@esgettext/tools 1.2.0 → 1.3.1

package/dist/commands/install.js

@@ -27,6 +27,7 @@ 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) {
@@ -47,8 +48,8 @@ class Install {
         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,
@@ -129,8 +130,11 @@ class Install {
         }
     }
     run(argv) {
-        this.init(argv);
         return new Promise(resolve => {
+            if (!(0, optspec_1.coerceOptions)(argv, this.args())) {
+                return resolve(1);
+            }
+            this.init(argv);
             const promises = [];
             for (let i = 0; i < this.locales.length; ++i) {
                 const locale = this.locales[i];
@@ -233,7 +237,11 @@ class Install {
     installLocale(locale) {
         try {
             const directory = this.options.outputDirectory + '/' + locale + '/LC_MESSAGES';
-            const outFile = directory + '/' + this.options.defaultDomain + '.' + 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);

package/dist/commands/msgfmt-all.js

@@ -37,6 +37,7 @@ 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) {
@@ -57,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,
@@ -84,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',
@@ -129,8 +129,11 @@ class MsgfmtAll {
         }
     }
     run(argv) {
-        this.init(argv);
         return new Promise(resolve => {
+            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 => {

package/dist/commands/msgmerge-all.js

@@ -38,6 +38,7 @@ 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) {
@@ -72,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,
@@ -93,10 +94,10 @@ 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,
+                default: (_h = (_g = this.configuration.programs) === null || _g === void 0 ? void 0 : _g.msgmerge) === null || _h === void 0 ? void 0 : _h.options,
                 group: gtx._('Mode of operation:'),
             },
             verbose: {
@@ -140,8 +141,11 @@ class MsgmergeAll {
         }
     }
     run(argv) {
-        this.init(argv);
         return new Promise(resolve => {
+            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 => {

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.js

@@ -33,6 +33,7 @@ const files_collector_1 = require("./xgettext/files-collector");
 const typescript_1 = require("../parser/typescript");
 const javascript_1 = require("../parser/javascript");
 const keyword_1 = require("../pot/keyword");
+const optspec_1 = require("../optspec");
 const gtx = runtime_1.Textdomain.getInstance('com.cantanea.esgettext-tools');
 class XGettext {
     // The date is only passed for testing.
@@ -59,16 +60,16 @@ class XGettext {
             : undefined;
         return {
             'files-from': {
+                multi: true,
                 group: gtx._('Input file location:'),
                 type: 'string',
-                array: true,
                 describe: gtx._('get list of input files from FILE'),
                 default: (_b = this.configuration.package) === null || _b === void 0 ? void 0 : _b['files-from'],
             },
             directory: {
+                multi: true,
                 group: gtx._('Input file location:'),
                 type: 'string',
-                array: true,
                 describe: gtx._('add directory to list for input files search\nIf input file is -, standard input is read.'),
             },
             'default-domain': {
@@ -112,18 +113,18 @@ class XGettext {
                 describe: gtx._('join messages with existing file'),
             },
             'exclude-file': {
+                multi: true,
                 group: gtx._('Operation mode:'),
                 alias: 'x',
                 type: 'string',
                 describe: gtx._('entries from FILE.po are not extracted'),
-                array: true,
             },
             'add-comments': {
+                multi: true,
                 group: gtx._('Operation mode:'),
                 alias: 'c',
                 type: 'string',
                 describe: gtx._('place comment blocks starting with TAG and preceding keyword lines in output file'),
-                array: true,
             },
             'add-all-comments': {
                 group: gtx._('Operation mode:'),
@@ -137,22 +138,22 @@ class XGettext {
                 describe: gtx._('extract all strings'),
             },
             keyword: {
+                multi: true,
                 group: gtx._('Language specific options:'),
                 type: 'string',
                 describe: gtx._('look for WORD as an additional keyword'),
-                array: true,
             },
             flag: {
+                multi: true,
                 group: gtx._('Language specific options:'),
                 type: 'string',
                 describe: gtx._('argument: WORD:ARG:FLAG, additional flag for strings inside the argument number ARG of keyword WORD'),
-                array: true,
             },
             instance: {
+                multi: true,
                 group: gtx._('Language specific options:'),
                 type: 'string',
                 describe: gtx._('only accept method calls of specified instance names'),
-                array: true,
             },
             'force-po': {
                 group: gtx._('Output details:'),
@@ -238,7 +239,12 @@ class XGettext {
         };
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    additional(_) { }
+    additional(argv) {
+        argv.positional(gtx._('INPUTFILE'), {
+            type: 'string',
+            describe: gtx._('input files'),
+        });
+    }
     init(argv) {
         var _a, _b, _c, _d, _e;
         const options = argv;
@@ -318,7 +324,7 @@ class XGettext {
         }
         let fileCollector;
         try {
-            fileCollector = new files_collector_1.FilesCollector(this.options.filesFrom, this.options._);
+            fileCollector = new files_collector_1.FilesCollector(this.options.filesFrom, this.options[gtx._('INPUTFILE')]);
         }
         catch (e) {
             console.error(`${this.options.$0}: ${e}`);
@@ -355,8 +361,11 @@ class XGettext {
         return exitCode;
     }
     run(argv) {
-        this.init(argv);
         return new Promise(resolve => {
+            if (!(0, optspec_1.coerceOptions)(argv, this.args())) {
+                return resolve(1);
+            }
+            this.init(argv);
             try {
                 resolve(this.doRun());
             }
@@ -412,6 +421,8 @@ class XGettext {
                 break;
             case '.js':
             case '.jsx':
+            case '.mjs':
+            case '.cjs':
                 parser = new javascript_1.JavaScriptParser(this.catalog, parserOptions);
                 break;
             case '.po':