feat: stable source uuid with subroot and appendFileCollection (#69)

Refs: #66

Author: tpoisseau

src/__tests__/file_collection.append_file_collection.test.ts

@@ -112,22 +112,6 @@ describe('same root', () => {
 
     expect(() => self.appendFileCollection(other)).toThrow(Error);
   });
-
-  it('should throw error on files without attached source', () => {
-    const self = new FileCollection();
-    const other = new FileCollection();
-    const emptyBlob = new Blob();
-    other.files.push({
-      sourceUUID: crypto.randomUUID(),
-      name: 'test.txt',
-      relativePath: 'test.txt',
-      text: emptyBlob.text.bind(emptyBlob),
-      arrayBuffer: emptyBlob.arrayBuffer.bind(emptyBlob),
-      stream: emptyBlob.stream.bind(emptyBlob),
-    });
-
-    expect(() => self.appendFileCollection(other)).toThrow(Error);
-  });
 });
 
 describe('at subPath', () => {

src/append/append_file_collection.ts

@@ -1,4 +1,3 @@
-import type { ExtendedSourceItem } from '../ExtendedSourceItem.ts';
 import { cloneExtendedSourceItem } from '../ExtendedSourceItem.ts';
 import type { FileCollection } from '../FileCollection.ts';
 import { cloneFileItem } from '../FileItem.ts';
@@ -10,20 +9,16 @@ export function appendFileCollection(
   other: FileCollection,
   subPath: string,
 ) {
-  const sanitizedSubPath = normalizeRelativePath(subPath).replace(/\/$/, '');
-  const otherSourcesToSelfSources = new Map<
-    ExtendedSourceItem['uuid'],
-    ExtendedSourceItem['uuid']
-  >();
+  const sanitizedSubPath = normalizeRelativePath(subPath)
+    // trim ending slash
+    .replace(/\/$/, '');
 
   for (const otherSource of other.sources) {
     const source = cloneExtendedSourceItem(otherSource);
-    source.uuid = crypto.randomUUID();
-    source.originalRelativePath = source.relativePath;
+    source.originalRelativePath ??= source.relativePath;
     source.relativePath = normalizeRelativePath(
       `${sanitizedSubPath}/${source.relativePath}`,
     );
-    otherSourcesToSelfSources.set(otherSource.uuid, source.uuid);
 
     self.sources.push(source);
   }
@@ -38,11 +33,6 @@ export function appendFileCollection(
     }
     const file = cloneFileItem(otherFile);
     file.relativePath = relativePath;
-    const sourceUUID = otherSourcesToSelfSources.get(file.sourceUUID);
-    if (!sourceUUID) {
-      throw new Error('Unreachable: sourceUUID should be defined');
-    }
-    file.sourceUUID = sourceUUID;
 
     self.files.push(file);
   }

src/subroot.ts

@@ -12,7 +12,7 @@ export function subroot(
   const sanitizedSubPath = normalizeRelativePath(subPath).replace(/\/+$/, '');
   const pathMatch = `${sanitizedSubPath}/`;
   const sources = new Map(top.sources.map((source) => [source.uuid, source]));
-  const addedSources = new Map<string, string>(); // top source uuid -> sub source uuid
+  const addedSources = new Set<string>();
 
   for (const topFile of top.files) {
     if (!topFile.relativePath.startsWith(pathMatch)) continue;
@@ -22,18 +22,13 @@ export function subroot(
       assert(source, 'source');
 
       const subSource = cloneExtendedSourceItem(source);
-      subSource.uuid = crypto.randomUUID();
-      subSource.originalRelativePath =
-        source.originalRelativePath ?? source.relativePath;
+      subSource.originalRelativePath ??= source.relativePath;
       subSource.relativePath = source.relativePath.slice(pathMatch.length);
-      addedSources.set(topFile.sourceUUID, subSource.uuid);
+      addedSources.add(subSource.uuid);
       sub.sources.push(subSource);
     }
 
     const file = cloneFileItem(topFile);
-    const sourceUUID = addedSources.get(topFile.sourceUUID);
-    assert(sourceUUID, 'sourceUUID');
-    file.sourceUUID = sourceUUID;
     file.relativePath = file.relativePath.slice(pathMatch.length);
     sub.files.push(file);
   }