@markuplint/i18n 4.4.0 → 4.5.0

package/$schema.json

@@ -48,12 +48,15 @@
 				"c:invalid": { "type": "string" },
 				"c:non-standard": { "type": "string" },
 				"c:obsolete": { "type": "string" },
+				"cell overlap": { "type": "string" },
 				"character": { "type": "string" },
 				"characters": { "type": "string" },
 				"child element": { "type": "string" },
 				"class name": { "type": "string" },
 				"code block": { "type": "string" },
 				"colon": { "type": "string" },
+				"column": { "type": "string" },
+				"columns": { "type": "string" },
 				"comma-separated list": { "type": "string" },
 				"comma": { "type": "string" },
 				"commas": { "type": "string" },
@@ -107,6 +110,8 @@
 				"minute": { "type": "string" },
 				"month": { "type": "string" },
 				"name": { "type": "string" },
+				"navigable target name": { "type": "string" },
+				"navigable target names": { "type": "string" },
 				"newline": { "type": "string" },
 				"node": { "type": "string" },
 				"non-negative integer": { "type": "string" },
@@ -129,6 +134,8 @@
 				"regular expression": { "type": "string" },
 				"role": { "type": "string" },
 				"roles": { "type": "string" },
+				"row": { "type": "string" },
+				"rows": { "type": "string" },
 				"second": { "type": "string" },
 				"semantics": { "type": "string" },
 				"serialized-origin": { "type": "string" },
@@ -178,6 +185,7 @@
 				"{0:c} on {1}": { "type": "string" },
 				"{0} ({1})": { "type": "string" },
 				"{0} according to {1}": { "type": "string" },
+				"{0} are causing {1}": { "type": "string" },
 				"{0} as {1}": { "type": "string" },
 				"{0} associates only {1}": { "type": "string" },
 				"{0} behaves the same as {1} if {2}": { "type": "string" },
@@ -189,6 +197,7 @@
 				"{0} does not exist": { "type": "string" },
 				"{0} expects {1:c}": { "type": "string" },
 				"{0} expects {1}": { "type": "string" },
+				"{0} extra {1} in {2}": { "type": "string" },
 				"{0} greater than {1} less than {2}": { "type": "string" },
 				"{0} greater than {1} less than or equal to {2}": { "type": "string" },
 				"{0} greater than {1}": { "type": "string" },
@@ -202,6 +211,7 @@
 				"{0} is {1:c}": { "type": "string" },
 				"{0} is {1}": { "type": "string" },
 				"{0} is {1} but {2}": { "type": "string" },
+				"{0} is causing {1}": { "type": "string" },
 				"{0} is disallowed": { "type": "string" },
 				"{0} is disallowed to accept the following values: {1}": { "type": "string" },
 				"{0} is matched with the below disallowed patterns: {1}": { "type": "string" },
@@ -212,6 +222,7 @@
 				"{0} is unmatched with the below patterns: {1}": { "type": "string" },
 				"{0} less than {1}": { "type": "string" },
 				"{0} less than or equal to {1}": { "type": "string" },
+				"{0} missing {1} in {2}": { "type": "string" },
 				"{0} must {1}": { "type": "string" },
 				"{0} must be {1}": { "type": "string" },
 				"{0} must not {1}": { "type": "string" },
@@ -239,6 +250,7 @@
 				"add {0}": { "type": "string" },
 				"allowed values are: {0}": { "type": "string" },
 				"also disallows {0} in this context": { "type": "string" },
+				"ambiguous {0}": { "type": "string" },
 				"an {0}": { "type": "string" },
 				"as its {0} is already provided by {1}": { "type": "string" },
 				"cannot overwrite {0} to {1}": { "type": "string" },
@@ -247,7 +259,9 @@
 				"corresponding {0}": { "type": "string" },
 				"detected {0} between {1} and {2}": { "type": "string" },
 				"did you mean \"{0}\"?": { "type": "string" },
+				"don't use {0}": { "type": "string" },
 				"either {0}": { "type": "string" },
+				"exceeds the number of available {0}": { "type": "string" },
 				"extra {0}": { "type": "string" },
 				"first {0}": { "type": "string" },
 				"found {0}": { "type": "string" },

package/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [4.5.0](https://github.com/markuplint/markuplint/compare/@markuplint/i18n@4.5.0-alpha.0...@markuplint/i18n@4.5.0) (2024-05-04)
+
+**Note:** Version bump only for package @markuplint/i18n
+
+# [4.5.0-alpha.0](https://github.com/markuplint/markuplint/compare/@markuplint/i18n@4.4.0...@markuplint/i18n@4.5.0-alpha.0) (2024-05-04)
+
+### Features
+
+- **i18n:** add `useLastSeparator` param to Translate listed phrases API ([2da7e11](https://github.com/markuplint/markuplint/commit/2da7e11e9838af4cf7bde64725c43a5d08a2e0a1))
+- **rules:** add `no-ambiguous-navigable-target-names` rule ([742db4e](https://github.com/markuplint/markuplint/commit/742db4eb98b8f27e8a1f6a82d3b6541871e02a5c))
+- **rules:** add `table-row-column-alignment` rule ([4b071f8](https://github.com/markuplint/markuplint/commit/4b071f8d7dae0f1500e1a77046b289489eb5a598))

package/README.md

@@ -121,7 +121,7 @@ console.log(phrase);
 ### Translate listed phrases
 
 ```ts
-type T = (phrases: string[]) => string;
+type T = (phrases: string[], useLastSeparator?: boolean) => string;
 ```
 
 ```ts
@@ -135,12 +135,23 @@ console.log(list);
 // => "element", "attribute", "value"
 ```
 
+```ts
+const list = t(['element', 'attribute', 'value'], true);
+
+console.log(list);
+// => 「要素」「属性」「値」
+
+/* If locale is "en" */
+console.log(list);
+// => "element", "attribute" and "value"
+```
+
 It converts the character-separated list specified in each locale.
 
-| Locale | Separator            | Before Char                | After Char                  |
-| ------ | -------------------- | -------------------------- | --------------------------- |
-| **en** | `, ` (comma + space) | `"` (double quote)         | `"` (double quote)          |
-| **ja** | none (empty string)  | `「` (left corner bracket) | `」` (right corner bracket) |
+| Locale | Separator            | Before Char                | After Char                  | Last Separator                 |
+| ------ | -------------------- | -------------------------- | --------------------------- | ------------------------------ |
+| **en** | `, ` (comma + space) | `"` (double quote)         | `"` (double quote)          | `and` (space + chars + space ) |
+| **ja** | none (empty string)  | `「` (left corner bracket) | `」` (right corner bracket) | none (empty string)            |
 
 ### Avoid translation
 

package/cjs/translator.js

@@ -5,15 +5,24 @@ const defaultListFormat = {
     quoteStart: '"',
     quoteEnd: '"',
     separator: ', ',
+    lastSeparator: ' and ',
 };
 function translator(localeSet) {
     return (messageTmpl, ...keywords) => {
         let message = messageTmpl;
         if (typeof messageTmpl !== 'string') {
+            if (messageTmpl.length === 0) {
+                return '';
+            }
             const format = localeSet?.listFormat ?? defaultListFormat;
-            return `${format.quoteStart}${messageTmpl
-                .map(keyword => translateKeyword(keyword, '', localeSet))
-                .join(`${format.quoteEnd}${format.separator}${format.quoteStart}`)}${format.quoteEnd}`;
+            const useLastSeparator = keywords[0] == null || keywords[0] == false ? false : true;
+            const lastSeparator = useLastSeparator ? format.lastSeparator ?? format.separator : format.separator;
+            const list = messageTmpl.map(keyword => format.quoteStart + translateKeyword(keyword, '', localeSet) + format.quoteEnd);
+            if (list.length === 1) {
+                return list[0];
+            }
+            const last = list.pop();
+            return list.join(format.separator) + lastSeparator + last;
         }
         const input = messageTmpl;
         if (keywords.length === 0) {

package/cjs/types.d.ts

@@ -1,4 +1,8 @@
-export type Translator = (messageTmpl: string | readonly string[], ...keywords: readonly Primitive[]) => string;
+export interface Translator {
+    (messageTmpl: string, ...keywords: readonly Primitive[]): string;
+    (messageTmpl: readonly string[], useLastSeparator?: boolean): string;
+    (messageTmpl: string | readonly string[], ...keywords: readonly Primitive[]): string;
+}
 export type LocaleSet = {
     readonly locale: string;
     readonly listFormat?: ListFormat;
@@ -9,6 +13,7 @@ export type ListFormat = {
     readonly quoteStart: string;
     readonly quoteEnd: string;
     readonly separator: string;
+    readonly lastSeparator?: string;
 };
 export type Primitive = string | number | boolean;
 export type LocalesKeywords = {

package/esm/translator.mjs

@@ -2,15 +2,24 @@ const defaultListFormat = {
     quoteStart: '"',
     quoteEnd: '"',
     separator: ', ',
+    lastSeparator: ' and ',
 };
 export function translator(localeSet) {
     return (messageTmpl, ...keywords) => {
         let message = messageTmpl;
         if (typeof messageTmpl !== 'string') {
+            if (messageTmpl.length === 0) {
+                return '';
+            }
             const format = localeSet?.listFormat ?? defaultListFormat;
-            return `${format.quoteStart}${messageTmpl
-                .map(keyword => translateKeyword(keyword, '', localeSet))
-                .join(`${format.quoteEnd}${format.separator}${format.quoteStart}`)}${format.quoteEnd}`;
+            const useLastSeparator = keywords[0] == null || keywords[0] == false ? false : true;
+            const lastSeparator = useLastSeparator ? format.lastSeparator ?? format.separator : format.separator;
+            const list = messageTmpl.map(keyword => format.quoteStart + translateKeyword(keyword, '', localeSet) + format.quoteEnd);
+            if (list.length === 1) {
+                return list[0];
+            }
+            const last = list.pop();
+            return list.join(format.separator) + lastSeparator + last;
         }
         const input = messageTmpl;
         if (keywords.length === 0) {

package/esm/types.d.ts

@@ -1,4 +1,8 @@
-export type Translator = (messageTmpl: string | readonly string[], ...keywords: readonly Primitive[]) => string;
+export interface Translator {
+    (messageTmpl: string, ...keywords: readonly Primitive[]): string;
+    (messageTmpl: readonly string[], useLastSeparator?: boolean): string;
+    (messageTmpl: string | readonly string[], ...keywords: readonly Primitive[]): string;
+}
 export type LocaleSet = {
     readonly locale: string;
     readonly listFormat?: ListFormat;
@@ -9,6 +13,7 @@ export type ListFormat = {
     readonly quoteStart: string;
     readonly quoteEnd: string;
     readonly separator: string;
+    readonly lastSeparator?: string;
 };
 export type Primitive = string | number | boolean;
 export type LocalesKeywords = {

package/locales/ja.json

@@ -36,12 +36,15 @@
 		"c:invalid": "は妥当ではありません",
 		"c:non-standard": "は非標準です",
 		"c:obsolete": "は廃止されています",
+		"cell overlap": "セルの交差",
 		"character": "文字",
 		"characters": "文字",
 		"child element": "子要素",
 		"class name": "クラス名",
 		"code block": "コードブロック",
 		"colon": "コロン",
+		"column": "列",
+		"columns": "列",
 		"comma-separated list": "カンマ区切りのリスト",
 		"comma": "カンマ",
 		"commas": "カンマ",
@@ -95,6 +98,8 @@
 		"minute": "分",
 		"month": "月",
 		"name": "名前",
+		"navigable target name": "ナビゲート可能なターゲット名",
+		"navigable target names": "ナビゲート可能なターゲット名",
 		"newline": "改行",
 		"node": "ノード",
 		"non-negative integer": "正の整数",
@@ -117,6 +122,8 @@
 		"regular expression": "正規表現",
 		"role": "ロール",
 		"roles": "ロール",
+		"row": "行",
+		"rows": "行",
 		"second": "秒",
 		"semantics": "セマンティクス",
 		"serialized-origin": "シリアル化されたオリジン",
@@ -162,6 +169,7 @@
 		"{0:c} on {1}": "{1}では、{0:c}",
 		"{0} ({1})": "{0}({1})",
 		"{0} according to {1}": "{1}において、{0}",
+		"{0} are causing {1}": "{0}が{1}を引き起こしています",
 		"{0} as {1}": "{1}として{0}",
 		"{0} associates only {1}": "{0}は{1}だけを関連付けます",
 		"{0} behaves the same as {1} if {2}": "{0}は{2}の場合、{1}と同じ振る舞いをします",
@@ -173,6 +181,7 @@
 		"{0} does not exist": "{0}は存在しません",
 		"{0} expects {1:c}": "{0}は{1}である必要があります",
 		"{0} expects {1}": "{0}には{1}が必要です",
+		"{0} extra {1} in {2}": "{2}に{0}つの余分な{1}があります",
 		"{0} greater than {1} less than {2}": "{1}より大きく{2}より小さい{0}",
 		"{0} greater than {1} less than or equal to {2}": "{1}より大きく{2}以下の{0}",
 		"{0} greater than {1}": "{1}より大きい{0}",
@@ -186,6 +195,7 @@
 		"{0} is {1:c}": "{0}{1:c}",
 		"{0} is {1} but {2}": "{0}は{1}ですが、{2}",
 		"{0} is {1}": "{0}は{1}です",
+		"{0} is causing {1}": "{0}が{1}を引き起こしています",
 		"{0} is disallowed": "{0}は禁止されています",
 		"{0} is disallowed to accept the following values: {1}": "{0}は次の値を受け取ることを禁止しています: {1}",
 		"{0} is matched with the below disallowed patterns: {1}": "{0}は次の許可しないパターンにマッチしました {1}",
@@ -196,6 +206,7 @@
 		"{0} is unmatched with the below patterns: {1}": "{0}は次のパターンにマッチしませんでした {1}",
 		"{0} less than {1}": "{1}より小さい{0}",
 		"{0} less than or equal to {1}": "{1}以下の{0}",
+		"{0} missing {1} in {2}": "{2}に{0}つの{1}がありません",
 		"{0} must {1}": "{0}は{1}するべきです",
 		"{0} must be {1}": "{0}は{1}にするべきです",
 		"{0} must not {1}": "{0}は{1}するべきではありません",
@@ -223,6 +234,7 @@
 		"add {0}": "{0}を追加してください",
 		"allowed values are: {0}": "許可されている値は次のとおりです {0}",
 		"also disallows {0} in this context": "このコンテキスト内では{0}も許可しません",
+		"ambiguous {0}": "曖昧な{0}",
 		"an {0}": "{0}",
 		"as its {0} is already provided by {1}": "その{0}は{1}によってすでに提供されています",
 		"cannot overwrite {0} to {1}": "{0}を{1}に上書きすることはできません",
@@ -231,7 +243,9 @@
 		"corresponding {0}": "対応する{0}",
 		"detected {0} between {1} and {2}": "{1}と{2}の間で{0}が検出されました",
 		"did you mean \"{0}\"?": "「{0}」ではありませんか？",
+		"don't use {0}": "{0}を使用しないでください",
 		"either {0}": "{0}のいずれか",
+		"exceeds the number of available {0}": "利用可能な{0}数を超えています",
 		"extra {0}": "余計な{0}",
 		"first {0}": "最初の{0}",
 		"found {0}": "{0}が発見されました",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/i18n",
-	"version": "4.4.0",
+	"version": "4.5.0",
 	"description": "Internationalization for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -37,5 +37,5 @@
 		"build:cjs": "tsc --module commonjs --outDir cjs",
 		"clean": "tsc --build --clean"
 	},
-	"gitHead": "d5c8786b0dbbd82cdd89018dd57941d62bbe8d06"
+	"gitHead": "7a5967fce14fdf66f0d8eae9d93ae5b350648d3d"
 }