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

package/build/services/translationIO.js

@@ -52,18 +52,18 @@ function init(config, options, successCallback, failCallback) {
   const sourceLocale = config.sourceLocale || "en";
   const targetLocales = getTargetLocales(config);
   const paths = poPathsPerLocale(config);
-  let segments = {};
+  const segments = {};
   targetLocales.forEach(targetLocale => {
     segments[targetLocale] = [];
   });
 
   // Create segments from source locale PO items
   paths[sourceLocale].forEach(path => {
-    let raw = _fs.default.readFileSync(path).toString();
-    let po = _pofile.default.parse(raw);
+    const raw = _fs.default.readFileSync(path).toString();
+    const po = _pofile.default.parse(raw);
     po.items.filter(item => !item["obsolete"]).forEach(item => {
       targetLocales.forEach(targetLocale => {
-        let newSegment = createSegmentFromPoItem(item);
+        const newSegment = createSegmentFromPoItem(item);
         segments[targetLocale].push(newSegment);
       });
     });
@@ -72,14 +72,14 @@ function init(config, options, successCallback, failCallback) {
   // Add translations to segments from target locale PO items
   targetLocales.forEach(targetLocale => {
     paths[targetLocale].forEach(path => {
-      let raw = _fs.default.readFileSync(path).toString();
-      let po = _pofile.default.parse(raw);
+      const raw = _fs.default.readFileSync(path).toString();
+      const po = _pofile.default.parse(raw);
       po.items.filter(item => !item["obsolete"]).forEach((item, index) => {
         segments[targetLocale][index].target = item.msgstr[0];
       });
     });
   });
-  let request = {
+  const request = {
     client: "lingui",
     version: require("@lingui/core/package.json").version,
     source_language: sourceLocale,
@@ -104,29 +104,26 @@ function sync(config, options, successCallback, failCallback) {
   const sourceLocale = config.sourceLocale || "en";
   const targetLocales = getTargetLocales(config);
   const paths = poPathsPerLocale(config);
-  let segments = [];
+  const segments = [];
 
   // Create segments with correct source
   paths[sourceLocale].forEach(path => {
-    let raw = _fs.default.readFileSync(path).toString();
-    let po = _pofile.default.parse(raw);
+    const raw = _fs.default.readFileSync(path).toString();
+    const po = _pofile.default.parse(raw);
     po.items.filter(item => !item["obsolete"]).forEach(item => {
-      let newSegment = createSegmentFromPoItem(item);
+      const newSegment = createSegmentFromPoItem(item);
       segments.push(newSegment);
     });
   });
-  let request = {
+  const request = {
     client: "lingui",
     version: require("@lingui/core/package.json").version,
     source_language: sourceLocale,
     target_languages: targetLocales,
-    segments: segments
+    segments: segments,
+    // Sync and then remove unused segments (not present in the local application) from Translation.io
+    purge: Boolean(options.clean)
   };
-
-  // Sync and then remove unused segments (not present in the local application) from Translation.io
-  if (options.clean) {
-    request["purge"] = true;
-  }
   postTio("sync", request, config.service.apiKey, response => {
     if (response.errors) {
       failCallback(response.errors);
@@ -139,8 +136,8 @@ function sync(config, options, successCallback, failCallback) {
   });
 }
 function createSegmentFromPoItem(item) {
-  let itemHasId = item.msgid != item.msgstr[0] && item.msgstr[0].length;
-  let segment = {
+  const itemHasId = item.msgid != item.msgstr[0] && item.msgstr[0].length;
+  const segment = {
     type: "source",
     // No way to edit text for source language (inside code), so not using "key" here
     source: itemHasId ? item.msgstr[0] : item.msgid,
@@ -161,7 +158,7 @@ function createSegmentFromPoItem(item) {
   return segment;
 }
 function createPoItemFromSegment(segment) {
-  let item = new _pofile.default.Item();
+  const item = new _pofile.default.Item();
   item.msgid = segment.context ? segment.context : segment.source;
   item.msgstr = [segment.target];
   item.references = segment.references && segment.references.length ? segment.references : [];
@@ -190,11 +187,11 @@ function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
     // Find target path (ignoring {name})
     const localePath = "".concat(config.catalogs[0].path.replace(/{locale}/g, targetLocale).replace(/{name}/g, ""), ".po");
     const segments = segmentsPerLocale[targetLocale];
-    let po = new _pofile.default();
+    const po = new _pofile.default();
     po.headers = getCreateHeaders(targetLocale);
-    let items = [];
+    const items = [];
     segments.forEach(segment => {
-      let item = createPoItemFromSegment(segment);
+      const item = createPoItemFromSegment(segment);
       items.push(item);
     });
 
@@ -224,7 +221,7 @@ function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {
   });
 }
 function poPathsPerLocale(config) {
-  const paths = [];
+  const paths = {};
   config.locales.forEach(locale => {
     paths[locale] = [];
     config.catalogs.forEach(catalog => {
@@ -241,23 +238,23 @@ function poPathsPerLocale(config) {
   return paths;
 }
 function postTio(action, request, apiKey, successCallback, failCallback) {
-  let jsonRequest = JSON.stringify(request);
-  let options = {
+  const jsonRequest = JSON.stringify(request);
+  const options = {
     hostname: "translation.io",
-    path: "/api/v1/segments/" + action + ".json?api_key=" + apiKey,
+    path: `/api/v1/segments/${action}.json?api_key=${apiKey}`,
     method: "POST",
     headers: {
       "Content-Type": "application/json"
     }
   };
-  let req = _https.default.request(options, res => {
+  const req = _https.default.request(options, res => {
     res.setEncoding("utf8");
     let body = "";
     res.on("data", chunk => {
       body = body.concat(chunk);
     });
     res.on("end", () => {
-      let response = JSON.parse(body);
+      const response = JSON.parse(body);
       successCallback(response);
     });
   });

package/build/tests.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.copyFixture = copyFixture;
+exports.createFixtures = createFixtures;
 exports.defaultMergeOptions = exports.defaultMakeTemplateOptions = exports.defaultMakeOptions = void 0;
 exports.listingToHumanReadable = listingToHumanReadable;
 exports.makeCatalog = void 0;
@@ -93,6 +94,26 @@ function listingToHumanReadable(listing) {
   });
   return output.join("\n");
 }
+
+/**
+ * Create fixtures from provided listing in temp folder
+ * Alternative for mock-fs which is also mocking nodejs require calls
+ * @param listing
+ */
+async function createFixtures(listing) {
+  const tmpDir = await _fs.default.promises.mkdtemp(_path.default.join(_os.default.tmpdir(), `lingui-test-${process.pid}`));
+  async function create(listing) {
+    for (const [filename, value] of Object.entries(listing)) {
+      if (typeof value === "string") {
+        await _fs.default.promises.writeFile(_path.default.join(tmpDir, filename), value);
+      } else {
+        await create(value);
+      }
+    }
+  }
+  await create(listing);
+  return tmpDir;
+}
 function readFsToJson(directory, filter) {
   const out = {};
   _fs.default.readdirSync(directory).map(filename => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.0.0-next.1",
+  "version": "4.0.0-next.2",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -45,15 +45,14 @@
     "build/"
   ],
   "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/generator": "^7.20.14",
-    "@babel/parser": "^7.20.15",
-    "@babel/plugin-syntax-jsx": "^7.18.6",
-    "@babel/runtime": "^7.20.13",
-    "@babel/types": "^7.20.7",
-    "@lingui/babel-plugin-extract-messages": "^4.0.0-next.1",
-    "@lingui/conf": "^4.0.0-next.1",
-    "@lingui/core": "^4.0.0-next.1",
+    "@babel/core": "^7.21.0",
+    "@babel/generator": "^7.21.1",
+    "@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",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
@@ -62,6 +61,7 @@
     "commander": "^10.0.0",
     "convert-source-map": "^2.0.0",
     "date-fns": "^2.16.1",
+    "esbuild": "^0.17.10",
     "glob": "^7.1.4",
     "inquirer": "^7.3.3",
     "micromatch": "4.0.2",
@@ -70,6 +70,7 @@
     "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",
@@ -86,5 +87,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.2"
   },
-  "gitHead": "27ee8e213ff6d0c7a0cd2b21c573d7f6da43fd85"
+  "gitHead": "556ab57e20c2ac9d384a22424c6a90c2ba0dd133"
 }