@lingui/cli 3.15.0 → 3.16.1

package/{api → build/api}/detect.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,21 +8,32 @@ exports.projectType = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _path = _interopRequireDefault(require("path"));
+
 var _pkgUp = _interopRequireDefault(require("pkg-up"));
 
-var projectType = {
+var _package = _interopRequireDefault(require("../../package.json"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const projectType = {
   CRA: "CRA",
   REACT: "REACT"
 };
 exports.projectType = projectType;
 
-function getPackageJson() {
-  var packageJsonPath = _pkgUp.default.sync();
+function getPackageJson(cwd) {
+  const packageJsonPath = _pkgUp.default.sync({
+    cwd
+  });
 
   try {
-    var json = _fs.default.readFileSync(packageJsonPath, "utf8");
+    const json = _fs.default.readFileSync(packageJsonPath, "utf8");
 
-    return JSON.parse(json);
+    return {
+      path: packageJsonPath,
+      content: JSON.parse(json)
+    };
   } catch (e) {
     console.error(e);
     return null;
@@ -48,7 +57,12 @@ function detectFramework(pkg) {
 }
 
 function detect() {
-  var pkg = getPackageJson();
+  let pkg = getPackageJson();
   if (!pkg) return null;
-  return detectFramework(pkg);
+
+  if (pkg.content.name === _package.default.name) {
+    pkg = getPackageJson(_path.default.dirname(pkg.path));
+  }
+
+  return detectFramework(pkg.content);
 }

package/build/api/extract.js

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.extract = extract;
+exports.collect = collect;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var R = _interopRequireWildcard(require("ramda"));
+
+var _utils = require("./utils");
+
+var _extractors = _interopRequireDefault(require("./extractors"));
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Merge origins for messages found in different places. All other attributes
+ * should be the same (raise an error if defaults are different).
+ */
+function mergeMessage(msgId, prev, next) {
+  if (prev.message && next.message && prev.message !== next.message) {
+    throw new Error(`Encountered different default translations for message ${_chalk.default.yellow(msgId)}` + `\n${_chalk.default.yellow((0, _utils.prettyOrigin)(prev.origin))} ${prev.message}` + `\n${_chalk.default.yellow((0, _utils.prettyOrigin)(next.origin))} ${next.message}`);
+  }
+
+  return { ...next,
+    message: prev.message || next.message,
+    origin: R.concat(prev.origin, next.origin)
+  };
+}
+
+async function extract(srcPaths, targetPath, options = {}) {
+  const {
+    ignore = []
+  } = options;
+  const ignorePattern = ignore.length ? new RegExp(ignore.join("|"), "i") : null;
+
+  for (let srcFilename of srcPaths) {
+    if (!_fs.default.existsSync(srcFilename) || ignorePattern && ignorePattern.test(srcFilename)) continue;
+
+    if (_fs.default.statSync(srcFilename).isDirectory()) {
+      const subdirs = _fs.default.readdirSync(srcFilename).sort().map(filename => _path.default.join(srcFilename, filename));
+
+      await extract(subdirs, targetPath, options);
+      continue;
+    }
+
+    await (0, _extractors.default)(srcFilename, targetPath, options);
+  }
+}
+
+function collect(buildDir) {
+  return _fs.default.readdirSync(buildDir).sort().map(filename => {
+    const filepath = _path.default.join(buildDir, filename);
+
+    if (_fs.default.lstatSync(filepath).isDirectory()) {
+      return collect(filepath);
+    }
+
+    if (!filename.endsWith(".json")) return;
+
+    try {
+      return JSON.parse(_fs.default.readFileSync(filepath).toString());
+    } catch (e) {
+      return {};
+    }
+  }).filter(Boolean).reduce((catalog, messages) => R.mergeWithKey(mergeMessage, catalog, messages), {});
+}

package/build/api/extractors/babel.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _core = require("@babel/core");
+
+var _babelPluginExtractMessages = _interopRequireDefault(require("@lingui/babel-plugin-extract-messages"));
+
+var _detect = require("../detect");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const babelRe = new RegExp("\\.(" + [..._core.DEFAULT_EXTENSIONS, ".ts", ".tsx"].map(ext => ext.slice(1)).join("|") + ")$", "i");
+const extractor = {
+  match(filename) {
+    return babelRe.test(filename);
+  },
+
+  extract(filename, localeDir, options = {}) {
+    const {
+      babelOptions: _babelOptions = {},
+      configPath
+    } = options;
+    const {
+      plugins = [],
+      ...babelOptions
+    } = _babelOptions;
+    const frameworkOptions = {};
+
+    if (options.projectType === _detect.projectType.CRA) {
+      frameworkOptions.presets = ["react-app"];
+    }
+
+    (0, _core.transformFileSync)(filename, { ...babelOptions,
+      ...frameworkOptions,
+      // we override envName to avoid issues with NODE_ENV=production
+      // https://github.com/lingui/js-lingui/issues/952
+      envName: "development",
+      plugins: ["macros", [_babelPluginExtractMessages.default, {
+        localeDir,
+        configPath
+      }], ...plugins]
+    });
+  }
+
+};
+var _default = extractor;
+exports.default = _default;

package/build/api/extractors/index.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = extract;
+
+var _ora = _interopRequireDefault(require("ora"));
+
+var _babel = _interopRequireDefault(require("./babel"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const DEFAULT_EXTRACTORS = [_babel.default];
+
+async function extract(filename, targetPath, options) {
+  const extractorsToExtract = options.extractors ?? DEFAULT_EXTRACTORS;
+
+  for (let e of extractorsToExtract) {
+    let ext = e;
+
+    if (typeof e === "string") {
+      // in case of the user using require.resolve in their extractors, we require that module
+      ext = require(e);
+    }
+
+    if (ext.default) {
+      ext = ext.default;
+    }
+
+    if (!ext.match(filename)) continue;
+    let spinner;
+    if (options.verbose) spinner = (0, _ora.default)().start(filename);
+
+    try {
+      await ext.extract(filename, targetPath, options);
+      if (options.verbose && spinner) spinner.succeed();
+      return true;
+    } catch (e) {
+      if (options.verbose && spinner) {
+        spinner.fail(e.message);
+      } else {
+        console.error(`Cannot process file ${e.message}`);
+      }
+
+      return false;
+    }
+  }
+
+  return true;
+}

package/build/api/extractors/typescript.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _core = require("@babel/core");
+
+var _babelPluginExtractMessages = _interopRequireDefault(require("@lingui/babel-plugin-extract-messages"));
+
+var _detect = require("../detect");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const typescriptRe = /(^.?|\.[^d]|[^.]d|[^.][^d])\.tsx?$/i;
+const extractor = {
+  match(filename) {
+    return typescriptRe.test(filename);
+  },
+
+  extract(filename, localeDir, options = {}) {
+    const ts = require("typescript");
+
+    const content = _fs.default.readFileSync(filename, "utf8");
+
+    const isTsx = filename.endsWith(".tsx"); // pass jsx to babel untouched
+
+    const jsx = isTsx ? ts.JsxEmit.Preserve : ts.JsxEmit.None;
+    const stripped = ts.transpileModule(content, {
+      compilerOptions: {
+        filename,
+        jsx,
+        module: ts.ModuleKind.ESNext,
+        target: ts.ScriptTarget.ES2016,
+        // use ES2015 or ES2016 to preserve tagged template literal
+        allowSyntheticDefaultImports: true,
+        moduleResolution: ts.ModuleResolutionKind.NodeJs
+      }
+    });
+    const frameworkOptions = {};
+
+    if (options.projectType === _detect.projectType.CRA) {
+      frameworkOptions.presets = ["react-app"];
+    }
+
+    const {
+      babelOptions = {},
+      configPath
+    } = options;
+    const plugins = ["macros", [_babelPluginExtractMessages.default, {
+      localeDir,
+      configPath
+    }], ...(babelOptions.plugins || [])];
+
+    if (isTsx) {
+      plugins.unshift(require.resolve("@babel/plugin-syntax-jsx"));
+    }
+
+    (0, _core.transform)(stripped.outputText, { ...babelOptions,
+      ...frameworkOptions,
+      filename,
+      plugins
+    });
+  }
+
+};
+var _default = extractor;
+exports.default = _default;

package/build/api/formats/csv.js

@@ -0,0 +1,65 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+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]);
+  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;
+};
+
+const csv = {
+  catalogExtension: ".csv",
+
+  write(filename, catalog) {
+    const messages = serialize(catalog);
+    (0, _utils.writeFileIfChanged)(filename, messages);
+  },
+
+  read(filename) {
+    const raw = _fs.default.readFileSync(filename).toString();
+
+    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/{api → build/api}/formats/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,19 +15,24 @@ var _po = _interopRequireDefault(require("./po"));
 
 var _poGettext = _interopRequireDefault(require("./po-gettext"));
 
-var formats = {
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const formats = {
   lingui: _lingui.default,
   minimal: _minimal.default,
   po: _po.default,
   csv: _csv.default,
   "po-gettext": _poGettext.default
 };
+/**
+ * @internal
+ */
 
 function getFormat(name) {
-  var format = formats[name];
+  const format = formats[name];
 
   if (!format) {
-    throw new Error("Unknown format \"".concat(name, "\". Use one of following: ").concat(Object.keys(formats).join(", ")));
+    throw new Error(`Unknown format "${name}". Use one of following: ${Object.keys(formats).join(", ")}`);
   }
 
   return format;

package/build/api/formats/lingui.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var R = _interopRequireWildcard(require("ramda"));
+
+var _utils = require("../utils");
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const removeOrigins = R.map(({
+  origin,
+  ...message
+}) => message);
+const removeLineNumbers = R.map(message => {
+  if (message.origin) {
+    message.origin.map(originValue => {
+      originValue.pop();
+      return originValue;
+    });
+  }
+
+  return message;
+});
+const lingui = {
+  catalogExtension: ".json",
+
+  write(filename, catalog, options) {
+    let outputCatalog = catalog;
+
+    if (options.origins === false) {
+      outputCatalog = removeOrigins(catalog);
+    }
+
+    if (options.origins !== false && options.lineNumbers === false) {
+      outputCatalog = removeLineNumbers(outputCatalog);
+    }
+
+    (0, _utils.writeFileIfChanged)(filename, JSON.stringify(outputCatalog, null, 2));
+  },
+
+  read(filename) {
+    const raw = _fs.default.readFileSync(filename).toString();
+
+    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

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var R = _interopRequireWildcard(require("ramda"));
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const serialize = R.map(message => message.translation || "");
+const deserialize = R.map(translation => ({
+  translation,
+  obsolete: false,
+  message: null,
+  origin: []
+}));
+const minimal = {
+  catalogExtension: ".json",
+
+  write(filename, catalog) {
+    const messages = serialize(catalog);
+    let file = null;
+
+    try {
+      file = _fs.default.readFileSync(filename, 'utf8');
+    } catch (error) {
+      if (error.code !== "ENOENT") {
+        throw error;
+      }
+    }
+
+    const shouldUseTrailingNewline = file === null || file?.endsWith("\n");
+    const trailingNewLine = shouldUseTrailingNewline ? "\n" : "";
+
+    _fs.default.writeFileSync(filename, `${JSON.stringify(messages, null, 2)}${trailingNewLine}`);
+  },
+
+  read(filename) {
+    const raw = _fs.default.readFileSync(filename).toString();
+
+    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;