@flint.fyi/json-language 0.16.1 → 0.16.3

package/lib/getJsonNodeRange.d.ts

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

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

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

package/lib/index.js

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

package/lib/language.d.ts

@@ -1,22 +1,11 @@
-import { JsonNodesByName } from "./nodes.js";
-import * as _flint_fyi_core0 from "@flint.fyi/core";
-import * as ts from "typescript";
+import { JsonNodeVisitors, JsonSourceFile } from "./nodes.js";
+import { Language } from "@flint.fyi/core";
 
 //#region src/language.d.ts
 interface JsonFileServices {
-  sourceFile: ts.JsonSourceFile;
+  sourceFile: JsonSourceFile;
 }
-declare const jsonLanguage: _flint_fyi_core0.Language<_flint_fyi_core0.Simplify<JsonNodesByName & {
-  "ArrayLiteralExpression:exit"?: ts.ArrayLiteralExpression;
-  "BooleanLiteral:exit"?: ts.BooleanLiteral;
-  "JsonMinusNumericLiteral:exit"?: ts.JsonMinusNumericLiteral;
-  "JsonObjectExpressionStatement:exit"?: ts.JsonObjectExpressionStatement;
-  "JsonSourceFile:exit"?: ts.JsonSourceFile;
-  "NullLiteral:exit"?: ts.NullLiteral;
-  "NumericLiteral:exit"?: ts.NumericLiteral;
-  "ObjectLiteralExpression:exit"?: ts.ObjectLiteralExpression;
-  "StringLiteral:exit"?: ts.StringLiteral;
-}>, JsonFileServices>;
+declare const jsonLanguage: Language<JsonNodeVisitors, JsonFileServices>;
 //#endregion
 export { JsonFileServices, jsonLanguage };
 //# sourceMappingURL=language.d.ts.map

package/lib/language.js

@@ -1,7 +1,7 @@
 import { createLanguage } from "@flint.fyi/core";
 import * as ts from "typescript";
-
 //#region src/language.ts
+const kindOverrides = new Map([[ts.SyntaxKind.SourceFile, "JsonSourceFile"]]);
 const jsonLanguage = createLanguage({
 	about: { name: "JSON" },
 	createFileFactory: () => {
@@ -20,7 +20,7 @@ const jsonLanguage = createLanguage({
 			...file.services
 		};
 		const visit = (node) => {
-			const key = ts.SyntaxKind[node.kind];
+			const key = kindOverrides.get(node.kind) ?? ts.SyntaxKind[node.kind];
 			visitors[key]?.(node, visitorServices);
 			node.forEachChild(visit);
 			visitors[`${key}:exit`]?.(node, visitorServices);
@@ -28,7 +28,7 @@ const jsonLanguage = createLanguage({
 		visit(file.services.sourceFile);
 	}
 });
-
 //#endregion
 export { jsonLanguage };
+
 //# sourceMappingURL=language.js.map

package/lib/nodes.d.ts

@@ -1,19 +1,33 @@
 import { WithExitKeys } from "@flint.fyi/core";
 import * as ts from "typescript";
+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: ts.ArrayLiteralExpression;
-  BooleanLiteral: ts.BooleanLiteral;
-  JsonMinusNumericLiteral: ts.JsonMinusNumericLiteral;
-  JsonObjectExpressionStatement: ts.JsonObjectExpressionStatement;
-  JsonSourceFile: ts.JsonSourceFile;
-  NullLiteral: ts.NullLiteral;
-  NumericLiteral: ts.NumericLiteral;
-  ObjectLiteralExpression: ts.ObjectLiteralExpression;
-  StringLiteral: ts.StringLiteral;
+  ArrayLiteralExpression: AST.ArrayLiteralExpression;
+  BooleanLiteral: AST.BooleanLiteral;
+  JsonMinusNumericLiteral: JsonMinusNumericLiteral;
+  JsonObjectExpressionStatement: JsonObjectExpressionStatement;
+  JsonSourceFile: JsonSourceFile;
+  NullLiteral: AST.NullLiteral;
+  NumericLiteral: AST.NumericLiteral;
+  ObjectLiteralExpression: AST.ObjectLiteralExpression;
+  StringLiteral: AST.StringLiteral;
 }
 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>;
+};
 //#endregion
-export { JsonNodeVisitors, JsonNodesByName };
+export { JsonMinusNumericLiteral, JsonNode, JsonNodeName, JsonNodeVisitors, JsonNodesByName, JsonObjectExpression, JsonObjectExpressionStatement, JsonSourceFile };
 //# sourceMappingURL=nodes.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flint.fyi/json-language",
-  "version": "0.16.1",
+  "version": "0.16.3",
   "description": "[Experimental] JSON language for Flint.",
   "homepage": "https://flint.fyi",
   "repository": {
@@ -10,8 +10,8 @@
   },
   "license": "MIT",
   "author": {
-    "name": "JoshuaKGoldberg",
-    "email": "npm@joshuakgoldberg.com"
+    "name": "Flint Team",
+    "url": "https://flint.fyi/team"
   },
   "sideEffects": false,
   "type": "module",
@@ -24,11 +24,12 @@
   ],
   "dependencies": {
     "typescript": "^5.9.0 || ^6.0.0",
-    "@flint.fyi/core": "^0.20.0"
+    "@flint.fyi/core": "^0.22.0",
+    "@flint.fyi/typescript-language": "^0.18.2"
   },
   "devDependencies": {
-    "tsdown": "0.20.1",
-    "vitest": "4.0.15"
+    "tsdown": "0.21.0",
+    "vitest": "4.1.0"
   },
   "engines": {
     "node": ">=24.0.0"
@@ -37,6 +38,6 @@
     "access": "public"
   },
   "scripts": {
-    "test": "vitest --typecheck --project json-language"
+    "test": "vitest --project json-language"
   }
 }