arrmatura 6.3.2 → 6.3.3

package/src/core/Arrmatron.ts

@@ -16,7 +16,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
   readonly scope: Arrmatron;
 
   $children?: Map<Uid, Arrmatron>;
-  isDone = false;
+  #isDone = false;
   #isInited = false;
   #fprints: Hash = {};
   #initialState: Hash = {};
@@ -26,7 +26,12 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
   #refs?: Hash<IArrmatron>;
   #propFnMap?: Map<string, Proc>;
 
-  constructor(readonly platform: IPlatform, protected readonly manifest: T, private _parent?: Arrmatron, scope?: Arrmatron) {
+  constructor(
+    readonly platform: IPlatform,
+    protected readonly manifest: T,
+    private _parent?: Arrmatron,
+    scope?: Arrmatron
+  ) {
     this.scope = scope ?? this;
     this.root = scope?.root ?? this;
     this.#initialState = this.manifest.resolveInitialProps(this);
@@ -34,7 +39,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
     if (this.refId) {
       // this.log('addReference', this.refId)
-      this.scope.addReference(this.refId, this);
+      this.refId.split(",").forEach((refId) => this.scope.addReference(refId, this));
     }
   }
 
@@ -59,7 +64,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
   // updates component state
   up(delta?: Delta | Promise<any> | null | void | unknown, force = false): void {
-    if (!delta || this.isDone) {
+    if (!delta || this.#isDone) {
       return;
     }
 
@@ -75,14 +80,12 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
         const isSpreading = !k || k.startsWith("...");
         const racer = this.raceCondition(`set:${k}`);
         void v.then((val) => racer(() => this.up(isSpreading ? val : { [k]: val })));
-
       } else if (k && typeof v !== "undefined") {
         if (k[0] === "$") {
           if (this.$component[k] !== v) {
             changes.set(k.slice(1), v);
           }
         } else {
-
           const fprint = objectFingerprint(v);
           if (!(k in this.#fprints) || fprint !== this.#fprints[k]) {
             this.#fprints[k] = fprint;
@@ -116,7 +119,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
    * use '@' prefix to access platform resources.
    * Functional values are bounded and cached.
    *
-   * @param {string} propId - The ID of the property. 
+   * @param {string} propId - The ID of the property.
    * @return {unknown} The value associated with the property ID.
    */
   get(propId: string): unknown {
@@ -132,8 +135,8 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
     if (instant && typeof instant === "function") {
       const bound = instant.bind(impl);
       fn = () => bound;
-    } else if (impl.__getProperty) {
-      fn = () => (impl.__getProperty as (p: string) => unknown)(propId);
+    } else if (impl.__getStateProperty) {
+      fn = () => (impl.__getStateProperty as (p: string) => unknown)(propId);
     } else {
       const [pk, ...path] = propId.split(".");
       if (pk === "R") {
@@ -141,7 +144,8 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
         fn = () => val;
       } else {
         const gettr = impl[`get${capitalize(pk)}`];
-        const fn0 = typeof gettr === "function" ? () => gettr.call(impl) ?? null : () => impl[pk] ?? null;
+        const fn0 =
+          typeof gettr === "function" ? () => gettr.call(impl) ?? null : () => impl[pk] ?? null;
 
         fn = !path.length ? fn0 : () => path.reduce((r, p) => r?.[p] ?? null, fn0());
       }
@@ -175,7 +179,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
   // emits action event to this component
   emit(key: string, data: Delta): void {
-    if (this.isDone) return;
+    if (this.#isDone) return;
 
     try {
       if (key.endsWith(")")) {
@@ -194,9 +198,9 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
         const result = method.call(impl, data);
 
-        // this.log(`-> ${refId}.${target}(data)`, result, data, impl);
-
         ref.up(result);
+
+        // this.log(`-> ${refId}.${target}(data)`, data, impl);
       } else {
         let [refId, target] = key.split(".");
         if (!target) {
@@ -213,7 +217,6 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
         // this.log(`-> ${refId}.${target} = `, data);
       }
-
     } catch (ex) {
       this.logError(`emit ${key}:`, ex);
     }
@@ -223,12 +226,10 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
   // Done  hook.
   done() {
-    if (this.isDone) {
+    if (this.#isDone) {
       return;
     }
-    this.isDone = true;
-
-    this.$component.done?.(this);
+    this.#isDone = true;
 
     this.children?.forEach((c) => c.done());
 
@@ -254,7 +255,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
       this.up(this.#initialState, true);
 
-      this.up(this.$component.init?.(this));
+      this.up(this.$component.__init?.(this));
     } else {
       void this.up(this.manifest.resolveProps(this), true);
     }
@@ -263,7 +264,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
   // --- Content.
 
   // map of children contexts
-  get children(): Map<Uid, IArrmatron> | undefined {
+  get children(): Map<Uid, Arrmatron> | undefined {
     return this.$children;
   }
 
@@ -292,7 +293,8 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
     const children = new Map<Uid, Arrmatron>();
 
     nodes?.forEach((node: IManifestNode, uid: Uid) => {
-      const e = this.$children?.get(uid) ?? node.createArrmatron(this.platform, this, this.recontentScope);
+      const e =
+        this.$children?.get(uid) ?? node.createArrmatron(this.platform, this, this.recontentScope);
       children.set(e.uid, e);
     });
 
@@ -342,33 +344,37 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
         }
 
         if (!sourcePropName) {
-          this.logError(`Connect: No prop specified: ${key}`);
+          this.logError(`Connect: No Source Property Name: ${refId}`);
           continue;
         }
 
         const applicator = targetPropName ? (rr: any) => ({ [targetPropName]: rr }) : identity;
 
-        this.defer((() => {
-          let popre;
-          return ref.subscribe(async (source: Arrmatron) => {
-            try {
-              const val = await source.get(sourcePropName);
-              const fingerprint = objectFingerprint(val);
-
-              if (popre !== undefined && popre === fingerprint) return;
-
-              popre = fingerprint;
-              const r = applicator(pipes(this, val));
-              this.up(r as Delta);
-            } catch (ex) {
-              source.logError("Notify ", ex);
-            }
-          })
-        })()
+        this.defer(
+          (() => {
+            let popre;
+            return ref.subscribe(async (source: Arrmatron) => {
+              try {
+                const val = await source.get(sourcePropName);
+                const fingerprint = objectFingerprint(val);
+
+                if (popre !== undefined && popre === fingerprint) return;
+
+                popre = fingerprint;
+                const r = applicator(pipes(this, val));
+                this.up(r as Delta);
+              } catch (ex) {
+                source.logError("Notify ", ex);
+              }
+            });
+          })()
         );
 
         // hot subscription
-        Object.assign(this.#initialState, applicator(pipes(ref, ref.get(sourcePropName))));
+        Object.assign(
+          this.#initialState,
+          applicator(pipes(ref, sourcePropName ? ref.get(sourcePropName) : ref.$component))
+        );
       }
     }
   }
@@ -409,7 +415,7 @@ export class Arrmatron<T extends IManifestNode = IManifestNode> implements IArrm
 
   toast = (t: LogEntry) => {
     this.platform.toast(t, this);
-  }
+  };
 
   toString(): string {
     return stringify(this);

package/src/core/Component.ts

@@ -1,43 +1,42 @@
 import type { Delta, Hash, LogEntry } from "ultimus/types";
 
-import type { IComponent, IArrmatron } from "../../types";
+import type { IComponentContext, IArrmatron, IComponent } from "../../types";
 
 /**
  * Base Ancestor for custom components.
  */
 export abstract class Component implements IComponent {
   [key: string]: unknown;
+  readonly $ctx: IComponentContext;
 
-  constructor(_: Hash, private readonly $ctx: IArrmatron) {
-    //no-op
+  constructor(initials: Hash, ctx: IComponentContext) {
+    this.$ctx = ctx;
+    this.__created(initials);
   }
 
-  get platform() {
-    return this.$ctx.platform;
-  }
+  // Lifecycle method called within constructor.
+  __created(_: Hash) {}
 
-  get isDone() {
-    return this.$ctx.isDone;
+  get refId() {
+    return this.$ctx.refId;
   }
 
-  // hook on done
-  done(_: IArrmatron): void {
-    //no-op
+  get platform() {
+    return this.$ctx.platform;
   }
 
-  // hook on init
+  // hook on initialization
   // returned value will be used to update state
-  init(_: IArrmatron): Delta | null | undefined | unknown {
+  __init(_: IArrmatron): Delta | null | undefined | unknown {
     return undefined;
   }
-
-  // get from ctx state
+  // get from$ctx state
   get(key: string) {
     return this.$ctx.get(key);
   }
 
-  // update ctx state
-  up(d: Delta) {
+  // update$ctx state
+  up(d) {
     return this.$ctx.up(d);
   }
 
@@ -46,7 +45,7 @@ export abstract class Component implements IComponent {
   }
 
   // emit action event to another component by key
-  emit(key: string, data: Delta) {
+  emit(key: string, data: Delta = {}) {
     return this.$ctx.emit(key, data);
   }
 
@@ -55,14 +54,13 @@ export abstract class Component implements IComponent {
     this.$ctx.defer(fn);
   }
 
-  // register callback to be called on done
   defineCalculatedProperty(key, fn: (...args: any[]) => any, deps?: string[]) {
     let depKey = "";
     let depValue = undefined;
     Object.defineProperty(this, key, {
       get() {
         const args: any[] = deps?.length ? deps.map((k) => this.$ctx.get(k)) : [];
-        const newKey = args.join(':');
+        const newKey = args.join(":");
         if (depKey !== newKey) {
           depKey = newKey;
           depValue = fn.apply(this, args);
@@ -85,6 +83,6 @@ export abstract class Component implements IComponent {
   }
 
   toString() {
-    return this.$ctx.toString();
+    return `${this.$ctx.toString()}${this.name ? `(${this.name})` : ""}`;
   }
 }

package/src/core/ManifestNode.ts

@@ -7,14 +7,13 @@ import { compilePipeExpression } from "../utils/compileExpression";
 import { Arrmatron } from "./Arrmatron";
 import { resolveExpression } from "./resolveExpression";
 
-
 type PropertyResolver = (c: IArrmatron, acc: Delta) => Delta;
 
 type PropertyGetter = (c: IArrmatron) => unknown;
 
 /**
  * ManifestNode is a abstract factory for Arrmatron.
- * 
+ *
  * Each specific kind of Arrmatron has its own descending implementation of ManifestNode.
  */
 export abstract class ManifestNode implements IManifestNode {
@@ -30,7 +29,12 @@ export abstract class ManifestNode implements IManifestNode {
     this.uid = `${nextId("N")}:${xid}`;
   }
 
-  abstract get EntitronConstructor(): new (platform: IPlatform, node: typeof this, parent?: Arrmatron, scope?: Arrmatron) => Arrmatron;
+  abstract get EntitronConstructor(): new (
+    platform: IPlatform,
+    node: typeof this,
+    parent?: Arrmatron,
+    scope?: Arrmatron
+  ) => Arrmatron;
 
   /**
    * Create a context object.
@@ -87,7 +91,7 @@ export abstract class ManifestNode implements IManifestNode {
 
   private addEmitter(expr: ExpressionText, k: string) {
     const { key, pipec } = compilePipeExpression(expr);
-    const rkey = key + (expr.endsWith(")") ? "()" : '');
+    const rkey = key + (expr.endsWith(")") ? "()" : "");
     this.initialState[k] = (c) => (data: unknown) => c.scope?.emit(rkey, pipec(c, data) as Delta);
   }
 
@@ -110,9 +114,9 @@ export abstract class ManifestNode implements IManifestNode {
       this.addDataPropertyResolver(resolveExpression(v), k.slice(5));
     } else if (k === "Ref") {
       this.refId = String(v);
-    } else if (k === '(...)') {
+    } else if (k === "Props") {
       const sv = String(v);
-      if (sv[0] === "<" && sv[1] === "-") {
+      if (sv.startsWith("<-")) {
         this.addConnector(sv.slice(2), "");
       } else {
         this.addPropertiesResolver(resolveExpression(sv));
@@ -121,22 +125,21 @@ export abstract class ManifestNode implements IManifestNode {
       if (typeof v !== "string") {
         this.initialState[k] = () => v;
       } else {
-        if (v[0] === "<" && v[1] === "-") {
-          this.addConnector(v.slice(2), k);
-        } else if (v[0] === "-" && v[1] === ">") {
-          this.addEmitter(v.slice(2), k);
-        } else if (v[0] === "d" && v.startsWith("data->")) {
-          this.addEmitter(v.slice(6), k);
-        } else {
-          if (!v.includes("{")) {
-            this.initialState[k] = () => v;
-          } else {
-            if (v[0] === "R" && v[1] === "." && v.match(/^@@[a-z0-9\-_.]+$/i) != null) {
-              this.initialState[k] = (c) => c.platform.getResource(v.slice(2));
+        if (!v.includes("{")) {
+          if (v.startsWith("<-")) {
+            if (v.endsWith(".This")) {
+              const refId = v.slice(2, -5).trim();
+              this.initialState[k] = (c) => c.getByRef(refId)?.$component;
             } else {
-              this.addPropertyResolver(resolveExpression(v), k);
+              this.addConnector(v.slice(2), k);
             }
+          } else if (v.startsWith("->")) {
+            this.addEmitter(v.slice(2).trim() || "*", k);
+          } else {
+            this.initialState[k] = () => v;
           }
+        } else {
+          this.addPropertyResolver(resolveExpression(v), k);
         }
       }
     }

package/src/core/resolveExpression.ts

@@ -1,6 +1,10 @@
 import { createStringInterpolator } from "ultimus/src/parsing/createStringInterpolator";
 
-import { compileConstant, compileJsExpression, compilePlaceholder } from "../utils/compileExpression";
+import {
+  compileConstant,
+  compileJsExpression,
+  compilePlaceholder,
+} from "../utils/compileExpression";
 // \{\{([\w\.]+)\}\}
 
 const CACHE = new Map();
@@ -13,7 +17,7 @@ function compileExpression(v: unknown) {
   if (v.includes("{")) {
     const vCutOne = v.slice(1, -1);
     if (v[0] === "{" && v[v.length - 1] === "}" && !vCutOne.includes("{")) {
-      return compilePlaceholder(vCutOne)
+      return compilePlaceholder(vCutOne);
     }
     return createStringInterpolator(v.replace(/\s+/g, " "), compilePlaceholder);
   }
@@ -22,4 +26,4 @@ function compileExpression(v: unknown) {
 
 export const resolveExpression = (x: unknown) => {
   return CACHE.has(x) ? CACHE.get(x) : CACHE.set(x, compileExpression(x)).get(x);
-}
+};

package/src/registry/{iterations.ts → Iterative.ts}

@@ -1,22 +1,10 @@
 import type { EContent, IManifestNode, IPlatform } from "arrmatura/types";
-import { mapEntries } from "ultimus";
 import type { Datum, Delta, Hash, Uid, XmlNode } from "ultimus/types";
 
 import { Arrmatron } from "../core/Arrmatron";
 import { ManifestNode } from "../core/ManifestNode";
 import { compilePlaceholder } from "../utils/compileExpression";
-
-
-const narrowData = (data: any) => {
-  if (!data) {
-    return [];
-  }
-  if (Array.isArray(data)) return data;
-  if (typeof data[Symbol.iterator] === 'function') return [...data];
-  if (typeof data === "string") return data.split(',').map(id => ({ id, name: id }));
-  if (typeof data === "object") return mapEntries(data, (key, value) => ({ ...value, id: key }));
-  return [{ id: String(data), name: String(data) }];
-}
+import { narrowData } from "../utils/narrowData";
 
 class Iterative extends Arrmatron<CForNode> {
   pkHash: Hash<Datum> = {};
@@ -32,7 +20,6 @@ class Iterative extends Arrmatron<CForNode> {
     this.pkHash = {};
     if (each?.length) {
       if (!each.forEach) {
-         
         throw new Error(`[each] Items has no forEach() ${each.toString()}`);
       }
       each.forEach((_datum: Datum, index: number) => {
@@ -83,7 +70,12 @@ export class CForNode extends ManifestNode {
 
   getItemCtxNode(platform: IPlatform) {
     return (
-      this.#itemNode ?? (this.#itemNode = new CItemNode(this.#xmlNode.id, this.#itemName, platform.getCompiledNodes([this.#xmlNode])))
+      this.#itemNode ??
+      (this.#itemNode = new CItemNode(
+        this.#xmlNode.id,
+        this.#itemName,
+        platform.getCompiledNodes([this.#xmlNode])
+      ))
     );
   }
 
@@ -107,7 +99,10 @@ class IterativeItem extends Arrmatron<CItemNode> {
 
   get(propId: string) {
     const iName: string = this.manifest.itemName;
-    const value = propId.startsWith(`${iName}.`) || propId === iName ? super.get(propId) : this.scope.get(propId);
+    const value =
+      propId.startsWith(`${iName}.`) || propId === iName
+        ? super.get(propId)
+        : this.scope.get(propId);
     // this.log(propId, value);
     return value;
   }

package/src/registry/composition.ts

@@ -48,10 +48,13 @@ export class CCompositeNode extends ManifestNode {
         return groups;
       }, {});
 
-      this.slotContent = Object.entries(slots ?? {}).reduce<Hash<EContent>>((groups, [gId, nodes]) => {
-        groups[gId] = platform.getCompiledNodes(nodes);
-        return groups;
-      }, {});
+      this.slotContent = Object.entries(slots ?? {}).reduce<Hash<EContent>>(
+        (groups, [gId, nodes]) => {
+          groups[gId] = platform.getCompiledNodes(nodes);
+          return groups;
+        },
+        {}
+      );
     }
 
     return this.slotContent[slotId || "default"] ?? undefined;

package/src/registry/conditionals.ts

@@ -49,10 +49,10 @@ export class CIfNode extends ManifestNode {
         $then = ifThen
           ? ifThen.nodes
           : [
-            Object.assign(this.#xml, {
-              nodes: nodes.filter((e) => e !== ifElse),
-            }),
-          ];
+              Object.assign(this.#xml, {
+                nodes: nodes.filter((e) => e !== ifElse),
+              }),
+            ];
       } else if (ifThen) {
         $then = ifThen.nodes;
       }
@@ -68,7 +68,10 @@ export class CIfNode extends ManifestNode {
     } else if (expr.slice(0, 5) === "slot(") {
       const slotId = expr.slice(5, -1);
       // DO NOT place inside iterations.
-      this.addPropertyResolver((c: IArrmatron) => !!(c.scope as Composite).slotContent?.(slotId)?.size, "condition");
+      this.addPropertyResolver(
+        (c: IArrmatron) => !!(c.scope as Composite).slotContent?.(slotId)?.size,
+        "condition"
+      );
     } else {
       const resolver = compilePlaceholder(expr);
       this.addPropertyResolver((c) => !!resolver(c), "condition");

package/src/registry/connector.ts

@@ -7,8 +7,6 @@ import { objectFingerprint } from "../utils/FingerprintMashine";
 class Connector extends Arrmatron<ConnectorNode> {
   prevkey: any;
 
-  counter = 0;
-
   /**
    * Triggers an with changes after a specified timeout.
    *
@@ -16,11 +14,15 @@ class Connector extends Arrmatron<ConnectorNode> {
    */
   touch() {
     super.touch();
-    //   if (this.isDone) return;
+
     const { trigger, data, change } = this.$component;
-    const key = 'trigger' in this.$component ? trigger : data;
+    const hasTrigger = "trigger" in this.$component;
+
+    if (hasTrigger && trigger == null) return;
+
+    const key = hasTrigger ? trigger : data;
     const fprint = objectFingerprint(key);
-    const changed = !('prevkey' in this) || this.prevkey != fprint;
+    const changed = !("prevkey" in this) || this.prevkey != fprint;
 
     if (!changed) return;
 
@@ -43,5 +45,4 @@ export class ConnectorNode extends ManifestNode {
   get EntitronConstructor() {
     return Connector;
   }
-
 }

package/src/registry/index.ts

@@ -2,20 +2,17 @@ import { Uid, XmlNode } from "ultimus";
 
 import { IManifestNode } from "../../types";
 
+import { CForNode } from "./Iterative";
 import { CCompositeNode } from "./composition";
 import { CIfNode } from "./conditionals";
 import { ConnectorNode } from "./connector";
 import { CElementNode } from "./elementary";
 import { CFragmentNode } from "./fragment";
-import { CForNode } from "./iterations";
 import { CDynamicTagNode } from "./routing";
 import { CSelectorNode } from "./selection";
 import { CSlotNode } from "./slot";
 
-
-
 const cloneNode = (x: XmlNode, eliminateAttr: string): XmlNode => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { [eliminateAttr]: _, ...attrs } = x.attrs ?? {};
   return {
     text: x.text,
@@ -27,7 +24,7 @@ const cloneNode = (x: XmlNode, eliminateAttr: string): XmlNode => {
 };
 
 const __compileManifestNode = (x: XmlNode): IManifestNode => {
-  const { tag = 'div', attrs } = x;
+  const { tag = "div", attrs } = x;
   if (attrs?.["Each"]) {
     return new CForNode(cloneNode(x, "Each"), String(attrs["Each"]).trim().split(" "));
   }

package/src/registry/root.ts

@@ -30,7 +30,7 @@ export class CRootNode extends ManifestNode {
   nodes?: XmlNode["nodes"];
 
   constructor(private template: string) {
-    super('R0');
+    super("R0");
     this.slotContent = {};
   }
 

package/src/registry/routing.ts

@@ -12,7 +12,12 @@ class DynamicTag extends Arrmatron<CDynamicTagNode> {
     const tag = this.$component.tag;
     const uid = `${this.uid}:${String(tag ?? "")}`;
     return new Map([
-      [uid, Object.assign(this.platform.getCompiledNodes({ ...this.manifest.xml, tag } as XmlNode), { uid })],
+      [
+        uid,
+        Object.assign(this.platform.getCompiledNodes({ ...this.manifest.xml, tag } as XmlNode), {
+          uid,
+        }),
+      ],
     ]);
   }
 }