great 1.3.0 → 1.4.0

package/dist/utils/writeShadowElement.js

@@ -1,61 +1,63 @@
 import fs from 'node:fs';
 import chalk from 'chalk';
-import { elementTypeToFolder, findElementFile, writeElementFile, } from './elementFiles.js';
+import { elementTypeToFolder, hasElementFile, readEndpointListKeys, writeElementFile, } from './elementFiles.js';
 import { getElementRecord, setElementRecord, addProvenance, } from './greatFile.js';
 import hashContent from './hashContent.js';
-import { ENDPOINT_LISTS_FOLDER, SERVICES_FOLDER, isServiceFileFolder, readServiceFileParts, } from './serviceFile.js';
-function hasLocalElement(root, folder, key, fsImpl) {
-    const filePath = findElementFile(root, folder, key, fsImpl);
-    if (!filePath) {
+import mergeEndpointLists from './mergeEndpointLists.js';
+import { ENDPOINT_LISTS_FOLDER, isEndpointKeys } from './serviceFile.js';
+export function isLocalOccupant(great, folder, key, root, fsImpl) {
+    const record = getElementRecord(great, folder, key);
+    if (record?.source) {
         return false;
     }
-    if (isServiceFileFolder(folder)) {
-        const parts = readServiceFileParts(filePath, fsImpl);
-        return Boolean(folder === SERVICES_FOLDER ? parts.service : parts.list);
-    }
-    return true;
+    return Boolean(record) || hasElementFile(root, folder, key, fsImpl);
 }
-function classify(great, resolved, root, fsImpl) {
+export const findLocalOccupants = (great, elements, root, fsImpl) => elements.flatMap((element) => {
+    const folder = elementTypeToFolder[element.type];
+    return folder && isLocalOccupant(great, folder, element.key, root, fsImpl)
+        ? [{ folder, key: element.key }]
+        : [];
+});
+const conflictFor = (resolved, folder, reason) => ({
+    status: 'conflict',
+    conflict: { key: resolved.key, folder, reason },
+});
+const occupiedReason = (record) => record?.source
+    ? `already a shadow of a different source (${record.source.id})`
+    : 'a local element already exists';
+function classify(great, resolved, mode, root, fsImpl) {
     const folder = elementTypeToFolder[resolved.type];
     if (!folder) {
         return { status: 'skip' };
     }
     if (!resolved.content?.sourceId) {
-        return {
-            status: 'conflict',
-            conflict: {
-                key: resolved.key,
-                folder,
-                reason: 'element has no versioned content to include',
-            },
-        };
+        return conflictFor(resolved, folder, 'element has no versioned content to include');
     }
     const record = getElementRecord(great, folder, resolved.key);
-    const hasFile = hasLocalElement(root, folder, resolved.key, fsImpl);
-    if (record?.source) {
-        if (record.source.id === resolved.content?.sourceId) {
-            return { status: 'write', folder };
-        }
-        return {
-            status: 'conflict',
-            conflict: {
-                key: resolved.key,
-                folder,
-                reason: `already a shadow of a different source (${record.source.id})`,
-            },
-        };
+    const isOccupied = record?.source
+        ? record.source.id !== resolved.content.sourceId
+        : isLocalOccupant(great, folder, resolved.key, root, fsImpl);
+    if (!isOccupied || mode === 'include') {
+        return { status: 'write', folder };
+    }
+    else if (folder === ENDPOINT_LISTS_FOLDER) {
+        return { status: 'mergeList', folder };
     }
-    if (hasFile || record) {
+    return conflictFor(resolved, folder, occupiedReason(record));
+}
+function planListMerge(resolved, root, fsImpl) {
+    const existing = readEndpointListKeys(root, resolved.key, fsImpl);
+    const incoming = resolved.content?.data?.endpoints;
+    const result = mergeEndpointLists(existing, isEndpointKeys(incoming) ? incoming : []);
+    if ('conflict' in result) {
+        const [first, second] = result.conflict;
         return {
-            status: 'conflict',
-            conflict: {
-                key: resolved.key,
-                folder,
-                reason: 'a local element already exists',
-            },
+            key: resolved.key,
+            folder: ENDPOINT_LISTS_FOLDER,
+            reason: `endpoints '${first}' and '${second}' are ordered differently`,
         };
     }
-    return { status: 'write', folder };
+    return { resolved, endpoints: result.merged };
 }
 function buildShadowData(resolved, folder) {
     if (folder === ENDPOINT_LISTS_FOLDER) {
@@ -82,33 +84,70 @@ function writeOne(great, resolved, folder, options) {
     setElementRecord(great, folder, resolved.key, record);
     writeElementFile(root, folder, resolved.key, buildShadowData(resolved, folder), great, fsImpl);
 }
-export function writeShadowElements(great, resolved, options = {}) {
-    const fsImpl = options.fsImpl ?? fs;
-    const result = {
-        written: [],
-        skipped: [],
-        conflicts: [],
+function writeMergedList(great, { resolved, endpoints }, root, fsImpl) {
+    const existing = getElementRecord(great, ENDPOINT_LISTS_FOLDER, resolved.key);
+    const record = {
+        ...(existing?.id ? { id: existing.id } : {}),
+        ...(existing?.timestamp ? { timestamp: existing.timestamp } : {}),
     };
+    addProvenance(record, [
+        ...(existing?.provenance ?? []),
+        ...(resolved.content?.provenance ?? []),
+    ]);
+    setElementRecord(great, ENDPOINT_LISTS_FOLDER, resolved.key, record);
+    writeElementFile(root, ENDPOINT_LISTS_FOLDER, resolved.key, { endpoints }, great, fsImpl);
+}
+function planWrites(great, resolved, mode, root, fsImpl) {
     const toWrite = [];
+    const toMerge = [];
+    const skipped = [];
+    const conflicts = [];
     for (const element of resolved) {
-        const classified = classify(great, element, options.root, fsImpl);
+        const classified = classify(great, element, mode, root, fsImpl);
         if (classified.status === 'skip') {
-            result.skipped.push(element);
+            skipped.push(element);
         }
         else if (classified.status === 'conflict') {
-            result.conflicts.push(classified.conflict);
+            conflicts.push(classified.conflict);
+        }
+        else if (classified.status === 'mergeList') {
+            const merge = planListMerge(element, root, fsImpl);
+            if ('reason' in merge) {
+                conflicts.push(merge);
+            }
+            else {
+                toMerge.push(merge);
+            }
         }
         else {
             toWrite.push({ resolved: element, folder: classified.folder });
         }
     }
-    if (result.conflicts.length > 0) {
+    return { toWrite, toMerge, skipped, conflicts };
+}
+export function writeShadowElements(great, resolved, options) {
+    const fsImpl = options.fsImpl ?? fs;
+    const { toWrite, toMerge, skipped, conflicts } = planWrites(great, resolved, options.mode, options.root, fsImpl);
+    const result = {
+        written: [],
+        merged: [],
+        skipped,
+        conflicts,
+    };
+    if (conflicts.length > 0) {
         return result;
     }
     for (const { resolved: element, folder } of toWrite) {
         writeOne(great, element, folder, { ...options, fsImpl });
         result.written.push({ folder, key: element.key });
     }
+    for (const merge of toMerge) {
+        writeMergedList(great, merge, options.root, fsImpl);
+        result.merged.push({
+            folder: ENDPOINT_LISTS_FOLDER,
+            key: merge.resolved.key,
+        });
+    }
     return result;
 }
 export function logShadowConflicts(verb, conflicts, log) {

package/dist/utils/writeShadowElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeShadowElement.js","sourceRoot":"","sources":["../../src/utils/writeShadowElement.ts"],"names":[],"mappings":"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"}
+{"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.3.0",
+  "version": "1.4.0",
   "description": "A CLI for Integreat",
   "author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io>",
   "license": "UNLICENSED",
@@ -39,8 +39,8 @@
   },
   "homepage": "https://github.com/integreat-io/great#readme",
   "dependencies": {
-    "@inquirer/prompts": "^8.7.0",
-    "chalk": "^6.0.0",
+    "@inquirer/prompts": "^8.7.2",
+    "chalk": "^6.0.1",
     "change-case": "^5.4.4",
     "clipboardy": "^5.3.2",
     "columnify": "^1.6.0",
@@ -51,16 +51,16 @@
     "graphql-tag": "^2.12.7",
     "ky": "^2.1.0",
     "nanospinner": "^1.2.2",
-    "open": "^11.0.2",
+    "open": "^11.0.4",
     "strip-json-comments": "^5.0.3"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^7.4.0",
+    "@graphql-codegen/cli": "^7.4.3",
     "@graphql-codegen/typescript": "^6.1.0",
-    "@graphql-codegen/typescript-operations": "^6.1.6",
+    "@graphql-codegen/typescript-operations": "^6.1.8",
     "@integreat/ts-dev-setup": "^10.0.0",
     "@types/columnify": "^1.5.4",
-    "@types/node": "^26.4.1",
+    "@types/node": "^26.6.3",
     "@types/sinon": "^22.0.0",
     "integreat": "^1.7.1",
     "sinon": "^22.1.0",

package/dist/utils/resolveElementInclude.d.ts

@@ -1,3 +0,0 @@
-import type { GraphQLRequestClient } from './graphqlClient.js';
-import type { ResolveElementIncludeQuery } from '../generated/operations.js';
-export declare function resolveElementInclude(graphqlClient: GraphQLRequestClient, elementId: string, sourceTimestamp: string | undefined, log: (message: string) => void): Promise<ResolveElementIncludeQuery['resolveElementInclude'] | undefined>;

package/dist/utils/resolveElementInclude.js

@@ -1,27 +0,0 @@
-import { gql } from 'graphql-tag';
-import { handleGraphQLError } from './graphqlError.js';
-const ResolveElementIncludeQueryDocument = gql `
-  query ResolveElementInclude($elementId: ID!, $sourceTimestamp: DateTime) {
-    resolveElementInclude(elementId: $elementId, sourceTimestamp: $sourceTimestamp) {
-      key
-      name
-      description
-      type
-      content {
-        sourceId
-        sourceTimestamp
-        provenance
-        data
-      }
-    }
-  }
-`;
-export async function resolveElementInclude(graphqlClient, elementId, sourceTimestamp, log) {
-    const result = await graphqlClient.request(ResolveElementIncludeQueryDocument, { elementId, sourceTimestamp });
-    if (result.error) {
-        handleGraphQLError(result.error, log);
-        return undefined;
-    }
-    return result.data?.resolveElementInclude;
-}
-//# sourceMappingURL=resolveElementInclude.js.map

package/dist/utils/resolveElementInclude.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveElementInclude.js","sourceRoot":"","sources":["../../src/utils/resolveElementInclude.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAItD,MAAM,kCAAkC,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;CAe7C,CAAA;AAOD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,aAAmC,EACnC,SAAiB,EACjB,eAAmC,EACnC,GAA8B;IAE9B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CACxC,kCAAkC,EAClC,EAAE,SAAS,EAAE,eAAe,EAAE,CAC/B,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,qBAAqB,CAAA;AAC3C,CAAC"}