@dxos/echo 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/dist/types/src/internal/common/types/meta.d.ts

@@ -1,6 +1,7 @@
 import * as Schema from 'effect/Schema';
 import { type EncodedReference, ForeignKey } from '@dxos/echo-protocol';
 import { type Comparator } from '@dxos/util';
+import type * as Tag from '../../../Tag';
 import { type Ref } from '../../Ref/ref';
 import { type AnyProperties } from './base';
 /**
@@ -18,10 +19,7 @@ export declare const EntityMetaSchema: Schema.Struct<{
     /**
      * Tags applied to this entity, as references to {@link Tag} objects.
      */
-    tags: Schema.Array$<Schema.suspend<Ref<{
-        readonly label: string;
-        readonly hue?: string | undefined;
-    } & import("../../../Entity").OfKind<import("./entity").EntityKind.Object>>, EncodedReference, never>>;
+    tags: Schema.Array$<Schema.suspend<Ref<Tag.Tag>, EncodedReference, never>>;
     /**
      * Fully-qualified registry key for the object (FQN format, e.g. `org.example.type.foo`).
      * Identifies the canonical registry entry the object instance was created from.

package/dist/types/src/internal/common/types/meta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/common/types/meta.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGxE,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,YAAY,CAAC;AAM3D,OAAO,EAAE,KAAK,GAAG,EAA6B,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAI5C;;GAEG;AACH,eAAO,MAAM,SAAS,UAAU,CAAC;AAuBjC,eAAO,MAAM,gBAAgB;;;;;;;;IAG3B;;OAEG;;;;;IAGH;;;OAGG;;IAGH;;;OAGG;;IAGH;;OAEG;;IAGH;;;OAGG;;IAGH;;;OAGG;;EAEH,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAmBrE,eAAO,MAAM,UAAU,WAAY,MAAM,MAAM,MAAM,KAAG,UAA8B,CAAC;AACvF,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,YAA2C,CAAC;AAGzG,eAAO,MAAM,kBAAkB,EAAE,UAAU,CAAC,aAAa,CACoB,CAAC"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/common/types/meta.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGxE,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,YAAY,CAAC;AAE3D,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AAIzC,OAAO,EAAE,KAAK,GAAG,EAA6B,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAI5C;;GAEG;AACH,eAAO,MAAM,SAAS,UAAU,CAAC;AAuBjC,eAAO,MAAM,gBAAgB;;;;;;;;IAG3B;;OAEG;;IAGH;;;OAGG;;IAGH;;;OAGG;;IAGH;;OAEG;;IAGH;;;OAGG;;IAGH;;;OAGG;;EAEH,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAmBrE,eAAO,MAAM,UAAU,WAAY,MAAM,MAAM,MAAM,KAAG,UAA8B,CAAC;AACvF,eAAO,MAAM,gBAAgB,MAAO,UAAU,KAAK,UAAU,YAA2C,CAAC;AAGzG,eAAO,MAAM,kBAAkB,EAAE,UAAU,CAAC,aAAa,CACoB,CAAC"}

package/dist/types/src/internal/index.d.ts

@@ -1,6 +1,7 @@
 export * from './Annotation';
 export * from './common';
 export * from './Entity';
+export * from './Filter';
 export * from './Format';
 export * from './JsonSchema';
 export * from './Obj';

package/dist/types/src/internal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/internal/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAE7B,cAAc,OAAO,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3D,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AAKvB,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/internal/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAE7B,cAAc,OAAO,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3D,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AAKvB,cAAc,qBAAqB,CAAC"}

package/dist/types/src/testing/test-schema.d.ts

@@ -2,22 +2,23 @@ import * as Schema from 'effect/Schema';
 import * as Obj from '../Obj';
 import * as Type from '../Type';
 export declare namespace TestSchema {
+    const Expando_base: Type.ObjClass<Expando, {
+        readonly [x: string]: any;
+    }, {}>;
     /**
      * Expando object is an object with an arbitrary set of properties.
      * This is the test variant with example.com namespace.
      */
-    const Expando: Type.Obj<{
-        readonly [x: string]: any;
-    }, Schema.Struct.Fields>;
-    type Expando = Type.InstanceType<typeof Expando>;
-    class TestClass {
+    export class Expando extends Expando_base {
+    }
+    export class TestClass {
         field: string;
         toJSON(): {
             field: string;
         };
     }
     /** @deprecated Use another test schema or create a specific local test schema. */
-    const ExampleSchema: Schema.SchemaClass<{
+    export const ExampleSchema: Schema.SchemaClass<{
         readonly string?: string | undefined;
         readonly number?: number | undefined;
         readonly boolean?: boolean | undefined;
@@ -61,10 +62,9 @@ export declare namespace TestSchema {
         readonly undefined?: undefined;
     }, never>;
     /** @deprecated Use another test schema or create a specific local test schema. */
-    interface ExampleSchema extends Schema.Schema.Type<typeof ExampleSchema> {
+    export interface ExampleSchema extends Schema.Schema.Type<typeof ExampleSchema> {
     }
-    /** @deprecated Use another test schema or create a specific local test schema. */
-    const Example: Type.Obj<{
+    const Example_base: Type.ObjClass<Example, {
         readonly string?: string | undefined;
         readonly number?: number | undefined;
         readonly boolean?: boolean | undefined;
@@ -85,36 +85,33 @@ export declare namespace TestSchema {
         readonly referenceArray?: readonly import("../internal").Ref<Example>[] | undefined;
         readonly classInstance?: TestClass | undefined;
         readonly other?: any;
-    }, Schema.Struct.Fields>;
+    }, {}>;
     /** @deprecated Use another test schema or create a specific local test schema. */
-    interface Example extends Type.InstanceType<typeof Example> {
+    export class Example extends Example_base {
     }
-    const MessageStruct: Schema.Struct<{
+    export const MessageStruct: Schema.Struct<{
         timestamp: Schema.PropertySignature<":", string, never, ":", string, true, never>;
     }>;
-    const Message: Type.Obj<{
+    const Message_base: Type.ObjClass<Message, {
         readonly timestamp: string;
-    }, Schema.Struct.Fields>;
-    type Message = Type.InstanceType<typeof Message>;
-    const Organization: Type.Obj<{
+    }, {}>;
+    export class Message extends Message_base {
+    }
+    const Organization_base: Type.ObjClass<Organization, {
         readonly name: string;
         readonly properties?: {
             readonly [x: string]: string;
         } | undefined;
-    }, Schema.Struct.Fields>;
-    type Organization = Type.InstanceType<typeof Organization>;
-    const Person: Type.Obj<{
+    }, {}>;
+    export class Organization extends Organization_base {
+    }
+    const Person_base: Type.ObjClass<Person, {
         readonly name?: string | undefined;
         readonly username?: string | undefined;
         readonly email?: string | undefined;
         readonly age?: number | undefined;
         readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
-        readonly employer?: import("../internal").Ref<{
-            readonly name: string;
-            readonly properties?: {
-                readonly [x: string]: string;
-            } | undefined;
-        } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
+        readonly employer?: import("../internal").Ref<Organization & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
         readonly address?: {
             readonly city?: string | undefined;
             readonly state?: string | undefined;
@@ -128,171 +125,45 @@ export declare namespace TestSchema {
             readonly label: string;
             readonly value: string;
         }[] | undefined;
-    }, Schema.Struct.Fields>;
-    interface Person extends Type.InstanceType<typeof Person> {
+    }, {}>;
+    export class Person extends Person_base {
     }
-    const Task: Type.Obj<{
+    const Task_base: Type.ObjClass<Task, {
         readonly title?: string | undefined;
         readonly deadline?: string | undefined;
         readonly completed?: boolean | undefined;
-        readonly assignee?: import("../internal").Ref<{
-            readonly name?: string | undefined;
-            readonly username?: string | undefined;
-            readonly email?: string | undefined;
-            readonly age?: number | undefined;
-            readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
-            readonly employer?: import("../internal").Ref<{
-                readonly name: string;
-                readonly properties?: {
-                    readonly [x: string]: string;
-                } | undefined;
-            } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
-            readonly address?: {
-                readonly city?: string | undefined;
-                readonly state?: string | undefined;
-                readonly zip?: string | undefined;
-                readonly coordinates: {
-                    readonly lat?: number | undefined;
-                    readonly lng?: number | undefined;
-                };
-            } | undefined;
-            readonly fields?: readonly {
-                readonly label: string;
-                readonly value: string;
-            }[] | undefined;
-        } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
+        readonly assignee?: import("../internal").Ref<Person & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
         readonly previous?: import("../internal").Ref<Task> | undefined;
         readonly subTasks?: readonly import("../internal").Ref<Task>[] | undefined;
         readonly description?: string | undefined;
-    }, Schema.Struct.Fields>;
-    interface Task extends Type.InstanceType<typeof Task> {
+    }, {}>;
+    export class Task extends Task_base {
     }
-    const HasManager: Type.Relation<{}, {
-        readonly name?: string | undefined;
-        readonly username?: string | undefined;
-        readonly email?: string | undefined;
-        readonly age?: number | undefined;
-        readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
-        readonly employer?: import("../internal").Ref<{
-            readonly name: string;
-            readonly properties?: {
-                readonly [x: string]: string;
-            } | undefined;
-        } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
-        readonly address?: {
-            readonly city?: string | undefined;
-            readonly state?: string | undefined;
-            readonly zip?: string | undefined;
-            readonly coordinates: {
-                readonly lat?: number | undefined;
-                readonly lng?: number | undefined;
-            };
-        } | undefined;
-        readonly fields?: readonly {
-            readonly label: string;
-            readonly value: string;
-        }[] | undefined;
-    } & import("../Entity").OfKind<import("../internal").EntityKind.Object>, {
-        readonly name?: string | undefined;
-        readonly username?: string | undefined;
-        readonly email?: string | undefined;
-        readonly age?: number | undefined;
-        readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
-        readonly employer?: import("../internal").Ref<{
-            readonly name: string;
-            readonly properties?: {
-                readonly [x: string]: string;
-            } | undefined;
-        } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
-        readonly address?: {
-            readonly city?: string | undefined;
-            readonly state?: string | undefined;
-            readonly zip?: string | undefined;
-            readonly coordinates: {
-                readonly lat?: number | undefined;
-                readonly lng?: number | undefined;
-            };
-        } | undefined;
-        readonly fields?: readonly {
-            readonly label: string;
-            readonly value: string;
-        }[] | undefined;
-    } & import("../Entity").OfKind<import("../internal").EntityKind.Object>, Schema.Struct.Fields>;
-    type HasManager = Type.InstanceType<typeof HasManager>;
-    const EmployedBy: Type.Relation<{
+    const HasManager_base: Type.RelationClass<HasManager, {}, Person & import("../Entity").OfKind<import("../internal").EntityKind.Object>, Person & import("../Entity").OfKind<import("../internal").EntityKind.Object>, {}>;
+    export class HasManager extends HasManager_base {
+    }
+    const EmployedBy_base: Type.RelationClass<EmployedBy, {
         readonly role: string;
         readonly since?: string | undefined;
-    }, {
-        readonly name?: string | undefined;
-        readonly username?: string | undefined;
-        readonly email?: string | undefined;
-        readonly age?: number | undefined;
-        readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
-        readonly employer?: import("../internal").Ref<{
-            readonly name: string;
-            readonly properties?: {
-                readonly [x: string]: string;
-            } | undefined;
-        } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
-        readonly address?: {
-            readonly city?: string | undefined;
-            readonly state?: string | undefined;
-            readonly zip?: string | undefined;
-            readonly coordinates: {
-                readonly lat?: number | undefined;
-                readonly lng?: number | undefined;
-            };
-        } | undefined;
-        readonly fields?: readonly {
-            readonly label: string;
-            readonly value: string;
-        }[] | undefined;
-    } & import("../Entity").OfKind<import("../internal").EntityKind.Object>, {
-        readonly name: string;
-        readonly properties?: {
-            readonly [x: string]: string;
-        } | undefined;
-    } & import("../Entity").OfKind<import("../internal").EntityKind.Object>, Schema.Struct.Fields>;
-    type EmployedBy = Type.InstanceType<typeof EmployedBy>;
-    enum RecordType {
+    }, Person & import("../Entity").OfKind<import("../internal").EntityKind.Object>, Organization & import("../Entity").OfKind<import("../internal").EntityKind.Object>, {}>;
+    export class EmployedBy extends EmployedBy_base {
+    }
+    export enum RecordType {
         UNDEFINED = 0,
         PERSONAL = 1,
         WORK = 2
     }
-    const Container: Type.Obj<{
+    const Container_base: Type.ObjClass<Container, {
         readonly objects?: readonly import("../internal").Ref<Obj.Unknown>[] | undefined;
         readonly records?: readonly {
             readonly title?: string | undefined;
             readonly description?: string | undefined;
-            readonly contacts?: readonly import("../internal").Ref<{
-                readonly name?: string | undefined;
-                readonly username?: string | undefined;
-                readonly email?: string | undefined;
-                readonly age?: number | undefined;
-                readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
-                readonly employer?: import("../internal").Ref<{
-                    readonly name: string;
-                    readonly properties?: {
-                        readonly [x: string]: string;
-                    } | undefined;
-                } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown> | undefined;
-                readonly address?: {
-                    readonly city?: string | undefined;
-                    readonly state?: string | undefined;
-                    readonly zip?: string | undefined;
-                    readonly coordinates: {
-                        readonly lat?: number | undefined;
-                        readonly lng?: number | undefined;
-                    };
-                } | undefined;
-                readonly fields?: readonly {
-                    readonly label: string;
-                    readonly value: string;
-                }[] | undefined;
-            } & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown>[] | undefined;
+            readonly contacts?: readonly import("../internal").Ref<Person & import("../Entity").OfKind<import("../internal").EntityKind.Object> & Obj.Unknown>[] | undefined;
             readonly type?: RecordType | undefined;
         }[] | undefined;
-    }, Schema.Struct.Fields>;
-    type Container = Type.InstanceType<typeof Container>;
+    }, {}>;
+    export class Container extends Container_base {
+    }
+    export {};
 }
 //# sourceMappingURL=test-schema.d.ts.map

package/dist/types/src/testing/test-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAC;AAE9B,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAEhC,yBAAiB,UAAU,CAAC,CAAC;IAK3B;;;OAGG;IACI,MAAM,OAAO;;4BAEnB,CAAC;IAEF,KAAY,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,OAAO,CAAC,CAAC;IAUxD,MAAa,SAAS;QACpB,KAAK,SAAW;QAChB,MAAM;YACK,KAAK;UACf;KACF;IAED,kFAAkF;IAC3E,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAeH,CAAC;IAExB,kFAAkF;IAClF,UAAiB,aAAc,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC;KAAG;IAElF,kFAAkF;IAC3E,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;4BAAqF,CAAC;IAE1G,kFAAkF;IAClF,UAAiB,OAAQ,SAAQ,IAAI,CAAC,YAAY,CAAC,OAAO,OAAO,CAAC;KAAG;IAO9D,MAAM,aAAa;;MAOxB,CAAC;IAEI,MAAM,OAAO;;4BAAqF,CAAC;IAE1G,KAAY,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,OAAO,CAAC,CAAC;IAMjD,MAAM,YAAY;;;;;4BAQmD,CAAC;IAE7E,KAAY,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,YAAY,CAAC,CAAC;IAM3D,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;4BAoBmE,CAAC;IAEvF,UAAiB,MAAO,SAAQ,IAAI,CAAC,YAAY,CAAC,OAAO,MAAM,CAAC;KAAG;IAM5D,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAQmE,CAAC;IAErF,UAAiB,IAAK,SAAQ,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC;KAAG;IAMxD,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kGAMtB,CAAC;IAEF,KAAY,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,UAAU,CAAC,CAAC;IAMvD,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kGAStB,CAAC;IAEF,KAAY,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,UAAU,CAAC,CAAC;IAM9D,KAAY,UAAU;QACpB,SAAS,IAAI;QACb,QAAQ,IAAI;QACZ,IAAI,IAAI;KACT;IAEM,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAYmE,CAAC;IAE1F,KAAY,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,SAAS,CAAC,CAAC;CAC7D"}
+{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAC;AAE9B,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAEhC,yBAAiB,UAAU,CAAC,CAAC;;;;IAK3B;;;OAGG;IACH,MAAM,OAAO,OAAQ,SAAQ,YAE5B;KAAG;IAUJ,MAAM,OAAO,SAAS;QACpB,KAAK,SAAW;QAChB,MAAM;YACK,KAAK;UACf;KACF;IAED,kFAAkF;IAClF,MAAM,CAAC,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAeH,CAAC;IAExB,kFAAkF;IAClF,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC;KAAG;;;;;;;;;;;;;;;;;;;;;;;IAElF,kFAAkF;IAClF,MAAM,OAAO,OAAQ,SAAQ,YAAsF;KAAG;IAOtH,MAAM,CAAC,MAAM,aAAa;;MAOxB,CAAC;;;;IAEH,MAAM,OAAO,OAAQ,SAAQ,YAAsF;KAAG;;;;;;;IAMtH,MAAM,OAAO,YAAa,SAAQ,iBAUjC;KAAG;;;;;;;;;;;;;;;;;;;;;;IAMJ,MAAM,OAAO,MAAO,SAAQ,WAsB3B;KAAG;;;;;;;;;;IAMJ,MAAM,OAAO,IAAK,SAAQ,SAUzB;KAAG;;IAMJ,MAAM,OAAO,UAAW,SAAQ,eAGX;KAAG;;;;;IAMxB,MAAM,OAAO,UAAW,SAAQ,eAQ/B;KAAG;IAMJ,MAAM,MAAM,UAAU;QACpB,SAAS,IAAI;QACb,QAAQ,IAAI;QACZ,IAAI,IAAI;KACT;;;;;;;;;;IAED,MAAM,OAAO,SAAU,SAAQ,cAc9B;KAAG;;CACL"}