@bablr/boot 0.2.4 → 0.4.0

package/lib/index.js

@@ -67,7 +67,7 @@ const getAgASTValue = (language, miniNode) => {
   if (!miniNode) return miniNode;
 
   if (isArray(miniNode)) {
-    return miniNode.map(node => getAgASTValue(node));
+    return miniNode.map((node) => getAgASTValue(node));
   }
 
   const { language: languageName, type, attributes } = miniNode;
@@ -107,10 +107,10 @@ const getAgASTValue = (language, miniNode) => {
       children.push(child);
     } else if (child.type === 'Trivia') {
       children.push({
-        type: 'Embedded',
+        type: 'EmbeddedNode',
         value: {
           flags: { escape: false, token: true, trivia: true, intrinsic: false },
-          language: 'https://bablr.org/languages/core/space-tab-newline',
+          language: 'https://bablr.org/languages/core/en/space-tab-newline',
           type: 'Space',
           children: [buildLiteral(child.value)],
           properties: {},
@@ -122,7 +122,7 @@ const getAgASTValue = (language, miniNode) => {
       const attributes = { cooked };
 
       children.push({
-        type: 'Embedded',
+        type: 'EmbeddedNode',
         value: {
           flags: { escape: true, token: true, trivia: false, intrinsic: false },
           language: cstml.canonicalURL,

package/lib/languages/cstml.js

@@ -1,4 +1,4 @@
-const objectEntries = require('iter-tools-es/methods/object-entries');
+const objectEntries = require('iter-tools/methods/object-entries');
 
 const { buildCovers } = require('../utils.js');
 const sym = require('../symbols.js');
@@ -11,7 +11,7 @@ const LIT = 'Literal';
 
 const name = 'CSTML';
 
-const canonicalURL = 'https://bablr.org/languages/core/cstml';
+const canonicalURL = 'https://bablr.org/languages/core/en/cstml';
 
 const dependencies = {};
 

package/lib/languages/instruction.js

@@ -12,7 +12,7 @@ const LIT = 'Literal';
 
 const name = 'Instruction';
 
-const canonicalURL = 'https://bablr.org/languages/core/bablr-vm-instruction';
+const canonicalURL = 'https://bablr.org/languages/core/en/bablr-vm-instruction';
 
 const dependencies = { Spamex, CSTML, Regex };
 

package/lib/languages/regex.js

@@ -1,11 +1,11 @@
-const when = require('iter-tools-es/methods/when');
+const when = require('iter-tools/methods/when');
 const { escapables } = require('./cstml.js');
 const { buildCovers } = require('../utils.js');
 const { node } = require('../symbols.js');
 
 const name = 'Regex';
 
-const canonicalURL = 'https://bablr.org/languages/core/bablr-regex-pattern';
+const canonicalURL = 'https://bablr.org/languages/core/en/bablr-regex-pattern';
 
 const dependencies = {};
 

package/lib/languages/spamex.js

@@ -10,7 +10,7 @@ const LIT = 'Literal';
 
 const name = 'Spamex';
 
-const canonicalURL = 'https://bablr.org/languages/core/spamex';
+const canonicalURL = 'https://bablr.org/languages/core/en/spamex';
 
 const dependencies = { CSTML, Regex };
 

package/lib/miniparser.js

@@ -1,8 +1,8 @@
 const { ref, lit, trivia, esc } = require('@bablr/boot-helpers/types');
 const escapeRegex = require('escape-string-regexp');
-const arrayLast = require('iter-tools-es/methods/array-last');
-const isString = require('iter-tools-es/methods/is-string');
-const isObject = require('iter-tools-es/methods/is-object');
+const arrayLast = require('iter-tools/methods/array-last');
+const isString = require('iter-tools/methods/is-string');
+const isObject = require('iter-tools/methods/is-object');
 const sym = require('./symbols.js');
 const { Match } = require('./match.js');
 const { parsePath } = require('./path.js');

package/lib/print.js

@@ -131,7 +131,7 @@ function* streamFromTree(rootNode) {
           break;
         }
 
-        case 'Embedded': {
+        case 'EmbeddedNode': {
           stack = stack.push(buildFrame(terminal.value));
           continue stack;
         }

package/lib/utils.js

@@ -1,6 +1,6 @@
-const every = require('iter-tools-es/methods/every');
-const isArray = require('iter-tools-es/methods/is-array');
-const isString = require('iter-tools-es/methods/is-string');
+const every = require('iter-tools/methods/every');
+const isArray = require('iter-tools/methods/is-array');
+const isString = require('iter-tools/methods/is-string');
 
 const { hasOwn, getPrototypeOf, getOwnPropertySymbols } = Object;
 const isSymbol = (value) => typeof value === 'symbol';
@@ -71,7 +71,7 @@ const set = (obj, path, value) => {
     if (hasOwn(obj, name)) {
       throw new Error('duplicate child name');
     }
-    
+
     obj[name] = value;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/boot",
-  "version": "0.2.4",
+  "version": "0.4.0",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"
@@ -24,7 +24,7 @@
     "@babel/types": "7.23.0",
     "@bablr/boot-helpers": "0.2.0",
     "escape-string-regexp": "4.0.0",
-    "iter-tools-es": "^7.5.3",
+    "iter-tools": "^7.5.3",
     "jest-diff": "29.7.0"
   },
   "devDependencies": {

package/shorthand.macro.js

@@ -2,11 +2,11 @@ const { spawnSync } = require('node:child_process');
 const t = require('@babel/types');
 const { expression } = require('@babel/template');
 const { diff } = require('jest-diff');
-const isObject = require('iter-tools-es/methods/is-object');
-const isUndefined = require('iter-tools-es/methods/is-undefined');
-const isNull = require('iter-tools-es/methods/is-null');
-const isString = require('iter-tools-es/methods/is-string');
-const concat = require('iter-tools-es/methods/concat');
+const isObject = require('iter-tools/methods/is-object');
+const isUndefined = require('iter-tools/methods/is-undefined');
+const isNull = require('iter-tools/methods/is-null');
+const isString = require('iter-tools/methods/is-string');
+const concat = require('iter-tools/methods/concat');
 const { createMacro } = require('babel-plugin-macros');
 const { TemplateParser, set, getAgASTValue } = require('./lib/index.js');
 const i = require('./lib/languages/instruction.js');
@@ -53,7 +53,7 @@ const generateBabelNodeChild = (child, exprs, bindings) => {
       t: bindings.t,
       value: getBabelASTValue(child.value, exprs, bindings),
     });
-  } else if (child.type === 'Embedded') {
+  } else if (child.type === 'EmbeddedNode') {
     return expression(`%%t%%.embedded(%%value%%)`)({
       t: bindings.t,
       value: generateBabelNode(child.value, exprs, bindings),
@@ -195,16 +195,16 @@ const getTopScope = (scope) => {
 
 const namesFor = Object.fromEntries([
   ...[i, re, spam, cstml].map((l) => [l.canonicalURL, l.name]),
-  ['https://bablr.org/languages/core/space-tab-newline', 'Space'],
+  ['https://bablr.org/languages/core/en/space-tab-newline', 'Space'],
 ]);
 
 const languages = {
-  i: '@bablr/language-bablr-vm-instruction',
-  re: '@bablr/language-regex-vm-pattern',
-  spam: '@bablr/language-spamex',
-  str: '@bablr/language-cstml',
-  num: '@bablr/language-cstml',
-  cst: '@bablr/language-cstml',
+  i: '@bablr/language-en-bablr-vm-instruction',
+  re: '@bablr/language-en-regex-vm-pattern',
+  spam: '@bablr/language-en-spamex',
+  str: '@bablr/language-en-cstml',
+  num: '@bablr/language-en-cstml',
+  cst: '@bablr/language-en-cstml',
 };
 
 const topTypes = {