@esgettext/tools 1.1.0 → 1.3.0

package/dist/commands/install.js

@@ -27,9 +27,12 @@ exports.Install = void 0;
 const fs_1 = require("fs");
 const runtime_1 = require("@esgettext/runtime");
 const mkdirp = __importStar(require("mkdirp"));
+const optspec_1 = require("../optspec");
 const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
 class Install {
     constructor(configuration) {
+        this.locales = undefined;
+        this.options = undefined;
         this.configuration = configuration;
     }
     synopsis() {
@@ -42,11 +45,11 @@ class Install {
         return [];
     }
     args() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return {
             locales: {
+                multi: true,
                 alias: 'l',
-                type: 'array',
                 describe: gtx._('List of locale identifiers'),
                 demandOption: true,
                 default: (_a = this.configuration.po) === null || _a === void 0 ? void 0 : _a.locales,
@@ -66,10 +69,16 @@ class Install {
                 choices: ['gmo', 'mo'],
                 group: gtx._('Input file options:'),
             },
+            'default-domain': {
+                type: 'string',
+                describe: gtx._('The textdomain to use'),
+                default: (_d = this.configuration.package) === null || _d === void 0 ? void 0 : _d.textdomain,
+                group: gtx._('Output file options'),
+            },
             'output-directory': {
                 type: 'string',
                 describe: gtx._('Output directory'),
-                default: (_e = (_d = this.configuration.install) === null || _d === void 0 ? void 0 : _d.directory) !== null && _e !== void 0 ? _e : 'src/locale',
+                default: (_f = (_e = this.configuration.install) === null || _e === void 0 ? void 0 : _e.directory) !== null && _f !== void 0 ? _f : 'src/locale',
                 group: gtx._('Output file options:'),
             },
             'output-format': {
@@ -86,6 +95,7 @@ class Install {
             },
         };
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     additional(_) { }
     init(argv) {
         var _a, _b, _c, _d;
@@ -120,8 +130,10 @@ class Install {
         }
     }
     run(argv) {
-        this.init(argv);
         return new Promise(resolve => {
+            if (!(0, optspec_1.coerceOptions)(argv, this.args())) {
+                return resolve(1);
+            }
             const promises = [];
             for (let i = 0; i < this.locales.length; ++i) {
                 const locale = this.locales[i];
@@ -224,7 +236,11 @@ class Install {
     installLocale(locale) {
         try {
             const directory = this.options.outputDirectory + '/' + locale + '/LC_MESSAGES';
-            const outFile = directory + '/' + 'domain' + '.' + this.options.outputFormat;
+            const outFile = directory +
+                '/' +
+                this.options.defaultDomain +
+                '.' +
+                this.options.outputFormat;
             const inFile = this.options.directory + '/' + locale + '.' + this.options.inputFormat;
             if (!(0, fs_1.existsSync)(directory)) {
                 mkdirp.sync(directory);
@@ -246,4 +262,3 @@ class Install {
     }
 }
 exports.Install = Install;
-//# sourceMappingURL=install.js.map

package/dist/commands/msgfmt-all.js

@@ -22,15 +22,27 @@ 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.MsgfmtAll = void 0;
 const fs = __importStar(require("fs"));
 const childProcess = __importStar(require("child_process"));
 const runtime_1 = require("@esgettext/runtime");
 const package_1 = require("../package");
+const optspec_1 = require("../optspec");
 const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
 class MsgfmtAll {
     constructor(configuration) {
+        this.locales = undefined;
+        this.options = undefined;
         this.configuration = configuration;
     }
     synopsis() {
@@ -46,8 +58,7 @@ class MsgfmtAll {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const options = {
             locales: {
-                alias: 'l',
-                type: 'array',
+                multi: true,
                 describe: gtx._('List of locale identifiers'),
                 demandOption: true,
                 default: (_a = this.configuration.po) === null || _a === void 0 ? void 0 : _a.locales,
@@ -73,8 +84,8 @@ class MsgfmtAll {
                 group: gtx._('Mode of operation:'),
             },
             options: {
+                multi: true,
                 type: 'string',
-                array: true,
                 describe: gtx._x("Options to pass to '{program}' program (without hyphens)", { program: 'msgfmt' }),
                 default: ((_h = (_g = this.configuration.programs) === null || _g === void 0 ? void 0 : _g.msgfmt) === null || _h === void 0 ? void 0 : _h.options) || [
                     'check',
@@ -96,6 +107,7 @@ class MsgfmtAll {
         }
         return options;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     additional(_) { }
     init(argv) {
         var _a, _b;
@@ -117,11 +129,20 @@ class MsgfmtAll {
         }
     }
     run(argv) {
-        this.init(argv);
         return new Promise(resolve => {
-            this.locales
-                .reduce((promise, locale) => promise.then(() => this.msgfmtLocale(locale)), Promise.resolve())
-                .then(() => resolve(0), () => resolve(1));
+            if (!(0, optspec_1.coerceOptions)(argv, this.args())) {
+                return resolve(1);
+            }
+            this.init(argv);
+            const promises = this.locales.map(locale => this.msgfmtLocale(locale));
+            Promise.all(promises)
+                .then(results => {
+                const hasOne = results.some(result => result === 1);
+                resolve(hasOne ? 1 : 0);
+            })
+                .catch(() => {
+                resolve(1);
+            });
         });
     }
     convertOptions(options) {
@@ -147,54 +168,55 @@ class MsgfmtAll {
         }
         return errors ? null : msgmergeOptions;
     }
-    async msgfmtLocale(locale) {
-        return new Promise(resolve => {
-            const args = this.convertOptions(this.options.options);
-            if (!args)
-                return resolve(1);
-            const poFile = this.options.directory + '/' + locale + '.po';
-            const moFile = this.options.directory + '/' + locale + '.' + this.options.format;
-            args.push('-o', moFile, poFile);
-            if (this.options.verbose) {
-                console.log(gtx._x("Compiling '{po}' into '{mo}'.", {
-                    po: poFile,
-                    mo: moFile,
-                }));
-            }
-            try {
-                const msgfmt = childProcess.spawn(this.options.msgfmt, args, {
-                    windowsHide: true,
-                });
-                msgfmt.stdout.on('data', (data) => process.stdout.write(data.toString()));
-                msgfmt.stderr.on('data', (data) => process.stderr.write(data.toString()));
-                msgfmt.on('close', code => {
-                    if (code) {
-                        fs.unlinkSync(moFile);
-                        resolve(1);
-                    }
-                    else {
-                        resolve(0);
-                    }
-                });
-                msgfmt.on('error', err => {
-                    throw new Error(gtx._x("Failed to run '{prg}': {err}", {
-                        prg: this.options.msgfmt,
-                        err,
+    msgfmtLocale(locale) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise(resolve => {
+                const args = this.convertOptions(this.options.options);
+                if (!args)
+                    return resolve(1);
+                const poFile = this.options.directory + '/' + locale + '.po';
+                const moFile = this.options.directory + '/' + locale + '.' + this.options.format;
+                args.push('-o', moFile, poFile);
+                if (this.options.verbose) {
+                    console.log(gtx._x("Compiling '{po}' into '{mo}'.", {
+                        po: poFile,
+                        mo: moFile,
                     }));
-                });
-            }
-            catch (err) {
+                }
                 try {
-                    fs.unlinkSync(moFile);
+                    const msgfmt = childProcess.spawn(this.options.msgfmt, args, {
+                        windowsHide: true,
+                    });
+                    msgfmt.stdout.on('data', (data) => process.stdout.write(data.toString()));
+                    msgfmt.stderr.on('data', (data) => process.stderr.write(data.toString()));
+                    msgfmt.on('close', code => {
+                        if (code) {
+                            fs.unlinkSync(moFile);
+                            resolve(1);
+                        }
+                        else {
+                            resolve(0);
+                        }
+                    });
+                    msgfmt.on('error', err => {
+                        throw new Error(gtx._x("Failed to run '{prg}': {err}", {
+                            prg: this.options.msgfmt,
+                            err,
+                        }));
+                    });
                 }
-                catch (err1) {
-                    console.error(err1);
+                catch (err) {
+                    try {
+                        fs.unlinkSync(moFile);
+                    }
+                    catch (err1) {
+                        console.error(err1);
+                    }
+                    console.error(err);
+                    resolve(1);
                 }
-                console.error(err);
-                resolve(1);
-            }
+            });
         });
     }
 }
 exports.MsgfmtAll = MsgfmtAll;
-//# sourceMappingURL=msgfmt-all.js.map

package/dist/commands/msgmerge-all.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.MsgmergeAll = void 0;
 const path = __importStar(require("path"));
@@ -29,10 +38,13 @@ const fs = __importStar(require("fs"));
 const childProcess = __importStar(require("child_process"));
 const runtime_1 = require("@esgettext/runtime");
 const package_1 = require("../package");
+const optspec_1 = require("../optspec");
 const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
 class MsgmergeAll {
     constructor(configuration) {
         var _a, _b;
+        this.locales = [];
+        this.options = {};
         this.configuration = configuration;
         if (((_a = configuration.package) === null || _a === void 0 ? void 0 : _a.textdomain) &&
             typeof ((_b = configuration.po) === null || _b === void 0 ? void 0 : _b.directory) !== 'undefined') {
@@ -61,8 +73,8 @@ class MsgmergeAll {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const options = {
             locales: {
+                multi: true,
                 alias: 'l',
-                type: 'array',
                 describe: gtx._('List of locale identifiers'),
                 demandOption: true,
                 default: (_a = this.configuration.po) === null || _a === void 0 ? void 0 : _a.locales,
@@ -82,8 +94,8 @@ class MsgmergeAll {
                 group: gtx._('Mode of operation:'),
             },
             options: {
+                multi: true,
                 type: 'string',
-                array: true,
                 describe: gtx._x("Options to pass to '{program}' program (without hyphens)", { program: 'msgmerge' }),
                 default: (_h = (_g = this.configuration.programs) === null || _g === void 0 ? void 0 : _g.msgfmt) === null || _h === void 0 ? void 0 : _h.options,
                 group: gtx._('Mode of operation:'),
@@ -129,11 +141,20 @@ class MsgmergeAll {
         }
     }
     run(argv) {
-        this.init(argv);
         return new Promise(resolve => {
-            this.locales
-                .reduce((promise, locale) => promise.then(() => this.msgmergeLocale(locale)), Promise.resolve())
-                .then(() => resolve(0), () => resolve(1));
+            if (!(0, optspec_1.coerceOptions)(argv, this.args())) {
+                return resolve(1);
+            }
+            this.init(argv);
+            const promises = this.locales.map(locale => this.msgmergeLocale(locale));
+            Promise.all(promises)
+                .then(results => {
+                const hasOne = results.some(result => result === 1);
+                resolve(hasOne ? 1 : 0);
+            })
+                .catch(() => {
+                resolve(1);
+            });
         });
     }
     convertOptions(options) {
@@ -159,54 +180,55 @@ class MsgmergeAll {
         }
         return errors ? null : msgmergeOptions;
     }
-    async msgmergeLocale(locale) {
-        return new Promise(resolve => {
-            const args = this.convertOptions(this.options.options);
-            if (!args)
-                return resolve(1);
-            const poFile = this.options.directory + '/' + locale + '.po';
-            const oldPoFile = this.options.directory + '/' + locale + '.old.po';
-            args.push(oldPoFile, this.potfile, '-o', poFile);
-            console.log(gtx._x("Merging '{pot}' into '{po}'.", {
-                pot: this.potfile,
-                po: poFile,
-            }));
-            try {
-                fs.renameSync(poFile, oldPoFile);
-                const msgmerge = childProcess.spawn(this.options.msgmerge, args, {
-                    windowsHide: true,
-                });
-                msgmerge.on('error', err => {
-                    throw new Error(gtx._x("Failed to run '{prg}': {err}", {
-                        prg: this.options.msgmerge,
-                        err,
-                    }));
-                });
-                msgmerge.stdout.on('data', (data) => process.stdout.write(data.toString()));
-                msgmerge.stderr.on('data', (data) => process.stderr.write(data.toString()));
-                msgmerge.on('close', code => {
-                    if (code) {
+    msgmergeLocale(locale) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise(resolve => {
+                const args = this.convertOptions(this.options.options);
+                if (!args)
+                    return resolve(1);
+                const poFile = this.options.directory + '/' + locale + '.po';
+                const oldPoFile = this.options.directory + '/' + locale + '.old.po';
+                args.push(oldPoFile, this.potfile, '-o', poFile);
+                console.log(gtx._x("Merging '{pot}' into '{po}'.", {
+                    pot: this.potfile,
+                    po: poFile,
+                }));
+                try {
+                    fs.renameSync(poFile, oldPoFile);
+                    const msgmerge = childProcess.spawn(this.options.msgmerge, args, {
+                        windowsHide: true,
+                    });
+                    msgmerge.on('error', err => {
+                        throw new Error(gtx._x("Failed to run '{prg}': {err}", {
+                            prg: this.options.msgmerge,
+                            err,
+                        }));
+                    });
+                    msgmerge.stdout.on('data', (data) => process.stdout.write(data.toString()));
+                    msgmerge.stderr.on('data', (data) => process.stderr.write(data.toString()));
+                    msgmerge.on('close', code => {
+                        if (code) {
+                            fs.renameSync(oldPoFile, poFile);
+                            resolve(1);
+                        }
+                        else {
+                            fs.unlinkSync(oldPoFile);
+                            resolve(0);
+                        }
+                    });
+                }
+                catch (err) {
+                    try {
                         fs.renameSync(oldPoFile, poFile);
-                        resolve(1);
                     }
-                    else {
-                        fs.unlinkSync(oldPoFile);
-                        resolve(0);
+                    catch (err1) {
+                        console.error(err1);
                     }
-                });
-            }
-            catch (err) {
-                try {
-                    fs.renameSync(oldPoFile, poFile);
+                    console.error(err);
+                    resolve(1);
                 }
-                catch (err1) {
-                    console.error(err1);
-                }
-                console.error(err);
-                resolve(1);
-            }
+            });
         });
     }
 }
 exports.MsgmergeAll = MsgmergeAll;
-//# sourceMappingURL=msgmerge-all.js.map

package/dist/commands/potfiles.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Potfiles = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const child_process_1 = require("child_process");
+const glob_1 = require("glob");
+const runtime_1 = require("@esgettext/runtime");
+const package_1 = require("../package");
+const optspec_1 = require("../optspec");
+const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
+class Potfiles {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    constructor(configuration) {
+        this.GIT_DIRECTORY_NAME = '.git';
+        this.options = undefined;
+        this.configuration = configuration;
+    }
+    synopsis() {
+        return `[${gtx._('PATTERN')}...]`;
+    }
+    description() {
+        return gtx._('Write a list of filenames with translatable strings to standard output.');
+    }
+    aliases() {
+        return [];
+    }
+    args() {
+        var _a;
+        return {
+            exclude: {
+                multi: true,
+                alias: 'x',
+                type: 'string',
+                describe: gtx._('Pattern for files to ignore.'),
+            },
+            git: {
+                type: 'boolean',
+                describe: gtx._('Only list files under (git) version control.'),
+                default: this.isGitRepo(),
+            },
+            include: {
+                multi: true,
+                type: 'string',
+                describe: gtx._('Pattern for additional files to include (even when not under version control).'),
+            },
+            directory: {
+                type: 'string',
+                describe: gtx._('Make paths relative to this directory.'),
+                default: (_a = this.configuration.po) === null || _a === void 0 ? void 0 : _a.directory,
+            },
+        };
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    additional(argv) {
+        argv.positional(gtx._('PATTERN'), {
+            type: 'string',
+            describe: gtx._('Filename patterns for source files'),
+        });
+    }
+    isDirectory(path) {
+        const stats = (0, fs_1.lstatSync)(path);
+        if (stats.isDirectory()) {
+            return true;
+        }
+        else if (stats.isSymbolicLink()) {
+            const realPath = (0, fs_1.realpathSync)(path);
+            const realStats = (0, fs_1.statSync)(realPath);
+            if (realStats.isDirectory()) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        else {
+            return false;
+        }
+    }
+    isGitDirectory(path) {
+        const fullPath = (0, path_1.join)(path, this.GIT_DIRECTORY_NAME);
+        return (0, fs_1.existsSync)(fullPath) && this.isDirectory(fullPath);
+    }
+    isGitRepo() {
+        if (this.isGitDirectory(process.cwd())) {
+            return true;
+        }
+        let currentPath = process.cwd();
+        while (true) {
+            const parentPath = (0, path_1.join)(currentPath, '..');
+            if (parentPath === currentPath) {
+                break;
+            }
+            if (this.isGitDirectory(parentPath)) {
+                return true;
+            }
+            currentPath = parentPath;
+        }
+        return false;
+    }
+    init(argv) {
+        const options = argv;
+        this.options = options;
+    }
+    filterGit(allFiles) {
+        const stdout = (0, child_process_1.execSync)('git ls-files').toString('utf-8');
+        const repoFiles = stdout
+            .trim()
+            .split('\n')
+            .map(filename => (0, path_1.resolve)(filename));
+        const filtered = [];
+        for (const filename of allFiles) {
+            const resolved = (0, path_1.resolve)(filename);
+            if (repoFiles.includes(resolved)) {
+                filtered.push(filename);
+            }
+        }
+        return filtered;
+    }
+    makeRelative(filename, base) {
+        const absoluteFilename = (0, path_1.resolve)(filename);
+        const absoluteBase = (0, path_1.resolve)(base);
+        return (0, path_1.relative)(absoluteBase, absoluteFilename);
+    }
+    run(argv) {
+        return new Promise(resolve => {
+            if (!(0, optspec_1.coerceOptions)(argv, this.args())) {
+                return resolve(1);
+            }
+            this.init(argv);
+            const patterns = this.options[gtx._('PATTERN')];
+            if (!patterns.length) {
+                console.error(gtx._x('{programName}: Error: No filename patterns specified!', {
+                    programName: package_1.Package.getName(),
+                }));
+                return resolve(1);
+            }
+            const candidates = (0, glob_1.globSync)(patterns, { ignore: this.options.exclude });
+            let filtered;
+            if (this.options.git) {
+                filtered = this.filterGit(candidates);
+            }
+            else {
+                filtered = candidates.filter(filename => !this.isDirectory(filename));
+            }
+            if (typeof this.options.include !== 'undefined') {
+                const included = (0, glob_1.globSync)(this.options.include).filter(filename => !this.isDirectory(filename));
+                filtered.push(...included);
+            }
+            // sort | uniq for JavaScript.
+            filtered = filtered.sort().filter((item, index) => {
+                return index === 0 || item !== filtered[index - 1];
+            });
+            if (typeof this.options.directory !== 'undefined' &&
+                this.options.directory.length) {
+                filtered = filtered.map(filename => this.makeRelative(filename, this.options.directory));
+            }
+            for (const filename of filtered) {
+                console.log(filename);
+            }
+            resolve(0);
+        });
+    }
+}
+exports.Potfiles = Potfiles;

package/dist/commands/xgettext/file-resolver.js

@@ -18,4 +18,3 @@ class FileResolver {
     }
 }
 exports.FileResolver = FileResolver;
-//# sourceMappingURL=file-resolver.js.map

package/dist/commands/xgettext/files-collector.js

@@ -18,6 +18,7 @@ class FilesCollector {
             });
         }
         args.forEach(filename => filenames.push(filename));
+        // Make filenames unique.
         this.filenames = Array.from(new Set(filenames));
     }
     getFilesFromFile(filename) {
@@ -36,4 +37,3 @@ class FilesCollector {
     }
 }
 exports.FilesCollector = FilesCollector;
-//# sourceMappingURL=files-collector.js.map