@formatjs/cli-lib 6.4.4 → 6.5.0

package/index.js

@@ -1,12 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = exports.compileAndWrite = exports.extract = exports.extractAndWrite = void 0;
+const tslib_1 = require("tslib");
 var extract_1 = require("./src/extract");
-Object.defineProperty(exports, "extractAndWrite", { enumerable: true, get: function () { return __importDefault(extract_1).default; } });
+Object.defineProperty(exports, "extractAndWrite", { enumerable: true, get: function () { return tslib_1.__importDefault(extract_1).default; } });
 Object.defineProperty(exports, "extract", { enumerable: true, get: function () { return extract_1.extract; } });
 var compile_1 = require("./src/compile");
-Object.defineProperty(exports, "compileAndWrite", { enumerable: true, get: function () { return __importDefault(compile_1).default; } });
+Object.defineProperty(exports, "compileAndWrite", { enumerable: true, get: function () { return tslib_1.__importDefault(compile_1).default; } });
 Object.defineProperty(exports, "compile", { enumerable: true, get: function () { return compile_1.compile; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/cli-lib",
-  "version": "6.4.4",
+  "version": "6.5.0",
   "description": "Lib for CLI for formatjs.",
   "keywords": [
     "intl",
@@ -34,17 +34,18 @@
     "@types/estree": "^1.0.0",
     "@types/fs-extra": "^9.0.1",
     "@types/json-stable-stringify": "^1.0.32",
-    "@types/node": "14 || 16 || 17",
+    "@types/node": "14 || 16 || 17 || 18",
     "chalk": "^4.0.0",
     "commander": "8",
     "fast-glob": "^3.2.7",
     "fs-extra": "10",
     "json-stable-stringify": "^1.0.1",
     "loud-rejection": "^2.2.0",
-    "tslib": "^2.4.0",
+    "tslib": "^2.7.0",
     "typescript": "5",
-    "@formatjs/icu-messageformat-parser": "2.7.9",
-    "@formatjs/ts-transformer": "3.13.15"
+    "@formatjs/icu-messageformat-parser": "2.7.10",
+    "@formatjs/ts-transformer": "3.13.16",
+    "@formatjs/icu-skeleton-parser": "1.8.4"
   },
   "peerDependencies": {
     "@glimmer/env": "^0.1.7",

package/src/cli.js

@@ -118,6 +118,8 @@ for more information`)
         .option('--skip-errors', `Whether to continue compiling messages after encountering an error. Any keys with errors will not be included in the output file.`)
         .option('--pseudo-locale <pseudoLocale>', `Whether to generate pseudo-locale files. See https://formatjs.io/docs/tooling/cli#--pseudo-locale-pseudolocale for possible values. 
 "--ast" is required for this to work.`)
+        .option('--ignore-tag', `Whether the parser to treat HTML/XML tags as string literal instead of parsing them as tag token. When this is false we only allow 
+simple tags without any attributes.`)
         .action(async (filePatterns, opts) => {
         (0, console_utils_1.debug)('File pattern:', filePatterns);
         (0, console_utils_1.debug)('Options:', opts);

package/src/compile.d.ts

@@ -26,6 +26,13 @@ export interface Opts {
      * Whether to compile to pseudo locale
      */
     pseudoLocale?: PseudoLocale;
+    /**
+     * Whether the parser to treat HTML/XML tags as string literal
+     * instead of parsing them as tag token.
+     * When this is false we only allow simple tags without
+     * any attributes
+     */
+    ignoreTag?: boolean;
 }
 /**
  * Aggregate `inputFiles` into a single JSON blob and compile.

package/src/compile.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compile = void 0;
+exports.compile = compile;
+exports.default = compileAndWrite;
 const tslib_1 = require("tslib");
 const icu_messageformat_parser_1 = require("@formatjs/icu-messageformat-parser");
 const fs_extra_1 = require("fs-extra");
@@ -19,7 +20,7 @@ const pseudo_locale_1 = require("./pseudo_locale");
  */
 async function compile(inputFiles, opts = {}) {
     (0, console_utils_1.debug)('Compiling files:', inputFiles);
-    const { ast, format, pseudoLocale, skipErrors } = opts;
+    const { ast, format, pseudoLocale, skipErrors, ignoreTag } = opts;
     const formatter = await (0, formatters_1.resolveBuiltinFormatter)(format);
     const messages = {};
     const messageAsts = {};
@@ -39,7 +40,7 @@ Message from ${inputFile}: ${compiled[id]}
 `);
             }
             try {
-                const msgAst = (0, icu_messageformat_parser_1.parse)(compiled[id]);
+                const msgAst = (0, icu_messageformat_parser_1.parse)(compiled[id], { ignoreTag });
                 messages[id] = compiled[id];
                 switch (pseudoLocale) {
                     case 'xx-LS':
@@ -76,7 +77,6 @@ Message from ${inputFile}: ${compiled[id]}
         cmp: formatter.compareMessages || undefined,
     });
 }
-exports.compile = compile;
 /**
  * Aggregate `inputFiles` into a single JSON blob and compile.
  * Also checks for conflicting IDs and write output to `outFile`.
@@ -93,4 +93,3 @@ async function compileAndWrite(inputFiles, compileOpts = {}) {
     }
     await (0, console_utils_1.writeStdout)(serializedResult);
 }
-exports.default = compileAndWrite;

package/src/compile_folder.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = compileFolder;
 const compile_1 = require("./compile");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -8,4 +9,3 @@ async function compileFolder(files, outFolder, opts = {}) {
     const outFiles = files.map(f => (0, path_1.join)(outFolder, (0, path_1.basename)(f)));
     return Promise.all(outFiles.map((outFile, i) => (0, fs_extra_1.outputFile)(outFile, results[i])));
 }
-exports.default = compileFolder;

package/src/console_utils.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export declare const writeStderr: (arg1: string | Uint8Array) => Promise<void>;
 export declare const writeStdout: (arg1: string | Uint8Array) => Promise<void>;
 export declare function clearLine(terminal: (typeof process)['stderr']): Promise<void>;

package/src/console_utils.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStdinAsString = exports.error = exports.warn = exports.debug = exports.clearLine = exports.writeStdout = exports.writeStderr = void 0;
+exports.writeStdout = exports.writeStderr = void 0;
+exports.clearLine = clearLine;
+exports.debug = debug;
+exports.warn = warn;
+exports.error = error;
+exports.getStdinAsString = getStdinAsString;
 const tslib_1 = require("tslib");
 const chalk_1 = require("chalk");
 const readline_1 = tslib_1.__importDefault(require("readline"));
@@ -28,7 +33,6 @@ async function clearLine(terminal) {
         await nativeCursorTo(terminal, 0, undefined);
     }
 }
-exports.clearLine = clearLine;
 const LEVEL_COLORS = {
     debug: chalk_1.green,
     warn: chalk_1.yellow,
@@ -45,19 +49,16 @@ async function debug(message, ...args) {
     await (0, exports.writeStderr)((0, util_1.format)(label('debug', message), ...args));
     await (0, exports.writeStderr)('\n');
 }
-exports.debug = debug;
 async function warn(message, ...args) {
     await clearLine(process.stderr);
     await (0, exports.writeStderr)((0, util_1.format)(label('warn', message), ...args));
     await (0, exports.writeStderr)('\n');
 }
-exports.warn = warn;
 async function error(message, ...args) {
     await clearLine(process.stderr);
     await (0, exports.writeStderr)((0, util_1.format)(label('error', message), ...args));
     await (0, exports.writeStderr)('\n');
 }
-exports.error = error;
 function getStdinAsString() {
     let result = '';
     return new Promise(resolve => {
@@ -73,4 +74,3 @@ function getStdinAsString() {
         });
     });
 }
-exports.getStdinAsString = getStdinAsString;

package/src/extract.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extract = void 0;
+exports.extract = extract;
+exports.default = extractAndWrite;
 const tslib_1 = require("tslib");
 const ts_transformer_1 = require("@formatjs/ts-transformer");
 const fs_extra_1 = require("fs-extra");
@@ -179,7 +180,6 @@ ${JSON.stringify(message, undefined, 2)}`);
         cmp: formatter.compareMessages || undefined,
     });
 }
-exports.extract = extract;
 /**
  * Extract strings from source files, also writes to a file.
  * @param files list of files
@@ -195,4 +195,3 @@ async function extractAndWrite(files, extractOpts) {
     }
     await (0, console_utils_1.writeStdout)(serializedResult);
 }
-exports.default = extractAndWrite;

package/src/formatters/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveBuiltinFormatter = void 0;
+exports.resolveBuiltinFormatter = resolveBuiltinFormatter;
 const tslib_1 = require("tslib");
 const path_1 = require("path");
 const url_1 = require("url");
@@ -38,4 +38,3 @@ async function resolveBuiltinFormatter(format) {
         throw e;
     }
 }
-exports.resolveBuiltinFormatter = resolveBuiltinFormatter;

package/src/gts_extractor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFile = void 0;
+exports.parseFile = parseFile;
 const content_tag_1 = require("content-tag");
 const hbs_extractor_1 = require("./hbs_extractor");
 const parse_script_1 = require("./parse_script");
@@ -15,4 +15,3 @@ function parseFile(source, fileName, options) {
         (0, hbs_extractor_1.parseFile)(parsed.contents, fileName, options);
     }
 }
-exports.parseFile = parseFile;

package/src/hbs_extractor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFile = void 0;
+exports.parseFile = parseFile;
 const ember_template_recast_1 = require("ember-template-recast");
 function extractText(node, fileName, options) {
     if (!options.onMsgExtracted)
@@ -46,4 +46,3 @@ function parseFile(source, fileName, options) {
     // but it does not affect runtime
     (0, ember_template_recast_1.transform)(source, visitor);
 }
-exports.parseFile = parseFile;

package/src/parse_script.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseScript = void 0;
+exports.parseScript = parseScript;
 const tslib_1 = require("tslib");
 const ts_transformer_1 = require("@formatjs/ts-transformer");
 const typescript_1 = tslib_1.__importDefault(require("typescript"));
@@ -48,4 +48,3 @@ ${e.message || ''}`;
         }
     };
 }
-exports.parseScript = parseScript;

package/src/pseudo_locale.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateENXB = exports.generateENXA = exports.generateXXHA = exports.generateXXAC = exports.generateXXLS = void 0;
+exports.generateXXLS = generateXXLS;
+exports.generateXXAC = generateXXAC;
+exports.generateXXHA = generateXXHA;
+exports.generateENXA = generateENXA;
+exports.generateENXB = generateENXB;
 const icu_messageformat_parser_1 = require("@formatjs/icu-messageformat-parser");
 function forEachLiteralElement(ast, fn) {
     ast.forEach(el => {
@@ -26,7 +30,6 @@ function generateXXLS(msg) {
     }
     return [...ast, { type: icu_messageformat_parser_1.TYPE.literal, value: 'SSSSSSSSSSSSSSSSSSSSSSSSS' }];
 }
-exports.generateXXLS = generateXXLS;
 function generateXXAC(msg) {
     const ast = typeof msg === 'string' ? (0, icu_messageformat_parser_1.parse)(msg) : msg;
     forEachLiteralElement(ast, el => {
@@ -34,7 +37,6 @@ function generateXXAC(msg) {
     });
     return ast;
 }
-exports.generateXXAC = generateXXAC;
 function generateXXHA(msg) {
     const ast = typeof msg === 'string' ? (0, icu_messageformat_parser_1.parse)(msg) : msg;
     const [firstChunk, ...rest] = ast;
@@ -44,7 +46,6 @@ function generateXXHA(msg) {
     }
     return [{ type: icu_messageformat_parser_1.TYPE.literal, value: '[javascript]' }, ...ast];
 }
-exports.generateXXHA = generateXXHA;
 const ACCENTED_MAP = {
     // ȦƁƇḒḖƑƓĦĪĴĶĿḾȠǾƤɊŘŞŦŬṼẆẊẎẐ
     // prettier-ignore
@@ -100,7 +101,6 @@ function generateENXA(msg) {
         { type: icu_messageformat_parser_1.TYPE.literal, value: ']' },
     ];
 }
-exports.generateENXA = generateENXA;
 /**
  * bidi - ɥsıʅƃuƎ ıpıԐ
  * -------------------
@@ -120,4 +120,3 @@ function generateENXB(msg) {
         { type: icu_messageformat_parser_1.TYPE.literal, value: '\u202c' },
     ];
 }
-exports.generateENXB = generateENXB;

package/src/vue_extractor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFile = void 0;
+exports.parseFile = parseFile;
 const compiler_core_1 = require("@vue/compiler-core");
 const compiler_sfc_1 = require("vue/compiler-sfc");
 function walk(node, visitor) {
@@ -69,4 +69,3 @@ function parseFile(source, filename, parseScriptFn) {
         parseScriptFn(scriptSetup.content);
     }
 }
-exports.parseFile = parseFile;