@wp-blocks/make-pot 1.0.2 → 1.2.0

package/lib/parser/progress.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initProgress = void 0;
+const cli_progress_1 = __importDefault(require("cli-progress"));
+function initProgress(args, filesCount) {
+    if (args.options?.silent)
+        return undefined;
+    const progressBar = new cli_progress_1.default.SingleBar({
+        clearOnComplete: true,
+        etaBuffer: 1000,
+        hideCursor: true,
+        format: ' {bar} {percentage}% | ETA: {eta}s | {filename} | {value}/{total}',
+    }, cli_progress_1.default.Presets.shades_classic);
+    progressBar.start(filesCount, 0);
+    return progressBar;
+}
+exports.initProgress = initProgress;
+//# sourceMappingURL=progress.js.map

package/lib/parser/progress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/parser/progress.ts"],"names":[],"mappings":";;;;;;AACA,gEAAqD;AASrD,SAAgB,YAAY,CAC3B,IAAU,EACV,UAAkB;IAElB,IAAI,IAAI,CAAC,OAAO,EAAE,MAAM;QAAE,OAAO,SAAS,CAAA;IAE1C,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,SAAS,CAC5C;QACC,eAAe,EAAE,IAAI;QACrB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,mEAAmE;KAC3E,EACD,sBAAW,CAAC,OAAO,CAAC,cAAc,CAClC,CAAA;IAED,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IAGhC,OAAO,WAAW,CAAA;AACnB,CAAC;AApBD,oCAoBC"}

package/lib/parser/taskRunner.d.ts

@@ -0,0 +1,4 @@
+import { SetOfBlocks } from 'gettext-merger';
+import { Args } from '../types';
+import { SingleBar } from 'cli-progress';
+export declare function taskRunner(tasks: Promise<SetOfBlocks>[], destination: SetOfBlocks, args: Args, progressBar?: SingleBar): Promise<SetOfBlocks>;

package/lib/parser/taskRunner.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskRunner = void 0;
+async function taskRunner(tasks, destination, args, progressBar) {
+    await Promise.allSettled(tasks)
+        .then((strings) => {
+        return strings
+            .map((block) => block.status === 'fulfilled' && block.value)
+            .filter(Boolean);
+    })
+        .then((consolidated) => {
+        consolidated.forEach((result) => {
+            if (result.blocks.length > 0) {
+                destination.addArray(result.blocks);
+                console.log('✅ ' + result.path + ' [', result.blocks.map((b) => b.msgid).join(', '), ']');
+            }
+            else
+                console.log('❌ ', result.path + ' has no strings');
+        });
+        progressBar?.stop();
+    })
+        .catch((err) => {
+        console.log('❌ Failed!', err);
+        process.exit(1);
+    });
+    if (!args.options?.silent) {
+        console.log('🎉 Done!');
+        console.log('📝 Found', Object.values(destination.blocks).length, 'translation strings in', args.paths.cwd);
+    }
+    return destination;
+}
+exports.taskRunner = taskRunner;
+//# sourceMappingURL=taskRunner.js.map

package/lib/parser/taskRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"taskRunner.js","sourceRoot":"","sources":["../../src/parser/taskRunner.ts"],"names":[],"mappings":";;;AAYO,KAAK,UAAU,UAAU,CAC/B,KAA6B,EAC7B,WAAwB,EACxB,IAAU,EACV,WAAuB;IAEvB,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;SAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAIjB,OAAO,OAAO;aACZ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC;aAC3D,MAAM,CAAC,OAAO,CAAkB,CAAA;IACnC,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;QACtB,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/B,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAI9B,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBAEnC,OAAO,CAAC,GAAG,CACV,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,EACzB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAC5C,GAAG,CACH,CAAA;YACF,CAAC;;gBAAM,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,iBAAiB,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;QAEF,WAAW,EAAE,IAAI,EAAE,CAAA;IACpB,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;QAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACvB,OAAO,CAAC,GAAG,CACV,UAAU,EACV,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EACxC,wBAAwB,EACxB,IAAI,CAAC,KAAK,CAAC,GAAG,CACd,CAAA;IACF,CAAC;IAED,OAAO,WAAW,CAAA;AACnB,CAAC;AAjDD,gCAiDC"}

package/lib/parser/tree.d.ts

@@ -1,2 +1,2 @@
-import { type TranslationStrings } from '../types';
-export declare function doTree(sourceCode: string, filepath: string): TranslationStrings;
+import { SetOfBlocks } from 'gettext-merger';
+export declare function doTree(sourceCode: string, filepath: string): SetOfBlocks;

package/lib/parser/tree.js

@@ -8,36 +8,37 @@ const tree_sitter_1 = __importDefault(require("tree-sitter"));
 const const_1 = require("../const");
 const glob_1 = require("../fs/glob");
 const utils_1 = require("../utils");
+const gettext_merger_1 = require("gettext-merger");
 function collectComments(node) {
-    var _a, _b;
     let currentNode = node;
     let depth = 0;
     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'))) {
-            return (0, utils_1.stripTranslationMarkup)(currentNode === null || currentNode === void 0 ? void 0 : currentNode.previousSibling.text);
+        if (currentNode?.previousSibling?.type === 'comment' &&
+            currentNode?.previousSibling?.text
+                .toLowerCase()
+                .includes('translators')) {
+            return (0, utils_1.stripTranslationMarkup)(currentNode?.previousSibling.text);
         }
         depth++;
         currentNode = currentNode.parent;
     }
 }
 function doTree(sourceCode, filepath) {
-    var _a;
     const parser = new tree_sitter_1.default();
     parser.setLanguage((0, glob_1.getParser)(filepath));
     const tree = parser.parse(sourceCode);
-    const gettextTranslations = {};
-    const typeToMatch = ((_a = filepath.split('.').pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== 'php'
+    const gettextTranslations = new gettext_merger_1.SetOfBlocks([], filepath);
+    const typeToMatch = filepath.split('.').pop()?.toLowerCase() !== 'php'
         ? 'call_expression'
         : 'function_call_expression';
+    const stringType = ['string', 'encapsed_string', 'string_value'];
     function traverse(node) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (node === null || node === void 0 ? void 0 : node.children.length)
+        if (node?.children.length)
             for (const child of node.children) {
                 traverse(child);
             }
-        if ((node === null || node === void 0 ? void 0 : node.type) === typeToMatch) {
-            const functionName = (_b = (_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : null;
+        if (node?.type === typeToMatch) {
+            const functionName = node.firstChild?.text ?? null;
             if (functionName === null ||
                 !Object.keys(const_1.i18nFunctions).includes(functionName)) {
                 return;
@@ -55,29 +56,45 @@ function doTree(sourceCode, filepath) {
             let translationKeyIndex = 0;
             for (const child of children) {
                 let node = child;
-                if (child.type === "argument") {
+                let nodeValue = node.text;
+                if (child.type === 'argument') {
                     if (child.children.length === 0)
                         continue;
                     node = child.children[0];
                 }
-                if (node.type !== "string")
+                if (node?.type === ',') {
                     continue;
+                }
+                if (stringType.includes(node?.type)) {
+                    nodeValue = nodeValue.slice(1, -1);
+                }
+                else {
+                    console.warn('Unexpected node type: ' +
+                        node?.type +
+                        ' is ' +
+                        translationKeys[translationKeyIndex] +
+                        ' for  ' +
+                        nodeValue +
+                        ' in ' +
+                        filepath);
+                    continue;
+                }
                 const currentKey = translationKeys[translationKeyIndex];
-                translation[currentKey] =
-                    child.text.slice(1, -1);
+                translation[currentKey] = nodeValue;
                 translationKeyIndex += 1;
             }
-            const gettext = {
-                msgctxt: (_c = translation.msgctxt) !== null && _c !== void 0 ? _c : '',
-                msgid: (_d = translation.msgid) !== null && _d !== void 0 ? _d : '',
-                msgid_plural: (_e = translation.msgid_plural) !== null && _e !== void 0 ? _e : '',
+            const comments = collectComments(argsNode);
+            const block = new gettext_merger_1.Block({
+                msgctxt: translation.msgctxt,
+                msgid: translation.msgid ?? '',
+                msgid_plural: translation.msgid_plural,
                 msgstr: translation.msgid_plural ? ['', ''] : [''],
                 comments: {
-                    translator: (_f = collectComments(node)) !== null && _f !== void 0 ? _f : '',
-                    reference: `${filepath}:${node.startPosition.row + 1}`,
+                    translator: comments ? [comments] : undefined,
+                    reference: [`${filepath}:${node.startPosition.row + 1}`],
                 },
-            };
-            gettextTranslations[(_g = gettext.msgctxt) !== null && _g !== void 0 ? _g : ''] = Object.assign(Object.assign({}, (gettextTranslations[(_h = gettext.msgctxt) !== null && _h !== void 0 ? _h : ''] || {})), { [gettext.msgid]: gettext });
+            });
+            gettextTranslations.add(block);
         }
     }
     traverse(tree.rootNode);

package/lib/parser/tree.js.map

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

package/lib/utils/index.d.ts

@@ -6,3 +6,4 @@ export declare function stringstring(string: string | string[] | undefined): str
 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[];
+export declare function getCopyright(slug: string, license?: string): string;

package/lib/utils/index.js

@@ -3,7 +3,7 @@ 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;
+exports.getCopyright = 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]*?\*\//);
@@ -31,7 +31,7 @@ function stringstring(string) {
 }
 exports.stringstring = stringstring;
 function advancedObjectMerge(obj1, obj2) {
-    const merged = Object.assign({}, obj1);
+    const merged = { ...obj1 };
     for (const key in obj2) {
         if (Object.prototype.hasOwnProperty.call(obj2, key)) {
             merged[key] =
@@ -75,4 +75,9 @@ function includeFunction(includePath) {
     });
 }
 exports.includeFunction = includeFunction;
+function getCopyright(slug, license = 'GPL v2 or later') {
+    return (`# Copyright (C) ${new Date().getFullYear()} ${slug}\n` +
+        `# This file is distributed under the ${license} license.`);
+}
+exports.getCopyright = getCopyright;
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

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

package/package.json

@@ -1,9 +1,22 @@
 {
 	"name": "@wp-blocks/make-pot",
-	"version": "1.0.2",
+	"version": "1.2.0",
+	"license": "GPL-3.0-or-later",
+	"homepage": "https://wp-blocks.github.io/make-pot/",
 	"description": "A Node.js script for generating a POT file from source code",
-	"author": "Erik Golinelli <https://github.com/erikyo>",
+	"authors": [
+		"Erik Golinelli <erik@codekraft.it> (https://codekraft.it/)",
+		"John Hooks <bitmachina@outlook.com> (https://johnhooks.io/)"
+	],
 	"main": "lib/index.js",
+	"keywords": [
+		"gettext",
+		"i18n",
+		"pot",
+		"WordPress",
+		"translation",
+		"internalization"
+	],
 	"scripts": {
 		"postinstall": "npm rebuild tree-sitter tree-sitter-typescript tree-sitter-php tree-sitter-javascript --force",
 		"build": "tsc --build",
@@ -27,7 +40,7 @@
 	"dependencies": {
 		"axios": "^1.6.8",
 		"cli-progress": "^3.12.0",
-		"gettext-merger": "^0.1.0",
+		"gettext-merger": "^1.2.1",
 		"gettext-parser": "^7.0.1",
 		"glob": "^10.3.10",
 		"tree-sitter": "^0.20.6",

package/tests/extract.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect } from '@jest/globals'
 import { doTree } from '../src/parser/tree'
+import { Block } from 'gettext-merger'
 
 describe('getStrings', () => {
 	it('should extract translations from js', () => {
@@ -7,36 +8,34 @@ describe('getStrings', () => {
 		const filename = 'filename.js'
 
 		const result = doTree(content, filename)
+		const expected = new Block([])
+		expected.msgid = 'Hello World'
+		expected.comments = {
+			reference: ['filename.js:1'],
+			translator: [''],
+		}
 
-		expect(result).toMatchObject({
-			'': {
-				'Hello World': {
-					comments: {
-						reference: 'filename.js:1',
-					},
-					msgid: 'Hello World',
-					msgstr: [''],
-				},
-			},
-		})
+		expect(result.blocks[0].msgid).toBe(expected.msgid)
 	})
+
 	it('should extract translations from ts', () => {
 		const content = `__('Hello World', 'greeting');`
 		const filename = 'filename.ts'
 
-		const result = doTree(content, filename)
+		const result = doTree(content, filename).blocks[0].toJson()
 
-		expect(result).toMatchObject({
-			'': {
-				'Hello World': {
-					comments: {
-						reference: 'filename.ts:1',
-					},
-					msgid: 'Hello World',
-					msgstr: [''],
-				},
-			},
-		})
+		const expected = new Block([])
+		expected.msgid = 'Hello World'
+		expected.comments = {
+			reference: ['filename.ts:1'],
+			translator: [''],
+		}
+
+		expect(result.msgid).toBe(expected.msgid)
+		expect(expected.comments?.reference).toHaveLength(1)
+		expect([result.comments?.reference]).toEqual(
+			expected.comments?.reference
+		)
 	})
 	it('should extract translations from tsx', () => {
 		const content = `const element = <h1>{ __('Hello World', 'greeting')}</h1>;`
@@ -45,17 +44,15 @@ describe('getStrings', () => {
 
 		const result = doTree(content, filename)
 
-		expect(result).toMatchObject({
-			'': {
-				'Hello World': {
-					comments: {
-						reference: 'filename.tsx:1',
-					},
-					msgid: 'Hello World',
-					msgstr: [''],
-				},
-			},
-		})
+		const expected = new Block([])
+		expected.msgid = 'Hello World'
+		expected.msgstr = ['']
+		expected.comments = {
+			reference: ['filename.tsx:1'],
+			translator: [''],
+		}
+
+		expect(result.blocks[0].toJson()).toEqual(expected.toJson())
 	})
 	it('should extract translations with context', () => {
 		const content = `<?php __('Hello World', 'greeting'); ?>`
@@ -63,42 +60,30 @@ describe('getStrings', () => {
 
 		const result = doTree(content, filename)
 
-		expect(result).toMatchObject({
-			'': {
-				'Hello World': {
-					comments: {
-						reference: 'filename.php:1',
-						translator: '',
-					},
-					msgctxt: '',
-					msgid: 'Hello World',
-					msgid_plural: '',
-					msgstr: [''],
-				},
-			},
-		})
+		const expected = new Block([])
+		expected.msgid = 'Hello World'
+		expected.msgstr = ['']
+		expected.comments = {
+			reference: ['filename.php:1'],
+			translator: [''],
+		}
+
+		expect(result.blocks[0].toJson()).toEqual(expected.toJson())
 	})
 	it('should extract translations from code content with no context or translator comments', () => {
 		const content = `<?php _e('Hello World'); ?>`
-		const expected = {
-			'': {
-				'Hello World': {
-					comments: {
-						reference: 'filename.php:1',
-						translator: '',
-					},
-					msgctxt: '',
-					msgid: 'Hello World',
-					msgstr: [''],
-					msgid_plural: '',
-				},
-			},
+		const expected = new Block([])
+		expected.msgid = 'Hello World'
+		expected.msgstr = ['']
+		expected.comments = {
+			translator: undefined,
+			reference: ['filename.php:1'],
 		}
 		const filename = 'filename.php'
 
 		const result = doTree(content, filename)
 
-		expect(result).toEqual(expected)
+		expect(result.blocks[0]).toEqual(expected)
 	})
 
 	it('should extract translations with comments', () => {
@@ -106,18 +91,18 @@ describe('getStrings', () => {
 		const content = `
 		<?php /** translators: ciao! */ echo _x('Hello World', 'greeting'); ?>`
 		const expected = {
-			greeting: {
-				'Hello World': {
+			blocks: [
+				{
 					comments: {
-						reference: 'filename.php:2',
-						translator: 'ciao!',
+						reference: ['filename.php:2'],
+						translator: ['ciao!'],
 					},
 					msgctxt: 'greeting',
 					msgid: 'Hello World',
-					msgid_plural: '',
 					msgstr: [''],
 				},
-			},
+			],
+			path: 'filename.php',
 		}
 
 		const result = doTree(content, filename)
@@ -137,24 +122,14 @@ describe('getStrings', () => {
 
 
 		<?php echo _x('Hello World', 'greeting'); ?>`
-		const expected = {
-			greeting: {
-				'Hello World': {
-					msgctxt: 'greeting',
-					msgid: 'Hello World',
-					msgid_plural: '',
-					msgstr: [''],
-					comments: {
-						translator: '',
-						reference: 'filename.php:10',
-					},
-				},
-			},
-		}
+		const expected = `#: filename.php:10
+msgctxt "greeting"
+msgid "Hello World"
+msgstr ""`
 
 		const result = doTree(content, filename)
 
-		expect(result).toMatchObject(expected)
+		expect(result.blocks[0].toStr()).toBe(expected)
 	})
 
 	it('should extract translations inside a sprint', () => {
@@ -168,9 +143,15 @@ echo $link;`
 				'Check out this link to my <a href="%s">website</a> made with WordPress.':
 					{
 						comments: {
+							extracted: '',
+							flag: '',
+							previous: '',
 							reference: 'filename.php:3',
+							translator: '',
 						},
+						msgctxt: '',
 						msgid: 'Check out this link to my <a href="%s">website</a> made with WordPress.',
+						msgid_plural: undefined,
 						msgstr: [''],
 					},
 			},
@@ -178,11 +159,36 @@ echo $link;`
 
 		const result = doTree(content, filename)
 
-		expect(result).toMatchObject(expected)
+		expect(result.toJson()).toMatchObject(expected)
 	})
 })
 
 describe('getStrings wp cli', () => {
+	it('should extract from an array of translations', () => {
+		const filename = 'filename.php'
+		const content = `<?php $var = 'don't do this'; $instructions = array(
+		"Overview" => array(
+				"title" => __( 'Overview', '3d-product-viewer' ),
+				"text"  => __( "Hold down the right button to move the model", '3d-product-viewer' ),
+				"icon"  => 'icon-book'
+		),
+		"Rotation" => array(
+				"title" => __( 'Rotation', '3d-product-viewer' ),
+				"text"  => __( "Left-click and drag to change the angle", '3d-product-viewer' ),
+				"icon"  => 'icon-rotation'
+		),
+		"Zoom"     => array(
+				"title" => __( 'Zoom', '3d-product-viewer' ),
+				"text"  => __( "Variable is % and not  {$var}", '3d-product-viewer' ),
+				"icon"  => 'icon-zoom'
+		)
+);
+`
+
+		const result = doTree(content, filename)
+		expect(result).toMatchSnapshot()
+	})
+
 	it('should extract translations with translator comments inside the formatting hell', () => {
 		const filename = 'filename.php'
 		const content = `<?php if ( count( $errors_in_remigrate_batch ) > 0 ) {
@@ -190,10 +196,10 @@ describe('getStrings wp cli', () => {
 		WP_CLI::warning(
 		  sprintf(
 		    /* Translators: %1$d is number of errors and %2$s is the formatted array of order IDs. */
-		    _n(
+		      _n(
 		        '%1$d error found: %2$s when re-migrating order. Please review the error above.',
 		        '%1$d errors found: %2$s when re-migrating orders. Please review the errors above.',
-		      count( $errors_in_remigrate_batch ),
+		     	count( %s ),
 		        'woocommerce'
 		      ),
 		    count( $errors_in_remigrate_batch ),
@@ -204,26 +210,11 @@ describe('getStrings wp cli', () => {
 			WP_CLI::warning( 'Re-migration successful.', 'woocommerce' );
 		}
 `
-		const expected = {
-			'': {
-				'%1$d error found: %2$s when re-migrating order. Please review the error above.':
-					{
-						comments: {
-							reference: 'filename.php:6',
-							translator:
-								'%1$d is number of errors and %2$s is the formatted array of order IDs.',
-						},
-						msgctxt: '',
-						msgid: '%1$d error found: %2$s when re-migrating order. Please review the error above.',
-						msgid_plural:
-							'%1$d errors found: %2$s when re-migrating orders. Please review the errors above.',
-						msgstr: ['', ''],
-					},
-			},
-		}
 
 		const result = doTree(content, filename)
-		expect(expected).toMatchObject(result)
+		expect(
+			'%1$d error found: %2$s when re-migrating order. Please review the error above.'
+		).toBe(result.blocks[0].msgid)
 	})
 
 	/** see https://github.com/wp-cli/i18n-command/blob/main/features/makepot.feature */