locize-cli 9.1.3 → 10.0.0

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [10.0.0](https://github.com/locize/locize-cli/compare/v9.1.4...v10.0.0) - 2025-06-30
+
+- replace old/unmaintained yaml dependency
+
+## [9.1.4](https://github.com/locize/locize-cli/compare/v9.1.3...v9.1.4) - 2025-06-30
+
+- download: fix issue with reversed pathMask in combination with no languageFolderPrefix
+
 ## [9.1.3](https://github.com/locize/locize-cli/compare/v9.1.2...v9.1.3) - 2025-05-22
 
 - mentioning comma separated ns argument

package/combineSubkeyPreprocessor.js

@@ -1,4 +1,4 @@
-const jsyaml = require('js-yaml');
+const yaml = require('yaml');
 
 const delimiter = {
   i18next: '_',
@@ -26,7 +26,7 @@ const getBaseKey = (delimiter) => (k) => {
 const uniq = (value, index, self) => self.indexOf(value) === index;
 
 const stringify = (o) => {
-  let str = jsyaml.dump(o);
+  let str = yaml.stringify(o);
   const subKeys = Object.keys(o);
   subKeys.forEach((sk) => {
     if (isNaN(sk)) {
@@ -123,7 +123,7 @@ const parse = (s) => {
       s = s.replace(new RegExp(`^(?:${escapedMatch}: )+`, 'm'), `${sk}: `);
     }
   }
-  return jsyaml.load(s);
+  return yaml.parse(s);
 };
 
 const prepareImport = (resources) => {

package/convertToDesiredFormat.js

@@ -2,7 +2,7 @@ const flatten = require('flat');
 const i18next2po = require('gettext-converter/cjs/i18next2po');
 const csvjson = require('csvjson');
 const xlsx = require('xlsx');
-const jsyaml = require('js-yaml');
+const yaml = require('yaml');
 const js2asr = require('android-string-resource/cjs/js2asr');
 const stringsFile = require('strings-file');
 const createxliff = require('xliff/cjs/createxliff');
@@ -146,7 +146,7 @@ const convertToDesiredFormat = (
       opt.format === 'yml'
     ) {
       if (isEmpty) return cb(null, '');
-      cb(null, jsyaml.dump(flatten(data)));
+      cb(null, yaml.stringify(flatten(data)));
       return;
     }
     if (
@@ -154,7 +154,7 @@ const convertToDesiredFormat = (
       opt.format === 'yml-nested'
     ) {
       if (isEmpty) return cb(null, '');
-      cb(null, jsyaml.dump(shouldUnflatten(data) ? unflatten(data) : data));
+      cb(null, yaml.stringify(shouldUnflatten(data) ? unflatten(data) : data));
       return;
     }
     if (
@@ -164,7 +164,7 @@ const convertToDesiredFormat = (
       if (isEmpty) return cb(null, '');
       var newData = {};
       newData[lng] = shouldUnflatten(data) ? unflatten(data) : data;
-      cb(null, jsyaml.dump(removeUndefinedFromArrays(newData)));
+      cb(null, yaml.stringify(removeUndefinedFromArrays(newData)));
       return;
     }
     if (
@@ -175,7 +175,7 @@ const convertToDesiredFormat = (
       var newDataNs = {};
       newDataNs[lng] = {};
       newDataNs[lng][namespace] = shouldUnflatten(data) ? unflatten(data) : data;
-      cb(null, jsyaml.dump(removeUndefinedFromArrays(newDataNs)));
+      cb(null, yaml.stringify(removeUndefinedFromArrays(newDataNs)));
       return;
     }
     if (opt.format === 'android') {

package/convertToFlatFormat.js

@@ -1,7 +1,7 @@
 const po2i18next = require('gettext-converter/cjs/po2i18next');
 const csvjson = require('csvjson');
 const xlsx = require('xlsx');
-const jsyaml = require('js-yaml');
+const yaml = require('yaml');
 const asr2js = require('android-string-resource/cjs/asr2js');
 const stringsFile = require('strings-file');
 const xliff2js = require('xliff/cjs/xliff2js');
@@ -123,8 +123,8 @@ const convertToFlatFormat = (opt, data, lng, cb) => {
       opt.format === 'yml'
     ) {
       const d = data.toString();
-      if (!d || d === '') return cb(null, {});
-      cb(null, flatten(jsyaml.load(d)));
+      if (!d || d === '' || d === '\n') return cb(null, {});
+      cb(null, flatten(yaml.parse(d)));
       return;
     }
     if (
@@ -132,8 +132,8 @@ const convertToFlatFormat = (opt, data, lng, cb) => {
       opt.format === 'yml-nested'
     ) {
       const d = data.toString();
-      if (!d || d === '') return cb(null, {});
-      cb(null, flatten(jsyaml.load(d)));
+      if (!d || d === '' || d === '\n') return cb(null, {});
+      cb(null, flatten(yaml.parse(d)));
       return;
     }
     if (
@@ -142,7 +142,7 @@ const convertToFlatFormat = (opt, data, lng, cb) => {
     ) {
       const d = data.toString();
       if (!d || d.trim() === '') return cb(null, {});
-      const jsObj = jsyaml.load(d);
+      const jsObj = yaml.parse(d);
       cb(
         null,
         flatten(
@@ -157,7 +157,7 @@ const convertToFlatFormat = (opt, data, lng, cb) => {
     ) {
       const dn = data.toString();
       if (!dn || dn.trim() === '') return cb(null, {});
-      const jsObjn = jsyaml.load(dn);
+      const jsObjn = yaml.parse(dn);
       cb(
         null,
         flatten(

package/download.js

@@ -157,7 +157,10 @@ function handleDownload(opt, url, err, res, downloads, cb) {
             return;
           }
 
-          if (filledMask.indexOf(path.sep) > 0) filledMask = filledMask.replace(opt.languageFolderPrefix + language, '');
+          if (opt.languageFolderPrefix && filledMask.indexOf(path.sep) > 0) filledMask = filledMask.replace(opt.languageFolderPrefix + language, '');
+          // if (opt.pathMask.indexOf(`${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`) > opt.pathMask.indexOf(`${opt.pathMaskInterpolationPrefix}namespace${opt.pathMaskInterpolationSuffix}`) && filledMask.lastIndexOf(path.sep) > 0) {
+          //   mkdirp.sync(path.join(opt.path, filledMask.substring(0, filledMask.lastIndexOf(path.sep))));
+          // }
           const parentDir = path.dirname(path.join(opt.path, filledMask));
           mkdirp.sync(parentDir);
           fs.writeFile(path.join(opt.path, filledMask), fileContent, clb);
@@ -283,7 +286,10 @@ function handlePull(opt, toDownload, cb) {
             return;
           }
 
-          if (filledMask.indexOf(path.sep) > 0) filledMask = filledMask.replace(opt.languageFolderPrefix + lng, '');
+          if (opt.languageFolderPrefix && filledMask.indexOf(path.sep) > 0) filledMask = filledMask.replace(opt.languageFolderPrefix + lng, '');
+          // if (opt.pathMask.indexOf(`${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`) > opt.pathMask.indexOf(`${opt.pathMaskInterpolationPrefix}namespace${opt.pathMaskInterpolationSuffix}`) && filledMask.lastIndexOf(path.sep) > 0) {
+          //   mkdirp.sync(path.join(opt.path, filledMask.substring(0, filledMask.lastIndexOf(path.sep))));
+          // }
           const parentDir = path.dirname(path.join(opt.path, filledMask));
           mkdirp.sync(parentDir);
           fs.writeFile(path.join(opt.path, filledMask), fileContent, clb);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "9.1.3",
+  "version": "10.0.0",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {
@@ -21,7 +21,6 @@
     "gettext-converter": "1.3.0",
     "https-proxy-agent": "7.0.6",
     "ini": "4.1.3",
-    "js-yaml": "4.1.0",
     "laravelphp": "2.0.4",
     "locize-xcstrings": "2.0.0",
     "lodash.clonedeep": "4.5.0",
@@ -32,7 +31,8 @@
     "strings-file": "0.0.5",
     "tmexchange": "2.0.5",
     "xliff": "6.2.2",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
+    "yaml": "2.8.0"
   },
   "devDependencies": {
     "@yao-pkg/pkg": "6.4.0",