@kubohiroya/turbowarp-plus-editor-project-folder 0.9.0 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { C as _asyncIterator, S as _objectSpread2, _ as readFolder, a as assetKey, b as unsupported, c as extensionsFile, d as manifestFile, f as parseProject, g as projectFile, h as projectChanges, i as assertFolderUnchanged, l as fileVersion, m as projectAssets, n as registerFolder, o as assetTypeFor, p as planExtensionSave, r as FolderError, s as equal, t as followProjectFolder, u as isObject, v as readFolderUpdate, x as _objectWithoutProperties, y as sameBytes } from "./shared-JdaDvk2R.js";
1
+ import { C as unsupported, S as sameBytes, T as _objectSpread2, _ as projectAssets, a as projectFolderOverwriteWarning, b as readFolder, c as assetKey, d as extensionsFile, f as fileVersion, g as planExtensionSave, h as parseProject, i as isProjectFolderEmpty, l as assetTypeFor, m as manifestFile, n as registerFolder, o as FolderError, p as isObject, r as createProjectFolder, s as assertFolderUnchanged, t as followProjectFolder, u as equal, v as projectChanges, w as _objectWithoutProperties, x as readFolderUpdate, y as projectFile } from "./shared-Dz9dzxQF.js";
2
2
  // src/block-reload.ts
3
3
  var _excluded$1 = ["targets"];
4
4
  var _excluded2$1 = ["targets"];
@@ -329,101 +329,6 @@ function applyScriptReload(targets, edits, deserialize) {
329
329
  }
330
330
  return prepared.map(({ target }) => target);
331
331
  }
332
- // src/create-folder.ts
333
- var manifests = /* @__PURE__ */ new Set([
334
- projectFile,
335
- manifestFile,
336
- extensionsFile
337
- ]);
338
- var sourcePath = /^(?:assets\/[a-f0-9]{32}\.[A-Za-z0-9]+|extensions\/[A-Za-z0-9._-]+\.(?:js|manifest\.json))$/u;
339
- function missing(error) {
340
- return error instanceof DOMException && error.name === "NotFoundError";
341
- }
342
- async function assertEmpty(directory) {
343
- var _iteratorAbruptCompletion = false;
344
- var _didIteratorError = false;
345
- var _iteratorError;
346
- try {
347
- for (var _iterator = _asyncIterator(directory.values()), _step; _iteratorAbruptCompletion = !(_step = await _iterator.next()).done; _iteratorAbruptCompletion = false) {
348
- _step.value;
349
- throw new FolderError("conflict", "Choose an empty project folder");
350
- }
351
- } catch (err) {
352
- _didIteratorError = true;
353
- _iteratorError = err;
354
- } finally {
355
- try {
356
- if (_iteratorAbruptCompletion && _iterator.return != null) await _iterator.return();
357
- } finally {
358
- if (_didIteratorError) throw _iteratorError;
359
- }
360
- }
361
- }
362
- /** Create and validate a project-folder snapshot in a directory chosen by the user. */
363
- async function createProjectFolder({ directory, files, storage, current = () => true }) {
364
- for (const filename of manifests) if (!files.has(filename)) return unsupported(`Missing ${filename}`);
365
- for (const [filename, bytes] of files) if (!manifests.has(filename) && !sourcePath.test(filename) || !(bytes instanceof Uint8Array)) return unsupported(`Invalid project folder entry: ${filename}`);
366
- const assertCurrent = () => {
367
- if (!current()) throw new FolderError("conflict", "The project changed before the folder was saved");
368
- };
369
- await assertEmpty(directory);
370
- const directories = /* @__PURE__ */ new Map();
371
- const undo = [];
372
- try {
373
- const entries = [...files].sort(([a], [b]) => Number(manifests.has(a)) - Number(manifests.has(b)) || Number(a === "project.source.json") - Number(b === "project.source.json"));
374
- for (const [filename, bytes] of entries) {
375
- assertCurrent();
376
- const [first, basename] = filename.split("/");
377
- let parent = directory;
378
- if (basename !== void 0) {
379
- const existing = directories.get(first);
380
- if (existing) parent = existing;
381
- else {
382
- if (await directory.getDirectoryHandle(first).catch((error) => {
383
- if (missing(error)) return null;
384
- throw error;
385
- })) throw new FolderError("conflict");
386
- parent = await directory.getDirectoryHandle(first, { create: true });
387
- directories.set(first, parent);
388
- undo.push(async () => {
389
- if (await (await directory.getDirectoryHandle(first)).isSameEntry(parent)) await directory.removeEntry(first);
390
- });
391
- }
392
- }
393
- const name = basename !== null && basename !== void 0 ? basename : first;
394
- if (await parent.getFileHandle(name).catch((error) => {
395
- if (missing(error)) return null;
396
- throw error;
397
- })) throw new FolderError("conflict");
398
- const file = await parent.getFileHandle(name, { create: true });
399
- const initial = await file.getFile();
400
- if (initial.size !== 0) throw new FolderError("conflict");
401
- let expected = /* @__PURE__ */ new Uint8Array();
402
- undo.push(async () => {
403
- const entry = await parent.getFileHandle(name);
404
- if (!await entry.isSameEntry(file)) return;
405
- if (sameBytes(new Uint8Array(await (await entry.getFile()).arrayBuffer()), expected)) await parent.removeEntry(name);
406
- });
407
- const writable = await file.createWritable({ mode: "exclusive" });
408
- try {
409
- await writable.write(bytes);
410
- assertCurrent();
411
- if (fileVersion(await file.getFile()) !== fileVersion(initial)) throw new FolderError("conflict");
412
- await writable.close();
413
- expected = bytes;
414
- } catch (error) {
415
- await writable.abort().catch(() => {});
416
- throw error;
417
- }
418
- }
419
- const source = await readFolder(directory, storage);
420
- assertCurrent();
421
- return source;
422
- } catch (error) {
423
- for (const revert of undo.reverse()) await revert().catch(() => {});
424
- throw error;
425
- }
426
- }
427
332
  // src/session.ts
428
333
  var storageReaders = /* @__PURE__ */ new WeakMap();
429
334
  var readerFor = (storage) => {
@@ -807,11 +712,17 @@ function createFolderSession(vm, host) {
807
712
  openDirectory(directory, confirmReplace) {
808
713
  return openFrom(() => Promise.resolve(directory), confirmReplace);
809
714
  },
810
- createFromSnapshot(getDirectory, prepareFiles, isCurrent) {
715
+ createFromSnapshot(selectDestination, prepareFiles, isCurrent) {
811
716
  const stage = vm.runtime.getTargetForStage();
812
717
  let savedRevision;
813
718
  const currentProject = () => !disposed && vm.runtime.getTargetForStage() === stage && (savedRevision === void 0 || revision === savedRevision) && isCurrent();
814
- return openFrom(getDirectory, currentProject, async (directory) => {
719
+ let overwrite = false;
720
+ return openFrom(async () => {
721
+ var _destination$overwrit, _destination$director;
722
+ const destination = await selectDestination();
723
+ overwrite = (_destination$overwrit = destination === null || destination === void 0 ? void 0 : destination.overwrite) !== null && _destination$overwrit !== void 0 ? _destination$overwrit : false;
724
+ return (_destination$director = destination === null || destination === void 0 ? void 0 : destination.directory) !== null && _destination$director !== void 0 ? _destination$director : null;
725
+ }, currentProject, async (directory) => {
815
726
  if (!currentProject()) return null;
816
727
  savedRevision = revision;
817
728
  const files = await prepareFiles();
@@ -820,6 +731,7 @@ function createFolderSession(vm, host) {
820
731
  directory,
821
732
  files,
822
733
  storage: vm.runtime.storage,
734
+ overwrite,
823
735
  current: currentProject
824
736
  });
825
737
  }, currentProject);
@@ -1251,14 +1163,22 @@ function mountProjectFolder({ vm, document, host, locale = "en", autoReload = tr
1251
1163
  return {
1252
1164
  openDirectory: (...args) => session.openDirectory(...args).finally(renderReload),
1253
1165
  save: () => session.save().finally(renderReload),
1254
- createFromSnapshot({ prepareFiles, directory, current = () => true }) {
1166
+ createFromSnapshot({ prepareFiles, collectEdits, directory, current = () => true }) {
1167
+ const message = locale.startsWith("ja") ? "指定されたフォルダは空ではありません。フォルダに保存されている内容が上書きされる場合があります。よろしいですか?" : "The selected folder is not empty. Contents in the folder may be overwritten. Continue?";
1255
1168
  return session.createFromSnapshot(async () => {
1256
- if (directory) return directory;
1257
1169
  try {
1258
- return await pickDirectory.call(view, {
1170
+ const selected = directory !== null && directory !== void 0 ? directory : await pickDirectory.call(view, {
1259
1171
  id: "turbowarp-plus-project-folder",
1260
1172
  mode: "readwrite"
1261
1173
  });
1174
+ if (!current()) return null;
1175
+ const overwrite = !await isProjectFolderEmpty(selected);
1176
+ if (!current() || overwrite && !view.confirm(message)) return null;
1177
+ await (collectEdits === null || collectEdits === void 0 ? void 0 : collectEdits());
1178
+ return current() ? {
1179
+ directory: selected,
1180
+ overwrite
1181
+ } : null;
1262
1182
  } catch (error) {
1263
1183
  if (error instanceof DOMException && error.name === "AbortError") return null;
1264
1184
  throw error;
@@ -1316,4 +1236,4 @@ function renderProjectFolderMenu(createElement, { vm, locale = "en", MenuItem, M
1316
1236
  };
1317
1237
  return createElement(MenuSection, null, item("open"), entry.session.canSave ? item("save") : null);
1318
1238
  }
1319
- export { createProjectFolder, followProjectFolder, mountProjectFolder, projectFolderActions, renderProjectFolderMenu };
1239
+ export { createProjectFolder, followProjectFolder, mountProjectFolder, projectFolderActions, projectFolderOverwriteWarning, renderProjectFolderMenu };
package/dist/session.d.ts CHANGED
@@ -120,7 +120,10 @@ export declare function createFolderSession(vm: FolderVM, host: FolderHost): {
120
120
  reloadAll(confirmReplace: () => boolean): Promise<OpenResult>;
121
121
  open(pick: FileSystemPicker, confirmReplace: () => boolean): Promise<OpenResult>;
122
122
  openDirectory(directory: FileSystemDirectoryHandle, confirmReplace: () => boolean): Promise<OpenResult>;
123
- createFromSnapshot(getDirectory: () => Promise<FileSystemDirectoryHandle | null>, prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>, isCurrent: () => boolean): Promise<OpenResult>;
123
+ createFromSnapshot(selectDestination: () => Promise<{
124
+ directory: FileSystemDirectoryHandle;
125
+ overwrite: boolean;
126
+ } | null>, prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>, isCurrent: () => boolean): Promise<OpenResult>;
124
127
  save(): Promise<SaveResult>;
125
128
  dispose: () => void;
126
129
  };
@@ -1,4 +1,4 @@
1
- import { S as _objectSpread2 } from "./shared-JdaDvk2R.js";
1
+ import { T as _objectSpread2 } from "./shared-Dz9dzxQF.js";
2
2
  // node_modules/@marijn/find-cluster-break/src/index.js
3
3
  var rangeFrom = [];
4
4
  var rangeTo = [];
@@ -547,6 +547,191 @@ function projectChanges(source, before, after, identity) {
547
547
  for (const key of Object.keys(other)) if (!Object.hasOwn(result, key)) result[key] = other[key];
548
548
  return result;
549
549
  }
550
+ // src/create-folder.ts
551
+ var manifests = /* @__PURE__ */ new Set([
552
+ projectFile,
553
+ manifestFile,
554
+ extensionsFile
555
+ ]);
556
+ var sourceDirectories = ["assets", "extensions"];
557
+ var sourcePath = /^(?:assets\/[a-f0-9]{32}\.[A-Za-z0-9]+|extensions\/[A-Za-z0-9._-]+\.(?:js|manifest\.json))$/u;
558
+ function missing(error) {
559
+ return error instanceof DOMException && error.name === "NotFoundError";
560
+ }
561
+ async function isProjectFolderEmpty(directory) {
562
+ var _iteratorAbruptCompletion = false;
563
+ var _didIteratorError = false;
564
+ var _iteratorError;
565
+ try {
566
+ for (var _iterator = _asyncIterator(directory.values()), _step; _iteratorAbruptCompletion = !(_step = await _iterator.next()).done; _iteratorAbruptCompletion = false) {
567
+ _step.value;
568
+ return false;
569
+ }
570
+ } catch (err) {
571
+ _didIteratorError = true;
572
+ _iteratorError = err;
573
+ } finally {
574
+ try {
575
+ if (_iteratorAbruptCompletion && _iterator.return != null) await _iterator.return();
576
+ } finally {
577
+ if (_didIteratorError) throw _iteratorError;
578
+ }
579
+ }
580
+ return true;
581
+ }
582
+ function projectFolderOverwriteWarning(locale = "en") {
583
+ return locale.startsWith("ja") ? "指定されたフォルダに保存されている内容は上書きされます" : "Contents in the selected folder will be overwritten.";
584
+ }
585
+ async function directoryEntries(directory) {
586
+ const entries = /* @__PURE__ */ new Map();
587
+ var _iteratorAbruptCompletion2 = false;
588
+ var _didIteratorError2 = false;
589
+ var _iteratorError2;
590
+ try {
591
+ for (var _iterator2 = _asyncIterator(directory.values()), _step2; _iteratorAbruptCompletion2 = !(_step2 = await _iterator2.next()).done; _iteratorAbruptCompletion2 = false) {
592
+ const entry = _step2.value;
593
+ entries.set(entry.name, entry);
594
+ }
595
+ } catch (err) {
596
+ _didIteratorError2 = true;
597
+ _iteratorError2 = err;
598
+ } finally {
599
+ try {
600
+ if (_iteratorAbruptCompletion2 && _iterator2.return != null) await _iterator2.return();
601
+ } finally {
602
+ if (_didIteratorError2) throw _iteratorError2;
603
+ }
604
+ }
605
+ return entries;
606
+ }
607
+ /** Create and validate a project-folder snapshot in a directory chosen by the user. */
608
+ async function createProjectFolder({ directory, files, storage, overwrite = false, current = () => true }) {
609
+ for (const filename of manifests) if (!files.has(filename)) return unsupported(`Missing ${filename}`);
610
+ for (const [filename, bytes] of files) if (!manifests.has(filename) && !sourcePath.test(filename) || !(bytes instanceof Uint8Array)) return unsupported(`Invalid project folder entry: ${filename}`);
611
+ const assertCurrent = () => {
612
+ if (!current()) throw new FolderError("conflict", "The project changed before the folder was saved");
613
+ };
614
+ const existing = await directoryEntries(directory);
615
+ if (existing.size && !overwrite) throw new FolderError("conflict", "The destination folder is no longer empty");
616
+ const directories = /* @__PURE__ */ new Map();
617
+ const undo = [];
618
+ const getFile = (parent, name) => parent.getFileHandle(name).catch((error) => {
619
+ if (missing(error)) return null;
620
+ throw error;
621
+ });
622
+ const getDirectory = (parent, name) => parent.getDirectoryHandle(name).catch((error) => {
623
+ if (missing(error)) return null;
624
+ throw error;
625
+ });
626
+ const write = async (file, data, guard) => {
627
+ const writable = await file.createWritable({ mode: "exclusive" });
628
+ try {
629
+ await writable.write(data);
630
+ await guard();
631
+ await writable.close();
632
+ } catch (error) {
633
+ await writable.abort().catch(() => {});
634
+ throw error;
635
+ }
636
+ };
637
+ const remove = async (parent, entry, restoreParent = async () => parent) => {
638
+ const { name } = entry;
639
+ if (entry.kind === "directory") {
640
+ const child = await getDirectory(parent, name);
641
+ if (!child || !await child.isSameEntry(entry)) throw new FolderError("conflict");
642
+ const restoreChild = async () => (await restoreParent()).getDirectoryHandle(name);
643
+ for (const nested of (await directoryEntries(child)).values()) await remove(child, nested, restoreChild);
644
+ assertCurrent();
645
+ await parent.removeEntry(name);
646
+ undo.push(async () => {
647
+ await (await restoreParent()).getDirectoryHandle(name, { create: true });
648
+ });
649
+ } else {
650
+ const file = await getFile(parent, name);
651
+ if (!file || !await file.isSameEntry(entry)) throw new FolderError("conflict");
652
+ const initial = await file.getFile();
653
+ const bytes = new Uint8Array(await initial.arrayBuffer());
654
+ if (fileVersion(await file.getFile()) !== fileVersion(initial)) throw new FolderError("conflict");
655
+ assertCurrent();
656
+ await parent.removeEntry(name);
657
+ undo.push(async () => {
658
+ const destination = await restoreParent();
659
+ if (await getFile(destination, name)) return;
660
+ const restored = await destination.getFileHandle(name, { create: true });
661
+ await write(restored, bytes, async () => {
662
+ if ((await restored.getFile()).size) throw new FolderError("conflict");
663
+ });
664
+ });
665
+ }
666
+ };
667
+ try {
668
+ for (const name of sourceDirectories) {
669
+ const entry = existing.get(name);
670
+ const needed = [...files.keys()].some((path) => path.startsWith(`${name}/`));
671
+ if ((entry === null || entry === void 0 ? void 0 : entry.kind) === "file") await remove(directory, entry);
672
+ const previous = await getDirectory(directory, name);
673
+ if (previous && (!entry || entry.kind !== "directory" || !await previous.isSameEntry(entry))) throw new FolderError("conflict");
674
+ if (!needed && !previous) continue;
675
+ assertCurrent();
676
+ const handle = previous !== null && previous !== void 0 ? previous : await directory.getDirectoryHandle(name, { create: true });
677
+ if (!previous) undo.push(async () => {
678
+ const found = await getDirectory(directory, name);
679
+ if (found && await found.isSameEntry(handle)) await directory.removeEntry(name);
680
+ });
681
+ const children = await directoryEntries(handle);
682
+ for (const child of children.values()) {
683
+ if (child.kind === "file" && files.has(`${name}/${child.name}`) && previous) continue;
684
+ if (!previous) throw new FolderError("conflict");
685
+ await remove(handle, child);
686
+ children.delete(child.name);
687
+ }
688
+ directories.set(name, {
689
+ handle,
690
+ entries: children
691
+ });
692
+ }
693
+ const entries = [...files].sort(([a], [b]) => Number(manifests.has(a)) - Number(manifests.has(b)) || Number(a === "project.source.json") - Number(b === "project.source.json"));
694
+ for (const [filename, bytes] of entries) {
695
+ var _subdirectory$handle, _subdirectory$entries;
696
+ assertCurrent();
697
+ const [first, basename] = filename.split("/");
698
+ const subdirectory = basename === void 0 ? void 0 : directories.get(first);
699
+ const parent = (_subdirectory$handle = subdirectory === null || subdirectory === void 0 ? void 0 : subdirectory.handle) !== null && _subdirectory$handle !== void 0 ? _subdirectory$handle : directory;
700
+ const name = basename !== null && basename !== void 0 ? basename : first;
701
+ const entry = ((_subdirectory$entries = subdirectory === null || subdirectory === void 0 ? void 0 : subdirectory.entries) !== null && _subdirectory$entries !== void 0 ? _subdirectory$entries : existing).get(name);
702
+ if ((entry === null || entry === void 0 ? void 0 : entry.kind) === "directory") await remove(parent, entry);
703
+ const previous = await getFile(parent, name);
704
+ if ((entry === null || entry === void 0 ? void 0 : entry.kind) === "file" ? !previous || !await previous.isSameEntry(entry) : previous) throw new FolderError("conflict");
705
+ const file = previous !== null && previous !== void 0 ? previous : await parent.getFileHandle(name, { create: true });
706
+ const initial = await file.getFile();
707
+ if (!previous && initial.size !== 0) throw new FolderError("conflict");
708
+ const backup = previous ? new Uint8Array(await initial.arrayBuffer()) : null;
709
+ let committed = false;
710
+ undo.push(async () => {
711
+ if (backup && !committed) return;
712
+ const found = await getFile(parent, name);
713
+ if (!found || !await found.isSameEntry(file)) return;
714
+ const latest = await found.getFile();
715
+ if (!sameBytes(new Uint8Array(await latest.arrayBuffer()), committed ? bytes : /* @__PURE__ */ new Uint8Array())) return;
716
+ if (backup) await write(found, backup, async () => {
717
+ if (fileVersion(await found.getFile()) !== fileVersion(latest)) throw new FolderError("conflict");
718
+ });
719
+ else await parent.removeEntry(name);
720
+ });
721
+ await write(file, bytes, async () => {
722
+ if (fileVersion(await file.getFile()) !== fileVersion(initial)) throw new FolderError("conflict");
723
+ assertCurrent();
724
+ });
725
+ committed = true;
726
+ }
727
+ const source = await readFolder(directory, storage);
728
+ assertCurrent();
729
+ return source;
730
+ } catch (error) {
731
+ for (const revert of undo.reverse()) await revert().catch(() => {});
732
+ throw error;
733
+ }
734
+ }
550
735
  // src/folder-registry.ts
551
736
  var folders = /* @__PURE__ */ new WeakMap();
552
737
  var registrations = /* @__PURE__ */ new Set();
@@ -585,4 +770,4 @@ function followProjectFolder(vm, listener) {
585
770
  unsubscribe();
586
771
  };
587
772
  }
588
- export { _asyncIterator as C, _objectSpread2 as S, readFolder as _, assetKey as a, unsupported as b, extensionsFile as c, manifestFile as d, parseProject as f, projectFile as g, projectChanges as h, assertFolderUnchanged as i, fileVersion as l, projectAssets as m, registerFolder as n, assetTypeFor as o, planExtensionSave as p, FolderError as r, equal as s, followProjectFolder as t, isObject as u, readFolderUpdate as v, _objectWithoutProperties as x, sameBytes as y };
773
+ export { unsupported as C, _asyncIterator as E, sameBytes as S, _objectSpread2 as T, projectAssets as _, projectFolderOverwriteWarning as a, readFolder as b, assetKey as c, extensionsFile as d, fileVersion as f, planExtensionSave as g, parseProject as h, isProjectFolderEmpty as i, assetTypeFor as l, manifestFile as m, registerFolder as n, FolderError as o, isObject as p, createProjectFolder as r, assertFolderUnchanged as s, followProjectFolder as t, equal as u, projectChanges as v, _objectWithoutProperties as w, readFolderUpdate as x, projectFile as y };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kubohiroya/turbowarp-plus-editor-project-folder",
3
- "version": "0.9.0",
3
+ "version": "0.9.2",
4
4
  "description": "Read and save expanded Scratch project folders in TurboWarp Plus Editor",
5
5
  "type": "module",
6
6
  "license": "MPL-2.0",
@@ -2,6 +2,7 @@ import {extensionsFile, fileVersion, FolderError, manifestFile, projectFile, rea
2
2
  import type {Storage} from './source.js';
3
3
 
4
4
  const manifests = new Set<string>([projectFile, manifestFile, extensionsFile]);
5
+ const sourceDirectories = ['assets', 'extensions'];
5
6
  const sourcePath = /^(?:assets\/[a-f0-9]{32}\.[A-Za-z0-9]+|extensions\/[A-Za-z0-9._-]+\.(?:js|manifest\.json))$/u;
6
7
 
7
8
  type IterableDirectory = FileSystemDirectoryHandle & {values(): AsyncIterable<FileSystemHandle>};
@@ -10,17 +11,28 @@ function missing(error: unknown) {
10
11
  return error instanceof DOMException && error.name === 'NotFoundError';
11
12
  }
12
13
 
13
- async function assertEmpty(directory: FileSystemDirectoryHandle) {
14
- for await (const _entry of (directory as IterableDirectory).values()) {
15
- throw new FolderError('conflict', 'Choose an empty project folder');
16
- }
14
+ export async function isProjectFolderEmpty(directory: FileSystemDirectoryHandle) {
15
+ for await (const _entry of (directory as IterableDirectory).values()) return false;
16
+ return true;
17
+ }
18
+
19
+ export function projectFolderOverwriteWarning(locale = 'en') {
20
+ return locale.startsWith('ja') ? '指定されたフォルダに保存されている内容は上書きされます' :
21
+ 'Contents in the selected folder will be overwritten.';
22
+ }
23
+
24
+ async function directoryEntries(directory: FileSystemDirectoryHandle) {
25
+ const entries = new Map<string, FileSystemHandle>();
26
+ for await (const entry of (directory as IterableDirectory).values()) entries.set(entry.name, entry);
27
+ return entries;
17
28
  }
18
29
 
19
30
  /** Create and validate a project-folder snapshot in a directory chosen by the user. */
20
- export async function createProjectFolder({directory, files, storage, current = () => true}: {
31
+ export async function createProjectFolder({directory, files, storage, overwrite = false, current = () => true}: {
21
32
  directory: FileSystemDirectoryHandle;
22
33
  files: ReadonlyMap<string, Uint8Array>;
23
34
  storage: Storage;
35
+ overwrite?: boolean;
24
36
  current?: () => boolean;
25
37
  }) {
26
38
  for (const filename of manifests) {
@@ -34,60 +46,120 @@ export async function createProjectFolder({directory, files, storage, current =
34
46
  const assertCurrent = () => {
35
47
  if (!current()) throw new FolderError('conflict', 'The project changed before the folder was saved');
36
48
  };
37
- await assertEmpty(directory);
38
- const directories = new Map<string, FileSystemDirectoryHandle>();
49
+ const existing = await directoryEntries(directory);
50
+ if (existing.size && !overwrite) throw new FolderError('conflict', 'The destination folder is no longer empty');
51
+ const directories = new Map<string, {handle: FileSystemDirectoryHandle; entries: Map<string, FileSystemHandle>}>();
39
52
  const undo: (() => Promise<void>)[] = [];
53
+ const getFile = (parent: FileSystemDirectoryHandle, name: string) => parent.getFileHandle(name).catch(error => {
54
+ if (missing(error)) return null;
55
+ throw error;
56
+ });
57
+ const getDirectory = (parent: FileSystemDirectoryHandle, name: string) => parent.getDirectoryHandle(name).catch(error => {
58
+ if (missing(error)) return null;
59
+ throw error;
60
+ });
61
+ const write = async (file: FileSystemFileHandle, data: Uint8Array, guard: () => void | Promise<void>) => {
62
+ const writable = await file.createWritable({mode: 'exclusive'} as FileSystemCreateWritableOptions);
63
+ try {
64
+ await writable.write(data as Uint8Array<ArrayBuffer>);
65
+ await guard();
66
+ await writable.close();
67
+ } catch (error) {
68
+ await writable.abort().catch(() => {});
69
+ throw error;
70
+ }
71
+ };
72
+ const remove = async (parent: FileSystemDirectoryHandle, entry: FileSystemHandle,
73
+ restoreParent = async () => parent): Promise<void> => {
74
+ const {name} = entry;
75
+ if (entry.kind === 'directory') {
76
+ const child = await getDirectory(parent, name);
77
+ if (!child || !await child.isSameEntry(entry)) throw new FolderError('conflict');
78
+ const restoreChild = async () => (await restoreParent()).getDirectoryHandle(name);
79
+ for (const nested of (await directoryEntries(child)).values()) await remove(child, nested, restoreChild);
80
+ assertCurrent();
81
+ await parent.removeEntry(name);
82
+ undo.push(async () => {await (await restoreParent()).getDirectoryHandle(name, {create: true});});
83
+ } else {
84
+ const file = await getFile(parent, name);
85
+ if (!file || !await file.isSameEntry(entry)) throw new FolderError('conflict');
86
+ const initial = await file.getFile();
87
+ const bytes = new Uint8Array(await initial.arrayBuffer());
88
+ if (fileVersion(await file.getFile()) !== fileVersion(initial)) throw new FolderError('conflict');
89
+ assertCurrent();
90
+ await parent.removeEntry(name);
91
+ undo.push(async () => {
92
+ const destination = await restoreParent();
93
+ if (await getFile(destination, name)) return;
94
+ const restored = await destination.getFileHandle(name, {create: true});
95
+ await write(restored, bytes, async () => {
96
+ if ((await restored.getFile()).size) throw new FolderError('conflict');
97
+ });
98
+ });
99
+ }
100
+ };
40
101
  try {
102
+ // The source format owns these directories and requires exactly the files in the snapshot.
103
+ for (const name of sourceDirectories) {
104
+ const entry = existing.get(name);
105
+ const needed = [...files.keys()].some(path => path.startsWith(`${name}/`));
106
+ if (entry?.kind === 'file') await remove(directory, entry);
107
+ const previous = await getDirectory(directory, name);
108
+ if (previous && (!entry || entry.kind !== 'directory' || !await previous.isSameEntry(entry))) {
109
+ throw new FolderError('conflict');
110
+ }
111
+ if (!needed && !previous) continue;
112
+ assertCurrent();
113
+ const handle = previous ?? await directory.getDirectoryHandle(name, {create: true});
114
+ if (!previous) undo.push(async () => {
115
+ const found = await getDirectory(directory, name);
116
+ if (found && await found.isSameEntry(handle)) await directory.removeEntry(name);
117
+ });
118
+ const children = await directoryEntries(handle);
119
+ for (const child of children.values()) {
120
+ if (child.kind === 'file' && files.has(`${name}/${child.name}`) && previous) continue;
121
+ if (!previous) throw new FolderError('conflict');
122
+ await remove(handle, child);
123
+ children.delete(child.name);
124
+ }
125
+ directories.set(name, {handle, entries: children});
126
+ }
41
127
  // Publish the project JSON last, after the files it refers to.
42
128
  const entries = [...files].sort(([a], [b]) => Number(manifests.has(a)) - Number(manifests.has(b)) ||
43
129
  Number(a === projectFile) - Number(b === projectFile));
44
130
  for (const [filename, bytes] of entries) {
45
131
  assertCurrent();
46
132
  const [first, basename] = filename.split('/');
47
- let parent = directory;
48
- if (basename !== undefined) {
49
- const existing = directories.get(first);
50
- if (existing) parent = existing;
51
- else {
52
- const unexpected = await directory.getDirectoryHandle(first).catch(error => {
53
- if (missing(error)) return null;
54
- throw error;
55
- });
56
- if (unexpected) throw new FolderError('conflict');
57
- parent = await directory.getDirectoryHandle(first, {create: true});
58
- directories.set(first, parent);
59
- undo.push(async () => {
60
- const entry = await directory.getDirectoryHandle(first);
61
- if (await entry.isSameEntry(parent)) await directory.removeEntry(first);
62
- });
63
- }
64
- }
133
+ const subdirectory = basename === undefined ? undefined : directories.get(first)!;
134
+ const parent = subdirectory?.handle ?? directory;
65
135
  const name = basename ?? first;
66
- const existing = await parent.getFileHandle(name).catch(error => {
67
- if (missing(error)) return null;
68
- throw error;
69
- });
70
- if (existing) throw new FolderError('conflict');
71
- const file = await parent.getFileHandle(name, {create: true});
136
+ const entry = (subdirectory?.entries ?? existing).get(name);
137
+ if (entry?.kind === 'directory') await remove(parent, entry);
138
+ const previous = await getFile(parent, name);
139
+ if (entry?.kind === 'file' ? !previous || !await previous.isSameEntry(entry) : previous) {
140
+ throw new FolderError('conflict');
141
+ }
142
+ const file = previous ?? await parent.getFileHandle(name, {create: true});
72
143
  const initial = await file.getFile();
73
- if (initial.size !== 0) throw new FolderError('conflict');
74
- let expected: Uint8Array = new Uint8Array();
144
+ if (!previous && initial.size !== 0) throw new FolderError('conflict');
145
+ const backup = previous ? new Uint8Array(await initial.arrayBuffer()) : null;
146
+ let committed = false;
75
147
  undo.push(async () => {
76
- const entry = await parent.getFileHandle(name);
77
- if (!await entry.isSameEntry(file)) return;
78
- if (sameBytes(new Uint8Array(await (await entry.getFile()).arrayBuffer()), expected)) await parent.removeEntry(name);
148
+ if (backup && !committed) return;
149
+ const found = await getFile(parent, name);
150
+ if (!found || !await found.isSameEntry(file)) return;
151
+ const latest = await found.getFile();
152
+ if (!sameBytes(new Uint8Array(await latest.arrayBuffer()), committed ? bytes : new Uint8Array())) return;
153
+ if (backup) await write(found, backup, async () => {
154
+ if (fileVersion(await found.getFile()) !== fileVersion(latest)) throw new FolderError('conflict');
155
+ });
156
+ else await parent.removeEntry(name);
79
157
  });
80
- const writable = await file.createWritable({mode: 'exclusive'} as FileSystemCreateWritableOptions);
81
- try {
82
- await writable.write(bytes as Uint8Array<ArrayBuffer>);
83
- assertCurrent();
158
+ await write(file, bytes, async () => {
84
159
  if (fileVersion(await file.getFile()) !== fileVersion(initial)) throw new FolderError('conflict');
85
- await writable.close();
86
- expected = bytes;
87
- } catch (error) {
88
- await writable.abort().catch(() => {});
89
- throw error;
90
- }
160
+ assertCurrent();
161
+ });
162
+ committed = true;
91
163
  }
92
164
  const source = await readFolder(directory, storage);
93
165
  assertCurrent();