@esgettext/tools 1.1.0 → 1.2.0

package/dist/configuration.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigurationFactory = exports.ConfigurationSchema = void 0;
 const runtime_1 = require("@esgettext/runtime");
@@ -66,11 +75,14 @@ exports.ConfigurationSchema = v.strictObject({
         })), v.nonEmpty(gtx._x("The field '{field}' must not be empty!", {
             field: 'package.copyright-holder',
         })))),
+        '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' })))),
     })),
     po: v.optional(v.strictObject({
-        directory: v.optional(v.string(gtx._x("The field '{field}' must be a string!", {
+        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' })))),
         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({
@@ -84,178 +96,182 @@ exports.ConfigurationSchema = v.strictObject({
 });
 class ConfigurationFactory {
     constructor() { }
-    static async create(lang) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        if (ConfigurationFactory.instance) {
-            return ConfigurationFactory.instance;
-        }
-        if (lang && !lang.match(/^zh-/)) {
-            lang = lang.replace(/-.*/, '');
-        }
-        const jsConfigFiles = [
-            'esgettext.config.mjs',
-            'esgettext.config.cjs',
-            'esgettext.config.js',
-            'esgettext.config.json',
-        ];
-        let jsConfigFilePath;
-        let msgidBugsAddressFilePath;
-        let nameFilePath;
-        let copyrightHolderFilePath;
-        let versionFilePath;
-        const rootPath = process.cwd();
-        let configuration = null;
-        for (const file of jsConfigFiles) {
-            const filePath = path.join(rootPath, file);
-            if (fs.existsSync(filePath)) {
-                const data = await this.loadFile(filePath);
-                if (data) {
-                    configuration = data;
-                    configuration.files = [file];
-                    jsConfigFilePath = file;
-                    if ((_a = configuration.package) === null || _a === void 0 ? void 0 : _a['msgid-bugs-address']) {
-                        msgidBugsAddressFilePath = filePath;
-                    }
-                    if ((_b = configuration.package) === null || _b === void 0 ? void 0 : _b.name) {
-                        nameFilePath = filePath;
-                    }
-                    if ((_c = configuration.package) === null || _c === void 0 ? void 0 : _c['copyright-holder']) {
-                        copyrightHolderFilePath = filePath;
+    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;
+            if (ConfigurationFactory.instance) {
+                return ConfigurationFactory.instance;
+            }
+            if (lang && !lang.match(/^zh-/)) {
+                lang = lang.replace(/-.*/, '');
+            }
+            let jsConfigFilePath;
+            let msgidBugsAddressFilePath;
+            let nameFilePath;
+            let copyrightHolderFilePath;
+            let versionFilePath;
+            const rootPath = process.cwd();
+            let configuration = null;
+            for (const file of jsConfigFiles) {
+                const filePath = path.join(rootPath, file);
+                if (fs.existsSync(filePath)) {
+                    const data = yield this.loadFile(filePath);
+                    if (data) {
+                        configuration = data;
+                        configuration.files = [file];
+                        jsConfigFilePath = file;
+                        if ((_a = configuration.package) === null || _a === void 0 ? void 0 : _a['msgid-bugs-address']) {
+                            msgidBugsAddressFilePath = filePath;
+                        }
+                        if ((_b = configuration.package) === null || _b === void 0 ? void 0 : _b.name) {
+                            nameFilePath = filePath;
+                        }
+                        if ((_c = configuration.package) === null || _c === void 0 ? void 0 : _c['copyright-holder']) {
+                            copyrightHolderFilePath = filePath;
+                        }
+                        if ((_d = configuration.package) === null || _d === void 0 ? void 0 : _d.version) {
+                            versionFilePath = filePath;
+                        }
+                        break;
                     }
-                    if ((_d = configuration.package) === null || _d === void 0 ? void 0 : _d.version) {
-                        versionFilePath = filePath;
+                    else {
+                        return null;
                     }
-                    break;
-                }
-                else {
-                    return null;
                 }
             }
-        }
-        if (!configuration ||
-            !configuration.package ||
-            !configuration.package['msgid-bugs-address'] ||
-            !configuration.package['name'] ||
-            !configuration.package['copyright-holder'] ||
-            !configuration.package['version']) {
-            const packageJsonPath = path.join(rootPath, 'package.json');
-            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 = [];
-                    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';
+            // Fallback to `package.json` configuration.  We also try to read
+            // msgid-bugs-address from package.json if not set.
+            if (!configuration ||
+                !configuration.package ||
+                !configuration.package['msgid-bugs-address'] ||
+                !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 = [];
                         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;
+                    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;
+                        }
                     }
-                }
-                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;
+                    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;
+                        }
                     }
-                }
-                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 (!((_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 (!((_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.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 (fileUsed) {
+                        configuration.files.push('package.json');
                     }
-                }
-                if (fileUsed) {
-                    configuration.files.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;
+            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,
+                        }));
                 }
-                console.error('  ' +
-                    gtx._x('{programName}: error: {filename}: {variable}: {message}.', {
-                        variable: path,
-                        programName: 'esgettext',
-                        filename,
-                        message,
-                    }));
+                return null;
             }
-            return null;
-        }
-        return configuration;
+            return configuration;
+        });
     }
-    static async loadFile(filePath) {
-        const extension = path.extname(filePath);
-        if (extension === '.mjs' || extension === '.cjs' || extension === '.js') {
-            return Promise.resolve(`${filePath}`).then(s => __importStar(require(s))).then(module => module.default)
-                .catch(error => {
-                console.error(gtx._x('{programName}: {filename}: error reading configuration: {error}', {
+    static loadFile(filePath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const extension = path.extname(filePath);
+            if (extension === '.mjs' || extension === '.cjs' || extension === '.js') {
+                return Promise.resolve(`${filePath}`).then(s => __importStar(require(s))).then(module => module.default)
+                    .catch(error => {
+                    console.error(gtx._x('{programName}: {filename}: error reading configuration: {error}', {
+                        programName: package_1.Package.getName(),
+                        filename: path.basename(filePath),
+                        error,
+                    }));
+                    return null;
+                });
+            }
+            else if (extension === '.json') {
+                try {
+                    return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+                }
+                catch (_a) {
+                    return null;
+                }
+            }
+            else {
+                throw new Error(gtx._x("{programName}: Error: {filename}: Configuration file name must end in '.mjs', '.cjs', '.js', or '.json'!", {
                     programName: package_1.Package.getName(),
-                    filename: path.basename(filePath),
-                    error,
+                    filename: filePath,
                 }));
-                return null;
-            });
-        }
-        else if (extension === '.json') {
-            try {
-                return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
-            }
-            catch (_a) {
-                return null;
             }
-        }
-        return null;
+        });
     }
 }
 exports.ConfigurationFactory = ConfigurationFactory;
-//# sourceMappingURL=configuration.js.map

package/dist/esgettext-package-json.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=esgettext-package-json.js.map

package/dist/index.js

@@ -1,18 +1,27 @@
 #! /usr/bin/env node
 "use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const yargs_1 = __importDefault(require("yargs"));
-const package_1 = require("./package");
+const package_js_1 = require("./package.js");
 const runtime_1 = require("@esgettext/runtime");
-const configuration_1 = require("./configuration");
-const xgettext_1 = require("./commands/xgettext");
-const msgmerge_all_1 = require("./commands/msgmerge-all");
-const install_1 = require("./commands/install");
-const convert_1 = require("./commands/convert");
-const msgfmt_all_1 = require("./commands/msgfmt-all");
+const configuration_js_1 = require("./configuration.js");
+const xgettext_js_1 = require("./commands/xgettext.js");
+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 commandNames = [
     'xgettext',
     'msgmerge-all',
@@ -20,37 +29,53 @@ const commandNames = [
     'install',
     'convert',
 ];
+const configFiles = locateConfigFiles();
+const pkgJsonFile = locatePkgJsonFile();
 const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
 gtx
     .resolve()
-    .then(async () => {
+    .then(() => __awaiter(void 0, void 0, void 0, function* () {
     const locale = runtime_1.Textdomain.selectLocale(['en-US', 'en-GB', 'de']);
     const ulocale = locale.replace('-', '_');
-    const configuration = await configuration_1.ConfigurationFactory.create(locale);
+    const configuration = yield configuration_js_1.ConfigurationFactory.create(configFiles, pkgJsonFile, locale);
     if (!configuration)
         process.exit(1);
     const commands = {
-        xgettext: new xgettext_1.XGettext(configuration),
-        'msgmerge-all': new msgmerge_all_1.MsgmergeAll(configuration),
-        'msgfmt-all': new msgfmt_all_1.MsgfmtAll(configuration),
-        install: new install_1.Install(configuration),
-        convert: new convert_1.Convert(configuration),
+        xgettext: new xgettext_js_1.XGettext(configuration),
+        'msgmerge-all': new msgmerge_all_js_1.MsgmergeAll(configuration),
+        'msgfmt-all': new msgfmt_all_js_1.MsgfmtAll(configuration),
+        install: new install_js_1.Install(configuration),
+        convert: new convert_js_1.Convert(configuration),
     };
     const program = (0, yargs_1.default)(process.argv.slice(2))
         .locale(ulocale)
         .strict()
+        .options({
+        configuration: {
+            alias: ['config-file'],
+            type: 'string',
+            describe: gtx._('Path to configuration file'),
+            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_1.Package.getName(),
+        programName: package_js_1.Package.getName(),
     }))
         .demandCommand(1, gtx._('Error: No command given.'))
-        .scriptName(package_1.Package.getName());
+        .scriptName(package_js_1.Package.getName());
     let epilogue = configuration.files.length
         ? gtx._x('Additional defaults read from: {files}.', {
             files: configuration.files.join(', '),
         }) + '\n\n'
         : '';
     epilogue += gtx._x('Report bugs in the bugtracker at {url}!', {
-        url: package_1.Package.getBugTrackerUrl(),
+        url: package_js_1.Package.getBugTrackerUrl(),
     });
     for (const name of commandNames) {
         const command = commands[name];
@@ -66,19 +91,45 @@ gtx
                 command.additional(argv);
                 return argv.options(command.args());
             },
-            handler: async (argv) => {
-                argv._.shift();
-                const exitCode = await command.run(argv);
+            handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
+                argv._.shift(); // Remove the command name.
+                const exitCode = yield command.run(argv);
                 process.exit(exitCode);
-            },
+            }),
         });
     }
     program.help().epilogue(epilogue).parse();
-})
+}))
     .catch((exception) => {
     console.error(gtx._x('{programName}: unhandled exception: {exception}'), {
-        programName: package_1.Package.getName(),
+        programName: package_js_1.Package.getName(),
         exception,
     });
 });
-//# sourceMappingURL=index.js.map
+function getArgument(option) {
+    const longOption = '--' + option;
+    const longOptionRe = new RegExp(`^${longOption}=.+`);
+    const args = process.argv.slice(2);
+    for (const [index, arg] of args.entries()) {
+        if (arg == longOption && index < args.length) {
+            return args[index + 1];
+        }
+        else if (arg.match(longOptionRe)) {
+            return arg.substring(longOption.length + 1);
+        }
+        else if (arg[0] !== '-') {
+            break;
+        }
+    }
+    return null;
+}
+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'];
+}
+function locatePkgJsonFile() {
+    var _a;
+    const configFile = (_a = getArgument('package')) !== null && _a !== void 0 ? _a : getArgument('package-json');
+    return configFile !== null ? configFile : 'package.json';
+}

package/dist/package.js

@@ -9,8 +9,7 @@ class Package {
         return 'https://github.com/gflohr/esgettext/issues';
     }
     static getVersion() {
-        return '1.1.0';
+        return '1.2.0';
     }
 }
 exports.Package = Package;
-//# sourceMappingURL=package.js.map

package/dist/parser/javascript.js

@@ -11,6 +11,8 @@ class JavaScriptParser extends parser_2.Parser {
             allowReturnOutsideFunction: true,
             allowSuperOutsideMethod: true,
             allowUndeclaredExports: true,
+            // Documented but not supported. FIXME! Maybe only missing in types.
+            // errorRecovery: true,
             sourceFilename: filename,
             plugins: [
                 'flow',
@@ -24,4 +26,3 @@ class JavaScriptParser extends parser_2.Parser {
     }
 }
 exports.JavaScriptParser = JavaScriptParser;
-//# sourceMappingURL=javascript.js.map