@ohm-js/wasm 0.6.14 → 0.6.16

package/dist/src/miniohm.d.ts

@@ -38,7 +38,7 @@ export declare class WasmGrammar {
     private _fillInputBuffer;
     getRightmostFailurePosition(): number;
 }
-export interface MatchContext {
+interface MatchContext {
     ruleNames: string[];
     view: DataView;
     input: string;
@@ -71,6 +71,7 @@ export interface TerminalNode extends CstNodeBase {
     type: typeof CstNodeType.TERMINAL;
     ctorName: '_terminal';
     leadingSpaces?: NonterminalNode;
+    children: readonly [];
     value: string;
 }
 export interface ListNode<TNode extends CstNode = CstNode> extends CstNodeBase {
@@ -202,16 +203,16 @@ export declare class MatchResult {
     toString(): string;
     use<T>(cb: (r: MatchResult) => T): T;
 }
-declare class SucceededMatchResult extends MatchResult {
+export declare class SucceededMatchResult extends MatchResult {
     _cst: CstNode;
     constructor(grammar: WasmGrammar, startExpr: string, ctx: MatchContext, succeeded: boolean);
 }
-declare class FailedMatchResult extends MatchResult {
+export declare class FailedMatchResult extends MatchResult {
     constructor(grammar: WasmGrammar, startExpr: string, ctx: MatchContext, succeeded: boolean, rightmostFailurePosition: number, optRecordedFailures?: any);
     _rightmostFailurePosition: number;
     _rightmostFailures: any;
-    shortMessage?: string;
-    message?: string;
+    shortMessage: string;
+    message: string;
     getRightmostFailurePosition(): number;
     getRightmostFailures(): any;
     getExpectedText(): string;

package/dist/src/miniohm.js

@@ -15,6 +15,7 @@ export const CstNodeType = {
     OPT: 3,
     SEQ: 4,
 };
+const EMPTY_CHILDREN = Object.freeze([]);
 const compileOptions = {
     builtins: ['js-string'],
 };
@@ -261,6 +262,9 @@ export class CstNodeImpl {
             startIdx,
             endIdx: startIdx + this.sourceString.length,
         };
+        if (this.matchRecordType === MatchRecordType.TERMINAL || this.count === 0) {
+            this._children = EMPTY_CHILDREN;
+        }
     }
     get type() {
         switch (this._typeAndDetails & MATCH_RECORD_TYPE_MASK) {
@@ -569,22 +573,20 @@ function createMatchResult(grammar, startExpr, ctx, succeeded) {
         ? new SucceededMatchResult(grammar, startExpr, ctx, succeeded)
         : new FailedMatchResult(grammar, startExpr, ctx, succeeded, grammar.getRightmostFailurePosition());
 }
-class SucceededMatchResult extends MatchResult {
+export class SucceededMatchResult extends MatchResult {
     _cst;
     constructor(grammar, startExpr, ctx, succeeded) {
         super(grammar, startExpr, ctx, succeeded);
         this._cst = grammar.getCstRoot();
     }
 }
-class FailedMatchResult extends MatchResult {
+export class FailedMatchResult extends MatchResult {
     constructor(grammar, startExpr, ctx, succeeded, rightmostFailurePosition, optRecordedFailures) {
         super(grammar, startExpr, ctx, succeeded);
         this._rightmostFailurePosition = rightmostFailurePosition;
         this._rightmostFailures = optRecordedFailures;
         // TODO: Define these as lazy properties, like in the JS implementation.
-        if (this.failed()) {
-            this.shortMessage = this.message = `Match failed at pos ${rightmostFailurePosition}`;
-        }
+        this.shortMessage = this.message = `Match failed at pos ${rightmostFailurePosition}`;
     }
     _rightmostFailurePosition;
     _rightmostFailures;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohm-js/wasm",
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "Compile Ohm.js grammars to WebAsssembly",
   "main": "dist/index.js",
   "exports": {