@dxos/cli 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

package/dist/src/commands/space/schema/list.js

@@ -3,7 +3,7 @@
 //
 import { Flags, ux } from '@oclif/core';
 import { FLAG_SPACE_KEYS, TABLE_FLAGS, table } from '@dxos/cli-base';
-import { getTypeAnnotation } from '@dxos/echo-schema';
+import { getTypeAnnotation } from '@dxos/echo/internal';
 import { BaseCommand } from '../../../base';
 // TODO(burdon): Option to output JSON schema.
 export default class List extends BaseCommand {

package/dist/src/commands/space/schema/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/space/schema/list.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAmB,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,8CAA8C;AAE9C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAwB;IACxD,MAAM,CAAU,cAAc,GAAG,IAAI,CAAC;IAEtC;QACE,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;IACpC,CAAC;IAED,MAAM,CAAU,KAAK,GAAG;QACtB,GAAG,WAAW,CAAC,KAAK;QACpB,GAAG,WAAW;QACd,GAAG,eAAe;QAClB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC;KAC3F,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEjE,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC;YAC/D,MAAM,aAAa,GAAG,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC;YAE5D,MAAM,OAAO,GAAG;gBACd,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAe,EAAE,CAAC,MAAM,CAAC;gBAClD,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAe,EAAE;oBAC3C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAE,CAAC;oBACpD,OAAO;wBACL,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;wBACnC,OAAO,EAAE,gBAAgB,CAAC,OAAO;qBAClC,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YACzB,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAY,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;;AAGH,MAAM,oBAAoB,GAAG,CAAC,cAAuB,EAAE,EAAE;IACvD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,MAAmB,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC;AACvG,CAAC,CAAC;AAQF,oCAAoC;AACpC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAE,QAAoB,EAAE,EAAE,EAAE;IACrE,EAAE,CAAC,MAAM,CACP,KAAK,CACH,OAAO,EACP;QACE,EAAE,EAAE;YACF,QAAQ,EAAE,IAAI;SACf;QACD,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;KACZ,EACD,KAAK,CACN,CACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/space/schema/list.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAmB,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,8CAA8C;AAE9C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAwB;IACxD,MAAM,CAAU,cAAc,GAAG,IAAI,CAAC;IAEtC;QACE,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;IACpC,CAAC;IAED,MAAM,CAAU,KAAK,GAAG;QACtB,GAAG,WAAW,CAAC,KAAK;QACpB,GAAG,WAAW;QACd,GAAG,eAAe;QAClB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC;KAC3F,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEjE,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC;YAC/D,MAAM,aAAa,GAAG,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC;YAE5D,MAAM,OAAO,GAAG;gBACd,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAe,EAAE,CAAC,MAAM,CAAC;gBAClD,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAe,EAAE;oBAC3C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAE,CAAC;oBACpD,OAAO;wBACL,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;wBACnC,OAAO,EAAE,gBAAgB,CAAC,OAAO;qBAClC,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YACzB,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAY,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;;AAGH,MAAM,oBAAoB,GAAG,CAAC,cAAuB,EAAE,EAAE;IACvD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,MAAmB,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC;AACvG,CAAC,CAAC;AAQF,oCAAoC;AACpC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAE,QAAoB,EAAE,EAAE,EAAE;IACrE,EAAE,CAAC,MAAM,CACP,KAAK,CACH,OAAO,EACP;QACE,EAAE,EAAE;YACF,QAAQ,EAAE,IAAI;SACf;QACD,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;KACZ,EACD,KAAK,CACN,CACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/commands/space/share.d.ts

@@ -18,7 +18,6 @@ export default class Share extends BaseCommand<typeof Share> {
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         target: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        agent: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'json-log': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'json-logfile': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };

package/dist/src/commands/space/share.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/share.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAA8B;IACzD,OAAgB,IAAI;;MAAkB;IACtC,OAAgB,KAAK;;;;;;;;;;;;;;;;;MAyBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAwC1B"}
+{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/share.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAA8B;IACzD,OAAgB,IAAI;;MAAkB;IACtC,OAAgB,KAAK;;;;;;;;;;;;;;;;MAyBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAwC1B"}

package/dist/src/commands/tunnel/index.d.ts

@@ -13,7 +13,6 @@ export default class Tunnel extends BaseCommand<typeof Tunnel> {
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         target: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        agent: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'json-log': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'json-logfile': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };

package/dist/src/commands/tunnel/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAU5D,OAAgB,KAAK;;;;;;;;;;;;;MASnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAS1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAU5D,OAAgB,KAAK;;;;;;;;;;;;MASnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAS1B"}

package/dist/src/commands/tunnel/list.d.ts

@@ -12,7 +12,6 @@ export default class List extends BaseCommand<typeof List> {
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         target: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        agent: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'json-log': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'json-logfile': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };

package/dist/src/commands/tunnel/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/list.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IAOxD,OAAgB,KAAK;;;;;;;;;;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAQ1B"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/list.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IAOxD,OAAgB,KAAK;;;;;;;;;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAQ1B"}

package/dist/src/util/function/index.d.ts

@@ -1,3 +1,2 @@
-export * from './bundle';
 export * from './lookup';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/util/function/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/util/function/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/util/function/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC"}

package/dist/src/util/function/index.js

@@ -1,6 +1,5 @@
 //
 // Copyright 2025 DXOS.org
 //
-export * from './bundle';
 export * from './lookup';
 //# sourceMappingURL=index.js.map

package/dist/src/util/function/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/util/function/index.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/util/function/index.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,cAAc,UAAU,CAAC"}

package/dist/src/util/function/lookup.d.ts

@@ -1,18 +1,21 @@
 import { type Space } from '@dxos/client/echo';
-export declare const findFunctionByDeploymentId: (space: Space, functionId?: string) => Promise<import("@dxos/live-object").Live<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+export declare const findFunctionByDeploymentId: (space: Space, functionId?: string) => Promise<import("@dxos/live-object").Live<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
+    key?: string | undefined;
     version: string;
     name: string;
     description?: string | undefined;
-    source?: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+    services?: readonly string[] | undefined;
+    updated?: string | undefined;
+    source?: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
         description?: string | undefined;
-        source: import("@dxos/echo-schema").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+        source: import("@dxos/echo/internal").Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo/internal").EntityKind.Object> & {
             content: string;
         }>;
         name?: string | undefined;
         changed?: boolean | undefined;
     }> | undefined;
-    inputSchema?: import("@dxos/echo-schema").JsonSchemaType | undefined;
-    outputSchema?: import("@dxos/echo-schema").JsonSchemaType | undefined;
+    inputSchema?: import("@dxos/echo/internal").JsonSchemaType | undefined;
+    outputSchema?: import("@dxos/echo/internal").JsonSchemaType | undefined;
     binding?: string | undefined;
 }> | undefined>;
 //# sourceMappingURL=lookup.d.ts.map

package/dist/src/util/function/lookup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lookup.d.ts","sourceRoot":"","sources":["../../../../src/util/function/lookup.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,KAAK,KAAK,EAAW,MAAM,mBAAmB,CAAC;AAGhE,eAAO,MAAM,0BAA0B,GAAU,OAAO,KAAK,EAAE,aAAa,MAAM;;;;;;;;;;;;;;;eAOjF,CAAC"}
+{"version":3,"file":"lookup.d.ts","sourceRoot":"","sources":["../../../../src/util/function/lookup.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,KAAK,KAAK,EAAW,MAAM,mBAAmB,CAAC;AAIhE,eAAO,MAAM,0BAA0B,GAAU,OAAO,KAAK,EAAE,aAAa,MAAM;;;;;;;;;;;;;;;;;;eAMjF,CAAC"}

package/dist/src/util/function/lookup.js

@@ -2,13 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 import { Filter, getMeta } from '@dxos/client/echo';
-import { FunctionType, getUserFunctionUrlInMetadata, makeFunctionUrl } from '@dxos/functions';
+import { getUserFunctionIdInMetadata } from '@dxos/functions';
+import { Function } from '@dxos/functions';
 export const findFunctionByDeploymentId = async (space, functionId) => {
     if (!functionId) {
         return undefined;
     }
-    const invocationUrl = makeFunctionUrl({ functionId });
-    const functions = await space.db.query(Filter.type(FunctionType)).run();
-    return functions.objects.find((fn) => getUserFunctionUrlInMetadata(getMeta(fn)) === invocationUrl);
+    const functions = await space.db.query(Filter.type(Function.Function)).run();
+    return functions.objects.find((fn) => getUserFunctionIdInMetadata(getMeta(fn)) === functionId);
 };
 //# sourceMappingURL=lookup.js.map

package/dist/src/util/function/lookup.js.map

@@ -1 +1 @@
-{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../../../src/util/function/lookup.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,MAAM,EAAc,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,4BAA4B,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE9F,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAAE,KAAY,EAAE,UAAmB,EAAE,EAAE;IACpF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,aAAa,GAAG,eAAe,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IACxE,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,4BAA4B,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC;AACrG,CAAC,CAAC"}
+{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../../../src/util/function/lookup.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,MAAM,EAAc,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAAE,KAAY,EAAE,UAAmB,EAAE,EAAE;IACpF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAC7E,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC;AACjG,CAAC,CAAC"}