@flint.fyi/json-language 0.17.0 → 0.18.0

package/lib/getNodeRange.d.ts

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

package/lib/getNodeRange.js

@@ -0,0 +1,9 @@
+//#region src/getNodeRange.ts
+function getNodeRange(node) {
+	return {
+		begin: node.range[0],
+		end: node.range[1]
+	};
+}
+//#endregion
+export { getNodeRange };

package/lib/{new/getNodeText.d.ts → getNodeText.d.ts}

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

package/lib/{new/getNodeText.js → getNodeText.js}

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

package/lib/index.d.ts

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

package/lib/index.js

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

package/lib/language.d.ts

@@ -1,12 +1,12 @@
-import { JsonNodeVisitors, JsonSourceFile } from "./nodes.js";
+import { JsonNodeVisitors } from "./nodes.js";
+import { DocumentNode } from "@humanwhocodes/momoa";
 import { Language } from "@flint.fyi/core";
 
 //#region src/language.d.ts
 interface JsonFileServices {
-  sourceFile: JsonSourceFile;
+  root: DocumentNode;
+  sourceText: string;
 }
-/** @deprecated Use the new `momoa` based language exported from `@flint.fyi/json-language/new` instead */
 declare const jsonLanguage: Language<JsonNodeVisitors, JsonFileServices>;
 //#endregion
-export { jsonLanguage };
-//# sourceMappingURL=language.d.ts.map
+export { jsonLanguage };

package/lib/language.js

@@ -1,15 +1,19 @@
-import * as ts from "typescript";
+import { parse, traverse } from "@humanwhocodes/momoa";
 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: () => {
 		return { createFile: (data) => {
 			return {
 				about: data,
-				services: { sourceFile: ts.parseJsonText(data.filePathAbsolute, data.sourceText) }
+				services: {
+					root: parse(data.sourceText, {
+						mode: "json",
+						ranges: true
+					}),
+					sourceText: data.sourceText
+				}
 			};
 		} };
 	},
@@ -20,16 +24,11 @@ const jsonLanguage = createLanguage({
 			options,
 			...file.services
 		};
-		const visit = (node) => {
-			const key = kindOverrides.get(node.kind) ?? ts.SyntaxKind[node.kind];
-			visitors[key]?.(node, visitorServices);
-			node.forEachChild(visit);
-			visitors[`${key}:exit`]?.(node, visitorServices);
-		};
-		visit(file.services.sourceFile);
+		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/nodes.d.ts

@@ -1,35 +1,9 @@
-import * as ts from "typescript";
+import { AnyNode } from "@humanwhocodes/momoa";
 import { WithExitKeys } from "@flint.fyi/core";
-import { AST } from "@flint.fyi/typescript-language";
 
 //#region src/nodes.d.ts
-type JsonMinusNumericLiteral = Omit<AST.PrefixUnaryExpression, "operand" | "operator"> & {
-  readonly operand: AST.NumericLiteral;
-  readonly operator: ts.SyntaxKind.MinusToken;
-};
-type JsonNode = JsonNodesByName[JsonNodeName];
-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 JsonNodesByName = { [Node in AnyNode as Node["type"]]: Node };
 type JsonNodeVisitors = WithExitKeys<JsonNodesByName>;
-type JsonObjectExpression = AST.ArrayLiteralExpression | AST.BooleanLiteral | AST.NullLiteral | AST.NumericLiteral | AST.ObjectLiteralExpression | AST.StringLiteral | JsonMinusNumericLiteral;
-type JsonObjectExpressionStatement = Omit<AST.ExpressionStatement, "expression"> & {
-  readonly expression: JsonObjectExpression;
-};
-type JsonSourceFile = Omit<AST.SourceFile, "statements"> & {
-  readonly statements: ts.NodeArray<JsonObjectExpressionStatement>;
-};
+type JsonVisitorKey = AnyNode["type"];
 //#endregion
-export { JsonNode, JsonNodeVisitors, JsonSourceFile };
-//# sourceMappingURL=nodes.d.ts.map
+export { JsonNodeVisitors, JsonVisitorKey };

package/package.json

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

package/lib/getJsonNodeRange.d.ts

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

package/lib/getJsonNodeRange.js

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

package/lib/new/getJsonNodeRange.d.ts

@@ -1,8 +0,0 @@
-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

@@ -1,11 +0,0 @@
-//#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/index.d.ts

@@ -1,5 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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