aontu 0.12.0 → 0.13.0

package/lib/val.ts

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 Richard Rodger, MIT License */
+/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
 
 // TODO: infinite recursion protection
 
@@ -21,13 +21,14 @@ TOP -> Scalar/Boolean -> BooleanVal
 */
 
 
+
 import type {
   Val,
+  ValSpec,
 } from './type'
 
 import {
   DONE,
-  TOP,
 } from './type'
 
 import {
@@ -41,19 +42,62 @@ import {
 
 
 
+import { ConjunctVal } from './val/ConjunctVal'
+import { DisjunctVal } from './val/DisjunctVal'
+import { ListVal } from './val/ListVal'
+import { MapVal } from './val/MapVal'
 import { Nil } from './val/Nil'
+import { PrefVal } from './val/PrefVal'
+import { RefVal } from './val/RefVal'
+import { ValBase } from './val/ValBase'
 
-import {
-  ValBase,
-} from './val/ValBase'
 
+// There can be only one.
+class TopVal extends ValBase {
+  isVal = true
+
+  id = 0
+  top = true
+  peg = undefined
+  done = DONE
+  path = []
+  row = -1
+  col = -1
+  url = ''
+
+  constructor() {
+    super(null)
+
+    // TOP is always DONE, by definition.
+    this.done = DONE
+  }
+
+  unify(peer: Val, _ctx: Context): Val {
+    return peer
+  }
 
+  get canon() { return 'top' }
 
+  get site(): Site { return new Site(this) }
 
+  same(peer: Val): boolean {
+    return this === peer
+  }
+
+  clone() {
+    return this
+  }
 
+  gen(_ctx?: Context) {
+    return undefined
+  }
+}
 
 
 
+const TOP = new TopVal()
+
+
 // A ScalarType for integers. Number includes floats.
 class Integer { }
 
@@ -67,8 +111,14 @@ type ScalarConstructor =
 
 
 class ScalarTypeVal extends ValBase {
-  constructor(peg: ScalarConstructor, ctx?: Context) {
-    super(peg, ctx)
+
+  constructor(
+    spec: {
+      peg: ScalarConstructor
+    },
+    ctx?: Context
+  ) {
+    super(spec, ctx)
     this.done = DONE
   }
 
@@ -111,23 +161,46 @@ class ScalarTypeVal extends ValBase {
 }
 
 
+
 class ScalarVal<T> extends ValBase {
   type: any
-  constructor(peg: T, type: ScalarConstructor, ctx?: Context) {
-    super(peg, ctx)
-    this.type = type
+
+  constructor(
+    spec: {
+      peg: T,
+      type: ScalarConstructor
+    },
+    ctx?: Context
+  ) {
+    super(spec, ctx)
+    this.type = spec.type
     this.done = DONE
   }
+
+  clone(spec?: ValSpec, ctx?: Context): Val {
+    let out = (super.clone({
+      peg: this.peg,
+      type: this.type,
+      ...(spec || {})
+    }, ctx) as RefVal)
+    return out
+  }
+
   unify(peer: Val, ctx: Context): Val {
     // Exactly equal scalars are handled in op/unite
     if (peer instanceof ScalarTypeVal) {
       return peer.unify(this, ctx)
     }
+    else if (peer.top) {
+      return this
+    }
     return Nil.make(ctx, 'scalar', this, peer)
   }
+
   get canon() {
     return (this.peg as any).toString()
   }
+
   same(peer: Val): boolean {
     return peer instanceof ScalarVal ? peer.peg === this.peg : super.same(peer)
   }
@@ -139,8 +212,13 @@ class ScalarVal<T> extends ValBase {
 
 
 class NumberVal extends ScalarVal<number> {
-  constructor(peg: number, ctx?: Context) {
-    super(peg, Number, ctx)
+  constructor(
+    spec: {
+      peg: number
+    },
+    ctx?: Context
+  ) {
+    super({ peg: spec.peg, type: Number }, ctx)
   }
   unify(peer: Val, ctx: Context): Val {
     if (peer instanceof ScalarVal && peer.type === Integer) {
@@ -154,12 +232,17 @@ class NumberVal extends ScalarVal<number> {
 
 
 class IntegerVal extends ScalarVal<number> {
-  constructor(peg: number, ctx?: Context) {
-    if (!Number.isInteger(peg)) {
+  constructor(
+    spec: {
+      peg: number
+    },
+    ctx?: Context
+  ) {
+    if (!Number.isInteger(spec.peg)) {
       // TODO: use Nil?
       throw new Error('not-integer')
     }
-    super(peg, Integer, ctx)
+    super({ peg: spec.peg, type: Integer }, ctx)
   }
   unify(peer: Val, ctx: Context): Val {
     if (peer instanceof ScalarTypeVal && peer.peg === Number) {
@@ -171,6 +254,7 @@ class IntegerVal extends ScalarVal<number> {
       return this
     }
     else {
+      // console.log('IntegerVal Q', peer.canon)
       return super.unify(peer, ctx)
     }
   }
@@ -178,8 +262,13 @@ class IntegerVal extends ScalarVal<number> {
 
 
 class StringVal extends ScalarVal<string> {
-  constructor(peg: string, ctx?: Context) {
-    super(peg, String, ctx)
+  constructor(
+    spec: {
+      peg: string
+    },
+    ctx?: Context
+  ) {
+    super({ peg: spec.peg, type: String }, ctx)
   }
   unify(peer: Val, ctx: Context): Val {
     return super.unify(peer, ctx)
@@ -192,24 +281,26 @@ class StringVal extends ScalarVal<string> {
 
 
 class BooleanVal extends ScalarVal<boolean> {
-  constructor(peg: boolean, ctx?: Context) {
-    super(peg, Boolean, ctx)
+  constructor(
+    spec: {
+      peg: boolean
+    },
+    ctx?: Context
+  ) {
+    super({ peg: spec.peg, type: Boolean }, ctx)
   }
   unify(peer: Val, ctx: Context): Val {
     return super.unify(peer, ctx)
   }
 
-  static TRUE = new BooleanVal(true, new Context({ vc: 1, root: TOP }))
-  static FALSE = new BooleanVal(false, new Context({ vc: 2, root: TOP }))
+  static TRUE = new BooleanVal({ peg: true }, new Context({ vc: 1, root: TOP }))
+  static FALSE = new BooleanVal({ peg: false }, new Context({ vc: 2, root: TOP }))
 }
 
 
 
-
-
-
-
 export {
+  TOP,
   Integer,
   ScalarTypeVal,
   NumberVal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",
@@ -27,7 +27,7 @@
     "build": "tsc -d",
     "build-web": "tsc -d && npm run build-browser",
     "build-browser": "cp dist/aontu.js dist/aontu.min.js && browserify -o dist/aontu.min.js -e dist/aontu.js -s Aontu -im -i assert -p tinyify",
-    "clean": "rm -rf node_modules yarn.lock package-lock.json",
+    "clean": "rm -rf dist 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-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;",
@@ -46,19 +46,19 @@
     "@jsonic/directive": "^0.11.0",
     "@jsonic/expr": "^0.8.0",
     "@jsonic/jsonic-next": "^2.10.0",
-    "@jsonic/multisource": "^0.12.0",
+    "@jsonic/multisource": "^1.0.1",
     "@jsonic/path": "^0.6.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.5.2",
     "browserify": "^17.0.0",
-    "esbuild": "^0.17.12",
+    "esbuild": "^0.17.19",
     "es-jest": "^2.1.0",
     "jest": "^29.5.0",
-    "prettier": "^2.8.5",
+    "prettier": "^2.8.8",
     "serve": "^14.2.0",
     "tinyify": "^4.0.0",
-    "typescript": "^5.0.2",
-    "@types/node": "^18.15.3"
+    "typescript": "^5.1.3",
+    "@types/node": "^20.2.5"
   }
 }

package/dist/lib/common.d.ts

@@ -1,8 +0,0 @@
-import { Resolver } from '@jsonic/multisource';
-declare type Options = {
-    src: string;
-    print: number;
-    resolver?: Resolver;
-    base?: string;
-};
-export { Options, Resolver, };

package/dist/lib/common.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=common.js.map

package/dist/lib/common.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../lib/common.ts"],"names":[],"mappings":""}