🎨 export non-dumping json parser

SpyglassMC · May 14, 2024 · 41b5c8b · 41b5c8b
1 parent 74a6855
commit 41b5c8b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/packages/java-edition/src/mcfunction/parser/argument.ts b/packages/java-edition/src/mcfunction/parser/argument.ts
@@ -337,7 +337,7 @@ function block(isPredicate: boolean): core.InfallibleParser<BlockNode> {
 const blockState: core.InfallibleParser<BlockNode> = block(false)
 export const blockPredicate: core.InfallibleParser<BlockNode> = block(true)
 
-export const component = json.parser.json()
+export const component = json.parser.json
 
 function double(
 	min = DoubleMin,

diff --git a/packages/json/src/parser/array.ts b/packages/json/src/parser/array.ts
@@ -5,7 +5,7 @@ import { json } from './entry.js'
 export const array: core.Parser<JsonArrayNode> = (src, ctx) => {
 	const parser = core.list({
 		start: '[',
-		value: json(),
+		value: json,
 		sep: ',',
 		trailingSep: false,
 		end: ']',

diff --git a/packages/json/src/parser/entry.ts b/packages/json/src/parser/entry.ts
@@ -20,7 +20,7 @@ const LegalNumberStart = new Set([
 	'9',
 	'-',
 ])
-export function json(dumpErrors = false): core.Parser<JsonNode> {
+function jsonParser(dumpErrors: boolean): core.Parser<JsonNode> {
 	return (src, ctx) => {
 		const result = core.select([
 			{ predicate: (src) => src.tryPeek('['), parser: array },
@@ -44,4 +44,19 @@ export function json(dumpErrors = false): core.Parser<JsonNode> {
 	}
 }
 
-export const entry: core.Parser<JsonNode> = json(true)
+/**
+ * A JSON parser that dumps any parser errors after it finishes parsing.
+ * This should be used when it is the root parser, e.g. for this package's
+ * initialization method (the JSON package).
+ */
+export const entry = jsonParser(true)
+
+/**
+ * A JSON parser that doesn't dump parser errors after it finishes parsing.
+ * This should be used when it is a child parser under another parent parser,
+ * e.g. in the JSON `array` parser.
+ *
+ * Since this parser doesn't dump its errors when it's done, those errors
+ * should be subsequently absorbed by the parent parser's `ParserContext`.
+ */
+export const json = jsonParser(false)
diff --git a/packages/json/src/parser/object.ts b/packages/json/src/parser/object.ts
@@ -11,7 +11,7 @@ export const object: core.InfallibleParser<JsonObjectNode> = (src, ctx) => {
 			pair: {
 				key: string,
 				sep: ':',
-				value: json(),
+				value: json,
 				end: ',',
 				trailingEnd: false,
 			},