@markuplint/i18n 4.0.0-dev.28 → 4.0.0-rc.0

package/$schema.json

@@ -50,6 +50,7 @@
 				"c:obsolete": { "type": "string" },
 				"character": { "type": "string" },
 				"characters": { "type": "string" },
+				"child element": { "type": "string" },
 				"class name": { "type": "string" },
 				"code block": { "type": "string" },
 				"colon": { "type": "string" },
@@ -212,6 +213,7 @@
 				"{0} or more chars": { "type": "string" },
 				"{0} or more digits": { "type": "string" },
 				"{0} part of {1}": { "type": "string" },
+				"{0} requires {1}": { "type": "string" },
 				"{0} should {1}": { "type": "string" },
 				"{0} should associate with {1}": { "type": "string" },
 				"{0} should be {1}": { "type": "string" },

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2024 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/{lib/cjs → cjs}/translator.js

@@ -19,13 +19,20 @@ function translator(localeSet) {
         if (keywords.length === 0) {
             return translateKeyword(messageTmpl, '', localeSet);
         }
-        const noTranslateIndex = new Set([...messageTmpl.matchAll(/(?<={)\d+(?=\*})/g)].map(m => m[0]));
+        const noTranslateIndex = new Set([
+            ...messageTmpl.matchAll(
+            // eslint-disable-next-line regexp/strict
+            /(?<={)\d+(?=\*})/g),
+        ].map(m => m[0]));
         const key = removeNoTranslateMark(messageTmpl).toLowerCase();
-        const sentence = localeSet?.sentences?.[key];
+        const sentences = Object.entries(localeSet?.sentences ?? {});
+        const sentence = sentences.find(([sentenceKey]) => sentenceKey.toLowerCase() === key)?.[1];
         messageTmpl = sentence ?? key;
         messageTmpl =
             removeNoTranslateMark(input.toLowerCase()) === messageTmpl ? removeNoTranslateMark(input) : messageTmpl;
-        message = messageTmpl.replaceAll(/{(\d+)(?::(c))?}/g, ($0, number, flag) => {
+        message = messageTmpl.replaceAll(
+        // eslint-disable-next-line regexp/strict
+        /{(\d+)(?::(c))?}/g, ($0, number, flag) => {
             const num = Number.parseInt(number);
             if (Number.isNaN(num)) {
                 return $0;
@@ -106,5 +113,7 @@ function toLocaleString(value, locale) {
     return value.toString(10);
 }
 function removeNoTranslateMark(message) {
-    return message.replaceAll(/(?<={\d+)\*(?=})/g, '');
+    return message.replaceAll(
+    // eslint-disable-next-line regexp/strict
+    /(?<={\d+)\*(?=})/g, '');
 }

package/esm/index.mjs

@@ -0,0 +1 @@
+export { translator } from './translator.mjs';

package/{lib/translator.js → esm/translator.mjs}

@@ -16,13 +16,20 @@ export function translator(localeSet) {
         if (keywords.length === 0) {
             return translateKeyword(messageTmpl, '', localeSet);
         }
-        const noTranslateIndex = new Set([...messageTmpl.matchAll(/(?<={)\d+(?=\*})/g)].map(m => m[0]));
+        const noTranslateIndex = new Set([
+            ...messageTmpl.matchAll(
+            // eslint-disable-next-line regexp/strict
+            /(?<={)\d+(?=\*})/g),
+        ].map(m => m[0]));
         const key = removeNoTranslateMark(messageTmpl).toLowerCase();
-        const sentence = localeSet?.sentences?.[key];
+        const sentences = Object.entries(localeSet?.sentences ?? {});
+        const sentence = sentences.find(([sentenceKey]) => sentenceKey.toLowerCase() === key)?.[1];
         messageTmpl = sentence ?? key;
         messageTmpl =
             removeNoTranslateMark(input.toLowerCase()) === messageTmpl ? removeNoTranslateMark(input) : messageTmpl;
-        message = messageTmpl.replaceAll(/{(\d+)(?::(c))?}/g, ($0, number, flag) => {
+        message = messageTmpl.replaceAll(
+        // eslint-disable-next-line regexp/strict
+        /{(\d+)(?::(c))?}/g, ($0, number, flag) => {
             const num = Number.parseInt(number);
             if (Number.isNaN(num)) {
                 return $0;
@@ -101,5 +108,7 @@ function toLocaleString(value, locale) {
     return value.toString(10);
 }
 function removeNoTranslateMark(message) {
-    return message.replaceAll(/(?<={\d+)\*(?=})/g, '');
+    return message.replaceAll(
+    // eslint-disable-next-line regexp/strict
+    /(?<={\d+)\*(?=})/g, '');
 }

package/esm.mjs

@@ -0,0 +1,42 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+/**
+ *
+ * @param {string} filePath
+ * @param {string} newExtension
+ */
+function renameFileExtension(filePath, newExtension) {
+	const dir = path.dirname(filePath);
+	const fileName = path.basename(filePath, path.extname(filePath)) + newExtension;
+	const newFilePath = path.join(dir, fileName);
+	fs.renameSync(filePath, newFilePath);
+	return newFilePath;
+}
+
+function replaceInFile(filePath, searchValue, replaceValue) {
+	const data = fs.readFileSync(filePath, 'utf8');
+	const result = data.replace(searchValue, replaceValue);
+	fs.writeFileSync(filePath, result, 'utf8');
+}
+
+/**
+ *
+ * @param {string} dir
+ */
+function processDirectory(dir) {
+	const files = fs.readdirSync(dir, { withFileTypes: true });
+	for (const file of files) {
+		const fullPath = path.join(dir, file.name);
+		if (file.isDirectory()) {
+			processDirectory(fullPath);
+		} else {
+			if (file.name.endsWith('.js')) {
+				const newFilePath = renameFileExtension(fullPath, '.mjs');
+				replaceInFile(newFilePath, /\.js/g, '.mjs');
+			}
+		}
+	}
+}
+
+processDirectory('./esm');

package/locales/ja.json

@@ -38,6 +38,7 @@
 		"c:obsolete": "は廃止されています",
 		"character": "文字",
 		"characters": "文字",
+		"child element": "子要素",
 		"class name": "クラス名",
 		"code block": "コードブロック",
 		"colon": "コロン",
@@ -196,6 +197,7 @@
 		"{0} or more chars": "{0}文字以上",
 		"{0} or more digits": "{0}桁以上",
 		"{0} part of {1}": "{1}の{0}の部分",
+		"{0} requires {1}": "{0}に{1}が必要です",
 		"{0} should {1}": "{0}は{1}したほうがよいです",
 		"{0} should associate with {1}": "{0}は{1}と関連付けたほうがよいです",
 		"{0} should be {1}": "{0}は{1}にしたほうがよいです",

package/package.json

@@ -1,16 +1,20 @@
 {
 	"name": "@markuplint/i18n",
-	"version": "4.0.0-dev.28+0131de5e",
+	"version": "4.0.0-rc.0",
 	"description": "Internationalization for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
 	"license": "MIT",
 	"private": false,
-	"type": "module",
+	"main": "./cjs/index.js",
+	"types": "./cjs/index.d.ts",
 	"exports": {
 		".": {
-			"import": "./lib/index.js",
-			"require": "./lib/cjs/index.js"
+			"import": {
+				"default": "./esm/index.mjs",
+				"types": "./esm/index.d.ts"
+			},
+			"require": "./cjs/index.js"
 		},
 		"./locales/en.json": {
 			"import": "./locales/en.json",
@@ -21,7 +25,6 @@
 			"require": "./locales/ja.json"
 		}
 	},
-	"types": "./lib/index.d.ts",
 	"publishConfig": {
 		"access": "public"
 	},
@@ -29,8 +32,10 @@
 		"entryPoint": "./src/index.ts"
 	},
 	"scripts": {
-		"build": "tsc; tsc --module commonjs --outDir lib/cjs",
+		"build": "yarn build:esm; yarn build:cjs; node ./esm.mjs",
+		"build:esm": "tsc",
+		"build:cjs": "tsc --module commonjs --outDir cjs",
 		"clean": "tsc --build --clean"
 	},
-	"gitHead": "0131de5ea9dd6d3fd5472d7b414b66644c758881"
+	"gitHead": "3fdeb45cb69ed52b3a215a7520cea1181601443f"
 }

package/lib/index.js

@@ -1 +0,0 @@
-export { translator } from './translator.js';