@seedprotocol/sdk 0.7.9-next.1189.g5e63267 → 0.7.9

package/dist/src/ModelProperty/service/modelPropertyMachine.d.ts

@@ -1,14 +1,11 @@
-import { ActorRefFrom } from 'xstate';
 import { Static } from '@sinclair/typebox';
 import { TProperty } from '../../Schema';
 import { ValidationError } from '../../Schema/validation';
-import { writeProcessMachine } from '../../services/write/writeProcessMachine';
 export type ModelPropertyMachineContext = Static<typeof TProperty> & {
     _originalValues?: Partial<Static<typeof TProperty>>;
     _isEdited?: boolean;
     _schemaName?: string;
     _validationErrors?: ValidationError[];
-    writeProcess?: ActorRefFrom<typeof writeProcessMachine> | null;
     _propertyFileId?: string;
     _destroyError?: {
         message: string;
@@ -50,99 +47,31 @@ export declare const modelPropertyMachine: import("xstate").StateMachine<ModelPr
 } | {
     type: "validationError";
     errors: ValidationError[];
-} | {
-    type: "requestWrite";
-    data: any;
 } | {
     type: "destroyStarted";
 } | {
     type: "destroyError";
     error: unknown;
 }, {
-    [x: string]: import("xstate").ActorRefFromLogic<import("xstate").StateMachine<import("../../services/write/writeProcessMachine").WriteProcessContext, {
-        type: "startWrite";
-        data: any;
-    } | {
-        type: "writeSuccess";
-        output?: any;
-    } | {
-        type: "writeError";
-        error: Error;
-    }, {
-        [x: string]: import("xstate").ActorRefFromLogic<any> | undefined;
-    }, {
-        src: "validateEntity";
-        logic: any;
-        id: string | undefined;
-    } | {
-        src: "writeToDatabase";
-        logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, {
-            entityType: "model" | "modelProperty" | "schema";
-            entityId: string;
-            entityData: any;
-        }, import("xstate").EventObject>;
-        id: string | undefined;
-    }, never, never, never, "error" | "idle" | "validating" | "writing" | "success", string, Partial<import("../../services/write/writeProcessMachine").WriteProcessContext>, import("xstate").NonReducibleUnknown, import("xstate").EventObject, import("xstate").MetaObject, {
-        id: "writeProcess";
-        states: {
-            readonly idle: {};
-            readonly validating: {};
-            readonly writing: {};
-            readonly success: {};
-            readonly error: {};
-        };
-    }, import("xstate").MetaObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<ModelPropertyMachineContext>, import("xstate").EventObject>> | undefined;
+    [x: string]: import("xstate").ActorRefFromLogic<import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<ModelPropertyMachineContext>, import("xstate").EventObject>> | undefined;
 }, {
-    src: "writeProcessMachine";
-    logic: import("xstate").StateMachine<import("../../services/write/writeProcessMachine").WriteProcessContext, {
-        type: "startWrite";
-        data: any;
-    } | {
-        type: "writeSuccess";
-        output?: any;
-    } | {
-        type: "writeError";
-        error: Error;
-    }, {
-        [x: string]: import("xstate").ActorRefFromLogic<any> | undefined;
-    }, {
-        src: "validateEntity";
-        logic: any;
-        id: string | undefined;
-    } | {
-        src: "writeToDatabase";
-        logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, {
-            entityType: "model" | "modelProperty" | "schema";
-            entityId: string;
-            entityData: any;
-        }, import("xstate").EventObject>;
-        id: string | undefined;
-    }, never, never, never, "error" | "idle" | "validating" | "writing" | "success", string, Partial<import("../../services/write/writeProcessMachine").WriteProcessContext>, import("xstate").NonReducibleUnknown, import("xstate").EventObject, import("xstate").MetaObject, {
-        id: "writeProcess";
-        states: {
-            readonly idle: {};
-            readonly validating: {};
-            readonly writing: {};
-            readonly success: {};
-            readonly error: {};
-        };
-    }, import("xstate").MetaObject>;
-    id: string | undefined;
-} | {
     src: "saveToSchema";
     logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<ModelPropertyMachineContext>, import("xstate").EventObject>;
     id: string | undefined;
 } | {
-    src: "compareAndMarkDraft";
+    src: "validateProperty";
     logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<ModelPropertyMachineContext>, import("xstate").EventObject>;
     id: string | undefined;
 } | {
-    src: "validateProperty";
+    src: "compareAndMarkDraft";
     logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<ModelPropertyMachineContext>, import("xstate").EventObject>;
     id: string | undefined;
 }, {
     type: "assignValidationErrors";
     params: import("xstate").NonReducibleUnknown;
+} | {
+    type: "applyUpdate";
+    params: import("xstate").NonReducibleUnknown;
 }, {
     type: "isPropertyValid";
     params: unknown;

package/dist/src/ModelProperty/service/modelPropertyMachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modelPropertyMachine.d.ts","sourceRoot":"","sources":["../../../../src/ModelProperty/service/modelPropertyMachine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,YAAY,EAAE,MAAM,QAAQ,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAIpC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAE1E,MAAM,MAAM,2BAA2B,GAAG,MAAM,CAAC,OAAO,SAAS,CAAC,GAAG;IAEnE,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC,CAAA;IAEnD,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAA;IACrC,YAAY,CAAC,EAAE,YAAY,CAAC,OAAO,mBAAmB,CAAC,GAAG,IAAI,CAAA;IAE9D,eAAe,CAAC,EAAE,MAAM,CAAA;IAIxB,aAAa,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAC1D,CAAA;AAED,eAAO,MAAM,oBAAoB;;UAKjB,eAAe;;UACf,0BAA0B;oBAAkB,OAAO,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;iBAAe,MAAM;eAAa,OAAO;;UACtH,aAAa;;UACb,eAAe;gBAAc,MAAM;;UACnC,mBAAmB;YAAU,OAAO,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;;UAC9D,cAAc;;UACd,qBAAqB;;UACrB,mBAAmB;WAAS,KAAK;;UACjC,4BAA4B;;UAC5B,0BAA0B;;UAC1B,kBAAkB;;UAClB,mBAAmB;YAAU,eAAe,EAAE;;UAC9C,iBAAiB;YAAU,eAAe,EAAE;;UAC5C,cAAc;UAAQ,GAAG;;UACzB,gBAAgB;;UAChB,cAAc;WAAS,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+BAuU5C,CAAA"}
+{"version":3,"file":"modelPropertyMachine.d.ts","sourceRoot":"","sources":["../../../../src/ModelProperty/service/modelPropertyMachine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAIpC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,MAAM,MAAM,2BAA2B,GAAG,MAAM,CAAC,OAAO,SAAS,CAAC,GAAG;IAEnE,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC,CAAA;IAEnD,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAA;IAErC,eAAe,CAAC,EAAE,MAAM,CAAA;IAIxB,aAAa,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAC1D,CAAA;AAED,eAAO,MAAM,oBAAoB;;UAKjB,eAAe;;UACf,0BAA0B;oBAAkB,OAAO,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;iBAAe,MAAM;eAAa,OAAO;;UACtH,aAAa;;UACb,eAAe;gBAAc,MAAM;;UACnC,mBAAmB;YAAU,OAAO,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;;UAC9D,cAAc;;UACd,qBAAqB;;UACrB,mBAAmB;WAAS,KAAK;;UACjC,4BAA4B;;UAC5B,0BAA0B;;UAC1B,kBAAkB;;UAClB,mBAAmB;YAAU,eAAe,EAAE;;UAC9C,iBAAiB;YAAU,eAAe,EAAE;;UAC5C,gBAAgB;;UAChB,cAAc;WAAS,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+BAuM5C,CAAA"}

package/dist/src/Schema/Schema.d.ts

@@ -1,12 +1,8 @@
 import { ActorRefFrom } from 'xstate';
 import { schemaMachine } from './service/schemaMachine';
 import { Model } from '../Model/Model';
-import { ActorKeyedState } from '../helpers/entity/entityState';
-import { Subscription } from 'rxjs';
+import { EntityCache } from '../helpers/entity/entityCache';
 type SchemaService = ActorRefFrom<typeof schemaMachine>;
-export declare const schemaInstanceState: ActorKeyedState<Schema, {
-    liveQuerySubscription: Subscription | null;
-}>;
 /**
  * Options for Schema.all() method
  */
@@ -33,16 +29,8 @@ export interface SchemaAllOptions {
     readyTimeout?: number;
 }
 export declare class Schema {
-    protected static instanceCacheById: Map<string, {
-        instance: Schema;
-        refCount: number;
-    }>;
-    protected static instanceCacheByName: Map<string, {
-        instance: Schema;
-        refCount: number;
-    }>;
-    private static pendingSchemaByName;
-    protected static savingSchemas: Set<string>;
+    /** Cached under its file id and its name (ADR 0014). */
+    static readonly cache: EntityCache<Schema>;
     protected readonly _service: SchemaService;
     $schema?: string;
     /** The schema's name (metadata.name). Assigning it renames the schema and saves a draft. */
@@ -64,6 +52,11 @@ export declare class Schema {
         changes: any[];
     }>;
     constructor(schemaName: string);
+    /**
+     * Load the schema (creating a draft for an unknown name), hold its models, and cache it under
+     * its file id and name. Another cached instance that already has the loaded id keeps it.
+     */
+    private static load;
     /**
      * Returns the cached schema for `schemaName`, or loads it (creating a draft for an unknown name).
      * Each call takes a hold on the instance; release it with `unload()`.
@@ -79,12 +72,6 @@ export declare class Schema {
         /** @internal SDK lookups pass false: see the implementation signature */
         hold?: false;
     }): Promise<Schema>;
-    /**
-     * Update the cache to use schemaFileId as the key instead of schemaName
-     * This should be called once the schema is loaded and we have the schemaFileId
-     * We keep the instance in BOTH caches for efficient lookups by either name or ID
-     */
-    private static _updateCacheKey;
     /**
      * Get schema instance by schemaFileId (preferred method)
      * Returns null if not found in cache
@@ -95,11 +82,7 @@ export declare class Schema {
      * the schema and doesn't hand it to a caller; callers that keep it use `create` or `find`.
      */
     static peek(schemaFileIdOrName: string): Schema | undefined;
-    /**
-     * Clear all cached Schema instances.
-     * This is primarily useful for test cleanup.
-     * All cached instances will be unloaded and removed from both caches.
-     */
+    /** Stop and drop every cached Schema, whoever holds it (test cleanup). */
     static clearCache(): void;
     /**
      * Create or get schema instance by schemaFileId
@@ -113,16 +96,25 @@ export declare class Schema {
         hold?: false;
     }): Promise<Schema>;
     /**
-     * Find schema instance by schemaFileId
-     * Waits for the schema to be fully loaded (idle state) by default
-     * @param options - Find options including schemaFileId and wait configuration
+     * Find a schema by schemaFileId or by name. Read-only: a name with no schema row gives undefined
+     * and creates nothing (`Schema.create` creates a draft for an unknown name). By name, the cached
+     * instance is used, else the stored schema is loaded. Waits for the schema to be fully loaded
+     * (idle state) by default. Takes a hold unless `hold: false`.
      * @returns Schema instance if found, undefined otherwise
      */
-    static find({ schemaFileId, waitForReady, readyTimeout, }: {
-        schemaFileId: string;
+    static find({ schemaFileId, schemaName, waitForReady, readyTimeout, hold, }: {
         waitForReady?: boolean;
         readyTimeout?: number;
-    }): Promise<Schema | undefined>;
+        /** @internal `hold: false` as for `create` */
+        hold?: false;
+    } & ({
+        schemaFileId: string;
+        schemaName?: undefined;
+    } | {
+        schemaName: string;
+        schemaFileId?: undefined;
+    })): Promise<Schema | undefined>;
+    private static findByName;
     /**
      * Get instantiated Schema objects for all schemas (from database and files)
      * By default, returns only the latest version of each schema and excludes the internal Seed Protocol schema.
@@ -147,9 +139,12 @@ export declare class Schema {
      * Note: This is NOT reactive - use useModels() hook for reactivity
      */
     get models(): Model[];
-    get status(): "error" | "idle" | "validating" | {
-        loading: "checkingExisting" | "writingSchema" | "verifyingSchema" | "writingModels" | "verifyingModels" | "creatingModelInstances" | "verifyingModelInstances" | "writingProperties" | "verifyingProperties" | "creatingPropertyInstances" | "verifyingPropertyInstances";
-    };
+    /** `loading` until the schema and its models are loaded, then `ready` or `error`. */
+    get status(): import("../helpers/entity/entityLifecycle").EntityStatus;
+    /** Resolves once `status` is `ready`; rejects when the load failed or `timeout` ms pass. */
+    waitForReady(options?: {
+        timeout?: number;
+    }): Promise<void>;
     get isEdited(): boolean;
     get validationErrors(): import("./validation").ValidationError[];
     /**
@@ -204,10 +199,14 @@ export declare class Schema {
      * query while their rows are being deleted.
      */
     static evict(schemaName: string): void;
+    /**
+     * Release this caller's hold. With the last one the schema is stopped, leaves the cache, and
+     * releases its hold on each of its models.
+     */
     unload(): void;
     /**
-     * Destroy the schema instance completely: remove from caches, delete from database (cascade),
-     * and stop the service. Uses shared destroy helpers.
+     * Destroy the schema: delete its rows (schema, models, properties, links) and its files, and stop
+     * it and its cached models and properties, whoever holds them.
      */
     destroy(): Promise<void>;
     private _destroyRows;

package/dist/src/Schema/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/Schema/Schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/Schema/Schema.ts"],"names":[],"mappings":"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"}

package/dist/src/Schema/loadOrCreateSchema.d.ts

@@ -0,0 +1,21 @@
+import { SchemaFileFormat } from '../types/import';
+import { type ActorBacked } from '../helpers/entity/entityCache';
+export type LoadedSchema = {
+    schema: SchemaFileFormat;
+    schemaRecord: any;
+    /** File ids of the schema's models, whose Model instances are cached */
+    modelIds: string[];
+    loadedAt: number;
+    dbVersion: number;
+    dbUpdatedAt: number;
+    /** True when no row or file had this name and the schema was created */
+    created: boolean;
+};
+/**
+ * Loads the schema named `schemaName` (or with that file id): its row, drafts first, resolved by
+ * resolveSchemaRow, with its models' instances cached. With no row, a version file of that name is
+ * applied first; with neither, the schema is created. A failed read throws rather than creating
+ * over the existing row.
+ */
+export declare function loadOrCreateSchema(schemaName: string, owner?: ActorBacked): Promise<LoadedSchema>;
+//# sourceMappingURL=loadOrCreateSchema.d.ts.map

package/dist/src/Schema/loadOrCreateSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadOrCreateSchema.d.ts","sourceRoot":"","sources":["../../../src/Schema/loadOrCreateSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAWjD,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAyE5E,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,gBAAgB,CAAA;IACxB,YAAY,EAAE,GAAG,CAAA;IACjB,wEAAwE;IACxE,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,wEAAwE;IACxE,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAwDD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAgDvG"}

package/dist/src/Schema/service/schemaMachine.d.ts

@@ -1,5 +1,6 @@
 import { SchemaFileFormat } from '../../types/import';
 import { ValidationError } from '../validation';
+import type { LoadedSchema } from '../loadOrCreateSchema';
 export type SchemaMachineContext = {
     schemaName: string;
     $schema?: string;
@@ -38,9 +39,6 @@ export type SchemaMachineContext = {
     _dbVersion?: number;
     _dbUpdatedAt?: number;
     _liveQueryModelIds?: string[];
-    _modelIds?: string[];
-    _propertyIds?: string[];
-    _loadingStage?: string;
     _loadingError?: {
         stage: string;
         error: Error;
@@ -64,136 +62,20 @@ export declare const schemaMachine: import("xstate").StateMachine<SchemaMachineC
 } | {
     type: "validateSchema";
 } | {
-    type: "validationSuccess";
-    errors: ValidationError[];
-} | {
-    type: "validationError";
-    errors: ValidationError[];
-} | {
-    type: "reloadFromDb";
-} | {
-    type: "schemaFound";
-    schema: SchemaFileFormat;
-    schemaRecord: any;
-    modelIds?: string[];
-    loadedAt?: number;
-    dbVersion?: number;
-    dbUpdatedAt?: number;
-} | {
-    type: "schemaNotFound";
-} | {
-    type: "schemaWritten";
-    schemaRecord: any;
-    schema: SchemaFileFormat;
-} | {
-    type: "schemaVerified";
-    schemaId: number;
-} | {
-    type: "modelsWritten";
-    modelIds: string[];
-} | {
-    type: "modelsVerified";
-    modelIds: string[];
-} | {
-    type: "instancesCreated";
-    count: number;
-} | {
-    type: "instancesVerified";
-    count: number;
-} | {
-    type: "propertiesWritten";
-    propertyIds: string[];
-} | {
-    type: "propertiesVerified";
-    propertyIds: string[];
-} | {
-    type: "verificationFailed";
-    stage: string;
-    error: Error;
-} | {
-    type: "writeError";
-    error: Error;
+    type: "loaded";
+    output: LoadedSchema;
 } | {
     type: "destroyStarted";
 } | {
     type: "destroyError";
     error: unknown;
-}, {
-    [x: string]: import("xstate").ActorRefFromLogic<import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<SchemaMachineContext>, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/writeSchemaToDb").WriteSchemaToDbInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifySchemaInDb").VerifySchemaInDbInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/writeModelsToDb").WriteModelsToDbInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyModelsInDb").VerifyModelsInDbInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/createModelInstances").CreateModelInstancesInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyModelInstancesInCache").VerifyModelInstancesInCacheInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/writePropertiesToDb").WritePropertiesToDbInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyPropertiesInDb").VerifyPropertiesInDbInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/createPropertyInstances").CreatePropertyInstancesInput, import("xstate").EventObject> | import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyPropertyInstancesInCache").VerifyPropertyInstancesInCacheInput, import("xstate").EventObject>> | undefined;
-}, {
-    src: "validateSchema";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<SchemaMachineContext>, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "checkExistingSchema";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("../..").FromCallbackInput<SchemaMachineContext>, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "writeSchemaToDb";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/writeSchemaToDb").WriteSchemaToDbInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "verifySchemaInDb";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifySchemaInDb").VerifySchemaInDbInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "writeModelsToDb";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/writeModelsToDb").WriteModelsToDbInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "verifyModelsInDb";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyModelsInDb").VerifyModelsInDbInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "createModelInstances";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/createModelInstances").CreateModelInstancesInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "verifyModelInstancesInCache";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyModelInstancesInCache").VerifyModelInstancesInCacheInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "writePropertiesToDb";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/writePropertiesToDb").WritePropertiesToDbInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "verifyPropertiesInDb";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyPropertiesInDb").VerifyPropertiesInDbInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "createPropertyInstances";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/createPropertyInstances").CreatePropertyInstancesInput, import("xstate").EventObject>;
-    id: string | undefined;
-} | {
-    src: "verifyPropertyInstancesInCache";
-    logic: import("xstate").CallbackActorLogic<import("xstate").EventObject, import("./actors/verifyPropertyInstancesInCache").VerifyPropertyInstancesInCacheInput, import("xstate").EventObject>;
-    id: string | undefined;
-}, never, {
-    type: "isSchemaValid";
-    params: unknown;
-}, never, "error" | "idle" | "validating" | {
-    loading: "checkingExisting" | "writingSchema" | "verifyingSchema" | "writingModels" | "verifyingModels" | "creatingModelInstances" | "verifyingModelInstances" | "writingProperties" | "verifyingProperties" | "creatingPropertyInstances" | "verifyingPropertyInstances";
-}, string, Pick<SchemaMachineContext, "schemaName">, import("xstate").NonReducibleUnknown, import("xstate").EventObject, import("xstate").MetaObject, {
+}, {}, never, {
+    type: "validate";
+    params: import("xstate").NonReducibleUnknown;
+}, never, never, "idle", string, Pick<SchemaMachineContext, "schemaName">, import("xstate").NonReducibleUnknown, import("xstate").EventObject, import("xstate").MetaObject, {
     id: "schema";
     states: {
-        readonly loading: {
-            states: {
-                readonly checkingExisting: {};
-                readonly writingSchema: {};
-                readonly verifyingSchema: {};
-                readonly writingModels: {};
-                readonly verifyingModels: {};
-                readonly creatingModelInstances: {};
-                readonly verifyingModelInstances: {};
-                readonly writingProperties: {};
-                readonly verifyingProperties: {};
-                readonly creatingPropertyInstances: {};
-                readonly verifyingPropertyInstances: {};
-            };
-        };
         readonly idle: {};
-        readonly validating: {};
-        readonly error: {};
     };
 }, import("xstate").MetaObject>;
 //# sourceMappingURL=schemaMachine.d.ts.map

package/dist/src/Schema/service/schemaMachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemaMachine.d.ts","sourceRoot":"","sources":["../../../../src/Schema/service/schemaMachine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schemaMachine.d.ts","sourceRoot":"","sources":["../../../../src/Schema/service/schemaMachine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAKzD,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,CAAA;QACZ,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,MAAM,CAAC,EAAE;QACP,CAAC,SAAS,EAAE,MAAM,GAAG;YACnB,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;YACzC,UAAU,EAAE;gBACV,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAAA;aAC5B,CAAA;SACF,CAAA;KACF,CAAA;IACD,KAAK,CAAC,EAAE;QACN,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;KACxB,CAAA;IACD,wDAAwD;IACxD,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACzC,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,OAAO,EAAE,MAAM,CAAA;QACf,SAAS,EAAE,MAAM,CAAA;QACjB,WAAW,EAAE,MAAM,CAAA;QACnB,OAAO,EAAE,GAAG,EAAE,CAAA;KACf,CAAC,CAAA;IAEF,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAE/B,iBAAiB,CAAC,EAAE,eAAe,EAAE,CAAA;IACrC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC7B,aAAa,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IAC/C,aAAa,CAAC,EAAE,GAAG,CAAA;IAEnB,aAAa,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAC1D,CAAA;AAED,eAAO,MAAM,aAAa;;UAKV,eAAe;;UACf,aAAa;iBAAe,MAAM;;UAClC,YAAY;mBAAiB,MAAM;iBAAe,MAAM;;UACxD,gBAAgB;;UAChB,QAAQ;YAAU,YAAY;;UAC9B,gBAAgB;;UAChB,cAAc;WAAS,OAAO;;;;;;;;;+BAiJ5C,CAAA"}

package/dist/src/browser/db/Db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Db.d.ts","sourceRoot":"","sources":["../../../../src/browser/db/Db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAW,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AASzE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAOhD,OAAO,EAAE,UAAU,EAAoE,MAAM,MAAM,CAAA;AAInG,qBAAa,SAAU,YAAW,GAAG;IAEnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,KAAK,EAAE,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAA;IAChE,eAAe,EAAE,cAAc,GAAG,SAAS,CAAA;IAC3C,+EAA+E;IAC/E,OAAO,CAAC,iBAAiB,CAA2C;IAGpE,QAAQ;IAIR,YAAY;IAIN,SAAS,CAAC,QAAQ,EAAE,MAAM;IAWhC;;;;;;OAMG;YACW,qBAAqB;YA4BrB,eAAe;IAmFvB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI3D,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmEvD,wEAAwE;YAC1D,aAAa;IAiB3B,+GAA+G;YACjG,mBAAmB;IAoBjC;;;;;OAKG;IACG,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAkBjG,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjF;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,SAAS,CAAC,CAAC,EACT,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,GAC/B,UAAU,CAAC,CAAC,EAAE,CAAC;CAwEnB"}
+{"version":3,"file":"Db.d.ts","sourceRoot":"","sources":["../../../../src/browser/db/Db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAW,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AASzE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAOhD,OAAO,EAAE,UAAU,EAAoE,MAAM,MAAM,CAAA;AAInG,qBAAa,SAAU,YAAW,GAAG;IAEnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,KAAK,EAAE,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAA;IAChE,eAAe,EAAE,cAAc,GAAG,SAAS,CAAA;IAC3C,+EAA+E;IAC/E,OAAO,CAAC,iBAAiB,CAA2C;IAGpE,QAAQ;IAIR,YAAY;IAIN,SAAS,CAAC,QAAQ,EAAE,MAAM;IAWhC;;;;;;OAMG;YACW,qBAAqB;YA4BrB,eAAe;IAuEvB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI3D,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmEvD,wEAAwE;YAC1D,aAAa;IAiB3B,+GAA+G;YACjG,mBAAmB;IAoBjC;;;;;OAKG;IACG,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAkBjG,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjF;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,SAAS,CAAC,CAAC,EACT,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,GAC/B,UAAU,CAAC,CAAC,EAAE,CAAC;CAwEnB"}

package/dist/src/browser/db/changeFeed.d.ts

@@ -23,8 +23,6 @@ export declare const ENTITY_CHANGES_RETENTION_MS: number;
 export declare const ENTITY_CHANGES_PRUNE_EVERY_MS = 60000;
 type FeedDb = SqliteRemoteDatabase<Record<string, unknown>>;
 type LiveQuery = <T>(query: (sql: any) => any) => Observable<T[]>;
-/** SQLocal's `sql` template tag: runs the statement and resolves to its rows. */
-type SqlTag = (strings: TemplateStringsArray, ...params: unknown[]) => Promise<Record<string, unknown>[]>;
 /**
  * Calls `listener` after a committed write to one of `watch.tables` for the watched seed, matched
  * by local id or (case-insensitively) by uid. A read of the log that has several matching rows
@@ -35,29 +33,16 @@ export declare function watchEntityChanges(watch: ChangeWatch, listener: () => v
 /**
  * Watches `watch` and runs `read` once per dispatch, handing its result to `onRows` when it differs
  * from the last one handed over. A read that finishes after a newer one started is dropped, so an
- * older result never replaces a newer one.
- *
- * Pass `since` (the `changeFeedCursor()` taken before the caller's own initial read) to run `read`
- * once right away when the feed moved on in between: a change dispatched before this watch was
- * registered would otherwise be missed. Pass `immediate` to run it once right away regardless, as
- * a liveQuery's first emission does.
+ * older result never replaces a newer one. Pass `immediate` to also run it once right away.
  */
 export declare function watchEntityRows<T>(watch: ChangeWatch, read: () => Promise<T>, onRows: (rows: T) => void, options?: {
-    since?: number;
     immediate?: boolean;
     onError?: (error: unknown) => void;
 }): {
     unsubscribe: () => void;
 };
-/**
- * Runs an SQL-tag query once, the way BaseDb.liveQuery's query function is written
- * (`(sql) => sql\`SELECT ...\``), so an entity can keep its liveQuery's text for its feed reads.
- */
-export declare function queryEntityRows<T>(query: (sql: any) => any): Promise<T[]>;
 /** Whether this tab's feed runs (a browser database is open); Node has none. */
 export declare function isChangeFeedRunning(): boolean;
-/** The seq of the newest log row this tab has dispatched. */
-export declare function changeFeedCursor(): number;
 /** Registered watches, for tests. */
 export declare function activeChangeWatches(): ChangeWatch[];
 /** Deletes log rows older than ENTITY_CHANGES_RETENTION_MS. Deleting doesn't raise max(seq), so it dispatches nothing. */
@@ -66,9 +51,8 @@ export declare function pruneEntityChanges(db: FeedDb, now?: number): Promise<vo
  * Starts this tab's feed on `db` (once its migrations ran), at the newest seq allocated so far:
  * entities do their own initial read. A second call replaces the first feed.
  */
-export declare function startChangeFeed(db: FeedDb, { liveQuery, sql: sqlTag }: {
+export declare function startChangeFeed(db: FeedDb, { liveQuery }: {
     liveQuery: LiveQuery;
-    sql: SqlTag;
 }): Promise<void>;
 export declare function stopChangeFeed(): void;
 /** Tests only: drops every watch and the prune clock. */

package/dist/src/browser/db/changeFeed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changeFeed.d.ts","sourceRoot":"","sources":["../../../../src/browser/db/changeFeed.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAMpE;;;;;;;;GAQG;AAEH,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;AAEjE,MAAM,MAAM,WAAW,GAAG;IACxB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,MAAM,EAAE,iBAAiB,EAAE,CAAA;IAC3B,iGAAiG;IACjG,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CACzB,CAAA;AAWD,6DAA6D;AAC7D,eAAO,MAAM,2BAA2B,QAAc,CAAA;AACtD,4CAA4C;AAC5C,eAAO,MAAM,6BAA6B,QAAS,CAAA;AAEnD,KAAK,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;AAC3D,KAAK,SAAS,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,CAAA;AACjE,iFAAiF;AACjF,KAAK,MAAM,GAAG,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;AAyBzG;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAiBvF;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAC/B,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,EACzB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;CAAO,GACxF;IAAE,WAAW,EAAE,MAAM,IAAI,CAAA;CAAE,CA+B7B;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAG/E;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAED,6DAA6D;AAC7D,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,qCAAqC;AACrC,wBAAgB,mBAAmB,IAAI,WAAW,EAAE,CAEnD;AAuED,0HAA0H;AAC1H,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpF;AAsBD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,MAAM,EACV,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAChE,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAgB,cAAc,IAAI,IAAI,CAIrC;AAED,yDAAyD;AACzD,wBAAgB,uBAAuB,IAAI,IAAI,CAK9C"}
+{"version":3,"file":"changeFeed.d.ts","sourceRoot":"","sources":["../../../../src/browser/db/changeFeed.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAMpE;;;;;;;;GAQG;AAEH,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;AAEjE,MAAM,MAAM,WAAW,GAAG;IACxB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,MAAM,EAAE,iBAAiB,EAAE,CAAA;IAC3B,iGAAiG;IACjG,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CACzB,CAAA;AAWD,6DAA6D;AAC7D,eAAO,MAAM,2BAA2B,QAAc,CAAA;AACtD,4CAA4C;AAC5C,eAAO,MAAM,6BAA6B,QAAS,CAAA;AAEnD,KAAK,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;AAC3D,KAAK,SAAS,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,CAAA;AAyBjE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAiBvF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAC/B,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,EACzB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;CAAO,GACxE;IAAE,WAAW,EAAE,MAAM,IAAI,CAAA;CAAE,CA+B7B;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAED,qCAAqC;AACrC,wBAAgB,mBAAmB,IAAI,WAAW,EAAE,CAEnD;AAuED,0HAA0H;AAC1H,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpF;AAsBD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,MAAM,EACV,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,GACtC,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAgB,cAAc,IAAI,IAAI,CAIrC;AAED,yDAAyD;AACzD,wBAAgB,uBAAuB,IAAI,IAAI,CAK9C"}