@spyglassmc/json 0.3.2 → 0.3.3

package/lib/checker/JsonChecker.d.ts

@@ -4,5 +4,5 @@ export interface JsonCheckerContext extends CheckerContext {
     context: string;
     depth?: number;
 }
-export declare type JsonChecker = (node: JsonNode, ctx: JsonCheckerContext) => void;
+export type JsonChecker = (node: JsonNode, ctx: JsonCheckerContext) => void;
 //# sourceMappingURL=JsonChecker.d.ts.map

package/lib/checker/primitives/list.d.ts

@@ -1,7 +1,7 @@
 import type { JsonNode } from '../../node/index.js';
 import type { JsonChecker, JsonCheckerContext } from '../JsonChecker.js';
 export declare function listOf(checker: JsonChecker): JsonChecker;
-declare type UniqueListOptions = {
+type UniqueListOptions = {
     items?: (node: JsonNode) => [string | undefined, JsonNode];
     report?: (node: JsonNode, ctx: JsonCheckerContext) => unknown;
 };

package/lib/checker/primitives/object.d.ts

@@ -1,19 +1,19 @@
 import type { PairNode } from '@spyglassmc/core';
 import type { JsonNode, JsonStringNode } from '../../node/index.js';
 import type { JsonChecker, JsonCheckerContext } from '../JsonChecker.js';
-declare type JsonValue = string | number | boolean | null | JsonValue[] | {
+type JsonValue = string | number | boolean | null | JsonValue[] | {
     [key: string]: JsonValue;
 };
-declare type ComplexProperty = {
+type ComplexProperty = {
     checker: JsonChecker;
     opt?: boolean;
     def?: JsonValue;
     deprecated?: boolean;
     context?: string;
 };
-declare type CheckerProperty = JsonChecker | ComplexProperty;
-declare type CheckerRecord = Record<string, CheckerProperty | undefined>;
-declare type ObjectCheckerOptions = {
+type CheckerProperty = JsonChecker | ComplexProperty;
+type CheckerRecord = Record<string, CheckerProperty | undefined>;
+type ObjectCheckerOptions = {
     allowUnknownProperties?: boolean;
 };
 export declare function object(): JsonChecker;

package/lib/checker/primitives/object.js

@@ -13,7 +13,8 @@ export function object(keys, values, options = {}) {
                 const fields = keys
                     .map((key) => [key, values(key, ctx)])
                     .filter(([_, v]) => v !== undefined);
-                node.expectation[0].fields = fields.map(([key, prop]) => {
+                node.expectation[0].fields = fields
+                    .map(([key, prop]) => {
                     return {
                         key,
                         value: expectation(isComplex(prop) ? prop.checker : prop, ctx),
@@ -77,9 +78,10 @@ export function object(keys, values, options = {}) {
                 const typedoc = propNode.expectation
                     ?.map((e) => e.typedoc)
                     .join(' | ');
-                prop.key.hover = `\`\`\`typescript\n${context}.${key}: ${typedoc}\n\`\`\`${doc || defaultValue !== undefined ? '\n******\n ' : ''}${doc}${defaultValue !== undefined
-                    ? `\n\`@default\` ${JSON.stringify(defaultValue)}`
-                    : ''}`;
+                prop.key.hover =
+                    `\`\`\`typescript\n${context}.${key}: ${typedoc}\n\`\`\`${doc || defaultValue !== undefined ? '\n******\n ' : ''}${doc}${defaultValue !== undefined
+                        ? `\n\`@default\` ${JSON.stringify(defaultValue)}`
+                        : ''}`;
             });
         }
         else if (typeof keys === 'function' && values) {
@@ -172,7 +174,8 @@ export function extractNested(wrap, value, children) {
     const wrapper = children?.find((p) => p.key?.value === wrap);
     if (wrapper?.value?.type !== 'json:object')
         return undefined;
-    const node = wrapper.children?.find((p) => p.key?.value === value);
+    const node = wrapper.children?.find((p) => p.key?.value ===
+        value);
     return node?.type === 'json:string' ? node.value : undefined;
 }
 export function extractStringArray(value, children) {

package/lib/checker/primitives/util.d.ts

@@ -3,7 +3,7 @@ import type { JsonExpectation, JsonNode } from '../../node/index.js';
 import type { JsonChecker, JsonCheckerContext } from '../JsonChecker.js';
 export declare function ref(checker: () => JsonChecker): JsonChecker;
 export declare function as(context: string, checker: JsonChecker): JsonChecker;
-export declare type AttemptResult = {
+export type AttemptResult = {
     totalErrorSpan: number;
     maxSeverity: ErrorSeverity;
     expectation?: JsonExpectation[];

package/lib/checker/primitives/util.js

@@ -41,7 +41,8 @@ export function any(checkers = []) {
         }
         const attempts = checkers
             .map((checker) => attempt(checker, node, ctx))
-            .sort((a, b) => a.maxSeverity - b.maxSeverity || a.totalErrorSpan - b.totalErrorSpan);
+            .sort((a, b) => a.maxSeverity - b.maxSeverity ||
+            a.totalErrorSpan - b.totalErrorSpan);
         const sameTypeAttempts = attempts.filter((a) => a.expectation?.map((e) => e.type).includes(node.type));
         const allExpectations = attempts
             .filter((a) => a.expectation)

package/lib/node/JsonAstNode.d.ts

@@ -1,7 +1,7 @@
 import type { DeepReadonly, ItemNode, PairNode } from '@spyglassmc/core';
 import * as core from '@spyglassmc/core';
-export declare type JsonNode = JsonObjectNode | JsonArrayNode | JsonStringNode | JsonNumberNode | JsonBooleanNode | JsonNullNode;
-export declare type JsonRelatedNode = JsonNode | JsonPairNode | JsonItemNode;
+export type JsonNode = JsonObjectNode | JsonArrayNode | JsonStringNode | JsonNumberNode | JsonBooleanNode | JsonNullNode;
+export type JsonRelatedNode = JsonNode | JsonPairNode | JsonItemNode;
 export declare namespace JsonNode {
     function is(node: core.AstNode): node is JsonNode;
     function isRelated(node: core.AstNode): node is JsonRelatedNode;
@@ -9,7 +9,7 @@ export declare namespace JsonNode {
 interface JsonBaseAstNode {
     expectation?: JsonExpectation[];
 }
-export declare type JsonExpectation = JsonObjectExpectation | JsonArrayExpectation | JsonStringExpectation | JsonNumberExpectation | JsonBooleanExpectation;
+export type JsonExpectation = JsonObjectExpectation | JsonArrayExpectation | JsonStringExpectation | JsonNumberExpectation | JsonBooleanExpectation;
 export declare namespace JsonExpectation {
     function isArray(e: DeepReadonly<JsonExpectation>): e is DeepReadonly<JsonArrayExpectation>;
     function isObject(e: DeepReadonly<JsonExpectation>): e is DeepReadonly<JsonObjectExpectation>;
@@ -35,7 +35,7 @@ export declare namespace JsonObjectNode {
     function is(obj: object | undefined): obj is JsonObjectNode;
     function mock(range: core.RangeLike): JsonObjectNode;
 }
-export declare type JsonPairNode = PairNode<JsonStringNode, JsonNode>;
+export type JsonPairNode = PairNode<JsonStringNode, JsonNode>;
 export declare namespace JsonPairNode {
     function is(obj: object): obj is JsonPairNode;
 }
@@ -50,7 +50,7 @@ export declare namespace JsonArrayNode {
     function is(obj: object | undefined): obj is JsonArrayNode;
     function mock(range: core.RangeLike): JsonArrayNode;
 }
-export declare type JsonItemNode = ItemNode<JsonNode>;
+export type JsonItemNode = ItemNode<JsonNode>;
 export declare namespace JsonItemNode {
     function is(obj: object): obj is JsonItemNode;
 }

package/lib/parser/entry.js

@@ -27,7 +27,10 @@ export function json(dumpErrors = false) {
                 parser: boolean,
             },
             { predicate: (src) => src.tryPeek('null'), parser: null_ },
-            { predicate: (src) => LegalNumberStart.has(src.peek()), parser: number },
+            {
+                predicate: (src) => LegalNumberStart.has(src.peek()),
+                parser: number,
+            },
             { predicate: (src) => src.tryPeek('{'), parser: object },
             { parser: string },
         ])(src, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/json",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "url": "https://github.com/SpyglassMC/Spyglass/issues"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.4.1",
-    "@spyglassmc/locales": "0.3.1"
+    "@spyglassmc/core": "0.4.2",
+    "@spyglassmc/locales": "0.3.2"
   }
 }