grammar-composer 0.2.4 → 0.3.1

package/dist/{test-grammars → tests/test-grammars}/RegExpGrammar.js

@@ -1,8 +1,8 @@
-import * as G from '../GrammarComposer.js';
+import * as G from '../../exports/Exports.js';
 import * as R from 'regexp-composer';
 export class RegExpGrammar {
     //////////////////////////////////////////////////////////////////////////////////////////////
-    // High level productions
+    // High-level productions
     //////////////////////////////////////////////////////////////////////////////////////////////
     disjunction = () => [
         this.sequence,
@@ -11,7 +11,7 @@ export class RegExpGrammar {
             this.disjunction,
         ])
     ];
-    sequence = () => G.oneOrMore(this.element);
+    sequence = () => G.zeroOrMore(this.element);
     element = () => G.anyOf(this.anchor, this.lookaround, this.possiblyQuantifiedExpression);
     //////////////////////////////////////////////////////////////////////////////////////////////
     // Quantifed expressions
@@ -38,13 +38,13 @@ export class RegExpGrammar {
     //////////////////////////////////////////////////////////////////////////////////////////////
     group = () => G.anyOf(this.uncapturedGroup, this.namedCaptureGroup, this.unnamedCaptureGroup);
     uncapturedGroup = () => [
-        '(:',
+        '(?:',
         this.disjunction,
         ')',
     ];
     namedCaptureGroup = () => [
         '(?<',
-        G.pattern(R.captureAs('name', R.oneOrMore(letter))),
+        G.pattern(R.captureAs('name', R.oneOrMore(identifierChar))),
         '>',
         this.disjunction,
         ')',
@@ -63,7 +63,7 @@ export class RegExpGrammar {
     ]);
     namedBackreference = () => G.pattern([
         '\\k<',
-        R.captureAs('name', digit),
+        R.captureAs('name', R.oneOrMore(identifierChar)),
         '>',
     ]);
     backReference = G.anyOf(this.unnamedBackreference, this.namedBackreference);
@@ -94,7 +94,7 @@ export class RegExpGrammar {
     //////////////////////////////////////////////////////////////////////////////////////////////
     // Single character expressions
     //////////////////////////////////////////////////////////////////////////////////////////////
-    singleCharExpression = () => G.anyOf(this.anyCharWildcard, this.charClass, this.unicodeProperty, this.notUnicodeProperty, this.charcodeOrEscapedChar, this.unreservedCharLiteral);
+    singleCharExpression = () => G.anyOf(this.anyCharWildcard, this.charClass, this.unicodeProperty, this.notUnicodeProperty, this.escapedCharacterClass, this.charcodeOrEscapedChar, this.unreservedCharLiteral);
     unreservedCharLiteral = () => G.pattern(R.notAnyOfChars('[', '.', '*', '+', '?', '^', '$', '{', '}', '(', ')', '|', ']', '\\'));
     escapedCharLiteral = () => G.pattern([
         '\\',
@@ -107,14 +107,21 @@ export class RegExpGrammar {
     ]);
     controlCharcode = () => G.pattern([
         '\\c',
-        R.charRange('A', 'Z'),
+        R.anyOf(R.charRange('A', 'Z'), R.charRange('a', 'z')),
     ]);
-    codepoint = () => G.pattern([
+    nullCharcode = () => G.pattern('\\0');
+    codepoint = () => G.anyOf(G.pattern([
         '\\u',
         '{',
-        R.captureAs('value', R.oneOrMore(hexDigit)),
+        R.captureAs('value', R.repeated([1, 6], hexDigit)),
         '}',
-    ]);
+    ]), G.pattern([
+        '\\u',
+        hexDigit,
+        hexDigit,
+        hexDigit,
+        hexDigit
+    ]));
     codepointRange = () => G.pattern([
         '\\u',
         '{',
@@ -133,10 +140,10 @@ export class RegExpGrammar {
     ]);
     unicodePropertyBodyPattern = [
         '{',
-        R.captureAs('property', R.oneOrMore(letterOrDigit)),
+        R.captureAs('property', R.oneOrMore(R.anyOf(letter, digit, '_', '-'))),
         R.possibly([
             '=',
-            R.captureAs('value', R.oneOrMore(letterOrDigit)),
+            R.captureAs('value', R.oneOrMore(R.anyOf(letter, digit, '_', '-'))),
         ]),
         '}',
     ];
@@ -144,11 +151,11 @@ export class RegExpGrammar {
     charClass = () => [
         '[',
         G.possibly(this.charClassNegator),
-        G.oneOrMore(G.anyOf(this.charRange, this.codepointRange, this.charClass, this.unicodeProperty, this.notUnicodeProperty, this.charcodeOrEscapedChar, this.charClassChar)),
+        G.oneOrMore(G.anyOf(this.charRange, this.codepointRange, this.unicodeProperty, this.notUnicodeProperty, this.escapedCharacterClass, this.charcodeOrEscapedChar, this.charClassChar)),
         ']',
     ];
     charcodeOrEscapedChar = G.anyOf(this.codepoint, this.hexCharcode, this.controlCharcode, this.escapedCharLiteral);
-    charRangeElement = G.anyOf(this.charcodeOrEscapedChar, G.pattern(R.anyChar));
+    charRangeElement = G.anyOf(this.charcodeOrEscapedChar, G.pattern(R.notAnyOfChars(']')));
     charRange = () => [
         this.charRangeElement,
         '-',
@@ -166,19 +173,19 @@ export class RegExpGrammar {
     anyCharWildcard = () => '.';
     disjunctionSeparator = () => '|';
     anchor = G.anyOf(this.inputStartAnchor, this.inputEndAnchor);
-    escapedCharacterClass = () => G.pattern(R.anyOf(R.captureAs('whitespace', escapedCharString.whitespace), R.captureAs('nonWhitespace', escapedCharString.nonWhitespace), R.captureAs('digit', escapedCharString.digit), R.captureAs('nonDigit', escapedCharString.nonDigit), R.captureAs('wordBoundary', escapedCharString.wordBoundary), R.captureAs('nonWordBoundary', escapedCharString.nonWordBoundary), R.captureAs('formFeed', escapedCharString.formFeed), R.captureAs('carriageReturn', escapedCharString.carriageReturn), R.captureAs('lineFeed', escapedCharString.lineFeed), R.captureAs('tab', escapedCharString.tab), R.captureAs('verticalTab', escapedCharString.verticalTab), R.captureAs('backwardSlash', escapedCharString.backwardSlash)));
+    escapedCharacterClass = () => G.pattern(R.anyOf(R.captureAs('whitespace', escapedCharString.whitespace), R.captureAs('nonWhitespace', escapedCharString.nonWhitespace), R.captureAs('digit', escapedCharString.digit), R.captureAs('nonDigit', escapedCharString.nonDigit), R.captureAs('word', escapedCharString.word), R.captureAs('nonWord', escapedCharString.nonWord), R.captureAs('wordBoundary', escapedCharString.wordBoundary), R.captureAs('nonWordBoundary', escapedCharString.nonWordBoundary), R.captureAs('formFeed', escapedCharString.formFeed), R.captureAs('carriageReturn', escapedCharString.carriageReturn), R.captureAs('lineFeed', escapedCharString.lineFeed), R.captureAs('tab', escapedCharString.tab), R.captureAs('verticalTab', escapedCharString.verticalTab), R.captureAs('backwardSlash', escapedCharString.backwardSlash)));
 }
 const digit = R.charRange('0', '9');
 const letter = R.anyOf(R.charRange('a', 'z'), R.charRange('A', 'Z'));
-const letterOrDigit = R.anyOf(letter, digit);
 const hexDigit = R.anyOf(digit, R.charRange('a', 'f'), R.charRange('A', 'F'));
+const identifierChar = R.anyOf(letter, digit, '_', '$');
 const escapedCharString = {
     whitespace: '\\s',
     nonWhitespace: '\\S',
     digit: '\\d',
     nonDigit: '\\D',
-    word: '\\d',
-    nonWord: '\\D',
+    word: '\\w',
+    nonWord: '\\W',
     wordBoundary: '\\b',
     nonWordBoundary: '\\B',
     formFeed: '\\f',

package/dist/tests/test-grammars/RegExpGrammar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RegExpGrammar.js","sourceRoot":"","sources":["../../../src/tests/test-grammars/RegExpGrammar.ts"],"names":[],"mappings":"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"}

package/dist/{test-grammars → tests/test-grammars}/XmlGrammar.d.ts

@@ -1,4 +1,4 @@
-import * as G from "../GrammarComposer.js";
+import * as G from '../../exports/Exports.js';
 export declare class XmlGrammar {
     document: () => G.Repetition[];
     textFragment: G.PatternTerminal;
@@ -12,3 +12,4 @@ export declare class XmlGrammar {
     declarationTagAttribute: G.PatternTerminal;
     comment: G.PatternTerminal;
 }
+//# sourceMappingURL=XmlGrammar.d.ts.map

package/dist/tests/test-grammars/XmlGrammar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"XmlGrammar.d.ts","sourceRoot":"","sources":["../../../src/tests/test-grammars/XmlGrammar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,0BAA0B,CAAA;AAG7C,qBAAa,UAAU;IACtB,QAAQ,uBAUP;IAED,YAAY,oBAEV;IAEF,UAAU,6CAMT;IAED,eAAe,oBAUb;IAEF,MAAM,oBAMJ;IAEF,SAAS,oBAkBP;IAEF,UAAU,oBAYR;IAEF,cAAc,6CAMb;IAED,qBAAqB,oBAQnB;IAEF,uBAAuB,oBAYrB;IAEF,OAAO,oBAQL;CACF"}

package/dist/{test-grammars → tests/test-grammars}/XmlGrammar.js

@@ -1,4 +1,4 @@
-import * as G from "../GrammarComposer.js";
+import * as G from '../../exports/Exports.js';
 import * as R from 'regexp-composer';
 export class XmlGrammar {
     document = () => [

package/dist/tests/test-grammars/XmlGrammar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"XmlGrammar.js","sourceRoot":"","sources":["../../../src/tests/test-grammars/XmlGrammar.ts"],"names":[],"mappings":"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"}

package/dist/utilities/Timer.d.ts

@@ -11,3 +11,4 @@ export declare class Timer {
     private static createGlobalTimestampFunction;
     private static timestampFunc;
 }
+//# sourceMappingURL=Timer.d.ts.map

package/dist/utilities/Timer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Timer.d.ts","sourceRoot":"","sources":["../../src/utilities/Timer.ts"],"names":[],"mappings":"AAKA,qBAAa,KAAK;IACjB,SAAS,SAAI;IAEb,cAEC;IAED,OAAO,SAEN;IAED,IAAI,WAAW,IAAI,MAAM,CAGxB;IAED,IAAI,kBAAkB,IAAI,MAAM,CAG/B;IAED,wBAAwB,IAAI,MAAM,CAKjC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,SAAI,GAAG,MAAM,CAYtD;IAED,MAAM,KAAK,WAAW,IAAI,MAAM,CAM/B;IAED,MAAM,KAAK,oBAAoB,IAAI,MAAM,CAExC;IAED,OAAO,CAAC,MAAM,CAAC,6BAA6B;IAkC5C,OAAO,CAAC,MAAM,CAAC,aAAa,CAAc;CAC1C"}

package/dist/utilities/Timer.js

@@ -1,4 +1,4 @@
-import { roundToDigits } from "./Utilities.js";
+import { roundToDigits } from './Utilities.js';
 export class Timer {
     startTime = 0;
     constructor() {

package/dist/utilities/{utilities.d.ts → Utilities.d.ts}

@@ -6,3 +6,4 @@ export declare function isObject(value: any): value is object;
 export declare function isArray(value: any): value is any[];
 export declare function isBoolean(value: any): value is boolean;
 export declare function isFunction(value: any): value is Function;
+//# sourceMappingURL=Utilities.d.ts.map

package/dist/utilities/Utilities.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Utilities.d.ts","sourceRoot":"","sources":["../../src/utilities/Utilities.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,SAAI,UAIpD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,MAAM,CAEpD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,MAAM,CAEpD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,MAAM,CAEpD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,MAAM,CAEpD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,GAAG,EAAE,CAElD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,OAAO,CAEtD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,QAAQ,CAExD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "grammar-composer",
-	"version": "0.2.4",
+	"version": "0.3.1",
 	"description": "Defines and generates parsers from composable grammar definitions. Includes advanced features like lexer-free parsing, selective packrat memoization and static analysis.",
 	"author": "Rotem Dan",
 	"license": "MIT",
@@ -19,7 +19,7 @@
 	"bugs": {
 		"url": "https://github.com/rotemdan/grammar-composer/issues"
 	},
-	"main": "./dist/GrammarComposer.js",
+	"main": "./dist/exports/Exports.js",
 	"type": "module",
 	"files": [
 		"dist",
@@ -29,12 +29,12 @@
 		"README.md"
 	],
 	"scripts": {
-		"test": "node dist/Test.js"
+		"test": "node dist/tests/Test.js"
 	},
 	"dependencies": {
-		"regexp-composer": "~0.3.0"
+		"regexp-composer": "~0.4.0"
 	},
 	"devDependencies": {
-		"@types/node": "~22.15.18"
+		"@types/node": "~26.2.0"
 	}
 }

package/src/exports/Exports.ts

@@ -0,0 +1 @@
+export * from '../parser-generator/Grammar.js'

package/src/{GrammarComposer.ts → parser-generator/Grammar.ts}

@@ -1,5 +1,5 @@
 import { Pattern, buildRegExp, inputStart, isPatternOptional } from 'regexp-composer'
-import { isArray, isBoolean, isFunction, isString } from "./utilities/Utilities.js"
+import { isArray, isBoolean, isFunction, isString } from '../utilities/Utilities.js'
 
 import { parse } from './TopDownParser.js'
 
@@ -24,7 +24,7 @@ export function buildGrammar<T extends { [key: string]: any }>(obj: T | (new ()
 			continue
 		}
 
-		const productionContent = objectProperty()
+		const productionContent = objectProperty.call(obj)
 		const normalizedProduction = productionToGrammarElement(productionContent)
 
 		const newNonterminal = nonterminal(key, normalizedProduction)
@@ -69,7 +69,7 @@ export function buildGrammar<T extends { [key: string]: any }>(obj: T | (new ()
 		nonterminals,
 		startProductionName,
 		uniqueIdCounter
-	 )
+	)
 }
 
 function prepareGrammarElement(
@@ -128,6 +128,18 @@ function prepareGrammarElement(
 					throw new Error(`Couldn't resolve function reference in grammar element: ${JSON.stringify(element)}`)
 				}
 
+				if (element.cached !== undefined || element.uniqueId !== undefined) {
+					const clonedNonterminal = { ...nonterminal }
+
+					if (element.cached !== undefined) {
+						clonedNonterminal.cached = element.cached
+					}
+
+					clonedNonterminal.uniqueId = getUniqueId()
+
+					return clonedNonterminal
+				}
+
 				if (nonterminal.uniqueId === undefined) {
 					nonterminal.uniqueId = getUniqueId()
 				}
@@ -147,7 +159,7 @@ function detectAndAnnotateOptionalNodes(rootNode: GrammarElement) {
 	const visitedNodes = new Set<GrammarElement>()
 
 	const resolvedNodes = new Map<GrammarElement, boolean>()
-	const unresolvedNodes = new Map<GrammarElement, Set<GrammarElement>>()
+	const unresolvedNodes = new Map<GrammarElement, { dependencies: Set<GrammarElement>, isChoice: boolean }>()
 
 	function processDepthFirst(node: GrammarElement): boolean | undefined {
 		if (visitedNodes.has(node)) {
@@ -177,24 +189,23 @@ function detectAndAnnotateOptionalNodes(rootNode: GrammarElement) {
 
 					return result
 				} else {
-					unresolvedNodes.set(node, new Set([node.content]))
+					unresolvedNodes.set(node, { dependencies: new Set([node.content]), isChoice: false })
 
 					return undefined
 				}
 			}
 
-			case 'Sequence':
-			case 'Choice': {
+			case 'Sequence': {
 				const dependencies = new Set<GrammarElement>()
 
-				let allResolvedElementsAreOptional = true
+				let hasNonOptionalResolvedMember = false
 
 				for (const element of node.members) {
 					const result = processDepthFirst(element)
 
 					if (isBoolean(result)) {
-						if (result == false) {
-							allResolvedElementsAreOptional = false
+						if (result === false) {
+							hasNonOptionalResolvedMember = true
 						}
 					} else {
 						dependencies.add(element)
@@ -205,12 +216,51 @@ function detectAndAnnotateOptionalNodes(rootNode: GrammarElement) {
 					resolvedNodes.set(node, true)
 
 					return true
-				} else if (dependencies.size == 0 || !allResolvedElementsAreOptional) {
-					resolvedNodes.set(node, allResolvedElementsAreOptional)
+				} else if (hasNonOptionalResolvedMember) {
+					resolvedNodes.set(node, false)
+
+					return false
+				} else if (dependencies.size == 0) {
+					resolvedNodes.set(node, true)
 
-					return allResolvedElementsAreOptional
+					return true
 				} else {
-					unresolvedNodes.set(node, dependencies)
+					unresolvedNodes.set(node, { dependencies, isChoice: false })
+
+					return undefined
+				}
+			}
+
+			case 'Choice': {
+				const dependencies = new Set<GrammarElement>()
+				let hasOptionalResolvedMember = false
+
+				for (const element of node.members) {
+					const result = processDepthFirst(element)
+
+					if (isBoolean(result)) {
+						if (result === true) {
+							hasOptionalResolvedMember = true
+						}
+					} else {
+						dependencies.add(element)
+					}
+				}
+
+				if (node.optional == true) {
+					resolvedNodes.set(node, true)
+
+					return true
+				} else if (hasOptionalResolvedMember) {
+					resolvedNodes.set(node, true)
+
+					return true
+				} else if (dependencies.size == 0) {
+					resolvedNodes.set(node, false)
+
+					return false
+				} else {
+					unresolvedNodes.set(node, { dependencies, isChoice: true })
 
 					return undefined
 				}
@@ -231,13 +281,14 @@ function detectAndAnnotateOptionalNodes(rootNode: GrammarElement) {
 		// If it stays false, it means that no improvement was made during the iteration,
 		// and we should exit the loop.
 		let atLastOneDependencyResolvedInAnyNode = false
+		const nodesToDelete: GrammarElement[] = []
 
 		// Scan the unresolved nodes to locate any new resolved dependencies
-		for (const [node, dependencies] of unresolvedNodes) {
-			let nonOptionalDependencyFound = false
+		for (const [node, { dependencies, isChoice }] of unresolvedNodes) {
+			let nodeResolved = false
 
 			// Iterate over all unresolved dependencies for the node
-			for (const dependency of dependencies) {
+			for (const dependency of Array.from(dependencies)) {
 				// Check if the dependency has been resolved
 				const value = resolvedNodes.get(dependency)
 
@@ -245,28 +296,41 @@ function detectAndAnnotateOptionalNodes(rootNode: GrammarElement) {
 					// If it did, record that some dependencies were resolved
 					atLastOneDependencyResolvedInAnyNode = true
 
-					if (value === false) {
-						// If the value was false, then the entire target node must not be optional
-						nonOptionalDependencyFound = true
-
-						break
+					if (isChoice) {
+						if (value === true) {
+							resolvedNodes.set(node, true)
+							nodeResolved = true
+							break
+						}
 					} else {
-						// If the result was true, remove the dependency from the set
-						dependencies.delete(dependency)
+						if (value === false) {
+							resolvedNodes.set(node, false)
+							nodeResolved = true
+							break
+						}
 					}
+
+					dependencies.delete(dependency)
 				}
 			}
 
-			// If either a non-optional dependency was found, or all dependencies were resolved,
-			// resolve the target node:
-			if (nonOptionalDependencyFound || dependencies.size === 0) {
-				const isOptional = !nonOptionalDependencyFound
+			if (nodeResolved) {
+				nodesToDelete.push(node)
+			} else if (dependencies.size === 0) {
+				if (isChoice) {
+					resolvedNodes.set(node, false)
+				} else {
+					resolvedNodes.set(node, true)
+				}
 
-				resolvedNodes.set(node, isOptional)
-				unresolvedNodes.delete(node)
+				nodesToDelete.push(node)
 			}
 		}
 
+		for (const node of nodesToDelete) {
+			unresolvedNodes.delete(node)
+		}
+
 		// If not even one dependency was eliminated for any node,
 		// it means that only mutually cyclic nodes are left unresolved, so exit the loop.
 		if (!atLastOneDependencyResolvedInAnyNode) {

package/src/{TopDownParser.ts → parser-generator/TopDownParser.ts}

@@ -1,4 +1,4 @@
-import { Grammar, GrammarElement, Terminal } from "./GrammarComposer.js"
+import { Grammar, GrammarElement, Terminal } from './Grammar.js'
 
 export function parse(inputString: string, grammar: Grammar<any>) {
 	const inputLength = inputString.length
@@ -78,12 +78,6 @@ export function parse(inputString: string, grammar: Grammar<any>) {
 			}
 
 			case 'PatternTerminal': {
-				if (startOffset >= inputLength) {
-					updateBestFailedMatchesIfNeeded(grammarElement, startOffset)
-
-					return null
-				}
-
 				const substringToMatch = inputString.substring(startOffset)
 
 				const matchResults = grammarElement.regExp.exec(substringToMatch)
@@ -209,6 +203,10 @@ export function parse(inputString: string, grammar: Grammar<any>) {
 						break
 					}
 
+					if (result.endOffset === readOffset) {
+						break
+					}
+
 					if (result.nodes !== undefined) {
 						nodes.push(...result.nodes)
 					}
@@ -221,6 +219,11 @@ export function parse(inputString: string, grammar: Grammar<any>) {
 						endOffset: readOffset,
 						nodes: nodes.length > 0 ? nodes : undefined
 					}
+				} else if (grammarElement.optional === true) {
+					return {
+						endOffset: startOffset,
+						nodes: undefined
+					}
 				} else {
 					return null
 				}
@@ -252,10 +255,8 @@ export function parse(inputString: string, grammar: Grammar<any>) {
 
 	const result = tryParse(grammar.rootElement, 0)
 
-	const lastNode = result?.nodes?.[result.nodes.length - 1]
-
-	if (lastNode && lastNode.endOffset >= inputLength) {
-		return result.nodes
+	if (result && result.endOffset >= inputLength) {
+		return result.nodes ?? []
 	} else {
 		if (bestFailedMatches.length > 0) {
 			const possibleMatches = bestFailedMatches.map(match => {
@@ -280,7 +281,9 @@ export function parse(inputString: string, grammar: Grammar<any>) {
 
 			throw new Error(`Failed parsing the input text. Expected ${possibleMatchesString} at position ${bestFailedMatchesOffset}.`)
 		} else {
-			throw new Error(`Failed parsing the input text. Parsed length was ${lastNode?.endOffset ?? 0}. Input length was ${inputLength}.`)
+			const lastNode = result?.nodes?.[result.nodes.length - 1]
+
+			throw new Error(`Failed parsing the input text. Parsed length was ${lastNode?.endOffset ?? result?.endOffset ?? 0}. Input length was ${inputLength}.`)
 		}
 	}
 }

package/src/{Test.ts → tests/Test.ts}

@@ -1,9 +1,9 @@
-import { Timer } from "./utilities/Timer.js"
-import { jsonSample1, jsonSample2 } from "./test-data/TestData.js"
-import { anyOf, buildGrammar } from "./GrammarComposer.js"
-import { JsonGrammar } from "./test-grammars/JsonGrammar.js"
-import { XmlGrammar } from "./test-grammars/XmlGrammar.js"
-import { RegExpGrammar } from "./test-grammars/RegExpGrammar.js"
+import { Timer } from '../utilities/Timer.js'
+import { jsonSample1, jsonSample2 } from './test-data/TestData.js'
+import { anyOf, buildGrammar } from '../exports/Exports.js'
+import { JsonGrammar } from './test-grammars/JsonGrammar.js'
+import { XmlGrammar } from './test-grammars/XmlGrammar.js'
+import { RegExpGrammar } from './test-grammars/RegExpGrammar.js'
 
 const log = console.log
 

package/src/{test-grammars → tests/test-grammars}/JsonGrammar.ts

@@ -1,4 +1,4 @@
-import * as G from "../GrammarComposer.js"
+import * as G from '../../exports/Exports.js'
 import * as R from 'regexp-composer'
 
 export class JsonGrammar {