@dxos/echo 0.8.4-main.5ea62a8 → 0.8.4-main.72ec0f3

package/dist/types/src/query/{dsl.d.ts → query.d.ts}

@@ -1,9 +1,21 @@
-import { Schema } from 'effect';
-import type { Simplify } from 'effect/Schema';
+import type * as EffectArray from 'effect/Array';
+import * as Schema from 'effect/Schema';
+import type * as Types from 'effect/Types';
 import { type ForeignKey, type QueryAST } from '@dxos/echo-protocol';
 import { DXN, ObjectId } from '@dxos/keys';
+import type * as Obj from '../Obj';
 import * as Ref from '../Ref';
 import type * as Type from '../Type';
+export interface Order<T> {
+    '~Order': {
+        value: T;
+    };
+    ast: QueryAST.Order;
+}
+export declare namespace Order {
+    const natural: Order<any>;
+    const property: <T>(property: keyof T & string, direction: QueryAST.OrderDirection) => Order<T>;
+}
 export interface Query<T> {
     '~Query': {
         value: T;
@@ -18,31 +30,31 @@ export interface Query<T> {
     select(props: Filter.Props<T>): Query<T>;
     /**
      * Traverse an outgoing reference.
-     * @param key - Property path inside T that is a reference.
+     * @param key - Property path inside T that is a reference or optional reference.
      * @returns Query for the target of the reference.
      */
-    reference<K extends RefPropKey<T>>(key: K): Query<T[K] extends Ref.Any ? Ref.Target<T[K]> : never>;
+    reference<K extends RefPropKey<T>>(key: K): Query<T[K] extends Ref.Any ? Ref.Target<T[K]> : T[K] extends Ref.Any | undefined ? Ref.Target<Exclude<T[K], undefined>> : never>;
     /**
      * Find objects referencing this object.
      * @param target - Schema of the referencing object.
      * @param key - Property path inside the referencing object that is a reference.
      * @returns Query for the referencing objects.
      */
-    referencedBy<S extends Schema.Schema.All>(target: S, key: RefPropKey<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
+    referencedBy<S extends Schema.Schema.All>(target: S | string, key: RefPropKey<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
     /**
      * Find relations where this object is the source.
      * @returns Query for the relation objects.
      * @param relation - Schema of the relation.
      * @param predicates - Predicates to filter the relation objects.
      */
-    sourceOf<S extends Schema.Schema.All>(relation: S, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
+    sourceOf<S extends Schema.Schema.All>(relation: S | string, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
     /**
      * Find relations where this object is the target.
      * @returns Query for the relation objects.
      * @param relation - Schema of the relation.
      * @param predicates - Predicates to filter the relation objects.
      */
-    targetOf<S extends Schema.Schema.All>(relation: S, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
+    targetOf<S extends Schema.Schema.All>(relation: S | string, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
     /**
      * For a query for relations, get the source objects.
      * @returns Query for the source objects.
@@ -53,6 +65,13 @@ export interface Query<T> {
      * @returns Query for the target objects.
      */
     target(): Query<Type.Relation.Target<T>>;
+    /**
+     * Order the query results.
+     * Orders are specified in priority order. The first order will be applied first, etc.
+     * @param order - Order to sort the results.
+     * @returns Query for the ordered results.
+     */
+    orderBy(...order: EffectArray.NonEmptyArray<Order<T>>): Query<T>;
     /**
      * Add options to a query.
      */
@@ -60,6 +79,8 @@ export interface Query<T> {
 }
 interface QueryAPI {
     is(value: unknown): value is Query.Any;
+    /** Construct a query from an ast. */
+    fromAst(ast: QueryAST.Query): Query<any>;
     /**
      * Select objects based on a filter.
      * @param filter - Filter to select the objects.
@@ -74,7 +95,7 @@ interface QueryAPI {
      *
      * Shorthand for: `Query.select(Filter.type(schema, predicates))`.
      */
-    type<S extends Schema.Schema.All>(schema: S, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
+    type<S extends Schema.Schema.All>(schema: S | string, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
     /**
      * Combine results of multiple queries.
      * @param queries - Queries to combine.
@@ -98,17 +119,19 @@ export declare namespace Query {
 }
 export interface Filter<T> {
     '~Filter': {
-        value: T;
+        value: Types.Contravariant<T>;
     };
     ast: QueryAST.Filter;
 }
 type Intersection<Types extends readonly unknown[]> = Types extends [infer First, ...infer Rest] ? First & Intersection<Rest> : unknown;
 interface FilterAPI {
-    is(value: unknown): value is Filter<any>;
+    is(value: unknown): value is Filter.Any;
+    /** Construct a filter from an ast. */
+    fromAst(ast: QueryAST.Filter): Filter<Obj.Any>;
     /**
      * Filter that matches all objects.
      */
-    everything(): Filter<any>;
+    everything(): Filter<Obj.AnyProps>;
     /**
      * Filter that matches no objects.
      */
@@ -116,25 +139,27 @@ interface FilterAPI {
     /**
      * Filter by object IDs.
      */
-    ids(...id: ObjectId[]): Filter<any>;
+    ids(...id: ObjectId[]): Filter<Obj.AnyProps>;
     /**
      * Filter by type.
      */
-    type<S extends Schema.Schema.All>(schema: S, props?: Filter.Props<Schema.Schema.Type<S>>): Filter<Schema.Schema.Type<S>>;
+    type<S extends Schema.Schema.All>(schema: S | string, props?: Filter.Props<Schema.Schema.Type<S>>): Filter<Schema.Schema.Type<S>>;
     /**
      * Filter by non-qualified typename.
      */
-    typename(typename: string): Filter<any>;
+    typename(typename: string): Filter<Obj.AnyProps>;
     /**
      * Filter by fully qualified type DXN.
      */
-    typeDXN(dxn: DXN): Filter<any>;
+    typeDXN(dxn: DXN): Filter<Obj.AnyProps>;
+    /**
+     * Filter by tag.
+     */
+    tag(tag: string): Filter<Obj.Any>;
     /**
      * Filter by properties.
-     *
-     * INTERNAL API: Do not use.
      */
-    _props<T>(props: Filter.Props<T>): Filter<T>;
+    props<T>(props: Filter.Props<T>): Filter<T>;
     /**
      * Full-text or vector search.
      */
@@ -176,12 +201,17 @@ interface FilterAPI {
      * @param values - Values to check against.
      */
     in<T>(...values: T[]): Filter<T>;
+    /**
+     * Predicate for an array property to contain the provided value.
+     * @param value - Value to check against.
+     */
+    contains<T>(value: T): Filter<readonly T[] | undefined>;
     /**
      * Predicate for property to be in the provided range.
      * @param from - Start of the range (inclusive).
      * @param to - End of the range (exclusive).
      */
-    between<T>(from: T, to: T): Filter<T>;
+    between<T>(from: T, to: T): Filter<unknown>;
     /**
      * Negate the filter.
      */
@@ -201,10 +231,10 @@ export declare namespace Filter {
     };
     type Any = Filter<any>;
     type Type<F extends Any> = F extends Filter<infer T> ? T : never;
-    type And<FS extends readonly Any[]> = Simplify<Intersection<{
+    type And<FS extends readonly Any[]> = Schema.Simplify<Intersection<{
         [K in keyof FS]: Type<FS[K]>;
     }>>;
-    type Or<FS extends readonly Any[]> = Simplify<{
+    type Or<FS extends readonly Any[]> = Schema.Simplify<{
         [K in keyof FS]: Type<FS[K]>;
     }[number]>;
 }
@@ -215,4 +245,4 @@ export declare const Filter: FilterAPI;
 type RefPropKey<T> = keyof T & string;
 export declare const Query: QueryAPI;
 export {};
-//# sourceMappingURL=dsl.d.ts.map
+//# sourceMappingURL=query.d.ts.map

package/dist/types/src/query/query.d.ts.map

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

package/dist/types/src/query/query.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=query.test.d.ts.map

package/dist/types/src/query/query.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.test.d.ts","sourceRoot":"","sources":["../../../../src/query/query.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,7 @@
+import type * as Schema from 'effect/Schema';
+import { EchoSchema } from '../internal';
+/**
+ * Create a reactive mutable schema that updates when the JSON schema is updated.
+ */
+export declare const createEchoSchema: (schema: Schema.Schema.AnyNoContext) => EchoSchema;
+//# sourceMappingURL=echo-schema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"echo-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/echo-schema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAK7C,OAAO,EAAE,UAAU,EAAuD,MAAM,aAAa,CAAC;AAK9F;;GAEG;AAEH,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,CAAC,MAAM,CAAC,YAAY,KAAG,UAmBrE,CAAC"}

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

@@ -1,2 +1,4 @@
+export { prepareAstForCompare, Testing as TestingDeprecated, updateCounter } from '../internal/testing';
 export * from './types';
+export * from './echo-schema';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,OAAO,IAAI,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACxG,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC"}

package/dist/types/src/testing/types.d.ts

@@ -1,11 +1,14 @@
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import { Type } from '..';
+/**
+ * @deprecated
+ */
 export declare namespace Testing {
-    const _Contact: Type.obj<Schema.SchemaClass<{
-        readonly name?: string | undefined;
+    const Person: Type.obj<Schema.SchemaClass<{
         readonly email?: string | undefined;
+        readonly name?: string | undefined;
         readonly username?: string | undefined;
-        readonly tasks?: import("@dxos/echo-schema").Ref<Task>[] | undefined;
+        readonly tasks?: import("../internal").Ref<Task>[] | undefined;
         readonly address?: {
             readonly city?: string | undefined;
             readonly state?: string | undefined;
@@ -16,8 +19,8 @@ export declare namespace Testing {
             };
         } | undefined;
     }, {
-        readonly name?: string | undefined;
         readonly email?: string | undefined;
+        readonly name?: string | undefined;
         readonly username?: string | undefined;
         readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
         readonly address?: {
@@ -30,58 +33,122 @@ export declare namespace Testing {
             readonly zip?: string | undefined;
         } | undefined;
     }, never>>;
-    export interface Contact extends Schema.Schema.Type<typeof _Contact> {
+    interface Person extends Schema.Schema.Type<typeof Person> {
     }
-    export const Contact: Schema.Schema<Contact, Schema.Schema.Encoded<typeof _Contact>, never>;
-    const _Task: Type.obj<Schema.SchemaClass<{
-        readonly description?: string | undefined;
+    const Task: Type.obj<Schema.SchemaClass<{
         readonly title?: string | undefined;
-        readonly assignee?: import("@dxos/echo-schema").Ref<Contact> | undefined;
+        readonly description?: string | undefined;
         readonly completed?: boolean | undefined;
-        readonly previous?: import("@dxos/echo-schema").Ref<Task> | undefined;
-        readonly subTasks?: import("@dxos/echo-schema").Ref<Task>[] | undefined;
+        readonly assignee?: import("../internal").Ref<Type.OfKind<import("../internal").EntityKind.Object> & {
+            email?: string | undefined;
+            name?: string | undefined;
+            username?: string | undefined;
+            tasks?: import("../internal").Ref<Task>[] | undefined;
+            address?: {
+                readonly city?: string | undefined;
+                readonly state?: string | undefined;
+                readonly zip?: string | undefined;
+                readonly coordinates: {
+                    readonly lat?: number | undefined;
+                    readonly lng?: number | undefined;
+                };
+            } | undefined;
+        }> | undefined;
+        readonly previous?: import("../internal").Ref<Task> | undefined;
+        readonly subTasks?: import("../internal").Ref<Task>[] | undefined;
     }, {
-        readonly description?: string | undefined;
         readonly title?: string | undefined;
-        readonly assignee?: import("@dxos/echo-protocol").EncodedReference | undefined;
+        readonly description?: string | undefined;
         readonly completed?: boolean | undefined;
+        readonly assignee?: import("@dxos/echo-protocol").EncodedReference | undefined;
         readonly previous?: import("@dxos/echo-protocol").EncodedReference | undefined;
         readonly subTasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
     }, never>>;
-    export interface Task extends Schema.Schema.Type<typeof _Task> {
-    }
-    export const Task: Schema.Schema<Task, Schema.Schema.Encoded<typeof _Task>, never>;
-    export enum RecordType {
-        UNDEFINED = 0,
-        PERSONAL = 1,
-        WORK = 2
+    interface Task extends Schema.Schema.Type<typeof Task> {
     }
-    export const Container: Type.obj<Schema.SchemaClass<{
-        readonly records?: {
-            readonly type?: RecordType | undefined;
-            readonly description?: string | undefined;
-            readonly title?: string | undefined;
-            readonly contacts?: import("@dxos/echo-schema").Ref<Contact>[] | undefined;
-        }[] | undefined;
-        readonly objects?: import("@dxos/echo-schema").Ref<Type.Expando>[] | undefined;
+    const WorksFor: Type.relation<Schema.Struct<{
+        since: Schema.optional<typeof Schema.String>;
+    }>, Type.obj<Schema.SchemaClass<{
+        readonly email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("../internal").Ref<Task>[] | 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 records?: {
-            readonly type?: RecordType | undefined;
-            readonly description?: string | undefined;
-            readonly title?: string | undefined;
-            readonly contacts?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        }[] | undefined;
-        readonly objects?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-    }, never>>;
-    export const WorksFor: Type.relation<Schema.Struct<{
+        readonly email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
+        readonly address?: {
+            readonly coordinates: {
+                readonly lat?: number | undefined;
+                readonly lng?: number | undefined;
+            };
+            readonly city?: string | undefined;
+            readonly state?: string | undefined;
+            readonly zip?: string | undefined;
+        } | undefined;
+    }, never>>, Type.obj<Schema.SchemaClass<{
+        readonly email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("../internal").Ref<Task>[] | 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 email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
+        readonly address?: {
+            readonly coordinates: {
+                readonly lat?: number | undefined;
+                readonly lng?: number | undefined;
+            };
+            readonly city?: string | undefined;
+            readonly state?: string | undefined;
+            readonly zip?: string | undefined;
+        } | undefined;
+    }, never>>>;
+    interface WorksFor extends Schema.Schema.Type<typeof WorksFor> {
+    }
+    const HasManager: Type.relation<Schema.Struct<{
         since: Schema.optional<typeof Schema.String>;
-    }>, Schema.Schema<Contact, {
-        id: string;
-        name?: string | undefined;
-        email?: string | undefined;
-        username?: string | undefined;
-        tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        address?: {
+    }>, Type.obj<Schema.SchemaClass<{
+        readonly email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("../internal").Ref<Task>[] | 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 email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
+        readonly address?: {
             readonly coordinates: {
                 readonly lat?: number | undefined;
                 readonly lng?: number | undefined;
@@ -90,13 +157,26 @@ export declare namespace Testing {
             readonly state?: string | undefined;
             readonly zip?: string | undefined;
         } | undefined;
-    }, never>, Schema.Schema<Contact, {
-        id: string;
-        name?: string | undefined;
-        email?: string | undefined;
-        username?: string | undefined;
-        tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        address?: {
+    }, never>>, Type.obj<Schema.SchemaClass<{
+        readonly email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("../internal").Ref<Task>[] | 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 email?: string | undefined;
+        readonly name?: string | undefined;
+        readonly username?: string | undefined;
+        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
+        readonly address?: {
             readonly coordinates: {
                 readonly lat?: number | undefined;
                 readonly lng?: number | undefined;
@@ -105,9 +185,44 @@ export declare namespace Testing {
             readonly state?: string | undefined;
             readonly zip?: string | undefined;
         } | undefined;
-    }, never>>;
-    export interface WorksFor extends Schema.Schema.Type<typeof WorksFor> {
+    }, never>>>;
+    interface HasManager extends Schema.Schema.Type<typeof HasManager> {
     }
-    export {};
+    enum RecordType {
+        UNDEFINED = 0,
+        PERSONAL = 1,
+        WORK = 2
+    }
+    const Container: Type.obj<Schema.SchemaClass<{
+        readonly records?: {
+            readonly title?: string | undefined;
+            readonly description?: string | undefined;
+            readonly type?: RecordType | undefined;
+            readonly contacts?: import("../internal").Ref<Type.OfKind<import("../internal").EntityKind.Object> & {
+                email?: string | undefined;
+                name?: string | undefined;
+                username?: string | undefined;
+                tasks?: import("../internal").Ref<Task>[] | undefined;
+                address?: {
+                    readonly city?: string | undefined;
+                    readonly state?: string | undefined;
+                    readonly zip?: string | undefined;
+                    readonly coordinates: {
+                        readonly lat?: number | undefined;
+                        readonly lng?: number | undefined;
+                    };
+                } | undefined;
+            }>[] | undefined;
+        }[] | undefined;
+        readonly objects?: import("../internal").Ref<Type.Expando>[] | undefined;
+    }, {
+        readonly records?: {
+            readonly title?: string | undefined;
+            readonly description?: string | undefined;
+            readonly type?: RecordType | undefined;
+            readonly contacts?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
+        }[] | undefined;
+        readonly objects?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
+    }, never>>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/types/src/testing/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/testing/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAG1B,yBAAiB,OAAO,CAAC;IACvB,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAoBb,CAAC;IACF,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC;KAAG;IACvE,MAAM,CAAC,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,QAAQ,CAAC,EAAE,KAAK,CAAY,CAAC;IAEvG,MAAM,KAAK;;;;;;;;;;;;;;cAaV,CAAC;IACF,MAAM,WAAW,IAAK,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC;KAAG;IACjE,MAAM,CAAC,MAAM,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,KAAK,CAAC,EAAE,KAAK,CAAS,CAAC;IAE3F,MAAM,MAAM,UAAU;QACpB,SAAS,IAAI;QACb,QAAQ,IAAI;QACZ,IAAI,IAAI;KACT;IAED,MAAM,CAAC,MAAM,SAAS;;;;;;;;;;;;;;;;cAoBrB,CAAC;IAEF,MAAM,CAAC,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cASpB,CAAC;IACF,MAAM,WAAW,QAAS,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC;KAAG;;CACzE"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/testing/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE1B;;GAEG;AAEH,yBAAiB,OAAO,CAAC;IAChB,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAoBlB,CAAC;IAEF,UAAiB,MAAO,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC;KAAG;IAE7D,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAahB,CAAC;IAEF,UAAiB,IAAK,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;KAAG;IAEzD,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eASpB,CAAC;IAEF,UAAiB,QAAS,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC;KAAG;IAEjE,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAStB,CAAC;IAEF,UAAiB,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;KAAG;IAE5E,KAAY,UAAU;QACpB,SAAS,IAAI;QACb,QAAQ,IAAI;QACZ,IAAI,IAAI;KACT;IAEM,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAoBrB,CAAC;CACH"}