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

package/build/api/catalog/extractFromFiles.js

@@ -18,7 +18,7 @@ async function extractFromFiles(paths, config) {
         messages[next.id] = {
           message: next.message,
           context: next.context,
-          extractedComments: [],
+          comments: [],
           origin: []
         };
       }
@@ -32,7 +32,7 @@ async function extractFromFiles(paths, config) {
       }
       messages[next.id] = {
         ...prev,
-        extractedComments: next.comment ? [...prev.extractedComments, next.comment] : prev.extractedComments,
+        comments: next.comment ? [...prev.comments, next.comment] : prev.comments,
         origin: [...prev.origin, [filename, next.origin[1]]]
       };
     }, config, {

package/build/api/catalog/getCatalogs.js

@@ -20,12 +20,13 @@ const LOCALE_PH = "{locale}";
 /**
  * Parse `config.catalogs` and return a list of configured Catalog instances.
  */
-function getCatalogs(config) {
+async function getCatalogs(config) {
   var _config$experimental, _config$experimental$;
   const catalogsConfig = config.catalogs;
   const catalogs = [];
+  const format = await (0, _formats.getFormat)(config.format, config.formatOptions, config.sourceLocale);
   catalogsConfig.forEach(catalog => {
-    validateCatalogPath(catalog.path, config);
+    validateCatalogPath(catalog.path, format.getCatalogExtension());
     const include = ensureArray(catalog.include).map(_utils.normalizeRelativePath);
     const exclude = ensureArray(catalog.exclude).map(_utils.normalizeRelativePath);
 
@@ -40,7 +41,8 @@ function getCatalogs(config) {
         name: getCatalogName(catalog.path),
         path: (0, _utils.normalizeRelativePath)(catalog.path),
         include,
-        exclude
+        exclude,
+        format
       }, config));
       return;
     }
@@ -63,12 +65,13 @@ function getCatalogs(config) {
         })),
         exclude: exclude.map(path => (0, _utils.replacePlaceholders)(path, {
           name
-        }))
+        })),
+        format
       }, 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));
+    catalogs.push(...(await (0, _getExperimentalCatalogs.getExperimentalCatalogs)(config)));
   }
   return catalogs;
 }
@@ -84,13 +87,15 @@ const ensureArray = value => {
 /**
  * Create catalog for merged messages.
  */
-function getCatalogForMerge(config) {
-  validateCatalogPath(config.catalogsMergePath, config);
+async function getCatalogForMerge(config) {
+  const format = await (0, _formats.getFormat)(config.format, config.formatOptions, config.sourceLocale);
+  validateCatalogPath(config.catalogsMergePath, format.getCatalogExtension());
   return new _catalog.Catalog({
     name: getCatalogName(config.catalogsMergePath),
     path: (0, _utils.normalizeRelativePath)(config.catalogsMergePath),
     include: [],
-    exclude: []
+    exclude: [],
+    format
   }, config);
 }
 function getCatalogForFile(file, catalogs) {
@@ -113,14 +118,13 @@ function getCatalogForFile(file, catalogs) {
 /**
  *  Validate that `catalogPath` doesn't end with trailing slash
  */
-function validateCatalogPath(path, config) {
+function validateCatalogPath(path, extension) {
   if (!path.endsWith(_utils.PATHSEP)) {
     return;
   }
-  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"
+    locale: "en"
   }) + extension;
   throw new Error(
   // prettier-ignore

package/build/api/catalog.js

@@ -11,7 +11,6 @@ var _path = _interopRequireDefault(require("path"));
 var R = _interopRequireWildcard(require("ramda"));
 var _glob = _interopRequireDefault(require("glob"));
 var _normalizePath = _interopRequireDefault(require("normalize-path"));
-var _formats = require("./formats");
 var _getTranslationsForCatalog = require("./catalog/getTranslationsForCatalog");
 var _mergeCatalog = require("./catalog/mergeCatalog");
 var _extractFromFiles = require("./catalog/extractFromFiles");
@@ -27,6 +26,7 @@ class Catalog {
     path,
     include,
     templatePath,
+    format,
     exclude = []
   }, config) {
     this.config = config;
@@ -34,7 +34,7 @@ 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, config.formatOptions);
+    this.format = format;
     this.templateFile = templatePath || getTemplatePath(this.format.getTemplateExtension(), this.path);
   }
   async make(options) {

package/build/api/formats/{api/formatterWrapper.js → formatterWrapper.js}

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FormatterWrapper = void 0;
-var _utils = require("../../utils");
-var _rethrownError = require("../../rethrownError");
+var _utils = require("../utils");
+var _rethrownError = require("../rethrownError");
 class FormatterWrapper {
-  constructor(f) {
+  constructor(f, sourceLocale) {
     this.f = f;
+    this.sourceLocale = sourceLocale;
   }
   getCatalogExtension() {
     return this.f.catalogExtension;
@@ -19,6 +20,7 @@ class FormatterWrapper {
   async write(filename, catalog, locale) {
     const content = await this.f.serialize(catalog, {
       locale,
+      sourceLocale: this.sourceLocale,
       existing: await (0, _utils.readFile)(filename),
       filename
     });
@@ -32,6 +34,7 @@ class FormatterWrapper {
     try {
       return this.f.parse(content, {
         locale,
+        sourceLocale: this.sourceLocale,
         filename
       });
     } catch (e) {

package/build/api/formats/index.js

@@ -10,21 +10,48 @@ Object.defineProperty(exports, "FormatterWrapper", {
   }
 });
 exports.getFormat = getFormat;
-var _formatterWrapper = require("./api/formatterWrapper");
+var _formatterWrapper = require("./formatterWrapper");
+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; }
+function createDeprecationError(packageName, format, installCode) {
+  const installCmd = (0, _utils.makeInstall)(packageName);
+  return `
+Format \`${format}\` is no longer included in \`@lingui/cli\` by default.
+You need to install it using ${installCmd} command and add to your \`lingui.config.{js,ts}\`:
+        
+import { formatter } from "${packageName}"
+
+export default {
+  [...]
+  format: ${installCode}
+}
+`.trim();
+}
+
+// Introduced in v4. Remove this deprecation in v5
 const formats = {
-  lingui: () => require("./lingui").default,
-  minimal: () => require("./minimal").default,
-  po: () => require("./po").default,
-  csv: () => require("./csv").default,
-  "po-gettext": () => require("./po-gettext").default
+  lingui: async () => {
+    throw new Error(createDeprecationError("@lingui/format-json", "lingui", 'formatter({style: "lingui"})'));
+  },
+  minimal: async () => {
+    throw new Error(createDeprecationError("@lingui/format-json", "minimal", 'formatter({style: "minimal"})'));
+  },
+  po: async () => (await Promise.resolve().then(() => _interopRequireWildcard(require("@lingui/format-po")))).formatter,
+  csv: async () => {
+    throw new Error(createDeprecationError("@lingui/format-csv", "csv", "formatter()"));
+  },
+  "po-gettext": async () => {
+    throw new Error(createDeprecationError("@lingui/format-po-gettext", "po-gettext", "formatter()"));
+  }
 };
-function getFormat(_format, options) {
+async function getFormat(_format, options, sourceLocale) {
   if (typeof _format !== "string") {
-    return new _formatterWrapper.FormatterWrapper(_format);
+    return new _formatterWrapper.FormatterWrapper(_format, sourceLocale);
   }
   const format = formats[_format];
   if (!format) {
     throw new Error(`Unknown format "${_format}". Use one of following: ${Object.keys(formats).join(", ")}`);
   }
-  return new _formatterWrapper.FormatterWrapper(format()(options));
+  return new _formatterWrapper.FormatterWrapper((await format())(options), sourceLocale);
 }

package/build/api/utils.js

@@ -87,9 +87,9 @@ async function writeFileIfChanged(filename, newContent) {
 function hasYarn() {
   return _fs.default.existsSync(_path.default.resolve("yarn.lock"));
 }
-function makeInstall() {
+function makeInstall(packageName, dev = false) {
   const withYarn = hasYarn();
-  return (packageName, dev = false) => withYarn ? `yarn add ${dev ? "--dev " : ""}${packageName}` : `npm install ${dev ? "--save-dev" : "--save"} ${packageName}`;
+  return withYarn ? `yarn add ${dev ? "--dev " : ""}${packageName}` : `npm install ${dev ? "--save-dev" : "--save"} ${packageName}`;
 }
 
 /**

package/build/extract-experimental/getExperimentalCatalogs.js

@@ -9,19 +9,20 @@ var _resolveCatalogPath = require("./resolveCatalogPath");
 var _catalog = require("../api/catalog");
 var _resolveTemplatePath = require("./resolveTemplatePath");
 var _api = require("@lingui/cli/api");
-function getExperimentalCatalogs(linguiConfig) {
+async function getExperimentalCatalogs(linguiConfig) {
   const config = linguiConfig.experimental.extractor;
   const entryPoints = (0, _getEntryPoints.getEntryPoints)(config.entries);
+  const format = await (0, _api.getFormat)(linguiConfig.format, linguiConfig.formatOptions, linguiConfig.sourceLocale);
   return entryPoints.map(entryPoint => {
     const catalogPath = (0, _resolveCatalogPath.resolveCatalogPath)(config.output, entryPoint, linguiConfig.rootDir, undefined, "");
-    const format = (0, _api.getFormat)(linguiConfig.format, linguiConfig.formatOptions);
     const templatePath = (0, _resolveTemplatePath.resolveTemplatePath)(entryPoint, config.output, linguiConfig.rootDir, format.getTemplateExtension());
     return new _catalog.Catalog({
       name: undefined,
       path: catalogPath,
       templatePath,
       include: [],
-      exclude: []
+      exclude: [],
+      format
     }, linguiConfig);
   });
 }

package/build/lingui-compile.js

@@ -17,7 +17,7 @@ var _utils = require("./api/utils");
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function command(config, options) {
-  const catalogs = (0, _api.getCatalogs)(config);
+  const catalogs = await (0, _api.getCatalogs)(config);
 
   // Check config.compile.merge if catalogs for current locale are to be merged into a single compiled file
   const doMerge = !!config.catalogsMergePath;
@@ -73,7 +73,7 @@ async function command(config, options) {
       }
     }
     if (doMerge) {
-      const compileCatalog = (0, _getCatalogs.getCatalogForMerge)(config);
+      const compileCatalog = await (0, _getCatalogs.getCatalogForMerge)(config);
       const namespace = options.namespace || config.compileNamespace;
       const compiledCatalog = (0, _compile.createCompiledCatalog)(locale, mergedCatalogs, {
         strict: false,
@@ -127,22 +127,24 @@ if (require.main === module) {
   // Check if Watch Mode is enabled
   if (options.watch) {
     console.info(_chalk.default.bold("Initializing Watch Mode..."));
-    const catalogs = (0, _api.getCatalogs)(config);
-    let paths = [];
-    const catalogExtension = (0, _api.getFormat)(config.format, config.formatOptions).getCatalogExtension();
-    config.locales.forEach(locale => {
-      catalogs.forEach(catalog => {
-        paths.push(`${catalog.path.replace(/{locale}/g, locale).replace(/{name}/g, "*")}${catalogExtension}`);
+    (async function initWatch() {
+      const format = await (0, _api.getFormat)(config.format, config.formatOptions, config.sourceLocale);
+      const catalogs = await (0, _api.getCatalogs)(config);
+      const paths = [];
+      config.locales.forEach(locale => {
+        catalogs.forEach(catalog => {
+          paths.push(`${catalog.path.replace(/{locale}/g, locale).replace(/{name}/g, "*")}${format.getCatalogExtension()}`);
+        });
       });
-    });
-    const watcher = _chokidar.default.watch(paths, {
-      persistent: true
-    });
-    const onReady = () => {
-      console.info(_chalk.default.green.bold("Watcher is ready!"));
-      watcher.on("add", () => dispatchCompile()).on("change", () => dispatchCompile());
-    };
-    watcher.on("ready", () => onReady());
+      const watcher = _chokidar.default.watch(paths, {
+        persistent: true
+      });
+      const onReady = () => {
+        console.info(_chalk.default.green.bold("Watcher is ready!"));
+        watcher.on("add", () => dispatchCompile()).on("change", () => dispatchCompile());
+      };
+      watcher.on("ready", () => onReady());
+    })();
   } else {
     compile().then(results => {
       if (!results) {

package/build/lingui-extract-experimental.js

@@ -33,7 +33,7 @@ async function command(linguiConfig, options) {
   const bundleResult = await (0, _bundleSource.bundleSource)(config, (0, _getEntryPoints.getEntryPoints)(config.entries), tempDir, linguiConfig.rootDir);
   const stats = [];
   let commandSuccess = true;
-  const format = (0, _formats.getFormat)(linguiConfig.format, linguiConfig.formatOptions);
+  const format = await (0, _formats.getFormat)(linguiConfig.format, linguiConfig.formatOptions, linguiConfig.sourceLocale);
   for (const outFile of Object.keys(bundleResult.metafile.outputs)) {
     const messages = await (0, _extractFromFiles.extractFromFiles)([outFile], linguiConfig);
     const {

package/build/lingui-extract-template.js

@@ -13,7 +13,7 @@ var _utils = require("./api/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function command(config, options) {
   options.verbose && console.log("Extracting messages from source files…");
-  const catalogs = (0, _api.getCatalogs)(config);
+  const catalogs = await (0, _api.getCatalogs)(config);
   const catalogStats = {};
   let commandSuccess = true;
   await Promise.all(catalogs.map(async catalog => {

package/build/lingui-extract.js

@@ -19,7 +19,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 async function command(config, options) {
   options.verbose && console.log("Extracting messages from source files…");
-  const catalogs = (0, _api.getCatalogs)(config);
+  const catalogs = await (0, _api.getCatalogs)(config);
   const catalogStats = {};
   let commandSuccess = true;
   const spinner = (0, _ora.default)().start();
@@ -111,22 +111,24 @@ if (require.main === module) {
   // Check if Watch Mode is enabled
   if (options.watch) {
     console.info(_chalk.default.bold("Initializing Watch Mode..."));
-    const catalogs = (0, _api.getCatalogs)(config);
-    let paths = [];
-    let ignored = [];
-    catalogs.forEach(catalog => {
-      paths.push(...catalog.include);
-      ignored.push(...catalog.exclude);
-    });
-    const watcher = _chokidar.default.watch(paths, {
-      ignored: ["/(^|[/\\])../", ...ignored],
-      persistent: true
-    });
-    const onReady = () => {
-      console.info(_chalk.default.green.bold("Watcher is ready!"));
-      watcher.on("add", path => dispatchExtract([path])).on("change", path => dispatchExtract([path]));
-    };
-    watcher.on("ready", () => onReady());
+    (async function initWatch() {
+      const catalogs = await (0, _api.getCatalogs)(config);
+      let paths = [];
+      let ignored = [];
+      catalogs.forEach(catalog => {
+        paths.push(...catalog.include);
+        ignored.push(...catalog.exclude);
+      });
+      const watcher = _chokidar.default.watch(paths, {
+        ignored: ["/(^|[/\\])../", ...ignored],
+        persistent: true
+      });
+      const onReady = () => {
+        console.info(_chalk.default.green.bold("Watcher is ready!"));
+        watcher.on("add", path => dispatchExtract([path])).on("change", path => dispatchExtract([path]));
+      };
+      watcher.on("ready", () => onReady());
+    })();
   } else if (_commander.program.args) {
     // this behaviour occurs when we extract files by his name
     // for ex: lingui extract src/app, this will extract only files included in src/app

package/build/tests.js

@@ -17,6 +17,7 @@ var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
 var _catalog = require("./api/catalog");
 var _conf = require("@lingui/conf");
+var _api = require("./api");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function copyFixture(fixtureDir) {
   const tmpDir = await _fs.default.promises.mkdtemp(_path.default.join(_os.default.tmpdir(), `lingui-test-${process.pid}`));
@@ -54,15 +55,17 @@ const defaultMergeOptions = {
 exports.defaultMergeOptions = defaultMergeOptions;
 const normalizeLineEndings = str => str.replace(/\r?\n/g, "\r\n");
 exports.normalizeLineEndings = normalizeLineEndings;
-const makeCatalog = (config = {}) => {
+const makeCatalog = async (_config = {}) => {
+  const config = (0, _conf.makeConfig)(_config, {
+    skipValidation: true
+  });
   return new _catalog.Catalog({
     name: "messages",
     path: "{locale}/messages",
     include: [],
-    exclude: []
-  }, (0, _conf.makeConfig)(config, {
-    skipValidation: true
-  }));
+    exclude: [],
+    format: await (0, _api.getFormat)(config.format, config.formatOptions, config.sourceLocale)
+  }, config);
 };
 exports.makeCatalog = makeCatalog;
 function makePrevMessage(message = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.0.0-next.2",
+  "version": "4.0.0-next.4",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -50,10 +50,10 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "^4.0.0-next.2",
-    "@lingui/conf": "^4.0.0-next.2",
-    "@lingui/core": "^4.0.0-next.2",
-    "@messageformat/parser": "^5.0.0",
+    "@lingui/babel-plugin-extract-messages": "^4.0.0-next.4",
+    "@lingui/conf": "^4.0.0-next.4",
+    "@lingui/core": "^4.0.0-next.4",
+    "@lingui/format-po": "^4.0.0-next.4",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
@@ -65,13 +65,9 @@
     "glob": "^7.1.4",
     "inquirer": "^7.3.3",
     "micromatch": "4.0.2",
-    "mkdirp": "^1.0.4",
-    "node-gettext": "^3.0.0",
     "normalize-path": "^3.0.0",
     "ora": "^5.1.0",
-    "papaparse": "^5.3.0",
     "pkg-up": "^3.1.0",
-    "plurals-cldr": "^1.0.4",
     "pofile": "^1.1.4",
     "pseudolocale": "^1.1.0",
     "ramda": "^0.27.1",
@@ -82,10 +78,8 @@
     "@types/convert-source-map": "^2.0.0",
     "@types/micromatch": "^4.0.1",
     "@types/normalize-path": "^3.0.0",
-    "@types/papaparse": "^5.2.3",
-    "@types/plurals-cldr": "^1.0.1",
     "mock-fs": "^5.2.0",
-    "mockdate": "^3.0.2"
+    "mockdate": "^3.0.5"
   },
-  "gitHead": "556ab57e20c2ac9d384a22424c6a90c2ba0dd133"
+  "gitHead": "3b999e35d26e67dec7cf0591f794be782e11022c"
 }

package/build/api/formats/csv.js

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _papaparse = _interopRequireDefault(require("papaparse"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const serialize = catalog => {
-  const rawArr = Object.keys(catalog).map(key => [key, catalog[key].translation]);
-  return _papaparse.default.unparse(rawArr);
-};
-const deserialize = raw => {
-  const rawCatalog = _papaparse.default.parse(raw);
-  const messages = {};
-  if (rawCatalog.errors.length) {
-    throw new Error(rawCatalog.errors.map(err => JSON.stringify(err)).join(";"));
-  }
-  rawCatalog.data.forEach(([key, translation]) => {
-    messages[key] = {
-      translation,
-      obsolete: false,
-      message: null,
-      origin: []
-    };
-  });
-  return messages;
-};
-function _default() {
-  return {
-    catalogExtension: ".csv",
-    parse(content) {
-      return deserialize(content);
-    },
-    serialize(catalog) {
-      return serialize(catalog);
-    }
-  };
-}

package/build/api/formats/lingui.js

@@ -1,46 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var R = _interopRequireWildcard(require("ramda"));
-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(({
-  origin,
-  ...message
-}) => message);
-const removeLineNumbers = R.map(message => {
-  if (message.origin) {
-    message.origin = message.origin.map(([file]) => [file]);
-  }
-  return message;
-});
-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);
-    }
-  };
-}

package/build/api/formats/minimal.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var R = _interopRequireWildcard(require("ramda"));
-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 || "");
-const deserialize = R.map(translation => ({
-  translation,
-  obsolete: false,
-  message: null,
-  origin: []
-}));
-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));
-    }
-  };
-}

package/build/api/formats/po-gettext.js

@@ -1,225 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-exports.parse = parse;
-exports.serialize = void 0;
-var _dateFns = require("date-fns");
-var _parser = require("@messageformat/parser");
-var _pluralsCldr = _interopRequireDefault(require("plurals-cldr"));
-var _pofile = _interopRequireDefault(require("pofile"));
-var _plurals = _interopRequireDefault(require("node-gettext/lib/plurals"));
-var _po = require("./po");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @ts-ignore
-
-function getCreateHeaders(language) {
-  return {
-    "POT-Creation-Date": (0, _dateFns.format)(new Date(), "yyyy-MM-dd HH:mmxxxx"),
-    "MIME-Version": "1.0",
-    "Content-Type": "text/plain; charset=utf-8",
-    "Content-Transfer-Encoding": "8bit",
-    "X-Generator": "@lingui/cli",
-    ...(language ? {
-      Language: language
-    } : {})
-  };
-}
-
-// Attempts to turn a single tokenized ICU plural case back into a string.
-function stringifyICUCase(icuCase) {
-  return icuCase.tokens.map(token => {
-    if (token.type === "content") {
-      return token.value;
-    } else if (token.type === "octothorpe") {
-      return "#";
-    } else if (token.type === "argument") {
-      return "{" + token.arg + "}";
-    } else {
-      console.warn(`Unexpected token "${token}" while stringifying plural case "${icuCase}". Token will be ignored.`);
-      return "";
-    }
-  }).join("");
-}
-const ICU_PLURAL_REGEX = /^{.*, plural, .*}$/;
-const ICU_SELECT_REGEX = /^{.*, select(Ordinal)?, .*}$/;
-const LINE_ENDINGS = /\r?\n/g;
-
-// Prefix that is used to identitify context information used by this module in PO's "extracted comments".
-const CTX_PREFIX = "js-lingui:";
-function serializePlurals(item, message, id, isGeneratedId, options) {
-  // Depending on whether custom ids are used by the developer, the (potential plural) "original", untranslated ICU
-  // message can be found in `message.message` or in the item's `key` itself.
-  const icuMessage = message.message;
-  if (!icuMessage) {
-    return;
-  }
-  const _simplifiedMessage = icuMessage.replace(LINE_ENDINGS, " ");
-
-  // Quick check to see if original message is a plural localization.
-  if (ICU_PLURAL_REGEX.test(_simplifiedMessage)) {
-    try {
-      var _message$translation;
-      const messageAst = (0, _parser.parse)(icuMessage)[0];
-
-      // Check if any of the plural cases contain plurals themselves.
-      if (messageAst.cases.some(icuCase => icuCase.tokens.some(token => token.type === "plural"))) {
-        console.warn(`Nested plurals cannot be expressed with gettext plurals. ` + `Message with key "%s" will not be saved correctly.`, id);
-      }
-
-      // Store placeholder that is pluralized upon to allow restoring ICU format later.
-      const ctx = new URLSearchParams({
-        pluralize_on: messageAst.arg
-      });
-      if (isGeneratedId) {
-        // For messages without developer-set ID, use first case as `msgid` and the last case as `msgid_plural`.
-        // This does not necessarily make sense for development languages with more than two numbers, but gettext
-        // only supports exactly two plural forms.
-        item.msgid = stringifyICUCase(messageAst.cases[0]);
-        item.msgid_plural = stringifyICUCase(messageAst.cases[messageAst.cases.length - 1]);
-
-        // Since the original msgid is overwritten, store ICU message to allow restoring that ID later.
-        ctx.set("icu", icuMessage);
-      } else {
-        // For messages with developer-set ID, append `_plural` to the key to generate `msgid_plural`.
-        item.msgid_plural = id + "_plural";
-      }
-      ctx.sort();
-      item.extractedComments.push(CTX_PREFIX + ctx.toString());
-
-      // If there is a translated value, parse that instead of the original message to prevent overriding localized
-      // content with the original message. If there is no translated value, don't touch msgstr, since marking item as
-      // plural (above) already causes `pofile` to automatically generate `msgstr[0]` and `msgstr[1]`.
-      if (((_message$translation = message.translation) === null || _message$translation === void 0 ? void 0 : _message$translation.length) > 0) {
-        const ast = (0, _parser.parse)(message.translation)[0];
-        if (ast.cases == null) {
-          console.warn(`Found translation without plural cases for key "${id}". ` + `This likely means that a translated .po file misses multiple msgstr[] entries for the key. ` + `Translation found: "${message.translation}"`);
-          item.msgstr = [message.translation];
-        } else {
-          item.msgstr = ast.cases.map(stringifyICUCase);
-        }
-      }
-    } catch (e) {
-      console.error(`Error parsing message ICU for key "${id}":`, e);
-    }
-  } else {
-    if (!options.disableSelectWarning && ICU_SELECT_REGEX.test(_simplifiedMessage)) {
-      console.warn(`ICU 'select' and 'selectOrdinal' formats cannot be expressed natively in gettext format. ` + `Item with key "%s" will be included in the catalog as raw ICU message. ` + `To disable this warning, include '{ disableSelectWarning: true }' in the config's 'formatOptions'`, id);
-    }
-    item.msgstr = [message.translation];
-  }
-  return item;
-}
-const serialize = (catalog, options) => {
-  return (0, _po.serialize)(catalog, options, (item, message, id, isGeneratedId) => serializePlurals(item, message, id, isGeneratedId, options));
-};
-
-/**
- * Returns ICU case labels in the order that gettext lists localized messages, e.g. 0,1,2 => `["one", "two", "other"]`.
- *
- * Obtaining the ICU case labels for gettext-supported inputs (gettext doesn't support fractions, even though some
- * languages have a separate case for fractional numbers) works by applying the CLDR selector to the example values
- * listed in the node-gettext plurals module.
- *
- * This approach is heavily influenced by
- * https://github.com/LLK/po2icu/blob/9eb97f81f72b2fee02b77f1424702e019647e9b9/lib/po2icu.js#L148.
- */
-exports.serialize = serialize;
-const getPluralCases = lang => {
-  // If users uses locale with underscore or slash, es-ES, es_ES, gettextplural is "es" not es-ES.
-  const [correctLang] = lang.split(/[-_]/g);
-  const gettextPluralsInfo = _plurals.default[correctLang];
-  return gettextPluralsInfo === null || gettextPluralsInfo === void 0 ? void 0 : gettextPluralsInfo.examples.map(pluralCase => (0, _pluralsCldr.default)(correctLang, pluralCase.sample));
-};
-const convertPluralsToICU = (item, pluralForms, lang) => {
-  var _item$extractedCommen;
-  const translationCount = item.msgstr.length;
-  const messageKey = item.msgid;
-
-  // Messages without multiple translations (= plural cases) need no further processing.
-  if (translationCount <= 1 && !item.msgid_plural) {
-    return;
-  }
-
-  // msgid_plural must be set, but its actual value is not important.
-  if (!item.msgid_plural) {
-    console.warn(`Multiple translations for item with key "%s" but missing 'msgid_plural' in catalog "${lang}". This is not supported and the plural cases will be ignored.`, messageKey);
-    return;
-  }
-  const contextComment = (_item$extractedCommen = item.extractedComments.find(comment => comment.startsWith(CTX_PREFIX))) === null || _item$extractedCommen === void 0 ? void 0 : _item$extractedCommen.substr(CTX_PREFIX.length);
-  const ctx = new URLSearchParams(contextComment);
-  if (contextComment != null) {
-    item.extractedComments = item.extractedComments.filter(comment => !comment.startsWith(CTX_PREFIX));
-  }
-
-  // If an original ICU was stored, use that as `msgid` to match the catalog that was originally exported.
-  const storedICU = ctx.get("icu");
-  if (storedICU != null) {
-    item.msgid = storedICU;
-  }
-
-  // If all translations are empty, ignore item.
-  if (item.msgstr.every(str => str.length === 0)) {
-    return;
-  }
-  if (pluralForms == null) {
-    console.warn(`Multiple translations for item with key "%s" in language "${lang}", but no plural cases were found. ` + `This prohibits the translation of .po plurals into ICU plurals. Pluralization will not work for this key.`, messageKey);
-    return;
-  }
-  const pluralCount = pluralForms.length;
-  if (translationCount > pluralCount) {
-    console.warn(`More translations provided (${translationCount}) for item with key "%s" in language "${lang}" than there are plural cases available (${pluralCount}). ` + `This will result in not all translations getting picked up.`, messageKey);
-  }
-
-  // Map each msgstr to a "<pluralform> {<translated_string>}" entry, joined by one space.
-  const pluralClauses = item.msgstr.map((str, index) => pluralForms[index] + " {" + str + "}").join(" ");
-
-  // Find out placeholder name from item's message context, defaulting to "count".
-  let pluralizeOn = ctx.get("pluralize_on");
-  if (!pluralizeOn) {
-    console.warn(`Unable to determine plural placeholder name for item with key "%s" in language "${lang}" (should be stored in a comment starting with "#. ${CTX_PREFIX}"), assuming "count".`, messageKey);
-    pluralizeOn = "count";
-  }
-  item.msgstr = ["{" + pluralizeOn + ", plural, " + pluralClauses + "}"];
-};
-function parse(raw) {
-  const po = _pofile.default.parse(raw);
-
-  // .po plurals are numbered 0-N and need to be mapped to ICU plural classes ("one", "few", "many"...). Different
-  // languages can have different plural classes (some start with "zero", some with "one"), so read that data from CLDR.
-  // `pluralForms` may be `null` if lang is not found. As long as no plural is used, don't report an error.
-  let pluralForms = getPluralCases(po.headers.Language);
-  return (0, _po.deserialize)(po.items, item => {
-    convertPluralsToICU(item, pluralForms, po.headers.Language);
-  });
-}
-function _default(options = {}) {
-  options = {
-    origins: true,
-    lineNumbers: true,
-    ...options
-  };
-  return {
-    catalogExtension: ".po",
-    templateExtension: ".pot",
-    parse(content) {
-      return parse(content);
-    },
-    serialize(catalog, ctx) {
-      let po;
-      if (ctx.existing) {
-        po = _pofile.default.parse(ctx.existing);
-      } else {
-        po = new _pofile.default();
-        po.headers = getCreateHeaders(ctx.locale)
-        // accessing private property
-        ;
-        po.headerOrder = Object.keys(po.headers);
-      }
-      po.items = serialize(catalog, options);
-      return po.toString();
-    }
-  };
-}

package/build/api/formats/po.js

@@ -1,125 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-exports.deserialize = deserialize;
-exports.serialize = void 0;
-var _dateFns = require("date-fns");
-var _pofile = _interopRequireDefault(require("pofile"));
-var _utils = require("../utils");
-var _generateMessageId = require("../generateMessageId");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function isGeneratedId(id, message) {
-  return id === (0, _generateMessageId.generateMessageId)(message.message, message.context);
-}
-function getCreateHeaders(language) {
-  return {
-    "POT-Creation-Date": (0, _dateFns.format)(new Date(), "yyyy-MM-dd HH:mmxxxx"),
-    "MIME-Version": "1.0",
-    "Content-Type": "text/plain; charset=utf-8",
-    "Content-Transfer-Encoding": "8bit",
-    "X-Generator": "@lingui/cli",
-    ...(language ? {
-      Language: language
-    } : {})
-  };
-}
-const EXPLICIT_ID_FLAG = "explicit-id";
-const serialize = (catalog, options, postProcessItem) => {
-  return Object.keys(catalog).map(id => {
-    const message = catalog[id];
-    const item = new _pofile.default.Item();
-
-    // The extractedComments array may be modified in this method,
-    // so create a new array with the message's elements.
-    item.extractedComments = [...(message.extractedComments || [])];
-    item.flags = (message.flags || []).reduce((acc, flag) => {
-      acc[flag] = true;
-      return acc;
-    }, {});
-    const _isGeneratedId = isGeneratedId(id, message);
-    if (_isGeneratedId) {
-      item.msgid = message.message;
-      if (!item.extractedComments.find(c => c.includes("js-lingui-id"))) {
-        item.extractedComments.push(`js-lingui-id: ${id}`);
-      }
-    } else {
-      item.flags[EXPLICIT_ID_FLAG] = true;
-      item.msgid = id;
-    }
-    if (message.context) {
-      item.msgctxt = message.context;
-    }
-    item.msgstr = [message.translation];
-    item.comments = message.comments || [];
-    if (options.origins !== false) {
-      if (message.origin && options.lineNumbers === false) {
-        item.references = message.origin.map(([path]) => path);
-      } else {
-        item.references = message.origin ? message.origin.map(_utils.joinOrigin) : [];
-      }
-    }
-    item.obsolete = message.obsolete;
-    return postProcessItem ? postProcessItem(item, message, id, _isGeneratedId) : item;
-  });
-};
-exports.serialize = serialize;
-function deserialize(items, onItem) {
-  return items.reduce((catalog, item) => {
-    onItem(item);
-    const message = {
-      translation: item.msgstr[0],
-      extractedComments: item.extractedComments || [],
-      comments: item.comments || [],
-      context: item.msgctxt ?? null,
-      obsolete: item.flags.obsolete || item.obsolete,
-      origin: (item.references || []).map(ref => (0, _utils.splitOrigin)(ref)),
-      flags: Object.keys(item.flags).map(flag => flag.trim())
-    };
-    let id = item.msgid;
-
-    // if generated id, recreate it
-    if (!item.flags[EXPLICIT_ID_FLAG]) {
-      id = (0, _generateMessageId.generateMessageId)(item.msgid, item.msgctxt);
-      message.message = item.msgid;
-    }
-    catalog[id] = message;
-    return catalog;
-  }, {});
-}
-function validateItem(item) {
-  if (item.msgstr.length > 1) {
-    console.warn(`Multiple translations for item with key ${item.msgid} is not supported and it will be ignored.`);
-  }
-}
-function _default(options = {}) {
-  options = {
-    origins: true,
-    lineNumbers: true,
-    ...options
-  };
-  return {
-    catalogExtension: ".po",
-    templateExtension: ".pot",
-    parse(content) {
-      const po = _pofile.default.parse(content);
-      return deserialize(po.items, validateItem);
-    },
-    serialize(catalog, ctx) {
-      let po;
-      if (ctx.existing) {
-        po = _pofile.default.parse(ctx.existing);
-      } else {
-        po = new _pofile.default();
-        po.headers = getCreateHeaders(ctx.locale)
-        // accessing private property
-        ;
-        po.headerOrder = Object.keys(po.headers);
-      }
-      po.items = serialize(catalog, options);
-      return po.toString();
-    }
-  };
-}