@hyperscale0/hsx 3.3.0 → 4.0.0

package/src/headers.ts

@@ -17,7 +17,6 @@ export const HEADER_NAMES = [
   "cards",
   "savings",
   "reporting",
-  "vehicles",
 ] as const;
 
 /** The compiler frontend owns header metadata used by docs and catalogue consumers. */
@@ -25,7 +24,7 @@ export function headerManifest(
   library: StandardLibrary = bundledStandardLibrary,
 ) {
   return {
-    version: 3,
+    version: 4,
     headers: HEADER_NAMES.map((name) => {
       const source = library.source(name);
       if (!source) throw new Error(`Missing standard header ${name}`);
@@ -112,7 +111,7 @@ export function headerManifest(
                 requiredImport: `use ${name}`,
                 instancePlaceholder: "${instance}",
                 source:
-                  "${instance} = " +
+                  "attach ${instance} = " +
                   `${name}.${decl.name} { ` +
                   bindings
                     .map((t) => t.name + ": ${" + t.name + "}")

package/src/index.ts

@@ -4,12 +4,23 @@ export {
   type CompileOptions,
   type CompileResult,
   type CompileOriginMapEntry,
+  type AdapterBindingTarget,
 } from "./compile.ts";
+export type { ProviderAdapter } from "@hyperscale0/adl";
 export { parseProgram } from "./parse.ts";
 export { lex, KEYWORDS } from "./lex.ts";
 export { format } from "./format.ts";
 export { bundledStandardLibrary, type StandardLibrary } from "./std-library.ts";
 export { buildUdlCostManifest, type UdlCostManifest } from "./cost.ts";
-export type { Program, Decl, Expr, Span, Diagnostic } from "./ast.ts";
+export type {
+  Program,
+  Decl,
+  AssignmentDecl,
+  ObjectDecl,
+  InstrumentDecl,
+  Expr,
+  Span,
+  Diagnostic,
+} from "./ast.ts";
 
 export { headerManifest, HEADER_NAMES } from "./headers.ts";

package/src/lex.ts

@@ -42,6 +42,11 @@ export const KEYWORDS = [
   "capture",
   "fee",
   "shares",
+  "object",
+  "attach",
+  "subject",
+  "rename",
+  "columns",
 ] as const;
 export interface Token {
   kind: "name" | "number" | "string" | "date" | "punct" | "eof";

package/src/parse.ts

@@ -172,14 +172,30 @@ class Parser {
         });
         continue;
       }
+      if (this.eat("object")) {
+        const name = this.identifier();
+        const title =
+          this.peek().kind === "string"
+            ? (JSON.parse(this.take().text) as string)
+            : name;
+        const body = this.block();
+        program.decls.push({
+          kind: "object",
+          name,
+          title,
+          body,
+          span: this.span(start),
+        });
+        continue;
+      }
       const name = this.identifier();
       this.expect("=");
       const object = this.path();
       const body = this.block();
       program.decls.push({
-        kind: "object",
+        kind: "assignment",
         name,
-        object,
+        target: object,
         body,
         span: this.span(start),
       });
@@ -194,7 +210,66 @@ class Parser {
       if (this.peek().kind === "eof")
         this.fail(`unclosed block, expected ${end}`, `add ${end}`);
       const start = this.peek().span.start;
+      if (this.eat("attach")) {
+        const name = this.identifier();
+        this.expect("=");
+        const target = this.path();
+        const body = this.block();
+        entries.push({
+          key: `attach ${name} = ${target}`,
+          value: body,
+          span: this.span(start),
+        });
+        this.separators();
+        continue;
+      }
+      if (this.eat("rename")) {
+        const body = this.block();
+        entries.push({
+          key: "rename",
+          value: body,
+          span: this.span(start),
+        });
+        this.separators();
+        continue;
+      }
+      if (this.eat("expose")) {
+        const action = this.identifier();
+        let publicName = action;
+        if (this.eat("as")) {
+          publicName = this.identifier();
+        }
+        entries.push({
+          key: "expose",
+          value: {
+            kind: "call",
+            name: action,
+            args: [{ kind: "name", value: publicName, span: this.span(start) }],
+            span: this.span(start),
+          },
+          span: this.span(start),
+        });
+        this.separators();
+        continue;
+      }
       let key = this.path();
+      if (key === "columns" && !this.at(":")) {
+        let value: Expr;
+        if (this.at("[")) {
+          value = this.atom();
+        } else if (this.at("{")) {
+          value = this.block();
+        } else {
+          value = { kind: "list", items: [], span: this.span(start) };
+        }
+        entries.push({
+          key: "columns",
+          value,
+          span: this.span(start),
+        });
+        this.separators();
+        continue;
+      }
       if (key === "action" && !this.at(":")) key += " " + this.identifier();
       if (key === "when") {
         const tunable = this.identifier();
@@ -242,7 +317,8 @@ class Parser {
   private operand(): BlockExpr {
     const value = this.atom();
     return this.record({
-      [value.kind === "name" && /^(self|input|party)\./.test(value.value)
+      [value.kind === "name" &&
+      /^(self|input|party|subject)\./.test(value.value)
         ? "field"
         : "literal"]: value,
     });
@@ -264,6 +340,8 @@ class Parser {
       };
       if (this.eat("for")) values.action = this.atom();
       if (this.eat("is")) values.decision = this.atom();
+      for (const key of ["protectedRequest", "differentFromInitiator"])
+        if (this.eat(key)) values[key] = this.atom();
       return this.record(values);
     }
     if (this.eat("unique")) {
@@ -316,6 +394,7 @@ class Parser {
         this.expect(key);
         values[key] = this.atom();
       }
+      if (this.eat("instruction")) values.instruction = this.atom();
       return this.record(values);
     }
     const left = this.operand();
@@ -361,6 +440,8 @@ class Parser {
     }
     for (const key of ["fee", "capture", "key"])
       if (this.eat(key)) values[key] = this.atom();
+    if (this.eat("boundary"))
+      values.boundary = this.record({ adapter: this.atom() });
     return this.record(values);
   }
   private block(): BlockExpr {