@flint.fyi/json-language 0.16.3 → 0.17.0

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { JsonMinusNumericLiteral, JsonNode, JsonNodeName, JsonNodeVisitors, JsonNodesByName, JsonObjectExpression, JsonObjectExpressionStatement, JsonSourceFile } from "./nodes.js";
+import { JsonNode, JsonSourceFile } from "./nodes.js";
 import { getJsonNodeRange } from "./getJsonNodeRange.js";
-import { JsonFileServices, jsonLanguage } from "./language.js";
-export { JsonFileServices, JsonMinusNumericLiteral, JsonNode, JsonNodeName, JsonNodeVisitors, JsonNodesByName, JsonObjectExpression, JsonObjectExpressionStatement, JsonSourceFile, getJsonNodeRange, jsonLanguage };
+import { jsonLanguage } from "./language.js";
+export { type JsonNode, type JsonSourceFile, getJsonNodeRange, jsonLanguage };

package/lib/language.d.ts

@@ -5,7 +5,8 @@ import { Language } from "@flint.fyi/core";
 interface JsonFileServices {
   sourceFile: JsonSourceFile;
 }
+/** @deprecated Use the new `momoa` based language exported from `@flint.fyi/json-language/new` instead */
 declare const jsonLanguage: Language<JsonNodeVisitors, JsonFileServices>;
 //#endregion
-export { JsonFileServices, jsonLanguage };
+export { jsonLanguage };
 //# sourceMappingURL=language.d.ts.map

package/lib/language.js

@@ -1,7 +1,8 @@
-import { createLanguage } from "@flint.fyi/core";
 import * as ts from "typescript";
+import { createLanguage } from "@flint.fyi/core";
 //#region src/language.ts
 const kindOverrides = new Map([[ts.SyntaxKind.SourceFile, "JsonSourceFile"]]);
+/** @deprecated Use the new `momoa` based language exported from `@flint.fyi/json-language/new` instead */
 const jsonLanguage = createLanguage({
 	about: { name: "JSON" },
 	createFileFactory: () => {

package/lib/new/getJsonNodeRange.d.ts

@@ -0,0 +1,8 @@
+import { CharacterReportRange } from "@flint.fyi/core";
+import { AnyNode } from "@humanwhocodes/momoa";
+
+//#region src/new/getJsonNodeRange.d.ts
+declare function getJsonNodeRange(node: AnyNode): CharacterReportRange;
+//#endregion
+export { getJsonNodeRange };
+//# sourceMappingURL=getJsonNodeRange.d.ts.map

package/lib/new/getJsonNodeRange.js

@@ -0,0 +1,11 @@
+//#region src/new/getJsonNodeRange.ts
+function getJsonNodeRange(node) {
+	return {
+		begin: node.range[0],
+		end: node.range[1]
+	};
+}
+//#endregion
+export { getJsonNodeRange };
+
+//# sourceMappingURL=getJsonNodeRange.js.map

package/lib/new/getNodeText.d.ts

@@ -0,0 +1,7 @@
+import { ValueNode } from "@humanwhocodes/momoa";
+
+//#region src/new/getNodeText.d.ts
+declare function getNodeText(node: ValueNode, sourceText: string): string;
+//#endregion
+export { getNodeText };
+//# sourceMappingURL=getNodeText.d.ts.map

package/lib/new/getNodeText.js

@@ -0,0 +1,8 @@
+//#region src/new/getNodeText.ts
+function getNodeText(node, sourceText) {
+	return sourceText.slice(node.range[0], node.range[1]);
+}
+//#endregion
+export { getNodeText };
+
+//# sourceMappingURL=getNodeText.js.map

package/lib/new/index.d.ts

@@ -0,0 +1,5 @@
+import { getJsonNodeRange } from "./getJsonNodeRange.js";
+import { getNodeText } from "./getNodeText.js";
+import { JsonVisitorKey } from "./nodes.js";
+import { jsonLanguage } from "./language.js";
+export { type JsonVisitorKey, getJsonNodeRange, getNodeText, jsonLanguage };

package/lib/new/index.js

@@ -0,0 +1,4 @@
+import { getJsonNodeRange } from "./getJsonNodeRange.js";
+import { getNodeText } from "./getNodeText.js";
+import { jsonLanguage } from "./language.js";
+export { getJsonNodeRange, getNodeText, jsonLanguage };

package/lib/new/language.d.ts

@@ -0,0 +1,13 @@
+import { JsonNodeVisitors } from "./nodes.js";
+import { Language } from "@flint.fyi/core";
+import { DocumentNode } from "@humanwhocodes/momoa";
+
+//#region src/new/language.d.ts
+interface JsonFileServices {
+  root: DocumentNode;
+  sourceText: string;
+}
+declare const jsonLanguage: Language<JsonNodeVisitors, JsonFileServices>;
+//#endregion
+export { jsonLanguage };
+//# sourceMappingURL=language.d.ts.map

package/lib/new/language.js

@@ -0,0 +1,36 @@
+import { createLanguage } from "@flint.fyi/core";
+import { parse, traverse } from "@humanwhocodes/momoa";
+//#region src/new/language.ts
+const jsonLanguage = createLanguage({
+	about: { name: "JSON" },
+	createFileFactory: () => {
+		return { createFile: (data) => {
+			return {
+				about: data,
+				services: {
+					root: parse(data.sourceText, {
+						mode: "json",
+						ranges: true
+					}),
+					sourceText: data.sourceText
+				}
+			};
+		} };
+	},
+	runFileVisitors: (file, options, runtime) => {
+		if (!runtime.visitors) return;
+		const { visitors } = runtime;
+		const visitorServices = {
+			options,
+			...file.services
+		};
+		traverse(file.services.root, {
+			enter: (node) => visitors[node.type]?.(node, visitorServices),
+			exit: (node) => visitors[`${node.type}:exit`]?.(node, visitorServices)
+		});
+	}
+});
+//#endregion
+export { jsonLanguage };
+
+//# sourceMappingURL=language.js.map

package/lib/new/nodes.d.ts

@@ -0,0 +1,10 @@
+import { WithExitKeys } from "@flint.fyi/core";
+import { AnyNode } from "@humanwhocodes/momoa";
+
+//#region src/new/nodes.d.ts
+type JsonNodesByName = { [Node in AnyNode as Node["type"]]: Node };
+type JsonNodeVisitors = WithExitKeys<JsonNodesByName>;
+type JsonVisitorKey = AnyNode["type"];
+//#endregion
+export { JsonNodeVisitors, JsonVisitorKey };
+//# sourceMappingURL=nodes.d.ts.map

package/lib/nodes.d.ts

@@ -1,5 +1,5 @@
-import { WithExitKeys } from "@flint.fyi/core";
 import * as ts from "typescript";
+import { WithExitKeys } from "@flint.fyi/core";
 import { AST } from "@flint.fyi/typescript-language";
 
 //#region src/nodes.d.ts
@@ -12,12 +12,14 @@ type JsonNodeName = keyof JsonNodesByName;
 interface JsonNodesByName {
   ArrayLiteralExpression: AST.ArrayLiteralExpression;
   BooleanLiteral: AST.BooleanLiteral;
+  JsonExpression: AST.Expression;
   JsonMinusNumericLiteral: JsonMinusNumericLiteral;
   JsonObjectExpressionStatement: JsonObjectExpressionStatement;
   JsonSourceFile: JsonSourceFile;
   NullLiteral: AST.NullLiteral;
   NumericLiteral: AST.NumericLiteral;
   ObjectLiteralExpression: AST.ObjectLiteralExpression;
+  PropertyAssignment: AST.PropertyAssignment;
   StringLiteral: AST.StringLiteral;
 }
 type JsonNodeVisitors = WithExitKeys<JsonNodesByName>;
@@ -29,5 +31,5 @@ type JsonSourceFile = Omit<AST.SourceFile, "statements"> & {
   readonly statements: ts.NodeArray<JsonObjectExpressionStatement>;
 };
 //#endregion
-export { JsonMinusNumericLiteral, JsonNode, JsonNodeName, JsonNodeVisitors, JsonNodesByName, JsonObjectExpression, JsonObjectExpressionStatement, JsonSourceFile };
+export { JsonNode, JsonNodeVisitors, JsonSourceFile };
 //# sourceMappingURL=nodes.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flint.fyi/json-language",
-  "version": "0.16.3",
+  "version": "0.17.0",
   "description": "[Experimental] JSON language for Flint.",
   "homepage": "https://flint.fyi",
   "repository": {
@@ -16,16 +16,18 @@
   "sideEffects": false,
   "type": "module",
   "exports": {
-    ".": "./lib/index.js"
+    ".": "./lib/index.js",
+    "./new": "./lib/new/index.js"
   },
   "files": [
     "lib/",
     "!lib/**/*.map"
   ],
   "dependencies": {
+    "@humanwhocodes/momoa": "^3.3.10",
     "typescript": "^5.9.0 || ^6.0.0",
-    "@flint.fyi/core": "^0.22.0",
-    "@flint.fyi/typescript-language": "^0.18.2"
+    "@flint.fyi/core": "^0.23.0",
+    "@flint.fyi/typescript-language": "^0.18.3"
   },
   "devDependencies": {
     "tsdown": "0.21.0",