From ad30fe75e4b9eb8150cf19a5658e13b8bb07c7dd Mon Sep 17 00:00:00 2001 From: lovebird Date: Wed, 11 Sep 2024 20:47:11 +0200 Subject: [PATCH] osr latest --- .vscode/launch.json | 11 +- commands/import-oa-howtos.d.ts | 10 +- commands/import-oa-users.d.ts | 10 +- commands/info.d.ts | 6 +- commands/query.d.ts | 12 +- commands/sync-component.d.ts | 56 +--- commands/sync-component.js | 7 +- commands/sync-file.d.ts | 42 +-- lib/discourse/cache.js | 5 +- lib/discourse/index.d.ts | 1 - lib/oa/commons.d.ts | 1 - lib/oa/users.d.ts | 2 +- lib/sync/component.js | 3 +- lib/sync/index.d.ts | 1 - lib/sync/osrl.js | 10 +- main.js | 2 +- package-lock.json | 574 ++++++++++++++------------------- package.json | 6 +- src/commands/sync-component.ts | 8 +- src/lib/discourse/cache.ts | 4 + src/lib/sync/component.ts | 2 +- src/lib/sync/osrl.ts | 42 +-- src/types.ts | 4 +- tmp-a.json | 106 +++--- tmp.json | 86 ++--- types.d.ts | 1 + 26 files changed, 390 insertions(+), 622 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 5775b99..a33c61b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -155,18 +155,19 @@ "preLaunchTask": "tsc: build - tsconfig.json", "args": [ "sync-component", - "--cache=false", - "--skip=false", + "--cache=true", + "--skip=true", "--src2='${OSR_LIBRARY_MACHINES}/injection/**/config.+(json)'", - "--src='${OSR_LIBRARY_MACHINES}/extrusion/**/config.+(json)'", - "--src2='${OSR_LIBRARY_MACHINES}/sheetpress/**/config.+(json)'", + "--src2='${OSR_LIBRARY_MACHINES}/extrusion/**/config.+(json)'", + "--src='${OSR_LIBRARY_MACHINES}/sheetpress/**/config.+(json)'", "--src2='${OSR_LIBRARY_MACHINES}/shredder/**/config.+(json)'", "--src2='${OSR_LIBRARY_MACHINES}/zoe/config.+(json)'", // "--src='${OSR_LIBRARY_MACHINES}/combo/IntegrationUnitMonash/config.+(json)'", "--src1='${OSR_LIBRARY_MACHINES}/injection/**/config.+(json)'", //"--src='${OSR_LIBRARY_MACHINES}/sheetpress/cassandra-light/config.+(json)'", "--root='${OSR_LIBRARY_MACHINES}'", - "--sync=mine" + "--sync=mine", + "--logLevel=debug" ], "outFiles": [ "${workspaceFolder}/**/*.js" diff --git a/commands/import-oa-howtos.d.ts b/commands/import-oa-howtos.d.ts index eb7ef92..443f33e 100644 --- a/commands/import-oa-howtos.d.ts +++ b/commands/import-oa-howtos.d.ts @@ -1,10 +1,2 @@ import * as CLI from 'yargs'; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{ - debug: boolean; -} & { - src: string; -} & { - track: string; -} & { - env_key: string; -}>; +export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; diff --git a/commands/import-oa-users.d.ts b/commands/import-oa-users.d.ts index eb7ef92..443f33e 100644 --- a/commands/import-oa-users.d.ts +++ b/commands/import-oa-users.d.ts @@ -1,10 +1,2 @@ import * as CLI from 'yargs'; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{ - debug: boolean; -} & { - src: string; -} & { - track: string; -} & { - env_key: string; -}>; +export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; diff --git a/commands/info.d.ts b/commands/info.d.ts index e3362f9..443f33e 100644 --- a/commands/info.d.ts +++ b/commands/info.d.ts @@ -1,6 +1,2 @@ import * as CLI from 'yargs'; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{ - debug: string; -} & { - env_key: string; -}>; +export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; diff --git a/commands/query.d.ts b/commands/query.d.ts index 5ea23d0..443f33e 100644 --- a/commands/query.d.ts +++ b/commands/query.d.ts @@ -1,12 +1,2 @@ import * as CLI from 'yargs'; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{ - debug: boolean; -} & { - short: string | boolean; -} & { - disabled: string | boolean; -} & { - dry: string; -} & { - env_key: string; -}>; +export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; diff --git a/commands/sync-component.d.ts b/commands/sync-component.d.ts index f065e4c..1d55e59 100644 --- a/commands/sync-component.d.ts +++ b/commands/sync-component.d.ts @@ -1,58 +1,4 @@ import * as CLI from 'yargs'; import { IOptionsSyncComponent } from '../types'; export declare const parse: (argv: any) => IOptionsSyncComponent | boolean; -export declare const register: (cli: CLI.Argv) => CLI.Argv<{ - debug: boolean; -} & { - verbose: boolean; -} & { - alt: boolean; -} & { - yaml: boolean; -} & { - skip: boolean; -} & { - uploadLocal: boolean; -} & { - uploadRemote: boolean; -} & { - title: string; -} & { - cat: number; -} & { - timestamp: number; -} & { - owner: number; -} & { - config: string; -} & { - src: string; -} & { - src2: string; -} & { - env: string; -} & { - profile: string; -} & { - format: string; -} & { - source: string; -} & { - language: string; -} & { - plugins: string; -} & { - root: string; -} & { - product_root: string; -} & { - cwd: string; -} & { - module: string; -} & { - filter: string; -} & { - cache: boolean; -} & { - env_key: string; -}>; +export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; diff --git a/commands/sync-component.js b/commands/sync-component.js index f5df4ed..0dc6321 100644 --- a/commands/sync-component.js +++ b/commands/sync-component.js @@ -66,8 +66,6 @@ exports.parse = parse; const defaultOptions = (yargs) => { return yargs //standard options - .option('debug', { type: 'boolean', default: true, describe: 'debug messages' }) - .option('verbose', { type: 'boolean', default: true, describe: 'even more debug messages' }) .option('alt', { type: 'boolean', default: false, describe: 'alt token (%)' }) //discourse .option('yaml', { type: 'boolean', default: false, describe: 'Parse options from YAML header' }) @@ -115,11 +113,12 @@ const register = (cli) => { if (!options) { return; } + index_1.logger.setSettings({ minLevel: argv.logLevel }); // options.debug && logger.debug(`CLI Args In`, argv) - // logger.debug('Options', options) + index_1.logger.debug('Options', options); let ret = (0, component_1.syncComponent)(options); return ret; }); }; exports.register = register; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy1jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29tbWFuZHMvc3luYy1jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQTRCO0FBRzVCLGlFQUFxRTtBQUNyRSx1REFBZ0U7QUFFaEUsa0RBQXNEO0FBRXRELDBEQUEyRTtBQUUzRSxrQ0FBa0M7QUFFbEMsb0NBQWlDO0FBQ2pDLHFEQUFxRDtBQUNyRCwyREFBdUQ7QUFDdkQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBRTlCLE1BQU0sS0FBSyxHQUFHLENBQUMsSUFBUyxFQUFtQyxFQUFFO0lBRWhFLElBQUksR0FBRyxHQUFRO1FBQ1gsR0FBRyxJQUFJO0tBQ1YsQ0FBQTtJQUVELElBQUksT0FBTyxDQUFBO0lBQ1gsSUFBSSxTQUFTLEdBQUcsRUFBRSxDQUFBO0lBRWxCLEdBQUcsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQTtJQUVsQixHQUFHLENBQUMsTUFBTSxHQUFHLElBQUEsWUFBTyxFQUFDLElBQUEsK0JBQWEsRUFBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNuRSxHQUFHLENBQUMsSUFBSSxHQUFHLElBQUEsWUFBTyxFQUFDLElBQUEsK0JBQWEsRUFBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUMvRCxHQUFHLENBQUMsWUFBWSxHQUFHLElBQUEsWUFBTyxFQUFDLElBQUEsK0JBQWEsRUFBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUUvRSxJQUFJLEdBQUcsQ0FBQyxHQUFHLEVBQUU7UUFFVCxHQUFHLENBQUMsR0FBRyxHQUFHLElBQUEsWUFBTyxFQUFDLEdB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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy1jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29tbWFuZHMvc3luYy1jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQTRCO0FBRzVCLGlFQUFxRTtBQUNyRSx1REFBZ0U7QUFFaEUsa0RBQXNEO0FBRXRELDBEQUEyRTtBQUUzRSxrQ0FBa0M7QUFFbEMsb0NBQWlDO0FBQ2pDLHFEQUFxRDtBQUNyRCwyREFBdUQ7QUFDdkQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBRTlCLE1BQU0sS0FBSyxHQUFHLENBQUMsSUFBUyxFQUFtQyxFQUFFO0lBRWhFLElBQUksR0FBRyxHQUFRO1FBQ1gsR0FBRyxJQUFJO0tBQ1YsQ0FBQTtJQUVELElBQUksT0FBTyxDQUFBO0lBQ1gsSUFBSSxTQUFTLEdBQUcsRUFBRSxDQUFBO0lBRWxCLEdBQUcsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQTtJQUVsQixHQUFHLENBQUMsTUFBTSxHQUFHLElBQUEsWUFBTyxFQUFDLElBQUEsK0JBQWEsRUFBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNuRSxHQUFHLENBQUMsSUFBSSxHQUFHLElBQUEsWUFBTyxFQUFDLElBQUEsK0JBQWEsRUFBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUMvRCxHQUFHLENBQUMsWUFBWSxHQUFHLElBQUEsWUFBTyxFQUFDLElBQUEsK0JBQWEsRUFBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUUvRSxJQUFJLEdBQUcsQ0FBQyxHQUFHLEVBQUU7UUFFVCxHQUFHLENBQUMsR0FBRyxHQUFHLElBQUEsWUFBTyxFQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQTtRQUM5QyxpRUFBaUU7UUFDakUsc0VBQXNFO1FBQ3RFLE1BQU0sU0FBUyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDbkMsTUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBRW5FLHFCQUFxQjtRQUNyQixJQUFJLElBQUEsYUFBTSxFQUFDLElBQUksQ0FBQyxJQUFJLElBQUEsV0FBTSxFQUFDLElBQUksQ0FBQyxFQUFFO1lBQzlCLEdBQUcsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFBO1NBQ2pCO1FBQ0QsTUFBTSxHQUFHLEdBQUcsSUFBQSxZQUFPLEVBQUMsSUFBQSwrQkFBYSxFQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxDQUFBO1FBQy9ELE9BQU8sR0FBRyxJQUFBLDBCQUFRLEVBQUMsR0FBRyxDQUFDLENBQUE7UUFFdkIsc0JBQXNCO1FBQ3RCLElBQUksT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDbEQsR0FBRyxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUE7WUFDckIsS0FBSyxNQUFNLEdBQUcsSUFBSSxPQUFPLEVBQUU7Z0JBQ3ZCLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsRUFBRTtvQkFDcEQsU0FBUyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQzFDO2FBQ0o7U0FDSjthQUFNO1lBQ0gsR0FBRyxDQUFDLEdBQUcsR0FBRyxJQUFBLFlBQU8sRUFBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUE7U0FDakQ7S0FDSjtJQUVELElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRTtRQUNWLEdBQUcsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakMsSUFBSSxDQUFDLElBQUEsYUFBTSxFQUFDLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDcEIsY0FBTSxDQUFDLEtBQUssQ0FBQyw2QkFBNkIsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUE7U0FDeEQ7S0FDSjtTQUFNO1FBQ0gsR0FBRyxDQUFDLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUE7S0FDMUI7SUFFRCxHQUFHLEdBQUc7UUFDRixHQUFHLEdBQUc7UUFDTixTQUFTO1FBQ1QsT0FBTztLQUNWLENBQUE7SUFFRCxPQUFPLEdBQUcsQ0FBQTtBQUNkLENBQUMsQ0FBQTtBQTNEWSxRQUFBLEtBQUssU0EyRGpCO0FBRUQsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUN2QyxPQUFPLEtBQUs7UUFFUixrQkFBa0I7U0FDakIsTUFBTSxDQUFDLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsZUFBZSxFQUFFLENBQUM7UUFDOUUsV0FBVztTQUNWLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLGdDQUFnQyxFQUFFLENBQUM7U0FDL0YsTUFBTSxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsZUFBZSxFQUFFLENBQUM7U0FDN0UsTUFBTSxDQUFDLGFBQWEsRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsa0NBQWtDLEVBQUUsQ0FBQztTQUN2RyxNQUFNLENBQUMsY0FBYyxFQUFFLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxtQ0FBbUMsRUFBRSxDQUFDO1NBQ3pHLE1BQU0sQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxDQUFDO1NBQzNFLE1BQU0sQ0FBQyxLQUFLLEVBQUUsRUFBRSxPQUFPLEVBQUUsb0JBQVEsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLENBQUM7U0FDcEQsTUFBTSxDQUFDLFdBQVcsRUFBRSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDO1NBQzVELE1BQU0sQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxnQ0FBb0IsRUFBRSxDQUFDO1NBQ2xFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxDQUFDO1FBRWpFLE1BQU07U0FDTCxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ1gsT0FBTyxFQUFFLG1EQUFtRDtRQUM1RCxJQUFJLEVBQUUsUUFBUTtRQUNkLFFBQVEsRUFBRSxxRUFBcUU7S0FDbEYsQ0FBQztTQUNELE1BQU0sQ0FBQyxNQUFNLEVBQUU7UUFDWixPQUFPLEVBQUUsaUVBQWlFO1FBQzFFLElBQUksRUFBRSxRQUFRO1FBQ2QsUUFBUSxFQUFFLHFFQUFxRTtLQUNsRixDQUFDO1NBQ0QsTUFBTSxDQUFDLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDO1NBQ25ELE1BQU0sQ0FBQyxTQUFTLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSwrQ0FBK0MsRUFBRSxDQUFDO1NBQy9GLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztTQUNuRCxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsK0NBQStDLEVBQUUsQ0FBQztTQUM5RixNQUFNLENBQUMsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUM7U0FDdEQsTUFBTSxDQUFDLFNBQVMsRUFBRSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLENBQUM7U0FDckUsTUFBTSxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDO1NBQzFELE1BQU0sQ0FBQyxjQUFjLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxDQUFDO1NBQy9FLE1BQU0sQ0FBQyxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQztTQUN6RCxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQztTQUNuRSxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsMkJBQVksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1NBQzdFLE1BQU0sQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztTQUNuRCxNQUFNLENBQUMsU0FBUyxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxxQ0FBcUMsRUFBRSxDQUFDLENBQUE7QUFDdEgsQ0FBQyxDQUFBO0FBRUQsSUFBSSxPQUFPLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtBQUVqRCxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQWEsRUFBRSxFQUFFO0lBQ3RDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxvQkFBb0IsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQW1CLEVBQUUsRUFBRTtRQUM5RixJQUFBLGVBQVEsR0FBRSxDQUFBO1FBQ1YsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQUUsT0FBTTtTQUFFO1FBQ3pCLElBQUksT0FBTyxHQUFHLElBQUEsYUFBSyxFQUFDLElBQVcsQ0FBMEIsQ0FBQTtRQUN6RCxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1YsT0FBTTtTQUNUO1FBQ0QsY0FBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBZSxFQUFFLENBQUMsQ0FBQTtRQUN0RCxxREFBcUQ7UUFDckQsY0FBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDaEMsSUFBSSxHQUFHLEdBQUcsSUFBQSx5QkFBYSxFQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ2hDLE9BQU8sR0FBRyxDQUFBO0lBQ2QsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUE7QUFkWSxRQUFBLFFBQVEsWUFjcEIifQ== \ No newline at end of file diff --git a/commands/sync-file.d.ts b/commands/sync-file.d.ts index a6168a9..443f33e 100644 --- a/commands/sync-file.d.ts +++ b/commands/sync-file.d.ts @@ -1,42 +1,2 @@ import * as CLI from 'yargs'; -export declare const register: (cli: CLI.Argv) => CLI.Argv & { - config: string; -} & { - env: string; -} & { - profile: string; -} & { - format: string; -} & { - root: string; -} & { - cwd: string; -} & { - cache: boolean; -} & { - env_key: string; -}>; +export declare const register: (cli: CLI.Argv) => CLI.Argv<{}>; diff --git a/lib/discourse/cache.js b/lib/discourse/cache.js index 997350c..e909286 100644 --- a/lib/discourse/cache.js +++ b/lib/discourse/cache.js @@ -90,6 +90,9 @@ const cacheUsers = async (options, discourse) => { const osr_cache = (0, osr_cli_commons_1.OSR_CACHE)(); const uPath = path.resolve((0, fs_1.resolve)(constants_1.DISCOURSE_USER_CACHE)); const cached = (0, exists_1.sync)(uPath) ? await (0, lib_1.get_cached)(uPath, {}, constants_2.MODULE_NAME) : null; + if (osr_cache && options.cache !== false && (0, exists_1.sync)(uPath)) { + return (0, read_1.sync)(uPath, 'json'); + } if (osr_cache && cached && options.cache !== false) { return JSON.parse(cached); } @@ -116,4 +119,4 @@ const cacheTags = async (options, discourse) => { return tags; }; exports.cacheTags = cacheTags; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2Rpc2NvdXJzZS9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx1Q0FBOEM7QUFDOUMsOENBQWtEO0FBQ2xELGtEQUFzRDtBQUN0RCxnREFBb0Q7QUFDcEQsdURBQXdEO0FBcUJ4RCxzREFRK0I7QUFLL0IsNkJBQTRCO0FBTzVCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUN6QyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7QUFFekIsTUFBTSxZQUFZLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUEsV0FBSSxFQUFDLElBQUksRUFBRSxRQUFRLENBQVcsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQW5GLFFBQUEsWUFBWSxnQkFBdUU7QUFFaEcsbURBQWtFO0FBQ2xFLGlFQUF1RDtBQUl2RCwrQ0FFd0I7QUFHakIsTUFBTSxlQUFlLEdBQUcsS0FBSyxFQUFFLE9BQVksRUFBRSxTQUFxQixFQUFFLEVBQUU7SUFFekUsTUFBTSxTQUFTLEdBQUcsSUFBQSwyQkFBUyxHQUFFLENBQUE7SUFFN0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFBLFlBQU8sRUFBQyxvQ0FBd0IsQ0FBQyxDQUFDLENBQUE7SUFFN0QsTUFBTSxNQUFNLEdBQUcsSUFBQSxhQUFNLEVBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sSUFBQSxnQkFBVSxFQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsdUJBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUE7SUFFOUUsSUFBSSxTQUFTLElBQUksTUFBTSxJQUFJLE9BQU8sQ0FBQyxLQUFLLEtBQUssS0FBSyxFQUFFO1FBQ2hELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENB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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2Rpc2NvdXJzZS9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx1Q0FBOEM7QUFDOUMsOENBQWtEO0FBQ2xELGtEQUFzRDtBQUN0RCxnREFBb0Q7QUFDcEQsdURBQXdEO0FBcUJ4RCxzREFRK0I7QUFLL0IsNkJBQTRCO0FBTzVCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUN6QyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7QUFFekIsTUFBTSxZQUFZLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUEsV0FBSSxFQUFDLElBQUksRUFBRSxRQUFRLENBQVcsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQW5GLFFBQUEsWUFBWSxnQkFBdUU7QUFFaEcsbURBQWtFO0FBQ2xFLGlFQUF1RDtBQUl2RCwrQ0FFd0I7QUFHakIsTUFBTSxlQUFlLEdBQUcsS0FBSyxFQUFFLE9BQVksRUFBRSxTQUFxQixFQUFFLEVBQUU7SUFFekUsTUFBTSxTQUFTLEdBQUcsSUFBQSwyQkFBUyxHQUFFLENBQUE7SUFFN0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFBLFlBQU8sRUFBQyxvQ0FBd0IsQ0FBQyxDQUFDLENBQUE7SUFFN0QsTUFBTSxNQUFNLEdBQUcsSUFBQSxhQUFNLEVBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sSUFBQSxnQkFBVSxFQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsdUJBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUE7SUFFOUUsSUFBSSxTQUFTLElBQUksTUFBTSxJQUFJLE9BQU8sQ0FBQyxLQUFLLEtBQUssS0FBSyxFQUFFO1FBQ2hELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENB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 \ No newline at end of file diff --git a/lib/discourse/index.d.ts b/lib/discourse/index.d.ts index 70a206d..a67155d 100644 --- a/lib/discourse/index.d.ts +++ b/lib/discourse/index.d.ts @@ -1,4 +1,3 @@ -import { IDiscourseConfig } from '@plastichub/osr-cli-commons/types'; export declare const logger: any; import PromisePool from 'native-promise-pool'; export declare const escape: (path: string) => string; diff --git a/lib/oa/commons.d.ts b/lib/oa/commons.d.ts index 4521133..9ad129b 100644 --- a/lib/oa/commons.d.ts +++ b/lib/oa/commons.d.ts @@ -1,4 +1,3 @@ -import { IUploadedFileMeta } from '@plastichub/osr-commons'; import { IImportUser, IOAHowto, IOACategory, IOATags, IOAHowtoImport } from '../../'; export declare const DEFAULT_HT_CATEGORY: { _modified: string; diff --git a/lib/oa/users.d.ts b/lib/oa/users.d.ts index b6b09b4..0c9a019 100644 --- a/lib/oa/users.d.ts +++ b/lib/oa/users.d.ts @@ -7,7 +7,7 @@ export declare const filter_email_only: (users: any[]) => any[]; export declare const filter_invalid: (users: any[]) => any[]; export declare const filter_email_missing: (users: any[]) => any[]; export declare const filter_accepted: (users: IImportUser[]) => IImportUser[]; -export declare const oa_user_email: (user: I_OSR_USER) => string | false; +export declare const oa_user_email: (user: I_OSR_USER) => any; export declare const get_user_name: (user: IImportUser) => string; export declare const get_user_display_name: (user: IImportUser) => string; export declare const getDataPath: (_path?: string) => string; diff --git a/lib/sync/component.js b/lib/sync/component.js index 13570e2..4927663 100644 --- a/lib/sync/component.js +++ b/lib/sync/component.js @@ -355,6 +355,7 @@ try { }); } //components = [components[0]] + index_1.logger.info(`Syncing ${components.length} components`, components); await bluebird_1.Promise.resolve(components).map((f) => { try { return syncFile(f, options); @@ -369,4 +370,4 @@ const sync = async (options) => { return (0, exports.syncComponent)(options); }; exports.sync = sync; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/lib/sync/component.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/lib/sync/component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/sync/index.d.ts b/lib/sync/index.d.ts index 05bc6d9..893cda8 100644 --- a/lib/sync/index.d.ts +++ b/lib/sync/index.d.ts @@ -1,5 +1,4 @@ import { IOptionsSync } from '../../types'; -import { IComponentConfig } from '@plastichub/osr-commons'; export declare const trackingPath: (root: any) => string; export declare const tracking: (root: any) => import("@plastichub/fs/interfaces").ReadWriteDataType; export declare const defaultConfig: (configFile: string, options: IOptionsSync) => IComponentConfig; diff --git a/lib/sync/osrl.js b/lib/sync/osrl.js index 3f08f05..83b3294 100644 --- a/lib/sync/osrl.js +++ b/lib/sync/osrl.js @@ -8,13 +8,11 @@ const glob_1 = require("@plastichub/osr-cli-commons/glob"); const fs_1 = require("@plastichub/osr-cli-commons/fs"); const index_1 = require("../../index"); const git_1 = require("../git"); +const moment = require("moment"); const read_1 = require("@plastichub/fs/read"); -const chokidar = require("chokidar"); const fileAsBuffer = (path) => (0, read_1.sync)(path, 'buffer') || Buffer.from("-"); exports.fileAsBuffer = fileAsBuffer; -const moment = require("moment"); const variable_extras = async (component, rel, options) => { - const parts = path.parse(component); const root = path.resolve((0, fs_1.resolve)('${OSR_LIBRARY_MACHINES}')); const gitStats = await (0, git_1.git_status)(root, rel); const latest = gitStats.latest; @@ -40,14 +38,13 @@ const createContent = async (component, _options) => { }; const defaults = { language: _options.language, - //debug: _options.debug, debug: false, profile: _options.profile, // output: output, plugins: [], env: _options.env || 'forum', cwd: _options.cwd, - source: _options.source, + source: _options.src, variables }; const options = (0, options_1.parse)(defaults, defaults); @@ -71,9 +68,8 @@ const createContent = async (component, _options) => { let content = await Engine.render(options.source, { ...options.variables, ...extras - // ...options.profile.variables }); return content; }; exports.createContent = createContent; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3NybC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvc3luYy9vc3JsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUU1QixvREFBMEQ7QUFDMUQsc0RBQWdEO0FBRWhELDJEQUF5RjtBQUV6Rix1REFBd0Q7QUFHeEQsdUNBQW9DO0FBQ3BDLGdDQUFtQztBQUduQyw4Q0FBa0Q7QUFTbEQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFBO0FBRTdCLE1BQU0sWUFBWSxHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxJQUFBLFdBQUksRUFBQyxJQUFJLEVBQUUsUUFBUSxDQUFXLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUFuRixRQUFBLFlBQVksZ0JBQXVFO0FBTWhHLGlDQUFnQztBQUVoQyxNQUFNLGVBQWUsR0FBRyxLQUFLLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxPQUE4QixFQUFFLEVBQUU7SUFFN0UsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNuQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUEsWUFBTyxFQUFDLHlCQUF5QixDQUFDLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUEsZ0JBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDNUMsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQTtJQUM5QixPQUFPO1FBQ0gsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQztRQUMvQyxZQUFZLEVBQUcsTUFBTSxDQUFDLFdBQVc7UUFDakMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxPQUFPO1FBQzdCLFlBQVksRUFBRyxNQUFNLENBQUMsSUFBSTtLQUM3QixDQUFBO0FBQ0wsQ0FBQyxDQUFBO0FBRU0sTUFBTSxhQUFhLEdBQUcsS0FBSyxFQUFFLFNBQVMsRUFBRSxRQUErQixFQUFFLEVBQUU7SUFFOUUsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUVuQyxNQUFNLEdBQUcsR0FBRyxJQUFBLG9CQUFhLEVBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFFbEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxlQUFlLENBQUMsU0FBUyxFQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFNBQVMsR0FBRztRQUNkLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSTtRQUNuQixHQUFHLEVBQUUsUUFBUSxDQUFDLEdBQUc7UUFDakIsR0FBRyxRQUFRLENBQUMsU0FBUztRQUNyQixPQUFPLEVBQUUsR0FBRztRQUNaLFdBQVcsRUFBRSxHQUFHO1FBQ2hCLGVBQWUsRUFBRSxHQUFHO1FBQ3BCLEdBQUcsTUFBTTtLQUNaLENBQUE7SUFHRCxNQUFNLFFBQVEsR0FBUTtRQUNsQixRQUFRLEVBQUUsUUFBUSxDQUFDLFFBQVE7UUFDM0Isd0JBQXdCO1FBQ3hCLEtBQUssRUFBRSxLQUFLO1FBQ1osT0FBTyxFQUFFLFFBQVEsQ0FBQyxPQUFPO1FBQzdCLHFCQUFxQjtRQUNqQixPQUFPLEVBQUUsRUFBRTtRQUNYLEdBQUcsRUFBRSxRQUFRLENBQUMsR0FBRyxJQUFJLE9BQU87UUFDNUIsR0FBRyxFQUFFLFFBQVEsQ0FBQyxHQUFHO1FBQ2pCLE1BQU0sRUFBRSxRQUFRLENBQUMsTUFBTTtRQUN2QixTQUFTO0tBQ1osQ0FBQztJQUdGLE1BQU0sT0FBTyxHQUFHLElBQUEsZUFBSyxFQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUMxQyxNQUFNLFFBQVEsR0FBRztRQUNiLEdBQUcsT0FBTztRQUNWLElBQUksRUFBRTtZQUNGLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxRQUFRO1lBQzNCLFNBQVM7U0FDWjtRQUNELE1BQU0sRUFBRSxLQUFLO1FBQ2IsS0FBSyxFQUFFLEtBQUs7UUFDWixjQUFjLEVBQUUsSUFBSTtRQUNwQixZQUFZLEVBQUUsS0FBSztRQUNuQixXQUFXLEVBQUUsS0FBSztRQUNsQixlQUFlLEVBQUUsS0FBSztRQUN0QixjQUFjLEVBQUUsS0FBSztRQUNyQixNQUFNLEVBQUUsS0FBSztLQUNKLENBQUM7SUFFZCxNQUFNLE1BQU0sR0FBRyxJQUFJLGVBQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUVwQyxPQUFPLENBQUMsS0FBSyxJQUFJLGNBQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxHQUFHLFNBQVMsRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUVuRSxJQUFJLE9BQU8sR0FBRyxNQUFNLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRTtRQUM5QyxHQUFHLE9BQU8sQ0FBQyxTQUFTO1FBQ3BCLEdBQUcsTUFBTTtRQUNYLGlDQUFpQztLQUNsQyxDQUFDLENBQUE7SUFFRixPQUFPLE9BQU8sQ0FBQTtBQUNsQixDQUFDLENBQUE7QUE1RFksUUFBQSxhQUFhLGlCQTREekIifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3NybC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvc3luYy9vc3JsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE0QjtBQUU1QixvREFBMEQ7QUFDMUQsc0RBQWdEO0FBRWhELDJEQUFnRTtBQUVoRSx1REFBd0Q7QUFHeEQsdUNBQW9DO0FBQ3BDLGdDQUFtQztBQUNuQyxpQ0FBZ0M7QUFDaEMsOENBQWtEO0FBRTNDLE1BQU0sWUFBWSxHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxJQUFBLFdBQUksRUFBQyxJQUFJLEVBQUUsUUFBUSxDQUFXLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUFuRixRQUFBLFlBQVksZ0JBQXVFO0FBQ2hHLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLE9BQThCLEVBQUUsRUFBRTtJQUM3RSxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUEsWUFBTyxFQUFDLHlCQUF5QixDQUFDLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUEsZ0JBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDNUMsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQTtJQUM5QixPQUFPO1FBQ0gsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQztRQUMvQyxZQUFZLEVBQUcsTUFBTSxDQUFDLFdBQVc7UUFDakMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxPQUFPO1FBQzdCLFlBQVksRUFBRyxNQUFNLENBQUMsSUFBSTtLQUM3QixDQUFBO0FBQ0wsQ0FBQyxDQUFBO0FBRU0sTUFBTSxhQUFhLEdBQUcsS0FBSyxFQUFFLFNBQVMsRUFBRSxRQUErQixFQUFFLEVBQUU7SUFFOUUsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUNuQyxNQUFNLEdBQUcsR0FBRyxJQUFBLG9CQUFhLEVBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFDbEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxlQUFlLENBQUMsU0FBUyxFQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFNBQVMsR0FBRztRQUNkLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSTtRQUNuQixHQUFHLEVBQUUsUUFBUSxDQUFDLEdBQUc7UUFDakIsR0FBRyxRQUFRLENBQUMsU0FBUztRQUNyQixPQUFPLEVBQUUsR0FBRztRQUNaLFdBQVcsRUFBRSxHQUFHO1FBQ2hCLGVBQWUsRUFBRSxHQUFHO1FBQ3BCLEdBQUcsTUFBTTtLQUNaLENBQUE7SUFDRCxNQUFNLFFBQVEsR0FBUTtRQUNsQixRQUFRLEVBQUUsUUFBUSxDQUFDLFFBQVE7UUFDM0IsS0FBSyxFQUFFLEtBQUs7UUFDWixPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU87UUFDN0IscUJBQXFCO1FBQ2pCLE9BQU8sRUFBRSxFQUFFO1FBQ1gsR0FBRyxFQUFFLFFBQVEsQ0FBQyxHQUFHLElBQUksT0FBTztRQUM1QixHQUFHLEVBQUUsUUFBUSxDQUFDLEdBQUc7UUFDakIsTUFBTSxFQUFFLFFBQVEsQ0FBQyxHQUFHO1FBQ3BCLFNBQVM7S0FDWixDQUFBO0lBQ0QsTUFBTSxPQUFPLEdBQUcsSUFBQSxlQUFLLEVBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQzFDLE1BQU0sUUFBUSxHQUFHO1FBQ2IsR0FBRyxPQUFPO1FBQ1YsSUFBSSxFQUFFO1lBQ0YsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVE7WUFDM0IsU0FBUztTQUNaO1FBQ0QsTUFBTSxFQUFFLEtBQUs7UUFDYixLQUFLLEVBQUUsS0FBSztRQUNaLGNBQWMsRUFBRSxJQUFJO1FBQ3BCLFlBQVksRUFBRSxLQUFLO1FBQ25CLFdBQVcsRUFBRSxLQUFLO1FBQ2xCLGVBQWUsRUFBRSxLQUFLO1FBQ3RCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLE1BQU0sRUFBRSxLQUFLO0tBQ0osQ0FBQTtJQUViLE1BQU0sTUFBTSxHQUFHLElBQUksZUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRXBDLE9BQU8sQ0FBQyxLQUFLLElBQUksY0FBTSxDQUFDLElBQUksQ0FBQyxlQUFlLEdBQUcsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFBO0lBRW5FLElBQUksT0FBTyxHQUFHLE1BQU0sTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFO1FBQzlDLEdBQUcsT0FBTyxDQUFDLFNBQVM7UUFDcEIsR0FBRyxNQUFNO0tBQ1osQ0FBQyxDQUFBO0lBQ0YsT0FBTyxPQUFPLENBQUE7QUFDbEIsQ0FBQyxDQUFBO0FBbkRZLFFBQUEsYUFBYSxpQkFtRHpCIn0= \ No newline at end of file diff --git a/main.js b/main.js index 3c0da9a..0d4817f 100644 --- a/main.js +++ b/main.js @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/env node "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0'; diff --git a/package-lock.json b/package-lock.json index d300b5d..99be53f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,9 @@ "dependencies": { "@iarna/toml": "^2.2.5", "@plastichub/core": "^0.2.5", - "@plastichub/fs": "^0.13.32", - "@plastichub/osr-cache": "^0.4.1", - "@plastichub/osr-cli-commons": "^0.4.9", + "@plastichub/fs": "^0.13.39", + "@plastichub/osr-cache": "^0.4.7", + "@plastichub/osr-cli-commons": "^0.5.1", "@plastichub/osr-commons": "^0.3.3", "@plastichub/osr-fs-utils": "^0.1.4", "@plastichub/osrl": "file:../osrl", @@ -104,7 +104,6 @@ "@plastichub/osr-ai": "file:../osr-ai", "@plastichub/osr-cache": "^0.3.9", "@plastichub/osr-cli-commons": "file:../osr-cli-commons", - "@plastichub/osr-discourse": "^0.1.4", "@plastichub/osr-i18n": "file:../osr-i18n", "@plastichub/osr-tasks": "file:../osr-tasks", "@plastichub/osr-vcs": "^0.0.3", @@ -136,6 +135,12 @@ "glob-base": "^0.3.0", "googleapis": "^105.0.0", "gray-matter": "^4.0.3", + "grunt": "^1.6.1", + "grunt-cli": "^1.4.3", + "grunt-contrib-clean": "^2.0.0", + "grunt-extend-config": "^0.9.7", + "grunt-parallel": "^0.5.1", + "grunt-shell": "^3.0.1", "highlight.js": "^11.1.0", "inquirer": "^8.1.2", "is-glob": "^4.0.1", @@ -154,9 +159,9 @@ "lodash": "^4.17.21", "markdown-table": "^3.0.3", "moment": "^2.29.1", - "mysql2": "^2.3.3", "native-promise-pool": "^3.19.0", - "nodemw": "^0.14.0", + "node-xlsx": "^0.24.0", + "npm-run-all": "^4.1.5", "open-graph-scraper": "^5.0.5", "ora": "^1.3.0", "parse-glob": "^3.0.4", @@ -164,9 +169,12 @@ "query-string": "^7.1.3", "readline": "^1.3.0", "require-like": "^0.1.2", - "sharp": "^0.30.3", - "showdown": "^1.9.1", + "rotating-file-stream": "^3.2.3", + "sharp": "^0.33.4", + "showdown": "^2.1.0", + "turndown": "^7.2.0", "typescript": "^4.9.4", + "uri-js": "^4.4.1", "yaml": "^2.4.2", "yargs": "^14.2.3", "yargs-parser": "^15.0.3" @@ -176,6 +184,9 @@ }, "engines": { "node": ">= 8.0.0" + }, + "optionalDependencies": { + "@img/sharp-win32-x64": "^0.33.4" } }, "node_modules/@gar/promisify": { @@ -424,6 +435,7 @@ "version": "0.13.39", "resolved": "https://registry.npmjs.org/@plastichub/fs/-/fs-0.13.39.tgz", "integrity": "sha512-Q96zN5LAlTmtj6gIbHbVM0erp2NgP+P4izRzdhqnMz/WopAvD7ZJxjQ/J44e67R6WKQuvcxt/eXPNaFBB5ehlg==", + "license": "BSD-3-Clause", "dependencies": { "@plastichub/core": "^0.2.1", "@types/denodeify": "^1.2.31", @@ -493,23 +505,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@plastichub/fs/node_modules/jackspeak": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz", - "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/@plastichub/fs/node_modules/minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", @@ -518,42 +513,20 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/@plastichub/fs/node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/@plastichub/osr-cache": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/@plastichub/osr-cache/-/osr-cache-0.4.6.tgz", - "integrity": "sha512-/uS7wMGM2WyCXaRcS1o9OBVYVpZYxRqUFtUdhs2QI3qOpRnkYXSqEJdTmWvcb1bM4V/7KlCVvAb1sMYfoDsQig==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/@plastichub/osr-cache/-/osr-cache-0.4.7.tgz", + "integrity": "sha512-uSuU+4xefo0+mX+Nft0QP4UZsp1y3afwGPOvcuRDusiMB+ShnVybUJs3T15M3JEuWSG32fViQfZnexVNiSCLLg==", + "license": "BSD-3-Clause", "dependencies": { "@plastichub/core": "^0.2.6", "@plastichub/fs": "^0.13.32", - "@plastichub/osr-cli-commons": "^0.4.7", - "@types/cacache": "^15.0.1", - "@types/node": "^14.17.5", - "@types/yargs": "^17.0.2", - "cacache": "^17.0.3", - "chalk": "^2.4.1", - "convert-units": "^2.3.4", - "env-var": "^7.0.1", + "@plastichub/osr-cli-commons": "^0.5.1", + "@types/node": "^20.14.9", + "@types/yargs": "^17.0.32", + "cacache": "^18.0.3", "md5": "^2.3.0", - "typescript": "^4.3.5", - "yargs": "^14.2.3", - "yargs-parser": "^15.0.3" + "yargs": "^17.7.2" }, "bin": { "osr-cache": "main.js" @@ -563,9 +536,10 @@ } }, "node_modules/@plastichub/osr-cache/node_modules/@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "license": "ISC", "dependencies": { "semver": "^7.3.5" }, @@ -573,33 +547,36 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@plastichub/osr-cache/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "engines": { - "node": ">=6" + "node_modules/@plastichub/osr-cache/node_modules/@types/node": { + "version": "20.16.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", + "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" } }, "node_modules/@plastichub/osr-cache/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "node_modules/@plastichub/osr-cache/node_modules/cacache": { - "version": "17.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz", - "integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==", + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "license": "ISC", "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-collect": "^1.0.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", @@ -608,91 +585,52 @@ "unique-filename": "^3.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@plastichub/osr-cache/node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/@plastichub/osr-cache/node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "node_modules/@plastichub/osr-cache/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@plastichub/osr-cache/node_modules/fs-minipass": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz", - "integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "license": "ISC", "dependencies": { - "minipass": "^5.0.0" + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@plastichub/osr-cache/node_modules/glob": { - "version": "10.2.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.7.tgz", - "integrity": "sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=16 || 14 >=14.17" + "glob": "dist/esm/bin.mjs" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@plastichub/osr-cache/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "engines": { - "node": ">=4" - } - }, - "node_modules/@plastichub/osr-cache/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } + "node_modules/@plastichub/osr-cache/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" }, "node_modules/@plastichub/osr-cache/node_modules/minimatch": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -704,28 +642,31 @@ } }, "node_modules/@plastichub/osr-cache/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/@plastichub/osr-cache/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "node_modules/@plastichub/osr-cache/node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "license": "ISC", "dependencies": { - "p-limit": "^2.0.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">=6" + "node": ">=16 || 14 >=14.17" } }, "node_modules/@plastichub/osr-cache/node_modules/p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -737,12 +678,10 @@ } }, "node_modules/@plastichub/osr-cache/node_modules/semver": { - "version": "7.5.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz", - "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==", - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -750,56 +689,23 @@ "node": ">=10" } }, - "node_modules/@plastichub/osr-cache/node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@plastichub/osr-cache/node_modules/ssri": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz", - "integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", "dependencies": { - "minipass": "^5.0.0" + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@plastichub/osr-cache/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@plastichub/osr-cache/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@plastichub/osr-cache/node_modules/unique-filename": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "license": "ISC", "dependencies": { "unique-slug": "^4.0.0" }, @@ -811,6 +717,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4" }, @@ -818,62 +725,18 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@plastichub/osr-cache/node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@plastichub/osr-cache/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" - }, - "node_modules/@plastichub/osr-cache/node_modules/yargs": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", - "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", - "dependencies": { - "cliui": "^5.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^15.0.1" - } - }, - "node_modules/@plastichub/osr-cache/node_modules/yargs-parser": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz", - "integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==", - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, "node_modules/@plastichub/osr-cli-commons": { - "version": "0.4.9", - "resolved": "https://registry.npmjs.org/@plastichub/osr-cli-commons/-/osr-cli-commons-0.4.9.tgz", - "integrity": "sha512-/cVXEqMp1T4n8njCnzzSqchTdSyPmzcqiucjCiR8Jc27uvzNAtTE+8pOxnmyibUqjkKijFV2CoJ2jVGguthAyA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@plastichub/osr-cli-commons/-/osr-cli-commons-0.5.1.tgz", + "integrity": "sha512-qEhCgnLsQ5xHivRL1/lfWGb7sBZSKYnjhvN9bdh8bA/qvIHbUa4azoFbC+wKMX6DxMZNlnzRUqH3fQvTQ8kkoQ==", + "license": "BSD-3-Clause", "dependencies": { "@plastichub/core": "^0.2.6", "@plastichub/fs": "^0.13.32", "@plastichub/osr-commons": "^0.3.3", "@types/cacache": "^15.0.1", - "@types/node": "^14.17.5", - "@types/which": "^3.0.3", + "@types/node": "^20.14.9", + "@types/which": "^3.0.4", "@types/yargs": "^17.0.2", "bluebird": "^3.7.2", "cacache": "^16.1.2", @@ -898,6 +761,15 @@ "node": ">= 14.0.0" } }, + "node_modules/@plastichub/osr-cli-commons/node_modules/@types/node": { + "version": "20.16.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", + "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, "node_modules/@plastichub/osr-cli-commons/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -936,23 +808,6 @@ "node": ">=16" } }, - "node_modules/@plastichub/osr-cli-commons/node_modules/jackspeak": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz", - "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/@plastichub/osr-cli-commons/node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", @@ -993,6 +848,7 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/@plastichub/osr-commons/-/osr-commons-0.3.3.tgz", "integrity": "sha512-NW2XBeeD7AdFh5HkKOGDEMxJf6E8rS8cr8LdaY8JfM1DDae+VeX+H2wOMsSY8dgJy0VYU9ci21yuGWbEWHjGVA==", + "license": "BSD-3-Clause", "dependencies": { "@plastichub/core": "^0.2.1", "@plastichub/fs": "^0.13.32", @@ -1038,6 +894,119 @@ "node": ">= 18.0.0" } }, + "node_modules/@plastichub/osr-fs-utils/node_modules/@plastichub/osr-cli-commons": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@plastichub/osr-cli-commons/-/osr-cli-commons-0.4.9.tgz", + "integrity": "sha512-/cVXEqMp1T4n8njCnzzSqchTdSyPmzcqiucjCiR8Jc27uvzNAtTE+8pOxnmyibUqjkKijFV2CoJ2jVGguthAyA==", + "license": "BSD-3-Clause", + "dependencies": { + "@plastichub/core": "^0.2.6", + "@plastichub/fs": "^0.13.32", + "@plastichub/osr-commons": "^0.3.3", + "@types/cacache": "^15.0.1", + "@types/node": "^14.17.5", + "@types/which": "^3.0.3", + "@types/yargs": "^17.0.2", + "bluebird": "^3.7.2", + "cacache": "^16.1.2", + "chalk": "^2.4.1", + "convert-units": "^2.3.4", + "cryptr": "^6.0.3", + "env-var": "^7.1.1", + "fast-glob": "^3.2.11", + "glob": "^10.4.1", + "glob-base": "github:justin-caribou/glob-base", + "is-glob": "^4.0.3", + "parse-glob": "^3.0.4", + "rage-edit": "^1.2.0", + "typescript": "^4.3.5", + "which": "^4.0.0", + "yargs": "^17.5.1" + }, + "bin": { + "osr-cli": "main.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@plastichub/osr-fs-utils/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@plastichub/osr-fs-utils/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@plastichub/osr-fs-utils/node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "license": "ISC", + "engines": { + "node": ">=16" + } + }, + "node_modules/@plastichub/osr-fs-utils/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@plastichub/osr-fs-utils/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@plastichub/osr-fs-utils/node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "license": "ISC", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } + }, "node_modules/@plastichub/osrl": { "resolved": "../osrl", "link": true @@ -1233,9 +1202,10 @@ "integrity": "sha512-liyfuo/106JdlgSchJzXEQCVArk0CvevqPote8F8HgWgJ3dRCcTHgJIsLDuee0kxk/mhbInzIZk3QWSZJ8R+2w==" }, "node_modules/@types/yargs": { - "version": "17.0.19", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.19.tgz", - "integrity": "sha512-cAx3qamwaYX9R0fzOIZAlFpo4A+1uBVCxqpKz9D26uTF4srRXaGTTsikQmaotCtNdbhzyUH7ft6p9ktz9s6UNQ==", + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "license": "MIT", "dependencies": { "@types/yargs-parser": "*" } @@ -1728,14 +1698,6 @@ "node": ">=0.10.0" } }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "engines": { - "node": ">=6" - } - }, "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -2060,14 +2022,6 @@ } } }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/decode-uri-component": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", @@ -3441,15 +3395,13 @@ } }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, - "engines": { - "node": ">=14" - }, "funding": { "url": "https://github.com/sponsors/isaacs" }, @@ -4346,28 +4298,6 @@ "node": ">=4" } }, - "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-limit/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "engines": { - "node": ">=6" - } - }, "node_modules/p-locate": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", @@ -4484,14 +4414,6 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "engines": { - "node": ">=4" - } - }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -4856,11 +4778,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, "node_modules/responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -4974,11 +4891,6 @@ "semver": "bin/semver" } }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" - }, "node_modules/shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -5584,6 +5496,12 @@ "through": "^2.3.8" } }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "license": "MIT" + }, "node_modules/unfetch": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-5.0.0.tgz", @@ -5723,11 +5641,6 @@ "which": "bin/which" } }, - "node_modules/which-module": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", - "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==" - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -5887,9 +5800,10 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", diff --git a/package.json b/package.json index f7d3afe..567a1e7 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "dependencies": { "@iarna/toml": "^2.2.5", "@plastichub/core": "^0.2.5", - "@plastichub/fs": "^0.13.32", - "@plastichub/osr-cache": "^0.4.1", - "@plastichub/osr-cli-commons": "^0.4.9", + "@plastichub/fs": "^0.13.39", + "@plastichub/osr-cache": "^0.4.7", + "@plastichub/osr-cli-commons": "^0.5.1", "@plastichub/osr-commons": "^0.3.3", "@plastichub/osr-fs-utils": "^0.1.4", "@plastichub/osrl": "file:../osrl", diff --git a/src/commands/sync-component.ts b/src/commands/sync-component.ts index 32204c5..16b5188 100644 --- a/src/commands/sync-component.ts +++ b/src/commands/sync-component.ts @@ -80,18 +80,13 @@ const defaultOptions = (yargs: CLI.Argv) => { return yargs //standard options - .option('debug', { type: 'boolean', default: true, describe: 'debug messages' }) - .option('verbose', { type: 'boolean', default: true, describe: 'even more debug messages' }) .option('alt', { type: 'boolean', default: false, describe: 'alt token (%)' }) - //discourse .option('yaml', { type: 'boolean', default: false, describe: 'Parse options from YAML header' }) .option('skip', { type: 'boolean', default: true, describe: 'Skip existing' }) .option('uploadLocal', { type: 'boolean', default: true, describe: 'Upload local images to Discourse' }) .option('uploadRemote', { type: 'boolean', default: true, describe: 'Upload remote images to Discourse' }) - .option('title', { type: 'string', default: 'Title of the Discourse post' }) - .option('cat', { default: CAT_TEST, type: 'number' }) .option('timestamp', { type: 'number', default: Date.now() }) .option('owner', { type: 'number', default: DEFAULT_IMPORT_OWNER }) @@ -133,8 +128,9 @@ export const register = (cli: CLI.Argv) => { if (!options) { return } + logger.setSettings({ minLevel: argv.logLevel as any }) // options.debug && logger.debug(`CLI Args In`, argv) - // logger.debug('Options', options) + logger.debug('Options', options) let ret = syncComponent(options) return ret }) diff --git a/src/lib/discourse/cache.ts b/src/lib/discourse/cache.ts index a971792..c50a55a 100644 --- a/src/lib/discourse/cache.ts +++ b/src/lib/discourse/cache.ts @@ -151,6 +151,10 @@ export const cacheUsers = async (options, discourse: Discourser): Promise { try { return syncFile(f, options) diff --git a/src/lib/sync/osrl.ts b/src/lib/sync/osrl.ts index 4d8aaa0..31ebb53 100644 --- a/src/lib/sync/osrl.ts +++ b/src/lib/sync/osrl.ts @@ -3,37 +3,18 @@ import { IOptions } from '@plastichub/osrl/types' import { Engine as engine } from '@plastichub/osrl/Engine' import { parse } from '@plastichub/osrl/options' -import { files as glob, forward_slash, pathInfo } from '@plastichub/osr-cli-commons/glob' +import { forward_slash } from '@plastichub/osr-cli-commons/glob' import { resolve } from '@plastichub/osr-cli-commons/fs' import { IOptionsSyncComponent } from '../../' import { logger } from '../../index' import { git_status } from '../git' - -import { sync as exists } from '@plastichub/fs/exists' +import * as moment from 'moment' import { sync as read } from '@plastichub/fs/read' -import { sync as write } from '@plastichub/fs/write' - -import { Promise as BPromise } from 'bluebird' -import { Hash } from '@plastichub/core' -import { - MODULE_NAME -} from '../../constants' - -const chokidar = require("chokidar") export const fileAsBuffer = (path: string) => read(path, 'buffer') as Buffer || Buffer.from("-") - -import { get_cached, set_cached } from '@plastichub/osr-cache/lib' -import { OSR_CACHE } from '@plastichub/osr-cli-commons' - -import * as md5 from 'md5' -import * as moment from 'moment' - const variable_extras = async (component, rel, options: IOptionsSyncComponent) => { - - const parts = path.parse(component) const root = path.resolve(resolve('${OSR_LIBRARY_MACHINES}')) const gitStats = await git_status(root, rel) const latest = gitStats.latest @@ -48,9 +29,7 @@ const variable_extras = async (component, rel, options: IOptionsSyncComponent) = export const createContent = async (component, _options: IOptionsSyncComponent) => { const parts = path.parse(component) - const rel = forward_slash(path.relative(_options.root, component)) - const extras = await variable_extras(component,rel, _options) const variables = { root: _options.root, @@ -60,23 +39,18 @@ export const createContent = async (component, _options: IOptionsSyncComponent) product_rel: rel, product_rel_min: rel, ...extras - } - - + } const defaults: any = { language: _options.language, - //debug: _options.debug, debug: false, profile: _options.profile, // output: output, plugins: [], env: _options.env || 'forum', cwd: _options.cwd, - source: _options.source, + source: _options.src, variables - }; - - + } const options = parse(defaults, defaults); const eOptions = { ...options, @@ -92,7 +66,7 @@ export const createContent = async (component, _options: IOptionsSyncComponent) trimOutputRight: false, trimOutputLeft: false, greedy: false - } as IOptions; + } as IOptions const Engine = new engine(eOptions); @@ -101,8 +75,6 @@ export const createContent = async (component, _options: IOptionsSyncComponent) let content = await Engine.render(options.source, { ...options.variables, ...extras - // ...options.profile.variables - }) - + }) return content } diff --git a/src/types.ts b/src/types.ts index 832276e..0cdd864 100644 --- a/src/types.ts +++ b/src/types.ts @@ -127,6 +127,7 @@ export type IOptionsSync = IDiscoursePostBaseOptions & IOSRLBaseOptions & { // common options debug?: boolean verbose?: boolean + logLevel?: string skip?: boolean alt?: boolean src?: string @@ -162,8 +163,7 @@ export type IOptionsSyncComponent = IOptionsSync & { format?:string module?:string - plugins?:string - + plugins?:string onCompiled?: () => void onCompileDone?: () => void cache?: boolean diff --git a/tmp-a.json b/tmp-a.json index a3b8754..990c2a1 100644 --- a/tmp-a.json +++ b/tmp-a.json @@ -1,5 +1,5 @@ { - "PRODUCT_ROOT": "C://Users//mc007//Desktop//osr//osr-machines/extrusion/pp-v42-extruder/", + "PRODUCT_ROOT": "C://Users//mc007//Desktop//osr//osr-machines/sheetpress/100cm/", "abs_url": "https://assets.osr-plastic.org", "CACHE": "C://Users//mc007//Desktop//osr//osr-machines/cache/", "GIT_REPO": "https://git.osr-plastic.org/osr-plastic/osr-machines", @@ -7,8 +7,8 @@ "OSR_FILES_WEB": "https://files.osr-plastic.org/files/osr-machines", "OSR_DIRECTORY_ASSETS_URL": "https://assets.osr-plastic.org/directory/", "OSR_DIRECTORY_FILES_WEB": "http://files.osr-plastic.org/files/directory", - "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/extrusion/pp-v42-extruder", - "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/extrusion/pp-v42-extruder", + "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/sheetpress/100cm", + "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/sheetpress/100cm", "OSR_HOWTOS_ROOT_URL": "https://forum.osr-plastic.org/c/wiki/howtos/72", "OSR_FORUM_URL": "https://forum.osr-plastic.org", "vendor_name": "Plastic Hub", @@ -25,55 +25,57 @@ "author_link": "https://osr-plastic.org", "vendor_forum": "https://forum.osr-plastic.org", "show": { - "badges": true, + "badges": false, "authors": true, "head": true, "debug": false, "wiki": false, "forum": false, "others": false, - "howtos": true, + "howtos": false, "instagram": false, "shipping": false, "payment_terms": false, "components": true, "marketplaceLinks": true, - "meta": true, - "productDump": true, - "configDump": false + "productDump": false, + "configDump": false, + "issues": false, + "alternatives": true, + "replacedBy": true, + "meta": true }, - "forumTags": "extrusion", - "forumCategory": 51, - "Preview3d": true, - "howtoSection": "https://forum.osr-plastic.org/tags/c/kb/54/injection", - "download": "https://files.osr-plastic.org/files/osr-machines/extrusion/pp-v42-extruder", - "product_dimensions": "https://assets.osr-plastic.org/machines//extrusion/pp-v42-extruder/drawings/dimensions.jpg", - "preview": "https://assets.osr-plastic.org/machines//extrusion/pp-v42-extruder/media/latest.jpg", - "product_parts": "https://assets.osr-plastic.org/machines//extrusion/pp-v42-extruder/drawings/parts.jpg", - "edrawings": "https://assets.osr-plastic.org/machines//extrusion/pp-v42-extruder/resources/edrawings.html", - "forumUserId": 1, - "hasSpecs": false, - "slug": "pp-extruder-v42", - "category": "extrusion", - "name": "Peter Bas Schelling Extruder v4.2", - "version": "1.2", - "previousVersion": "pp-extruder-v4", + "forumCategory": 63, + "forum": "https://forum.osr-plastic.org/c/machines/sheetpress/63", + "howtoSection": "https://osr-plastic.org/howto/#sheetpress", + "edrawings:": "https://assets.osr-plastic.org/machines//sheetpress/100cmresources/edrawings.html", "showParts": false, "showDimensions": false, + "Preview3d": true, + "forumTags": "sheetpress", + "forumUserId": 1, + "howto_categories": "86", + "download": "https://files.osr-plastic.org/files/osr-machines/sheetpress/100cm", + "library": "https://osr-plastic.org/machines/sheetpress.html", + "preview": "https://assets.osr-plastic.org/machines//sheetpress/100cm/media/latest.jpg", + "product_parts": "https://assets.osr-plastic.org/machines//sheetpress/100cm/drawings/parts.jpg", + "product_dimensions": "https://assets.osr-plastic.org/machines//sheetpress/100cm/drawings/dimensions.jpg", + "slug": "sheetpress", + "category": "sheetpress", + "feature": "1m Sheets", + "code": "SPM", + "name": "Sheetpress", + "keywords": "sheetpress", "authors": [ { - "name": "PlasticHub S.L.", - "url": "https://osr-plastic.org" - }, - { - "name": "Peter Bas Schelling", - "url": "https://bazar.preciousplastic.com/pbs-machinery/" + "name": "Jason Knight", + "url": "https://www.mandin.earth/" } ], - "forumTopicId": 10128, - "forumPostId": 27553, - "forumPostHash": "2b5916abe6bffe23e81c7c4501bbfdc0", - "image": "extrusion/pp-v42-extruder/renderings/perspective.jpg", + "forumPostHash": "da522fc5546d4d7c3c86bada779d1aa4", + "forumTopicId": 10152, + "forumPostId": 27597, + "image": "sheetpress/100cm/renderings/perspective.jpg", "config": { "includes": [ "C:/Users/mc007/Desktop/osr/osr-machines/osr", @@ -82,12 +84,12 @@ "C:/Users/mc007/Desktop/osr/osr-templates/discourse", "C:/Users/mc007/Desktop/osr/osr-templates/discourse/commons", "C:/Users/mc007/Desktop/osr/osr-templates/discourse/widgets", - "C:/Users/mc007/Desktop/osr/osr-machines/extrusion/pp-v42-extruder/", - "C:/Users/mc007/Desktop/osr/osr-machines/extrusion/pp-v42-extruder//templates/site/", - "C:/Users/mc007/Desktop/osr/osr-machines/extrusion/pp-v42-extruder//templates/shared/" + "C:/Users/mc007/Desktop/osr/osr-machines/sheetpress/100cm/", + "C:/Users/mc007/Desktop/osr/osr-machines/sheetpress/100cm//templates/site/", + "C:/Users/mc007/Desktop/osr/osr-machines/sheetpress/100cm//templates/shared/" ], "variables": { - "PRODUCT_ROOT": "C:/Users/mc007/Desktop/osr/osr-machines/extrusion/pp-v42-extruder/", + "PRODUCT_ROOT": "C:/Users/mc007/Desktop/osr/osr-machines/sheetpress/100cm/", "abs_url": "https://assets.osr-plastic.org", "CACHE": "C:/Users/mc007/Desktop/osr/osr-machines/cache/", "GIT_REPO": "https://git.osr-plastic.org/osr-plastic/osr-machines", @@ -95,8 +97,8 @@ "OSR_FILES_WEB": "https://files.osr-plastic.org/files/osr-machines", "OSR_DIRECTORY_ASSETS_URL": "https://assets.osr-plastic.org/directory/", "OSR_DIRECTORY_FILES_WEB": "http://files.osr-plastic.org/files/directory", - "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/extrusion/pp-v42-extruder", - "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/extrusion/pp-v42-extruder", + "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/sheetpress/100cm", + "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/sheetpress/100cm", "OSR_HOWTOS_ROOT_URL": "https://forum.osr-plastic.org/c/wiki/howtos/72", "OSR_FORUM_URL": "https://forum.osr-plastic.org", "vendor_name": "Plastic Hub", @@ -175,7 +177,7 @@ } }, "variables": { - "PRODUCT_ROOT": "C:/Users/mc007/Desktop/osr/osr-machines/extrusion/pp-v42-extruder/", + "PRODUCT_ROOT": "C:/Users/mc007/Desktop/osr/osr-machines/sheetpress/100cm/", "abs_url": "https://assets.osr-plastic.org", "CACHE": "C:/Users/mc007/Desktop/osr/osr-machines/cache/", "GIT_REPO": "https://git.osr-plastic.org/osr-plastic/osr-machines", @@ -183,8 +185,8 @@ "OSR_FILES_WEB": "https://files.osr-plastic.org/files/osr-machines", "OSR_DIRECTORY_ASSETS_URL": "https://assets.osr-plastic.org/directory/", "OSR_DIRECTORY_FILES_WEB": "http://files.osr-plastic.org/files/directory", - "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/extrusion/pp-v42-extruder", - "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/extrusion/pp-v42-extruder", + "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/sheetpress/100cm", + "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/sheetpress/100cm", "OSR_HOWTOS_ROOT_URL": "https://forum.osr-plastic.org/c/wiki/howtos/72", "OSR_FORUM_URL": "https://forum.osr-plastic.org", "vendor_name": "Plastic Hub", @@ -222,12 +224,13 @@ "meta": true } }, - "forum_url": "https://forum.osr-plastic.org/", + "i18n": "C:/Users/mc007/Desktop/osr/i18n-store/store-en.json", "OSR_ROOT": "C://Users//mc007//Desktop//osr", "OSR_TEMP": "C://Users//mc007//AppData//Local//Temp//osr", "OA_ROOT": "C://Users//mc007//Desktop//ph3//pp-next2", "KB_ROOT": "C://Users//mc007//Desktop//osr//osr-kb-next", "OSR_CACHE": "C://Users//mc007//.osr//cache", + "OSR_LIBRARY": "C://Users//mc007//Desktop//osr//osr-machines", "OSR_LIBRARY_MACHINES": "C://Users//mc007//Desktop//osr//osr-machines", "OSR_USER_ASSETS": "C://Users//mc007//Desktop//osr//osr-user-assets", "OSR_PRIVATE": "C://Users//mc007//.osr//", @@ -252,13 +255,14 @@ "SRC_FILES": [ "C://Users//mc007//Desktop//osr/osr-templates/discourse/root.html" ], - "product": "extrusion/pp-v42-extruder", - "product_rel": "extrusion/pp-v42-extruder", - "product_rel_min": "extrusion/pp-v42-extruder", - "GIT_LAST": "Sunday, November 12, 2023 9:43 PM", + "product": "sheetpress/100cm", + "product_rel": "sheetpress/100cm", + "product_rel_min": "sheetpress/100cm", + "GIT_LAST": "Thursday, February 15, 2024 12:52 PM", "GIT_AUTHOR": "lovebird", - "GIT_MESSAGE": "init", - "GIT_COMMIT": "198a607dc46a4832fd228c2975a9de24ac49165d", + "GIT_MESSAGE": "todos | latest :)", + "GIT_COMMIT": "2bdacc5427b7d47e4d5aaf73bf0fe48fd703f2e0", "debug": false, - "env": "forum" + "env": "forum", + "forum_url": "https://forum.osr-plastic.org/" } \ No newline at end of file diff --git a/tmp.json b/tmp.json index 76e9025..8f29061 100644 --- a/tmp.json +++ b/tmp.json @@ -1,5 +1,5 @@ { - "PRODUCT_ROOT": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines/extrusion/pp-v42-extruder/", + "PRODUCT_ROOT": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines/sheetpress/100cm/", "abs_url": "https://assets.osr-plastic.org", "CACHE": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines/cache/", "GIT_REPO": "https://git.osr-plastic.org/osr-plastic/osr-machines", @@ -7,8 +7,8 @@ "OSR_FILES_WEB": "https://files.osr-plastic.org/files/osr-machines", "OSR_DIRECTORY_ASSETS_URL": "https://assets.osr-plastic.org/directory/", "OSR_DIRECTORY_FILES_WEB": "http://files.osr-plastic.org/files/directory", - "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/extrusion/pp-v42-extruder", - "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/extrusion/pp-v42-extruder", + "PRODUCTS_FILES_URL": "https://files.osr-plastic.org/files/osr-machines/sheetpress/100cm", + "PRODUCTS_ASSETS_URL": "https://assets.osr-plastic.org/machines/sheetpress/100cm", "OSR_HOWTOS_ROOT_URL": "https://forum.osr-plastic.org/c/wiki/howtos/72", "OSR_FORUM_URL": "https://forum.osr-plastic.org", "vendor_name": "Plastic Hub", @@ -25,54 +25,56 @@ "author_link": "https://osr-plastic.org", "vendor_forum": "https://forum.osr-plastic.org", "show": { - "badges": true, + "badges": false, "authors": true, "head": true, "debug": false, "wiki": false, "forum": false, "others": false, - "howtos": true, + "howtos": false, "instagram": false, "shipping": false, "payment_terms": false, "components": true, "marketplaceLinks": true, - "meta": true, - "productDump": true, - "configDump": false + "productDump": false, + "configDump": false, + "issues": false, + "alternatives": true, + "replacedBy": true, + "meta": true }, - "forumTags": "extrusion", - "forumCategory": 51, - "Preview3d": true, - "howtoSection": "https://forum.osr-plastic.org/tags/c/kb/54/injection", - "download": "${OSR_FILES_WEB}/${product_rel_min}", - "product_dimensions": "${OSR_MACHINES_ASSETS_URL}/${product_rel}/drawings/dimensions.jpg", - "preview": "${OSR_MACHINES_ASSETS_URL}/${product_rel}/media/latest.jpg", - "product_parts": "${OSR_MACHINES_ASSETS_URL}/${product_rel_min}/drawings/parts.jpg", - "edrawings": "${OSR_MACHINES_ASSETS_URL}/${product_rel_min}/resources/edrawings.html", - "forumUserId": 1, - "hasSpecs": false, - "slug": "pp-extruder-v42", - "category": "extrusion", - "name": "Peter Bas Schelling Extruder v4.2", - "version": "1.2", - "previousVersion": "pp-extruder-v4", + "forumCategory": 63, + "forum": "https://forum.osr-plastic.org/c/machines/sheetpress/63", + "howtoSection": "https://osr-plastic.org/howto/#sheetpress", + "edrawings:": "${OSR_MACHINES_ASSETS_URL}/${product_rel}resources/edrawings.html", "showParts": false, "showDimensions": false, + "Preview3d": true, + "forumTags": "sheetpress", + "forumUserId": 1, + "howto_categories": "86", + "download": "${OSR_FILES_WEB}/${product_rel_min}", + "library": "https://osr-plastic.org/machines/${slug}.html", + "preview": "${OSR_MACHINES_ASSETS_URL}/${product_rel}/media/latest.jpg", + "product_parts": "${OSR_MACHINES_ASSETS_URL}/${product_rel_min}/drawings/parts.jpg", + "product_dimensions": "${OSR_MACHINES_ASSETS_URL}/${product_rel_min}/drawings/dimensions.jpg", + "slug": "sheetpress", + "category": "sheetpress", + "feature": "1m Sheets", + "code": "SPM", + "name": "Sheetpress", + "keywords": "sheetpress", "authors": [ { - "name": "PlasticHub S.L.", - "url": "${author_link}" - }, - { - "name": "Peter Bas Schelling", - "url": "https://bazar.preciousplastic.com/pbs-machinery/" + "name": "Jason Knight", + "url": "https://www.mandin.earth/" } ], - "forumTopicId": 10128, - "forumPostId": 27553, - "forumPostHash": "2b5916abe6bffe23e81c7c4501bbfdc0", + "forumPostHash": "da522fc5546d4d7c3c86bada779d1aa4", + "forumTopicId": 10152, + "forumPostId": 27597, "image": "${product_rel}/renderings/perspective.jpg", "config": { "includes": [ @@ -222,12 +224,13 @@ "meta": true } }, - "forum_url": "https://forum.osr-plastic.org/", + "i18n": "${OSR_ROOT}/i18n-store/store-en.json", "OSR_ROOT": "C:\\Users\\mc007\\Desktop\\osr", "OSR_TEMP": "C:\\Users\\mc007\\AppData\\Local\\Temp\\osr", "OA_ROOT": "C:\\Users\\mc007\\Desktop\\ph3\\pp-next2", "KB_ROOT": "C:\\Users\\mc007\\Desktop\\osr\\osr-kb-next", "OSR_CACHE": "C:\\Users\\mc007\\.osr\\cache", + "OSR_LIBRARY": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines", "OSR_LIBRARY_MACHINES": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines", "OSR_USER_ASSETS": "C:\\Users\\mc007\\Desktop\\osr\\osr-user-assets", "OSR_PRIVATE": "C:\\Users\\mc007\\.osr\\", @@ -252,13 +255,14 @@ "SRC_FILES": [ "C:\\Users\\mc007\\Desktop\\osr/osr-templates/discourse/root.html" ], - "product": "extrusion/pp-v42-extruder", - "product_rel": "extrusion/pp-v42-extruder", - "product_rel_min": "extrusion/pp-v42-extruder", - "GIT_LAST": "Sunday, November 12, 2023 9:43 PM", + "product": "sheetpress/100cm", + "product_rel": "sheetpress/100cm", + "product_rel_min": "sheetpress/100cm", + "GIT_LAST": "Thursday, February 15, 2024 12:52 PM", "GIT_AUTHOR": "lovebird", - "GIT_MESSAGE": "init", - "GIT_COMMIT": "198a607dc46a4832fd228c2975a9de24ac49165d", + "GIT_MESSAGE": "todos | latest :)", + "GIT_COMMIT": "2bdacc5427b7d47e4d5aaf73bf0fe48fd703f2e0", "debug": false, - "env": "forum" + "env": "forum", + "forum_url": "https://forum.osr-plastic.org/" } \ No newline at end of file diff --git a/types.d.ts b/types.d.ts index 8413408..fdf88bd 100644 --- a/types.d.ts +++ b/types.d.ts @@ -97,6 +97,7 @@ export interface IDiscoursePostBaseOptions { export type IOptionsSync = IDiscoursePostBaseOptions & IOSRLBaseOptions & { debug?: boolean; verbose?: boolean; + logLevel?: string; skip?: boolean; alt?: boolean; src?: string;