@lingui/cli 4.0.0-next.0 → 4.0.0-next.2

package/build/api/catalog/getCatalogs.js

@@ -12,6 +12,7 @@ var _catalog = require("../catalog");
 var _utils = require("../utils");
 var _micromatch = _interopRequireDefault(require("micromatch"));
 var _formats = require("../formats");
+var _getExperimentalCatalogs = require("../../extract-experimental/getExperimentalCatalogs");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const NAME_PH = "{name}";
 const LOCALE_PH = "{locale}";
@@ -20,6 +21,7 @@ const LOCALE_PH = "{locale}";
  * Parse `config.catalogs` and return a list of configured Catalog instances.
  */
 function getCatalogs(config) {
+  var _config$experimental, _config$experimental$;
   const catalogsConfig = config.catalogs;
   const catalogs = [];
   catalogsConfig.forEach(catalog => {
@@ -65,6 +67,9 @@ function getCatalogs(config) {
       }, config));
     });
   });
+  if ((_config$experimental = config.experimental) !== null && _config$experimental !== void 0 && (_config$experimental$ = _config$experimental.extractor) !== null && _config$experimental$ !== void 0 && _config$experimental$.entries.length) {
+    catalogs.push(...(0, _getExperimentalCatalogs.getExperimentalCatalogs)(config));
+  }
   return catalogs;
 }
 
@@ -90,7 +95,7 @@ function getCatalogForMerge(config) {
 }
 function getCatalogForFile(file, catalogs) {
   for (const catalog of catalogs) {
-    const catalogFile = `${catalog.path}${catalog.format.catalogExtension}`;
+    const catalogFile = `${catalog.path}${catalog.format.getCatalogExtension()}`;
     const catalogGlob = (0, _utils.replacePlaceholders)(catalogFile, {
       locale: "*"
     });
@@ -112,7 +117,7 @@ function validateCatalogPath(path, config) {
   if (!path.endsWith(_utils.PATHSEP)) {
     return;
   }
-  const extension = (0, _formats.getFormat)(config.format).catalogExtension;
+  const extension = (0, _formats.getFormat)(config.format, config.formatOptions).getCatalogExtension();
   const correctPath = path.slice(0, -1);
   const examplePath = (0, _utils.replacePlaceholders)(correctPath, {
     locale: (config.locales || [])[0] || "en"

package/build/api/catalog/getTranslationsForCatalog.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getTranslationsForCatalog = getTranslationsForCatalog;
-function getTranslationsForCatalog(catalog, locale, options) {
-  const catalogs = catalog.readAll();
-  const template = catalog.readTemplate() || {};
+async function getTranslationsForCatalog(catalog, locale, options) {
+  const catalogs = await catalog.readAll();
+  const template = (await catalog.readTemplate()) || {};
   const sourceLocaleCatalog = catalogs[options.sourceLocale] || {};
   const input = {
     ...template,

package/build/api/catalog.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.cleanObsolete = exports.Catalog = void 0;
 exports.order = order;
-exports.orderByMessageId = orderByMessageId;
-exports.orderByOrigin = orderByOrigin;
+exports.orderByMessage = orderByMessage;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var R = _interopRequireWildcard(require("ramda"));
@@ -35,15 +34,15 @@ class Catalog {
     this.path = (0, _utils.normalizeRelativePath)(path);
     this.include = include.map(_utils.normalizeRelativePath);
     this.exclude = [this.localeDir, ...exclude.map(_utils.normalizeRelativePath)];
-    this.format = (0, _formats.getFormat)(config.format);
-    this.templateFile = templatePath || getTemplatePath(this.format, this.path);
+    this.format = (0, _formats.getFormat)(config.format, config.formatOptions);
+    this.templateFile = templatePath || getTemplatePath(this.format.getTemplateExtension(), this.path);
   }
   async make(options) {
     const nextCatalog = await this.collect({
       files: options.files
     });
     if (!nextCatalog) return false;
-    const prevCatalogs = this.readAll();
+    const prevCatalogs = await this.readAll();
     const catalogs = this.merge(prevCatalogs, nextCatalog, {
       overwrite: options.overwrite,
       files: options.files
@@ -56,11 +55,8 @@ class Catalog {
     // Sort messages
     order(options.orderBy)));
     const sortedCatalogs = cleanAndSort(catalogs);
-    if (options.locale) {
-      this.write(options.locale, sortedCatalogs[options.locale]);
-    } else {
-      this.writeAll(sortedCatalogs);
-    }
+    const locales = options.locale ? [options.locale] : this.locales;
+    await Promise.all(locales.map(locale => this.write(locale, sortedCatalogs[locale])));
     return sortedCatalogs;
   }
   async makeTemplate(options) {
@@ -69,7 +65,7 @@ class Catalog {
     });
     if (!catalog) return false;
     const sorted = order(options.orderBy)(catalog);
-    this.writeTemplate(sorted);
+    await this.writeTemplate(sorted);
     return sorted;
   }
 
@@ -111,33 +107,22 @@ class Catalog {
       return (0, _mergeCatalog.mergeCatalog)(prevCatalog, nextCatalog, this.config.sourceLocale === locale, options);
     }, prevCatalogs);
   }
-  getTranslations(locale, options) {
-    return (0, _getTranslationsForCatalog.getTranslationsForCatalog)(this, locale, options);
+  async getTranslations(locale, options) {
+    return await (0, _getTranslationsForCatalog.getTranslationsForCatalog)(this, locale, options);
   }
-  write(locale, messages) {
+  async write(locale, messages) {
     const filename = (0, _utils.replacePlaceholders)(this.path, {
       locale
-    }) + this.format.catalogExtension;
+    }) + this.format.getCatalogExtension();
     const created = !_fs.default.existsSync(filename);
-    const options = {
-      ...this.config.formatOptions,
-      locale
-    };
-    this.format.write(filename, messages, options);
+    await this.format.write(filename, messages, locale);
     return [created, filename];
   }
-  writeAll(catalogs) {
-    this.locales.forEach(locale => this.write(locale, catalogs[locale]));
-  }
-  writeTemplate(messages) {
+  async writeTemplate(messages) {
     const filename = this.templateFile;
-    const options = {
-      ...this.config.formatOptions,
-      locale: undefined
-    };
-    this.format.write(filename, messages, options);
+    await this.format.write(filename, messages, undefined);
   }
-  writeCompiled(locale, compiledCatalog, namespace) {
+  async writeCompiled(locale, compiledCatalog, namespace) {
     let ext;
     if (namespace === "es") {
       ext = "mjs";
@@ -149,23 +134,29 @@ class Catalog {
     const filename = `${(0, _utils.replacePlaceholders)(this.path, {
       locale
     })}.${ext}`;
-    (0, _utils.writeFile)(filename, compiledCatalog);
+    await (0, _utils.writeFile)(filename, compiledCatalog);
     return filename;
   }
-  read(locale) {
+  async read(locale) {
     const filename = (0, _utils.replacePlaceholders)(this.path, {
       locale
-    }) + this.format.catalogExtension;
-    return this.format.read(filename);
+    }) + this.format.getCatalogExtension();
+    return await this.format.read(filename, locale);
   }
-  readAll() {
-    return R.mergeAll(this.locales.map(locale => ({
-      [locale]: this.read(locale)
-    })));
-  }
-  readTemplate() {
+  async readAll() {
+    const res = {};
+    await Promise.all(this.locales.map(async locale => res[locale] = await this.read(locale)));
+
+    // statement above will save locales in object in undetermined order
+    // resort here to have keys order the same as in locales definition
+    return this.locales.reduce((acc, locale) => {
+      acc[locale] = res[locale];
+      return acc;
+    }, {});
+  }
+  async readTemplate() {
     const filename = this.templateFile;
-    return this.format.read(filename);
+    return await this.format.read(filename, undefined);
   }
   get sourcePaths() {
     const includeGlobs = this.include.map(includePath => {
@@ -194,8 +185,7 @@ class Catalog {
   }
 }
 exports.Catalog = Catalog;
-function getTemplatePath(format, path) {
-  const ext = format.templateExtension || format.catalogExtension;
+function getTemplatePath(ext, path) {
   return path.replace(LOCALE_SUFFIX_RE, "messages" + ext);
 }
 const cleanObsolete = R.filter(message => !message.obsolete);
@@ -203,6 +193,7 @@ exports.cleanObsolete = cleanObsolete;
 function order(by) {
   return {
     messageId: orderByMessageId,
+    message: orderByMessage,
     origin: orderByOrigin
   }[by];
 }
@@ -240,4 +231,15 @@ function orderByOrigin(messages) {
     acc[key] = messages[key];
     return acc;
   }, {});
+}
+function orderByMessage(messages) {
+  return Object.keys(messages).sort((a, b) => {
+    const aMsg = messages[a].message || "";
+    const bMsg = messages[b].message || "";
+    return aMsg.localeCompare(bMsg);
+  }).reduce((acc, key) => {
+    ;
+    acc[key] = messages[key];
+    return acc;
+  }, {});
 }

package/build/api/compile.js

@@ -26,6 +26,11 @@ function createCompiledCatalog(locale, messages, options) {
     obj[key] = compile(translation, shouldPseudolocalize);
     return obj;
   }, {});
+  if (namespace === "json") {
+    return JSON.stringify({
+      messages: compiledMessages
+    });
+  }
   const ast = buildExportStatement(
   //build JSON.parse(<compiledMessages>) statement
   t.callExpression(t.memberExpression(t.identifier("JSON"), t.identifier("parse")), [t.stringLiteral(JSON.stringify(compiledMessages))]), namespace);

package/build/api/extractors/babel.js

@@ -16,17 +16,23 @@ const extractor = {
   match(filename) {
     return babelRe.test(filename);
   },
-  async extract(filename, code, onMessageExtracted, linguiConfig, ctx) {
-    const parserOptions = linguiConfig.extractorParserOptions;
-    const parserPlugins = [
+  async extract(filename, code, onMessageExtracted, ctx) {
+    const parserOptions = ctx.linguiConfig.extractorParserOptions;
+
     // https://babeljs.io/docs/en/babel-parser#latest-ecmascript-features
-    ["decorators", {
-      decoratorsBeforeExport: (parserOptions === null || parserOptions === void 0 ? void 0 : parserOptions.decoratorsBeforeExport) || true
-    }]];
+    const parserPlugins = [];
     if ([/\.ts$/, /\.mts$/, /\.cts$/, /\.tsx$/].some(r => filename.match(r))) {
       parserPlugins.push("typescript");
-    } else if (parserOptions !== null && parserOptions !== void 0 && parserOptions.flow) {
-      parserPlugins.push("flow");
+      if (parserOptions.tsExperimentalDecorators) {
+        parserPlugins.push("decorators-legacy");
+      } else {
+        parserPlugins.push("decorators");
+      }
+    } else {
+      parserPlugins.push("decorators");
+      if (parserOptions !== null && parserOptions !== void 0 && parserOptions.flow) {
+        parserPlugins.push("flow");
+      }
     }
     if ([/\.jsx$/, /\.tsx$/].some(r => filename.match(r))) {
       parserPlugins.push("jsx");
@@ -58,7 +64,7 @@ const extractor = {
         resolvePath: source => require.resolve(source),
         lingui: {
           extract: true,
-          linguiConfig
+          linguiConfig: ctx.linguiConfig
         }
       }], [_babelPluginExtractMessages.default, {
         onMessageExtracted: msg => {

package/build/api/extractors/index.js

@@ -22,7 +22,9 @@ async function extract(filename, onMessageExtracted, linguiConfig, options) {
     if (!ext.match(filename)) continue;
     try {
       const file = await _promises.default.readFile(filename);
-      await ext.extract(filename, file.toString(), onMessageExtracted, linguiConfig);
+      await ext.extract(filename, file.toString(), onMessageExtracted, {
+        linguiConfig
+      });
       return true;
     } catch (e) {
       console.error(`Cannot process file ${filename} ${e.message}`);

package/build/api/formats/api/formatterWrapper.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FormatterWrapper = void 0;
+var _utils = require("../../utils");
+var _rethrownError = require("../../rethrownError");
+class FormatterWrapper {
+  constructor(f) {
+    this.f = f;
+  }
+  getCatalogExtension() {
+    return this.f.catalogExtension;
+  }
+  getTemplateExtension() {
+    return this.f.templateExtension || this.f.catalogExtension;
+  }
+  async write(filename, catalog, locale) {
+    const content = await this.f.serialize(catalog, {
+      locale,
+      existing: await (0, _utils.readFile)(filename),
+      filename
+    });
+    await (0, _utils.writeFileIfChanged)(filename, content);
+  }
+  async read(filename, locale) {
+    const content = await (0, _utils.readFile)(filename);
+    if (!content) {
+      return null;
+    }
+    try {
+      return this.f.parse(content, {
+        locale,
+        filename
+      });
+    } catch (e) {
+      throw new _rethrownError.RethrownError(`Cannot read ${filename}`, e);
+    }
+  }
+}
+exports.FormatterWrapper = FormatterWrapper;

package/build/api/formats/csv.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = _default;
 var _papaparse = _interopRequireDefault(require("papaparse"));
-var _utils = require("../utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const serialize = catalog => {
   const rawArr = Object.keys(catalog).map(key => [key, catalog[key].translation]);
@@ -27,26 +26,14 @@ const deserialize = raw => {
   });
   return messages;
 };
-const csv = {
-  catalogExtension: ".csv",
-  write(filename, catalog) {
-    const messages = serialize(catalog);
-    (0, _utils.writeFileIfChanged)(filename, messages);
-  },
-  read(filename) {
-    const raw = (0, _utils.readFile)(filename);
-    if (!raw) {
-      return null;
+function _default() {
+  return {
+    catalogExtension: ".csv",
+    parse(content) {
+      return deserialize(content);
+    },
+    serialize(catalog) {
+      return serialize(catalog);
     }
-    try {
-      return deserialize(raw);
-    } catch (e) {
-      throw new Error(`Cannot read ${filename}: ${e.message}`);
-    }
-  },
-  parse(content) {
-    return deserialize(content);
-  }
-};
-var _default = csv;
-exports.default = _default;
+  };
+}

package/build/api/formats/index.js

@@ -3,29 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "FormatterWrapper", {
+  enumerable: true,
+  get: function () {
+    return _formatterWrapper.FormatterWrapper;
+  }
+});
 exports.getFormat = getFormat;
-var _csv = _interopRequireDefault(require("./csv"));
-var _lingui = _interopRequireDefault(require("./lingui"));
-var _minimal = _interopRequireDefault(require("./minimal"));
-var _po = _interopRequireDefault(require("./po"));
-var _poGettext = _interopRequireDefault(require("./po-gettext"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _formatterWrapper = require("./api/formatterWrapper");
 const formats = {
-  lingui: _lingui.default,
-  minimal: _minimal.default,
-  po: _po.default,
-  csv: _csv.default,
-  "po-gettext": _poGettext.default
+  lingui: () => require("./lingui").default,
+  minimal: () => require("./minimal").default,
+  po: () => require("./po").default,
+  csv: () => require("./csv").default,
+  "po-gettext": () => require("./po-gettext").default
 };
-
-/**
- * @internal
- */
-
-function getFormat(name) {
-  const format = formats[name];
+function getFormat(_format, options) {
+  if (typeof _format !== "string") {
+    return new _formatterWrapper.FormatterWrapper(_format);
+  }
+  const format = formats[_format];
   if (!format) {
-    throw new Error(`Unknown format "${name}". Use one of following: ${Object.keys(formats).join(", ")}`);
+    throw new Error(`Unknown format "${_format}". Use one of following: ${Object.keys(formats).join(", ")}`);
   }
-  return format;
+  return new _formatterWrapper.FormatterWrapper(format()(options));
 }

package/build/api/formats/lingui.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = _default;
 var R = _interopRequireWildcard(require("ramda"));
-var _utils = require("../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const removeOrigins = R.map(({
@@ -14,39 +13,34 @@ const removeOrigins = R.map(({
 }) => message);
 const removeLineNumbers = R.map(message => {
   if (message.origin) {
-    message.origin.map(originValue => {
-      originValue.pop();
-      return originValue;
-    });
+    message.origin = message.origin.map(([file]) => [file]);
   }
   return message;
 });
-const lingui = {
-  catalogExtension: ".json",
-  write(filename, catalog, options) {
-    let outputCatalog = catalog;
-    if (options.origins === false) {
-      outputCatalog = removeOrigins(catalog);
+function _default(options = {}) {
+  options = {
+    origins: true,
+    lineNumbers: true,
+    ...options
+  };
+  return {
+    catalogExtension: ".json",
+    serialize(catalog, {
+      existing
+    }) {
+      let outputCatalog = catalog;
+      if (options.origins === false) {
+        outputCatalog = removeOrigins(outputCatalog);
+      }
+      if (options.origins !== false && options.lineNumbers === false) {
+        outputCatalog = removeLineNumbers(outputCatalog);
+      }
+      const shouldUseTrailingNewline = existing === null || (existing === null || existing === void 0 ? void 0 : existing.endsWith("\n"));
+      const trailingNewLine = shouldUseTrailingNewline ? "\n" : "";
+      return JSON.stringify(outputCatalog, null, 2) + trailingNewLine;
+    },
+    parse(content) {
+      return JSON.parse(content);
     }
-    if (options.origins !== false && options.lineNumbers === false) {
-      outputCatalog = removeLineNumbers(outputCatalog);
-    }
-    (0, _utils.writeFileIfChanged)(filename, JSON.stringify(outputCatalog, null, 2));
-  },
-  read(filename) {
-    const raw = (0, _utils.readFile)(filename);
-    if (!raw) {
-      return null;
-    }
-    try {
-      return JSON.parse(raw);
-    } catch (e) {
-      throw new Error(`Cannot read ${filename}: ${e.message}`);
-    }
-  },
-  parse(content) {
-    return content;
-  }
-};
-var _default = lingui;
-exports.default = _default;
+  };
+}

package/build/api/formats/minimal.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = _default;
 var R = _interopRequireWildcard(require("ramda"));
-var _utils = require("../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const serialize = R.map(message => message.translation || "");
@@ -15,30 +14,18 @@ const deserialize = R.map(translation => ({
   message: null,
   origin: []
 }));
-const minimal = {
-  catalogExtension: ".json",
-  write(filename, catalog) {
-    const messages = serialize(catalog);
-    let file = (0, _utils.readFile)(filename);
-    const shouldUseTrailingNewline = file === null || (file === null || file === void 0 ? void 0 : file.endsWith("\n"));
-    const trailingNewLine = shouldUseTrailingNewline ? "\n" : "";
-    (0, _utils.writeFile)(filename, `${JSON.stringify(messages, null, 2)}${trailingNewLine}`);
-  },
-  read(filename) {
-    const raw = (0, _utils.readFile)(filename);
-    if (!raw) {
-      return null;
+function _default() {
+  return {
+    catalogExtension: ".json",
+    serialize(catalog, {
+      existing
+    }) {
+      const shouldUseTrailingNewline = existing === null || (existing === null || existing === void 0 ? void 0 : existing.endsWith("\n"));
+      const trailingNewLine = shouldUseTrailingNewline ? "\n" : "";
+      return JSON.stringify(serialize(catalog), null, 2) + trailingNewLine;
+    },
+    parse(content) {
+      return deserialize(JSON.parse(content));
     }
-    try {
-      const rawCatalog = JSON.parse(raw);
-      return deserialize(rawCatalog);
-    } catch (e) {
-      throw new Error(`Cannot read ${filename}: ${e.message}`);
-    }
-  },
-  parse(content) {
-    return deserialize(content);
-  }
-};
-var _default = minimal;
-exports.default = _default;
+  };
+}