diff --git a/packages/cache/package.json b/packages/cache/package.json index 3bd2b142..20150a6a 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,15 +1,18 @@ { - "name": "@polymech/osr-cache", + "name": "@polymech/cache", "description": "", "version": "0.4.8", "typings": "dist/index.d.ts", "type": "module", + "exports": { + ".": { + "import": "./dist/index.js", + "require": "./dist/index.cjs" + } + }, "publishConfig": { "access": "public" }, - "bin": { - "osr-cache": "main.js" - }, "dependencies": { "@polymech/commons": "link:..\\commons", "@polymech/core": "link:..\\core", diff --git a/packages/commons/dist/lang/frontmatter.d.ts b/packages/commons/dist/lang/frontmatter.d.ts new file mode 100644 index 00000000..e24a266b --- /dev/null +++ b/packages/commons/dist/lang/frontmatter.d.ts @@ -0,0 +1,20 @@ +export declare function isFrontmatterValid(frontmatter: Record): boolean; +export declare function extractFrontmatter(code: string): string | undefined; +export interface ParseFrontmatterOptions { + /** + * How the frontmatter should be handled in the returned `content` string. + * - `preserve`: Keep the frontmatter. + * - `remove`: Remove the frontmatter. + * - `empty-with-spaces`: Replace the frontmatter with empty spaces. (preserves sourcemap line/col/offset) + * - `empty-with-lines`: Replace the frontmatter with empty line breaks. (preserves sourcemap line/col) + * + * @default 'remove' + */ + frontmatter: 'preserve' | 'remove' | 'empty-with-spaces' | 'empty-with-lines'; +} +export interface ParseFrontmatterResult { + frontmatter: Record; + rawFrontmatter: string; + content: string; +} +export declare function parseFrontmatter(code: string, options?: ParseFrontmatterOptions): ParseFrontmatterResult; diff --git a/packages/commons/dist/lang/frontmatter.js b/packages/commons/dist/lang/frontmatter.js new file mode 100644 index 00000000..bbfecd10 --- /dev/null +++ b/packages/commons/dist/lang/frontmatter.js @@ -0,0 +1,48 @@ +import yaml from 'js-yaml'; +export function isFrontmatterValid(frontmatter) { + try { + // ensure frontmatter is JSON-serializable + JSON.stringify(frontmatter); + } + catch { + return false; + } + return typeof frontmatter === 'object' && frontmatter !== null; +} +// Capture frontmatter wrapped with `---`, including any characters and new lines within it. +// Only capture if `---` exists near the top of the file, including: +// 1. Start of file (including if has BOM encoding) +// 2. Start of file with any whitespace (but `---` must still start on a new line) +const frontmatterRE = /(?:^\uFEFF?|^\s*\n)---([\s\S]*?\n)---/; +export function extractFrontmatter(code) { + return frontmatterRE.exec(code)?.[1]; +} +export function parseFrontmatter(code, options) { + const rawFrontmatter = extractFrontmatter(code); + if (rawFrontmatter == null) { + return { frontmatter: {}, rawFrontmatter: '', content: code }; + } + const parsed = yaml.load(rawFrontmatter); + const frontmatter = (parsed && typeof parsed === 'object' ? parsed : {}); + let content; + switch (options?.frontmatter ?? 'remove') { + case 'preserve': + content = code; + break; + case 'remove': + content = code.replace(`---${rawFrontmatter}---`, ''); + break; + case 'empty-with-spaces': + content = code.replace(`---${rawFrontmatter}---`, ` ${rawFrontmatter.replace(/[^\r\n]/g, ' ')} `); + break; + case 'empty-with-lines': + content = code.replace(`---${rawFrontmatter}---`, rawFrontmatter.replace(/[^\r\n]/g, '')); + break; + } + return { + frontmatter, + rawFrontmatter, + content, + }; +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJvbnRtYXR0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGFuZy9mcm9udG1hdHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxTQUFTLENBQUM7QUFFM0IsTUFBTSxVQUFVLGtCQUFrQixDQUFDLFdBQWdDO0lBQ2xFLElBQUk7UUFDSCwwQ0FBMEM7UUFDMUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQztLQUM1QjtJQUFDLE1BQU07UUFDUCxPQUFPLEtBQUssQ0FBQztLQUNiO0lBQ0QsT0FBTyxPQUFPLFdBQVcsS0FBSyxRQUFRLElBQUksV0FBVyxLQUFLLElBQUksQ0FBQztBQUNoRSxDQUFDO0FBRUQsNEZBQTRGO0FBQzVGLG9FQUFvRTtBQUNwRSxtREFBbUQ7QUFDbkQsa0ZBQWtGO0FBQ2xGLE1BQU0sYUFBYSxHQUFHLHVDQUF1QyxDQUFDO0FBQzlELE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxJQUFZO0lBQzlDLE9BQU8sYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3RDLENBQUM7QUFxQkQsTUFBTSxVQUFVLGdCQUFnQixDQUMvQixJQUFZLEVBQ1osT0FBaUM7SUFFakMsTUFBTSxjQUFjLEdBQUcsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFaEQsSUFBSSxjQUFjLElBQUksSUFBSSxFQUFFO1FBQzNCLE9BQU8sRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO0tBQzlEO0lBRUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUN6QyxNQUFNLFdBQVcsR0FBRyxDQUFDLE1BQU0sSUFBSSxPQUFPLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUF3QixDQUFDO0lBRWhHLElBQUksT0FBZSxDQUFDO0lBQ3BCLFFBQVEsT0FBTyxFQUFFLFdBQVcsSUFBSSxRQUFRLEVBQUU7UUFDekMsS0FBSyxVQUFVO1lBQ2QsT0FBTyxHQUFHLElBQUksQ0FBQztZQUNmLE1BQU07UUFDUCxLQUFLLFFBQVE7WUFDWixPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLGNBQWMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3RELE1BQU07UUFDUCxLQUFLLG1CQUFtQjtZQUN2QixPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FDckIsTUFBTSxjQUFjLEtBQUssRUFDekIsTUFBTSxjQUFjLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsS0FBSyxDQUNsRCxDQUFDO1lBQ0YsTUFBTTtRQUNQLEtBQUssa0JBQWtCO1lBQ3RCLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sY0FBYyxLQUFLLEVBQUUsY0FBYyxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUMxRixNQUFNO0tBQ1A7SUFFRCxPQUFPO1FBQ04sV0FBVztRQUNYLGNBQWM7UUFDZCxPQUFPO0tBQ1AsQ0FBQztBQUNILENBQUMifQ== \ No newline at end of file diff --git a/packages/commons/dist/profile.d.ts b/packages/commons/dist/profile.d.ts index 0667d1bd..e4e84103 100644 --- a/packages/commons/dist/profile.d.ts +++ b/packages/commons/dist/profile.d.ts @@ -8,7 +8,7 @@ interface EnvConfig { export interface IProfile { includes: string[]; variables: EnvVariables; - env: { + env?: { [key: string]: EnvConfig; }; } diff --git a/packages/commons/dist/shemas/zod_map.js b/packages/commons/dist/shemas/zod_map.js index de05a3da..d295124c 100644 --- a/packages/commons/dist/shemas/zod_map.js +++ b/packages/commons/dist/shemas/zod_map.js @@ -87,9 +87,6 @@ export class ZodMetaMap { catch { // no default } - if (key == 'path') { - debugger; - } fieldUi = { ...fieldUi, ...this.getMetadata(key), @@ -99,4 +96,4 @@ export class ZodMetaMap { return uiSchema; } } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiem9kX21hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGVtYXMvem9kX21hcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUF5QixNQUFNLEtBQUssQ0FBQztBQUUvQzs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sVUFBVTtJQUNYLFFBQVEsR0FBRyxJQUFJLEdBQUcsRUFHdkIsQ0FBQztJQUVKOzs7Ozs7O09BT0c7SUFDSCxHQUFHLENBQXVCLEdBQVcsRUFBRSxNQUFTLEVBQUUsUUFBbUI7UUFDakUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDN0MsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVEOzs7T0FHRztJQUNILElBQUk7UUFDQSxNQUFNLEtBQUssR0FBK0IsRUFBRSxDQUFDO1FBQzdDLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNyRCxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDO1NBQ3ZCO1FBQ0QsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUM7SUFFRDs7T0FFRztJQUNILFdBQVcsQ0FBQyxHQUFXO1FBQ25CLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsUUFBUSxDQUFDO0lBQzVDLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsTUFBTTtRQUNULE9BQU8sSUFBSSxVQUFVLEVBQU0sQ0FBQztJQUNoQyxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILFdBQVc7UUFDUCx3REFBd0Q7UUFDeEQsTUFBTSxRQUFRLEdBQTRCO1lBQ3RDLHdCQUF3QixFQUFFO2dCQUN0QixLQUFLLEVBQUU7b0JBQ0gsUUFBUSxFQUFFLEtBQUs7b0JBQ2YsU0FBUyxFQUFFLGNBQWM7aUJBQzVCO2dCQUNELFFBQVEsRUFBRSxLQUFLO2dCQUNmLFVBQVUsRUFBRSxRQUFRO2FBQ3ZCO1NBQ0osQ0FBQztRQUVGLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNyRCxJQUFJLE9BQU8sR0FBNEIsRUFBRyxDQUFDO1lBQzNDLHVDQUF1QztZQUN2Qyx1RUFBdUU7WUFDdkUsTUFBTSxJQUFJLEdBQUcsTUFBYSxDQUFDO1lBQzNCLElBQUksSUFBSSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUU7Z0JBQ3pCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDO2FBQ3JEO1lBRUQsK0RBQStEO1lBQy9ELDhDQUE4QztZQUM5QyxPQUFPLENBQUMsVUFBVSxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUE7WUFFeEUseUVBQXlFO1lBQ3pFLElBQUk7Z0JBQ0EsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDM0MsNEVBQTRFO2dCQUM1RSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxVQUFVLENBQUM7YUFDMUM7WUFBQyxNQUFNO2dCQUNKLGFBQWE7YUFDaEI7WUFDRCxJQUFHLEdBQUcsSUFBRSxNQUFNLEVBQUM7Z0JBQ1gsUUFBUSxDQUFBO2FBQ1g7WUFDRCxPQUFPLEdBQUc7Z0JBQ04sR0FBRyxPQUFPO2dCQUNWLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUM7YUFDM0IsQ0FBQTtZQUNELFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxPQUFPLENBQUM7U0FDM0I7UUFDRCxPQUFPLFFBQVEsQ0FBQztJQUNwQixDQUFDO0NBQ0oifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiem9kX21hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGVtYXMvem9kX21hcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUF5QixNQUFNLEtBQUssQ0FBQztBQUUvQzs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sVUFBVTtJQUNYLFFBQVEsR0FBRyxJQUFJLEdBQUcsRUFHdkIsQ0FBQztJQUVKOzs7Ozs7O09BT0c7SUFDSCxHQUFHLENBQXVCLEdBQVcsRUFBRSxNQUFTLEVBQUUsUUFBbUI7UUFDakUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDN0MsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVEOzs7T0FHRztJQUNILElBQUk7UUFDQSxNQUFNLEtBQUssR0FBK0IsRUFBRSxDQUFDO1FBQzdDLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNyRCxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDO1NBQ3ZCO1FBQ0QsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUM7SUFFRDs7T0FFRztJQUNILFdBQVcsQ0FBQyxHQUFXO1FBQ25CLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsUUFBUSxDQUFDO0lBQzVDLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsTUFBTTtRQUNULE9BQU8sSUFBSSxVQUFVLEVBQU0sQ0FBQztJQUNoQyxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILFdBQVc7UUFDUCx3REFBd0Q7UUFDeEQsTUFBTSxRQUFRLEdBQTRCO1lBQ3RDLHdCQUF3QixFQUFFO2dCQUN0QixLQUFLLEVBQUU7b0JBQ0gsUUFBUSxFQUFFLEtBQUs7b0JBQ2YsU0FBUyxFQUFFLGNBQWM7aUJBQzVCO2dCQUNELFFBQVEsRUFBRSxLQUFLO2dCQUNmLFVBQVUsRUFBRSxRQUFRO2FBQ3ZCO1NBQ0osQ0FBQztRQUVGLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNyRCxJQUFJLE9BQU8sR0FBNEIsRUFBRyxDQUFDO1lBQzNDLHVDQUF1QztZQUN2Qyx1RUFBdUU7WUFDdkUsTUFBTSxJQUFJLEdBQUcsTUFBYSxDQUFDO1lBQzNCLElBQUksSUFBSSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUU7Z0JBQ3pCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDO2FBQ3JEO1lBRUQsK0RBQStEO1lBQy9ELDhDQUE4QztZQUM5QyxPQUFPLENBQUMsVUFBVSxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUE7WUFFeEUseUVBQXlFO1lBQ3pFLElBQUk7Z0JBQ0EsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDM0MsNEVBQTRFO2dCQUM1RSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxVQUFVLENBQUM7YUFDMUM7WUFBQyxNQUFNO2dCQUNKLGFBQWE7YUFDaEI7WUFDRCxPQUFPLEdBQUc7Z0JBQ04sR0FBRyxPQUFPO2dCQUNWLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUM7YUFDM0IsQ0FBQTtZQUNELFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxPQUFPLENBQUM7U0FDM0I7UUFDRCxPQUFPLFFBQVEsQ0FBQztJQUNwQixDQUFDO0NBQ0oifQ== \ No newline at end of file diff --git a/packages/commons/package.json b/packages/commons/package.json index dc322e8f..b8e9df64 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -42,6 +42,10 @@ "./glob": { "import": "./dist/_glob.js", "require": "./dist/_glob.cjs" + }, + "./frontmatter": { + "import": "./dist/lang/frontmatter.js", + "require": "./dist/lang/frontmatter.js" } }, "licenses": [ @@ -62,6 +66,7 @@ "@schemastore/package": "^0.0.10", "env-var": "^7.5.0", "glob": "^10.4.1", + "js-yaml": "^4.1.0", "tslog": "^3.3.3", "tsup": "^8.3.5", "yargs": "^17.7.2", diff --git a/packages/commons/src/lang/frontmatter.ts b/packages/commons/src/lang/frontmatter.ts new file mode 100644 index 00000000..fe878df6 --- /dev/null +++ b/packages/commons/src/lang/frontmatter.ts @@ -0,0 +1,78 @@ +import yaml from 'js-yaml'; + +export function isFrontmatterValid(frontmatter: Record) { + try { + // ensure frontmatter is JSON-serializable + JSON.stringify(frontmatter); + } catch { + return false; + } + return typeof frontmatter === 'object' && frontmatter !== null; +} + +// Capture frontmatter wrapped with `---`, including any characters and new lines within it. +// Only capture if `---` exists near the top of the file, including: +// 1. Start of file (including if has BOM encoding) +// 2. Start of file with any whitespace (but `---` must still start on a new line) +const frontmatterRE = /(?:^\uFEFF?|^\s*\n)---([\s\S]*?\n)---/; +export function extractFrontmatter(code: string): string | undefined { + return frontmatterRE.exec(code)?.[1]; +} + +export interface ParseFrontmatterOptions { + /** + * How the frontmatter should be handled in the returned `content` string. + * - `preserve`: Keep the frontmatter. + * - `remove`: Remove the frontmatter. + * - `empty-with-spaces`: Replace the frontmatter with empty spaces. (preserves sourcemap line/col/offset) + * - `empty-with-lines`: Replace the frontmatter with empty line breaks. (preserves sourcemap line/col) + * + * @default 'remove' + */ + frontmatter: 'preserve' | 'remove' | 'empty-with-spaces' | 'empty-with-lines'; +} + +export interface ParseFrontmatterResult { + frontmatter: Record; + rawFrontmatter: string; + content: string; +} + +export function parseFrontmatter( + code: string, + options?: ParseFrontmatterOptions, +): ParseFrontmatterResult { + const rawFrontmatter = extractFrontmatter(code); + + if (rawFrontmatter == null) { + return { frontmatter: {}, rawFrontmatter: '', content: code }; + } + + const parsed = yaml.load(rawFrontmatter); + const frontmatter = (parsed && typeof parsed === 'object' ? parsed : {}) as Record; + + let content: string; + switch (options?.frontmatter ?? 'remove') { + case 'preserve': + content = code; + break; + case 'remove': + content = code.replace(`---${rawFrontmatter}---`, ''); + break; + case 'empty-with-spaces': + content = code.replace( + `---${rawFrontmatter}---`, + ` ${rawFrontmatter.replace(/[^\r\n]/g, ' ')} `, + ); + break; + case 'empty-with-lines': + content = code.replace(`---${rawFrontmatter}---`, rawFrontmatter.replace(/[^\r\n]/g, '')); + break; + } + + return { + frontmatter, + rawFrontmatter, + content, + }; +} diff --git a/packages/commons/src/profile.ts b/packages/commons/src/profile.ts index 26162a83..17dd6b34 100644 --- a/packages/commons/src/profile.ts +++ b/packages/commons/src/profile.ts @@ -18,7 +18,7 @@ interface EnvConfig { export interface IProfile { includes: string[] variables: EnvVariables - env: { + env?: { [key: string]: EnvConfig } } diff --git a/packages/commons/src/shemas/zod_map.ts b/packages/commons/src/shemas/zod_map.ts index f2014967..a152d2e1 100644 --- a/packages/commons/src/shemas/zod_map.ts +++ b/packages/commons/src/shemas/zod_map.ts @@ -98,9 +98,6 @@ export class ZodMetaMap> { } catch { // no default } - if(key=='path'){ - debugger - } fieldUi = { ...fieldUi, ...this.getMetadata(key), diff --git a/packages/fs/dist/errors.d.ts b/packages/fs/dist/errors.d.ts index 69149de1..939d6a42 100644 --- a/packages/fs/dist/errors.d.ts +++ b/packages/fs/dist/errors.d.ts @@ -1,3 +1,4 @@ +export declare const exports: {}; export declare const ErrNoFileOrDir: (path: string) => Error; export declare const ErrCantDelete: (path: string) => Error; export declare const ErrNotFile: (path: string) => Error; diff --git a/packages/fs/dist/errors.js b/packages/fs/dist/errors.js index 2672702d..0bf1e6f7 100644 --- a/packages/fs/dist/errors.js +++ b/packages/fs/dist/errors.js @@ -1,5 +1,6 @@ import { ErrnoException } from './interfaces.js'; import { code } from './errno.js'; +export const exports = {}; Object.keys(code).forEach(function (code) { const e = code[code]; exports[code] = (path) => { diff --git a/packages/fs/dist/inspect.js b/packages/fs/dist/inspect.js index 4fdc9ee2..03020b7f 100644 --- a/packages/fs/dist/inspect.js +++ b/packages/fs/dist/inspect.js @@ -1,6 +1,7 @@ import * as fs from 'node:fs'; import { readlinkSync, statSync, lstatSync, readFileSync } from 'node:fs'; -import { getType } from 'mime'; +import pkg from 'mime'; +const { getType } = pkg; import * as pathUtil from 'node:path'; import { createHash } from 'node:crypto'; import { validateArgument, validateOptions } from './utils/validate.js'; diff --git a/packages/fs/package.json b/packages/fs/package.json index fd595412..d4449fb5 100644 --- a/packages/fs/package.json +++ b/packages/fs/package.json @@ -30,7 +30,7 @@ "eslint-plugin-regexp": "^2.7.0", "glob": "^10.4.1", "mime": "^2.0.3", - "minimatch": "^3.0.4", + "minimatch": "^10.0.1", "mkdirp": "^3.0.1", "progress-stream": "^1.2.0", "q": "^1.4.1", @@ -45,7 +45,6 @@ "@types/denodeify": "^1.2.31", "@types/glob": "^8.1.0", "@types/mime": "^2.0.0", - "@types/minimatch": "^3.0.3", "@types/mkdirp": "^0.5.1", "@types/node": "^22.10.2", "chai": "^3.5.0", diff --git a/packages/fs/src/errors.ts b/packages/fs/src/errors.ts index 5fc34479..3dd7fadd 100644 --- a/packages/fs/src/errors.ts +++ b/packages/fs/src/errors.ts @@ -1,5 +1,7 @@ import { ErrnoException } from './interfaces.js'; -import { errno, code } from './errno.js' +import { code } from './errno.js' + +export const exports = {} Object.keys(code).forEach(function (code) { const e = code[code]; @@ -9,8 +11,8 @@ Object.keys(code).forEach(function (code) { err.code = code; err.path = path; return err; - }; -}); + } +}) export const ErrNoFileOrDir = (path: string): Error => { return new Error('Can\'t remove ' + path + ' The path is not file nor directory'); }; diff --git a/packages/fs/src/inspect.ts b/packages/fs/src/inspect.ts index 9004bb2d..74d1d823 100644 --- a/packages/fs/src/inspect.ts +++ b/packages/fs/src/inspect.ts @@ -1,6 +1,9 @@ import * as fs from 'node:fs' import { Stats, readlinkSync, statSync, lstatSync, readFileSync } from 'node:fs' -import { getType } from 'mime' + +import pkg from 'mime'; +const {getType} = pkg; + import * as pathUtil from 'node:path' import { createHash } from 'node:crypto' import { validateArgument, validateOptions } from './utils/validate.js' diff --git a/packages/fs/src/utils/matcher.ts b/packages/fs/src/utils/matcher.ts index 46d3e163..7cc672c8 100644 --- a/packages/fs/src/utils/matcher.ts +++ b/packages/fs/src/utils/matcher.ts @@ -1,4 +1,5 @@ -import { Minimatch } from 'minimatch'; +import { Minimatch } from 'minimatch' + export interface IOptions { matchBase: boolean; nocomment: boolean; diff --git a/packages/i18n/dist/commands/glossary.js b/packages/i18n/dist/commands/glossary.js index a1a16d1d..f04e5699 100644 --- a/packages/i18n/dist/commands/glossary.js +++ b/packages/i18n/dist/commands/glossary.js @@ -1,12 +1,8 @@ import * as path from 'path'; -const globBase = require('glob-base'); import { pairs } from '../lib/glossary.js'; -import { defaults, sanitize } from '../_cli.js'; -import { parse } from '../options.js'; -import { logger } from '../index.js'; +import { defaults } from '../_cli.js'; import { CONFIG_DEFAULT } from '@polymech/commons'; import { resolve } from "@polymech/commons/variables"; -import pMap from 'p-map'; const defaultOptions = (yargs) => { return yargs.option('debug', { default: false, @@ -51,42 +47,46 @@ export const register = (cli) => { const config = CONFIG_DEFAULT(args.env_key); const verb = argv.verb; if (verb === 'create') { - let options = sanitize(argv); + /* + let options = sanitize(argv as any) as IOptions if (!options) { logger.error(`Invalid options, abort`); - return; + return } - let opts = parse(options, args); - opts.config = config; + + let opts = parse(options, args) + opts.config = config if (!opts.srcInfo) { - logger.error(`Invalid source : ${argv.src}`, opts); - return; + logger.error(`Invalid source : ${argv.src}`, opts) + return } + if (opts.srcInfo.IS_GLOB) { - const glob_base = globBase(opts.src); - opts.pathVariables.ROOT = path.resolve(glob_base.base); + const glob_base = globBase(opts.src) + opts.pathVariables.ROOT = path.resolve(glob_base.base) + } else { + options.pathVariables.ROOT = path.resolve(opts.cwd) } - else { - options.pathVariables.ROOT = path.resolve(opts.cwd); - } - opts.pathVariables['DST_LANG'] = opts.dstLang.toLocaleLowerCase(); - opts.pathVariables['SRC_LANG'] = opts.srcLang.toLocaleLowerCase(); - opts.pathVariables['CWD'] = path.resolve(opts.cwd); + + opts.pathVariables['DST_LANG'] = opts.dstLang.toLocaleLowerCase() + opts.pathVariables['SRC_LANG'] = opts.srcLang.toLocaleLowerCase() + opts.pathVariables['CWD'] = path.resolve(opts.cwd) if (!opts.srcInfo || (opts.srcInfo && !opts.srcInfo.FILES)) { - logger.error(`Have no source files for ${opts.src}`); - return; + logger.error(`Have no source files for ${opts.src}`) + return } if (opts.srcInfo && opts.srcInfo.FILES) { await pMap(opts.srcInfo.FILES, async (files) => { - await pMap(files, (source) => { + await pMap(files, (source: string) => { //return create(options.srcLang, options.dstLang, options, source) - }, { concurrency: 1 }); - }); + }, { concurrency: 1 }) + }) } + */ } if (verb === 'pairs' && argv.dst) { await pairs(config.deepl, path.resolve(resolve(argv.dst))); } }); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvc3NhcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvZ2xvc3NhcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUE7QUFFNUIsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQ3JDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUUxQyxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUMvQyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRXJDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFcEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ2xELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQTtBQUNyRCxPQUFPLElBQUksTUFBTSxPQUFPLENBQUE7QUFFeEIsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRTtJQUN2QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ3pCLE9BQU8sRUFBRSxLQUFLO1FBQ2QsUUFBUSxFQUFFLGdCQUFnQjtRQUMxQixJQUFJLEVBQUUsU0FBUztLQUNsQixDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtRQUNqQixPQUFPLEVBQUUsWUFBWTtRQUNyQixRQUFRLEVBQUUscUNBQXFDO0tBQ2xELENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsUUFBUSxFQUFFLHVEQUF1RDtLQUNwRSxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtRQUNiLFFBQVEsRUFBRSxhQUFhO0tBQzFCLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsUUFBUSxFQUFFLHdEQUF3RDtRQUNsRSxPQUFP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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvc3NhcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvZ2xvc3NhcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUE7QUFFNUIsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ2xELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQTtBQUVyRCxNQUFNLGNBQWMsR0FBRyxDQUFDLEtBQWUsRUFBRSxFQUFFO0lBQ3ZDLE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDekIsT0FBTyxFQUFFLEtBQUs7UUFDZCxRQUFRLEVBQUUsZ0JBQWdCO1FBQzFCLElBQUksRUFBRSxTQUFTO0tBQ2xCLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ2pCLE9BQU8sRUFBRSxZQUFZO1FBQ3JCLFFBQVEsRUFBRSxxQ0FBcUM7S0FDbEQsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixRQUFRLEVBQUUsdURBQXVEO0tBQ3BFLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFO1FBQ2IsUUFBUSxFQUFFLGFBQWE7S0FDMUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixRQUFRLEVBQUUsd0RBQXdEO1FBQ2xFLE9BQU8sRUFBRSw4Q0FBOEM7S0FDMUQsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUU7UUFDakIsUUFBUSxFQUFFLDRFQUE0RTtRQUN0RixPQUFPLEVBQUUsRUFBRTtLQUNkLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ2YsUUFBUSxFQUFFLGlCQUFpQjtRQUMzQixPQUFPLEVBQUUseUJBQXlCO0tBQ3JDLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ2pCLFFBQVEsRUFBRSw0RUFBNEU7UUFDdEYsT0FBTyxFQUFFLElBQUk7S0FDaEIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7UUFDZCxRQUFRLEVBQUUsc0JBQXNCO1FBQ2hDLE9BQU8sRUFBRSxnQkFBZ0I7S0FDNUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7UUFDYixPQUFPLEVBQUUsS0FBSztRQUNkLFFBQVEsRUFBRSx5Q0FBeUM7UUFDbkQsSUFBSSxFQUFFLFNBQVM7S0FDbEIsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBO0FBRUQsSUFBSSxPQUFPLEdBQUcsQ0FBQyxLQUFlLEVBQUUsRUFBRSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtBQUd4RCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFhLEVBQUUsRUFBRTtJQUN0QyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsaUJBQWlCLEVBQUUsNkJBQTZCLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFtQixFQUFHLEVBQUU7UUFDekcsUUFBUSxFQUFFLENBQUE7UUFFVixJQUFJLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFBRSxPQUFNO1NBQUU7UUFDekIsTUFBTSxJQUFJLEdBQVEsSUFBSSxDQUFBO1FBQ3RCLE1BQU0sTUFBTSxHQUFRLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDaEQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQTtRQUN0QixJQUFJLElBQUksS0FBSyxRQUFRLEVBQUU7WUFDbkI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O2NBbUNFO1NBQ0w7UUFDRCxJQUFJLElBQUksS0FBSyxPQUFPLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRTtZQUM5QixNQUFNLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFhLENBQUMsQ0FBQyxDQUFDLENBQUE7U0FDdkU7SUFDTCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/packages/i18n/dist/index.js b/packages/i18n/dist/index.js index 71eb3e79..aabddd41 100644 --- a/packages/i18n/dist/index.js +++ b/packages/i18n/dist/index.js @@ -8,4 +8,4 @@ export * from './types.js'; export * from './zod_schema.js'; export * from './zod_types.js'; export const logger = createLogger('commons'); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE9BQU8sQ0FBQTtBQUM5QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBSTVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUM1QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQ3BDLGNBQWMsZ0JBQWdCLENBQUE7QUFDOUIsY0FBYyxjQUFjLENBQUE7QUFDNUIsY0FBYyxZQUFZLENBQUE7QUFDMUIsY0FBYyxpQkFBaUIsQ0FBQTtBQUMvQixjQUFjLGdCQUFnQixDQUFBO0FBRTlCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBTyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE9BQU8sQ0FBQTtBQUM5QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUM1QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQ3BDLGNBQWMsZ0JBQWdCLENBQUE7QUFDOUIsY0FBYyxjQUFjLENBQUE7QUFDNUIsY0FBYyxZQUFZLENBQUE7QUFDMUIsY0FBYyxpQkFBaUIsQ0FBQTtBQUMvQixjQUFjLGdCQUFnQixDQUFBO0FBRTlCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBTyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/packages/i18n/dist/lib/filters.d.ts b/packages/i18n/dist/lib/filters.d.ts index 092c5553..be5bfa85 100644 --- a/packages/i18n/dist/lib/filters.d.ts +++ b/packages/i18n/dist/lib/filters.d.ts @@ -1,4 +1 @@ -export declare const Hugo: (raw: string, translated: string, file?: string) => string; -export declare const Filters: { - Hugo: (raw: string, translated: string, file?: string) => string; -}; +export declare const Filters: {}; diff --git a/packages/i18n/dist/lib/filters.js b/packages/i18n/dist/lib/filters.js index bcadd8fb..29d51d52 100644 --- a/packages/i18n/dist/lib/filters.js +++ b/packages/i18n/dist/lib/filters.js @@ -1,43 +1,2 @@ -import { logger } from "../index.js"; -import { sync as write } from "@polymech/fs/write"; -const frontMatter = require('front-matter'); -const YAML = require('json-to-pretty-yaml'); -const index = (attrs, key) => Object.keys(attrs).indexOf(key); -export const Hugo = (raw, translated, file = "") => { - let fm = {}; - if (!frontMatter.test(raw)) { - return translated; - } - fm = frontMatter(raw).attributes; - let fmTranslated = {}; - try { - fmTranslated = frontMatter(translated); - } - catch (e) { - write(file + "_e.md", translated); - } - const translatedKeys = {}; - const keys = [ - 'title' - ]; - keys.forEach((k) => { - const e = Object.entries(fmTranslated.attributes); - const s = Object.entries(fm).findIndex((v) => v[0] == k); - const v = e[s][1]; - translatedKeys[k] = v; - }); - const fmPatch = { - ...fm, - ...translatedKeys - }; - try { - return `---\n${YAML.stringify(fmPatch)}---\n${fmTranslated.body}`; - } - catch (e) { - logger.error(`Error, `, e); - } -}; -export const Filters = { - Hugo -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsdGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvZmlsdGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3BDLE9BQU8sRUFBRSxJQUFJLElBQUksS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFFbEQsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0FBQzNDLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0FBRTNDLE1BQU0sS0FBSyxHQUFHLENBQUMsS0FBVSxFQUFFLEdBQVcsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7QUFFMUUsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FBVyxFQUFFLFVBQWtCLEVBQUUsT0FBYSxFQUFFLEVBQUUsRUFBRTtJQUNyRSxJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUE7SUFDWCxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUN4QixPQUFPLFVBQVUsQ0FBQTtLQUNwQjtJQUNELEVBQUUsR0FBRyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxDQUFBO0lBRWhDLElBQUksWUFBWSxHQUFRLEVBQUUsQ0FBQTtJQUMxQixJQUFJO1FBQ0EsWUFBWSxHQUFHLFdBQVcsQ0FBQyxVQUFVLENBQUMsQ0FBQTtLQUN6QztJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1IsS0FBSyxDQUFDLElBQUksR0FBRyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUE7S0FDcEM7SUFFRCxNQUFNLGNBQWMsR0FBRyxFQUFFLENBQUE7SUFFekIsTUFBTSxJQUFJLEdBQUc7UUFDVCxPQUFPO0tBQ1YsQ0FBQTtJQUVELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNmLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQ2pELE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7UUFDeEQsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ2pCLGNBQWMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDekIsQ0FBQyxDQUFDLENBQUE7SUFFRixNQUFNLE9BQU8sR0FBRztRQUNaLEdBQUcsRUFBRTtRQUNMLEdBQUcsY0FBYztLQUNwQixDQUFBO0lBRUQsSUFBSTtRQUNBLE9BQU8sUUFBUSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLFlBQVksQ0FBQyxJQUFJLEVBQUUsQ0FBQTtLQUNwRTtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1IsTUFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUE7S0FDN0I7QUFDTCxDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUc7SUFDbkIsSUFBSTtDQUNQLENBQUEifQ== \ No newline at end of file +export const Filters = {}; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsdGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvZmlsdGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsRUFFdEIsQ0FBQSJ9 \ No newline at end of file diff --git a/packages/i18n/dist/lib/index.d.ts b/packages/i18n/dist/lib/index.d.ts index 4e7016c7..26991371 100644 --- a/packages/i18n/dist/lib/index.d.ts +++ b/packages/i18n/dist/lib/index.d.ts @@ -2,3 +2,4 @@ export * from './deepl.js'; export * from './codes.js'; export * from './filters.js'; export * from './store.js'; +export * from './translate.js'; diff --git a/packages/i18n/dist/lib/index.js b/packages/i18n/dist/lib/index.js index 622d91cb..36d41c47 100644 --- a/packages/i18n/dist/lib/index.js +++ b/packages/i18n/dist/lib/index.js @@ -2,4 +2,5 @@ export * from './deepl.js'; export * from './codes.js'; export * from './filters.js'; export * from './store.js'; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsWUFBWSxDQUFBO0FBQzFCLGNBQWMsWUFBWSxDQUFBO0FBQzFCLGNBQWMsY0FBYyxDQUFBO0FBQzVCLGNBQWMsWUFBWSxDQUFBIn0= \ No newline at end of file +export * from './translate.js'; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsWUFBWSxDQUFBO0FBQzFCLGNBQWMsWUFBWSxDQUFBO0FBQzFCLGNBQWMsY0FBYyxDQUFBO0FBQzVCLGNBQWMsWUFBWSxDQUFBO0FBQzFCLGNBQWMsZ0JBQWdCLENBQUEifQ== \ No newline at end of file diff --git a/packages/i18n/dist/lib/store.d.ts b/packages/i18n/dist/lib/store.d.ts index b9d20a5c..e6964b0f 100644 --- a/packages/i18n/dist/lib/store.d.ts +++ b/packages/i18n/dist/lib/store.d.ts @@ -1,4 +1,3 @@ -export declare const clean: (text?: string) => string; export declare const sortObjectKeysAlpha: (obj: Record) => Record; export declare const store: (storePath: string, text: string, translation: string, options?: any) => string; export declare const get: (storePath: string, text: string, options?: any) => any; diff --git a/packages/i18n/dist/lib/store.js b/packages/i18n/dist/lib/store.js index 43fe1e24..6f924b85 100644 --- a/packages/i18n/dist/lib/store.js +++ b/packages/i18n/dist/lib/store.js @@ -3,7 +3,7 @@ import { sync as read } from '@polymech/fs/read'; import { resolve } from '@polymech/commons'; import * as path from 'path'; const removeNonPrintableCharacters = (text) => text.replace(/[^\x20-\x7E]/g, ''); -export const clean = (text = "") => text.trim(); +const clean = (text = "") => text.trim(); export const sortObjectKeysAlpha = (obj) => { const sortedKeys = Object.keys(obj).sort(); const sortedObj = {}; @@ -34,4 +34,4 @@ export const get = (storePath, text, options = {}) => { return store[text]; } }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLElBQUksS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDbEQsT0FBTyxFQUFFLElBQUksSUFBSSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDM0MsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUE7QUFFNUIsTUFBTSw0QkFBNEIsR0FBRyxDQUFDLElBQVksRUFBVSxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDLENBQUE7QUFFaEcsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLENBQUMsT0FBZSxFQUFFLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQTtBQUV2RCxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEdBQXdCLEVBQXVCLEVBQUU7SUFDcEYsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUMzQyxNQUFNLFNBQVMsR0FBd0IsRUFBRSxDQUFDO0lBQzFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUMxQixTQUFTLENBQUMsR0FBRyxDQUFDLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzNCLENBQUMsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxTQUFTLENBQUM7QUFDbEIsQ0FBQyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLENBQUMsU0FBZ0IsRUFBRSxJQUFZLEVBQUUsV0FBa0IsRUFBRSxVQUFjLEVBQUUsRUFBRSxFQUFFO0lBQzdGLElBQUksU0FBUyxJQUFJLE9BQU8sSUFBSSxPQUFPLENBQUMsS0FBSyxFQUFFO1FBQ3BDLFNBQVMsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDekQsUUFBUSxFQUFFLE9BQU8sQ0FBQyxPQUFPO1NBQzVCLENBQUMsQ0FBQyxDQUFBO0tBQ047SUFDSixNQUFNLEtBQUssR0FBTyxJQUFJLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUMvQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ2hDLEtBQUssQ0FBQyxTQUFTLEVBQUUsbUJBQW1CLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtJQUM1QyxPQUFPLFdBQVcsQ0FBQTtBQUNuQixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxHQUFHLEdBQUcsQ0FBQyxTQUFnQixFQUFFLElBQVksRUFBRSxVQUFjLEVBQUUsRUFBRSxFQUFFO0lBQ3ZFLElBQUksU0FBUyxJQUFJLE9BQU8sSUFBSSxPQUFPLENBQUMsS0FBSyxFQUFFO1FBQ3BDLFNBQVMsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDekQsUUFBUSxFQUFFLE9BQU8sQ0FBQyxPQUFPO1NBQzVCLENBQUMsQ0FBQyxDQUFBO0tBQ047SUFDSixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUMzQyxJQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBQztRQUNkLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFBO0tBQ2xCO0FBQ0YsQ0FBQyxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLElBQUksS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDbEQsT0FBTyxFQUFFLElBQUksSUFBSSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDM0MsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUE7QUFFNUIsTUFBTSw0QkFBNEIsR0FBRyxDQUFDLElBQVksRUFBVSxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDLENBQUE7QUFFaEcsTUFBTSxLQUFLLEdBQUcsQ0FBQyxPQUFlLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFBO0FBRWhELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUMsR0FBd0IsRUFBdUIsRUFBRTtJQUNwRixNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzNDLE1BQU0sU0FBUyxHQUF3QixFQUFFLENBQUM7SUFDMUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQzFCLFNBQVMsQ0FBQyxHQUFHLENBQUMsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDM0IsQ0FBQyxDQUFDLENBQUM7SUFDSCxPQUFPLFNBQVMsQ0FBQztBQUNsQixDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsQ0FBQyxTQUFnQixFQUFFLElBQVksRUFBRSxXQUFrQixFQUFFLFVBQWMsRUFBRSxFQUFFLEVBQUU7SUFDN0YsSUFBSSxTQUFTLElBQUksT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUU7UUFDcEMsU0FBUyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUN6RCxRQUFRLEVBQUUsT0FBTyxDQUFDLE9BQU87U0FDNUIsQ0FBQyxDQUFDLENBQUE7S0FDTjtJQUNKLE1BQU0sS0FBSyxHQUFPLElBQUksQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQy9DLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDaEMsS0FBSyxDQUFDLFNBQVMsRUFBRSxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFBO0lBQzVDLE9BQU8sV0FBVyxDQUFBO0FBQ25CLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDLFNBQWdCLEVBQUUsSUFBWSxFQUFFLFVBQWMsRUFBRSxFQUFFLEVBQUU7SUFDdkUsSUFBSSxTQUFTLElBQUksT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUU7UUFDcEMsU0FBUyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUN6RCxRQUFRLEVBQUUsT0FBTyxDQUFDLE9BQU87U0FDNUIsQ0FBQyxDQUFDLENBQUE7S0FDTjtJQUNKLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzNDLElBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFDO1FBQ2QsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7S0FDbEI7QUFDRixDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/packages/i18n/dist/lib/translate.d.ts b/packages/i18n/dist/lib/translate.d.ts index 0d63983a..c694ef66 100644 --- a/packages/i18n/dist/lib/translate.d.ts +++ b/packages/i18n/dist/lib/translate.d.ts @@ -1,3 +1,4 @@ +import * as TOML from '@iarna/toml'; import { IOptions } from '../types.js'; import * as deepl from './deepl.js'; export declare const clean: (text?: string) => string; @@ -10,7 +11,7 @@ export declare const getTranslation: (translations: any, all?: boolean) => any; export declare const translateMarkup: (src: string, dst: string, options: IOptions) => Promise; export declare const translateJSON: (src: string, dst: string, options: IOptions) => Promise; export declare const translateTOML: (src: string, dst: string, options: IOptions) => Promise; -export declare const translateYAML: (src: string, dst: string, options: IOptions) => Promise; +export declare const translateYAML: (src: string, dst: string, options: IOptions) => Promise; export declare const translateFiles: (file: any, targets: string[], options: IOptions) => Promise; export declare const translate: (opts: IOptions) => Promise; export declare const translateText: (text: string, srcLang: string, dstLang: string, options?: IOptions) => Promise; @@ -21,7 +22,7 @@ export declare const TRANSLATORS: { '.html': (src: string, dst: string, options: IOptions) => Promise; '.json': (src: string, dst: string, options: IOptions) => Promise; '.toml': (src: string, dst: string, options: IOptions) => Promise; - '.yaml': (src: string, dst: string, options: IOptions) => Promise; + '.yaml': (src: string, dst: string, options: IOptions) => Promise; '.xlsx': (src: string, dst: string, options: IOptions) => Promise; '.xls': (src: string, dst: string, options: IOptions) => Promise; }; diff --git a/packages/i18n/dist/lib/translate.js b/packages/i18n/dist/lib/translate.js index ecb60472..f2a4c044 100644 --- a/packages/i18n/dist/lib/translate.js +++ b/packages/i18n/dist/lib/translate.js @@ -1,7 +1,7 @@ import * as path from 'path'; import { JSONPath } from 'jsonpath-plus'; import { createHash } from 'crypto'; -import { get_cached, set_cached } from '@polymech/osr-cache'; +import { get_cached, set_cached } from '@polymech/cache'; import { OSR_CACHE } from '@polymech/commons'; import { CONFIG_DEFAULT } from '@polymech/commons'; import { resolve } from '@polymech/commons'; @@ -14,14 +14,14 @@ import * as XLSX from 'xlsx'; import { parse, stringify } from 'yaml'; import pMap from 'p-map'; import { minify as minify_html } from 'html-minifier-terser'; -const TOML = require('@iarna/toml'); -const globBase = require('glob-base'); +import { globBase } from '@polymech/commons'; +import * as TOML from '@iarna/toml'; import { targets, parse as parseOptions } from '../options.js'; import { MODULE_NAME } from '../constants.js'; import { store, get } from './store.js'; import * as deepl from './deepl.js'; -import { logger as loggerDefault } from '../index.js'; -let logger = loggerDefault; +import { createLogger } from '@polymech/log'; +let logger = createLogger('i18n'); const minify = false; const extension = (file) => path.parse(file).ext; import { defaultFilters, defaultOptions, transformObject, testFilters } from './async-iterator.js'; @@ -323,8 +323,6 @@ export const translateFiles = async (file, targets, options) => { }; export const translate = async (opts) => { opts = parseOptions(opts, {}); - logger = opts.logger || loggerDefault; - logger.settings.minLevel = opts.logLevel || 'warn'; if (!opts.api_key) { logger.error('i18n : No API key provided'); return; @@ -399,6 +397,10 @@ export const translateText = async (text, srcLang, dstLang, options = {}) => { options.storeRoot = "${OSR_ROOT}/i18n-store"; } if (!options.api_key) { + if (!config || !config.deepl || !config.deepl.auth_key) { + logger.error('i18n:translateText: No API key provided'); + return text; + } options.api_key = config.deepl.auth_key; } const out = await translateDeepL(text, srcLang, dstLang, { @@ -435,4 +437,4 @@ export const TRANSLATORS = { '.xls': translateXLS }; export const getTranslator = (file) => TRANSLATORS[extension(file)]; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"translate.js","sourceRoot":"","sources":["../../src/lib/translate.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"translate.js","sourceRoot":"","sources":["../../src/lib/translate.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/i18n/dist/types.d.ts b/packages/i18n/dist/types.d.ts index 726bee78..b694104b 100644 --- a/packages/i18n/dist/types.d.ts +++ b/packages/i18n/dist/types.d.ts @@ -1,6 +1,5 @@ import { Hash } from '@polymech/core'; import { PATH_INFO } from '@polymech/commons/types'; -import { Logger } from 'tslog'; export type TranslateFilter = (raw: string, translated: string, file?: string) => string; export type IOptions = { src?: string; @@ -33,5 +32,4 @@ export type IOptions = { storeRoot?: string; api_key?: string; logLevel?: string; - logger?: Logger; }; diff --git a/packages/i18n/package.json b/packages/i18n/package.json index db3357d5..27fa40e6 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,5 +1,5 @@ { - "name": "@polymech/osr-i18n", + "name": "@polymech/i18n", "version": "0.3.0", "typings": "index.d.ts", "type": "module", @@ -9,22 +9,30 @@ "bin": { "osr-i18n": "main.js" }, + "exports": { + ".": { + "import": "./dist/index.js", + "require": "./dist/index.cjs" + }, + "./lib": { + "import": "./dist/lib/index.js", + "require": "./dist/lib/index.cjs" + } + }, "dependencies": { "@iarna/toml": "^2.2.5", + "@polymech/cache": "link:..\\cache", "@polymech/commons": "link:..\\commons", "@polymech/core": "link:..\\core", "@polymech/fs": "link:..\\fs", "@polymech/log": "link:..\\log", - "@polymech/osr-cache": "link:..\\cache", "@types/html-minifier-terser": "^7.0.2", - "@types/node": "^20.14.9", + "@types/node": "^22.12.0", "axios": "^1.7.9", "convert-units": "^2.3.4", "cryptr": "^6.0.3", "deepl-node": "^1.8.0", "env-var": "^7.1.1", - "front-matter": "^4.0.2", - "glob-base": "^0.3.0", "html-minifier-terser": "^7.2.0", "json-to-pretty-yaml": "^1.2.2", "jsonpath-plus": "^8.1.0", @@ -35,9 +43,8 @@ "p-throttle": "^4.1.1", "querystring": "^0.2.1", "ssri": "^10.0.1", - "tslog": "^4.9.3", - "typesafe-i18n": "^5.11.0", - "typescript": "^4.9.5", + "tslog": "^3.3.3", + "typescript": "^5.7.3", "xlsx": "^0.18.5", "yaml": "^2.4.1", "yargs": "^17.7.2", @@ -71,4 +78,4 @@ "keywords": [ "typescript" ] -} +} \ No newline at end of file diff --git a/packages/i18n/src/commands/glossary.ts b/packages/i18n/src/commands/glossary.ts index b0931838..212f68a7 100644 --- a/packages/i18n/src/commands/glossary.ts +++ b/packages/i18n/src/commands/glossary.ts @@ -1,17 +1,10 @@ import * as CLI from 'yargs' import * as path from 'path' -const globBase = require('glob-base') import { pairs } from '../lib/glossary.js' - -import { defaults, sanitize } from '../_cli.js' -import { parse } from '../options.js' -import { IOptions } from '../types.js' -import { logger } from '../index.js' - +import { defaults } from '../_cli.js' import { CONFIG_DEFAULT } from '@polymech/commons' import { resolve } from "@polymech/commons/variables" -import pMap from 'p-map' const defaultOptions = (yargs: CLI.Argv) => { return yargs.option('debug', { @@ -59,6 +52,7 @@ export const register = (cli: CLI.Argv) => { const config: any = CONFIG_DEFAULT(args.env_key) const verb = argv.verb if (verb === 'create') { + /* let options = sanitize(argv as any) as IOptions if (!options) { logger.error(`Invalid options, abort`); @@ -93,6 +87,7 @@ export const register = (cli: CLI.Argv) => { }, { concurrency: 1 }) }) } + */ } if (verb === 'pairs' && argv.dst) { await pairs(config.deepl, path.resolve(resolve(argv.dst as string))) diff --git a/packages/i18n/src/index.ts b/packages/i18n/src/index.ts index 015b1908..18d0c093 100644 --- a/packages/i18n/src/index.ts +++ b/packages/i18n/src/index.ts @@ -1,8 +1,6 @@ export { Logger } from 'tslog' import { createLogger } from '@polymech/log' -import { Logger } from 'tslog' - export { MODULE_NAME } from './constants.js' export { sanitize } from './_cli.js' diff --git a/packages/i18n/src/lib/filters.ts b/packages/i18n/src/lib/filters.ts index 283e49fe..ef286366 100644 --- a/packages/i18n/src/lib/filters.ts +++ b/packages/i18n/src/lib/filters.ts @@ -1,50 +1,7 @@ import { logger } from "../index.js" import { sync as write } from "@polymech/fs/write" - -const frontMatter = require('front-matter') -const YAML = require('json-to-pretty-yaml') - -const index = (attrs: any, key: string) => Object.keys(attrs).indexOf(key) - -export const Hugo = (raw: string, translated: string, file:string ="") => { - let fm = {} - if (!frontMatter.test(raw)) { - return translated - } - fm = frontMatter(raw).attributes - - let fmTranslated: any = {} - try { - fmTranslated = frontMatter(translated) - } catch (e) { - write(file + "_e.md", translated) - } - - const translatedKeys = {} - - const keys = [ - 'title' - ] - - keys.forEach((k) => { - const e = Object.entries(fmTranslated.attributes) - const s = Object.entries(fm).findIndex((v) => v[0] == k) - const v = e[s][1] - translatedKeys[k] = v - }) - - const fmPatch = { - ...fm, - ...translatedKeys - } - - try { - return `---\n${YAML.stringify(fmPatch)}---\n${fmTranslated.body}` - } catch (e) { - logger.error(`Error, `, e) - } -} +import { parseFrontmatter, extractFrontmatter } from '@polymech/commons/frontmatter' export const Filters = { - Hugo + } \ No newline at end of file diff --git a/packages/i18n/src/lib/index.ts b/packages/i18n/src/lib/index.ts index b05c4369..b957a5fe 100644 --- a/packages/i18n/src/lib/index.ts +++ b/packages/i18n/src/lib/index.ts @@ -2,3 +2,4 @@ export * from './deepl.js' export * from './codes.js' export * from './filters.js' export * from './store.js' +export * from './translate.js' diff --git a/packages/i18n/src/lib/store.ts b/packages/i18n/src/lib/store.ts index 2a4c8d07..ddeaea29 100644 --- a/packages/i18n/src/lib/store.ts +++ b/packages/i18n/src/lib/store.ts @@ -5,7 +5,7 @@ import * as path from 'path' const removeNonPrintableCharacters = (text: string): string => text.replace(/[^\x20-\x7E]/g, '') -export const clean = (text: string = "") => text.trim() +const clean = (text: string = "") => text.trim() export const sortObjectKeysAlpha = (obj: Record): Record => { const sortedKeys = Object.keys(obj).sort(); diff --git a/packages/i18n/src/lib/translate.ts b/packages/i18n/src/lib/translate.ts index 4d4f4ef4..41fb43e9 100644 --- a/packages/i18n/src/lib/translate.ts +++ b/packages/i18n/src/lib/translate.ts @@ -1,9 +1,12 @@ import * as path from 'path' import { JSONPath } from 'jsonpath-plus' import { createHash } from 'crypto' -import { get_cached, set_cached } from '@polymech/osr-cache' + +import { get_cached, set_cached } from '@polymech/cache' + import { OSR_CACHE } from '@polymech/commons' import { CONFIG_DEFAULT } from '@polymech/commons' + import { resolve } from '@polymech/commons' import { isString, isArray, isObject, isNumber } from '@polymech/core/primitives' import { sync as read } from "@polymech/fs/read" @@ -14,9 +17,8 @@ import * as XLSX from 'xlsx' import { parse, stringify } from 'yaml' import pMap from 'p-map' import { minify as minify_html } from 'html-minifier-terser' - -const TOML = require('@iarna/toml') -const globBase = require('glob-base') +import { globBase } from '@polymech/commons' +import * as TOML from '@iarna/toml' import { targets, @@ -24,13 +26,13 @@ import { } from '../options.js' import { MODULE_NAME } from '../constants.js' - import { IOptions, TranslateFilter } from '../types.js' import { store, get } from './store.js' import * as deepl from './deepl.js' -import { logger as loggerDefault } from '../index.js' -let logger = loggerDefault +import { createLogger } from '@polymech/log' +let logger = createLogger('i18n') + const minify = false const extension = (file: string) => path.parse(file).ext @@ -322,10 +324,8 @@ export const translateTOML = async ( if (osr_cache && cached && options.cache) { return cached } - let srcContent = read(src) as string let toml = TOML.parse(srcContent) - toml = await translateObject(toml, src, options) if (osr_cache && options.cache) { @@ -375,8 +375,6 @@ export const translateFiles = async ( } export const translate = async (opts: IOptions) => { opts = parseOptions(opts as any, {}) - logger = opts.logger || loggerDefault - logger.settings.minLevel = opts.logLevel as any || 'warn' if (!opts.api_key) { logger.error('i18n : No API key provided') return @@ -445,7 +443,6 @@ export const translateText = async (text: string, srcLang: string, dstLang: stri } const config: any = CONFIG_DEFAULT() text = clean(text) - if (exists(options.store)) { const stored = storeGet(options.store, text) if (stored) { @@ -456,6 +453,10 @@ export const translateText = async (text: string, srcLang: string, dstLang: stri options.storeRoot = "${OSR_ROOT}/i18n-store" } if(!options.api_key){ + if(!config || !config.deepl || !config.deepl.auth_key){ + logger.error('i18n:translateText: No API key provided') + return text + } options.api_key = config.deepl.auth_key } const out: string[] = await translateDeepL(text, srcLang, dstLang, diff --git a/packages/i18n/src/lib/types.ts b/packages/i18n/src/lib/types.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/i18n/src/types.ts b/packages/i18n/src/types.ts index d4886f20..7248adff 100644 --- a/packages/i18n/src/types.ts +++ b/packages/i18n/src/types.ts @@ -1,6 +1,5 @@ import { Hash } from '@polymech/core' import { PATH_INFO } from '@polymech/commons/types' -import { Logger } from 'tslog' export type TranslateFilter = (raw: string, translated: string, file?: string) => string @@ -35,5 +34,4 @@ export type IOptions = { storeRoot?: string api_key?: string logLevel?: string - logger?: Logger }