@kubohiroya/turbowarp-plus-editor-project-folder 0.9.1 → 0.9.3
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/create-folder.d.ts +4 -1
- package/dist/explorer.d.ts +10 -2
- package/dist/explorer.js +297 -85
- package/dist/file-preview.d.ts +14 -4
- package/dist/index.d.ts +6 -2
- package/dist/index.js +57 -111
- package/dist/session.d.ts +6 -1
- package/dist/{shared-kI7qYraF.js → shared-BqC3-Bzi.js} +15 -4
- package/dist/{shared-JdaDvk2R.js → shared-Dz9dzxQF.js} +186 -1
- package/dist/text-file-editor.d.ts +5 -0
- package/package.json +1 -1
- package/src/create-folder.ts +118 -46
- package/src/explorer-menu.tsx +1 -1
- package/src/explorer.tsx +213 -50
- package/src/file-preview.ts +22 -4
- package/src/index.ts +16 -4
- package/src/session.ts +41 -13
- package/src/text-file-editor.ts +16 -3
package/dist/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export type { ReloadTarget } from './block-reload.js';
|
|
|
4
4
|
export { followProjectFolder } from './folder-registry.js';
|
|
5
5
|
export type { FollowedFolder } from './folder-registry.js';
|
|
6
6
|
export type { DeserializeBlocks } from './script-reload.js';
|
|
7
|
-
export { createProjectFolder } from './create-folder.js';
|
|
7
|
+
export { createProjectFolder, projectFolderOverwriteWarning } from './create-folder.js';
|
|
8
8
|
type MenuElement = (component: any, props: any, ...children: any[]) => any;
|
|
9
9
|
interface MenuProps {
|
|
10
10
|
vm: FolderVM;
|
|
@@ -25,12 +25,16 @@ export declare function mountProjectFolder({ vm, document, host, locale, autoRel
|
|
|
25
25
|
autoReload?: boolean;
|
|
26
26
|
}): {
|
|
27
27
|
openDirectory: (directory: FileSystemDirectoryHandle, confirmReplace: () => boolean) => Promise<import("./session.js").OpenResult>;
|
|
28
|
+
unsavedPaths: () => ReadonlySet<string> | null;
|
|
29
|
+
readUnsavedFile: (path: string) => Uint8Array<ArrayBufferLike> | null | undefined;
|
|
30
|
+
subscribeEdits: (listener: () => void) => () => void;
|
|
28
31
|
save: () => Promise<{
|
|
29
32
|
status: "saved" | "unchanged";
|
|
30
33
|
sourceRemoved: string[];
|
|
31
34
|
}>;
|
|
32
|
-
createFromSnapshot({ prepareFiles, directory, current }: {
|
|
35
|
+
createFromSnapshot({ prepareFiles, collectEdits, directory, current }: {
|
|
33
36
|
prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>;
|
|
37
|
+
collectEdits?: () => Promise<void>;
|
|
34
38
|
directory?: FileSystemDirectoryHandle;
|
|
35
39
|
current?: () => boolean;
|
|
36
40
|
}): Promise<import("./session.js").OpenResult>;
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { C as
|
|
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) => {
|
|
@@ -438,6 +343,12 @@ var readerFor = (storage) => {
|
|
|
438
343
|
storageReaders.set(storage, reader);
|
|
439
344
|
return reader;
|
|
440
345
|
};
|
|
346
|
+
var encodeJson = (value) => new TextEncoder().encode(`${JSON.stringify(value, null, 2)}\n`);
|
|
347
|
+
function saveManifest(source, added, removed) {
|
|
348
|
+
const value = JSON.parse(new TextDecoder().decode(source.files.get(manifestFile)));
|
|
349
|
+
const entries = value.archiveEntries.filter((name) => !removed.includes(name));
|
|
350
|
+
return encodeJson(_objectSpread2(_objectSpread2({}, value), {}, { archiveEntries: [...entries, ...added] }));
|
|
351
|
+
}
|
|
441
352
|
function createFolderSession(vm, host) {
|
|
442
353
|
let current = null;
|
|
443
354
|
const listeners = /* @__PURE__ */ new Set();
|
|
@@ -660,6 +571,29 @@ function createFolderSession(vm, host) {
|
|
|
660
571
|
}
|
|
661
572
|
return paths;
|
|
662
573
|
},
|
|
574
|
+
/** The bytes the next save would write, null for a deletion, or undefined when no preview is available. */
|
|
575
|
+
readUnsavedFile(path) {
|
|
576
|
+
if (!current || busy) return;
|
|
577
|
+
try {
|
|
578
|
+
const { result, extensionSave, added, removed } = planSave(current, snapshot());
|
|
579
|
+
if (path === "project.source.json" && result) return encodeJson(extensionSave.project);
|
|
580
|
+
if (path === "embedded-extensions.json" && extensionSave.manifestChanged) return encodeJson(extensionSave.embedded);
|
|
581
|
+
if (path === "sb3-source.json" && (added.length || removed.length)) return saveManifest(current.source, added.map(([name]) => name), removed);
|
|
582
|
+
if (path.startsWith("assets/")) {
|
|
583
|
+
var _added$find, _assetData;
|
|
584
|
+
const name = path.slice(7);
|
|
585
|
+
if (removed.includes(name)) return null;
|
|
586
|
+
const kind = (_added$find = added.find(([asset]) => asset === name)) === null || _added$find === void 0 ? void 0 : _added$find[1];
|
|
587
|
+
if (kind) return (_assetData = assetData(name, kind)) !== null && _assetData !== void 0 ? _assetData : void 0;
|
|
588
|
+
}
|
|
589
|
+
if (path.startsWith("extensions/")) {
|
|
590
|
+
const name = path.slice(11);
|
|
591
|
+
return extensionSave.removed.includes(name) ? null : extensionSave.writes.get(name);
|
|
592
|
+
}
|
|
593
|
+
} catch (error) {
|
|
594
|
+
if (!(error instanceof FolderError)) throw error;
|
|
595
|
+
}
|
|
596
|
+
},
|
|
663
597
|
get canSave() {
|
|
664
598
|
return current !== null;
|
|
665
599
|
},
|
|
@@ -807,11 +741,17 @@ function createFolderSession(vm, host) {
|
|
|
807
741
|
openDirectory(directory, confirmReplace) {
|
|
808
742
|
return openFrom(() => Promise.resolve(directory), confirmReplace);
|
|
809
743
|
},
|
|
810
|
-
createFromSnapshot(
|
|
744
|
+
createFromSnapshot(selectDestination, prepareFiles, isCurrent) {
|
|
811
745
|
const stage = vm.runtime.getTargetForStage();
|
|
812
746
|
let savedRevision;
|
|
813
747
|
const currentProject = () => !disposed && vm.runtime.getTargetForStage() === stage && (savedRevision === void 0 || revision === savedRevision) && isCurrent();
|
|
814
|
-
|
|
748
|
+
let overwrite = false;
|
|
749
|
+
return openFrom(async () => {
|
|
750
|
+
var _destination$overwrit, _destination$director;
|
|
751
|
+
const destination = await selectDestination();
|
|
752
|
+
overwrite = (_destination$overwrit = destination === null || destination === void 0 ? void 0 : destination.overwrite) !== null && _destination$overwrit !== void 0 ? _destination$overwrit : false;
|
|
753
|
+
return (_destination$director = destination === null || destination === void 0 ? void 0 : destination.directory) !== null && _destination$director !== void 0 ? _destination$director : null;
|
|
754
|
+
}, currentProject, async (directory) => {
|
|
815
755
|
if (!currentProject()) return null;
|
|
816
756
|
savedRevision = revision;
|
|
817
757
|
const files = await prepareFiles();
|
|
@@ -820,6 +760,7 @@ function createFolderSession(vm, host) {
|
|
|
820
760
|
directory,
|
|
821
761
|
files,
|
|
822
762
|
storage: vm.runtime.storage,
|
|
763
|
+
overwrite,
|
|
823
764
|
current: currentProject
|
|
824
765
|
});
|
|
825
766
|
}, currentProject);
|
|
@@ -853,13 +794,7 @@ function createFolderSession(vm, host) {
|
|
|
853
794
|
sourceRemoved: []
|
|
854
795
|
};
|
|
855
796
|
}
|
|
856
|
-
const
|
|
857
|
-
let manifest = null;
|
|
858
|
-
if (added.size || removed.length) {
|
|
859
|
-
const value = JSON.parse(new TextDecoder().decode(source.files.get(manifestFile)));
|
|
860
|
-
value.archiveEntries = [...value.archiveEntries.filter((name) => !removed.includes(name)), ...added.keys()];
|
|
861
|
-
manifest = encoder.encode(`${JSON.stringify(value, null, 2)}\n`);
|
|
862
|
-
}
|
|
797
|
+
const manifest = added.size || removed.length ? saveManifest(source, added.keys(), removed) : null;
|
|
863
798
|
const root = {
|
|
864
799
|
directory: source.directory,
|
|
865
800
|
files: source.files,
|
|
@@ -921,8 +856,8 @@ function createFolderSession(vm, host) {
|
|
|
921
856
|
for (const [name, data] of added) await write(assets, name, data);
|
|
922
857
|
for (const [name, data] of extensionSave.writes) await write(extensions, name, data);
|
|
923
858
|
if (manifest) await write(root, manifestFile, manifest);
|
|
924
|
-
if (extensionSave.manifestChanged) await write(root, extensionsFile,
|
|
925
|
-
if (result) await write(root, projectFile,
|
|
859
|
+
if (extensionSave.manifestChanged) await write(root, extensionsFile, encodeJson(extensionSave.embedded));
|
|
860
|
+
if (result) await write(root, projectFile, encodeJson(extensionSave.project));
|
|
926
861
|
} catch (error) {
|
|
927
862
|
for (const restore of undo.reverse()) await restore().catch(() => {});
|
|
928
863
|
throw error;
|
|
@@ -1250,15 +1185,26 @@ function mountProjectFolder({ vm, document, host, locale = "en", autoReload = tr
|
|
|
1250
1185
|
});
|
|
1251
1186
|
return {
|
|
1252
1187
|
openDirectory: (...args) => session.openDirectory(...args).finally(renderReload),
|
|
1188
|
+
unsavedPaths: () => session.unsavedPaths(),
|
|
1189
|
+
readUnsavedFile: (path) => session.readUnsavedFile(path),
|
|
1190
|
+
subscribeEdits: (listener) => session.subscribeEdits(listener),
|
|
1253
1191
|
save: () => session.save().finally(renderReload),
|
|
1254
|
-
createFromSnapshot({ prepareFiles, directory, current = () => true }) {
|
|
1192
|
+
createFromSnapshot({ prepareFiles, collectEdits, directory, current = () => true }) {
|
|
1193
|
+
const message = locale.startsWith("ja") ? "指定されたフォルダは空ではありません。フォルダに保存されている内容が上書きされる場合があります。よろしいですか?" : "The selected folder is not empty. Contents in the folder may be overwritten. Continue?";
|
|
1255
1194
|
return session.createFromSnapshot(async () => {
|
|
1256
|
-
if (directory) return directory;
|
|
1257
1195
|
try {
|
|
1258
|
-
|
|
1196
|
+
const selected = directory !== null && directory !== void 0 ? directory : await pickDirectory.call(view, {
|
|
1259
1197
|
id: "turbowarp-plus-project-folder",
|
|
1260
1198
|
mode: "readwrite"
|
|
1261
1199
|
});
|
|
1200
|
+
if (!current()) return null;
|
|
1201
|
+
const overwrite = !await isProjectFolderEmpty(selected);
|
|
1202
|
+
if (!current() || overwrite && !view.confirm(message)) return null;
|
|
1203
|
+
await (collectEdits === null || collectEdits === void 0 ? void 0 : collectEdits());
|
|
1204
|
+
return current() ? {
|
|
1205
|
+
directory: selected,
|
|
1206
|
+
overwrite
|
|
1207
|
+
} : null;
|
|
1262
1208
|
} catch (error) {
|
|
1263
1209
|
if (error instanceof DOMException && error.name === "AbortError") return null;
|
|
1264
1210
|
throw error;
|
|
@@ -1316,4 +1262,4 @@ function renderProjectFolderMenu(createElement, { vm, locale = "en", MenuItem, M
|
|
|
1316
1262
|
};
|
|
1317
1263
|
return createElement(MenuSection, null, item("open"), entry.session.canSave ? item("save") : null);
|
|
1318
1264
|
}
|
|
1319
|
-
export { createProjectFolder, followProjectFolder, mountProjectFolder, projectFolderActions, renderProjectFolderMenu };
|
|
1265
|
+
export { createProjectFolder, followProjectFolder, mountProjectFolder, projectFolderActions, projectFolderOverwriteWarning, renderProjectFolderMenu };
|
package/dist/session.d.ts
CHANGED
|
@@ -94,6 +94,8 @@ export declare function createFolderSession(vm: FolderVM, host: FolderHost): {
|
|
|
94
94
|
subscribeEdits(listener: () => void): () => void;
|
|
95
95
|
/** Files affected by the pending save. A save in progress still owns its baseline. */
|
|
96
96
|
unsavedPaths(): ReadonlySet<string> | null;
|
|
97
|
+
/** The bytes the next save would write, null for a deletion, or undefined when no preview is available. */
|
|
98
|
+
readUnsavedFile(path: string): Uint8Array | null | undefined;
|
|
97
99
|
readonly canSave: boolean;
|
|
98
100
|
readonly busy: boolean;
|
|
99
101
|
readonly reloadState: ReloadState;
|
|
@@ -120,7 +122,10 @@ export declare function createFolderSession(vm: FolderVM, host: FolderHost): {
|
|
|
120
122
|
reloadAll(confirmReplace: () => boolean): Promise<OpenResult>;
|
|
121
123
|
open(pick: FileSystemPicker, confirmReplace: () => boolean): Promise<OpenResult>;
|
|
122
124
|
openDirectory(directory: FileSystemDirectoryHandle, confirmReplace: () => boolean): Promise<OpenResult>;
|
|
123
|
-
createFromSnapshot(
|
|
125
|
+
createFromSnapshot(selectDestination: () => Promise<{
|
|
126
|
+
directory: FileSystemDirectoryHandle;
|
|
127
|
+
overwrite: boolean;
|
|
128
|
+
} | null>, prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>, isCurrent: () => boolean): Promise<OpenResult>;
|
|
124
129
|
save(): Promise<SaveResult>;
|
|
125
130
|
dispose: () => void;
|
|
126
131
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
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 = [];
|
|
@@ -29959,15 +29959,22 @@ function mountTextFile(parent, options) {
|
|
|
29959
29959
|
EditorView.contentAttributes.of({ "aria-label": options.path }),
|
|
29960
29960
|
keymap.of([...defaultKeymap, ...historyKeymap]),
|
|
29961
29961
|
EditorView.updateListener.of((update) => {
|
|
29962
|
-
if (update.docChanged) updateSaveState();
|
|
29962
|
+
if (update.docChanged) updateSaveState(void 0, true);
|
|
29963
29963
|
})
|
|
29964
29964
|
]
|
|
29965
29965
|
});
|
|
29966
29966
|
const dirty = () => !view.state.doc.eq(savedDoc);
|
|
29967
29967
|
const serialize = () => bom + (newline === "\n" ? view.state.doc.toString() : view.state.doc.toString().replace(/\n/gu, newline));
|
|
29968
|
-
|
|
29969
|
-
|
|
29968
|
+
let wasDirty = false;
|
|
29969
|
+
function updateSaveState(text = saving ? message.saving : dirty() ? message.unsaved : "", contentChanged = false) {
|
|
29970
|
+
const isDirty = dirty();
|
|
29971
|
+
saveButton.disabled = saving || !isDirty;
|
|
29970
29972
|
setStatus(status, text);
|
|
29973
|
+
if (isDirty !== wasDirty || contentChanged && isDirty) {
|
|
29974
|
+
var _options$onDirtyChang;
|
|
29975
|
+
wasDirty = isDirty;
|
|
29976
|
+
(_options$onDirtyChang = options.onDirtyChange) === null || _options$onDirtyChang === void 0 || _options$onDirtyChang.call(options);
|
|
29977
|
+
}
|
|
29971
29978
|
}
|
|
29972
29979
|
async function unchanged(handle) {
|
|
29973
29980
|
try {
|
|
@@ -30107,6 +30114,7 @@ function mountTextFile(parent, options) {
|
|
|
30107
30114
|
};
|
|
30108
30115
|
panel.addEventListener("keydown", (event) => {
|
|
30109
30116
|
if (!(event.metaKey || event.ctrlKey) || event.key.toLowerCase() !== "s") return;
|
|
30117
|
+
if (options.hostSaveShortcut && panel.ownerDocument === document) return;
|
|
30110
30118
|
event.preventDefault();
|
|
30111
30119
|
event.stopPropagation();
|
|
30112
30120
|
save();
|
|
@@ -30115,6 +30123,9 @@ function mountTextFile(parent, options) {
|
|
|
30115
30123
|
showDiff(false);
|
|
30116
30124
|
updateSaveState();
|
|
30117
30125
|
return {
|
|
30126
|
+
save,
|
|
30127
|
+
isDirty: dirty,
|
|
30128
|
+
readUnsaved: () => !disposed && dirty() ? encoder.encode(serialize()) : void 0,
|
|
30118
30129
|
requestClose() {
|
|
30119
30130
|
if (!saving && (!dirty() || (browser === null || browser === void 0 ? void 0 : browser.confirm(message.close)))) options.close();
|
|
30120
30131
|
},
|
|
@@ -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 {
|
|
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 };
|
|
@@ -9,8 +9,13 @@ type TextFileOptions = {
|
|
|
9
9
|
readHandle(): Promise<FileSystemFileHandle>;
|
|
10
10
|
readBaseline?(): Promise<FileBaseline | null>;
|
|
11
11
|
close(): void;
|
|
12
|
+
hostSaveShortcut?: boolean;
|
|
13
|
+
onDirtyChange?(): void;
|
|
12
14
|
};
|
|
13
15
|
export declare function mountTextFile(parent: HTMLElement, options: TextFileOptions): {
|
|
16
|
+
save: () => Promise<void>;
|
|
17
|
+
isDirty: () => boolean;
|
|
18
|
+
readUnsaved: () => Uint8Array<ArrayBuffer> | undefined;
|
|
14
19
|
requestClose(): void;
|
|
15
20
|
dispose(): void;
|
|
16
21
|
};
|
package/package.json
CHANGED