@esgettext/tools 1.2.0 → 1.3.1

package/dist/configuration.js

@@ -31,9 +31,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigurationFactory = exports.ConfigurationSchema = void 0;
 const runtime_1 = require("@esgettext/runtime");
+const package_json_1 = __importDefault(require("@npmcli/package-json"));
+const normalize_package_data_1 = __importDefault(require("normalize-package-data"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const v = __importStar(require("valibot"));
@@ -46,10 +51,10 @@ const bugsAddressSchema = v.union([
 ]);
 const programSchema = (program) => {
     return v.strictObject({
-        path: v.pipe(v.string(), v.nonEmpty(gtx._x("The field '{field}' must not be empty!", {
+        path: v.optional(v.pipe(v.string(), v.nonEmpty(gtx._x("The field '{field}' must not be empty!", {
             field: `programs.${program}.path`,
-        }))),
-        options: v.array(v.pipe(v.string(), v.regex(new RegExp('^(?:[A-Z]|[-a-z]{2,})')), v.nonEmpty())),
+        })))),
+        options: v.optional(v.array(v.pipe(v.string(), v.regex(new RegExp('^(?:[A-Z]|[-a-z]{2,})')), v.nonEmpty()))),
     });
 };
 exports.ConfigurationSchema = v.strictObject({
@@ -77,12 +82,16 @@ exports.ConfigurationSchema = v.strictObject({
         })))),
         'files-from': v.optional(v.pipe(v.string(gtx._x("The field '{field}' must be a string!", {
             field: 'package.files-from',
-        })), v.nonEmpty(gtx._x("The field '{field}' must not be empty!", { field: 'package.files-from' })))),
+        })), v.nonEmpty(gtx._x("The field '{field}' must not be empty!", {
+            field: 'package.files-from',
+        })))),
     })),
     po: v.optional(v.strictObject({
         directory: v.optional(v.pipe(v.string(gtx._x("The field '{field}' must be a string!", {
             field: 'po.directory',
-        })), v.nonEmpty(gtx._x("The field '{field}' must not be empty!", { field: 'po.directory' })))),
+        })), v.nonEmpty(gtx._x("The field '{field}' must not be empty!", {
+            field: 'po.directory',
+        })))),
         locales: v.optional(v.array(v.pipe(v.string(gtx._("The entries in 'po.locales' must be strings!")), v.nonEmpty(gtx._("The entries in 'po.locales' must not be empty!"))))),
     })),
     install: v.optional(v.strictObject({
@@ -92,24 +101,24 @@ exports.ConfigurationSchema = v.strictObject({
         msgmerge: v.optional(programSchema('msgmerge')),
         msgfmt: v.optional(programSchema('msgfmt')),
     })),
-    files: v.array(v.string()),
+    files: v.optional(v.array(v.string())),
 });
 class ConfigurationFactory {
     constructor() { }
     static create(jsConfigFiles, pkgJsonFile, lang) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
             if (ConfigurationFactory.instance) {
                 return ConfigurationFactory.instance;
             }
             if (lang && !lang.match(/^zh-/)) {
                 lang = lang.replace(/-.*/, '');
             }
-            let jsConfigFilePath;
-            let msgidBugsAddressFilePath;
-            let nameFilePath;
-            let copyrightHolderFilePath;
-            let versionFilePath;
+            let jsConfigFile;
+            let msgidBugsAddressFile;
+            let nameFile;
+            let copyrightHolderFile;
+            let versionFile;
             const rootPath = process.cwd();
             let configuration = null;
             for (const file of jsConfigFiles) {
@@ -119,18 +128,18 @@ class ConfigurationFactory {
                     if (data) {
                         configuration = data;
                         configuration.files = [file];
-                        jsConfigFilePath = file;
+                        jsConfigFile = file;
                         if ((_a = configuration.package) === null || _a === void 0 ? void 0 : _a['msgid-bugs-address']) {
-                            msgidBugsAddressFilePath = filePath;
+                            msgidBugsAddressFile = filePath;
                         }
                         if ((_b = configuration.package) === null || _b === void 0 ? void 0 : _b.name) {
-                            nameFilePath = filePath;
+                            nameFile = filePath;
                         }
                         if ((_c = configuration.package) === null || _c === void 0 ? void 0 : _c['copyright-holder']) {
-                            copyrightHolderFilePath = filePath;
+                            copyrightHolderFile = filePath;
                         }
                         if ((_d = configuration.package) === null || _d === void 0 ? void 0 : _d.version) {
-                            versionFilePath = filePath;
+                            versionFile = filePath;
                         }
                         break;
                     }
@@ -147,102 +156,136 @@ class ConfigurationFactory {
                 !configuration.package['name'] ||
                 !configuration.package['copyright-holder'] ||
                 !configuration.package['version']) {
-                const packageJsonPath = pkgJsonFile;
-                if (fs.existsSync(packageJsonPath)) {
-                    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-                    let fileUsed = false;
-                    if (!configuration && packageJson.esgettext) {
-                        configuration = packageJson.esgettext;
-                        configuration.files = [];
+                const packageJson = yield ConfigurationFactory.getPackageJson();
+                let fileUsed = false;
+                if (!configuration && packageJson.esgettext) {
+                    configuration = packageJson.esgettext;
+                    configuration.files = [];
+                    fileUsed = true;
+                }
+                if (!configuration)
+                    configuration = { files: [] };
+                if (!((_e = configuration.package) === null || _e === void 0 ? void 0 : _e['msgid-bugs-address'])) {
+                    if ((_f = packageJson.bugs) === null || _f === void 0 ? void 0 : _f.url) {
+                        (_g = configuration.package) !== null && _g !== void 0 ? _g : (configuration.package = {});
+                        configuration.package['msgid-bugs-address'] = packageJson.bugs.url;
+                        msgidBugsAddressFile = 'package.json: bugs.url';
                         fileUsed = true;
                     }
-                    if (!configuration)
-                        configuration = { files: [] };
-                    if (!((_e = configuration.package) === null || _e === void 0 ? void 0 : _e['msgid-bugs-address'])) {
-                        if ((_f = packageJson.bugs) === null || _f === void 0 ? void 0 : _f.email) {
-                            (_g = configuration.package) !== null && _g !== void 0 ? _g : (configuration.package = {});
-                            configuration.package['msgid-bugs-address'] =
-                                packageJson.bugs.email;
-                            msgidBugsAddressFilePath = 'package.json';
-                            fileUsed = true;
-                        }
-                        else if ((_h = packageJson.bugs) === null || _h === void 0 ? void 0 : _h.url) {
-                            (_j = configuration.package) !== null && _j !== void 0 ? _j : (configuration.package = {});
-                            configuration.package['msgid-bugs-address'] = packageJson.bugs.url;
-                            msgidBugsAddressFilePath = 'package.json';
-                            fileUsed = true;
-                        }
+                    else if ((_h = packageJson.bugs) === null || _h === void 0 ? void 0 : _h.email) {
+                        (_j = configuration.package) !== null && _j !== void 0 ? _j : (configuration.package = {});
+                        configuration.package['msgid-bugs-address'] = packageJson.bugs.email;
+                        msgidBugsAddressFile = 'package.json: bugs.email';
+                        fileUsed = true;
                     }
-                    if (!((_k = configuration.package) === null || _k === void 0 ? void 0 : _k.name)) {
-                        if (packageJson.name) {
-                            (_l = configuration.package) !== null && _l !== void 0 ? _l : (configuration.package = {});
-                            configuration.package.name = packageJson.name;
-                            nameFilePath = 'package.json';
-                            fileUsed = true;
-                        }
+                    else if ((_l = (_k = packageJson.people) === null || _k === void 0 ? void 0 : _k.author) === null || _l === void 0 ? void 0 : _l.email) {
+                        (_m = configuration.package) !== null && _m !== void 0 ? _m : (configuration.package = {});
+                        configuration.package['msgid-bugs-address'] =
+                            packageJson.people.author.email;
+                        msgidBugsAddressFile = 'package.json: people.author';
+                        fileUsed = true;
                     }
-                    if (!((_m = configuration.package) === null || _m === void 0 ? void 0 : _m['copyright-holder'])) {
-                        if ((_o = packageJson.people) === null || _o === void 0 ? void 0 : _o.author) {
-                            (_p = configuration.package) !== null && _p !== void 0 ? _p : (configuration.package = {});
-                            configuration.package['copyright-holder'] =
-                                packageJson.people.author;
-                            copyrightHolderFilePath = 'package.json';
-                            fileUsed = true;
-                        }
+                }
+                if (!((_o = configuration.package) === null || _o === void 0 ? void 0 : _o.name)) {
+                    if (packageJson.name) {
+                        (_p = configuration.package) !== null && _p !== void 0 ? _p : (configuration.package = {});
+                        configuration.package.name = packageJson.name;
+                        nameFile = 'package.json';
+                        fileUsed = true;
                     }
-                    if (!((_q = configuration.package) === null || _q === void 0 ? void 0 : _q.version)) {
-                        if (packageJson.version) {
-                            (_r = configuration.package) !== null && _r !== void 0 ? _r : (configuration.package = {});
-                            configuration.package.version = packageJson.version;
-                            nameFilePath = 'package.json';
-                            fileUsed = true;
+                }
+                if (!((_q = configuration.package) === null || _q === void 0 ? void 0 : _q['copyright-holder'])) {
+                    if ((_r = packageJson.people) === null || _r === void 0 ? void 0 : _r.author) {
+                        (_s = configuration.package) !== null && _s !== void 0 ? _s : (configuration.package = {});
+                        configuration.package['copyright-holder'] =
+                            packageJson.people.author.name;
+                        if (packageJson.people.author.email) {
+                            configuration.package['copyright-holder'] +=
+                                ` <${packageJson.people.author.email}>`;
                         }
+                        if (packageJson.people.author.url) {
+                            configuration.package['copyright-holder'] +=
+                                ` <${packageJson.people.author.url}>`;
+                        }
+                        copyrightHolderFile = 'package.json';
+                        fileUsed = true;
                     }
-                    if (fileUsed) {
-                        configuration.files.push('package.json');
+                }
+                if (!((_t = configuration.package) === null || _t === void 0 ? void 0 : _t.version)) {
+                    if (packageJson.version) {
+                        (_u = configuration.package) !== null && _u !== void 0 ? _u : (configuration.package = {});
+                        configuration.package.version = packageJson.version;
+                        nameFile = 'package.json';
+                        fileUsed = true;
                     }
                 }
+                if (fileUsed) {
+                    (_v = configuration.files) === null || _v === void 0 ? void 0 : _v.push('package.json');
+                }
             }
             if (!configuration)
-                configuration = { files: [] };
-            const result = v.safeParse(exports.ConfigurationSchema, configuration, { lang });
-            if (!result.success) {
-                const issues = result.issues;
-                console.error(gtx._nx('There is one configuration error:', 'There are {num} configuration errors:', issues.length, { num: issues.length }));
-                for (const issue of issues) {
-                    const path = v.getDotPath(issue) || gtx._('[path not set]');
-                    const message = issue.issues ? issue.issues[0].message : issue.message;
-                    let filename;
-                    switch (path) {
-                        case 'package.msgid-bugs-address':
-                            filename = msgidBugsAddressFilePath;
-                            break;
-                        case 'name':
-                            filename = nameFilePath;
-                            break;
-                        case 'copyright-holder':
-                            filename = copyrightHolderFilePath;
-                            break;
-                        case 'version':
-                            filename = versionFilePath;
-                            break;
-                        default:
-                            filename = jsConfigFilePath;
-                            break;
-                    }
-                    console.error('  ' +
-                        gtx._x('{programName}: error: {filename}: {variable}: {message}.', {
-                            variable: path,
-                            programName: 'esgettext',
-                            filename,
-                            message,
-                        }));
-                }
+                configuration = {};
+            if (!this.validate(configuration, {
+                msgidBugsAddressFile: msgidBugsAddressFile,
+                nameFile: nameFile,
+                copyrightHolderFile: copyrightHolderFile,
+                versionFile: versionFile,
+                jsConfigFile: jsConfigFile,
+            }, lang)) {
                 return null;
             }
             return configuration;
         });
     }
+    static validate(configuration, files, lang) {
+        const result = v.safeParse(exports.ConfigurationSchema, configuration, { lang });
+        if (!result.success) {
+            const issues = result.issues;
+            console.error(gtx._nx('There is one configuration error:', 'There are {num} configuration errors:', issues.length, { num: issues.length }));
+            for (const issue of issues) {
+                const path = v.getDotPath(issue) || gtx._('[path not set]');
+                const message = issue.issues ? issue.issues[0].message : issue.message;
+                let filename;
+                switch (path) {
+                    case 'package.msgid-bugs-address':
+                        filename = files.msgidBugsAddressFile;
+                        break;
+                    case 'name':
+                        filename = files.nameFile;
+                        break;
+                    case 'copyright-holder':
+                        filename = files.copyrightHolderFile;
+                        break;
+                    case 'version':
+                        filename = files.versionFile;
+                        break;
+                    default:
+                        filename = files.jsConfigFile;
+                        break;
+                }
+                console.error('\t', gtx._x('{programName}: Error: {filename}: {variable}: {message}.', {
+                    variable: path,
+                    programName: 'esgettext',
+                    filename,
+                    message,
+                }));
+            }
+            return false;
+        }
+        return true;
+    }
+    static getPackageJson() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const data = yield package_json_1.default.load(process.cwd());
+                (0, normalize_package_data_1.default)(data.content);
+                return data.content;
+            }
+            catch (error) {
+                return {};
+            }
+        });
+    }
     static loadFile(filePath) {
         return __awaiter(this, void 0, void 0, function* () {
             const extension = path.extname(filePath);

package/dist/index.js

@@ -22,12 +22,18 @@ const msgmerge_all_js_1 = require("./commands/msgmerge-all.js");
 const install_js_1 = require("./commands/install.js");
 const convert_js_1 = require("./commands/convert.js");
 const msgfmt_all_js_1 = require("./commands/msgfmt-all.js");
+const init_js_1 = require("./commands/init.js");
+const potfiles_js_1 = require("./commands/potfiles.js");
+const add_language_js_1 = require("./commands/add-language.js");
 const commandNames = [
-    'xgettext',
-    'msgmerge-all',
-    'msgfmt-all',
-    'install',
+    'add-language',
     'convert',
+    'install',
+    'init',
+    'msgfmt-all',
+    'msgmerge-all',
+    'potfiles',
+    'xgettext',
 ];
 const configFiles = locateConfigFiles();
 const pkgJsonFile = locatePkgJsonFile();
@@ -35,6 +41,7 @@ const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
 gtx
     .resolve()
     .then(() => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const locale = runtime_1.Textdomain.selectLocale(['en-US', 'en-GB', 'de']);
     const ulocale = locale.replace('-', '_');
     const configuration = yield configuration_js_1.ConfigurationFactory.create(configFiles, pkgJsonFile, locale);
@@ -46,6 +53,9 @@ gtx
         'msgfmt-all': new msgfmt_all_js_1.MsgfmtAll(configuration),
         install: new install_js_1.Install(configuration),
         convert: new convert_js_1.Convert(configuration),
+        init: new init_js_1.Init(configuration),
+        potfiles: new potfiles_js_1.Potfiles(configuration),
+        'add-language': new add_language_js_1.AddLanguage(configuration),
     };
     const program = (0, yargs_1.default)(process.argv.slice(2))
         .locale(ulocale)
@@ -55,21 +65,21 @@ gtx
             alias: ['config-file'],
             type: 'string',
             describe: gtx._('Path to configuration file'),
-            default: 'esgettext.config.{mjs,cjs,js,json}'
+            default: 'esgettext.config.{mjs,cjs,js,json}',
         },
         package: {
             alias: ['package-json'],
             type: 'string',
             describe: gtx._("Path to 'package.json'"),
             default: 'package.json',
-        }
+        },
     })
         .showHelpOnFail(false, gtx._x("Try {programName} '--help' for more information!", {
         programName: package_js_1.Package.getName(),
     }))
         .demandCommand(1, gtx._('Error: No command given.'))
         .scriptName(package_js_1.Package.getName());
-    let epilogue = configuration.files.length
+    let epilogue = ((_a = configuration.files) === null || _a === void 0 ? void 0 : _a.length)
         ? gtx._x('Additional defaults read from: {files}.', {
             files: configuration.files.join(', '),
         }) + '\n\n'
@@ -126,7 +136,14 @@ function getArgument(option) {
 function locateConfigFiles() {
     var _a;
     const configFile = (_a = getArgument('config-file')) !== null && _a !== void 0 ? _a : getArgument('configuration');
-    return configFile !== null ? [configFile] : ['esgettext.config.mjs', 'esgettext.config.cjs', 'esgettext.config.js', 'esgettext.config.json'];
+    return configFile !== null
+        ? [configFile]
+        : [
+            'esgettext.config.mjs',
+            'esgettext.config.cjs',
+            'esgettext.config.js',
+            'esgettext.config.json',
+        ];
 }
 function locatePkgJsonFile() {
     var _a;

package/dist/optspec.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.coerceOptions = void 0;
+const runtime_1 = require("@esgettext/runtime");
+const package_1 = require("./package");
+const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
+function coerceOptions(args, optspecs) {
+    for (const optname in optspecs) {
+        const optspec = optspecs[optname];
+        const optkey = optname.replace(/-(.)/g, (_, group1) => group1.toUpperCase());
+        const arg = args[optkey];
+        const isArray = typeof arg === 'object' && Array.isArray(arg);
+        if (optspec.multi) {
+            if (typeof arg !== 'undefined' && !isArray) {
+                args[optkey] = [args[optkey]];
+            }
+        }
+        else {
+            if (isArray) {
+                console.error(gtx._x('{programName}: Error: The option' +
+                    ' {optname} cannot be specified more than once!', { programName: package_1.Package.getName(), optname }));
+                return false;
+            }
+        }
+    }
+    return true;
+}
+exports.coerceOptions = coerceOptions;

package/dist/package.js

@@ -9,7 +9,10 @@ class Package {
         return 'https://github.com/gflohr/esgettext/issues';
     }
     static getVersion() {
-        return '1.2.0';
+        return '1.3.1';
+    }
+    static getNpmRunAllVersion() {
+        return '^4.1.5';
     }
 }
 exports.Package = Package;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@esgettext/tools",
-	"version": "1.2.0",
+	"version": "1.3.1",
 	"description": "Gettext-like po creation and manipulation",
 	"publishConfig": {
 		"access": "public"
@@ -24,7 +24,7 @@
 	"scripts": {
 		"build": "npm run clean && tsc --project tsconfig-build.json && chmod +x dist/index.js",
 		"prebuild": "node ./write-package.mjs >src/package.ts",
-		"prepublishOnly": "npm run check:clean && npm run build",
+		"prepublishOnly": "npm run build",
 		"check:clean": "../../check-clean",
 		"format": "prettier --write 'src/**/*.ts'",
 		"watch": "tsc --watch",
@@ -53,7 +53,7 @@
 			"^@esgettext/runtime$": "<rootDir>/../../runtime/src"
 		},
 		"rootDir": "src",
-		"testRegex": ".spec.ts$",
+		"testRegex": "\\.spec\\.ts$",
 		"transform": {
 			"^.+\\.ts$": "ts-jest"
 		},
@@ -77,9 +77,11 @@
 		"@types/jest": "^29.5.12",
 		"@types/jsonfile": "^6.1.4",
 		"@types/node": "^20.14.2",
+		"@types/npmcli__package-json": "^4.0.4",
 		"@types/yargs": "^17.0.32",
 		"eslint": "^8.56.0",
 		"jest": "^29.7.0",
+		"npm-run-all": "^4.1.5",
 		"prettier": "^3.3.2",
 		"rimraf": "^5.0.7",
 		"tsx": "^4.15.4",
@@ -89,7 +91,9 @@
 	"dependencies": {
 		"@babel/parser": "^7.24.7",
 		"@babel/traverse": "^7.24.7",
-		"@esgettext/runtime": "^1.2.0",
+		"@esgettext/runtime": "^1.3.0",
+		"@inquirer/prompts": "^5.0.6",
+		"@npmcli/package-json": "^5.2.0",
 		"@valibot/i18n": "^0.15.0",
 		"iconv-lite": "^0.6.3",
 		"jsonfile": "^6.1.0",
@@ -97,5 +101,5 @@
 		"valibot": "^0.31.1",
 		"yargs": "^17.7.2"
 	},
-	"gitHead": "b3027a2934ec19444374e984673099f26cfccff7"
+	"gitHead": "cdc3f0b16ceb2692722109bbcc3078d156c3d2ec"
 }