Tag entities with hash of zod schema and query by it

Author: bfollington

typescript/package-lock.json

@@ -195,6 +195,10 @@ export class Select<Match extends Selector = Selector> {
     return { ...this.#select };
   }
 
+  get constraints(): WhereBuilder {
+    return this.#where;
+  }
+
   get clauses(): Clause[] {
     return this.#where.commit();
   }

typescript/packages/common-system/src/rule-builder.ts

@@ -67,7 +67,7 @@
     "merkle-reference": "^1.1.0",
     "mermaid": "^11.4.1",
     "panzoom": "^9.4.3",
-    "zod": "^3.x.x",
+    "zod": "^3.24.1",
     "zod-to-json-schema": "^3.23.3"
   },
   "overrides": {

typescript/packages/lookslike-high-level/package.json

@@ -8,6 +8,7 @@ export class ShaderLayer extends LitElement {
   @property({ type: Number }) width = 640;
   @property({ type: Number }) height = 480;
   @property({ type: String }) blendMode = 'default';
+  @property({ type: String, reflect: true }) errorMessage: string | null = null;
 
   private canvasRef = createRef<HTMLCanvasElement>();
   private gl?: WebGLRenderingContext;
@@ -17,7 +18,6 @@ export class ShaderLayer extends LitElement {
   private animationFrame?: number;
   private startTime = performance.now();
   private vertexShader?: WebGLShader;
-  private errorMessage: string | null = null;
 
   static override styles = css`
     :host {
@@ -87,6 +87,7 @@ export class ShaderLayer extends LitElement {
     });
     if (!gl) {
       this.errorMessage = "WebGL not supported";
+      this.requestUpdate();
       return;
     }
     this.gl = gl;
@@ -97,6 +98,7 @@ export class ShaderLayer extends LitElement {
     const vertexShader = gl.createShader(gl.VERTEX_SHADER);
     if (!vertexShader) {
       this.errorMessage = "Failed to create vertex shader";
+      this.requestUpdate();
       return;
     }
     this.vertexShader = vertexShader;
@@ -113,6 +115,7 @@ export class ShaderLayer extends LitElement {
 
     if (!gl.getShaderParameter(vertexShader, gl.COMPILE_STATUS)) {
       this.errorMessage = `Vertex shader error: ${gl.getShaderInfoLog(vertexShader)}`;
+      this.requestUpdate();
       return;
     }
 
@@ -138,12 +141,14 @@ export class ShaderLayer extends LitElement {
     const program = gl.createProgram();
     if (!program) {
       this.errorMessage = "Failed to create program";
+      this.requestUpdate();
       return;
     }
 
     const fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
     if (!fragmentShader) {
       this.errorMessage = "Failed to create fragment shader";
+      this.requestUpdate();
       return;
     }
 
@@ -153,6 +158,7 @@ export class ShaderLayer extends LitElement {
     if (!gl.getShaderParameter(fragmentShader, gl.COMPILE_STATUS)) {
       this.errorMessage = `Fragment shader error: ${gl.getShaderInfoLog(fragmentShader)}`;
       gl.deleteShader(fragmentShader);
+      this.requestUpdate();
       return;
     }
 
@@ -164,6 +170,7 @@ export class ShaderLayer extends LitElement {
       this.errorMessage = `Program linking error: ${gl.getProgramInfoLog(program)}`;
       gl.deleteShader(fragmentShader);
       gl.deleteProgram(program);
+      this.requestUpdate();
       return;
     }
 

typescript/packages/lookslike-high-level/src/components/shader-layer.ts

@@ -61,6 +61,7 @@ import { musicLibrary } from "./spells/18_music.jsx";
 import { spellManager } from './spells/19_process_manager.jsx'
 import { shaderManager } from './spells/20_shader_editor.jsx'
 import { schemaGenerator } from './spells/21_model_builder.jsx'
+import { search } from './spells/22_search.jsx'
 
 export type Charm = {
   [NAME]?: string;
@@ -260,6 +261,7 @@ addCharms([
   spellManager.spawn({ spellManager: 1 }),
   shaderManager.spawn({ shaderManager: 1 }),
   schemaGenerator.spawn({ schemaGenerator: 1 }),
+  search.spawn({ search: 1 }),
   FetchService.spawn() as any,
   GmailService.spawn() as any,
   ViewService.spawn() as any,

typescript/packages/lookslike-high-level/src/data.ts

@@ -10,18 +10,18 @@ import { Reference } from "merkle-reference";
 import { importEntity, resolve } from "../sugar/sugar.jsx";
 import { Ref, UiFragment } from "../sugar/zod.js";
 
-const Artist = z.object({
+export const Artist = z.object({
   name: z.string().min(1).max(255).describe("The name of the artist"),
 });
 
-const Song = z.object({
+export const Song = z.object({
   title: z.string().min(1).max(255).describe("The title of the song"),
   artists: z.array(Artist).min(1).describe("The artists who performed the song"),
   duration: z.number().min(1).describe("The duration in seconds"),
   year: z.number().min(1900).max(2100).describe("The release year")
 });
 
-const Album = z.object({
+export const Album = z.object({
   "album/title": z.string().min(1).max(255).describe("The album title"),
   artist: Artist.describe("The primary artist"),
   songs: z.array(Song).min(1).describe("The songs on the album"),
@@ -151,51 +151,51 @@ const playlistEditor = typedBehavior(Playlist, {
 
 export const musicLibrary = typedBehavior(
   MusicLibrary.pick({
-    focused: true,
+    // focused: true,
     '~/common/ui/artist-list': true,
     '~/common/ui/song-list': true,
     '~/common/ui/album-list': true,
     '~/common/ui/playlist-list': true
   }), {
-  render: ({ self, focused, '~/common/ui/artist-list': artistList, '~/common/ui/song-list': songList, '~/common/ui/album-list': albumList, '~/common/ui/playlist-list': playlistList }) => (
-    <div entity={self}>
+  render: ({
+    self,
+    '~/common/ui/artist-list': artistList,
+    '~/common/ui/song-list': songList,
+    '~/common/ui/album-list': albumList,
+    '~/common/ui/playlist-list': playlistList
+  }) => (
+    <div entity={self} title="Music">
       <div>
-        {focused ? (
-          <div>
-            <button onclick="~/on/close-editor">Close</button>
-            <Charm self={focused} spell={songEditor as any} />
-          </div>
-        ) : (
-          <div>
-            <h3>Add Artist</h3>
-            <common-form
-              schema={Artist}
-              reset
-              onsubmit="~/on/add-artist"
-            />
-            <h3>Add Song</h3>
-            <common-form
-              schema={Song}
-              referenceFields={new Set(['artists'])}
-              reset
-              onsubmit="~/on/add-song"
-            />
-            <h3>Add Album</h3>
-            <common-form
-              schema={Album}
-              referenceFields={new Set(['artist', 'songs'])}
-              reset
-              onsubmit="~/on/add-album"
-            />
-            <h3>Add Playlist</h3>
-            <common-form
-              schema={Playlist}
-              referenceFields={new Set(['songs'])}
-              reset
-              onsubmit="~/on/add-playlist"
-            />
-          </div>
-        )}
+        <div>
+          <h3>Add Artist</h3>
+          <common-form
+            schema={Artist}
+            reset
+            onsubmit="~/on/add-artist"
+          />
+          <h3>Add Song</h3>
+          <common-form
+            schema={Song}
+            referenceFields={new Set(['artists'])}
+            reset
+            onsubmit="~/on/add-song"
+          />
+          <h3>Add Album</h3>
+          <common-form
+            schema={Album}
+            referenceFields={new Set(['artist', 'songs'])}
+            reset
+            onsubmit="~/on/add-album"
+          />
+          <h3>Add Playlist</h3>
+          <common-form
+            schema={Playlist}
+            referenceFields={new Set(['songs'])}
+            reset
+            onsubmit="~/on/add-playlist"
+          />
+        </div>
+
       </div>
 
       <div>

typescript/packages/lookslike-high-level/src/spells/18_music.tsx

@@ -10,7 +10,7 @@ import { event, subview, Transact } from "../sugar.js";
 import { Charm as CharmComponent, initRules, typedBehavior, typedService } from "./spell.jsx";
 import { z } from "zod";
 import { fromString, Reference } from "merkle-reference";
-import { importEntity, resolve } from "../sugar/sugar.jsx";
+import { importEntity, resolve, tagWithSchema } from "../sugar/sugar.jsx";
 import { Ref, UiFragment } from "../sugar/zod.js";
 import { tsToExports } from "../localBuild.js";
 import { sendMessage } from "./stickers/chat.jsx";
@@ -40,7 +40,7 @@ const generateIdentifier = () => {
 };
 
 // Define the core schemas
-const Spell = z.object({
+export const Spell = z.object({
   name: z.string().min(1).max(255).describe("The name of the spell"),
   sourceCode: z.string().min(1).max(8192).describe("The spell's source code"),
   notes: z.string().describe("Notes about the spell"),
@@ -163,6 +163,7 @@ const spellEditor = typedBehavior(Spell, {
         const ev = Session.resolve<SubmitEvent<z.infer<typeof Spell>>>(event);
         const spell = ev.detail.value;
         cmd.add(...Transact.set(self, spell))
+        cmd.add(tagWithSchema(self, Spell))
       }),
 
     onModifyWithAI: event("~/on/modify-with-ai")
@@ -674,7 +675,7 @@ export const spellManager = typedBehavior(
     '~/common/ui/charm-list': true
   }), {
   render: ({ self, editingSpell, focusedCharm, '~/common/ui/spell-list': spellList, '~/common/ui/charm-list': charmList }) => (
-    <div entity={self}>
+    <div entity={self} title="Spell Manager">
       <div>
         <details>
           <h3>Create New Spell</h3>

typescript/packages/lookslike-high-level/src/spells/19_process_manager.tsx

@@ -9,7 +9,7 @@ import { event, subview, Transact } from "../sugar.js";
 import { Charm, initRules, typedBehavior } from "./spell.jsx";
 import { z } from "zod";
 import { Reference } from "merkle-reference";
-import { importEntity, resolve } from "../sugar/sugar.jsx";
+import { importEntity, resolve, tagWithSchema } from "../sugar/sugar.jsx";
 import { Ref, UiFragment } from "../sugar/zod.js";
 import { llm, RESPONSE } from "../effects/fetch.jsx";
 
@@ -45,7 +45,7 @@ const SHADER_TEMPLATE = `    precision mediump float;
 `;
 
 // Define the core schemas
-const Shader = z.object({
+export const Shader = z.object({
   name: z.string().min(1).max(255).describe("The name of the shader"),
   sourceCode: z.string().min(1).max(8192).describe("The shader's GLSL source code"),
   notes: z.string().describe("Notes about the shader")
@@ -107,6 +107,7 @@ const shaderEditor = typedBehavior(Shader, {
         const ev = Session.resolve<SubmitEvent<z.infer<typeof Shader>>>(event);
         const shader = ev.detail.value;
         cmd.add(...Transact.set(self, shader))
+        cmd.add(tagWithSchema(self, Shader))
       }),
 
     onModifyWithAI: event("~/on/modify-with-ai")
@@ -156,7 +157,7 @@ export const shaderManager = typedBehavior(
     '~/common/ui/navigation': true
   }), {
   render: ({ self, editingShader, '~/common/ui/shader-list': shaderList, '~/common/ui/navigation': navigation }) => (
-    <div entity={self}>
+    <div entity={self} title="Genuary">
       <div>
         <details>
           <h3>Create New Shader</h3>

typescript/packages/lookslike-high-level/src/spells/20_shader_editor.tsx

@@ -111,7 +111,7 @@ type SubmitEvent<T> = {
 
 export const schemaGenerator = typedBehavior(SchemaGenerator, {
   render: ({ self, description, generatedCode, mermaidDiagram }) => (
-    <div entity={self}>
+    <div entity={self} title="Domain Model Generator">
       <h3>Domain Model Generator</h3>
       <common-form
         schema={DomainModel}