great 1.6.0 → 1.8.0

package/dist/utils/{resolveImports.js → resolveTemplateImport.js}

@@ -4,20 +4,39 @@ import { handleGraphQLError } from './graphqlError.js';
 import { folderToElementType, readWorkspaceElements } from './elementFiles.js';
 import { getElementRecord } from './greatFile.js';
 import { ENDPOINT_LISTS_FOLDER } from './serviceFile.js';
-const ResolveImportsQueryDocument = gql `
-  query ResolveImports(
-    $imports: [ImportInput!]!
-    $elements: [TargetElementInput!]
+const ResolveTemplateImportQueryDocument = gql `
+  query ResolveTemplateImport(
+    $templateId: ID!
+    $existingTemplates: [TemplateImportInput!]
+    $existingElements: [TargetElementInput!]
+    $allowVersionChange: Boolean
   ) {
-    resolveImports(imports: $imports, elements: $elements) {
+    resolveTemplateImport(
+      templateId: $templateId
+      existingTemplates: $existingTemplates
+      existingElements: $existingElements
+      allowVersionChange: $allowVersionChange
+    ) {
       imports {
         templateId
         timestamp
+        outOfSync
+        outOfSyncElements {
+          type
+          key
+        }
       }
       conflicts {
         type
         key
+        code
         reason
+        templates {
+          templateId
+          timestamp
+          contentTimestamp
+          importing
+        }
       }
       elements {
         key
@@ -47,21 +66,20 @@ function toTargetElement(great, element) {
     };
 }
 export const buildTargetElements = (great, root, fsImpl = fs) => readWorkspaceElements(root, fsImpl).map((element) => toTargetElement(great, element));
-export const buildImportInputs = (great, templateId) => [
-    ...(great.imports ?? [])
-        .filter((record) => record.templateId !== templateId)
-        .map((record) => ({
-        templateId: record.templateId,
-        timestamp: record.timestamp,
-    })),
-    { templateId },
-];
-export default async function resolveImports(graphqlClient, imports, elements, log) {
-    const result = await graphqlClient.request(ResolveImportsQueryDocument, { imports, elements });
+const toTemplateImport = (record) => ({
+    templateId: record.templateId,
+    timestamp: record.timestamp,
+});
+export const buildExistingTemplates = (great, templateId) => (great.imports ?? [])
+    .filter((record) => record.templateId !== templateId)
+    .map(toTemplateImport);
+export const buildAllTemplates = (great) => (great.imports ?? []).map(toTemplateImport);
+export default async function resolveTemplateImport(graphqlClient, templateId, existingTemplates, existingElements, allowVersionChange, log) {
+    const result = await graphqlClient.request(ResolveTemplateImportQueryDocument, { templateId, existingTemplates, existingElements, allowVersionChange });
     if (result.error) {
         handleGraphQLError(result.error, log);
         return undefined;
     }
-    return result.data?.resolveImports;
+    return result.data?.resolveTemplateImport;
 }
-//# sourceMappingURL=resolveImports.js.map
+//# sourceMappingURL=resolveTemplateImport.js.map

package/dist/utils/resolveTemplateImport.js.map

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

package/dist/utils/resolveTemplateUnimport.d.ts

@@ -0,0 +1,5 @@
+import type { GraphQLRequestClient } from './graphqlClient.js';
+import type { ResolveTemplateUnimportQuery } from '../generated/operations.js';
+import type { TargetElementInput, TemplateImportInput } from '../generated/schema.js';
+export type ResolvedUnimports = ResolveTemplateUnimportQuery['resolveTemplateUnimport'];
+export default function resolveTemplateUnimport(graphqlClient: GraphQLRequestClient, templateId: string, existingTemplates: TemplateImportInput[], existingElements: TargetElementInput[], log: (message: string) => void): Promise<ResolvedUnimports | undefined>;

package/dist/utils/resolveTemplateUnimport.js

@@ -0,0 +1,47 @@
+import { gql } from 'graphql-tag';
+import { handleGraphQLError } from './graphqlError.js';
+const ResolveTemplateUnimportQueryDocument = gql `
+  query ResolveTemplateUnimport(
+    $templateId: ID!
+    $existingTemplates: [TemplateImportInput!]
+    $existingElements: [TargetElementInput!]
+  ) {
+    resolveTemplateUnimport(
+      templateId: $templateId
+      existingTemplates: $existingTemplates
+      existingElements: $existingElements
+    ) {
+      imports {
+        templateId
+        timestamp
+      }
+      conflicts {
+        type
+        key
+        code
+        reason
+      }
+      elements {
+        key
+        name
+        description
+        type
+        content {
+          sourceId
+          sourceTimestamp
+          provenance
+          data
+        }
+      }
+    }
+  }
+`;
+export default async function resolveTemplateUnimport(graphqlClient, templateId, existingTemplates, existingElements, log) {
+    const result = await graphqlClient.request(ResolveTemplateUnimportQueryDocument, { templateId, existingTemplates, existingElements });
+    if (result.error) {
+        handleGraphQLError(result.error, log);
+        return undefined;
+    }
+    return result.data?.resolveTemplateUnimport;
+}
+//# sourceMappingURL=resolveTemplateUnimport.js.map

package/dist/utils/resolveTemplateUnimport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveTemplateUnimport.js","sourceRoot":"","sources":["../../src/utils/resolveTemplateUnimport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAQtD,MAAM,oCAAoC,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmC/C,CAAA;AAWD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CACnD,aAAmC,EACnC,UAAkB,EAClB,iBAAwC,EACxC,gBAAsC,EACtC,GAA8B;IAE9B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CACxC,oCAAoC,EACpC,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CACpD,CAAA;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QACrC,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,EAAE,uBAAuB,CAAA;AAC7C,CAAC"}

package/dist/utils/writeShadowElement.d.ts

@@ -1,12 +1,14 @@
 import type { ElementTarget } from './elementFiles.js';
 import type { GreatFile } from './greatFile.js';
-import type { ResolveImportsQuery } from '../generated/operations.js';
+import type { ResolveTemplateImportQuery } from '../generated/operations.js';
+import type { ImportConflictCode } from '../generated/schema.js';
 import type { GreatFs } from '../types.js';
-export type ResolvedShadow = ResolveImportsQuery['resolveImports']['elements'][number];
+export type ResolvedShadow = ResolveTemplateImportQuery['resolveTemplateImport']['elements'][number];
 export interface ShadowConflict {
     key: string;
     folder: string;
     reason: string;
+    code?: ImportConflictCode;
 }
 export interface WriteShadowsResult {
     written: ElementTarget[];
@@ -19,6 +21,7 @@ export interface WriteShadowsOptions {
 }
 export declare function isLocalOccupant(great: GreatFile, folder: string, key: string, root: string | undefined, fsImpl: GreatFs): boolean;
 export declare const findLocalOccupants: (great: GreatFile, elements: readonly ResolvedShadow[], root: string | undefined, fsImpl: GreatFs) => ElementTarget[];
+export declare function buildShadowData(resolved: ResolvedShadow, folder: string): Record<string, unknown>;
 export declare function writeShadowFile(great: GreatFile, resolved: ResolvedShadow, folder: string, provenance: readonly string[], root: string | undefined, fsImpl: GreatFs): void;
 export declare function writeShadowElements(great: GreatFile, resolved: readonly ResolvedShadow[], options?: WriteShadowsOptions): WriteShadowsResult;
 export declare function logShadowConflicts(verb: string, conflicts: readonly ShadowConflict[], log: (message: string) => void): void;

package/dist/utils/writeShadowElement.js

@@ -34,7 +34,7 @@ function classify(resolved) {
     }
     return { status: 'write', folder };
 }
-function buildShadowData(resolved, folder) {
+export function buildShadowData(resolved, folder) {
     if (folder === ENDPOINT_LISTS_FOLDER) {
         return { ...resolved.content?.data };
     }

package/dist/utils/writeShadowElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeShadowElement.js","sourceRoot":"","sources":["../../src/utils/writeShadowElement.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,gBAAgB,GACjB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,GACd,MAAM,gBAAgB,CAAA;AACvB,OAAO,WAAW,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAwCxD,MAAM,UAAU,eAAe,CAC7B,KAAgB,EAChB,MAAc,EACd,GAAW,EACX,IAAwB,EACxB,MAAe;IAEf,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;IACnD,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;AACrE,CAAC;AAID,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAgB,EAChB,QAAmC,EACnC,IAAwB,EACxB,MAAe,EACE,EAAE,CACnB,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;IAC3B,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAChD,OAAO,MAAM,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC;QACxE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;QAChC,CAAC,CAAC,EAAE,CAAA;AACR,CAAC,CAAC,CAAA;AAKJ,SAAS,QAAQ,CAAC,QAAwB;IACxC,MAAM,MAAM,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;IAC3B,CAAC;IAMD,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;QAChC,OAAO;YACL,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE;gBACR,GAAG,EAAE,QAAQ,CAAC,GAAG;gBACjB,MAAM;gBACN,MAAM,EAAE,6CAA6C;aACtD;SACF,CAAA;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAA;AACpC,CAAC;AAQD,SAAS,eAAe,CACtB,QAAwB,EACxB,MAAc;IAEd,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;QACrC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAA;IACtC,CAAC;IACD,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,GAAG,CAAC,QAAQ,CAAC,WAAW,IAAI,IAAI;YAC9B,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE;YACvC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI;KAC1B,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,eAAe,CAC7B,KAAgB,EAChB,QAAwB,EACxB,MAAc,EACd,UAA6B,EAC7B,IAAwB,EACxB,MAAe;IAEf,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IAIlE,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAA;IACnD,MAAM,CAAC,MAAM,GAAG;QACd,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,IAAI,EAAE;QACpC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAA;IAGD,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IACxD,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACjC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAKrD,gBAAgB,CACd,IAAI,EACJ,MAAM,EACN,QAAQ,CAAC,GAAG,EACZ,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,EACjC,KAAK,EACL,MAAM,CACP,CAAA;AACH,CAAC;AAID,MAAM,kBAAkB,GAAG,CACzB,KAAgB,EAChB,QAAwB,EACxB,MAAc,EACJ,EAAE,CAAC;IACb,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC;IACpE,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,IAAI,EAAE,CAAC;CACxC,CAAA;AAID,SAAS,UAAU,CAAC,QAAmC;IACrD,MAAM,OAAO,GAAmD,EAAE,CAAA;IAClE,MAAM,OAAO,GAAqB,EAAE,CAAA;IACpC,MAAM,SAAS,GAAqB,EAAE,CAAA;IAEtC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;QACpC,IAAI,UAAU,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,UAAU,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC5C,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;AACxC,CAAC;AAMD,MAAM,UAAU,mBAAmB,CACjC,KAAgB,EAChB,QAAmC,EACnC,UAA+B,EAAE;IAEjC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAA;IACnC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;IAC5D,MAAM,MAAM,GAAuB,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;IAEtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;QACpD,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAC7D,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACzE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IACnD,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAID,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,SAAoC,EACpC,GAA8B;IAE9B,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,cAAc,SAAS,CAAC,MAAM,eAAe,CAAC,CAAC,CAAA;IACpE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,GAAG,CAAC,KAAK,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IACjE,CAAC;AACH,CAAC"}
+{"version":3,"file":"writeShadowElement.js","sourceRoot":"","sources":["../../src/utils/writeShadowElement.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "great",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "A CLI for Integreat",
   "author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io>",
   "license": "UNLICENSED",
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/integreat-io/great#readme",
   "dependencies": {
-    "@inquirer/prompts": "^8.7.4",
+    "@inquirer/prompts": "^8.7.5",
     "chalk": "^6.0.1",
     "change-case": "^5.4.4",
     "clipboardy": "^5.3.2",
@@ -57,11 +57,11 @@
   "devDependencies": {
     "@graphql-codegen/cli": "^7.4.6",
     "@graphql-codegen/typescript": "^6.1.2",
-    "@graphql-codegen/typescript-operations": "^6.1.10",
+    "@graphql-codegen/typescript-operations": "^6.2.0",
     "@integreat/ts-dev-setup": "^10.0.0",
     "@types/columnify": "^1.5.4",
-    "@types/node": "^26.6.5",
-    "@types/sinon": "^22.0.1",
+    "@types/node": "^26.6.6",
+    "@types/sinon": "^22.0.2",
     "integreat": "^1.7.1",
     "sinon": "^22.1.0",
     "strip-ansi": "^7.2.0"

package/dist/utils/resolveImports.d.ts

@@ -1,9 +0,0 @@
-import type { GraphQLRequestClient } from './graphqlClient.js';
-import type { GreatFile } from './greatFile.js';
-import type { ResolveImportsQuery } from '../generated/operations.js';
-import type { ImportInput, TargetElementInput } from '../generated/schema.js';
-import type { GreatFs } from '../types.js';
-export type ResolvedImports = ResolveImportsQuery['resolveImports'];
-export declare const buildTargetElements: (great: GreatFile, root: string | undefined, fsImpl?: GreatFs) => TargetElementInput[];
-export declare const buildImportInputs: (great: GreatFile, templateId: string) => ImportInput[];
-export default function resolveImports(graphqlClient: GraphQLRequestClient, imports: ImportInput[], elements: TargetElementInput[], log: (message: string) => void): Promise<ResolvedImports | undefined>;

package/dist/utils/resolveImports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveImports.js","sourceRoot":"","sources":["../../src/utils/resolveImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAQxD,MAAM,2BAA2B,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BtC,CAAA;AAOD,SAAS,eAAe,CACtB,KAAgB,EAChB,OAAyB;IAEzB,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IACnE,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,CAAA;IAC7B,OAAO;QACL,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5E,CAAA;AACH,CAAC;AAKD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAgB,EAChB,IAAwB,EACxB,SAAkB,EAAE,EACE,EAAE,CACxB,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAClD,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAChC,CAAA;AAMH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,KAAgB,EAChB,UAAkB,EACH,EAAE,CAAC;IAClB,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;SACrB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC;SACpD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,SAAS,EAAE,MAAM,CAAC,SAAS;KAC5B,CAAC,CAAC;IACL,EAAE,UAAU,EAAE;CACf,CAAA;AAMD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,aAAmC,EACnC,OAAsB,EACtB,QAA8B,EAC9B,GAA8B;IAE9B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CACxC,2BAA2B,EAC3B,EAAE,OAAO,EAAE,QAAQ,EAAE,CACtB,CAAA;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QACrC,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,EAAE,cAAc,CAAA;AACpC,CAAC"}