@wp-blocks/make-pot 1.0.0 → 1.0.2

package/tests/{extract.old.ts → extract.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', () => {
 	it('should extract translations from js', () => {
@@ -15,7 +15,7 @@ describe('getStrings', () => {
 						reference: 'filename.js:1',
 					},
 					msgid: 'Hello World',
-					msgstr: [],
+					msgstr: [''],
 				},
 			},
 		})
@@ -33,7 +33,7 @@ describe('getStrings', () => {
 						reference: 'filename.ts:1',
 					},
 					msgid: 'Hello World',
-					msgstr: [],
+					msgstr: [''],
 				},
 			},
 		})
@@ -52,7 +52,7 @@ describe('getStrings', () => {
 						reference: 'filename.tsx:1',
 					},
 					msgid: 'Hello World',
-					msgstr: [],
+					msgstr: [''],
 				},
 			},
 		})
@@ -73,7 +73,7 @@ describe('getStrings', () => {
 					msgctxt: '',
 					msgid: 'Hello World',
 					msgid_plural: '',
-					msgstr: [],
+					msgstr: [''],
 				},
 			},
 		})
@@ -89,7 +89,7 @@ describe('getStrings', () => {
 					},
 					msgctxt: '',
 					msgid: 'Hello World',
-					msgstr: [],
+					msgstr: [''],
 					msgid_plural: '',
 				},
 			},
@@ -106,16 +106,16 @@ describe('getStrings', () => {
 		const content = `
 		<?php /** translators: ciao! */ echo _x('Hello World', 'greeting'); ?>`
 		const expected = {
-			'': {
+			greeting: {
 				'Hello World': {
 					comments: {
 						reference: 'filename.php:2',
 						translator: 'ciao!',
 					},
+					msgctxt: 'greeting',
 					msgid: 'Hello World',
-					msgctxt: '',
-					msgid_plural: 'greeting',
-					msgstr: [],
+					msgid_plural: '',
+					msgstr: [''],
 				},
 			},
 		}
@@ -138,15 +138,16 @@ 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',
 					},
-					msgid: 'Hello World',
-					msgctxt: '',
-					msgid_plural: '',
-					msgstr: [],
 				},
 			},
 		}
@@ -170,7 +171,7 @@ echo $link;`
 							reference: 'filename.php:3',
 						},
 						msgid: 'Check out this link to my <a href="%s">website</a> made with WordPress.',
-						msgstr: [],
+						msgstr: [''],
 					},
 			},
 		}
@@ -214,8 +215,9 @@ describe('getStrings wp cli', () => {
 						},
 						msgctxt: '',
 						msgid: '%1$d error found: %2$s when re-migrating order. Please review the error above.',
-						msgid_plural: '',
-						msgstr: [],
+						msgid_plural:
+							'%1$d errors found: %2$s when re-migrating orders. Please review the errors above.',
+						msgstr: ['', ''],
 					},
 			},
 		}

package/tests/{getFiles.old.ts → getFiles.test.ts}

@@ -1,114 +1,114 @@
-import { describe, expect } from '@jest/globals'
-import { getFiles } from '../src/glob'
-import { Args, DomainType } from '../src/types'
-import path from 'path'
-import { parseCliArgs } from '../src/cli/parseCli'
-
-describe('getFiles', () => {
-	const DEFAULTS = parseCliArgs({
-		domain: 'plugin' as DomainType,
-		slug: 'plugin-slug',
-		paths: { cwd: 'tests/fixtures/', out: 'tests/fixtures/' },
-		options: {
-			silent: true,
-		},
-		$0: 'makepot',
-		_: [0, 1],
-	})
-
-	it('should retrieve a all files', async () => {
-		const args = { ...DEFAULTS, domain: 'theme' } as Args
-		const pattern = { include: ['**'], exclude: [] }
-
-		const files = await getFiles(args, pattern)
-		const collected: string[] = []
-		for (const file of files) {
-			expect(file).toBeTruthy()
-			collected.push(file)
-		}
-		expect(collected.length).toBeGreaterThan(2)
-		expect(collected.find((e) => e.includes('theme.json'))).toBeTruthy()
-	})
-	it('Should retrieve a list of txt files based on the provided plugin pattern', async () => {
-		const args = {
-			...DEFAULTS,
-		}
-		const pattern = {
-			include: ['**/*.txt'],
-			exclude: ['node_modules', 'dist'],
-		}
-		const expectedFiles = [
-			'tests' + path.sep + 'fixtures' + path.sep + 'file1.txt',
-			'tests' +
-				path.sep +
-				'fixtures' +
-				path.sep +
-				'sourcedir' +
-				path.sep +
-				'file2.txt',
-			'tests' +
-				path.sep +
-				'fixtures' +
-				path.sep +
-				'block' +
-				path.sep +
-				'readme.txt',
-		]
-
-		const files = await getFiles(args, pattern)
-		const collected: string[] = []
-		for (const file of files) {
-			expect(file).toBeTruthy()
-			collected.push(file)
-		}
-
-		expect(collected).toEqual(expectedFiles)
-	})
-	it('should retrieve a list of theme.json files based on the provided theme pattern', async () => {
-		const args = {
-			...DEFAULTS,
-		}
-		const pattern = {
-			include: ['**/*.json'],
-			exclude: [],
-		}
-		const expectedFiles = [
-			`sourcedir${path.sep}theme.json`,
-			`sourcedir${path.sep}package.json`,
-			`sourcedir${path.sep}node_modules${path.sep}module${path.sep}block.json`,
-			`node_modules${path.sep}block.json`,
-			`fse${path.sep}theme.json`,
-			`block${path.sep}block.json`,
-		]
-
-		const files = await getFiles(args, pattern)
-		let collected = []
-		for (const file of files) {
-			expect(file).toBeTruthy()
-			collected.push(file)
-		}
-		expect(
-			collected.filter((file) => !expectedFiles.includes(file))
-		).toBeTruthy()
-	})
-	it('Should retrieve a list of files without any node_modules folder', async () => {
-		const args = {
-			...DEFAULTS,
-		}
-		const pattern = {
-			include: ['**'],
-			exclude: ['node_modules'],
-		}
-
-		const files = await getFiles(args, pattern)
-		let collected = []
-		for (const file of files) {
-			expect(file).toBeTruthy()
-			collected.push(file)
-		}
-
-		// for each file check if that strings contains the node_modules folder
-		expect(collected.find((e) => e.includes('node_modules'))).toBeFalsy()
-		expect(collected.length).toBeGreaterThan(10)
-	})
-})
+import { describe, expect } from '@jest/globals'
+import { getFiles } from '../src/fs/glob'
+import { Args, DomainType } from '../src/types'
+import path from 'path'
+import { parseCliArgs } from '../src/cli/parseCli'
+
+describe('getFiles', () => {
+	const DEFAULTS = parseCliArgs({
+		domain: 'plugin' as DomainType,
+		slug: 'plugin-slug',
+		paths: { cwd: 'tests/fixtures/', out: 'tests/fixtures/' },
+		options: {
+			silent: true,
+		},
+		$0: 'makepot',
+		_: [0, 1],
+	})
+
+	it('should retrieve a all files', async () => {
+		const args = { ...DEFAULTS, domain: 'theme' } as Args
+		const pattern = { include: ['**'], exclude: [] }
+
+		const files = await getFiles(args, pattern)
+		const collected: string[] = []
+		for (const file of files) {
+			expect(file).toBeTruthy()
+			collected.push(file)
+		}
+		expect(collected.length).toBeGreaterThan(2)
+		expect(collected.find((e) => e.includes('theme.json'))).toBeTruthy()
+	})
+	it('Should retrieve a list of txt files based on the provided plugin pattern', async () => {
+		const args = {
+			...DEFAULTS,
+		}
+		const pattern = {
+			include: ['**/*.txt'],
+			exclude: ['node_modules', 'dist'],
+		}
+		const expectedFiles = [
+			'tests' + path.sep + 'fixtures' + path.sep + 'file1.txt',
+			'tests' +
+				path.sep +
+				'fixtures' +
+				path.sep +
+				'sourcedir' +
+				path.sep +
+				'file2.txt',
+			'tests' +
+				path.sep +
+				'fixtures' +
+				path.sep +
+				'block' +
+				path.sep +
+				'readme.txt',
+		]
+
+		const files = await getFiles(args, pattern)
+		const collected: string[] = []
+		for (const file of files) {
+			expect(file).toBeTruthy()
+			collected.push(file)
+		}
+
+		expect(collected).toEqual(expectedFiles)
+	})
+	it('should retrieve a list of theme.json files based on the provided theme pattern', async () => {
+		const args = {
+			...DEFAULTS,
+		}
+		const pattern = {
+			include: ['**/*.json'],
+			exclude: [],
+		}
+		const expectedFiles = [
+			`sourcedir${path.sep}theme.json`,
+			`sourcedir${path.sep}package.json`,
+			`sourcedir${path.sep}node_modules${path.sep}module${path.sep}block.json`,
+			`node_modules${path.sep}block.json`,
+			`fse${path.sep}theme.json`,
+			`block${path.sep}block.json`,
+		]
+
+		const files = await getFiles(args, pattern)
+		let collected = []
+		for (const file of files) {
+			expect(file).toBeTruthy()
+			collected.push(file)
+		}
+		expect(
+			collected.filter((file) => !expectedFiles.includes(file))
+		).toBeTruthy()
+	})
+	it('Should retrieve a list of files without any node_modules folder', async () => {
+		const args = {
+			...DEFAULTS,
+		}
+		const pattern = {
+			include: ['**'],
+			exclude: ['node_modules'],
+		}
+
+		const files = await getFiles(args, pattern)
+		let collected = []
+		for (const file of files) {
+			expect(file).toBeTruthy()
+			collected.push(file)
+		}
+
+		// for each file check if that strings contains the node_modules folder
+		expect(collected.find((e) => e.includes('node_modules'))).toBeFalsy()
+		expect(collected.length).toBeGreaterThan(10)
+	})
+})

package/tests/{getStrings.old.ts → getStrings.test.ts}

@@ -1,76 +1,85 @@
-import { describe, expect } from '@jest/globals'
-import { Args, DomainType } from '../src/types'
-import { getFiles } from '../src/glob'
-import { getStrings } from '../src/parser/process'
-
-const args: Args = {
-	slug: 'plugin-slug',
-	paths: { cwd: 'tests/fixtures/sourcedir/', out: 'tests/fixtures/' },
-	domain: 'plugin' as DomainType,
-	patterns: {
-		include: ['**'],
-		exclude: [
-			'node_modules',
-			'vendor',
-			'dist',
-			'tests',
-			'package-lock.json',
-		],
-	},
-}
-
-describe('getStrings', () => {
-	it('Should build pot file', async () => {
-		const files = await getFiles(args as Args, {
-			include: ['file.php'],
-			exclude: ['node_modules', 'dist'],
-		})
-		const dataExtracted = await getStrings({ ...args } as Args, files)
-
-		expect(dataExtracted).toMatchSnapshot()
-	})
-	it('Should build pot file from fixtures block.json', async () => {
-		const currentArgs = {
-			...args,
-			paths: { cwd: 'tests/fixtures/block/', out: 'tests/fixtures/' },
-			patterns: {
-				include: ['block.json'],
-				exclude: ['node_modules'],
-			},
-		} as Args
-		const files = await getFiles(currentArgs as Args, currentArgs.patterns)
-		const dataExtracted = await getStrings(currentArgs as Args, files)
-
-		const expected = {
-			'block variation keyword': {
-				undefined: {
-					msgstr: [],
-					msgid: 'undefined',
-					msgctxt: 'block variation keyword',
-				},
-			},
-			'block variation title': {
-				title: {
-					msgstr: [],
-					msgid: 'title',
-					msgctxt: 'block variation title',
-				},
-			},
-			'block variation description': {
-				description: {
-					msgstr: [],
-					msgid: 'description',
-					msgctxt: 'block variation description',
-				},
-			},
-			'block style label': {
-				label: {
-					msgstr: [],
-					msgid: 'label',
-					msgctxt: 'block style label',
-				},
-			},
-		}
-		expect(dataExtracted).toMatchObject(expected)
-	})
-})
+import { describe, expect } from '@jest/globals'
+import { Args, DomainType } from '../src/types'
+import { getFiles } from '../src/fs/glob'
+import { getStrings } from '../src/parser/process'
+
+const args: Args = {
+	slug: 'plugin-slug',
+	paths: { cwd: 'tests/fixtures/sourcedir/', out: 'tests/fixtures/' },
+	domain: 'plugin' as DomainType,
+	patterns: {
+		include: ['**'],
+		exclude: [
+			'node_modules',
+			'vendor',
+			'dist',
+			'tests',
+			'package-lock.json',
+		],
+	},
+}
+
+describe('getStrings', () => {
+	it('Should build pot file', async () => {
+		const files = await getFiles(args as Args, {
+			include: ['file.php'],
+			exclude: ['node_modules', 'dist'],
+		})
+		const dataExtracted = await getStrings({ ...args } as Args, files)
+
+		expect(dataExtracted).toMatchSnapshot()
+	})
+})
+
+describe('getFiles', () => {
+	it('Should build pot file from fixtures block.json', async () => {
+		const currentArgs = {
+			...args,
+			paths: { cwd: 'tests/fixtures/block/', out: 'tests/fixtures/' },
+			patterns: {
+				include: ['block.json'],
+				exclude: ['node_modules'],
+			},
+		} as Args
+		const files = await getFiles(currentArgs as Args, currentArgs.patterns)
+		const dataExtracted = await getStrings(currentArgs as Args, files)
+
+		const expected = [
+			{
+				'': {
+					description: {
+						comments: {
+							extracted: 'description',
+							reference: 'tests\\fixtures\\block\\block.json',
+						},
+						msgctxt: undefined,
+						msgid: 'description',
+						msgid_plural: '',
+						msgstr: [],
+					},
+					keywords: {
+						comments: {
+							extracted: 'keywords',
+							reference: 'tests\\fixtures\\block\\block.json',
+						},
+						msgctxt: undefined,
+						msgid: 'keywords',
+						msgid_plural: '',
+						msgstr: [],
+					},
+					title: {
+						comments: {
+							extracted: 'title',
+							reference: 'tests\\fixtures\\block\\block.json',
+						},
+						msgctxt: undefined,
+						msgid: 'title',
+						msgid_plural: '',
+						msgstr: [],
+					},
+				},
+			},
+		]
+		expect(dataExtracted).toMatchObject(expected)
+	})
+})