great 1.4.0 → 1.5.0

package/dist/utils/applyImports.js

@@ -0,0 +1,147 @@
+import fs from 'node:fs';
+import { elementTypeToFolder, removeElementFile, writeElementFile, } from './elementFiles.js';
+import { getElementRecord, removeElementRecord, setElementRecord, setProvenance, upsertImportRecord, } from './greatFile.js';
+import { ENDPOINT_LISTS_FOLDER, isEndpointKeys } from './serviceFile.js';
+import { writeShadowFile } from './writeShadowElement.js';
+const elementId = (element) => `${element.type}/${element.key}`;
+const resolvedProvenance = (resolved) => resolved.content?.provenance ?? [];
+const conflictFor = (resolved, folder, reason) => ({
+    status: 'conflict',
+    conflict: { key: resolved.key, folder, reason },
+});
+function classifyResolved(resolved) {
+    const folder = elementTypeToFolder[resolved.type];
+    if (!folder) {
+        return { status: 'skip' };
+    }
+    else if (!resolved.content) {
+        return conflictFor(resolved, folder, 'source has no resolvable content');
+    }
+    else if (resolved.content.sourceId) {
+        return { status: 'shadow', folder };
+    }
+    else if (resolvedProvenance(resolved).length === 0) {
+        return { status: 'kept', folder };
+    }
+    else if (folder === ENDPOINT_LISTS_FOLDER) {
+        return { status: 'merged', folder };
+    }
+    return conflictFor(resolved, folder, 'unexpected local content from Integreat');
+}
+function findRemovals(previous, resolved) {
+    const remaining = new Set(resolved.map(elementId));
+    return previous
+        .filter((element) => element.provenance?.length && !remaining.has(elementId(element)))
+        .flatMap((element) => {
+        const folder = elementTypeToFolder[element.type];
+        return folder ? [{ folder, key: element.key }] : [];
+    })
+        .sort((a, b) => Number(b.folder === ENDPOINT_LISTS_FOLDER) -
+        Number(a.folder === ENDPOINT_LISTS_FOLDER));
+}
+const mapConflicts = (conflicts) => conflicts.map((conflict) => ({
+    key: conflict.key,
+    folder: elementTypeToFolder[conflict.type] ?? conflict.type,
+    reason: conflict.reason,
+}));
+function planImports(resolved, previous) {
+    const plan = {
+        shadows: [],
+        merged: [],
+        kept: [],
+        removals: findRemovals(previous, resolved.elements),
+        skipped: [],
+        conflicts: mapConflicts(resolved.conflicts),
+    };
+    for (const element of resolved.elements) {
+        const classified = classifyResolved(element);
+        if (classified.status === 'skip') {
+            plan.skipped.push(element);
+        }
+        else if (classified.status === 'conflict') {
+            plan.conflicts.push(classified.conflict);
+        }
+        else if (classified.status === 'shadow') {
+            plan.shadows.push({ resolved: element, folder: classified.folder });
+        }
+        else if (classified.status === 'merged') {
+            plan.merged.push({ resolved: element, folder: classified.folder });
+        }
+        else {
+            plan.kept.push({ resolved: element, folder: classified.folder });
+        }
+    }
+    return plan;
+}
+function writeMergedList(great, resolved, root, fsImpl) {
+    const existing = getElementRecord(great, ENDPOINT_LISTS_FOLDER, resolved.key);
+    const record = {
+        ...(existing?.id ? { id: existing.id } : {}),
+        ...(existing?.timestamp ? { timestamp: existing.timestamp } : {}),
+    };
+    setProvenance(record, resolvedProvenance(resolved));
+    setElementRecord(great, ENDPOINT_LISTS_FOLDER, resolved.key, record);
+    const endpoints = resolved.content?.data?.endpoints;
+    writeElementFile(root, ENDPOINT_LISTS_FOLDER, resolved.key, { endpoints: isEndpointKeys(endpoints) ? endpoints : [] }, great, fsImpl);
+}
+function keepAsLocal(great, { resolved, folder }) {
+    const record = getElementRecord(great, folder, resolved.key);
+    if (!record) {
+        return;
+    }
+    Reflect.deleteProperty(record, 'source');
+    Reflect.deleteProperty(record, 'provenance');
+    if (Object.keys(record).length === 0) {
+        removeElementRecord(great, folder, resolved.key);
+    }
+}
+function removeImported(great, target, root, fsImpl) {
+    removeElementFile(root, target.folder, target.key, great, fsImpl);
+    removeElementRecord(great, target.folder, target.key);
+}
+function writePlan(great, plan, imports, root, fsImpl) {
+    for (const target of plan.removals) {
+        removeImported(great, target, root, fsImpl);
+    }
+    for (const { resolved, folder } of plan.shadows) {
+        const provenance = resolvedProvenance(resolved);
+        writeShadowFile(great, resolved, folder, provenance, root, fsImpl);
+    }
+    for (const { resolved } of plan.merged) {
+        writeMergedList(great, resolved, root, fsImpl);
+    }
+    for (const kept of plan.kept) {
+        keepAsLocal(great, kept);
+    }
+    for (const { templateId, timestamp } of imports) {
+        upsertImportRecord(great, templateId, timestamp);
+    }
+}
+const toTarget = ({ resolved, folder }) => ({
+    folder,
+    key: resolved.key,
+});
+export default function applyImports(great, resolved, previous, options = {}) {
+    const plan = planImports(resolved, previous);
+    const { skipped, conflicts } = plan;
+    if (conflicts.length > 0) {
+        return {
+            written: [],
+            merged: [],
+            kept: [],
+            removed: [],
+            skipped,
+            conflicts,
+        };
+    }
+    writePlan(great, plan, resolved.imports, options.root, options.fsImpl ?? fs);
+    return {
+        written: plan.shadows.map(toTarget),
+        merged: plan.merged.map(toTarget),
+        kept: plan.kept.map(toTarget),
+        removed: plan.removals,
+        skipped,
+        conflicts,
+    };
+}
+//# sourceMappingURL=applyImports.js.map

package/dist/utils/applyImports.js.map

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

package/dist/utils/config.d.ts

@@ -12,7 +12,7 @@ export interface ConfigSchema {
 }
 export declare function getConfig(): Conf<ConfigSchema>;
 export declare function getConfigValue<K extends keyof ConfigSchema>(key: K, config?: Conf<ConfigSchema>): ConfigSchema[K] | undefined;
-export declare function setConfigValue<K extends keyof ConfigSchema>(key: K, value: ConfigSchema[K], config?: Conf<ConfigSchema>): void;
+export declare function setConfigValue<K extends keyof ConfigSchema>(key: K, value: Exclude<ConfigSchema[K], undefined>, config?: Conf<ConfigSchema>): void;
 export declare function deleteConfigValue<K extends keyof ConfigSchema>(key: K, config?: Conf<ConfigSchema>): void;
 export declare function getEnvironments(config?: Conf<ConfigSchema>): Record<string, NamedEnvironment>;
 export declare function getCurrentEnvName(config?: Conf<ConfigSchema>): string;

package/dist/utils/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,IAAI,MAAM,MAAM,CAAA;AAwBvB,MAAM,eAAe,GAAG,0BAA0B,CAAA;AAClD,MAAM,eAAe,GAAG,0BAA0B,CAAA;AAElD,IAAI,cAA8C,CAAA;AAMlD,MAAM,UAAU,SAAS;IACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG,IAAI,IAAI,CAAe;YACtC,WAAW,EAAE,OAAO;SACrB,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,GAAM,EACN,MAA2B;IAE3B,MAAM,IAAI,GAAG,MAAM,IAAI,SAAS,EAAE,CAAA;IAClC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACtB,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,GAAM,EACN,KAAsB,EACtB,MAA2B;IAE3B,MAAM,IAAI,GAAG,MAAM,IAAI,SAAS,EAAE,CAAA;IAClC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACtB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,GAAM,EACN,MAA2B;IAE3B,MAAM,IAAI,GAAG,MAAM,IAAI,SAAS,EAAE,CAAA;IAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC;AAGD,MAAM,UAAU,eAAe,CAC7B,MAA2B;IAE3B,OAAO,cAAc,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;AACrD,CAAC;AAMD,MAAM,UAAU,iBAAiB,CAAC,MAA2B;IAC3D,MAAM,OAAO,GAAG,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;IACpD,IAAI,CAAC,OAAO;QAAE,OAAO,MAAM,CAAA;IAC3B,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IACpC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;AAC/E,CAAC;AAGD,MAAM,UAAU,MAAM,CAAC,MAA2B;IAChD,OAAO,iBAAiB,CAAC,MAAM,CAAC,KAAK,MAAM,CAAA;AAC7C,CAAC;AAED,SAAS,qBAAqB,CAC5B,MAA2B;IAE3B,MAAM,OAAO,GAAG,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;IACpD,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAC9B,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAEpC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAA;AACtB,CAAC;AAKD,MAAM,aAAa,GAAG,IAAI,OAAO,EAAsB,CAAA;AAEvD,SAAS,eAAe,CAAC,MAA2B;IAClD,IAAI,MAAM,CAAC,MAAM,CAAC;QAAE,OAAM;IAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,SAAS,EAAE,CAAA;IAClC,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAM;IACnC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACvB,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CACV,2CAA2C,iBAAiB,CAAC,MAAM,CAAC,EAAE,CACvE,CACF,CAAA;AACH,CAAC;AAOD,MAAM,UAAU,aAAa,CAAC,MAA2B;IACvD,eAAe,CAAC,MAAM,CAAC,CAAA;IACvB,OAAO,qBAAqB,CAAC,MAAM,CAAC,EAAE,MAAM,IAAI,eAAe,CAAA;AACjE,CAAC;AAOD,MAAM,UAAU,aAAa,CAAC,MAA2B;IACvD,eAAe,CAAC,MAAM,CAAC,CAAA;IACvB,OAAO,qBAAqB,CAAC,MAAM,CAAC,EAAE,MAAM,IAAI,eAAe,CAAA;AACjE,CAAC;AAKD,MAAM,UAAU,YAAY,CAAC,MAA2B;IACtD,MAAM,IAAI,GAAG,MAAM,IAAI,SAAS,EAAE,CAAA;IAClC,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;QAChC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;QAC5B,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC;QACtC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC;KACnC,CAAA;AACH,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"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"}

package/dist/utils/createIntegrationFromFile.d.ts

@@ -6,6 +6,7 @@ import type { GreatFs } from '../types.js';
 export interface CreateIntegrationResult {
     success: boolean;
     error?: Error | string;
+    hint?: string;
     integration?: {
         id: string;
         key: string;

package/dist/utils/createIntegrationFromFile.js

@@ -1,9 +1,10 @@
 import fs from 'node:fs';
 import { currentIntegrationKey } from './fetchLocal.js';
 import { sentenceCase } from 'change-case';
+import chalk from 'chalk';
 import { gql } from 'graphql-tag';
 import resolveIntegrationType from './integrationType.js';
-import { getGraphQLErrorMessage } from './graphqlError.js';
+import { getGraphQLErrorMessage, isConflictError } from './graphqlError.js';
 import { resolveAccountId } from './resolveAccount.js';
 const CreateIntegrationMutationDocument = gql `
   mutation CreateIntegrationFromFile(
@@ -69,6 +70,13 @@ export default async function createIntegrationFromFile(graphqlClient, apiToken,
         type: resolveIntegrationType(integrationData.type),
     });
     if (result.error) {
+        if (isConflictError(result.error)) {
+            return {
+                success: false,
+                error: `An integration with key '${key}' already exists in this account.`,
+                hint: `The key comes from the folder name – rename the folder, or run ${chalk.bold('great clone')} to work on the existing integration.`,
+            };
+        }
         return {
             success: false,
             error: `Failed to create integration: ${getGraphQLErrorMessage(result.error)}`,

package/dist/utils/createIntegrationFromFile.js.map

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

package/dist/utils/detectPullConflicts.js

@@ -3,15 +3,14 @@ import hashContent from './hashContent.js';
 import { getElementRecord, sameProvenance } from './greatFile.js';
 import { typeToFolder } from './saveIntegration.js';
 import { readWorkspaceElements } from './elementFiles.js';
+import { CONFIG_KEY, CONFIG_RECORD_FOLDER, findConfigElement, hashFlags, readLocalFlags, } from './integrationConfig.js';
 function readLocalElements(root, fsImpl) {
     return new Map(readWorkspaceElements(root, fsImpl).map((element) => [
         `${element.folder}/${element.key}`,
         element,
     ]));
 }
-function conflictReason(element, localData, baseHash) {
-    const localHash = hashContent(localData);
-    const remoteHash = hashContent({ ...element.content?.data });
+function compareHashes(remoteHash, localHash, baseHash) {
     if (remoteHash === localHash) {
         return undefined;
     }
@@ -25,6 +24,13 @@ function conflictReason(element, localData, baseHash) {
         ? 'Local changes would be overwritten'
         : 'Content changed both locally and remotely';
 }
+const conflictReason = (element, localData, baseHash) => compareHashes(hashContent({ ...element.content?.data }), hashContent(localData), baseHash);
+function configConflictReason(config, localFlags, record) {
+    if (!record) {
+        return undefined;
+    }
+    return compareHashes(hashFlags(config?.content?.data ?? {}), hashFlags(localFlags ?? {}), record.hash);
+}
 function shadowPinConflict(element, record) {
     const pinChanged = (record.source?.timestamp ?? null) !==
         (element.content?.sourceTimestamp ?? null);
@@ -55,6 +61,10 @@ export default function detectPullConflicts(definitions, priorGreat, root, fsImp
             conflicts.push({ filePath: local.filePath, reason });
         }
     }
+    const configReason = configConflictReason(findConfigElement(definitions.elements), readLocalFlags(root, fsImpl), getElementRecord(priorGreat, CONFIG_RECORD_FOLDER, CONFIG_KEY));
+    if (configReason) {
+        conflicts.push({ filePath: 'integration.json', reason: configReason });
+    }
     return conflicts;
 }
 //# sourceMappingURL=detectPullConflicts.js.map

package/dist/utils/detectPullConflicts.js.map

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

package/dist/utils/graphqlError.d.ts

@@ -1,3 +1,4 @@
 export declare function isNotFoundError(error: Error): boolean;
+export declare function isConflictError(error: Error | string): boolean;
 export declare function getGraphQLErrorMessage(error: Error | string): string;
 export declare function handleGraphQLError(error: Error | string | undefined, log: (message: string) => void): void;

package/dist/utils/graphqlError.js

@@ -6,6 +6,21 @@ export function isNotFoundError(error) {
     }
     return error?.message?.includes('NOT_FOUND');
 }
+export function isConflictError(error) {
+    if (typeof error === 'string')
+        return false;
+    const errors = error.response?.errors;
+    return errors?.some((err) => err.extensions?.code === 'CONFLICT') ?? false;
+}
+const INTERNAL_ERROR_CODES = ['INTERNAL_SERVER_ERROR', 'INTERNAL_ERROR'];
+function formatGraphQLErrorMessage(err) {
+    if (!err.message)
+        return undefined;
+    const code = err.extensions?.code;
+    return !code || INTERNAL_ERROR_CODES.includes(code)
+        ? `The API failed to handle the request:\n${err.message}`
+        : err.message;
+}
 const UNAVAILABLE_STATUSES = [502, 503, 504];
 function isHttpErrorStatus(status) {
     return typeof status === 'number' && (status < 200 || status >= 300);
@@ -21,7 +36,7 @@ export function getGraphQLErrorMessage(error) {
         return error;
     const response = error.response;
     const messages = response?.errors
-        ?.map((err) => err.message)
+        ?.map(formatGraphQLErrorMessage)
         .filter((message) => Boolean(message));
     if (messages?.length) {
         return messages.join('\n');

package/dist/utils/graphqlError.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlError.js","sourceRoot":"","sources":["../../src/utils/graphqlError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAgBzB,MAAM,UAAU,eAAe,CAAC,KAAY;IAE1C,MAAM,iBAAiB,GAAG,KAAkC,CAAA;IAE5D,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QACvC,OAAO,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAC3C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,KAAK,WAAW,CAC9C,CAAA;IACH,CAAC;IAGD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;AAC9C,CAAC;AAID,MAAM,oBAAoB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAE5C,SAAS,iBAAiB,CAAC,MAAe;IACxC,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC,CAAA;AACtE,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAc;IACzC,IAAI,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,OAAO,6CAA6C,MAAM,sEAAsE,CAAA;IAClI,CAAC;IACD,OAAO,iDAAiD,MAAM,IAAI,CAAA;AACpE,CAAC;AAYD,MAAM,UAAU,sBAAsB,CAAC,KAAqB;IAC1D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAE3C,MAAM,QAAQ,GAAI,KAAmC,CAAC,QAAQ,CAAA;IAC9D,MAAM,QAAQ,GAAG,QAAQ,EAAE,MAAM;QAC/B,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;SAC1B,MAAM,CAAC,CAAC,OAAO,EAAqB,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3D,IAAI,QAAQ,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,EAAE,MAAM,CAAA;IAC/B,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;IAED,OAAO,KAAK,CAAC,OAAO,CAAA;AACtB,CAAC;AAKD,MAAM,UAAU,kBAAkB,CAChC,KAAiC,EACjC,GAA8B;IAE9B,IAAI,CAAC,KAAK;QAAE,OAAM;IAElB,MAAM,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC;QAC3C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;QACrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;IAClC,IAAI,WAAW,EAAE,CAAC;QAChB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,sBAAsB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;QAClE,OAAM;IACR,CAAC;IAGD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;AACzB,CAAC"}
+{"version":3,"file":"graphqlError.js","sourceRoot":"","sources":["../../src/utils/graphqlError.ts"],"names":[],"mappings":"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"}

package/dist/utils/greatFile.d.ts

@@ -37,4 +37,5 @@ export declare function renameElementRecord(great: GreatFile, folder: string, ol
 export declare function getImportRecord(great: GreatFile, templateId: string): GreatImportRecord | undefined;
 export declare function upsertImportRecord(great: GreatFile, templateId: string, timestamp: string): void;
 export declare function addProvenance(record: GreatElementRecord, templates: readonly string[]): void;
+export declare function setProvenance(record: GreatElementRecord, templates: readonly string[]): void;
 export declare function sameProvenance(a: readonly string[] | undefined, b: readonly string[] | undefined): boolean;

package/dist/utils/greatFile.js

@@ -58,6 +58,14 @@ export function addProvenance(record, templates) {
         record.provenance = [...merged].sort();
     }
 }
+export function setProvenance(record, templates) {
+    if (templates.length > 0) {
+        record.provenance = [...new Set(templates)].sort();
+    }
+    else {
+        Reflect.deleteProperty(record, 'provenance');
+    }
+}
 export function sameProvenance(a, b) {
     const setA = new Set(a ?? []);
     const setB = new Set(b ?? []);

package/dist/utils/greatFile.js.map

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

package/dist/utils/hashContent.d.ts

@@ -1 +1,2 @@
+export declare function hashJson(data: Record<string, unknown>): string;
 export default function hashContent(data: Record<string, unknown>): string;

package/dist/utils/hashContent.js

@@ -1,7 +1,10 @@
 import crypto from 'node:crypto';
-export default function hashContent(data) {
-    const { name, description, value, ...content } = data;
-    const jsonString = JSON.stringify(content);
+export function hashJson(data) {
+    const jsonString = JSON.stringify(data);
     return crypto.createHash('sha256').update(jsonString).digest('hex');
 }
+export default function hashContent(data) {
+    const { name, description, value, ref, ...content } = data;
+    return hashJson(content);
+}
 //# sourceMappingURL=hashContent.js.map

package/dist/utils/hashContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"hashContent.js","sourceRoot":"","sources":["../../src/utils/hashContent.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAahC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,IAA6B;IAK/D,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAA;IAGrD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAG1C,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACrE,CAAC"}
+{"version":3,"file":"hashContent.js","sourceRoot":"","sources":["../../src/utils/hashContent.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAShC,MAAM,UAAU,QAAQ,CAAC,IAA6B;IAEpD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAGvC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACrE,CAAC;AAcD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,IAA6B;IAK/D,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAA;IAE1D,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAA;AAC1B,CAAC"}

package/dist/utils/integrationConfig.d.ts

@@ -0,0 +1,13 @@
+import type { GreatElementRecord } from './greatFile.js';
+import type { GreatFs } from '../types.js';
+export type Flags = Record<string, unknown>;
+export declare const CONFIG_KEY = "config";
+export declare const CONFIG_RECORD_FOLDER = "config";
+export declare const findConfigElement: <T extends {
+    __typename: string;
+    key: string;
+}>(elements: T[] | undefined) => T | undefined;
+export declare const hashFlags: (flags: Flags) => string;
+export declare function flagsFromIntegration(data: Record<string, unknown> | undefined): Flags | undefined;
+export declare function readLocalFlags(root: string | undefined, fsImpl?: GreatFs): Flags | undefined;
+export declare const buildConfigRecord: (id: string | undefined, timestamp: string | null | undefined, flags: Flags) => GreatElementRecord;

package/dist/utils/integrationConfig.js

@@ -0,0 +1,29 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { hashJson } from './hashContent.js';
+export const CONFIG_KEY = 'config';
+export const CONFIG_RECORD_FOLDER = 'config';
+const isFlags = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+export const findConfigElement = (elements) => elements?.find((element) => element.__typename === 'ConfigElement' && element.key === CONFIG_KEY);
+export const hashFlags = (flags) => hashJson(flags);
+export function flagsFromIntegration(data) {
+    const flags = data?.flags;
+    return isFlags(flags) ? flags : undefined;
+}
+export function readLocalFlags(root, fsImpl = fs) {
+    try {
+        const filePath = root
+            ? path.join(root, 'integration.json')
+            : 'integration.json';
+        return flagsFromIntegration(JSON.parse(fsImpl.readFileSync(filePath, 'utf8')));
+    }
+    catch {
+        return undefined;
+    }
+}
+export const buildConfigRecord = (id, timestamp, flags) => ({
+    ...(id ? { id } : {}),
+    ...(timestamp ? { timestamp } : {}),
+    hash: hashFlags(flags),
+});
+//# sourceMappingURL=integrationConfig.js.map

package/dist/utils/integrationConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"integrationConfig.js","sourceRoot":"","sources":["../../src/utils/integrationConfig.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAM3C,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAA;AAIlC,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAAA;AAE5C,MAAM,OAAO,GAAG,CAAC,KAAc,EAAkB,EAAE,CACjD,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAGtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAyB,EACV,EAAE,CACjB,QAAQ,EAAE,IAAI,CACZ,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,UAAU,KAAK,eAAe,IAAI,OAAO,CAAC,GAAG,KAAK,UAAU,CACvE,CAAA;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAY,EAAU,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAIlE,MAAM,UAAU,oBAAoB,CAClC,IAAyC;IAEzC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,CAAA;IACzB,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;AAC3C,CAAC;AAID,MAAM,UAAU,cAAc,CAC5B,IAAwB,EACxB,SAAkB,EAAE;IAEpB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI;YACnB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC;YACrC,CAAC,CAAC,kBAAkB,CAAA;QACtB,OAAO,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAChF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAID,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,EAAsB,EACtB,SAAoC,EACpC,KAAY,EACQ,EAAE,CAAC,CAAC;IACxB,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACnC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC;CACvB,CAAC,CAAA"}

package/dist/utils/promptForValue.d.ts

@@ -5,6 +5,7 @@ interface LocalElement {
     data: Record<string, unknown>;
     remoteId?: string;
 }
+export declare const hasValueToSet: (element: LocalElement) => boolean;
 export declare const findElementsToSet: (elements: LocalElement[]) => LocalElement[];
 export declare function promptForValueSetting(elements: LocalElement[], log: (message: string) => void): Promise<boolean>;
 export {};

package/dist/utils/promptForValue.js

@@ -1,7 +1,8 @@
 import { confirm } from '@inquirer/prompts';
 import chalk from 'chalk';
-export const findElementsToSet = (elements) => elements.filter((element) => element.folder === 'values' &&
-    (element.data.value !== undefined || element.data.ref !== undefined));
+export const hasValueToSet = (element) => element.folder === 'values' &&
+    (element.data.value !== undefined || element.data.ref !== undefined);
+export const findElementsToSet = (elements) => elements.filter(hasValueToSet);
 export async function promptForValueSetting(elements, log) {
     const elementsToSet = findElementsToSet(elements);
     if (elementsToSet.length === 0) {

package/dist/utils/promptForValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"promptForValue.js","sourceRoot":"","sources":["../../src/utils/promptForValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAwB,EAAkB,EAAE,CAC5E,QAAQ,CAAC,MAAM,CACb,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,MAAM,KAAK,QAAQ;IAC3B,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CACvE,CAAA;AAOH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAwB,EACxB,GAA8B;IAE9B,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAGjD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAA;IACjE,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACxC,CAAC;IACD,GAAG,CAAC,EAAE,CAAC,CAAA;IAGP,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC;YAC9B,OAAO,EAAE,sDAAsD;YAC/D,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,MAAM,CAAC;QAEP,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;IACnC,CAAC;AACH,CAAC"}
+{"version":3,"file":"promptForValue.js","sourceRoot":"","sources":["../../src/utils/promptForValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAA;AAezB,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAqB,EAAW,EAAE,CAC9D,OAAO,CAAC,MAAM,KAAK,QAAQ;IAC3B,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAA;AAKtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAwB,EAAkB,EAAE,CAC5E,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;AAOhC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAwB,EACxB,GAA8B;IAE9B,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAGjD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAA;IACjE,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACxC,CAAC;IACD,GAAG,CAAC,EAAE,CAAC,CAAA;IAGP,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC;YAC9B,OAAO,EAAE,sDAAsD;YAC/D,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,MAAM,CAAC;QAEP,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;IACnC,CAAC;AACH,CAAC"}

package/dist/utils/resolveImports.d.ts

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,67 @@
+import fs from 'node:fs';
+import { gql } from 'graphql-tag';
+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!]
+  ) {
+    resolveImports(imports: $imports, elements: $elements) {
+      imports {
+        templateId
+        timestamp
+      }
+      conflicts {
+        type
+        key
+        reason
+      }
+      elements {
+        key
+        name
+        description
+        type
+        content {
+          sourceId
+          sourceTimestamp
+          provenance
+          data
+        }
+      }
+    }
+  }
+`;
+function toTargetElement(great, element) {
+    const record = getElementRecord(great, element.folder, element.key);
+    const source = record?.source;
+    return {
+        type: folderToElementType[element.folder],
+        key: element.key,
+        ...(source ? { sourceId: source.id } : {}),
+        ...(source?.timestamp ? { sourceTimestamp: source.timestamp } : {}),
+        ...(record?.provenance?.length ? { provenance: record.provenance } : {}),
+        ...(element.folder === ENDPOINT_LISTS_FOLDER ? { data: element.data } : {}),
+    };
+}
+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 });
+    if (result.error) {
+        handleGraphQLError(result.error, log);
+        return undefined;
+    }
+    return result.data?.resolveImports;
+}
+//# sourceMappingURL=resolveImports.js.map

package/dist/utils/resolveImports.js.map

@@ -0,0 +1 @@
+{"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"}

package/dist/utils/saveIntegration.js

@@ -5,6 +5,7 @@ import { emptyGreatFile, readGreatFile, writeGreatFile, setElementRecord, getEle
 import { elementFilePath, elementKeyFromFileName, isVirtualFolder, } from './elementFiles.js';
 import { SERVICES_FOLDER, mergeServiceFile, serviceFileFolders, } from './serviceFile.js';
 import { SHADOW_MARKER, shadowMarkerFor } from './shadowMarker.js';
+import { CONFIG_KEY, CONFIG_RECORD_FOLDER, buildConfigRecord, findConfigElement, } from './integrationConfig.js';
 const normalizeFolderName = (folder) => folder.replace(':', '_');
 function createFolderIfMissing(root, fsImpl) {
     const rootPath = root ? `${root}/` : '';
@@ -155,13 +156,14 @@ export default function saveIntegration(integration, definitions, root, fsImpl =
     great.id = id;
     great.timestamp = timestamp ?? undefined;
     great.account = account ? { id: account.id, key: account.key } : undefined;
-    const config = elements?.find((el) => el.__typename === 'ConfigElement' && el.key === 'config');
+    const config = findConfigElement(elements);
+    const flags = config?.content?.data;
     const index = {
         name,
         description,
         status,
         type: resolveIntegrationType(type),
-        flags: config?.content?.data,
+        flags,
         identConfig: undefined,
         nonvalues: undefined,
         queueService: undefined,
@@ -172,6 +174,9 @@ export default function saveIntegration(integration, definitions, root, fsImpl =
     if (elements) {
         writeElements(elements, writeFile, great);
     }
+    if (config) {
+        setElementRecord(great, CONFIG_RECORD_FOLDER, CONFIG_KEY, buildConfigRecord(config.id, config.content?.createdAt, flags ?? {}));
+    }
     const imports = buildImportRecords(templateImports);
     if (imports.length > 0) {
         great.imports = imports;