aontu 0.46.0 → 0.48.0

package/dist/val/VarVal.js

@@ -40,12 +40,14 @@ class VarVal extends FeatureVal_1.FeatureVal {
         if (!(nameVal.isRef) && type_1.DONE === nameVal.dc) {
             if (nameVal instanceof StringVal_1.StringVal) {
                 let found = ctx.vars[nameVal.peg];
+                // TODO: support complex values
+                const ft = typeof found;
+                // Single ladder: a missing var must report `unknown_var` and not
+                // fall through to the `invalid_var_kind` default below.
                 if (undefined === found) {
                     out = (0, err_1.makeNilErr)(ctx, 'unknown_var', this, peer);
                 }
-                // TODO: support complex values
-                const ft = typeof found;
-                if (null === found) {
+                else if (null === found) {
                     out = this.place(new NullVal_1.NullVal({ peg: null }));
                 }
                 else if ('string' === ft) {

package/dist/val/VarVal.js.map

@@ -1 +1 @@
-{"version":3,"file":"VarVal.js","sourceRoot":"","sources":["../../src/val/VarVal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VarVal.js","sourceRoot":"","sources":["../../src/val/VarVal.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "aontu",
-  "version": "0.46.0",
+  "version": "0.48.0",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "types": "dist/aontu.d.ts",
   "bin": {
-    "aontu": "dist/cli.js"
+    "aontu": "dist/cli.js",
+    "aontu-lsp": "dist/lsp-server.js"
   },
   "description": "Unifier.",
   "homepage": "https://github.com/rjrodger/aontu",
@@ -26,13 +27,19 @@
     "clean": "rm -rf dist dist-test node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "version": "node -r fs -e \"v=require('./package.json').version;s=fs.readFileSync('./aontu.ts').toString();if(!s.includes('VERSION = \\''+v+'\\'')){s=s.replace(/VERSION = '.*?'/,'VERSION = \\''+v+'\\'');fs.writeFileSync('./aontu.ts',s)}\"",
+    "repo-bump": "npm version patch --no-git-tag-version && node -e \"console.log('bumped to v' + require('./package.json').version + ' (package.json only - commit via repo-tag / repo-release)')\"",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
+    "repo-tag-dry": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo \"[dry-run] TAG: v$REPO_VERSION\" && if git rev-parse -q --verify refs/tags/v$REPO_VERSION >/dev/null; then echo \"[dry-run] WARNING: tag v$REPO_VERSION already exists - bump the version first\"; else echo \"[dry-run] would commit -a, push, tag v$REPO_VERSION and push --tags; nothing done\"; fi && git status --short",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
-    "repo-publish-quick": "npm run build && npm run test && npm run repo-tag && npm publish --registry https://registry.npmjs.org "
+    "repo-publish-dry": "npm run clean && npm i && npm run repo-publish-quick-dry",
+    "repo-publish-quick": "npm run build && npm run test && npm publish --registry https://registry.npmjs.org --access=public",
+    "repo-publish-quick-dry": "npm run build && npm run test && ( npm publish --dry-run --registry https://registry.npmjs.org --access=public || echo \"[dry-run] npm publish refused (see npm error above) - usually the version is already published; bump package.json before a real release\" )",
+    "repo-release": "npm run repo-publish && npm run repo-tag",
+    "repo-release-dry": "npm run repo-publish-quick-dry && npm run repo-tag-dry"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   },
   "files": [
     "src",
@@ -40,22 +47,23 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@jsonic/directive": "2.2.0",
-    "@jsonic/expr": "2.3.2",
-    "@jsonic/multisource": "2.9.1",
-    "@jsonic/path": "2.1.0",
-    "jsonic": "2.28.0"
+    "@tabnas/debug": "0.2.0",
+    "@tabnas/directive": "0.2.0",
+    "@tabnas/expr": "0.2.0",
+    "@tabnas/jsonic": "0.2.0",
+    "@tabnas/multisource": "0.2.0",
+    "@tabnas/path": "0.2.0"
   },
   "devDependencies": {
-    "@types/node": "25.9.2",
-    "memfs": "4.57.6",
+    "@types/node": "26.1.0",
+    "memfs": "4.59.0",
     "typescript": "6.0.3"
   },
   "aliasify": {
     "aliases": {
-      "@jsonic/multisource/resolver/file": "@jsonic/multisource/dist/resolver/file.js",
-      "@jsonic/multisource/resolver/pkg": "@jsonic/multisource/dist/resolver/pkg.js",
-      "@jsonic/multisource/resolver/mem": "@jsonic/multisource/dist/resolver/mem.js"
+      "@tabnas/multisource/resolver/file": "@tabnas/multisource/dist/resolver/file.js",
+      "@tabnas/multisource/resolver/pkg": "@tabnas/multisource/dist/resolver/pkg.js",
+      "@tabnas/multisource/resolver/mem": "@tabnas/multisource/dist/resolver/mem.js"
     }
   }
 }

package/src/aontu.ts

@@ -35,6 +35,11 @@ class Aontu {
 
 
   // Parse source into a matching Val AST, not yet unified.
+  //
+  // NOTE: the returned Val is SINGLE-USE — unify()/generate() refine the
+  // tree in place (see Val.unify), so do not unify or generate the same
+  // parsed Val more than once, and do not share it across threads. Call
+  // parse() again for a fresh tree.
   parse(src: string, opts?: AontuOptions, ac?: AontuContext): Val | undefined {
     let out: Val | undefined
     let errs: any[] = []

package/src/err.ts

@@ -1,7 +1,7 @@
 /* Copyright (c) 2021-2025 Richard Rodger, MIT License */
 
 
-import { util } from 'jsonic'
+import { util } from '@tabnas/jsonic'
 
 import { Val, ErrContext } from './type'
 

package/src/hints.ts

@@ -109,6 +109,8 @@ const hints: Record<string, string> = {
   '|:empty': 'Empty disjunction. The disjunction has no valid alternatives.',
   '|:empty-dist': 'Empty disjunction distribution. All alternatives in the disjunction are invalid.',
 
+  'max_depth': 'Input nesting is too deep to process safely.',
+
   // Function errors (dynamic patterns)
   'func': 'Function operation failed. See the specific function name for details.',
   'make': 'Failed to create a new value. The make operation could not construct the value.',

package/src/lang.ts

@@ -5,42 +5,43 @@
 
 import {
   Jsonic,
+  Tabnas,
   Plugin,
   Rule,
   RuleSpec,
   Context as JsonicContext,
   JsonicError,
-} from 'jsonic'
+} from '@tabnas/jsonic'
 
 
-import { Debug } from 'jsonic/debug'
+import { Debug } from '@tabnas/debug'
 
 import {
   MultiSource
-} from '@jsonic/multisource'
+} from '@tabnas/multisource'
 
-// TODO: @jsonic/multisource should support virtual fs
+// TODO: @tabnas/multisource should support virtual fs
 
 import {
   makeFileResolver
-} from '@jsonic/multisource/resolver/file'
+} from '@tabnas/multisource/resolver/file'
 
 import {
   makePkgResolver
-} from '@jsonic/multisource/resolver/pkg'
+} from '@tabnas/multisource/resolver/pkg'
 
 import {
   makeMemResolver
-} from '@jsonic/multisource/resolver/mem'
+} from '@tabnas/multisource/resolver/mem'
 
 import {
   Expr,
   Op,
-} from '@jsonic/expr'
+} from '@tabnas/expr'
 
 import {
   Path
-} from '@jsonic/path'
+} from '@tabnas/path'
 
 import type {
   Val,
@@ -93,9 +94,11 @@ import { OpenFuncVal } from './val/OpenFuncVal'
 import { SuperFuncVal } from './val/SuperFuncVal'
 
 
+const asPlugin = (p: unknown): Plugin => p as Plugin
+
 let AontuJsonic: Plugin = function AontuLang(jsonic: Jsonic) {
 
-  jsonic.use(Path)
+  jsonic.use(asPlugin(Path))
 
   // TODO: refactor Val constructor
   // let addsite = (v: Val, p: string[]) => (v.path = [...(p || [])], v)
@@ -250,6 +253,8 @@ help isolate the syntax error.`,
     'negative-prefix': (r: Rule, ctx: JsonicContext, _op: Op, terms: any) => {
       let val = terms[0]
       val.peg = -1 * val.peg
+      // Normalize -0 to 0 (keeps the AST and canon free of negative zero).
+      if (0 === val.peg) val.peg = 0
       return addsite(val, r, ctx)
     },
 
@@ -277,7 +282,7 @@ help isolate the syntax error.`,
 
 
   jsonic
-    .use(Expr, {
+    .use(asPlugin(Expr), {
       op: {
         // disjunct < conjunct: c & b | a -> (c & b) | a
         'conjunct': {
@@ -374,13 +379,23 @@ help isolate the syntax error.`,
 
     rs
       .open([
-        { s: [CJ, CL], p: 'map', b: 2, n: { pk: 1 }, g: 'spread' },
+        {
+          s: [CJ, CL], p: 'map', b: 2, n: { pk: 1 },
+          // @tabnas seeds a descended rule's node from its parent; without
+          // a fresh node here the nested spread map (`a:&:{x:1}`) would
+          // share the parent map's node object and self-reference.
+          a: (r: Rule) => { r.node = {} },
+          g: 'spread'
+        },
 
         {
           s: [OPTKEY, QM],
           c: (r) => 0 == r.d,
           p: 'map',
           b: 2,
+          // Fresh node (see spread alt above): the optional dive descends
+          // to a map and must not share the parent's node object.
+          a: (r: Rule) => { r.node = {} },
           g: 'pair,jsonic,top,aontu-optional',
         },
 
@@ -389,12 +404,13 @@ help isolate the syntax error.`,
           p: 'map',
           b: 2,
           n: { pk: 1 },
+          a: (r: Rule) => { r.node = {} },
           g: 'pair,jsonic,top,dive,aontu-optional',
         },
 
       ])
 
-      .bc((r: Rule, ctx: JsonicContext) => {
+      .ac((r: Rule, ctx: JsonicContext) => {
 
         let valnode: Val = r.node
         let valtype = typeof valnode
@@ -555,7 +571,7 @@ help isolate the syntax error.`,
         }
       ])
 
-      // NOTE: manually adjust path - @jsonic/path ignores as not pair:true
+      // NOTE: manually adjust path - @tabnas/path ignores as not pair:true
       .ao((r) => {
         if (0 < r.d && r.u.spread) {
           r.child.k.path = [...r.k.path, '&']
@@ -640,6 +656,13 @@ help isolate the syntax error.`,
 
 
 
+// SECURITY: the default resolver reads any file/package the process can
+// reach — @"path" follows relative paths (`@"../../etc/passwd"`) and
+// symlinks with no containment check, and @"pkg" can require() arbitrary
+// installed modules. This is intentional for the CLI, but it means a
+// `.aon` source can read referenced files; the LSP uses this same
+// resolver, so treat opening an untrusted source as running it. Pass a
+// confined `options.resolver` to restrict reads in less-trusted contexts.
 function makeModelResolver(options: any) {
   const useRequire = options.require || require
 
@@ -662,7 +685,7 @@ function makeModelResolver(options: any) {
     popts: any,
     rule: Rule,
     ctx: JsonicContext,
-    jsonic: Jsonic
+    jsonic: Tabnas
   ) {
 
     let path = 'string' === typeof spec ? spec : spec?.peg
@@ -711,20 +734,25 @@ class Lang {
     this.jsonic = Jsonic.make()
 
     if (this.opts.debug) {
-      this.jsonic.use(Debug, {
+      this.jsonic.use(asPlugin(Debug), {
         trace: this.opts.trace
       })
     }
 
     this.jsonic
-      .use(AontuJsonic)
-      .use(MultiSource, {
+      .use(asPlugin(MultiSource), {
         resolver: options?.resolver || modelResolver,
+        // `.aon` is the preferred Aontu source extension; `.aontu` also
+        // works. `.jsonic` is retired (no longer auto-resolved); the
+        // default `['jsonic','jsc','json','js']` is overridden here.
+        // (Upstream option name is the misspelled `implictExt`.)
+        implictExt: ['aon', 'aontu'],
         processor: {
           aontu: 'jsonic',
           aon: 'jsonic',
         }
       })
+      .use(AontuJsonic)
   }
 
 

package/src/lsp-server.ts

@@ -0,0 +1,109 @@
+#!/usr/bin/env node
+/* Copyright (c) 2025 Richard Rodger, MIT License */
+
+// Aontu Language Server (stdio).
+//
+//   aontu-lsp
+//
+// Speaks LSP over stdio (JSON-RPC with Content-Length framing) and
+// publishes unification diagnostics as `.aontu` files are edited. This
+// binary is intentionally thin: all protocol logic lives in the reusable
+// library ./lsp (LspHandler + computeDiagnostics). See docs/lsp.md for
+// editor configuration.
+
+import { LspHandler, Message, OutMessage } from './lsp'
+
+
+// A byte-level LSP framing codec: feed it incoming chunks, give it a
+// handler, and it decodes Content-Length frames, dispatches them, and
+// writes framed replies. Kept transport-injectable (write/onExit) so it
+// can be unit-tested without real stdio.
+class FrameCodec {
+  private buffer = Buffer.alloc(0)
+
+  constructor(
+    private handler: LspHandler,
+    private write: (chunk: Buffer) => void,
+    private onExit: (code: number) => void,
+  ) { }
+
+  // Feed a chunk of incoming bytes; processes any complete frames.
+  push(chunk: Buffer) {
+    this.buffer = Buffer.concat([this.buffer, chunk])
+    this.drain()
+  }
+
+  // Called when the input stream ends.
+  end() {
+    this.onExit(this.handler.exitCode)
+  }
+
+  private drain() {
+    for (; ;) {
+      const headerEnd = this.buffer.indexOf('\r\n\r\n')
+      if (headerEnd < 0) return
+
+      const header = this.buffer.subarray(0, headerEnd).toString('ascii')
+      const match = /Content-Length:\s*(\d+)/i.exec(header)
+      if (null == match) {
+        // Malformed header block: skip past it and continue.
+        this.buffer = this.buffer.subarray(headerEnd + 4)
+        continue
+      }
+
+      const length = parseInt(match[1], 10)
+      const bodyStart = headerEnd + 4
+      if (this.buffer.length < bodyStart + length) return // need more bytes
+
+      const body = this.buffer.subarray(bodyStart, bodyStart + length).toString('utf8')
+      this.buffer = this.buffer.subarray(bodyStart + length)
+
+      let msg: Message
+      try {
+        msg = JSON.parse(body)
+      }
+      catch {
+        continue // ignore unparseable frame
+      }
+
+      for (const out of this.handler.handle(msg)) {
+        this.send(out)
+      }
+
+      if (this.handler.shouldExit) {
+        this.onExit(this.handler.exitCode)
+        return
+      }
+    }
+  }
+
+  private send(out: OutMessage) {
+    const body = Buffer.from(JSON.stringify(out), 'utf8')
+    this.write(Buffer.from('Content-Length: ' + body.length + '\r\n\r\n', 'ascii'))
+    this.write(body)
+  }
+}
+
+
+function main() {
+  const handler = new LspHandler()
+  const codec = new FrameCodec(
+    handler,
+    (chunk) => process.stdout.write(chunk),
+    (code) => process.exit(code),
+  )
+
+  process.stdin.on('data', (chunk: Buffer) => codec.push(chunk))
+  process.stdin.on('end', () => codec.end())
+}
+
+
+// Only auto-run when invoked as a program, not when imported by tests.
+if (require.main === module) {
+  main()
+}
+
+
+export {
+  FrameCodec,
+}