@eslint/json 0.6.0 → 0.8.0

package/README.md

@@ -154,6 +154,8 @@ export default [
 
 -   `no-duplicate-keys` - warns when there are two keys in an object with the same text.
 -   `no-empty-keys` - warns when there is a key in an object that is an empty string or contains only whitespace (note: `package-lock.json` uses empty keys intentionally)
+-   `no-unsafe-values` - warns on values that are unsafe for interchange, such as numbers outside safe range or lone surrogates.
+-   `no-unnormalized-keys` - warns on keys containing [unnormalized characters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize#description). You can optionally specify the normalization form via `{ form: "form_name" }`, where `form_name` can be any of `"NFC"`, `"NFD"`, `"NFKC"`, or `"NFKD"`.
 
 ## Configuration Comments
 
@@ -249,7 +251,7 @@ to get your logo on our READMEs and [website](https://eslint.org/sponsors).
 <p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="128"></a></p><h3>Gold Sponsors</h3>
 <p><a href="https://trunk.io/"><img src="https://images.opencollective.com/trunkio/fb92d60/avatar.png" alt="trunk.io" height="96"></a></p><h3>Silver Sponsors</h3>
 <p><a href="https://www.serptriumph.com/"><img src="https://images.opencollective.com/serp-triumph5/fea3074/logo.png" alt="SERP Triumph" height="64"></a> <a href="https://www.jetbrains.com/"><img src="https://images.opencollective.com/jetbrains/fe76f99/logo.png" alt="JetBrains" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://americanexpress.io"><img src="https://avatars.githubusercontent.com/u/3853301?v=4" alt="American Express" height="64"></a> <a href="https://www.workleap.com"><img src="https://avatars.githubusercontent.com/u/53535748?u=d1e55d7661d724bf2281c1bfd33cb8f99fe2465f&v=4" alt="Workleap" height="64"></a></p><h3>Bronze Sponsors</h3>
-<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://www.wordhint.net/"><img src="https://images.opencollective.com/wordhint/be86813/avatar.png" alt="WordHint" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340?v=4" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104?v=4" alt="Nx" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774?v=4" alt="HeroCoders" height="32"></a></p>
+<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://syntax.fm"><img src="https://github.com/syntaxfm.png" alt="Syntax" height="32"></a> <a href="https://www.wordhint.net/"><img src="https://images.opencollective.com/wordhint/be86813/avatar.png" alt="WordHint" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340?v=4" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104?v=4" alt="Nx" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774?v=4" alt="HeroCoders" height="32"></a></p>
 <h3>Technology Sponsors</h3>
 Technology sponsors allow us to use their products and services for free as part of a contribution to the open source ecosystem and our work.
 <p><a href="https://netlify.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/netlify-icon.svg" alt="Netlify" height="32"></a> <a href="https://algolia.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/algolia-icon.svg" alt="Algolia" height="32"></a> <a href="https://1password.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/1password-icon.svg" alt="1Password" height="32"></a></p>

package/dist/cjs/index.cjs

@@ -455,7 +455,7 @@ class JSONLanguage {
 
 var noDuplicateKeys = {
 	meta: {
-		type: "problem",
+		type: /** @type {const} */ ("problem"),
 
 		docs: {
 			description: "Disallow duplicate keys in JSON objects",
@@ -508,7 +508,7 @@ var noDuplicateKeys = {
 
 var noEmptyKeys = {
 	meta: {
-		type: "problem",
+		type: /** @type {const} */ ("problem"),
 
 		docs: {
 			description: "Disallow empty keys in JSON objects",
@@ -538,6 +538,122 @@ var noEmptyKeys = {
 	},
 };
 
+/**
+ * @fileoverview Rule to detect unsafe values in JSON.
+ * @author Bradley Meck Farias
+ */
+
+var noUnsafeValues = {
+	meta: {
+		type: /** @type {const} */ ("problem"),
+
+		docs: {
+			description: "Disallow JSON values that are unsafe for interchange",
+		},
+
+		messages: {
+			unsafeNumber: "Number outside safe range found.",
+			loneSurrogate: "Lone surrogate '{{ surrogate }}' found.",
+		},
+	},
+
+	create(context) {
+		return {
+			Number(node) {
+				if (Number.isFinite(node.value) !== true) {
+					context.report({
+						loc: node.loc,
+						messageId: "unsafeNumber",
+					});
+				}
+			},
+			String(node) {
+				if (node.value.isWellFormed) {
+					if (node.value.isWellFormed()) {
+						return;
+					}
+				}
+				// match any high surrogate and, if it exists, a paired low surrogate
+				// match any low surrogate not already matched
+				const surrogatePattern =
+					/[\uD800-\uDBFF][\uDC00-\uDFFF]?|[\uDC00-\uDFFF]/gu;
+				let match = surrogatePattern.exec(node.value);
+				while (match) {
+					// only need to report non-paired surrogates
+					if (match[0].length < 2) {
+						context.report({
+							loc: node.loc,
+							messageId: "loneSurrogate",
+							data: {
+								surrogate: JSON.stringify(match[0]).slice(
+									1,
+									-1,
+								),
+							},
+						});
+					}
+					match = surrogatePattern.exec(node.value);
+				}
+			},
+		};
+	},
+};
+
+/**
+ * @fileoverview Rule to detect unnormalized keys in JSON.
+ * @author Bradley Meck Farias
+ */
+
+var noUnnormalizedKeys = {
+	meta: {
+		type: /** @type {const} */ ("problem"),
+
+		docs: {
+			description: "Disallow JSON keys that are not normalized",
+		},
+
+		messages: {
+			unnormalizedKey: "Unnormalized key '{{key}}' found.",
+		},
+
+		schema: [
+			{
+				type: "object",
+				properties: {
+					form: {
+						enum: ["NFC", "NFD", "NFKC", "NFKD"],
+					},
+				},
+				additionalProperties: false,
+			},
+		],
+	},
+
+	create(context) {
+		const normalization = context.options.length
+			? text => text.normalize(context.options[0].form)
+			: text => text.normalize();
+		return {
+			Member(node) {
+				const key =
+					node.name.type === "String"
+						? node.name.value
+						: node.name.name;
+
+				if (normalization(key) !== key) {
+					context.report({
+						loc: node.name.loc,
+						messageId: "unnormalizedKey",
+						data: {
+							key,
+						},
+					});
+				}
+			},
+		};
+	},
+};
+
 /**
  * @fileoverview JSON plugin.
  * @author Nicholas C. Zakas
@@ -551,7 +667,7 @@ var noEmptyKeys = {
 const plugin = {
 	meta: {
 		name: "@eslint/json",
-		version: "0.6.0", // x-release-please-version
+		version: "0.8.0", // x-release-please-version
 	},
 	languages: {
 		json: new JSONLanguage({ mode: "json" }),
@@ -561,19 +677,26 @@ const plugin = {
 	rules: {
 		"no-duplicate-keys": noDuplicateKeys,
 		"no-empty-keys": noEmptyKeys,
+		"no-unsafe-values": noUnsafeValues,
+		"no-unnormalized-keys": noUnnormalizedKeys,
 	},
-	configs: {},
-};
-
-Object.assign(plugin.configs, {
-	recommended: {
-		plugins: { json: plugin },
-		rules: {
-			"json/no-duplicate-keys": "error",
-			"json/no-empty-keys": "error",
+	configs: {
+		recommended: {
+			plugins: {},
+			rules: /** @type {const} */ ({
+				"json/no-duplicate-keys": "error",
+				"json/no-empty-keys": "error",
+				"json/no-unsafe-values": "error",
+				"json/no-unnormalized-keys": "error",
+			}),
 		},
 	},
-});
+};
+
+// eslint-disable-next-line no-lone-blocks -- The block syntax { ... } ensures that TypeScript does not get confused about the type of `plugin`.
+{
+	plugin.configs.recommended.plugins.json = plugin;
+}
 
 exports.JSONLanguage = JSONLanguage;
 exports.JSONSourceCode = JSONSourceCode;

package/dist/cjs/index.d.cts

@@ -174,7 +174,7 @@ declare namespace plugin {
     let rules: {
         "no-duplicate-keys": {
             meta: {
-                type: string;
+                type: "problem";
                 docs: {
                     description: string;
                 };
@@ -190,7 +190,7 @@ declare namespace plugin {
         };
         "no-empty-keys": {
             meta: {
-                type: string;
+                type: "problem";
                 docs: {
                     description: string;
                 };
@@ -202,8 +202,58 @@ declare namespace plugin {
                 Member(node: any): void;
             };
         };
+        "no-unsafe-values": {
+            meta: {
+                type: "problem";
+                docs: {
+                    description: string;
+                };
+                messages: {
+                    unsafeNumber: string;
+                    loneSurrogate: string;
+                };
+            };
+            create(context: any): {
+                Number(node: any): void;
+                String(node: any): void;
+            };
+        };
+        "no-unnormalized-keys": {
+            meta: {
+                type: "problem";
+                docs: {
+                    description: string;
+                };
+                messages: {
+                    unnormalizedKey: string;
+                };
+                schema: {
+                    type: string;
+                    properties: {
+                        form: {
+                            enum: string[];
+                        };
+                    };
+                    additionalProperties: boolean;
+                }[];
+            };
+            create(context: any): {
+                Member(node: any): void;
+            };
+        };
     };
-    let configs: {};
+    namespace configs {
+        namespace recommended {
+            export let plugins: {};
+            let rules_1: {
+                readonly "json/no-duplicate-keys": "error";
+                readonly "json/no-empty-keys": "error";
+                readonly "json/no-unsafe-values": "error";
+                readonly "json/no-unnormalized-keys": "error";
+            };
+            export { rules_1 as rules };
+        }
+    }
 }
 import { TextSourceCodeBase } from '@eslint/plugin-kit';
 import { Directive } from '@eslint/plugin-kit';

package/dist/esm/index.d.ts

@@ -174,7 +174,7 @@ declare namespace plugin {
     let rules: {
         "no-duplicate-keys": {
             meta: {
-                type: string;
+                type: "problem";
                 docs: {
                     description: string;
                 };
@@ -190,7 +190,7 @@ declare namespace plugin {
         };
         "no-empty-keys": {
             meta: {
-                type: string;
+                type: "problem";
                 docs: {
                     description: string;
                 };
@@ -202,8 +202,58 @@ declare namespace plugin {
                 Member(node: any): void;
             };
         };
+        "no-unsafe-values": {
+            meta: {
+                type: "problem";
+                docs: {
+                    description: string;
+                };
+                messages: {
+                    unsafeNumber: string;
+                    loneSurrogate: string;
+                };
+            };
+            create(context: any): {
+                Number(node: any): void;
+                String(node: any): void;
+            };
+        };
+        "no-unnormalized-keys": {
+            meta: {
+                type: "problem";
+                docs: {
+                    description: string;
+                };
+                messages: {
+                    unnormalizedKey: string;
+                };
+                schema: {
+                    type: string;
+                    properties: {
+                        form: {
+                            enum: string[];
+                        };
+                    };
+                    additionalProperties: boolean;
+                }[];
+            };
+            create(context: any): {
+                Member(node: any): void;
+            };
+        };
     };
-    let configs: {};
+    namespace configs {
+        namespace recommended {
+            export let plugins: {};
+            let rules_1: {
+                readonly "json/no-duplicate-keys": "error";
+                readonly "json/no-empty-keys": "error";
+                readonly "json/no-unsafe-values": "error";
+                readonly "json/no-unnormalized-keys": "error";
+            };
+            export { rules_1 as rules };
+        }
+    }
 }
 import { TextSourceCodeBase } from '@eslint/plugin-kit';
 import { Directive } from '@eslint/plugin-kit';

package/dist/esm/index.js

@@ -452,7 +452,7 @@ class JSONLanguage {
 
 var noDuplicateKeys = {
 	meta: {
-		type: "problem",
+		type: /** @type {const} */ ("problem"),
 
 		docs: {
 			description: "Disallow duplicate keys in JSON objects",
@@ -505,7 +505,7 @@ var noDuplicateKeys = {
 
 var noEmptyKeys = {
 	meta: {
-		type: "problem",
+		type: /** @type {const} */ ("problem"),
 
 		docs: {
 			description: "Disallow empty keys in JSON objects",
@@ -535,6 +535,122 @@ var noEmptyKeys = {
 	},
 };
 
+/**
+ * @fileoverview Rule to detect unsafe values in JSON.
+ * @author Bradley Meck Farias
+ */
+
+var noUnsafeValues = {
+	meta: {
+		type: /** @type {const} */ ("problem"),
+
+		docs: {
+			description: "Disallow JSON values that are unsafe for interchange",
+		},
+
+		messages: {
+			unsafeNumber: "Number outside safe range found.",
+			loneSurrogate: "Lone surrogate '{{ surrogate }}' found.",
+		},
+	},
+
+	create(context) {
+		return {
+			Number(node) {
+				if (Number.isFinite(node.value) !== true) {
+					context.report({
+						loc: node.loc,
+						messageId: "unsafeNumber",
+					});
+				}
+			},
+			String(node) {
+				if (node.value.isWellFormed) {
+					if (node.value.isWellFormed()) {
+						return;
+					}
+				}
+				// match any high surrogate and, if it exists, a paired low surrogate
+				// match any low surrogate not already matched
+				const surrogatePattern =
+					/[\uD800-\uDBFF][\uDC00-\uDFFF]?|[\uDC00-\uDFFF]/gu;
+				let match = surrogatePattern.exec(node.value);
+				while (match) {
+					// only need to report non-paired surrogates
+					if (match[0].length < 2) {
+						context.report({
+							loc: node.loc,
+							messageId: "loneSurrogate",
+							data: {
+								surrogate: JSON.stringify(match[0]).slice(
+									1,
+									-1,
+								),
+							},
+						});
+					}
+					match = surrogatePattern.exec(node.value);
+				}
+			},
+		};
+	},
+};
+
+/**
+ * @fileoverview Rule to detect unnormalized keys in JSON.
+ * @author Bradley Meck Farias
+ */
+
+var noUnnormalizedKeys = {
+	meta: {
+		type: /** @type {const} */ ("problem"),
+
+		docs: {
+			description: "Disallow JSON keys that are not normalized",
+		},
+
+		messages: {
+			unnormalizedKey: "Unnormalized key '{{key}}' found.",
+		},
+
+		schema: [
+			{
+				type: "object",
+				properties: {
+					form: {
+						enum: ["NFC", "NFD", "NFKC", "NFKD"],
+					},
+				},
+				additionalProperties: false,
+			},
+		],
+	},
+
+	create(context) {
+		const normalization = context.options.length
+			? text => text.normalize(context.options[0].form)
+			: text => text.normalize();
+		return {
+			Member(node) {
+				const key =
+					node.name.type === "String"
+						? node.name.value
+						: node.name.name;
+
+				if (normalization(key) !== key) {
+					context.report({
+						loc: node.name.loc,
+						messageId: "unnormalizedKey",
+						data: {
+							key,
+						},
+					});
+				}
+			},
+		};
+	},
+};
+
 /**
  * @fileoverview JSON plugin.
  * @author Nicholas C. Zakas
@@ -548,7 +664,7 @@ var noEmptyKeys = {
 const plugin = {
 	meta: {
 		name: "@eslint/json",
-		version: "0.6.0", // x-release-please-version
+		version: "0.8.0", // x-release-please-version
 	},
 	languages: {
 		json: new JSONLanguage({ mode: "json" }),
@@ -558,18 +674,25 @@ const plugin = {
 	rules: {
 		"no-duplicate-keys": noDuplicateKeys,
 		"no-empty-keys": noEmptyKeys,
+		"no-unsafe-values": noUnsafeValues,
+		"no-unnormalized-keys": noUnnormalizedKeys,
 	},
-	configs: {},
-};
-
-Object.assign(plugin.configs, {
-	recommended: {
-		plugins: { json: plugin },
-		rules: {
-			"json/no-duplicate-keys": "error",
-			"json/no-empty-keys": "error",
+	configs: {
+		recommended: {
+			plugins: {},
+			rules: /** @type {const} */ ({
+				"json/no-duplicate-keys": "error",
+				"json/no-empty-keys": "error",
+				"json/no-unsafe-values": "error",
+				"json/no-unnormalized-keys": "error",
+			}),
 		},
 	},
-});
+};
+
+// eslint-disable-next-line no-lone-blocks -- The block syntax { ... } ensures that TypeScript does not get confused about the type of `plugin`.
+{
+	plugin.configs.recommended.plugins.json = plugin;
+}
 
 export { JSONLanguage, JSONSourceCode, plugin as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint/json",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "JSON linting plugin for ESLint",
   "author": "Nicholas C. Zakas",
   "type": "module",
@@ -51,7 +51,8 @@
     "fmt": "prettier --write .",
     "fmt:check": "prettier --check .",
     "test": "mocha tests/**/*.js",
-    "test:coverage": "c8 npm test"
+    "test:coverage": "c8 npm test",
+    "test:types": "tsc -p tests/types/tsconfig.json"
   },
   "keywords": [
     "eslint",
@@ -62,8 +63,8 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@eslint/plugin-kit": "^0.2.0",
-    "@humanwhocodes/momoa": "^3.3.0"
+    "@eslint/plugin-kit": "^0.2.3",
+    "@humanwhocodes/momoa": "^3.3.3"
   },
   "devDependencies": {
     "@eslint/core": "^0.6.0",
@@ -72,6 +73,7 @@
     "dedent": "^1.5.3",
     "eslint": "^9.11.1",
     "eslint-config-eslint": "^11.0.0",
+    "eslint-plugin-eslint-plugin": "^6.3.2",
     "got": "^14.4.2",
     "lint-staged": "^15.2.7",
     "mocha": "^10.4.0",