@bablr/language_enhancer-debug-log 0.2.1 → 0.4.0

package/lib/index.js

@@ -1,9 +1,14 @@
 /* global console */
 
 import { printSource, getCooked } from '@bablr/agast-helpers/tree';
-import { printType } from '@bablr/agast-helpers/print';
+import { buildCall, buildNumber, buildObject, buildString } from '@bablr/agast-vm-helpers';
+import { printType as printType_ } from '@bablr/agast-helpers/print';
 
-const { getOwnPropertyNames, hasOwn } = Object;
+const { getOwnPropertyNames, getOwnPropertySymbols, hasOwn } = Object;
+
+const printType = (type) => {
+  return type == null ? '[null]' : printType_(type);
+};
 
 // TODO this lives in bablr-helpers but I can't use it there
 //   it would create a circular dep at the module level
@@ -14,8 +19,8 @@ const mapProductions = (fn, Grammar) => {
 
   const mapped = MappedGrammar.prototype;
 
-  while (prototype) {
-    for (const key of getOwnPropertyNames(prototype)) {
+  while (prototype && prototype !== Object.prototype) {
+    for (const key of [...getOwnPropertyNames(prototype), ...getOwnPropertySymbols(prototype)]) {
       if (!hasOwn(mapped, key)) {
         mapped[key] = fn(prototype[key], key);
       }
@@ -26,17 +31,22 @@ const mapProductions = (fn, Grammar) => {
   return MappedGrammar;
 };
 
-const mapProduction = (production, type, indentation, log) => {
-  return function* (...args) {
+const writeError = (text) => {
+  return buildCall('write', buildString(text), buildObject({ stream: buildNumber(2) }));
+};
+
+const mapProduction = (production, type, indentation) => {
+  return function* mappedProduction(props) {
+    const { grammar } = props;
     const indent = (strings, ...args) => {
       return `${indentation}${String.raw(strings, ...args)}`;
     };
 
-    log(`--> ${printType(type)}`);
+    yield writeError(`--> ${printType(type)}`);
 
     let earlyReturn = true;
     try {
-      const generator = production(...args);
+      const generator = production(props);
       let current = generator.next();
 
       let anyResult = false;
@@ -44,7 +54,7 @@ const mapProduction = (production, type, indentation, log) => {
       while (!current.done) {
         const instr = current.value;
 
-        log(indent`${printSource(instr)}`);
+        yield writeError(`>>> ` + indent`${printSource(instr)}`.slice(indentation.length));
 
         const eats =
           instr.type === 'Call' && ['eat', 'eatMatch'].includes(getCooked(instr.properties.verb));
@@ -56,21 +66,23 @@ const mapProduction = (production, type, indentation, log) => {
         current = generator.next(result);
       }
 
-      if (anyResult) {
-        log(`<-- ${printType(type)}`);
+      const allowEmpty = grammar.emptyables?.has(type);
+
+      if ((anyResult || allowEmpty) && props.s.status === 'active') {
+        yield writeError(`<-- ${printType(type)}`);
       } else {
-        log(`x-- ${printType(type)}`);
+        yield writeError(`x-- ${printType(type)}`);
       }
       earlyReturn = false;
 
       if (current.value) {
-        log(indent`${printSource(current.value)}`);
+        yield writeError(indent`${printSource(current.value)}`);
       }
 
       return current.value;
     } finally {
       if (earlyReturn) {
-        log(`x-- ${printType(type)}`);
+        yield writeError(`x-- ${printType(type)}`);
       }
     }
   };
@@ -89,9 +101,9 @@ export const enhanceLanguageWithDebugLogging = (language, indentation = '') => {
 
 export const enhanceWithDebugLogging = enhanceLanguageWithDebugLogging;
 
-export const enhanceProductionWithDebugLogging = (indentation = '', log = console.log) => {
+export const enhanceProductionWithDebugLogging = (indentation = '') => {
   return (production, type) => {
-    return mapProduction(production, type, indentation, log);
+    return mapProduction(production, type, 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.2.1",
+  "version": "0.4.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -12,7 +12,8 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.1.1"
+    "@bablr/agast-helpers": "0.2.0",
+    "@bablr/agast-vm-helpers": "0.2.0"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",