[web] Update model processor usage (#47)

Author: paullewis

web/lib/src/0.8/data/model-processor.ts

@@ -60,7 +60,6 @@ import {
 export class A2UIModelProcessor {
   static readonly DEFAULT_SURFACE_ID = "@default";
 
-  #currentSurface = A2UIModelProcessor.DEFAULT_SURFACE_ID;
   #mapCtor: MapConstructor = Map;
   #arrayCtor: ArrayConstructor = Array;
   #setCtor: SetConstructor = Set;
@@ -118,8 +117,6 @@ export class A2UIModelProcessor {
         this.#handleDeleteSurface(message.deleteSurface);
       }
     }
-
-    this.#currentSurface = A2UIModelProcessor.DEFAULT_SURFACE_ID;
   }
 
   /**
@@ -132,7 +129,7 @@ export class A2UIModelProcessor {
     relativePath: string,
     surfaceId = A2UIModelProcessor.DEFAULT_SURFACE_ID
   ): DataValue | null {
-    const surface = this.#surfaces.get(surfaceId);
+    const surface = this.#getOrCreateSurface(surfaceId);
     if (!surface) return null;
 
     let finalPath: string;
@@ -149,25 +146,13 @@ export class A2UIModelProcessor {
     return this.#getDataByPath(surface.dataModel, finalPath);
   }
 
-  getDataByPath(path: string, surfaceId: SurfaceID | null = null) {
-    if (!surfaceId) {
-      surfaceId = A2UIModelProcessor.DEFAULT_SURFACE_ID;
-    }
-    const surface = this.#getOrCreateSurface(surfaceId);
-    if (!surface) {
-      return null;
-    }
-
-    return this.#getDataByPath(surface.dataModel, path) ?? null;
-  }
-
   setData(
     node: AnyComponentNode,
     relativePath: string,
     value: DataValue,
     surfaceId = A2UIModelProcessor.DEFAULT_SURFACE_ID
   ): void {
-    const surface = this.#surfaces.get(surfaceId);
+    const surface = this.#getOrCreateSurface(surfaceId);
     if (!surface) return null;
 
     let finalPath: string;
@@ -184,19 +169,6 @@ export class A2UIModelProcessor {
     this.#setDataByPath(surface.dataModel, finalPath, value);
   }
 
-  setDataByPath(
-    path: string,
-    value: DataValue,
-    surfaceId = A2UIModelProcessor.DEFAULT_SURFACE_ID
-  ) {
-    const surface = this.#getOrCreateSurface(surfaceId);
-    if (!surface) {
-      return null;
-    }
-
-    return this.#setDataByPath(surface.dataModel, path, value);
-  }
-
   resolvePath(path: string, dataContextPath?: string): string {
     // If the path is absolute, it overrides any context.
     if (path.startsWith("/")) {

web/lib/src/0.8/events/a2ui.ts

@@ -15,6 +15,7 @@
  */
 
 import { Action } from "../types/components.js";
+import { AnyComponentNode } from "../types/types.js";
 import { BaseEventDetail } from "./base.js";
 
 type Namespace = "a2ui";
@@ -23,4 +24,5 @@ export interface A2UIAction extends BaseEventDetail<`${Namespace}.action`> {
   readonly action: Action;
   readonly dataContextPath: string;
   readonly sourceComponentId: string;
+  readonly sourceComponent: AnyComponentNode;
 }

web/lib/src/0.8/ui/button.ts

@@ -57,6 +57,7 @@ export class Button extends Root {
             action: this.action,
             dataContextPath: this.dataContextPath,
             sourceComponentId: this.id,
+            sourceComponent: this.component,
           });
           this.dispatchEvent(evt);
         }}

web/lib/src/0.8/ui/datetime-input.ts

@@ -67,9 +67,11 @@ export class DateTimeInput extends Root {
       return;
     }
 
-    this.processor.setDataByPath(
-      this.processor.resolvePath(this.value.path, this.dataContextPath),
-      value
+    this.processor.setData(
+      this.component,
+      this.value.path,
+      value,
+      this.surfaceId ?? A2UIModelProcessor.DEFAULT_SURFACE_ID
     );
   }
 

web/lib/src/0.8/ui/multiple-choice.ts

@@ -19,6 +19,7 @@ import { customElement, property } from "lit/decorators.js";
 import { Root } from "./root.js";
 import { StringValue } from "../types/primitives.js";
 import * as Styles from "./styles/index.js";
+import { A2UIModelProcessor } from "../data/model-processor.js";
 
 @customElement("a2ui-multiplechoice")
 export class MultipleChoice extends Root {
@@ -65,9 +66,11 @@ export class MultipleChoice extends Root {
       return;
     }
 
-    this.processor.setDataByPath(
-      this.processor.resolvePath(this.value.path, this.dataContextPath),
-      value
+    this.processor.setData(
+      this.component,
+      this.value.path,
+      value,
+      this.surfaceId ?? A2UIModelProcessor.DEFAULT_SURFACE_ID
     );
   }
 

web/restaurant/restaurant.ts

@@ -257,7 +257,8 @@ export class A2UILayoutEditor extends SignalWatcher(LitElement) {
                         item.value.path,
                         evt.detail.dataContextPath
                       );
-                      const value = this.#processor.getDataByPath(
+                      const value = this.#processor.getData(
+                        evt.detail.sourceComponent,
                         path,
                         surfaceId
                       );

web/tests/0.8/model.test.ts

@@ -45,7 +45,7 @@ const toPlainObject = (value: unknown): ReturnType<typeof JSON.parse> => {
 };
 
 describe("A2UIModelProcessor", () => {
-  let processor;
+  let processor = new v0_8.Data.A2UIModelProcessor();
 
   beforeEach(() => {
     processor = new v0_8.Data.A2UIModelProcessor();
@@ -138,7 +138,10 @@ describe("A2UIModelProcessor", () => {
           },
         },
       ]);
-      const name = processor.getDataByPath("/user/name");
+      const name = processor.getData(
+        { dataContextPath: "/" } as v0_8.Types.AnyComponentNode,
+        "/user/name"
+      );
       assert.strictEqual(name, "Alice");
     });
 
@@ -152,13 +155,17 @@ describe("A2UIModelProcessor", () => {
           },
         },
       ]);
-      const user = processor.getDataByPath("/user");
+      const user = processor.getData(
+        { dataContextPath: "/" } as v0_8.Types.AnyComponentNode,
+        "/user"
+      );
       assert.deepStrictEqual(toPlainObject(user), { name: "Bob" });
     });
 
     it("should create nested structures when setting data", () => {
-      processor.setDataByPath("/a/b/c", "value");
-      const data = processor.getDataByPath("/a/b/c");
+      const component = { dataContextPath: "/" } as v0_8.Types.AnyComponentNode;
+      processor.setData(component, "/a/b/c", "value");
+      const data = processor.getData(component, "/a/b/c");
       assert.strictEqual(data, "value");
     });
 
@@ -494,8 +501,9 @@ describe("A2UIModelProcessor", () => {
 
       processor.processMessages(messages);
 
-      const title = processor.getDataByPath("/title", "test-surface");
-      const items = processor.getDataByPath("/items", "test-surface");
+      const component = { dataContextPath: "/" } as v0_8.Types.AnyComponentNode;
+      const title = processor.getData(component, "/title", "test-surface");
+      const items = processor.getData(component, "/items", "test-surface");
 
       assert.strictEqual(title, "My Title");
       assert.deepStrictEqual(toPlainObject(items), [{ id: 1 }, { id: 2 }]);
@@ -512,7 +520,8 @@ describe("A2UIModelProcessor", () => {
         },
       ]);
 
-      const badData = processor.getDataByPath("/badData");
+      const component = { dataContextPath: "/" } as v0_8.Types.AnyComponentNode;
+      const badData = processor.getData(component, "/badData");
       assert.strictEqual(badData, invalidJSON);
     });
   });