@wp-blocks/make-pot 0.1.0 → 1.0.0

package/lib/parser/tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/parser/tree.ts"],"names":[],"mappings":"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"}

package/lib/parser.d.ts

@@ -2,5 +2,5 @@ import type { Args, TranslationStrings } from './types';
 import { Glob } from 'glob';
 export declare function getStrings(args: Args, files: Glob<{
     cwd: string;
-}>): Promise<TranslationStrings>;
-export declare function runExtract(args: Args): Promise<TranslationStrings>;
+}>): Promise<TranslationStrings[]>;
+export declare function runExtract(args: Args): Promise<TranslationStrings[]>;

package/lib/parser.js

@@ -17,11 +17,10 @@ const cli_progress_1 = __importDefault(require("cli-progress"));
 const extractors_1 = require("./extractors");
 const const_1 = require("./const");
 const glob_1 = require("./glob");
-const consolidate_1 = require("./consolidate");
 function initProgress(args, filesCount) {
     var _a;
     if ((_a = args.options) === null || _a === void 0 ? void 0 : _a.silent)
-        return null;
+        return undefined;
     const progressBar = new cli_progress_1.default.SingleBar({
         clearOnComplete: true,
         etaBuffer: 1000,
@@ -31,77 +30,79 @@ function initProgress(args, filesCount) {
     progressBar.start(filesCount, 0);
     return progressBar;
 }
-function getStrings(args, files) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        let progressBar = null;
-        progressBar = initProgress(args, Array.from(files.iterateSync()).length);
-        for (const file of files) {
-            const ext = file.split('.').pop() || undefined;
-            if (!ext || !const_1.allowedFiles.includes(ext)) {
-                if (progressBar) {
-                    progressBar.increment(1, {
-                        filename: `Skipping ${ext} (not a valid file extension)`,
-                    });
-                }
-                continue;
+function processFiles(files, args, progressBar) {
+    const tasks = [];
+    for (const file of files) {
+        const ext = file.split('.').pop() || undefined;
+        if (!ext || !const_1.allowedFiles.includes(ext)) {
+            if (progressBar) {
+                progressBar.increment(1, {
+                    filename: `Skipping ${ext} file: ${file}`,
+                });
             }
-            const task = (0, extractors_1.parseFile)(file, args.paths.cwd);
+            continue;
+        }
+        const task = (0, extractors_1.parseFile)(file, args.paths.cwd).finally(() => {
             if (progressBar) {
                 progressBar.increment(1, {
                     filename: file,
                 });
             }
-            if (task !== null) {
-                tasks.push(task);
-            }
+        });
+        if (task !== null) {
+            tasks.push(task);
         }
-        const results = yield Promise.all(tasks).finally(() => {
-            if (progressBar)
+    }
+    return tasks;
+}
+function getStrings(args, files) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        let progressBar = undefined;
+        progressBar =
+            (_a = initProgress(args, Array.from(files.iterateSync()).length)) !== null && _a !== void 0 ? _a : undefined;
+        return yield Promise.all(processFiles(files, args, progressBar)).finally(() => {
+            if (progressBar) {
                 progressBar.stop();
+            }
         });
-        const mergedResult = (0, consolidate_1.consolidate)(results.filter((r) => r !== null));
-        if (!((_a = args.options) === null || _a === void 0 ? void 0 : _a.silent)) {
-            console.log('📝 Found', Object.values(mergedResult).length, 'group of strings in', results.length, 'files.\n', 'In total ' +
-                Object.values(mergedResult)
-                    .map((v) => Object.keys(v).length)
-                    .reduce((acc, val) => acc + val, 0) +
-                ' strings were found');
-        }
-        return mergedResult;
     });
 }
 exports.getStrings = getStrings;
-function runExtract(args) {
+function getPatterns(args) {
     var _a, _b, _c, _d, _e, _f;
-    return __awaiter(this, void 0, void 0, function* () {
-        const pattern = {
-            include: args.patterns.include || [],
-            exclude: args.patterns.exclude || [],
-            mergePaths: args.patterns.mergePaths,
-            subtractPaths: args.patterns.subtractPaths,
-            subtractAndMerge: args.patterns.subtractAndMerge,
-        };
-        if (((_a = args.options) === null || _a === void 0 ? void 0 : _a.skip.php) !== undefined ||
-            ((_b = args.options) === null || _b === void 0 ? void 0 : _b.skip.blade) !== undefined) {
-            if (((_c = args.options) === null || _c === void 0 ? void 0 : _c.skip.blade) !== undefined) {
-                pattern.include.push('**/*.php');
-            }
-            else {
-                pattern.include.push('**/*.php', '!**/blade.php');
-            }
-        }
-        if (((_d = args.options) === null || _d === void 0 ? void 0 : _d.skip.js) !== undefined) {
-            pattern.include.push('**/*.{js,jsx,ts,tsx,mjs,cjs}');
-        }
-        if (((_e = args.options) === null || _e === void 0 ? void 0 : _e.skip.blockJson) !== undefined) {
-            pattern.include.push('block.json');
+    const pattern = {
+        include: args.patterns.include || [],
+        exclude: args.patterns.exclude || [],
+        mergePaths: args.patterns.mergePaths,
+        subtractPaths: args.patterns.subtractPaths,
+        subtractAndMerge: args.patterns.subtractAndMerge,
+    };
+    if (((_a = args.options) === null || _a === void 0 ? void 0 : _a.skip.php) !== undefined ||
+        ((_b = args.options) === null || _b === void 0 ? void 0 : _b.skip.blade) !== undefined) {
+        if (((_c = args.options) === null || _c === void 0 ? void 0 : _c.skip.blade) !== undefined) {
+            pattern.include.push('**/*.php');
         }
-        if (((_f = args.options) === null || _f === void 0 ? void 0 : _f.skip.themeJson) !== undefined) {
-            pattern.include.push('theme.json');
+        else {
+            pattern.include.push('**/*.php', '!**/blade.php');
         }
+    }
+    if (((_d = args.options) === null || _d === void 0 ? void 0 : _d.skip.js) !== undefined) {
+        pattern.include.push('**/*.{js,jsx,ts,tsx,mjs,cjs}');
+    }
+    if (((_e = args.options) === null || _e === void 0 ? void 0 : _e.skip.blockJson) !== undefined) {
+        pattern.include.push('block.json');
+    }
+    if (((_f = args.options) === null || _f === void 0 ? void 0 : _f.skip.themeJson) !== undefined) {
+        pattern.include.push('theme.json');
+    }
+    return pattern;
+}
+function runExtract(args) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const pattern = getPatterns(args);
         const files = yield (0, glob_1.getFiles)(args, pattern);
+        console.log('Found ', Object.values(files).length, 'files that match the pattern');
         return yield getStrings(args, files);
     });
 }

package/lib/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"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"}

package/lib/tree.js

@@ -15,8 +15,7 @@ function collectComments(node) {
     while (currentNode && depth < 6) {
         if (((_a = currentNode === null || currentNode === void 0 ? void 0 : currentNode.previousSibling) === null || _a === void 0 ? void 0 : _a.type) === 'comment' &&
             ((_b = currentNode === null || currentNode === void 0 ? void 0 : currentNode.previousSibling) === null || _b === void 0 ? void 0 : _b.text.toLowerCase().includes('translators'))) {
-            const comment = (0, utils_1.stripTranslationMarkup)(currentNode === null || currentNode === void 0 ? void 0 : currentNode.previousSibling.text);
-            return comment;
+            return (0, utils_1.stripTranslationMarkup)(currentNode === null || currentNode === void 0 ? void 0 : currentNode.previousSibling.text);
         }
         depth++;
         currentNode = currentNode.parent;
@@ -49,14 +48,15 @@ function doTree(sourceCode, filepath) {
                 argsNode.type !== 'arguments') {
                 return;
             }
-            const [fn, raw] = node.children;
+            const [_fn, raw] = node.children;
             const translation = {};
             const translationKeys = const_1.i18nFunctions[functionName];
             raw.children.slice(1, -1).forEach((child, index) => {
+                if (!child.text)
+                    return;
                 const currentKey = translationKeys[index];
-                if (/^["|']/.exec(child.text[0]))
-                    translation[currentKey] =
-                        child.text.slice(1, -1);
+                translation[currentKey] =
+                    child.text.slice(1, -1);
             });
             const gettext = {
                 msgctxt: (_c = translation.msgctxt) !== null && _c !== void 0 ? _c : '',

package/lib/tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"tree.js","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -1,9 +1,9 @@
-import { pkgJsonHeaders, pluginHeaders, themeHeaders } from './extractors-maps';
+import { pkgJsonHeaders, pluginHeaders, themeHeaders } from './const';
 import { GetTextTranslation } from 'gettext-parser';
 export type ThemeHeadersType = keyof typeof themeHeaders;
 export type PluginHeadersType = keyof typeof pluginHeaders;
 export type PkgHeadersType = keyof typeof pkgJsonHeaders;
-export type PotHeaders = (typeof pkgJsonHeaders)[PkgHeadersType] | (typeof pluginHeaders)[PluginHeadersType] | (typeof themeHeaders)[ThemeHeadersType] | 'fileComment' | 'packageName';
+export type PotHeaders = (typeof pkgJsonHeaders)[PkgHeadersType] | (typeof pluginHeaders)[PluginHeadersType] | (typeof themeHeaders)[ThemeHeadersType] | 'license';
 export type DomainType = 'plugin' | 'theme' | 'block' | 'theme-block' | 'generic';
 export interface Patterns {
     mergePaths?: string[];
@@ -27,6 +27,7 @@ export interface Args {
         location?: boolean;
         packageName?: string;
         output?: boolean;
+        fileComment?: string;
         skip: {
             js?: boolean;
             php?: boolean;
@@ -36,12 +37,14 @@ export interface Args {
             audit?: boolean;
         };
     };
-    headers?: Record<PotHeaders, string>;
+    headers?: Record<PotHeaders, unknown>;
     patterns: Patterns;
 }
+export interface I18nSchema {
+    [key: string]: string | string[] | I18nSchema | I18nSchema[];
+}
 export interface TranslationStrings {
     [msgctxt: string]: {
         [msgId: string]: GetTextTranslation;
     };
 }
-export type JsonData = Record<string, any>;

package/lib/utils/index.d.ts

@@ -0,0 +1,8 @@
+import { TranslationStrings } from '../types';
+export declare function getCommentBlock(input: string): string;
+export declare function removeCommentMarkup(input: string): string[] | null;
+export declare function stripTranslationMarkup(comment: string): string;
+export declare function stringstring(string: string | string[] | undefined): string[] | null;
+export declare function advancedObjectMerge(obj1: TranslationStrings, obj2: TranslationStrings): TranslationStrings;
+export declare function detectPatternType(pattern: string): 'file' | 'directory' | 'glob';
+export declare function includeFunction(includePath: string[]): string[];

package/lib/utils/index.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.includeFunction = exports.detectPatternType = exports.advancedObjectMerge = exports.stringstring = exports.stripTranslationMarkup = exports.removeCommentMarkup = exports.getCommentBlock = void 0;
+const path_1 = __importDefault(require("path"));
+function getCommentBlock(input) {
+    const commentBlock = input.match(/\/\*\*?[\s\S]*?\*\//);
+    return commentBlock !== null ? commentBlock[0] : input;
+}
+exports.getCommentBlock = getCommentBlock;
+function removeCommentMarkup(input) {
+    return input.match(/[a-zA-Z].*/gm);
+}
+exports.removeCommentMarkup = removeCommentMarkup;
+function stripTranslationMarkup(comment) {
+    const commentPattern = /\/\*\*?\s*(?:translators:)\s*([\s\S]*?)\s*\*\/|\/\/\s*(?:translators:)\s*(.*)$/i;
+    const matches = comment.match(commentPattern);
+    return matches ? matches[1] : comment;
+}
+exports.stripTranslationMarkup = stripTranslationMarkup;
+function stringstring(string) {
+    if (typeof string === 'string') {
+        if (string.includes(',')) {
+            return string.split(',');
+        }
+        return [string];
+    }
+    return null;
+}
+exports.stringstring = stringstring;
+function advancedObjectMerge(obj1, obj2) {
+    const merged = Object.assign({}, obj1);
+    for (const key in obj2) {
+        if (Object.prototype.hasOwnProperty.call(obj2, key)) {
+            merged[key] =
+                obj1[key] && obj1[key].toString() === '[object Object]'
+                    ?
+                        advancedObjectMerge(obj1[key], obj2[key])
+                    : obj2[key];
+        }
+    }
+    return merged;
+}
+exports.advancedObjectMerge = advancedObjectMerge;
+function detectPatternType(pattern) {
+    const containsFileExtension = pattern.includes('.');
+    const containsDirectorySeparator = pattern.includes(path_1.default.sep) || pattern.endsWith(path_1.default.sep);
+    if (pattern.includes('*')) {
+        return 'glob';
+    }
+    else if (!containsFileExtension && !containsDirectorySeparator) {
+        return 'directory';
+    }
+    else if (containsFileExtension && !containsDirectorySeparator) {
+        return 'file';
+    }
+    else {
+        return 'glob';
+    }
+}
+exports.detectPatternType = detectPatternType;
+function includeFunction(includePath) {
+    return includePath.map((path) => {
+        const type = detectPatternType(path);
+        switch (type) {
+            case 'directory':
+                return path + '/**';
+            case 'file':
+                return '**/' + path;
+            default:
+                return path;
+        }
+    });
+}
+exports.includeFunction = includeFunction;
+//# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AASvB,SAAgB,eAAe,CAAC,KAAa;IAC5C,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACvD,OAAO,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;AACvD,CAAC;AAHD,0CAGC;AAQD,SAAgB,mBAAmB,CAAC,KAAa;IAChD,OAAO,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AACnC,CAAC;AAFD,kDAEC;AAQD,SAAgB,sBAAsB,CAAC,OAAe;IACrD,MAAM,cAAc,GACnB,iFAAiF,CAAA;IAClF,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAC7C,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;AACtC,CAAC;AALD,wDAKC;AAQD,SAAgB,YAAY,CAC3B,MAAqC;IAErC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,CAAA;IAChB,CAAC;IACD,OAAO,IAAI,CAAA;AACZ,CAAC;AAVD,oCAUC;AASD,SAAgB,mBAAmB,CAClC,IAAwB,EACxB,IAAwB;IAExB,MAAM,MAAM,qBAAQ,IAAI,CAAE,CAAA;IAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YAErD,MAAM,CAAC,GAAG,CAAC;gBACV,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,iBAAiB;oBACtD,CAAC;wBACA,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;IACF,CAAC;IACD,OAAO,MAA4B,CAAA;AACpC,CAAC;AAhBD,kDAgBC;AAMD,SAAgB,iBAAiB,CAChC,OAAe;IAEf,MAAM,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACnD,MAAM,0BAA0B,GAC/B,OAAO,CAAC,QAAQ,CAAC,cAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAI,CAAC,GAAG,CAAC,CAAA;IAEzD,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAA;IACd,CAAC;SAAM,IAAI,CAAC,qBAAqB,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClE,OAAO,WAAW,CAAA;IACnB,CAAC;SAAM,IAAI,qBAAqB,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACjE,OAAO,MAAM,CAAA;IACd,CAAC;SAAM,CAAC;QACP,OAAO,MAAM,CAAA;IACd,CAAC;AACF,CAAC;AAhBD,8CAgBC;AAQD,SAAgB,eAAe,CAAC,WAAqB;IACpD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC/B,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACpC,QAAQ,IAAI,EAAE,CAAC;YACd,KAAK,WAAW;gBACf,OAAO,IAAI,GAAG,KAAK,CAAA;YACpB,KAAK,MAAM;gBACV,OAAO,KAAK,GAAG,IAAI,CAAA;YACpB;gBACC,OAAO,IAAI,CAAA;QACb,CAAC;IACF,CAAC,CAAC,CAAA;AACH,CAAC;AAZD,0CAYC"}

package/lib/utils.d.ts

@@ -1,8 +1,8 @@
-import { type Args } from './types';
-export declare function generateHeaderComments(args: Args): string;
+import { TranslationStrings } from './types';
 export declare function getCommentBlock(input: string): string;
-export declare function removeCommentMarkup(input: string): string;
+export declare function removeCommentMarkup(input: string): string[] | null;
 export declare function stripTranslationMarkup(comment: string): string;
 export declare function stringstring(string: string | string[] | undefined): string[] | null;
+export declare function advancedObjectMerge(obj1: TranslationStrings, obj2: TranslationStrings): TranslationStrings;
 export declare function detectPatternType(pattern: string): 'file' | 'directory' | 'glob';
 export declare function includeFunction(includePath: string[]): string[];

package/lib/utils.js

@@ -3,26 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.includeFunction = exports.detectPatternType = exports.stringstring = exports.stripTranslationMarkup = exports.removeCommentMarkup = exports.getCommentBlock = exports.generateHeaderComments = void 0;
+exports.includeFunction = exports.detectPatternType = exports.advancedObjectMerge = exports.stringstring = exports.stripTranslationMarkup = exports.removeCommentMarkup = exports.getCommentBlock = void 0;
 const path_1 = __importDefault(require("path"));
-function generateHeaderComments(args) {
-    var _a, _b, _c, _d, _e, _f;
-    const { author, email, license } = {
-        author: (_b = (_a = args.headers) === null || _a === void 0 ? void 0 : _a.author) !== null && _b !== void 0 ? _b : 'AUTHOR',
-        email: (_d = (_c = args.headers) === null || _c === void 0 ? void 0 : _c.email) !== null && _d !== void 0 ? _d : 'EMAIL',
-        license: (_f = (_e = args.headers) === null || _e === void 0 ? void 0 : _e.license) !== null && _f !== void 0 ? _f : 'gpl-2.0 or later',
-    };
-    return `# Copyright (C) ${new Date().getFullYear()} ${author} (${email})
-# This file is distributed under the ${license}.`;
-}
-exports.generateHeaderComments = generateHeaderComments;
 function getCommentBlock(input) {
     const commentBlock = input.match(/\/\*\*?[\s\S]*?\*\//);
     return commentBlock !== null ? commentBlock[0] : input;
 }
 exports.getCommentBlock = getCommentBlock;
 function removeCommentMarkup(input) {
-    return input.replace(/\/\*[\s\S]*?\*\/|\/\/.*/gm, '');
+    return input.match(/[a-zA-Z].*/gm);
 }
 exports.removeCommentMarkup = removeCommentMarkup;
 function stripTranslationMarkup(comment) {
@@ -41,6 +30,20 @@ function stringstring(string) {
     return null;
 }
 exports.stringstring = stringstring;
+function advancedObjectMerge(obj1, obj2) {
+    const merged = Object.assign({}, obj1);
+    for (const key in obj2) {
+        if (Object.prototype.hasOwnProperty.call(obj2, key)) {
+            merged[key] =
+                obj1[key] && obj1[key].toString() === '[object Object]'
+                    ?
+                        advancedObjectMerge(obj1[key], obj2[key])
+                    : obj2[key];
+        }
+    }
+    return merged;
+}
+exports.advancedObjectMerge = advancedObjectMerge;
 function detectPatternType(pattern) {
     const containsFileExtension = pattern.includes('.');
     const containsDirectorySeparator = pattern.includes(path_1.default.sep) || pattern.endsWith(path_1.default.sep);

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAiBvB,SAAgB,sBAAsB,CAAC,IAAU;;IAChD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG;QAClC,MAAM,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,mCAAI,QAAQ;QACxC,KAAK,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,mCAAI,OAAO;QACrC,OAAO,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,kBAAkB;KACpD,CAAA;IAED,OAAO,mBAAmB,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,MAAM,KAAK,KAAK;uCAChC,OAAO,GAAG,CAAA;AACjD,CAAC;AATD,wDASC;AAQD,SAAgB,eAAe,CAAC,KAAa;IAC5C,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACvD,OAAO,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;AACvD,CAAC;AAHD,0CAGC;AAQD,SAAgB,mBAAmB,CAAC,KAAa;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAA;AACtD,CAAC;AAFD,kDAEC;AAQD,SAAgB,sBAAsB,CAAC,OAAe;IACrD,MAAM,cAAc,GACnB,iFAAiF,CAAA;IAClF,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAC7C,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;AACtC,CAAC;AALD,wDAKC;AAQD,SAAgB,YAAY,CAC3B,MAAqC;IAErC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,CAAA;IAChB,CAAC;IACD,OAAO,IAAI,CAAA;AACZ,CAAC;AAVD,oCAUC;AAOD,SAAgB,iBAAiB,CAChC,OAAe;IAEf,MAAM,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACnD,MAAM,0BAA0B,GAC/B,OAAO,CAAC,QAAQ,CAAC,cAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAI,CAAC,GAAG,CAAC,CAAA;IAEzD,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAA;IACd,CAAC;SAAM,IAAI,CAAC,qBAAqB,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClE,OAAO,WAAW,CAAA;IACnB,CAAC;SAAM,IAAI,qBAAqB,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACjE,OAAO,MAAM,CAAA;IACd,CAAC;SAAM,CAAC;QACP,OAAO,MAAM,CAAA;IACd,CAAC;AACF,CAAC;AAhBD,8CAgBC;AAQD,SAAgB,eAAe,CAAC,WAAqB;IACpD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC/B,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACpC,QAAQ,IAAI,EAAE,CAAC;YACd,KAAK,WAAW;gBACf,OAAO,IAAI,GAAG,KAAK,CAAA;YACpB,KAAK,MAAM;gBACV,OAAO,KAAK,GAAG,IAAI,CAAA;YACpB;gBACC,OAAO,IAAI,CAAA;QACb,CAAC;IACF,CAAC,CAAC,CAAA;AACH,CAAC;AAZD,0CAYC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wp-blocks/make-pot",
-	"version": "0.1.0",
+	"version": "1.0.0",
 	"description": "A Node.js script for generating a POT file from source code",
 	"author": "Erik Golinelli <https://github.com/erikyo>",
 	"main": "lib/index.js",
@@ -12,27 +12,36 @@
 		"lint": "eslint ./src ./tests --fix",
 		"test": "jest",
 		"update-snapshots": "jest -- -u",
-		"run": "node ./lib/index.js tests/fixtures/"
+		"run": "node ./lib/index.js tests/fixtures/vinyl/"
 	},
 	"bin": {
 		"make-pot": "lib/index.js"
 	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/wp-blocks/makePot.git"
+	},
+	"bugs": {
+		"url": "https://github.com/wp-blocks/makePot/issues"
+	},
 	"dependencies": {
+		"axios": "^1.6.7",
 		"cli-progress": "^3.12.0",
+		"gettext-merger": "^0.1.0",
 		"gettext-parser": "^7.0.1",
 		"glob": "^10.3.10",
 		"tree-sitter": "^0.20.6",
-		"tree-sitter-javascript": "^0.20.1",
+		"tree-sitter-javascript": "^0.20.4",
 		"tree-sitter-php": "^0.20.0",
-		"tree-sitter-typescript": "^0.20.3",
+		"tree-sitter-typescript": "^0.20.5",
 		"yargs": "^17.7.2"
 	},
 	"devDependencies": {
 		"@jest/globals": "^29.7.0",
 		"@types/cli-progress": "^3.11.5",
 		"@types/gettext-parser": "^4.0.4",
-		"@types/jest": "^29.5.11",
-		"@types/node": "^20.10.4",
+		"@types/jest": "^29.5.12",
+		"@types/node": "^20.11.19",
 		"@types/strip-comments": "^2.0.4",
 		"@types/yargs": "^17.0.32",
 		"@typescript-eslint/eslint-plugin": "^6.18.1",
@@ -43,11 +52,11 @@
 		"eslint-plugin-import": "^2.29.1",
 		"eslint-plugin-n": "^16.6.1",
 		"eslint-plugin-promise": "^6.1.1",
-		"husky": "^8.0.3",
+		"husky": "^9.0.11",
 		"jest": "^29.7.0",
-		"lint-staged": "^15.2.0",
-		"prettier": "3.2.2",
-		"ts-jest": "^29.1.1",
+		"lint-staged": "^15.2.2",
+		"prettier": "3.2.5",
+		"ts-jest": "^29.1.2",
 		"typescript": "^5.3.3"
 	}
 }

package/tests/consolidate.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect } from '@jest/globals'
-import { consolidate } from '../src/consolidate'
+import { consolidate } from '../src/parser/consolidate'
 import { GetTextComment } from 'gettext-parser'
 
 describe('consolidate', () => {

package/tests/{extract-2.old.ts → extract-2.test.ts}

@@ -1,5 +1,5 @@
 import { describe, expect } from '@jest/globals'
-import { doTree } from '../src/tree'
+import { doTree } from '../src/parser/tree'
 
 describe('getStrings-extra', () => {
 	/** see wp cli tests */
@@ -90,8 +90,15 @@ describe('getStrings-extra', () => {
 
 		const filename = 'filename.php'
 
-		const result = doTree(content, filename)
+		const r = doTree(content, filename)
+		const res = Object.values(r)[0]
+		const translations = Object.keys(res)
+		const comments = Object.entries(res).filter(
+			([x, translation]) => !!translation.comments?.translator
+		)
 
-		expect(result).toMatchSnapshot()
+		expect(translations.length).toBeGreaterThanOrEqual(19)
+		expect(comments.length).toBeGreaterThanOrEqual(8)
+		expect(res).toMatchSnapshot()
 	})
 })

package/tests/getFiles.old.ts

@@ -1,8 +1,8 @@
 import { describe, expect } from '@jest/globals'
 import { getFiles } from '../src/glob'
 import { Args, DomainType } from '../src/types'
-import { parseCliArgs } from '../src/cliArgs'
 import path from 'path'
+import { parseCliArgs } from '../src/cli/parseCli'
 
 describe('getFiles', () => {
 	const DEFAULTS = parseCliArgs({

package/tests/getStrings.old.ts

@@ -1,7 +1,7 @@
 import { describe, expect } from '@jest/globals'
-import { getStrings } from '../src/parser'
 import { Args, DomainType } from '../src/types'
 import { getFiles } from '../src/glob'
+import { getStrings } from '../src/parser/process'
 
 const args: Args = {
 	slug: 'plugin-slug',

package/tests/{jsonParse.test.ts → jsonParse.ts}

@@ -1,5 +1,5 @@
 import { describe, expect } from '@jest/globals'
-import { parseJsonFile } from '../src/extractors-json'
+import { parseJsonFile } from '../src/extractors/json'
 import fs from 'fs'
 
 describe('should parse json', () => {
@@ -15,38 +15,39 @@ describe('should parse json', () => {
 					msgstr: [],
 				},
 			},
-			'block variation description': {
+			'block description': {
 				description: {
 					comments: {
 						reference: 'block/block.json',
 					},
-					msgctxt: 'block variation description',
+					msgctxt: 'block description',
 					msgid: 'description',
 					msgstr: [],
 				},
 			},
-			'block variation keyword': {
+			'block keyword': {
 				undefined: {
 					comments: {
 						reference: 'block/block.json',
 					},
-					msgctxt: 'block variation keyword',
+					msgctxt: 'block keyword',
+					msgid: undefined,
 					msgstr: [],
 				},
 			},
-			'block variation title': {
+			'block title': {
 				title: {
 					comments: {
 						reference: 'block/block.json',
 					},
-					msgctxt: 'block variation title',
+					msgctxt: 'block title',
 					msgid: 'title',
 					msgstr: [],
 				},
 			},
 		}
 
-		const result = parseJsonFile({
+		const result = await parseJsonFile({
 			sourceCode: fs.readFileSync(
 				'tests/fixtures/block/block.json',
 				'utf8'

package/lib/extractors-json.d.ts

@@ -1,9 +0,0 @@
-import type { TranslationStrings } from './types';
-import { GetTextTranslation } from 'gettext-parser';
-export declare function parseJsonFile(opts: {
-    sourceCode: string;
-    filename: 'block.json' | 'theme.json';
-    filepath: string;
-}): TranslationStrings;
-export declare function getJsonComment(key: string, type?: 'block.json' | 'theme.json'): string;
-export declare function jsonString(key: string, data: string, path: string, type?: 'block.json' | 'theme.json'): GetTextTranslation;