@melfore/clibelt 6.0.1 → 6.0.2

package/README.md

@@ -17,7 +17,7 @@ Add required CLIs to your `package.json`, for example:
 ```json
 "scripts": {
   "i18n": "i18n-msg",
-  "i18n:copy": "i18n-copy",
+  "i18n:copy": "i18n-copy --from it --to fr",
   "pwd2hash": "pwd2hash"
 }
 ```
@@ -48,8 +48,7 @@ Add arguments to script in `package.json`, for example:
 
 ```json
 "scripts": {
-  "i18n": "i18n-msg --input new/path --outTs new/constants.ts",
-  "i18n:copy": "i18n-copy --from=it --to=fr",
+  "i18n": "i18n-msg --input new/path --outTs new/constants.ts"
 }
 ```
 

package/dist/cli/i18n-copy/index.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -65,80 +42,53 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var fs = require("fs");
 var config_1 = __importDefault(require("../../config"));
 var path_1 = __importDefault(require("path"));
-var prettier = __importStar(require("prettier"));
-var checkFile = function (inputPath, from, to) { return __awaiter(void 0, void 0, void 0, function () {
-    var fileContent, addValue, existLang, newContent, writeContent, prettierContent;
+var utils_1 = require("./utils");
+var langCopy = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var from, to, inputPath, isDir, filesCheck, _i, filesCheck_1, fileName, filePath, e_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                fileContent = require(inputPath);
-                addValue = "";
-                existLang = false;
-                newContent = fileContent.messages.map(function (messages) {
-                    messages.tr.forEach(function (value) {
-                        if (value.l === from) {
-                            addValue = value.v;
-                        }
-                        if (value.l === to) {
-                            existLang = true;
-                        }
-                    });
-                    if (!existLang) {
-                        messages.tr.push({ l: to, v: addValue });
-                    }
-                    if (messages.overrides) {
-                        messages.overrides.forEach(function (i, index) {
-                            var addOverrideValue = "";
-                            var existOverridesLang = false;
-                            i.tr.forEach(function (value) {
-                                if (value.l === from) {
-                                    addOverrideValue = value.v;
-                                }
-                                if (value.l === to) {
-                                    existOverridesLang = true;
-                                }
-                            });
-                            if (!existOverridesLang) {
-                                messages.overrides[index].tr.push({ l: to, v: addOverrideValue });
-                            }
-                        });
-                    }
-                    return messages;
-                });
-                writeContent = "exports.messages = " + JSON.stringify(newContent);
-                return [4, prettier.format(writeContent, { parser: "babel" })];
+                _a.trys.push([0, 8, , 9]);
+                from = config_1.default.get("i18nMsg").from;
+                to = config_1.default.get("i18nMsg").to;
+                inputPath = path_1.default.join(process.cwd(), config_1.default.get("i18nMsg").input);
+                isDir = fs.lstatSync(inputPath).isDirectory();
+                if (!from || !to) {
+                    console.error("Missing from/to Param");
+                    return [2, 1];
+                }
+                if (!isDir) return [3, 5];
+                filesCheck = fs.readdirSync(inputPath);
+                _i = 0, filesCheck_1 = filesCheck;
+                _a.label = 1;
             case 1:
-                prettierContent = _a.sent();
-                fs.writeFileSync(inputPath, prettierContent, "utf-8");
-                return [2];
+                if (!(_i < filesCheck_1.length)) return [3, 4];
+                fileName = filesCheck_1[_i];
+                if (!(fileName !== "index.js")) return [3, 3];
+                filePath = path_1.default.join(inputPath, fileName);
+                return [4, (0, utils_1.checkMultipleFile)(filePath, from, to)];
+            case 2:
+                _a.sent();
+                _a.label = 3;
+            case 3:
+                _i++;
+                return [3, 1];
+            case 4: return [3, 7];
+            case 5: return [4, (0, utils_1.checkSingleFile)(inputPath, from, to)];
+            case 6:
+                _a.sent();
+                _a.label = 7;
+            case 7:
+                console.log("Successfully copied");
+                return [2, 0];
+            case 8:
+                e_1 = _a.sent();
+                console.error(e_1);
+                return [2, 1];
+            case 9: return [2];
         }
     });
 }); };
-var langCopy = function () {
-    var from = process.env.npm_config_from;
-    var to = process.env.npm_config_to;
-    var inputPath = path_1.default.join(process.cwd(), config_1.default.get("i18nMsg").input);
-    var isDir = fs.lstatSync(inputPath).isDirectory();
-    if (!from || !to) {
-        console.error("Missing params from and to");
-        return 1;
-    }
-    if (isDir) {
-        fs.readdirSync(inputPath).map(function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
-            var filePath;
-            return __generator(this, function (_a) {
-                filePath = path_1.default.join(inputPath, fileName);
-                checkFile(filePath, from, to);
-                return [2];
-            });
-        }); });
-        console.log("Successfully copied");
-    }
-    else {
-        checkFile(inputPath, from, to);
-        console.log("Successfully copied");
-    }
-    return 0;
-};
-var res = langCopy();
-process.exit(res);
+langCopy().then(function (res) {
+    process.exit(res);
+});

package/dist/cli/i18n-copy/utils.d.ts

@@ -0,0 +1,2 @@
+export declare const checkSingleFile: (inputPath: string, from: string, to: string) => Promise<void>;
+export declare const checkMultipleFile: (inputPath: string, from: string, to: string) => Promise<void>;

package/dist/cli/i18n-copy/utils.js

@@ -0,0 +1,174 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkMultipleFile = exports.checkSingleFile = void 0;
+var fs = require("fs");
+var prettier = __importStar(require("prettier"));
+var checkSingleFile = function (inputPath, from, to) { return __awaiter(void 0, void 0, void 0, function () {
+    var fileContent, addValue, existLang, newContent, writeContent, prettierContent;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                fileContent = require(inputPath);
+                addValue = "";
+                existLang = false;
+                newContent = fileContent.messages.map(function (messages) {
+                    messages.tr.forEach(function (value) {
+                        if (value.l === from) {
+                            addValue = value.v;
+                        }
+                        if (value.l === to) {
+                            existLang = true;
+                        }
+                    });
+                    if (!addValue) {
+                        throw new Error("--from " + from + " not exist");
+                    }
+                    if (!existLang) {
+                        messages.tr.push({ l: to, v: addValue });
+                    }
+                    if (messages.overrides) {
+                        messages.overrides.forEach(function (i, index) {
+                            var addOverrideValue = "";
+                            var existOverridesLang = false;
+                            i.tr.forEach(function (value) {
+                                if (value.l === from) {
+                                    addOverrideValue = value.v;
+                                }
+                                if (value.l === to) {
+                                    existOverridesLang = true;
+                                }
+                            });
+                            if (!addOverrideValue) {
+                                throw new Error("--from " + from + " not exist");
+                            }
+                            if (!existOverridesLang) {
+                                messages.overrides[index].tr.push({ l: to, v: addOverrideValue });
+                            }
+                        });
+                    }
+                    return messages;
+                });
+                writeContent = "exports.messages = " + JSON.stringify(newContent);
+                return [4, prettier.format(writeContent, { parser: "babel" })];
+            case 1:
+                prettierContent = _a.sent();
+                fs.writeFileSync(inputPath, prettierContent, "utf-8");
+                return [2];
+        }
+    });
+}); };
+exports.checkSingleFile = checkSingleFile;
+var checkMultipleFile = function (inputPath, from, to) { return __awaiter(void 0, void 0, void 0, function () {
+    var fileContent, addValue, existLang, newContent, writeContent, prettierContent;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                fileContent = require(inputPath);
+                addValue = "";
+                existLang = false;
+                newContent = fileContent.map(function (messages) {
+                    messages.tr.forEach(function (value) {
+                        if (value.l === from) {
+                            addValue = value.v;
+                        }
+                        if (value.l === to) {
+                            existLang = true;
+                        }
+                    });
+                    if (!addValue) {
+                        throw new Error("--from " + from + " not exist");
+                    }
+                    if (!existLang) {
+                        messages.tr.push({ l: to, v: addValue });
+                    }
+                    if (messages.overrides) {
+                        messages.overrides.forEach(function (i, index) {
+                            var addOverrideValue = "";
+                            var existOverridesLang = false;
+                            i.tr.forEach(function (value) {
+                                if (value.l === from) {
+                                    addOverrideValue = value.v;
+                                }
+                                if (value.l === to) {
+                                    existOverridesLang = true;
+                                }
+                            });
+                            if (!addOverrideValue) {
+                                throw new Error("--from " + from + " not exist");
+                            }
+                            if (!existOverridesLang) {
+                                messages.overrides[index].tr.push({ l: to, v: addOverrideValue });
+                            }
+                        });
+                    }
+                    return messages;
+                });
+                writeContent = "module.exports = " + JSON.stringify(newContent);
+                return [4, prettier.format(writeContent, { parser: "babel" })];
+            case 1:
+                prettierContent = _a.sent();
+                fs.writeFileSync(inputPath, prettierContent, "utf-8");
+                return [2];
+        }
+    });
+}); };
+exports.checkMultipleFile = checkMultipleFile;

package/dist/cli/i18n-msg/index.js

@@ -129,12 +129,20 @@ var allLanguagesReport = function (data, languages) {
         }
     });
 };
-var report = function (data, languages) {
+var report = function (data, languages, uniqueCode) {
     var e = 0;
     data.forEach(function (value) {
         var _a;
         var valueLanguages = [];
         var valueLanguagesOverrites = [];
+        var isUniqueCode = uniqueCode.includes(value.code);
+        if (!isUniqueCode) {
+            uniqueCode.push(value.code);
+        }
+        else {
+            console.log("\x1b[31m Duplicate Code: \x1b[0m", value.code);
+            e = 1;
+        }
         value.tr.forEach(function (i) {
             valueLanguages.push(i.l);
         });
@@ -165,19 +173,21 @@ var multiFileReport = function (languages, namespaces) {
     console.log("-------REPORT-------");
     var uniqueLang = getAllLanguagesUnique(languages);
     var numeError = 0;
+    var uniqueCode = [];
     for (var _i = 0, namespaces_1 = namespaces; _i < namespaces_1.length; _i++) {
         var _a = namespaces_1[_i], messages = _a[1];
-        var e = report(messages, uniqueLang);
+        var e = report(messages, uniqueLang, uniqueCode);
         numeError = numeError + e;
     }
     console.log("All languages: ", uniqueLang);
     return numeError !== 0 ? 1 : 0;
 };
 var singleFileReport = function (message, languages) {
+    var uniqueCode = [];
     console.log();
     console.log("-----REPORT-------");
     var uniqueLang = getAllLanguagesUnique(languages);
-    var e = report(message, uniqueLang);
+    var e = report(message, uniqueLang, uniqueCode);
     console.log("All languages: ", uniqueLang);
     return e !== 0 ? 1 : 0;
 };

package/dist/config/config-schema.d.ts

@@ -28,6 +28,16 @@ declare const _default: {
             arg: string;
             env: string;
         };
+        from: {
+            format: string;
+            default: undefined;
+            arg: string;
+        };
+        to: {
+            format: string;
+            default: undefined;
+            arg: string;
+        };
     };
 };
 export default _default;

package/dist/config/config-schema.js

@@ -30,5 +30,15 @@ exports.default = {
             arg: "i18n-out-ts",
             env: "I18N_OUT_TS",
         },
+        from: {
+            format: "countryCode",
+            default: undefined,
+            arg: "from",
+        },
+        to: {
+            format: "countryCode",
+            default: undefined,
+            arg: "to",
+        },
     },
 };

package/dist/config/config-validators.d.ts

@@ -28,6 +28,11 @@ export declare const int: {
     coerce: (v: any) => any;
     validate: (x: any) => void;
 };
+export declare const countryCode: {
+    name: string;
+    coerce: (v: any) => any;
+    validate: (x: any) => void;
+};
 declare const _default: {
     email: {
         name: string;
@@ -54,5 +59,10 @@ declare const _default: {
         coerce: (v: any) => any;
         validate: (x: any) => void;
     };
+    countryCode: {
+        name: string;
+        coerce: (v: any) => any;
+        validate: (x: any) => void;
+    };
 };
 export default _default;

package/dist/config/config-validators.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.int = exports.serverPort = exports.strictBoolean = exports.url = exports.ipaddress = exports.email = void 0;
+exports.countryCode = exports.int = exports.serverPort = exports.strictBoolean = exports.url = exports.ipaddress = exports.email = void 0;
 var isEmail_1 = __importDefault(require("validator/lib/isEmail"));
 var isIP_1 = __importDefault(require("validator/lib/isIP"));
 var isURL_1 = __importDefault(require("validator/lib/isURL"));
 var isBoolean_1 = __importDefault(require("validator/lib/isBoolean"));
 var isInt_1 = __importDefault(require("validator/lib/isInt"));
+var isISO31661Alpha2_1 = __importDefault(require("validator/lib/isISO31661Alpha2"));
 var assert = function (assertion, err_msg) {
     if (!assertion) {
         throw new Error(err_msg);
@@ -56,10 +57,18 @@ exports.int = {
         assert((0, isInt_1.default)(x === null || x === void 0 ? void 0 : x.toString()), "must be a valid integer number");
     },
 };
+exports.countryCode = {
+    name: "countryCode",
+    coerce: function (v) { return v.toString(); },
+    validate: function (x) {
+        assert((0, isISO31661Alpha2_1.default)(x === null || x === void 0 ? void 0 : x.toString()), "must be a valid country code");
+    },
+};
 exports.default = {
     email: exports.email,
     ipaddress: exports.ipaddress,
     url: exports.url,
     strictBoolean: exports.strictBoolean,
     serverPort: exports.serverPort,
+    countryCode: exports.countryCode,
 };

package/dist/config/index.d.ts

@@ -5,6 +5,8 @@ declare const config: convict.Config<{
         outMsg: string;
         outTemp: string;
         outTs: string;
+        from: undefined;
+        to: undefined;
     };
 }>;
 export { config };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melfore/clibelt",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "homepage": "https://github.com/melfore/clibelt#readme",
   "description": "CLI belt: the Melfore tool belt",
   "repository": {
@@ -35,7 +35,7 @@
     "preversion": "npm run lintify",
     "version": "npm run prettify",
     "upload": "npm run build && npm publish --access public",
-    "i18n:copy": "ts-node src/cli/i18n-copy/index.ts"
+    "i18n:copy": "ts-node src/cli/i18n-copy/index.ts --from it --to fr"
   },
   "dependencies": {
     "convict": "^6.2.4",