@bablr/boot 0.6.3 → 0.7.1

package/lib/path.js

@@ -1,26 +1,19 @@
-const buildNode = (id) => {
-  const { language, type } = id;
-
-  return {
-    language,
-    type,
-    attributes: {},
-    children: [],
-    properties: {},
-  };
-};
+import { buildReferenceTag } from '@bablr/agast-helpers/tree';
+
+const { hasOwn, freeze } = Object;
+const { isArray } = Array;
 
-const stripPathBraces = (str) => (str.endsWith('[]') ? str.slice(0, -2) : str);
+export const parsePath = (str) => {
+  const match = /^([a-zA-Z]+)(\[\])?(\+)?(\$)?$/.exec(str);
 
-const parsePath = (str) => {
-  const name = stripPathBraces(str);
+  if (!match) throw new Error();
 
-  if (!/[a-zA-Z]+$/.test(name)) throw new Error();
+  let flags = freeze({ expression: !!match[3], hasGap: !!match[4] });
 
-  return { isArray: name !== str, name };
+  return buildReferenceTag(match[1], !!match[2], flags);
 };
 
-class Path {
+export class Path {
   constructor(id, attributes, parent = null) {
     this.id = id;
     this.attributes = attributes;
@@ -54,4 +47,35 @@ class Path {
   }
 }
 
-module.exports = { Path, buildNode, parsePath };
+export class PathResolver {
+  constructor(node) {
+    this.node = node;
+    this.counters = {};
+  }
+
+  get(path) {
+    const { node, counters } = this;
+
+    const { isArray: pathIsArray, name } = path;
+
+    if (!hasOwn(node.properties, name)) {
+      throw new Error(`cannot resolve {path: ${name}}`);
+    }
+
+    let value = node.properties[name];
+
+    if (pathIsArray) {
+      if (!isArray(value)) {
+        throw new Error(`cannot resolve {path: ${name}}: not an array`);
+      }
+
+      const counter = counters[name] ?? 0;
+
+      counters[name] = counter + 1;
+
+      value = value[counter];
+    }
+
+    return value;
+  }
+}

package/lib/utils.js

@@ -1,82 +1,24 @@
-const every = require('iter-tools/methods/every');
-const isArray = require('iter-tools/methods/is-array');
-const isString = require('iter-tools/methods/is-string');
+import isArray from 'iter-tools/methods/is-array';
+import isString from 'iter-tools/methods/is-string';
 
-const { hasOwn, getPrototypeOf, getOwnPropertySymbols } = Object;
-const isSymbol = (value) => typeof value === 'symbol';
-const isType = (value) => isString(value) || isSymbol(value);
-const isRegex = (val) => val instanceof RegExp;
-
-const objectEntries = (obj) => {
-  return {
-    *[Symbol.iterator]() {
-      for (let key in obj) if (hasOwn(obj, key)) yield [key, obj[key]];
-      const symTypes = getOwnPropertySymbols(obj);
-      for (const type of symTypes) {
-        yield [type, obj[type]];
-      }
-    },
-  };
-};
-
-const explodeSubtypes = (aliases, exploded, types) => {
-  for (const type of types) {
-    const explodedTypes = aliases.get(type);
-    if (explodedTypes) {
-      for (const explodedType of explodedTypes) {
-        exploded.add(explodedType);
-        const subtypes = aliases.get(explodedType);
-        if (subtypes) {
-          explodeSubtypes(aliases, exploded, subtypes);
-        }
-      }
-    }
-  }
-};
-
-const buildCovers = (rawAliases) => {
-  const aliases = new Map();
-
-  for (const alias of objectEntries(rawAliases)) {
-    if (!isType(alias[0])) throw new Error('alias[0] key must be a string or symbol');
-    if (!isArray(alias[1])) throw new Error('alias[1] must be an array');
-    if (!every(isType, alias[1])) throw new Error('alias[1] values must be strings or symbols');
+const { getPrototypeOf } = Object;
 
-    aliases.set(alias[0], new Set(alias[1]));
-  }
+const isRegex = (val) => val instanceof RegExp;
 
-  for (const [type, types] of aliases.entries()) {
-    explodeSubtypes(aliases, aliases.get(type), types);
+export const buildId = (value) => {
+  if (isString(value)) {
+    const { 0: language, 1: type } = value.split(':');
+    return type ? { language, type } : { language: undefined, type: language };
+  } else {
+    return value;
   }
-
-  return new Map(aliases);
 };
 
-const set = (obj, path, value) => {
-  const { isArray: pathIsArray, name } = path;
-
-  if (!name) {
-    throw new Error();
-  }
-
-  if (pathIsArray) {
-    if (!obj[name]) {
-      obj[name] = [];
-    }
-
-    if (!isArray(obj[name])) throw new Error('bad array value');
-
-    obj[name].push(value);
-  } else {
-    if (hasOwn(obj, name)) {
-      throw new Error(`duplicate child name \`${name}\``);
-    }
-
-    obj[name] = value;
-  }
+export const id = (...args) => {
+  return buildId(String.raw(...args));
 };
 
-const resolveDependentLanguage = (language, name) => {
+export const resolveDependentLanguage = (language, name) => {
   if (name === undefined) {
     return language;
   }
@@ -90,32 +32,4 @@ const resolveDependentLanguage = (language, name) => {
   return resolved;
 };
 
-const buildNode = (id, children, properties = {}, attributes = {}) => {
-  const { language, type } = id;
-  return { language, type, children, properties, attributes, gap: undefined };
-};
-
-const buildId = (value) => {
-  if (isString(value)) {
-    const { 0: language, 1: type } = value.split(':');
-    return type ? { language, type } : { language: undefined, type: language };
-  } else {
-    return value;
-  }
-};
-
-const id = (...args) => {
-  return buildId(String.raw(...args));
-};
-
-module.exports = {
-  buildCovers,
-  set,
-  resolveDependentLanguage,
-  isArray,
-  isRegex,
-  getPrototypeOf,
-  buildNode,
-  buildId,
-  id,
-};
+export { isArray, isRegex, getPrototypeOf };

package/package.json

@@ -1,38 +1,25 @@
 {
   "name": "@bablr/boot",
-  "version": "0.6.3",
+  "version": "0.7.1",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"
   },
+  "type": "module",
   "exports": {
-    ".": {
-      "require": "./dist/cjs.bundle.cjs",
-      "import": "./lib/esm-entry.mjs"
-    },
-    "./shorthand.macro": "./shorthand.macro.js"
+    ".": "./lib/index.js"
   },
   "files": [
-    "dist/**/*.cjs",
-    "dist/**/*.mjs",
-    "lib/esm-entry.mjs",
     "lib/**/*.js",
     "shorthand.macro.js"
   ],
   "sideEffects": false,
-  "scripts": {
-    "build": "rollup -c"
-  },
   "dependencies": {
-    "@babel/helper-module-imports": "^7.22.15",
-    "@babel/template": "^7.22.15",
-    "@babel/types": "7.23.0",
-    "@bablr/boot-helpers": "0.3.2",
+    "@bablr/agast-helpers": "0.6.1",
+    "@bablr/agast-vm-helpers": "0.6.0",
     "@iter-tools/imm-stack": "1.1.0",
-    "escape-string-regexp": "4.0.0",
-    "iter-tools": "^7.5.3",
-    "jest-diff": "29.7.0",
-    "rollup": "^4.27.3"
+    "escape-string-regexp": "5.0.0",
+    "iter-tools": "^7.5.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.0",
@@ -40,16 +27,12 @@
     "@babel/plugin-proposal-decorators": "^7.23.2",
     "@babel/plugin-transform-runtime": "^7.23.2",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#a49dbe6861a82d96864ee89fbf0ec1844a8a5e8e",
-    "@rollup/plugin-commonjs": "^28.0.1",
-    "@rollup/plugin-node-resolve": "^15.3.0",
     "babel-plugin-macros": "^3.1.0",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.47.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",
     "eslint-plugin-import": "^2.27.5",
     "expect": "^29.6.2",
-    "install": "^0.13.0",
-    "npm": "^10.9.0",
     "prettier": "^2.0.5"
   },
   "repository": "git@github.com:bablr-lang/boot.git",