@ohm-js/wasm 0.7.3 → 0.7.4

package/dist/src/Compiler.d.ts

@@ -7,7 +7,7 @@ export class Compiler {
         paramTypes: any[];
         resultTypes: any[];
     }[];
-    ruleIdByName: any;
+    ruleIdByName: StringTable;
     _failureDescriptions: StringTable;
     _endOfInputFailureId: any;
     _deferredRuleIds: Set<any>;

package/dist/src/Compiler.js

@@ -718,7 +718,7 @@ export class Compiler {
                 return JSON.stringify(exp.value);
             case 'End':
                 return 'end of input';
-            case 'Apply':
+            case 'Apply': {
                 if (exp.descriptionId != null && exp.descriptionId >= 0) {
                     return this._failureDescriptions.getStr(exp.descriptionId);
                 }
@@ -726,7 +726,15 @@ export class Compiler {
                     return 'end of input';
                 if (exp.ruleName === 'any')
                     return 'any character';
-                return null;
+                // For lifted rules, expand their body to get a meaningful description.
+                if (exp.ruleName.startsWith('$lifted')) {
+                    const ruleInfo = this.rules.get(exp.ruleName);
+                    if (ruleInfo)
+                        return this.toFailureDescription(ruleInfo.body);
+                }
+                const article = /^[aeiouAEIOU]/.test(exp.ruleName) ? 'an' : 'a';
+                return article + ' ' + exp.ruleName;
+            }
             case 'Alt': {
                 const strs = exp.children.map(c => this.toFailureDescription(c));
                 if (strs.some(s => s == null))

package/package.json

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