@bablr/language_enhancer-debug-log 0.11.0 → 0.12.0

package/README.md

@@ -6,7 +6,7 @@ This langauge enhancer `console.log`s productions as they are evaluated. It is h
 
 ```js
 import { parse } from '@bablr/vm';
-import * as langauge from 'some-langauge';
+import langauge from 'some-langauge';
 import { logEnhancer } from '@bablr/hol-debug-log';
 
 parse(

package/lib/index.js

@@ -7,10 +7,6 @@ import { printCall } from '@bablr/agast-vm-helpers/print';
 
 const { getOwnPropertyNames, getOwnPropertySymbols, hasOwn } = Object;
 
-const printType = (type) => {
-  return type == Symbol.for('@bablr/fragment') ? '_' : printIdentifier(type);
-};
-
 // TODO this lives in bablr-helpers but I can't use it there
 //   it would create a circular dep at the module level
 const mapProductions = (fn, Grammar) => {
@@ -36,14 +32,14 @@ const writeError = (text) => {
   return { verb: 'write', arguments: [text, buildEmbeddedObject({ stream: 2 })] };
 };
 
-const mapProduction = (production, type, indentation) => {
+const mapProduction = (production, name, indentation) => {
   return {
-    *[type](args) {
+    *[name](args) {
       const indent = (strings, ...args) => {
         return `${indentation}${String.raw(strings, ...args)}`;
       };
 
-      yield writeError(`--> ${printType(type)}`);
+      yield writeError(`--> ${printIdentifier(name)}`);
 
       let earlyReturn = true;
       try {
@@ -66,31 +62,31 @@ const mapProduction = (production, type, indentation) => {
           current = generator.next(result);
         }
 
-        const { allowEmpty } = args;
+        const { allowEmpty, s } = args;
 
-        if ((anyResult || allowEmpty) && args.s.status === 'active') {
-          yield writeError(`<-- ${printType(type)}`);
+        if ((anyResult || allowEmpty) && s().status === 'active') {
+          yield writeError(`<-- ${printIdentifier(name)}`);
         } else {
-          yield writeError(`x-- ${printType(type)}`);
+          yield writeError(`x-- ${printIdentifier(name)}`);
         }
         earlyReturn = false;
 
-        if (current.value) {
-          yield writeError(indent`${printCall(current.value)}`);
+        if (current.value?.shift) {
+          yield writeError(indent`${printCall(current.value.shift)}`);
         }
 
         return current.value;
       } finally {
         if (earlyReturn) {
-          yield writeError(`x-- ${printType(type)}`);
+          yield writeError(`x-- ${printIdentifier(name)}`);
         }
       }
     },
-  }[type];
+  }[name];
 };
 
 export const enhanceGrammarWithDebugLogging = (grammar, indentation = '') => {
-  return mapProductions((type, prod) => mapProduction(type, prod, indentation), grammar);
+  return mapProductions((name, prod) => mapProduction(name, prod, indentation), grammar);
 };
 
 export const enhanceLanguageWithDebugLogging = (language, indentation = '') => {
@@ -103,8 +99,8 @@ export const enhanceLanguageWithDebugLogging = (language, indentation = '') => {
 export const enhanceWithDebugLogging = enhanceLanguageWithDebugLogging;
 
 export const enhanceProductionWithDebugLogging = (indentation = '') => {
-  return (production, type) => {
-    return mapProduction(production, type, indentation);
+  return (production, name) => {
+    return mapProduction(production, name, indentation);
   };
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/language_enhancer-debug-log",
   "description": "A BABLR language enhancer that logs production execution",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -12,8 +12,8 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.9.0",
-    "@bablr/agast-vm-helpers": "0.8.0"
+    "@bablr/agast-helpers": "0.10.0",
+    "@bablr/agast-vm-helpers": "0.10.0"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
@@ -23,7 +23,10 @@
     "eslint-plugin-import": "^2.27.5",
     "prettier": "^2.6.2"
   },
-  "repository": "github:bablr-lang/language_enhancer-debug-log",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bablr-lang/language_enhancer-debug-log.git"
+  },
   "homepage": "https://github.com/bablr-lang/language_enhancer-debug-log",
   "license": "MIT"
 }