great 1.6.0 → 1.8.0

package/README.md

@@ -89,7 +89,10 @@ commands never silently fall back to the current folder in that case.
   Will check for conflicts and abort.
 - `great push`: Push local changes to Integreat. Must be run from a folder with
   an `integration.json` file; supports `-a` when creating a new integration, to
-  create it in the right account. Will check for conflicts and abort.
+  create it in the right account. Will check for conflicts and abort. Use
+  `-y, --yes` to answer yes to all prompts (sets values and detaches edited
+  shadows). Template imports are registered in Integreat as well, and imports
+  removed locally with `great unimport` are unregistered.
 - `great import <template>`: Import a template, creating a local **shadow file**
   for each of its elements. `<template>` can be a template id or key; supports
   `-a`. A shadow file is an ordinary element file carrying a `$shadow: true`
@@ -102,20 +105,39 @@ commands never silently fall back to the current folder in that case.
   too). Elements shared by several templates point at what the templates have in
   common. When templates share a service with different endpoint lists, the
   lists are merged into a local endpoint list that remembers every template it
-  came from. Editing a shadow's content locally and pushing detaches it from its
-  source (push asks first). Conflicts — such as a local element in the way of a
-  template element, or templates disagreeing on an element — are reported by
-  Integreat, and nothing is written. Must be run from a folder with an
-  `integration.json` file (no push required first).
-- `great include <element>`: Include a single element from another integration
-  as a shadow file. Use `-p, --pinned-at <timestamp>` to pin the shadow to the
-  source as it stood at that ISO timestamp; omit it to follow the source's
-  latest content. Including a service with an endpoint list, you're asked which
-  endpoints to include with it as shadow elements. Leaving any out makes the
-  endpoint list a local element with only the selected endpoints, detached from
-  its source. Including an element that already exists replaces it with a
-  shadow. You're asked first when local content would be overwritten. Must be
+  came from. Conflicts — such as a local element in the way of a template
+  element, or templates disagreeing on an element — are reported by Integreat,
+  and nothing is written. When the only conflict is that already imported
+  templates pin a shared element at another version, the elements are listed and
+  you are asked whether to move them to the version of the template being
+  imported; answering yes leaves the other templates out of sync (which is
+  reported) until they are re-imported. Use `-y, --yes` to answer yes to this
+  without being asked. Must be run from a folder with an `integration.json` file
+  (no push required first).
+- `great unimport <template>`: Remove an imported template. `<template>` can be
+  a template id or key; supports `-a`. Integreat resolves the remaining
+  templates against the local elements, and the result is applied to the local
+  files: elements only this template supplied are removed, shadows other
+  templates also supply are kept with the template dropped from their
+  provenance, and elements Integreat keeps as local elements lose their link to
+  the templates. The template import is removed from `.great.json`. Nothing is
+  changed in Integreat right away: the next `great push` deletes the removed
+  elements and removes the template import there. Conflicts are reported and
+  nothing is written. It is an error when the template is not imported. Must be
   run from a folder with an `integration.json` file.
+- `great include <element>`: Include a single element from another integration
+  as a shadow file. `<element>` is an element id, or `"<folder>/<key>"` (e.g.
+  `schemas/entry`). With a key, `-i, --integration` is required and takes the id
+  or key of the integration to include from. Use `-a, --account` to resolve an
+  integration key (defaults to the folder's account, then the account in
+  config). Use `-p, --pinned-at <timestamp>` to pin the shadow to the source as
+  it stood at that ISO timestamp; omit it to follow the source's latest content.
+  Including a service with an endpoint list, you're asked which endpoints to
+  include with it as shadow elements. Leaving any out makes the endpoint list a
+  local element with only the selected endpoints, detached from its source.
+  Including an element that already exists replaces it with a shadow. You're
+  asked first when local content would be overwritten. Must be run from a folder
+  with an `integration.json` file.
 - `great rename <target> <new-key>`: Rename an element or the account key,
   keeping the link to the remote element intact. `<target>` is
   `"<folder>/<key>"` for an element (e.g. `schemas/entry`), or the literal

package/dist/clone/index.js

@@ -1,10 +1,8 @@
 import chalk from 'chalk';
 import saveIntegration from '../utils/saveIntegration.js';
 import { getClient } from '../utils/graphqlClient.js';
-import { handleGraphQLError } from '../utils/graphqlError.js';
 import { fetchIntegrationDefinition } from '../utils/fetchIntegrationDefinition.js';
-import { resolveAccountId } from '../utils/resolveAccount.js';
-import { resolveIntegration } from '../utils/resolveIntegration.js';
+import { resolveIntegrationInAccount } from '../utils/resolveIntegration.js';
 export const action = (log, apiToken, client, fsImpl, config) => async function cloneIntegration(integrationIdOrKey, options) {
     if (!integrationIdOrKey) {
         log(chalk.red('Integration id or key is required'));
@@ -12,14 +10,8 @@ export const action = (log, apiToken, client, fsImpl, config) => async function
         return;
     }
     const graphqlClient = getClient(apiToken, client, config);
-    const { accountId, error: accountError } = await resolveAccountId(options ?? {}, apiToken ?? '', graphqlClient, config);
-    if (accountError) {
-        handleGraphQLError(accountError, log);
-        return;
-    }
-    const resolved = await resolveIntegration(integrationIdOrKey, accountId, apiToken, graphqlClient);
-    if (resolved.error) {
-        handleGraphQLError(new Error(resolved.error), log);
+    const resolved = await resolveIntegrationInAccount(integrationIdOrKey, options?.account, apiToken, graphqlClient, config, undefined, log);
+    if (!resolved) {
         return;
     }
     const integration = await fetchIntegrationDefinition(graphqlClient, resolved.id, log);

package/dist/clone/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/clone/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,eAAe,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,SAAS,EAA6B,MAAM,2BAA2B,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAA;AAEnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAInE,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,GAA8B,EAC9B,QAAiB,EACjB,MAA6B,EAC7B,MAAgB,EAChB,MAA2B,EAC3B,EAAE,CACF,KAAK,UAAU,gBAAgB,CAC7B,kBAA0B,EAC1B,OAA8B;IAE9B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC,CAAA;QACnD,GAAG,CAAC,UAAU,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC,EAAE,CAAC,CAAA;QAClE,OAAM;IACR,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAEzD,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,gBAAgB,CAC/D,OAAO,IAAI,EAAE,EACb,QAAQ,IAAI,EAAE,EACd,aAAa,EACb,MAAM,CACP,CAAA;IACD,IAAI,YAAY,EAAE,CAAC;QACjB,kBAAkB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAA;QACrC,OAAM;IACR,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CACvC,kBAAkB,EAClB,SAAS,EACT,QAAQ,EACR,aAAa,CACd,CAAA;IACD,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,kBAAkB,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAA;QAClD,OAAM;IACR,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAClD,aAAa,EACb,QAAQ,CAAC,EAAE,EACX,GAAG,CACJ,CAAA;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAM;IACR,CAAC;IAGD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,IAAI,WAAW,CAAC,EAAE,CAAA;IAC9C,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;AAChE,CAAC,CAAA;AAEH,eAAe,CAAC,OAAgB,EAAE,QAAiB,EAAE,EAAE,CACrD,OAAO;KACJ,OAAO,CAAC,qBAAqB,CAAC;KAC9B,WAAW,CAAC,sCAAsC,CAAC;KACnD,MAAM,CACL,oBAAoB,EACpB,8DAA8D,CAC/D;KACA,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/clone/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,eAAe,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,SAAS,EAA6B,MAAM,2BAA2B,CAAA;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAA;AAEnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAA;AAI5E,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,GAA8B,EAC9B,QAAiB,EACjB,MAA6B,EAC7B,MAAgB,EAChB,MAA2B,EAC3B,EAAE,CACF,KAAK,UAAU,gBAAgB,CAC7B,kBAA0B,EAC1B,OAA8B;IAE9B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC,CAAA;QACnD,GAAG,CAAC,UAAU,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC,EAAE,CAAC,CAAA;QAClE,OAAM;IACR,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAEzD,MAAM,QAAQ,GAAG,MAAM,2BAA2B,CAChD,kBAAkB,EAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EACR,aAAa,EACb,MAAM,EACN,SAAS,EACT,GAAG,CACJ,CAAA;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAM;IACR,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAClD,aAAa,EACb,QAAQ,CAAC,EAAE,EACX,GAAG,CACJ,CAAA;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAM;IACR,CAAC;IAGD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,IAAI,WAAW,CAAC,EAAE,CAAA;IAC9C,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;AAChE,CAAC,CAAA;AAEH,eAAe,CAAC,OAAgB,EAAE,QAAiB,EAAE,EAAE,CACrD,OAAO;KACJ,OAAO,CAAC,qBAAqB,CAAC;KAC9B,WAAW,CAAC,sCAAsC,CAAC;KACnD,MAAM,CACL,oBAAoB,EACpB,8DAA8D,CAC/D;KACA,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAA"}

package/dist/generated/operations.d.ts

@@ -238,6 +238,22 @@ export type RegisterTemplateImportMutation = {
         }>;
     };
 };
+export type UnregisterTemplateImportMutationVariables = Exact<{
+    integrationId: string | number;
+    templateId: string | number;
+}>;
+export type UnregisterTemplateImportMutation = {
+    unregisterTemplateImport: {
+        id: string;
+        templateImports: Array<{
+            id: string;
+            timestamp: string;
+            template: {
+                id: string;
+            } | null;
+        }>;
+    };
+};
 export type UpdateElementMutationVariables = Exact<{
     id: string | number;
     name?: string | null | undefined;
@@ -386,6 +402,13 @@ export type DispatchMutation = {
         error: string | null;
         warning: string | null;
         itemCount: number | null;
+        params: Record<string, unknown> | null;
+        reason: string | null;
+        origin: string | null;
+        paging: {
+            next: Record<string, unknown> | null;
+            prev: Record<string, unknown> | null;
+        } | null;
     };
 };
 export type IntegrationDefinitionQueryVariables = Exact<{
@@ -541,20 +564,55 @@ export type ElementIdByKeyQuery = {
         id: string;
     };
 };
-export type ResolveImportsQueryVariables = Exact<{
-    imports: Array<Types.ImportInput> | Types.ImportInput;
-    elements?: Array<Types.TargetElementInput> | Types.TargetElementInput | null | undefined;
+export type IntegrationQueryVariables = Exact<{
+    id: string | number;
 }>;
-export type ResolveImportsQuery = {
-    resolveImports: {
+export type IntegrationQuery = {
+    integration: {
+        id: string;
+        name: string;
+        type: Types.IntegrationType;
+    } | null;
+};
+export type IntegrationByKeyQueryVariables = Exact<{
+    account: Types.AccountSelector;
+    key: string | number;
+}>;
+export type IntegrationByKeyQuery = {
+    integrationByKey: {
+        id: string;
+        name: string;
+        type: Types.IntegrationType;
+    } | null;
+};
+export type ResolveTemplateImportQueryVariables = Exact<{
+    templateId: string | number;
+    existingTemplates?: Array<Types.TemplateImportInput> | Types.TemplateImportInput | null | undefined;
+    existingElements?: Array<Types.TargetElementInput> | Types.TargetElementInput | null | undefined;
+    allowVersionChange?: boolean | null | undefined;
+}>;
+export type ResolveTemplateImportQuery = {
+    resolveTemplateImport: {
         imports: Array<{
             templateId: string;
             timestamp: string;
+            outOfSync: boolean;
+            outOfSyncElements: Array<{
+                type: Types.ElementType;
+                key: string;
+            }>;
         }>;
         conflicts: Array<{
             type: Types.ElementType;
             key: string;
+            code: Types.ImportConflictCode;
             reason: string;
+            templates: Array<{
+                templateId: string;
+                timestamp: string;
+                contentTimestamp: string;
+                importing: boolean;
+            }>;
         }>;
         elements: Array<{
             key: string;
@@ -570,26 +628,36 @@ export type ResolveImportsQuery = {
         }>;
     };
 };
-export type IntegrationQueryVariables = Exact<{
-    id: string | number;
-}>;
-export type IntegrationQuery = {
-    integration: {
-        id: string;
-        name: string;
-        type: Types.IntegrationType;
-    } | null;
-};
-export type IntegrationByKeyQueryVariables = Exact<{
-    account: Types.AccountSelector;
-    key: string | number;
+export type ResolveTemplateUnimportQueryVariables = Exact<{
+    templateId: string | number;
+    existingTemplates?: Array<Types.TemplateImportInput> | Types.TemplateImportInput | null | undefined;
+    existingElements?: Array<Types.TargetElementInput> | Types.TargetElementInput | null | undefined;
 }>;
-export type IntegrationByKeyQuery = {
-    integrationByKey: {
-        id: string;
-        name: string;
-        type: Types.IntegrationType;
-    } | null;
+export type ResolveTemplateUnimportQuery = {
+    resolveTemplateUnimport: {
+        imports: Array<{
+            templateId: string;
+            timestamp: string;
+        }>;
+        conflicts: Array<{
+            type: Types.ElementType;
+            key: string;
+            code: Types.ImportConflictCode;
+            reason: string;
+        }>;
+        elements: Array<{
+            key: string;
+            name: string;
+            description: string | null;
+            type: Types.ElementType;
+            content: {
+                sourceId: string | null;
+                sourceTimestamp: string | null;
+                provenance: Array<string>;
+                data: Record<string, unknown> | null;
+            } | null;
+        }>;
+    };
 };
 export type ResponseQueryVariables = Exact<{
     actionId: string | number;

package/dist/generated/schema.d.ts

@@ -159,6 +159,11 @@ export type ElementContent = {
     sourceTimestamp?: Maybe<Scalars['DateTime']['output']>;
     timestamp?: Maybe<Scalars['Date']['output']>;
 };
+export type ElementIdentifier = {
+    __typename?: 'ElementIdentifier';
+    key: Scalars['ID']['output'];
+    type: ElementType;
+};
 export declare enum ElementType {
     Auth = "auth",
     Config = "config",
@@ -219,14 +224,25 @@ export type Flow = Element & {
 };
 export type ImportConflict = {
     __typename?: 'ImportConflict';
+    code: ImportConflictCode;
     key: Scalars['ID']['output'];
     reason: Scalars['String']['output'];
+    templates: Array<ImportConflictTemplate>;
     type: ElementType;
 };
-export type ImportInput = {
-    templateId: Scalars['ID']['input'];
-    timestamp?: InputMaybe<Scalars['DateTime']['input']>;
-    versionId?: InputMaybe<Scalars['ID']['input']>;
+export declare enum ImportConflictCode {
+    DifferentOrder = "differentOrder",
+    DifferentSource = "differentSource",
+    DifferentValue = "differentValue",
+    DifferentVersion = "differentVersion",
+    LocalElement = "localElement"
+}
+export type ImportConflictTemplate = {
+    __typename?: 'ImportConflictTemplate';
+    contentTimestamp: Scalars['DateTime']['output'];
+    importing: Scalars['Boolean']['output'];
+    templateId: Scalars['ID']['output'];
+    timestamp: Scalars['DateTime']['output'];
 };
 export type Integration = {
     __typename?: 'Integration';
@@ -482,6 +498,8 @@ export type Mutation = {
     stopAgent: Scalars['Boolean']['output'];
     stopIntegration: Integration;
     unacknowledgeNotifications: Array<Notification>;
+    unimportTemplate: Integration;
+    unregisterTemplateImport: Integration;
     updateAccountKey: Account;
     updateAccountName: Account;
     updateAccountUserRole: Account;
@@ -593,6 +611,7 @@ export type MutationDispatchArgs = {
     waitForResponse?: InputMaybe<Scalars['Boolean']['input']>;
 };
 export type MutationImportTemplateArgs = {
+    allowVersionChange?: InputMaybe<Scalars['Boolean']['input']>;
     integrationId: Scalars['ID']['input'];
     templateId: Scalars['ID']['input'];
     versionId?: InputMaybe<Scalars['ID']['input']>;
@@ -661,6 +680,14 @@ export type MutationStopIntegrationArgs = {
 export type MutationUnacknowledgeNotificationsArgs = {
     ids: Array<Scalars['ID']['input']>;
 };
+export type MutationUnimportTemplateArgs = {
+    integrationId: Scalars['ID']['input'];
+    templateId: Scalars['ID']['input'];
+};
+export type MutationUnregisterTemplateImportArgs = {
+    integrationId: Scalars['ID']['input'];
+    templateId: Scalars['ID']['input'];
+};
 export type MutationUpdateAccountKeyArgs = {
     id: Scalars['ID']['input'];
     key: Scalars['ID']['input'];
@@ -797,8 +824,8 @@ export type Query = {
     logEntry: LogEntry;
     notifications: NotificationConnection;
     resolveElementInclude: ResolvedShadowElement;
-    resolveImports: ResolvedImports;
-    resolveTemplateImport: ResolvedTemplateImport;
+    resolveTemplateImport: ResolvedImports;
+    resolveTemplateUnimport: ResolvedImports;
     response?: Maybe<Response>;
     ruleset?: Maybe<Ruleset>;
     rulesets: RulesetConnection;
@@ -877,14 +904,18 @@ export type QueryResolveElementIncludeArgs = {
     elementId: Scalars['ID']['input'];
     sourceTimestamp?: InputMaybe<Scalars['DateTime']['input']>;
 };
-export type QueryResolveImportsArgs = {
-    elements?: InputMaybe<Array<TargetElementInput>>;
-    imports: Array<ImportInput>;
-};
 export type QueryResolveTemplateImportArgs = {
+    allowVersionChange?: InputMaybe<Scalars['Boolean']['input']>;
+    existingElements?: InputMaybe<Array<TargetElementInput>>;
+    existingTemplates?: InputMaybe<Array<TemplateImportInput>>;
     templateId: Scalars['ID']['input'];
     versionId?: InputMaybe<Scalars['ID']['input']>;
 };
+export type QueryResolveTemplateUnimportArgs = {
+    existingElements?: InputMaybe<Array<TargetElementInput>>;
+    existingTemplates?: InputMaybe<Array<TemplateImportInput>>;
+    templateId: Scalars['ID']['input'];
+};
 export type QueryResponseArgs = {
     actionId: Scalars['ID']['input'];
 };
@@ -910,6 +941,8 @@ export type QueryUserArgs = {
 };
 export type ResolvedImport = {
     __typename?: 'ResolvedImport';
+    outOfSync: Scalars['Boolean']['output'];
+    outOfSyncElements: Array<ElementIdentifier>;
     templateId: Scalars['ID']['output'];
     timestamp: Scalars['DateTime']['output'];
 };
@@ -928,11 +961,6 @@ export type ResolvedShadowElement = {
     name: Scalars['String']['output'];
     type: ElementType;
 };
-export type ResolvedTemplateImport = {
-    __typename?: 'ResolvedTemplateImport';
-    elements: Array<ResolvedShadowElement>;
-    timestamp: Scalars['DateTime']['output'];
-};
 export type Response = {
     __typename?: 'Response';
     data?: Maybe<Scalars['JSON']['output']>;
@@ -1076,9 +1104,15 @@ export type TemplateImport = {
     __typename?: 'TemplateImport';
     createdAt: Scalars['DateTime']['output'];
     id: Scalars['ID']['output'];
+    outOfSync: Scalars['Boolean']['output'];
+    outOfSyncElements: Array<ElementIdentifier>;
     template?: Maybe<Integration>;
     timestamp: Scalars['DateTime']['output'];
 };
+export type TemplateImportInput = {
+    templateId: Scalars['ID']['input'];
+    timestamp: Scalars['DateTime']['input'];
+};
 export type Thread = {
     __typename?: 'Thread';
     createdAt: Scalars['DateTime']['output'];

package/dist/generated/schema.js

@@ -30,6 +30,14 @@ export var ElementType;
     ElementType["Service"] = "service";
     ElementType["Value"] = "value";
 })(ElementType || (ElementType = {}));
+export var ImportConflictCode;
+(function (ImportConflictCode) {
+    ImportConflictCode["DifferentOrder"] = "differentOrder";
+    ImportConflictCode["DifferentSource"] = "differentSource";
+    ImportConflictCode["DifferentValue"] = "differentValue";
+    ImportConflictCode["DifferentVersion"] = "differentVersion";
+    ImportConflictCode["LocalElement"] = "localElement";
+})(ImportConflictCode || (ImportConflictCode = {}));
 export var IntegrationOrderField;
 (function (IntegrationOrderField) {
     IntegrationOrderField["Account"] = "account";

package/dist/generated/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/generated/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/generated/schema.ts"],"names":[],"mappings":"AA2DA,MAAM,CAAN,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAE3B,4CAAuB,CAAA;IAEvB,kCAAa,CAAA;IAEb,4CAAuB,CAAA;AACzB,CAAC,EAPW,iBAAiB,KAAjB,iBAAiB,QAO5B;AAGD,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,8BAAe,CAAA;IACf,gCAAiB,CAAA;IACjB,8BAAe,CAAA;AACjB,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAqGD,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,0BAAa,CAAA;AACf,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AA8CD,MAAM,CAAN,IAAY,WAaX;AAbD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,wCAAyB,CAAA;IACzB,oCAAqB,CAAA;IACrB,4CAA6B,CAAA;IAC7B,4BAAa,CAAA;IACb,0BAAW,CAAA;IACX,oCAAqB,CAAA;IACrB,sCAAuB,CAAA;IACvB,gCAAiB,CAAA;IACjB,kCAAmB,CAAA;IACnB,8BAAe,CAAA;AACjB,CAAC,EAbW,WAAW,KAAX,WAAW,QAatB;AAyFD,MAAM,CAAN,IAAY,kBAiBX;AAjBD,WAAY,kBAAkB;IAK5B,uDAAiC,CAAA;IAEjC,yDAAmC,CAAA;IAEnC,uDAAiC,CAAA;IAKjC,2DAAqC,CAAA;IAErC,mDAA6B,CAAA;AAC/B,CAAC,EAjBW,kBAAkB,KAAlB,kBAAkB,QAiB7B;AA0LD,MAAM,CAAN,IAAY,qBASX;AATD,WAAY,qBAAqB;IAE/B,4CAAmB,CAAA;IAEnB,gDAAuB,CAAA;IAEvB,sCAAa,CAAA;IAEb,gDAAuB,CAAA;AACzB,CAAC,EATW,qBAAqB,KAArB,qBAAqB,QAShC;AAGD,MAAM,CAAN,IAAY,eAaX;AAbD,WAAY,eAAe;IAEzB,8CAA2B,CAAA;IAK3B,sCAAmB,CAAA;IAKnB,wCAAqB,CAAA;AACvB,CAAC,EAbW,eAAe,KAAf,eAAe,QAa1B;AAsJD,MAAM,CAAN,IAAY,SAeX;AAfD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;IAC3B,4BAAe,CAAA;IACf,kCAAqB,CAAA;IACrB,kCAAqB,CAAA;IACrB,kCAAqB,CAAA;IACrB,sBAAS,CAAA;IACT,gCAAmB,CAAA;IACnB,8BAAiB,CAAA;IACjB,gCAAmB,CAAA;IACnB,kCAAqB,CAAA;IACrB,gCAAmB,CAAA;IACnB,gCAAmB,CAAA;AACrB,CAAC,EAfW,SAAS,KAAT,SAAS,QAepB;AAGD,MAAM,CAAN,IAAY,OAMX;AAND,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,wBAAa,CAAA;IACb,gCAAqB,CAAA;IACrB,8BAAmB,CAAA;IACnB,4BAAiB,CAAA;AACnB,CAAC,EANW,OAAO,KAAP,OAAO,QAMlB;AAkDD,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,8BAAe,CAAA;IACf,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;AACrB,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAmDD,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IAEvB,8BAAa,CAAA;IAEb,wCAAuB,CAAA;IAEvB,gCAAe,CAAA;AACjB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AA00BD,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;AACrB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAmjBD,MAAM,CAAN,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAE3B,4CAAuB,CAAA;IAEvB,kCAAa,CAAA;IAEb,4CAAuB,CAAA;AACzB,CAAC,EAPW,iBAAiB,KAAjB,iBAAiB,QAO5B;AA2DD,MAAM,CAAN,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,2BAAiB,CAAA;IACjB,+BAAqB,CAAA;AACvB,CAAC,EAHW,MAAM,KAAN,MAAM,QAGjB;AAmHD,MAAM,CAAN,IAAY,QASX;AATD,WAAY,QAAQ;IAElB,2BAAe,CAAA;IAEf,+BAAmB,CAAA;IAEnB,+BAAmB,CAAA;IAEnB,yBAAa,CAAA;AACf,CAAC,EATW,QAAQ,KAAR,QAAQ,QASnB"}

package/dist/import/index.d.ts

@@ -1,10 +1,13 @@
 import Conf from 'conf';
 import { type GraphQLRequestClient } from '../utils/graphqlClient.js';
+import type { VersionConflict } from '../utils/promptForVersionChange.js';
 import type { ConfigSchema } from '../utils/config.js';
 import type { Command } from 'commander';
 import type { GreatFs } from '../types.js';
-export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: GreatFs, config?: Conf<ConfigSchema>) => (templateIdOrKey: string, options?: {
+type PromptForVersionChange = (conflicts: readonly VersionConflict[], log: (message: string) => void) => Promise<boolean>;
+export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: GreatFs, config?: Conf<ConfigSchema>, promptForVersionChangeFn?: PromptForVersionChange) => (templateIdOrKey: string, options?: {
     account?: string;
+    yes?: boolean;
 }) => Promise<void>;
 declare const _default: (program: Command, apiToken?: string) => Command;
 export default _default;

package/dist/import/index.js

@@ -1,15 +1,18 @@
 import chalk from 'chalk';
 import { getClient } from '../utils/graphqlClient.js';
-import { handleGraphQLError } from '../utils/graphqlError.js';
 import { fetchIntegrationFromFile } from '../utils/fetchLocal.js';
-import resolveImports, { buildImportInputs, buildTargetElements, } from '../utils/resolveImports.js';
+import resolveTemplateImport, { buildExistingTemplates, buildTargetElements, } from '../utils/resolveTemplateImport.js';
 import applyImports from '../utils/applyImports.js';
-import { resolveAccountId } from '../utils/resolveAccount.js';
-import { resolveIntegration } from '../utils/resolveIntegration.js';
+import promptForVersionChange, { acceptVersionChange, } from '../utils/promptForVersionChange.js';
+import { resolveIntegrationInAccount } from '../utils/resolveIntegration.js';
 import { readGreatFile, writeGreatFile } from '../utils/greatFile.js';
+import { elementTypeToFolder } from '../utils/elementFiles.js';
 import { logShadowConflicts } from '../utils/writeShadowElement.js';
+import { ImportConflictCode } from '../generated/schema.js';
+const formatSummary = (result, templateId) => `Imported template ${templateId}: ${result.imported.length} new, ${result.updated.length} updated, ${result.removedFromTemplate.length} removed, ${result.unchanged.length} unchanged element(s)`;
+const hasUnchangedValues = (result) => result.unchanged.some(({ folder }) => folder === 'values');
 function logImportResult(result, templateId, log) {
-    log(chalk.green(`Imported ${result.written.length} element(s) from template ${templateId}`));
+    log(chalk.green(formatSummary(result, templateId)));
     for (const { folder, key } of result.merged) {
         log(chalk.green(`Merged ${folder}/${key} from several templates (a local endpoint list)`));
     }
@@ -22,8 +25,32 @@ function logImportResult(result, templateId, log) {
     if (result.skipped.length > 0) {
         log(chalk.yellow(`Skipped ${result.skipped.length} config element(s)`));
     }
+    if (hasUnchangedValues(result)) {
+        log(chalk.yellow("Note: There may have also been changes to values, but we can't tell."));
+    }
+}
+const isVersionConflict = (conflict) => conflict.code === ImportConflictCode.DifferentVersion;
+const hasOnlyVersionConflicts = (resolved) => resolved.conflicts.length > 0 && resolved.conflicts.every(isVersionConflict);
+async function resolveWithConsent(graphqlClient, templateId, existingTemplates, elements, log, prompt) {
+    const resolved = await resolveTemplateImport(graphqlClient, templateId, existingTemplates, elements, false, log);
+    if (!resolved || !hasOnlyVersionConflicts(resolved)) {
+        return resolved;
+    }
+    if (!(await prompt(resolved.conflicts, log))) {
+        log(chalk.red('Import aborted'));
+        return undefined;
+    }
+    return resolveTemplateImport(graphqlClient, templateId, existingTemplates, elements, true, log);
 }
-export const action = (log, apiToken, client, fsImpl, config) => async function importTemplate(templateIdOrKey, options) {
+const formatOutOfSyncElements = (elements) => elements
+    .map((element) => `${elementTypeToFolder[element.type] ?? element.type}/${element.key}`)
+    .join(', ');
+function logOutOfSync(imports, log) {
+    for (const record of imports.filter((record) => record.outOfSync)) {
+        log(chalk.yellow(`Template ${record.templateId} is now out of sync on ${formatOutOfSyncElements(record.outOfSyncElements)}. Re-import it with great import ${record.templateId} to update it`));
+    }
+}
+export const action = (log, apiToken, client, fsImpl, config, promptForVersionChangeFn = promptForVersionChange) => async function importTemplate(templateIdOrKey, options) {
     if (!templateIdOrKey) {
         log(chalk.red('Template id or key is required'));
         log(`Usage: ${chalk.bold('great import <template-id-or-key>')}`);
@@ -35,34 +62,35 @@ export const action = (log, apiToken, client, fsImpl, config) => async function
         return;
     }
     const graphqlClient = getClient(apiToken, client, config);
-    const { accountId, error: accountError } = await resolveAccountId(options ?? {}, apiToken ?? '', graphqlClient, config, fsImpl);
-    if (accountError) {
-        handleGraphQLError(accountError, log);
-        return;
-    }
-    const template = await resolveIntegration(templateIdOrKey, accountId, apiToken, graphqlClient);
-    if (template.error) {
-        handleGraphQLError(new Error(template.error), log);
+    const template = await resolveIntegrationInAccount(templateIdOrKey, options?.account, apiToken, graphqlClient, config, fsImpl, log);
+    if (!template) {
         return;
     }
     const templateId = template.id;
+    const versionChangePrompt = options?.yes
+        ? acceptVersionChange
+        : promptForVersionChangeFn;
     const great = readGreatFile(undefined, fsImpl);
     const elements = buildTargetElements(great, undefined, fsImpl);
-    const resolved = await resolveImports(graphqlClient, buildImportInputs(great, templateId), elements, log);
+    const resolved = await resolveWithConsent(graphqlClient, templateId, buildExistingTemplates(great, templateId), elements, log, versionChangePrompt);
     if (!resolved) {
         return;
     }
-    const result = applyImports(great, resolved, elements, { fsImpl });
+    const result = applyImports(great, resolved, elements, templateId, {
+        fsImpl,
+    });
     if (result.conflicts.length > 0) {
         logShadowConflicts('Import', result.conflicts, log);
         return;
     }
     writeGreatFile(great, undefined, fsImpl);
     logImportResult(result, templateId, log);
+    logOutOfSync(resolved.imports, log);
 };
 export default (program, apiToken) => program
     .command('import <template>')
     .description('import a template, creating a shadow file for each element, `<template>` can be a template id or key')
     .option('-a, --account <id>', 'account id or key (uses default from config if not provided)')
+    .option('-y, --yes', 'answer yes to all prompts (for use in scripts)')
     .action(action(console.log, apiToken));
 //# sourceMappingURL=index.js.map

package/dist/import/index.js.map

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

package/dist/include/index.d.ts

@@ -5,8 +5,11 @@ import promptForReplaceLocal from '../utils/promptForReplaceLocal.js';
 import type { ConfigSchema } from '../utils/config.js';
 import type { Command } from 'commander';
 import type { GreatFs } from '../types.js';
-export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: GreatFs, config?: Conf<ConfigSchema>, promptForEndpointsFn?: typeof promptForEndpoints, promptForReplaceLocalFn?: typeof promptForReplaceLocal) => (elementId: string, options?: {
+interface IncludeOptions {
     pinnedAt?: string;
-}) => Promise<void>;
+    account?: string;
+    integration?: string;
+}
+export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: GreatFs, config?: Conf<ConfigSchema>, promptForEndpointsFn?: typeof promptForEndpoints, promptForReplaceLocalFn?: typeof promptForReplaceLocal) => (elementIdOrTarget: string, options?: IncludeOptions) => Promise<void>;
 declare const _default: (program: Command, apiToken?: string) => Command;
 export default _default;