From 90282ad78356e4bdd437c45dae0738d7706899ad Mon Sep 17 00:00:00 2001 From: Code Date: Fri, 31 Jan 2025 14:45:54 +0100 Subject: [PATCH] refactor | latest --- packages/osr-ai/commands/prompt.js | 2 +- packages/osr-ai/lib/report_map.js | 2 +- packages/osr-cli/dist/commands/exe.js | 2 +- packages/osr-cli/src/commands/exe.ts | 2 +- .../commands/import-oa-howtos.js | 2 +- .../osr-discourse/commands/import-oa-users.js | 2 +- packages/osr-discourse/commands/import-oa.js | 2 +- .../osr-discourse/commands/sync-component.js | 2 +- packages/osr-discourse/lib/discourse/cache.js | 2 +- packages/osr-discourse/lib/oa/commons.js | 2 +- packages/osr-discourse/lib/oa/howtos.js | 2 +- packages/osr-discourse/lib/oa/users.js | 2 +- packages/osr-discourse/lib/sync/commons.js | 2 +- packages/osr-discourse/lib/sync/component.js | 2 +- packages/osr-discourse/lib/sync/file.js | 2 +- packages/osr-discourse/lib/sync/fs.js | 2 +- packages/osr-discourse/lib/sync/osrl.js | 2 +- packages/osr-discourse/src/_cli.ts | 2 +- .../src/commands/import-oa-howtos.ts | 2 +- .../src/commands/import-oa-users.ts | 2 +- .../src/commands/sync-component.ts | 2 +- .../src/commands/sync-directory.ts | 2 +- .../osr-discourse/src/commands/sync-file.ts | 2 +- .../osr-discourse/src/lib/discourse/cache.ts | 2 +- packages/osr-discourse/src/lib/oa/commons.ts | 2 +- packages/osr-discourse/src/lib/oa/howtos.ts | 2 +- packages/osr-discourse/src/lib/oa/users.ts | 2 +- .../osr-discourse/src/lib/sync/commons.ts | 2 +- .../osr-discourse/src/lib/sync/component.ts | 2 +- .../osr-discourse/src/lib/sync/directory.ts | 2 +- packages/osr-discourse/src/lib/sync/file.ts | 2 +- packages/osr-discourse/src/lib/sync/index.ts | 2 +- packages/osr-discourse/src/lib/sync/osrl.ts | 2 +- packages/osr-fs-utils/commands/argv.js | 12 +-- packages/osr-fs-utils/commands/argv.js.map | 2 +- packages/osr-fs-utils/lib/find.js | 12 +-- packages/osr-fs-utils/lib/find.js.map | 2 +- .../osr-fs-utils/lib/writer_components.js | 4 +- .../osr-fs-utils/lib/writer_components.js.map | 2 +- packages/osr-fs-utils/src/commands/argv.ts | 2 +- packages/osr-fs-utils/src/lib/find.ts | 4 +- .../osr-fs-utils/src/lib/writer_components.ts | 2 +- packages/osr-mail/_cli.d.ts | 6 +- packages/osr-mail/constants.d.ts | 10 +-- packages/osr-mail/index.d.ts | 12 +-- packages/osr-mail/lib/imap/index.d.ts | 2 +- packages/osr-mail/lib/index.d.ts | 4 +- packages/osr-mail/lib/media/images/lib.js | 2 +- packages/osr-mail/lib/nodemailer/index.d.ts | 4 +- packages/osr-mail/main.d.ts | 4 +- packages/osr-mail/types.d.ts | 76 +++++++++---------- packages/osr-media/.inc/media.ts | 2 +- packages/osr-sync/argv.js | 4 +- packages/osr-sync/argv.js.map | 2 +- packages/osr-sync/commands/zip.js | 4 +- packages/osr-sync/commands/zip.js.map | 2 +- packages/osr-sync/src/argv.ts | 2 +- packages/osr-sync/src/commands/zip.ts | 2 +- packages/osrl/config.js | 2 +- 59 files changed, 124 insertions(+), 124 deletions(-) diff --git a/packages/osr-ai/commands/prompt.js b/packages/osr-ai/commands/prompt.js index f7bda64..72632b7 100644 --- a/packages/osr-ai/commands/prompt.js +++ b/packages/osr-ai/commands/prompt.js @@ -27,7 +27,7 @@ exports.register = void 0; const path = __importStar(require("path")); const exists_1 = require("@plastichub/fs/exists"); const osr_cli_commons_1 = require("@plastichub/osr-cli-commons"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const __1 = require("../"); const _cli_1 = require("../_cli"); const filters_1 = require("../lib/filters"); diff --git a/packages/osr-ai/lib/report_map.js b/packages/osr-ai/lib/report_map.js index 876d235..0ba7735 100644 --- a/packages/osr-ai/lib/report_map.js +++ b/packages/osr-ai/lib/report_map.js @@ -5,7 +5,7 @@ const path = require("path"); const node_xlsx_1 = require("node-xlsx"); const write_1 = require("@plastichub/fs/write"); const __1 = require(".."); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const extension = (file) => path.parse(file).ext; const createGoogleMapLink = (latitude, longitude, zoomLevel) => { const link = `https://www.google.com/maps/@${latitude},${longitude},${zoomLevel}z`; diff --git a/packages/osr-cli/dist/commands/exe.js b/packages/osr-cli/dist/commands/exe.js index 5e9d08e..fb4e0de 100644 --- a/packages/osr-cli/dist/commands/exe.js +++ b/packages/osr-cli/dist/commands/exe.js @@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", { value: true }); exports.register = void 0; -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const __1 = require("../"); const shelljs_1 = require("shelljs"); const defaultOptions = (yargs) => { diff --git a/packages/osr-cli/src/commands/exe.ts b/packages/osr-cli/src/commands/exe.ts index 85a2ec0..62dd460 100644 --- a/packages/osr-cli/src/commands/exe.ts +++ b/packages/osr-cli/src/commands/exe.ts @@ -1,5 +1,5 @@ import * as CLI from 'yargs'; -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { CONFIG_DEFAULT, OSR_ROOT } from '@plastichub/osr-cli-commons' import { logger } from '../' import { exec } from 'shelljs' diff --git a/packages/osr-discourse/commands/import-oa-howtos.js b/packages/osr-discourse/commands/import-oa-howtos.js index cb27ad3..817dec1 100644 --- a/packages/osr-discourse/commands/import-oa-howtos.js +++ b/packages/osr-discourse/commands/import-oa-howtos.js @@ -7,7 +7,7 @@ const discourse_1 = require("../lib/discourse"); const commons_1 = require("../lib/oa/commons"); const howtos_1 = require("../lib/oa/howtos"); const path = require("path"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const KB_ROOT = '${KB_ROOT}'; const osr_commons_1 = require("@plastichub/osr-commons"); const defaultOptions = (yargs) => { diff --git a/packages/osr-discourse/commands/import-oa-users.js b/packages/osr-discourse/commands/import-oa-users.js index 3b749c4..84b3f40 100644 --- a/packages/osr-discourse/commands/import-oa-users.js +++ b/packages/osr-discourse/commands/import-oa-users.js @@ -8,7 +8,7 @@ const discourse_1 = require("../lib/discourse"); const write_1 = require("@plastichub/fs/write"); const users_1 = require("../lib/oa/users"); const path = require("path"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const defaultOptions = (yargs) => { return yargs.option('debug', { default: false, diff --git a/packages/osr-discourse/commands/import-oa.js b/packages/osr-discourse/commands/import-oa.js index ad9d862..905ccbc 100644 --- a/packages/osr-discourse/commands/import-oa.js +++ b/packages/osr-discourse/commands/import-oa.js @@ -8,7 +8,7 @@ const discourse_1 = require("../lib/discourse"); const write_1 = require("@plastichub/fs/write"); const users_1 = require("../lib/oa/users"); const path = require("path"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const KB_ROOT = '${KB_ROOT}'; const defaultOptions = (yargs) => { return yargs.option('debug', { diff --git a/packages/osr-discourse/commands/sync-component.js b/packages/osr-discourse/commands/sync-component.js index 0dc6321..55e73f4 100644 --- a/packages/osr-discourse/commands/sync-component.js +++ b/packages/osr-discourse/commands/sync-component.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.register = exports.parse = void 0; const path = require("path"); const osr_cli_commons_1 = require("@plastichub/osr-cli-commons"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const exists_1 = require("@plastichub/fs/exists"); const constants_1 = require("../lib/discourse/constants"); const _cli_1 = require("../_cli"); diff --git a/packages/osr-discourse/lib/discourse/cache.js b/packages/osr-discourse/lib/discourse/cache.js index e909286..6238f7d 100644 --- a/packages/osr-discourse/lib/discourse/cache.js +++ b/packages/osr-discourse/lib/discourse/cache.js @@ -5,7 +5,7 @@ const bluebird_1 = require("bluebird"); const read_1 = require("@plastichub/fs/read"); const exists_1 = require("@plastichub/fs/exists"); const write_1 = require("@plastichub/fs/write"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const constants_1 = require("../discourse/constants"); const path = require("path"); const escapeHtml = require('escape-html'); diff --git a/packages/osr-discourse/lib/oa/commons.js b/packages/osr-discourse/lib/oa/commons.js index 5638ec5..d01ef52 100644 --- a/packages/osr-discourse/lib/oa/commons.js +++ b/packages/osr-discourse/lib/oa/commons.js @@ -4,7 +4,7 @@ exports.createTextLinks_ = exports.toHTML = exports.removeEmojis = exports.md_ed const lib_1 = require("./lib"); const path = require("path"); const read_1 = require("@plastichub/fs/read"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const users_1 = require("./users"); const js_beautify_1 = require("js-beautify"); const showdown_1 = require("showdown"); diff --git a/packages/osr-discourse/lib/oa/howtos.js b/packages/osr-discourse/lib/oa/howtos.js index e35268c..eb0ab03 100644 --- a/packages/osr-discourse/lib/oa/howtos.js +++ b/packages/osr-discourse/lib/oa/howtos.js @@ -12,7 +12,7 @@ const path = require("path"); const read_1 = require("@plastichub/fs/read"); const exists_1 = require("@plastichub/fs/exists"); const write_1 = require("@plastichub/fs/write"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const cheerio = require("cheerio"); const users_1 = require("./users"); var escapeHtml = require('escape-html'); diff --git a/packages/osr-discourse/lib/oa/users.js b/packages/osr-discourse/lib/oa/users.js index b364f54..399e4d4 100644 --- a/packages/osr-discourse/lib/oa/users.js +++ b/packages/osr-discourse/lib/oa/users.js @@ -8,7 +8,7 @@ const path = require("path"); const read_1 = require("@plastichub/fs/read"); const exists_1 = require("@plastichub/fs/exists"); const write_1 = require("@plastichub/fs/write"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const index_1 = require("../../index"); const slugify = require('slugify'); const core_1 = require("@plastichub/core"); diff --git a/packages/osr-discourse/lib/sync/commons.js b/packages/osr-discourse/lib/sync/commons.js index 858399b..42a4c36 100644 --- a/packages/osr-discourse/lib/sync/commons.js +++ b/packages/osr-discourse/lib/sync/commons.js @@ -5,7 +5,7 @@ const path = require("path"); const Engine_1 = require("@plastichub/osrl/Engine"); const options_1 = require("@plastichub/osrl/options"); const glob_1 = require("@plastichub/osr-cli-commons/glob"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const __1 = require("../../"); const exists_1 = require("@plastichub/fs/exists"); const read_1 = require("@plastichub/fs/read"); diff --git a/packages/osr-discourse/lib/sync/component.js b/packages/osr-discourse/lib/sync/component.js index 4927663..21b2ead 100644 --- a/packages/osr-discourse/lib/sync/component.js +++ b/packages/osr-discourse/lib/sync/component.js @@ -5,7 +5,7 @@ const path = require("path"); const exists_1 = require("@plastichub/fs/exists"); const dir_1 = require("@plastichub/fs/dir"); const write_1 = require("@plastichub/fs/write"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const bluebird_1 = require("bluebird"); const osrl_1 = require("./osrl"); const YAML = require('json-to-pretty-yaml'); diff --git a/packages/osr-discourse/lib/sync/file.js b/packages/osr-discourse/lib/sync/file.js index 36b7dc0..1cfbdc3 100644 --- a/packages/osr-discourse/lib/sync/file.js +++ b/packages/osr-discourse/lib/sync/file.js @@ -6,7 +6,7 @@ const exists_1 = require("@plastichub/fs/exists"); const dir_1 = require("@plastichub/fs/dir"); const write_1 = require("@plastichub/fs/write"); const read_1 = require("@plastichub/fs/read"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const bluebird_1 = require("bluebird"); const download_1 = require("./download"); const YAML = require('json-to-pretty-yaml'); diff --git a/packages/osr-discourse/lib/sync/fs.js b/packages/osr-discourse/lib/sync/fs.js index 0f5ae47..2a3279f 100644 --- a/packages/osr-discourse/lib/sync/fs.js +++ b/packages/osr-discourse/lib/sync/fs.js @@ -6,7 +6,7 @@ const exists_1 = require("@plastichub/fs/exists"); const dir_1 = require("@plastichub/fs/dir"); const write_1 = require("@plastichub/fs/write"); const read_1 = require("@plastichub/fs/read"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const bluebird_1 = require("bluebird"); const YAML = require('json-to-pretty-yaml'); const cheerio = require('cheerio'); diff --git a/packages/osr-discourse/lib/sync/osrl.js b/packages/osr-discourse/lib/sync/osrl.js index 83b3294..9b848a5 100644 --- a/packages/osr-discourse/lib/sync/osrl.js +++ b/packages/osr-discourse/lib/sync/osrl.js @@ -5,7 +5,7 @@ const path = require("path"); const Engine_1 = require("@plastichub/osrl/Engine"); const options_1 = require("@plastichub/osrl/options"); const glob_1 = require("@plastichub/osr-cli-commons/glob"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const index_1 = require("../../index"); const git_1 = require("../git"); const moment = require("moment"); diff --git a/packages/osr-discourse/src/_cli.ts b/packages/osr-discourse/src/_cli.ts index 58689d3..ec69791 100644 --- a/packages/osr-discourse/src/_cli.ts +++ b/packages/osr-discourse/src/_cli.ts @@ -4,7 +4,7 @@ import { logger } from './' import * as path from 'path' import { forward_slash, pathInfo } from "@plastichub/osr-cli-commons" -import { isFile, resolve } from "@plastichub/osr-cli-commons/fs" +import { isFile, resolve } from "@plastichub/osr-commons" import { substitute } from './index' diff --git a/packages/osr-discourse/src/commands/import-oa-howtos.ts b/packages/osr-discourse/src/commands/import-oa-howtos.ts index 61ee62e..2c6bc67 100644 --- a/packages/osr-discourse/src/commands/import-oa-howtos.ts +++ b/packages/osr-discourse/src/commands/import-oa-howtos.ts @@ -37,7 +37,7 @@ import { import { IUserPP } from '@plastichub/osr-commons' import * as path from 'path' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { CONFIG_DEFAULT, DEFAULT_ROOTS } from '@plastichub/osr-cli-commons' const KB_ROOT = '${KB_ROOT}' diff --git a/packages/osr-discourse/src/commands/import-oa-users.ts b/packages/osr-discourse/src/commands/import-oa-users.ts index a0bc1de..0cefac5 100644 --- a/packages/osr-discourse/src/commands/import-oa-users.ts +++ b/packages/osr-discourse/src/commands/import-oa-users.ts @@ -24,7 +24,7 @@ import { } from '../lib/oa/users' import * as path from 'path' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' const defaultOptions = (yargs: CLI.Argv) => { return yargs.option('debug', { diff --git a/packages/osr-discourse/src/commands/sync-component.ts b/packages/osr-discourse/src/commands/sync-component.ts index 16b5188..32a354a 100644 --- a/packages/osr-discourse/src/commands/sync-component.ts +++ b/packages/osr-discourse/src/commands/sync-component.ts @@ -2,7 +2,7 @@ import * as path from 'path' import * as CLI from 'yargs' import { forward_slash, pathInfo } from "@plastichub/osr-cli-commons" -import { resolve, isFile } from '@plastichub/osr-cli-commons/fs' +import { resolve, isFile } from '@plastichub/osr-commons' import { sync as exists } from '@plastichub/fs/exists' diff --git a/packages/osr-discourse/src/commands/sync-directory.ts b/packages/osr-discourse/src/commands/sync-directory.ts index dfb3e72..d61a2bd 100644 --- a/packages/osr-discourse/src/commands/sync-directory.ts +++ b/packages/osr-discourse/src/commands/sync-directory.ts @@ -2,7 +2,7 @@ import * as path from 'path' import * as CLI from 'yargs' import { forward_slash, pathInfo } from "@plastichub/osr-cli-commons" -import { resolve, isFile } from '@plastichub/osr-cli-commons/fs' +import { resolve, isFile } from '@plastichub/osr-commons' import { sync as exists } from '@plastichub/fs/exists' diff --git a/packages/osr-discourse/src/commands/sync-file.ts b/packages/osr-discourse/src/commands/sync-file.ts index 0896f3c..68c1fff 100644 --- a/packages/osr-discourse/src/commands/sync-file.ts +++ b/packages/osr-discourse/src/commands/sync-file.ts @@ -9,7 +9,7 @@ import { Instance } from '../lib/discourse' import { sync as write } from '@plastichub/fs/write' import * as path from 'path' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { syncYAML } from '../lib/sync/file' import { CAT_TEST, DEFAULT_IMPORT_OWNER } from '../lib/discourse/constants' diff --git a/packages/osr-discourse/src/lib/discourse/cache.ts b/packages/osr-discourse/src/lib/discourse/cache.ts index c50a55a..abcb454 100644 --- a/packages/osr-discourse/src/lib/discourse/cache.ts +++ b/packages/osr-discourse/src/lib/discourse/cache.ts @@ -3,7 +3,7 @@ import { Promise as BPromise } from 'bluebird' import { sync as read } from '@plastichub/fs/read' import { sync as exists } from '@plastichub/fs/exists' import { sync as write } from '@plastichub/fs/write' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { sync as mkdir } from '@plastichub/fs/dir' import { files } from '@plastichub/osr-cli-commons' diff --git a/packages/osr-discourse/src/lib/oa/commons.ts b/packages/osr-discourse/src/lib/oa/commons.ts index d8afae6..fe27340 100644 --- a/packages/osr-discourse/src/lib/oa/commons.ts +++ b/packages/osr-discourse/src/lib/oa/commons.ts @@ -30,7 +30,7 @@ import { sync as exists } from '@plastichub/fs/exists' import { sync as write } from '@plastichub/fs/write' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import * as cheerio from 'cheerio' import { getUsers, get_user_name } from './users' diff --git a/packages/osr-discourse/src/lib/oa/howtos.ts b/packages/osr-discourse/src/lib/oa/howtos.ts index 98256b6..55e81b5 100644 --- a/packages/osr-discourse/src/lib/oa/howtos.ts +++ b/packages/osr-discourse/src/lib/oa/howtos.ts @@ -31,7 +31,7 @@ import { sync as exists } from '@plastichub/fs/exists' import { sync as write } from '@plastichub/fs/write' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import * as cheerio from 'cheerio' import { getUsers, get_user_name } from './users' diff --git a/packages/osr-discourse/src/lib/oa/users.ts b/packages/osr-discourse/src/lib/oa/users.ts index b9cc2e0..b0887cf 100644 --- a/packages/osr-discourse/src/lib/oa/users.ts +++ b/packages/osr-discourse/src/lib/oa/users.ts @@ -12,7 +12,7 @@ import { sync as read } from '@plastichub/fs/read' import { sync as exists } from '@plastichub/fs/exists' import { sync as write } from '@plastichub/fs/write' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { logger } from '../../index' diff --git a/packages/osr-discourse/src/lib/sync/commons.ts b/packages/osr-discourse/src/lib/sync/commons.ts index 12e1221..68c541d 100644 --- a/packages/osr-discourse/src/lib/sync/commons.ts +++ b/packages/osr-discourse/src/lib/sync/commons.ts @@ -4,7 +4,7 @@ import { Engine as engine } from '@plastichub/osrl/Engine' import { parse } from '@plastichub/osrl/options' import { pathInfo } from '@plastichub/osr-cli-commons/glob' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { IOptionsSync, IOptionsSyncComponent, logger } from '../../' import { sync as exists } from '@plastichub/fs/exists' import { sync as read } from '@plastichub/fs/read' diff --git a/packages/osr-discourse/src/lib/sync/component.ts b/packages/osr-discourse/src/lib/sync/component.ts index 67a7652..07236dd 100644 --- a/packages/osr-discourse/src/lib/sync/component.ts +++ b/packages/osr-discourse/src/lib/sync/component.ts @@ -5,7 +5,7 @@ import { sync as dir } from "@plastichub/fs/dir" import { sync as write } from "@plastichub/fs/write" import { sync as read } from "@plastichub/fs/read" -import { resolve } from "@plastichub/osr-cli-commons/fs" +import { resolve } from "@plastichub/osr-commons" import { Promise as BPromise } from 'bluebird' import { IOptionsSync, IDiscoursePostBaseOptions } from '../../types' diff --git a/packages/osr-discourse/src/lib/sync/directory.ts b/packages/osr-discourse/src/lib/sync/directory.ts index 9496e6d..e33194d 100644 --- a/packages/osr-discourse/src/lib/sync/directory.ts +++ b/packages/osr-discourse/src/lib/sync/directory.ts @@ -5,7 +5,7 @@ import { sync as dir } from "@plastichub/fs/dir" import { sync as write } from "@plastichub/fs/write" import { sync as read } from "@plastichub/fs/read" -import { resolve } from "@plastichub/osr-cli-commons/fs" +import { resolve } from "@plastichub/osr-commons" import { Promise as BPromise } from 'bluebird' import { IOptionsSync, IDiscoursePostBaseOptions } from '../../types' diff --git a/packages/osr-discourse/src/lib/sync/file.ts b/packages/osr-discourse/src/lib/sync/file.ts index f200e7f..5256569 100644 --- a/packages/osr-discourse/src/lib/sync/file.ts +++ b/packages/osr-discourse/src/lib/sync/file.ts @@ -5,7 +5,7 @@ import { sync as dir } from "@plastichub/fs/dir" import { sync as write } from "@plastichub/fs/write" import { sync as read } from "@plastichub/fs/read" -import { resolve } from "@plastichub/osr-cli-commons/fs" +import { resolve } from "@plastichub/osr-commons" import { Promise as BPromise } from 'bluebird' import { IOptionsSync, IDiscoursePostBaseOptions } from '../../types' diff --git a/packages/osr-discourse/src/lib/sync/index.ts b/packages/osr-discourse/src/lib/sync/index.ts index b049a39..54f1fc4 100644 --- a/packages/osr-discourse/src/lib/sync/index.ts +++ b/packages/osr-discourse/src/lib/sync/index.ts @@ -9,7 +9,7 @@ import { async as move } from "@plastichub/fs/move" import { sync as dir } from "@plastichub/fs/dir" import { sync as write } from "@plastichub/fs/write" -import { resolve } from "@plastichub/osr-cli-commons/fs" +import { resolve } from "@plastichub/osr-commons" import { Promise as BPromise } from 'bluebird' import { IOptionsSync, IDiscoursePostBaseOptions } from '../../types' diff --git a/packages/osr-discourse/src/lib/sync/osrl.ts b/packages/osr-discourse/src/lib/sync/osrl.ts index 31ebb53..5156341 100644 --- a/packages/osr-discourse/src/lib/sync/osrl.ts +++ b/packages/osr-discourse/src/lib/sync/osrl.ts @@ -5,7 +5,7 @@ import { parse } from '@plastichub/osrl/options' import { forward_slash } from '@plastichub/osr-cli-commons/glob' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { IOptionsSyncComponent } from '../../' import { logger } from '../../index' diff --git a/packages/osr-fs-utils/commands/argv.js b/packages/osr-fs-utils/commands/argv.js index dce7a6e..bb45f56 100644 --- a/packages/osr-fs-utils/commands/argv.js +++ b/packages/osr-fs-utils/commands/argv.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.sanitize = exports.defaultOptions = void 0; const path = require("path"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const osr_commons_1 = require("@plastichub/osr-commons"); const exists_1 = require("@plastichub/fs/exists"); const globBase = require('glob-base'); const find_1 = require("../lib/find"); @@ -22,15 +22,15 @@ const sanitize = (argv, opts = {}) => { let variables = Object.assign({}, options.variables); let srcInfo; if (options.src) { - options.src = (0, fs_1.resolve)(options.src, options.alt, variables); + options.src = (0, osr_commons_1.resolve)(options.src, options.alt, variables); // in case a file with a glob pattern is provided, strip the glob // this is a special case, enabling shared scripts in Alt-Tap Salamand const glob_base = globBase(options.src); const file = options.src.replace(glob_base.glob, '').replace(/\/$/, ''); - if ((0, exists_1.sync)(file) && (0, fs_1.isFile)(file)) { + if ((0, exists_1.sync)(file) && (0, osr_commons_1.isFile)(file)) { options.src = file; } - const src = ((0, fs_1.resolve)(options.src, options.alt, variables)); + const src = ((0, osr_commons_1.resolve)(options.src, options.alt, variables)); srcInfo = (0, find_1.pathInfo)(src); if (srcInfo && srcInfo.FILES && srcInfo.FILES.length) { options.srcInfo = srcInfo; @@ -41,11 +41,11 @@ const sanitize = (argv, opts = {}) => { } } else { - options.src = (0, fs_1.resolve)(options.src, options.alt, variables); + options.src = (0, osr_commons_1.resolve)(options.src, options.alt, variables); } } if (options.dst) { - options.dst = path.resolve((0, fs_1.resolve)(options.dst, options.alt, variables)); + options.dst = path.resolve((0, osr_commons_1.resolve)(options.dst, options.alt, variables)); } return options; }; diff --git a/packages/osr-fs-utils/commands/argv.js.map b/packages/osr-fs-utils/commands/argv.js.map index 604c9dc..c8e11f2 100644 --- a/packages/osr-fs-utils/commands/argv.js.map +++ b/packages/osr-fs-utils/commands/argv.js.map @@ -1 +1 @@ -{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/commands/argv.ts"],"names":[],"mappings":";;;AACA,6BAA4B;AAM5B,uDAAiE;AACjE,kDAAuD;AAEvD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAErC,sCAAsC;AAEtC,mCAAmC;AAC5B,MAAM,cAAc,GAAG,CAAC,KAAe,EAAE,EAAE;IAC9C,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;QACvB,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,kEAAkE;QAC5E,YAAY,EAAE,IAAI;KACrB,CAAC,CAAA;AACN,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B;AAED,uDAAuD;AAChD,MAAM,QAAQ,GAAG,CAAC,IAAmB,EAAE,OAAgB,EAAE,EAAY,EAAE;IAE1E,MAAM,IAAI,GAAQ,IAAI,CAAA;IACtB,MAAM,OAAO,mBACT,GAAG,EAAE,IAAI,CAAC,GAAG,EACb,GAAG,EAAE,IAAI,CAAC,GAAG,EACb,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,GAAG,EAAE,IAAI,CAAC,GAAG,IACV,IAAI,CACV,CAAA;IAED,IAAI,SAAS,qBACN,OAAO,CAAC,SAAS,CACvB,CAAA;IAED,IAAI,OAAO,CAAA;IAEX,IAAI,OAAO,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,IAAA,YAAO,EAAC,OAAO,CAAC,GAAG,EAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAEzD,iEAAiE;QACjE,sEAAsE;QACtE,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QACvE,IAAG,IAAA,aAAM,EAAC,IAAI,CAAC,IAAI,IAAA,WAAM,EAAC,IAAI,CAAC,EAAC;YAC5B,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;SACrB;QAED,MAAM,GAAG,GAAG,CAAC,IAAA,YAAO,EAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;QAC1D,OAAO,GAAG,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAA;QAEvB,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;YAClD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAA;YACzB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;gBACvB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACpD,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;iBAC1C;aACJ;SACJ;aAAM;YACH,OAAO,CAAC,GAAG,GAAG,IAAA,YAAO,EAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;SAC7D;KACJ;IACD,IAAI,OAAO,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,YAAO,EAAC,OAAO,CAAC,GAAG,EAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;KAC1E;IACD,OAAO,OAAO,CAAA;AAClB,CAAC,CAAA;AA/CY,QAAA,QAAQ,YA+CpB"} \ No newline at end of file +{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/commands/argv.ts"],"names":[],"mappings":";;;AACA,6BAA4B;AAM5B,yDAA0D;AAC1D,kDAAuD;AAEvD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAErC,sCAAsC;AAEtC,mCAAmC;AAC5B,MAAM,cAAc,GAAG,CAAC,KAAe,EAAE,EAAE;IAC9C,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;QACvB,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,kEAAkE;QAC5E,YAAY,EAAE,IAAI;KACrB,CAAC,CAAA;AACN,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B;AAED,uDAAuD;AAChD,MAAM,QAAQ,GAAG,CAAC,IAAmB,EAAE,OAAgB,EAAE,EAAY,EAAE;IAE1E,MAAM,IAAI,GAAQ,IAAI,CAAA;IACtB,MAAM,OAAO,mBACT,GAAG,EAAE,IAAI,CAAC,GAAG,EACb,GAAG,EAAE,IAAI,CAAC,GAAG,EACb,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,GAAG,EAAE,IAAI,CAAC,GAAG,IACV,IAAI,CACV,CAAA;IAED,IAAI,SAAS,qBACN,OAAO,CAAC,SAAS,CACvB,CAAA;IAED,IAAI,OAAO,CAAA;IAEX,IAAI,OAAO,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,IAAA,qBAAO,EAAC,OAAO,CAAC,GAAG,EAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAEzD,iEAAiE;QACjE,sEAAsE;QACtE,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QACvE,IAAG,IAAA,aAAM,EAAC,IAAI,CAAC,IAAI,IAAA,oBAAM,EAAC,IAAI,CAAC,EAAC;YAC5B,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;SACrB;QAED,MAAM,GAAG,GAAG,CAAC,IAAA,qBAAO,EAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;QAC1D,OAAO,GAAG,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAA;QAEvB,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;YAClD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAA;YACzB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;gBACvB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACpD,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;iBAC1C;aACJ;SACJ;aAAM;YACH,OAAO,CAAC,GAAG,GAAG,IAAA,qBAAO,EAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;SAC7D;KACJ;IACD,IAAI,OAAO,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,qBAAO,EAAC,OAAO,CAAC,GAAG,EAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;KAC1E;IACD,OAAO,OAAO,CAAA;AAClB,CAAC,CAAA;AA/CY,QAAA,QAAQ,YA+CpB"} \ No newline at end of file diff --git a/packages/osr-fs-utils/lib/find.js b/packages/osr-fs-utils/lib/find.js index fbf0bc0..41f78e1 100644 --- a/packages/osr-fs-utils/lib/find.js +++ b/packages/osr-fs-utils/lib/find.js @@ -6,12 +6,12 @@ const isGlob = require("is-glob"); const fg = require("fast-glob"); const constants_1 = require("@plastichub/core/constants"); const exists_1 = require("@plastichub/fs/exists"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const osr_commons_1 = require("@plastichub/osr-commons"); const files = (dir, glob, options) => fg.sync(glob, Object.assign({ dot: true, cwd: dir, absolute: true, caseSensitiveMatch: false }, options || {})); exports.files = files; const globBase = require('glob-base'); const osr_cli_commons_1 = require("@plastichub/osr-cli-commons/"); -const fs_2 = require("@plastichub/osr-cli-commons/fs"); +const osr_commons_2 = require("@plastichub/osr-commons"); const lib_1 = require("../lib"); const pathInfo = (src, altToken = false) => { const srcParts = path.parse(src); @@ -23,8 +23,8 @@ const pathInfo = (src, altToken = false) => { variables.FILE_NAME = srcParts.base; variables.FILE_EXT = srcParts.ext.replace('.', ''); variables.PATH = src; - variables.IS_FILE = (0, fs_1.isFile)(src); - variables.IS_FOLDER = (0, fs_1.isFolder)(src); + variables.IS_FILE = (0, osr_commons_1.isFile)(src); + variables.IS_FOLDER = (0, osr_commons_1.isFolder)(src); variables.IS_EXPRESSION = src.match(altToken ? constants_1.REGEX_VAR_ALT : constants_1.REGEX_VAR) != null; if (!variables.IS_FOLDER && !variables.IS_FILE) { variables.IS_GLOB = isGlob(src); @@ -38,7 +38,7 @@ const pathInfo = (src, altToken = false) => { variables.DIR = path.resolve(glob_base.base); variables.FILE_NAME = glob_base.glob; variables.GLOB = glob_base.glob; - variables.GLOB_EXTENSIONS = (0, fs_1.getExtensions)(glob_base.glob); + variables.GLOB_EXTENSIONS = (0, osr_commons_1.getExtensions)(glob_base.glob); variables.FILES = fg.sync(glob_base.glob, { dot: true, cwd: variables.DIR, @@ -62,7 +62,7 @@ const _find = (options) => { exports._find = _find; const find_items = (options) => { let ret = (0, exports._find)(options).map((c) => { - const root = (0, fs_2.resolve)(options.root, false, {}); + const root = (0, osr_commons_2.resolve)(options.root, false, {}); return { path: (0, osr_cli_commons_1.forward_slash)(`${options.root}/${path.relative(root, c)}`), config: (0, lib_1.readOSRConfig)(c) diff --git a/packages/osr-fs-utils/lib/find.js.map b/packages/osr-fs-utils/lib/find.js.map index 72370aa..b05bdd6 100644 --- a/packages/osr-fs-utils/lib/find.js.map +++ b/packages/osr-fs-utils/lib/find.js.map @@ -1 +1 @@ -{"version":3,"file":"find.js","sourceRoot":"","sources":["../src/lib/find.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"find.js","sourceRoot":"","sources":["../src/lib/find.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/osr-fs-utils/lib/writer_components.js b/packages/osr-fs-utils/lib/writer_components.js index 8506339..2404340 100644 --- a/packages/osr-fs-utils/lib/writer_components.js +++ b/packages/osr-fs-utils/lib/writer_components.js @@ -4,7 +4,7 @@ exports.write_components = exports._write = void 0; const path = require("path"); const node_xlsx_1 = require("node-xlsx"); const write_1 = require("@plastichub/fs/write"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const osr_commons_1 = require("@plastichub/osr-commons"); const __1 = require(".."); const sync_1 = require("csv-generate/sync"); const extension = (file) => path.parse(file).ext; @@ -22,7 +22,7 @@ const writerTXT = (_products: any[], opts: IOptions) => { } */ const writerXLS = (items, opts, extraProps = [], extraCols = []) => { - let _path = path.resolve((0, fs_1.resolve)(opts.dst)); + let _path = path.resolve((0, osr_commons_1.resolve)(opts.dst)); items = items.map((u) => { return [u.email, u.name, u.bazar, u.web, u.social, u.status, u.lastActive, u.ig, ...extraProps]; }); diff --git a/packages/osr-fs-utils/lib/writer_components.js.map b/packages/osr-fs-utils/lib/writer_components.js.map index 1aa33fb..a320e49 100644 --- a/packages/osr-fs-utils/lib/writer_components.js.map +++ b/packages/osr-fs-utils/lib/writer_components.js.map @@ -1 +1 @@ -{"version":3,"file":"writer_components.js","sourceRoot":"","sources":["../src/lib/writer_components.ts"],"names":[],"mappings":";;;AAAA,6BAA4B;AAC5B,yCAA4B;AAC5B,gDAAoD;AAEpD,uDAAwD;AAExD,0BAA2B;AAG3B,4CAA4C;AAE5C,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;AAEzD;;;;;;;;;;;;EAYE;AACF,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,IAAc,EAAE,UAAU,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE;IAEhF,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,YAAO,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,UAAU,CAAC,CAAC;IACpG,CAAC,CAAC,CAAA;IAEF,IAAI,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC;IAEnG,IAAI,IAAI,GACJ;QACI,OAAO;QACP,GAAG,KAAK;KACX,CAAC;IAEN,MAAM,YAAY,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;IACjH,MAAM,MAAM,GAAG,mBAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;IAChF,IAAA,YAAK,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrB,IAAI,CAAC,KAAK,IAAI,UAAM,CAAC,KAAK,CAAC,oBAAoB,KAAK,GAAG,EAAE,KAAK,CAAC,CAAC;AAEpE,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,IAAc,EAAE,EAAE;IAC/C,IAAI,IAAI,CAAC,GAAG,EAAE;QACV,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;QACjF,CAAC,CAAC,CAAA;QAEF,IAAI,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAEvF,2bAA2b;QAG3b,IAAI,IAAI,GACJ;YACI,OAAO;YACP,GAAG,KAAK;SACX,CAAC;QAEN,MAAM,OAAO,GAAG,IAAA,eAAQ,EAAC;YACrB,IAAI,EAAE,CAAC;YACP,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;SACZ,CAAC,CAAC;QAEH;;;;;UAKE;QAEF,IAAA,YAAK,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjB,IAAI,CAAC,KAAK,IAAI,UAAM,CAAC,KAAK,CAAC,oBAAoB,KAAK,GAAG,EAAE,KAAK,CAAC,CAAC;KACnE;AACL,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,GAAW,EAAE,EAAE,CAAC,IAAA,YAAK,EAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AAEjE,MAAM,OAAO,GACb;IACI,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,UAAU;IACnB,MAAM,EAAE,SAAS;CACpB,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAA;AAErC,MAAM,MAAM,GAAG,CAAC,KAAU,EAAE,OAAe,IAAI,EAAE,EAAE,CACtD,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAD7B,QAAA,MAAM,UACuB;AAEnC,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAE,GAAU,EAAE,EAAE,CACzD,IAAA,cAAM,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAA;AADxB,QAAA,gBAAgB,oBACQ"} \ No newline at end of file +{"version":3,"file":"writer_components.js","sourceRoot":"","sources":["../src/lib/writer_components.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/osr-fs-utils/src/commands/argv.ts b/packages/osr-fs-utils/src/commands/argv.ts index ce7d42d..2de6276 100644 --- a/packages/osr-fs-utils/src/commands/argv.ts +++ b/packages/osr-fs-utils/src/commands/argv.ts @@ -5,7 +5,7 @@ import { logger } from '../' import { isArray } from "@plastichub/core/primitives" import { IOptions } from '../' import { forward_slash, } from "@plastichub/osr-cli-commons" -import { isFile, resolve } from "@plastichub/osr-cli-commons/fs" +import { isFile, resolve } from "@plastichub/osr-commons" import { sync as exists } from "@plastichub/fs/exists" const globBase = require('glob-base') diff --git a/packages/osr-fs-utils/src/lib/find.ts b/packages/osr-fs-utils/src/lib/find.ts index f5483e2..c7fcbf0 100644 --- a/packages/osr-fs-utils/src/lib/find.ts +++ b/packages/osr-fs-utils/src/lib/find.ts @@ -6,7 +6,7 @@ import { REGEX_VAR, REGEX_VAR_ALT } from "@plastichub/core/constants" import { PATH_INFO } from "@plastichub/osr-cli-commons" import { sync as exists } from '@plastichub/fs/exists' -import { isFile, isFolder, getExtensions } from "@plastichub/osr-cli-commons/fs" +import { isFile, isFolder, getExtensions } from "@plastichub/osr-commons" import { IOptions } from '../' export const files = (dir, glob, options?: any) => fg.sync(glob, { ...{ dot: true, cwd: dir, absolute: true, caseSensitiveMatch: false }, ...options || {} }) as [] @@ -15,7 +15,7 @@ const globBase = require('glob-base') import { forward_slash } from "@plastichub/osr-cli-commons/" -import { resolve } from "@plastichub/osr-cli-commons/fs" +import { resolve } from "@plastichub/osr-commons" import { readOSRConfig, write_components } from '../lib' export const pathInfo = (src: string, altToken: boolean = false): PATH_INFO => { diff --git a/packages/osr-fs-utils/src/lib/writer_components.ts b/packages/osr-fs-utils/src/lib/writer_components.ts index 2199797..f2e49d3 100644 --- a/packages/osr-fs-utils/src/lib/writer_components.ts +++ b/packages/osr-fs-utils/src/lib/writer_components.ts @@ -2,7 +2,7 @@ import * as path from 'path' import xlsx from 'node-xlsx' import { sync as write } from "@plastichub/fs/write" import { IProduct } from "@plastichub/osr-commons/types" -import { resolve } from "@plastichub/osr-cli-commons/fs" +import { resolve } from "@plastichub/osr-commons" import { logger } from '..' import { IOptions } from '../types' diff --git a/packages/osr-mail/_cli.d.ts b/packages/osr-mail/_cli.d.ts index 9c57c0f..4d5a50f 100644 --- a/packages/osr-mail/_cli.d.ts +++ b/packages/osr-mail/_cli.d.ts @@ -1,3 +1,3 @@ -import { IOptions } from './types'; -export declare const defaults: () => void; -export declare const sanitize: (argv: any) => IOptions | boolean; +import { IOptions } from './types'; +export declare const defaults: () => void; +export declare const sanitize: (argv: any) => IOptions | boolean; diff --git a/packages/osr-mail/constants.d.ts b/packages/osr-mail/constants.d.ts index ce56ff7..a15bfb1 100644 --- a/packages/osr-mail/constants.d.ts +++ b/packages/osr-mail/constants.d.ts @@ -1,5 +1,5 @@ -export declare const GIT_REPO = "https://git.osr-plastic.org/osr-plastic/"; -export declare const MODULE_NAME = "OSR-MEDIA"; -export declare const PACKAGE_NAME = "osr-media"; -export declare const ERR_PERM_RETRY_DELAY = 500; -export declare const ERR_PERM_RETRY_MAX = 5; +export declare const GIT_REPO = "https://git.osr-plastic.org/osr-plastic/"; +export declare const MODULE_NAME = "OSR-MEDIA"; +export declare const PACKAGE_NAME = "osr-media"; +export declare const ERR_PERM_RETRY_DELAY = 500; +export declare const ERR_PERM_RETRY_MAX = 5; diff --git a/packages/osr-mail/index.d.ts b/packages/osr-mail/index.d.ts index 8b04521..703ba15 100644 --- a/packages/osr-mail/index.d.ts +++ b/packages/osr-mail/index.d.ts @@ -1,6 +1,6 @@ -export * from './constants'; -export * from './types'; -export * from './lib'; -export declare const logger: import("@plastichub/core/debug").Logger; -import { IObjectLiteral } from "@plastichub/core"; -export declare const substitute: (alt: boolean, template: string, vars: IObjectLiteral) => any; +export * from './constants'; +export * from './types'; +export * from './lib'; +export declare const logger: import("@plastichub/core/debug").Logger; +import { IObjectLiteral } from "@plastichub/core"; +export declare const substitute: (alt: boolean, template: string, vars: IObjectLiteral) => any; diff --git a/packages/osr-mail/lib/imap/index.d.ts b/packages/osr-mail/lib/imap/index.d.ts index e4053fe..a3c86c8 100644 --- a/packages/osr-mail/lib/imap/index.d.ts +++ b/packages/osr-mail/lib/imap/index.d.ts @@ -1 +1 @@ -export declare const draft: (subject: string, html: string, options: any) => Promise; +export declare const draft: (subject: string, html: string, options: any) => Promise; diff --git a/packages/osr-mail/lib/index.d.ts b/packages/osr-mail/lib/index.d.ts index cef5cda..80bed9e 100644 --- a/packages/osr-mail/lib/index.d.ts +++ b/packages/osr-mail/lib/index.d.ts @@ -1,2 +1,2 @@ -export * from './nodemailer'; -export * from './imap'; +export * from './nodemailer'; +export * from './imap'; diff --git a/packages/osr-mail/lib/media/images/lib.js b/packages/osr-mail/lib/media/images/lib.js index cb3d8df..a35a848 100644 --- a/packages/osr-mail/lib/media/images/lib.js +++ b/packages/osr-mail/lib/media/images/lib.js @@ -6,7 +6,7 @@ const fs = require("fs"); const index_1 = require("../../../index"); const exists_1 = require("@plastichub/fs/exists"); const read_1 = require("@plastichub/fs/read"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const fileAsBuffer = (path) => (0, read_1.sync)(path, 'buffer') || Buffer.from("-"); exports.fileAsBuffer = fileAsBuffer; const clone = (obj) => { diff --git a/packages/osr-mail/lib/nodemailer/index.d.ts b/packages/osr-mail/lib/nodemailer/index.d.ts index 4131376..3e140e3 100644 --- a/packages/osr-mail/lib/nodemailer/index.d.ts +++ b/packages/osr-mail/lib/nodemailer/index.d.ts @@ -1,2 +1,2 @@ -import { IOptions } from '../../types'; -export declare const test: (options: IOptions) => Promise; +import { IOptions } from '../../types'; +export declare const test: (options: IOptions) => Promise; diff --git a/packages/osr-mail/main.d.ts b/packages/osr-mail/main.d.ts index d1ebc9c..b798801 100644 --- a/packages/osr-mail/main.d.ts +++ b/packages/osr-mail/main.d.ts @@ -1,2 +1,2 @@ -#!/usr/bin/env node -export {}; +#!/usr/bin/env node +export {}; diff --git a/packages/osr-mail/types.d.ts b/packages/osr-mail/types.d.ts index ba3b864..88904df 100644 --- a/packages/osr-mail/types.d.ts +++ b/packages/osr-mail/types.d.ts @@ -1,38 +1,38 @@ -import { Hash } from '@plastichub/core'; -import { PATH_INFO } from '@plastichub/osr-commons'; -import { Attachment } from 'nodemailer/lib/mailer'; -export interface ITransportOptions { - host: string; - port: number; - secure: boolean; - auth: { - user: string; - pass: string; - }; -} -export type IOptions = { - alt?: boolean; - config?: any; - cwd?: string; - root?: string; - debug?: boolean; - verbose?: boolean; - dry?: boolean; - dst?: string; - dstInfo?: PATH_INFO; - env?: string; - cache?: boolean; - src?: string; - srcInfo?: PATH_INFO; - stdout?: boolean; - variables?: Hash; - key?: string; - logLevel?: string; - transport?: string; - from?: string; - subject?: string; - html?: string; - to?: string; - attachments?: Attachment[]; -}; -export type INodeMailer = IOptions & {}; +import { Hash } from '@plastichub/core'; +import { PATH_INFO } from '@plastichub/osr-commons'; +import { Attachment } from 'nodemailer/lib/mailer'; +export interface ITransportOptions { + host: string; + port: number; + secure: boolean; + auth: { + user: string; + pass: string; + }; +} +export type IOptions = { + alt?: boolean; + config?: any; + cwd?: string; + root?: string; + debug?: boolean; + verbose?: boolean; + dry?: boolean; + dst?: string; + dstInfo?: PATH_INFO; + env?: string; + cache?: boolean; + src?: string; + srcInfo?: PATH_INFO; + stdout?: boolean; + variables?: Hash; + key?: string; + logLevel?: string; + transport?: string; + from?: string; + subject?: string; + html?: string; + to?: string; + attachments?: Attachment[]; +}; +export type INodeMailer = IOptions & {}; diff --git a/packages/osr-media/.inc/media.ts b/packages/osr-media/.inc/media.ts index db683de..66378ca 100644 --- a/packages/osr-media/.inc/media.ts +++ b/packages/osr-media/.inc/media.ts @@ -1,7 +1,7 @@ process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0' import * as path from 'path' import * as pMap from 'p-map' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { files } from '@plastichub/osr-cli-commons/glob' import { sync as exists } from '@plastichub/fs/exists' diff --git a/packages/osr-sync/argv.js b/packages/osr-sync/argv.js index 4be1331..4d8b349 100644 --- a/packages/osr-sync/argv.js +++ b/packages/osr-sync/argv.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.defaultOptions = exports.sanitize = exports.default_profile = void 0; const path = require("path"); const primitives_1 = require("@plastichub/core/primitives"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const osr_commons_1 = require("@plastichub/osr-commons"); const exists_1 = require("@plastichub/fs/exists"); const read_1 = require("@plastichub/fs/read"); const _1 = require("./"); @@ -14,7 +14,7 @@ exports.default_profile = { '**' ] }; -const _resolvePath = (_path, alt = false, vars = {}) => path.resolve((0, fs_1.resolve)(_path, alt, vars)); +const _resolvePath = (_path, alt = false, vars = {}) => path.resolve((0, osr_commons_1.resolve)(_path, alt, vars)); const sanitize = (argv) => { argv = argv; const resolvePath = (_path) => _resolvePath(_path, argv.alt, argv.var); diff --git a/packages/osr-sync/argv.js.map b/packages/osr-sync/argv.js.map index 98a0cab..910b4e4 100644 --- a/packages/osr-sync/argv.js.map +++ b/packages/osr-sync/argv.js.map @@ -1 +1 @@ -{"version":3,"file":"argv.js","sourceRoot":"","sources":["src/argv.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"argv.js","sourceRoot":"","sources":["src/argv.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/osr-sync/commands/zip.js b/packages/osr-sync/commands/zip.js index db889d7..645fd45 100644 --- a/packages/osr-sync/commands/zip.js +++ b/packages/osr-sync/commands/zip.js @@ -7,7 +7,7 @@ const exists_1 = require("@plastichub/fs/exists"); const remove_1 = require("@plastichub/fs/remove"); const fs = require("fs"); const path = require("path"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const osr_commons_1 = require("@plastichub/osr-commons"); const options = (yargs) => (0, argv_1.defaultOptions)(yargs); const archiver = require("archiver"); const defaultProduct_public_folders = [ @@ -48,7 +48,7 @@ const register = (cli) => { __1.logger.setSettings({ minLevel: args.logLevel ? 'trace' : 'info' }); - const target = path.resolve((0, fs_1.resolve)(args.target)); + const target = path.resolve((0, osr_commons_1.resolve)(args.target)); if ((0, exists_1.sync)(target) && args.clear) { __1.logger.trace(`Deleting ${target}`); (0, remove_1.sync)(target); diff --git a/packages/osr-sync/commands/zip.js.map b/packages/osr-sync/commands/zip.js.map index a304c07..d516bc3 100644 --- a/packages/osr-sync/commands/zip.js.map +++ b/packages/osr-sync/commands/zip.js.map @@ -1 +1 @@ -{"version":3,"file":"zip.js","sourceRoot":"","sources":["../src/commands/zip.ts"],"names":[],"mappings":";;;AAAA,2BAA4B;AAG5B,kCAAkD;AAElD,kDAAsD;AACtD,kDAAsD;AACtD,yBAAwB;AACxB,6BAA4B;AAC5B,uDAAwD;AAExD,MAAM,OAAO,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,IAAA,qBAAc,EAAC,KAAK,CAAC,CAAA;AAE1D,qCAAoC;AAEpC,MAAM,6BAA6B,GAAG;IAClC,KAAK;IACL,eAAe;IACf,WAAW;IACX,UAAU;IACV,QAAQ;IACR,WAAW;IACX,OAAO;IACP,OAAO;IACP,YAAY;CACf,CAAA;AACD,MAAM,2BAA2B,GAAG;IAChC,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,OAAO;IACP,OAAO;CACV,CAAA;AAED,MAAM,QAAQ,GAAG;IACb,SAAS,EAAE;QACP,QAAQ,EAAE;YACN,GAAG,2BAA2B;YAC9B,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;SACzD;KACJ;CACJ,CAAA;AAED,iJAAiJ;AACjJ,+JAA+J;AAC/J,iNAAiN;AAC1M,MAAM,QAAQ,GAAG,CAAC,GAAa,EAAE,EAAE;IACtC,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAmB,EAAE,EAAE;QACpE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAAC,OAAM;QAAC,CAAC;QACzB,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAoB,CAAA;QAC9C,UAAM,CAAC,WAAW,CAAC;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;SAC7C,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,YAAO,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QACjD,IAAI,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,UAAM,CAAC,KAAK,CAAC,YAAY,MAAM,EAAE,CAAC,CAAA;YAClC,IAAA,aAAM,EAAC,MAAM,CAAC,CAAA;QAClB,CAAC;QAED,IAAI,OAAO,GAAQ,EAAE,CAAA;QACrB,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAiB,CAAC,CAAC,CAAE,QAAgB,CAAC,IAAI,CAAC,OAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACvF,OAAO,GAAG;gBACN,GAAG,OAAO;aACb,CAAA;QACL,CAAC;aAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;QAED,UAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE;YAC5B,IAAI,EAAE;gBACF,KAAK,EAAE,CAAC;aACX;SACJ,CAAC,CAAA;QACF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxB,UAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAA;YACvC,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,CAAA;YACb,CAAC;QACL,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,UAAM,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,CAAC,CAAA;YAClC,OAAM;QACV,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;wBAC3C,UAAM,CAAC,IAAI,CAAC,iBAAiB,MAAM,WAAW,KAAK,UAAU,GAAG,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;wBACnF,OAAO,CAAC,IAAI,CAAC,KAAK,EACd;4BACI,GAAG,EAAE,MAAM;4BACX,MAAM,EAAE,EAAE;yBACb,EACD;4BACI,MAAM,EAAE,GAAG;yBACd,CAAC,CAAA;oBACV,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACtB,UAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;oBAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC;QACD,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAA;QAExB,UAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;IACvD,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAxEY,QAAA,QAAQ,YAwEpB"} \ No newline at end of file +{"version":3,"file":"zip.js","sourceRoot":"","sources":["../src/commands/zip.ts"],"names":[],"mappings":";;;AAAA,2BAA4B;AAG5B,kCAAkD;AAElD,kDAAsD;AACtD,kDAAsD;AACtD,yBAAwB;AACxB,6BAA4B;AAC5B,yDAAiD;AAEjD,MAAM,OAAO,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,IAAA,qBAAc,EAAC,KAAK,CAAC,CAAA;AAE1D,qCAAoC;AAEpC,MAAM,6BAA6B,GAAG;IAClC,KAAK;IACL,eAAe;IACf,WAAW;IACX,UAAU;IACV,QAAQ;IACR,WAAW;IACX,OAAO;IACP,OAAO;IACP,YAAY;CACf,CAAA;AACD,MAAM,2BAA2B,GAAG;IAChC,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,OAAO;IACP,OAAO;CACV,CAAA;AAED,MAAM,QAAQ,GAAG;IACb,SAAS,EAAE;QACP,QAAQ,EAAE;YACN,GAAG,2BAA2B;YAC9B,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;SACzD;KACJ;CACJ,CAAA;AAED,iJAAiJ;AACjJ,+JAA+J;AAC/J,iNAAiN;AAC1M,MAAM,QAAQ,GAAG,CAAC,GAAa,EAAE,EAAE;IACtC,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAmB,EAAE,EAAE;QACpE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAAC,OAAM;QAAC,CAAC;QACzB,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAoB,CAAA;QAC9C,UAAM,CAAC,WAAW,CAAC;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;SAC7C,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,qBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QACjD,IAAI,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,UAAM,CAAC,KAAK,CAAC,YAAY,MAAM,EAAE,CAAC,CAAA;YAClC,IAAA,aAAM,EAAC,MAAM,CAAC,CAAA;QAClB,CAAC;QAED,IAAI,OAAO,GAAQ,EAAE,CAAA;QACrB,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAiB,CAAC,CAAC,CAAE,QAAgB,CAAC,IAAI,CAAC,OAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACvF,OAAO,GAAG;gBACN,GAAG,OAAO;aACb,CAAA;QACL,CAAC;aAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;QAED,UAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE;YAC5B,IAAI,EAAE;gBACF,KAAK,EAAE,CAAC;aACX;SACJ,CAAC,CAAA;QACF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxB,UAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAA;YACvC,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,CAAA;YACb,CAAC;QACL,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,UAAM,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,CAAC,CAAA;YAClC,OAAM;QACV,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;wBAC3C,UAAM,CAAC,IAAI,CAAC,iBAAiB,MAAM,WAAW,KAAK,UAAU,GAAG,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;wBACnF,OAAO,CAAC,IAAI,CAAC,KAAK,EACd;4BACI,GAAG,EAAE,MAAM;4BACX,MAAM,EAAE,EAAE;yBACb,EACD;4BACI,MAAM,EAAE,GAAG;yBACd,CAAC,CAAA;oBACV,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACtB,UAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;oBAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC;QACD,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAA;QAExB,UAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;IACvD,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAxEY,QAAA,QAAQ,YAwEpB"} \ No newline at end of file diff --git a/packages/osr-sync/src/argv.ts b/packages/osr-sync/src/argv.ts index 62abb30..a4c7115 100644 --- a/packages/osr-sync/src/argv.ts +++ b/packages/osr-sync/src/argv.ts @@ -4,7 +4,7 @@ import * as path from 'path' import { isArray, isString, isObject } from '@plastichub/core/primitives' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' import { sync as exists } from '@plastichub/fs/exists' import { sync as read } from '@plastichub/fs/read' import { logger } from './' diff --git a/packages/osr-sync/src/commands/zip.ts b/packages/osr-sync/src/commands/zip.ts index a205fdb..01819af 100644 --- a/packages/osr-sync/src/commands/zip.ts +++ b/packages/osr-sync/src/commands/zip.ts @@ -7,7 +7,7 @@ import { sync as exists } from '@plastichub/fs/exists' import { sync as remove } from '@plastichub/fs/remove' import * as fs from 'fs' import * as path from 'path' -import { resolve } from '@plastichub/osr-cli-commons/fs' +import { resolve } from '@plastichub/osr-commons' const options = (yargs: CLI.Argv) => defaultOptions(yargs) diff --git a/packages/osrl/config.js b/packages/osrl/config.js index 6972b7a..0426515 100644 --- a/packages/osrl/config.js +++ b/packages/osrl/config.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.TASK_LOG_DIRECTORY = exports.TASK_COMPILE_CONTENT_CACHE = exports.TASK_CONFIG_LOG_DIRECTORY = exports.ENABLED_PRODUCTS = exports.OSRL_LANG_FLAVOR = exports.OSRL_PROFILE = exports.OSRL_MODULE_NAME = exports.PRODUCTS_TARGET_SRC = exports.PRODUCT_HUGO_TEMPLATE = exports.OSRL_ENVIRONMENT = exports.OSRL_ENV_DEV = exports.OSRL_ENV = exports.IS_DEV = exports.PRODUCT_DIR = exports.PRODUCT_CONFIG = exports.PRODUCT_ROOT = exports.I18N_SOURCE_LANGUAGE = exports.I18N_STORE = exports.I18N_STORE_EN = exports.LANGUAGES_ALL = exports.LANGUAGES = exports.TRANSLATE_CONTENT = exports.OSR_ROOT = void 0; const path = require("path"); -const fs_1 = require("@plastichub/osr-cli-commons/fs"); +const fs_1 = require("@plastichub/osr-commons"); const OSR_ROOT = () => path.resolve((0, fs_1.resolve)("${OSR_ROOT}")); exports.OSR_ROOT = OSR_ROOT; // Supported languages