@kubohiroya/turbowarp-plus-editor-project-folder 0.9.2 → 0.10.0
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/README.ja.md +2 -1
- package/README.md +2 -1
- package/dist/explorer-state.d.ts +22 -0
- package/dist/explorer.d.ts +5 -0
- package/dist/explorer.js +283 -74
- package/dist/file-preview.d.ts +14 -4
- package/dist/index.d.ts +6 -1
- package/dist/index.js +99 -12
- package/dist/session.d.ts +18 -0
- package/dist/{shared-Dco5rGKE.js → shared-teFlHQ2X.js} +15 -4
- package/dist/{shared-Dz9dzxQF.js → shared-zlHgCKDG.js} +33 -1
- package/dist/text-file-editor.d.ts +5 -0
- package/package.json +1 -1
- package/src/explorer-files.ts +2 -1
- package/src/explorer-menu.tsx +1 -1
- package/src/explorer-state.ts +50 -0
- package/src/explorer.tsx +191 -43
- package/src/file-preview.ts +22 -4
- package/src/index.ts +6 -1
- package/src/session.ts +112 -10
- package/src/text-file-editor.ts +16 -3
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { A as unsupported, C as planExtensionSave, D as readFolder, E as projectFile, M as _objectSpread2, O as readFolderUpdate, S as parseProject, T as projectChanges, _ as equal, a as parseExplorerState, b as isObject, c as subscribeExplorerState, d as isProjectFolderEmpty, f as projectFolderOverwriteWarning, g as assetTypeFor, h as assetKey, j as _objectWithoutProperties, k as sameBytes, l as writeExplorerState, m as assertFolderUnchanged, n as registerFolder, o as readExplorerState, p as FolderError, r as editorDirectory, s as screenStateFile, t as followProjectFolder, u as createProjectFolder, v as extensionsFile, w as projectAssets, x as manifestFile, y as fileVersion } from "./shared-zlHgCKDG.js";
|
|
2
2
|
// src/block-reload.ts
|
|
3
3
|
var _excluded$1 = ["targets"];
|
|
4
4
|
var _excluded2$1 = ["targets"];
|
|
@@ -330,6 +330,41 @@ function applyScriptReload(targets, edits, deserialize) {
|
|
|
330
330
|
return prepared.map(({ target }) => target);
|
|
331
331
|
}
|
|
332
332
|
// src/session.ts
|
|
333
|
+
var screenStateMaxBytes = 524288;
|
|
334
|
+
var notFound = (error) => error instanceof DOMException && ["NotFoundError", "TypeMismatchError"].includes(error.name);
|
|
335
|
+
/** The screen state the folder was saved with, or nothing. */
|
|
336
|
+
async function readScreenStateText(directory) {
|
|
337
|
+
try {
|
|
338
|
+
const file = await (await (await directory.getDirectoryHandle(editorDirectory)).getFileHandle(screenStateFile)).getFile();
|
|
339
|
+
return file.size > screenStateMaxBytes ? void 0 : await file.text();
|
|
340
|
+
} catch (error) {
|
|
341
|
+
if (!notFound(error)) console.warn("The screen state of the project folder could not be read", error);
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
/** The slices of a screen state, to tell whether only the time of the save changed. */
|
|
345
|
+
var slicesOf = (text) => {
|
|
346
|
+
try {
|
|
347
|
+
return JSON.stringify(JSON.parse(text).slices);
|
|
348
|
+
} catch (_unused) {
|
|
349
|
+
return;
|
|
350
|
+
}
|
|
351
|
+
};
|
|
352
|
+
/** Write the screen state next to the project. Failing to write it never fails the save. */
|
|
353
|
+
async function writeScreenStateText(directory, text) {
|
|
354
|
+
try {
|
|
355
|
+
if (slicesOf(await readScreenStateText(directory)) === slicesOf(text)) return;
|
|
356
|
+
const writable = await (await (await directory.getDirectoryHandle(editorDirectory, { create: true })).getFileHandle(screenStateFile, { create: true })).createWritable();
|
|
357
|
+
try {
|
|
358
|
+
await writable.write(new TextEncoder().encode(text));
|
|
359
|
+
await writable.close();
|
|
360
|
+
} catch (error) {
|
|
361
|
+
await writable.abort().catch(() => {});
|
|
362
|
+
throw error;
|
|
363
|
+
}
|
|
364
|
+
} catch (error) {
|
|
365
|
+
console.warn("The screen state of the project folder could not be saved", error);
|
|
366
|
+
}
|
|
367
|
+
}
|
|
333
368
|
var storageReaders = /* @__PURE__ */ new WeakMap();
|
|
334
369
|
var readerFor = (storage) => {
|
|
335
370
|
const existing = storageReaders.get(storage);
|
|
@@ -343,7 +378,14 @@ var readerFor = (storage) => {
|
|
|
343
378
|
storageReaders.set(storage, reader);
|
|
344
379
|
return reader;
|
|
345
380
|
};
|
|
381
|
+
var encodeJson = (value) => new TextEncoder().encode(`${JSON.stringify(value, null, 2)}\n`);
|
|
382
|
+
function saveManifest(source, added, removed) {
|
|
383
|
+
const value = JSON.parse(new TextDecoder().decode(source.files.get(manifestFile)));
|
|
384
|
+
const entries = value.archiveEntries.filter((name) => !removed.includes(name));
|
|
385
|
+
return encodeJson(_objectSpread2(_objectSpread2({}, value), {}, { archiveEntries: [...entries, ...added] }));
|
|
386
|
+
}
|
|
346
387
|
function createFolderSession(vm, host) {
|
|
388
|
+
var _host$screenState, _host$screenState$reg;
|
|
347
389
|
let current = null;
|
|
348
390
|
const listeners = /* @__PURE__ */ new Set();
|
|
349
391
|
const notify = () => {
|
|
@@ -423,6 +465,22 @@ function createFolderSession(vm, host) {
|
|
|
423
465
|
removed: [...source.bytes.keys()].filter((name) => !needed.has(name))
|
|
424
466
|
};
|
|
425
467
|
};
|
|
468
|
+
let expectingTree = false;
|
|
469
|
+
let pendingTree;
|
|
470
|
+
const unregisterTree = (_host$screenState = host.screenState) === null || _host$screenState === void 0 || (_host$screenState$reg = _host$screenState.register) === null || _host$screenState$reg === void 0 ? void 0 : _host$screenState$reg.call(_host$screenState, "projectFolder", {
|
|
471
|
+
capture: () => current ? readExplorerState(current.source.directory) : void 0,
|
|
472
|
+
apply(value) {
|
|
473
|
+
const tree = parseExplorerState(value);
|
|
474
|
+
if (!tree) return;
|
|
475
|
+
if (current) writeExplorerState(current.source.directory, tree, true);
|
|
476
|
+
else if (expectingTree) pendingTree = tree;
|
|
477
|
+
}
|
|
478
|
+
});
|
|
479
|
+
const saveScreenState = async (directory) => {
|
|
480
|
+
var _host$screenState2;
|
|
481
|
+
const text = (_host$screenState2 = host.screenState) === null || _host$screenState2 === void 0 ? void 0 : _host$screenState2.serialize();
|
|
482
|
+
if (text !== void 0) await writeScreenStateText(directory, text);
|
|
483
|
+
};
|
|
426
484
|
const loaded = () => setCurrent(null);
|
|
427
485
|
vm.runtime.on("PROJECT_LOADED", loaded);
|
|
428
486
|
vm.on("PROJECT_CHANGED", changed);
|
|
@@ -436,6 +494,7 @@ function createFolderSession(vm, host) {
|
|
|
436
494
|
editListeners.clear();
|
|
437
495
|
vm.runtime.off("PROJECT_LOADED", loaded);
|
|
438
496
|
vm.off("PROJECT_CHANGED", changed);
|
|
497
|
+
unregisterTree === null || unregisterTree === void 0 || unregisterTree();
|
|
439
498
|
};
|
|
440
499
|
const openFrom = async (getDirectory, confirmReplace, prepare = (directory) => readFolder(directory, vm.runtime.storage), stillCurrent = () => true) => {
|
|
441
500
|
if (disposed || busy) return "cancelled";
|
|
@@ -455,7 +514,10 @@ function createFolderSession(vm, host) {
|
|
|
455
514
|
const assets = source.storageAssets;
|
|
456
515
|
reader.assets = assets;
|
|
457
516
|
let stage;
|
|
517
|
+
pendingTree = void 0;
|
|
518
|
+
expectingTree = true;
|
|
458
519
|
try {
|
|
520
|
+
if (host.screenState) host.screenState.prepareLoad(await readScreenStateText(directory));
|
|
459
521
|
vm.quit();
|
|
460
522
|
await vm.loadProject(source.loadText, { replaceLegacyExtensions: true });
|
|
461
523
|
stage = vm.runtime.getTargetForStage();
|
|
@@ -472,6 +534,9 @@ function createFolderSession(vm, host) {
|
|
|
472
534
|
ids: identify(baseline),
|
|
473
535
|
pending: null
|
|
474
536
|
});
|
|
537
|
+
expectingTree = false;
|
|
538
|
+
if (pendingTree) writeExplorerState(directory, pendingTree, true);
|
|
539
|
+
pendingTree = void 0;
|
|
475
540
|
(_vm$renderer = vm.renderer) === null || _vm$renderer === void 0 || _vm$renderer.draw();
|
|
476
541
|
return "opened";
|
|
477
542
|
} finally {
|
|
@@ -565,6 +630,29 @@ function createFolderSession(vm, host) {
|
|
|
565
630
|
}
|
|
566
631
|
return paths;
|
|
567
632
|
},
|
|
633
|
+
/** The bytes the next save would write, null for a deletion, or undefined when no preview is available. */
|
|
634
|
+
readUnsavedFile(path) {
|
|
635
|
+
if (!current || busy) return;
|
|
636
|
+
try {
|
|
637
|
+
const { result, extensionSave, added, removed } = planSave(current, snapshot());
|
|
638
|
+
if (path === "project.source.json" && result) return encodeJson(extensionSave.project);
|
|
639
|
+
if (path === "embedded-extensions.json" && extensionSave.manifestChanged) return encodeJson(extensionSave.embedded);
|
|
640
|
+
if (path === "sb3-source.json" && (added.length || removed.length)) return saveManifest(current.source, added.map(([name]) => name), removed);
|
|
641
|
+
if (path.startsWith("assets/")) {
|
|
642
|
+
var _added$find, _assetData;
|
|
643
|
+
const name = path.slice(7);
|
|
644
|
+
if (removed.includes(name)) return null;
|
|
645
|
+
const kind = (_added$find = added.find(([asset]) => asset === name)) === null || _added$find === void 0 ? void 0 : _added$find[1];
|
|
646
|
+
if (kind) return (_assetData = assetData(name, kind)) !== null && _assetData !== void 0 ? _assetData : void 0;
|
|
647
|
+
}
|
|
648
|
+
if (path.startsWith("extensions/")) {
|
|
649
|
+
const name = path.slice(11);
|
|
650
|
+
return extensionSave.removed.includes(name) ? null : extensionSave.writes.get(name);
|
|
651
|
+
}
|
|
652
|
+
} catch (error) {
|
|
653
|
+
if (!(error instanceof FolderError)) throw error;
|
|
654
|
+
}
|
|
655
|
+
},
|
|
568
656
|
get canSave() {
|
|
569
657
|
return current !== null;
|
|
570
658
|
},
|
|
@@ -631,7 +719,7 @@ function createFolderSession(vm, host) {
|
|
|
631
719
|
try {
|
|
632
720
|
const file = await (await session.source.directory.getFileHandle(projectFile)).getFile();
|
|
633
721
|
disk = decoder.decode(new Uint8Array(await file.arrayBuffer()));
|
|
634
|
-
} catch (
|
|
722
|
+
} catch (_unused2) {
|
|
635
723
|
disk = null;
|
|
636
724
|
}
|
|
637
725
|
return current === session ? {
|
|
@@ -758,6 +846,7 @@ function createFolderSession(vm, host) {
|
|
|
758
846
|
added.set(name, data);
|
|
759
847
|
}
|
|
760
848
|
if (!result && !removed.length && !extensionSave.removed.length) {
|
|
849
|
+
await saveScreenState(source.directory);
|
|
761
850
|
if (revision === saveRevision) host.onSaved();
|
|
762
851
|
notify();
|
|
763
852
|
return {
|
|
@@ -765,13 +854,7 @@ function createFolderSession(vm, host) {
|
|
|
765
854
|
sourceRemoved: []
|
|
766
855
|
};
|
|
767
856
|
}
|
|
768
|
-
const
|
|
769
|
-
let manifest = null;
|
|
770
|
-
if (added.size || removed.length) {
|
|
771
|
-
const value = JSON.parse(new TextDecoder().decode(source.files.get(manifestFile)));
|
|
772
|
-
value.archiveEntries = [...value.archiveEntries.filter((name) => !removed.includes(name)), ...added.keys()];
|
|
773
|
-
manifest = encoder.encode(`${JSON.stringify(value, null, 2)}\n`);
|
|
774
|
-
}
|
|
857
|
+
const manifest = added.size || removed.length ? saveManifest(source, added.keys(), removed) : null;
|
|
775
858
|
const root = {
|
|
776
859
|
directory: source.directory,
|
|
777
860
|
files: source.files,
|
|
@@ -833,8 +916,8 @@ function createFolderSession(vm, host) {
|
|
|
833
916
|
for (const [name, data] of added) await write(assets, name, data);
|
|
834
917
|
for (const [name, data] of extensionSave.writes) await write(extensions, name, data);
|
|
835
918
|
if (manifest) await write(root, manifestFile, manifest);
|
|
836
|
-
if (extensionSave.manifestChanged) await write(root, extensionsFile,
|
|
837
|
-
if (result) await write(root, projectFile,
|
|
919
|
+
if (extensionSave.manifestChanged) await write(root, extensionsFile, encodeJson(extensionSave.embedded));
|
|
920
|
+
if (result) await write(root, projectFile, encodeJson(extensionSave.project));
|
|
838
921
|
} catch (error) {
|
|
839
922
|
for (const restore of undo.reverse()) await restore().catch(() => {});
|
|
840
923
|
throw error;
|
|
@@ -855,6 +938,7 @@ function createFolderSession(vm, host) {
|
|
|
855
938
|
session.baseline = edited;
|
|
856
939
|
session.ids = ids;
|
|
857
940
|
session.pending = null;
|
|
941
|
+
await saveScreenState(source.directory);
|
|
858
942
|
if (current === session && revision === saveRevision) host.onSaved();
|
|
859
943
|
notify();
|
|
860
944
|
return {
|
|
@@ -1162,6 +1246,9 @@ function mountProjectFolder({ vm, document, host, locale = "en", autoReload = tr
|
|
|
1162
1246
|
});
|
|
1163
1247
|
return {
|
|
1164
1248
|
openDirectory: (...args) => session.openDirectory(...args).finally(renderReload),
|
|
1249
|
+
unsavedPaths: () => session.unsavedPaths(),
|
|
1250
|
+
readUnsavedFile: (path) => session.readUnsavedFile(path),
|
|
1251
|
+
subscribeEdits: (listener) => session.subscribeEdits(listener),
|
|
1165
1252
|
save: () => session.save().finally(renderReload),
|
|
1166
1253
|
createFromSnapshot({ prepareFiles, collectEdits, directory, current = () => true }) {
|
|
1167
1254
|
const message = locale.startsWith("ja") ? "指定されたフォルダは空ではありません。フォルダに保存されている内容が上書きされる場合があります。よろしいですか?" : "The selected folder is not empty. Contents in the folder may be overwritten. Continue?";
|
|
@@ -1236,4 +1323,4 @@ function renderProjectFolderMenu(createElement, { vm, locale = "en", MenuItem, M
|
|
|
1236
1323
|
};
|
|
1237
1324
|
return createElement(MenuSection, null, item("open"), entry.session.canSave ? item("save") : null);
|
|
1238
1325
|
}
|
|
1239
|
-
export { createProjectFolder, followProjectFolder, mountProjectFolder, projectFolderActions, projectFolderOverwriteWarning, renderProjectFolderMenu };
|
|
1326
|
+
export { createProjectFolder, followProjectFolder, mountProjectFolder, parseExplorerState, projectFolderActions, projectFolderOverwriteWarning, readExplorerState, renderProjectFolderMenu, subscribeExplorerState, writeExplorerState };
|
package/dist/session.d.ts
CHANGED
|
@@ -1,6 +1,21 @@
|
|
|
1
1
|
import type { Asset, Storage } from './source.js';
|
|
2
2
|
import type { ReloadTarget } from './block-reload.js';
|
|
3
3
|
import type { DeserializeBlocks } from './script-reload.js';
|
|
4
|
+
/**
|
|
5
|
+
* The Editor's screen state, such as `installProjectScreenState` of the workbench gives it. A project folder is not
|
|
6
|
+
* an SB3, so the folder keeps the state as `.tw-plus/workspace.json` and gives it back when it opens.
|
|
7
|
+
*/
|
|
8
|
+
export interface FolderScreenState {
|
|
9
|
+
/** The text to write, or nothing to leave the file as it is. */
|
|
10
|
+
serialize(): string | undefined;
|
|
11
|
+
/** Use this text for the next project load. */
|
|
12
|
+
prepareLoad(text: string | undefined): void;
|
|
13
|
+
/** Add a slice, here the explorer's tree. Returns a function that removes it. */
|
|
14
|
+
register?(key: string, slice: {
|
|
15
|
+
capture(): unknown;
|
|
16
|
+
apply?(value: unknown): void;
|
|
17
|
+
}): () => void;
|
|
18
|
+
}
|
|
4
19
|
export interface FolderVM {
|
|
5
20
|
runtime: {
|
|
6
21
|
storage: Storage;
|
|
@@ -51,6 +66,7 @@ export interface FolderHost {
|
|
|
51
66
|
*/
|
|
52
67
|
compareChanges?(request: ComparisonRequest): Promise<string | null>;
|
|
53
68
|
};
|
|
69
|
+
screenState?: FolderScreenState;
|
|
54
70
|
}
|
|
55
71
|
/** A titled comparison of two project.source.json texts; `null` stands for a version that cannot be shown. */
|
|
56
72
|
export type ComparisonSection = {
|
|
@@ -94,6 +110,8 @@ export declare function createFolderSession(vm: FolderVM, host: FolderHost): {
|
|
|
94
110
|
subscribeEdits(listener: () => void): () => void;
|
|
95
111
|
/** Files affected by the pending save. A save in progress still owns its baseline. */
|
|
96
112
|
unsavedPaths(): ReadonlySet<string> | null;
|
|
113
|
+
/** The bytes the next save would write, null for a deletion, or undefined when no preview is available. */
|
|
114
|
+
readUnsavedFile(path: string): Uint8Array | null | undefined;
|
|
97
115
|
readonly canSave: boolean;
|
|
98
116
|
readonly busy: boolean;
|
|
99
117
|
readonly reloadState: ReloadState;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { M as _objectSpread2 } from "./shared-zlHgCKDG.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
|
},
|
|
@@ -732,6 +732,38 @@ async function createProjectFolder({ directory, files, storage, overwrite = fals
|
|
|
732
732
|
throw error;
|
|
733
733
|
}
|
|
734
734
|
}
|
|
735
|
+
// src/explorer-state.ts
|
|
736
|
+
/** The folder the Editor keeps its own files in. The explorer and its search leave it out, like `.git`. */
|
|
737
|
+
var editorDirectory = ".tw-plus";
|
|
738
|
+
/** The screen state of the Editor, inside `editorDirectory`. */
|
|
739
|
+
var screenStateFile = "workspace.json";
|
|
740
|
+
var hiddenEntry = (name) => [".git", editorDirectory].includes(name.toLowerCase());
|
|
741
|
+
var limit = 1e3;
|
|
742
|
+
var states = /* @__PURE__ */ new WeakMap();
|
|
743
|
+
var listeners = /* @__PURE__ */ new WeakMap();
|
|
744
|
+
var validPath = (value) => typeof value === "string" && value.length > 0 && value.length <= 1024 && value.split("/").every((part) => part && part !== "." && part !== ".." && !hiddenEntry(part) && !/[\\\u0000]/u.test(part));
|
|
745
|
+
/** Read a tree state saved in a file, keeping only well-formed paths. */
|
|
746
|
+
function parseExplorerState(value) {
|
|
747
|
+
if (value === null || typeof value !== "object" || Array.isArray(value)) return;
|
|
748
|
+
const { expanded, selected } = value;
|
|
749
|
+
if (!Array.isArray(expanded)) return;
|
|
750
|
+
return _objectSpread2({ expanded: [...new Set(expanded.filter(validPath))].slice(0, limit) }, validPath(selected) && { selected });
|
|
751
|
+
}
|
|
752
|
+
var readExplorerState = (directory) => states.get(directory);
|
|
753
|
+
/** Remember the tree of `directory`. With `notify`, a mounted explorer of that folder shows it too. */
|
|
754
|
+
function writeExplorerState(directory, state, notify = false) {
|
|
755
|
+
var _listeners$get;
|
|
756
|
+
states.set(directory, state);
|
|
757
|
+
if (notify) for (const listener of [...(_listeners$get = listeners.get(directory)) !== null && _listeners$get !== void 0 ? _listeners$get : []]) listener(state);
|
|
758
|
+
}
|
|
759
|
+
function subscribeExplorerState(directory, listener) {
|
|
760
|
+
let set = listeners.get(directory);
|
|
761
|
+
if (!set) listeners.set(directory, set = /* @__PURE__ */ new Set());
|
|
762
|
+
set.add(listener);
|
|
763
|
+
return () => {
|
|
764
|
+
set.delete(listener);
|
|
765
|
+
};
|
|
766
|
+
}
|
|
735
767
|
// src/folder-registry.ts
|
|
736
768
|
var folders = /* @__PURE__ */ new WeakMap();
|
|
737
769
|
var registrations = /* @__PURE__ */ new Set();
|
|
@@ -770,4 +802,4 @@ function followProjectFolder(vm, listener) {
|
|
|
770
802
|
unsubscribe();
|
|
771
803
|
};
|
|
772
804
|
}
|
|
773
|
-
export { unsupported as C,
|
|
805
|
+
export { unsupported as A, planExtensionSave as C, readFolder as D, projectFile as E, _objectSpread2 as M, _asyncIterator as N, readFolderUpdate as O, parseProject as S, projectChanges as T, equal as _, parseExplorerState as a, isObject as b, subscribeExplorerState as c, isProjectFolderEmpty as d, projectFolderOverwriteWarning as f, assetTypeFor as g, assetKey as h, hiddenEntry as i, _objectWithoutProperties as j, sameBytes as k, writeExplorerState as l, assertFolderUnchanged as m, registerFolder as n, readExplorerState as o, FolderError as p, editorDirectory as r, screenStateFile as s, followProjectFolder as t, createProjectFolder as u, extensionsFile as v, projectAssets as w, manifestFile as x, fileVersion 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
package/src/explorer-files.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {hiddenEntry} from './explorer-state.js';
|
|
1
2
|
type DirectoryEntries = FileSystemDirectoryHandle & {values(): AsyncIterable<FileSystemHandle>};
|
|
2
3
|
|
|
3
4
|
export class ExplorerFileError extends Error {
|
|
@@ -11,7 +12,7 @@ export function parentPath(path: string) {
|
|
|
11
12
|
}
|
|
12
13
|
|
|
13
14
|
function validateName(name: string) {
|
|
14
|
-
if (!name.trim() || name === '.' || name === '..' || name
|
|
15
|
+
if (!name.trim() || name === '.' || name === '..' || hiddenEntry(name) || /[\\/\u0000]/u.test(name)) {
|
|
15
16
|
throw new ExplorerFileError('invalidName');
|
|
16
17
|
}
|
|
17
18
|
}
|
package/src/explorer-menu.tsx
CHANGED
|
@@ -5,7 +5,7 @@ export const actionMessages = (locale = 'en') => locale.toLowerCase().startsWith
|
|
|
5
5
|
actions: 'ファイルとフォルダの操作', rename: '名前を変更…', renameTitle: '名前を変更', delete: '削除…', deleteTitle: '削除',
|
|
6
6
|
createFolder: '新規フォルダを作成', folderName: 'フォルダ名', newName: '新しい名前', cancel: 'キャンセル',
|
|
7
7
|
remove: (name: string, folder: boolean) => folder ? `「${name}」とその中身を削除しますか?` : `「${name}」を削除しますか?`,
|
|
8
|
-
stage: '
|
|
8
|
+
stage: '次のコミットに含める', unstage: '次のコミットから外す',
|
|
9
9
|
working: '処理中…', copyFailed: 'コピーできませんでした', filesOnly: 'ファイルをドロップしてください。',
|
|
10
10
|
invalidName: 'この名前は使用できません。', exists: '同じ名前のファイルまたはフォルダがあります。',
|
|
11
11
|
invalidDestination: 'このフォルダには移動できません。',
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The expanded folders and the selected entry of each project folder's explorer, for this page. It outlives the
|
|
3
|
+
* explorer, which unmounts whenever the side panel shows another view, so the tree comes back as it was left, and
|
|
4
|
+
* the Editor's screen state reads it from here when a project is saved.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
export interface ExplorerTreeState {
|
|
8
|
+
/** Folder paths relative to the project folder, such as `assets`. */
|
|
9
|
+
expanded: readonly string[];
|
|
10
|
+
/** The selected entry, a path relative to the project folder. */
|
|
11
|
+
selected?: string;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/** The folder the Editor keeps its own files in. The explorer and its search leave it out, like `.git`. */
|
|
15
|
+
export const editorDirectory = '.tw-plus';
|
|
16
|
+
/** The screen state of the Editor, inside `editorDirectory`. */
|
|
17
|
+
export const screenStateFile = 'workspace.json';
|
|
18
|
+
export const hiddenEntry = (name: string) => ['.git', editorDirectory].includes(name.toLowerCase());
|
|
19
|
+
|
|
20
|
+
const limit = 1000;
|
|
21
|
+
const states = new WeakMap<FileSystemDirectoryHandle, ExplorerTreeState>();
|
|
22
|
+
const listeners = new WeakMap<FileSystemDirectoryHandle, Set<(state: ExplorerTreeState) => void>>();
|
|
23
|
+
|
|
24
|
+
const validPath = (value: unknown): value is string => typeof value === 'string' && value.length > 0 &&
|
|
25
|
+
value.length <= 1024 && value.split('/').every(part => part && part !== '.' && part !== '..' && !hiddenEntry(part) &&
|
|
26
|
+
!/[\\\u0000]/u.test(part));
|
|
27
|
+
|
|
28
|
+
/** Read a tree state saved in a file, keeping only well-formed paths. */
|
|
29
|
+
export function parseExplorerState(value: unknown): ExplorerTreeState | undefined {
|
|
30
|
+
if (value === null || typeof value !== 'object' || Array.isArray(value)) return;
|
|
31
|
+
const {expanded, selected} = value as Record<string, unknown>;
|
|
32
|
+
if (!Array.isArray(expanded)) return;
|
|
33
|
+
return {expanded: [...new Set(expanded.filter(validPath))].slice(0, limit),
|
|
34
|
+
...(validPath(selected) && {selected})};
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export const readExplorerState = (directory: FileSystemDirectoryHandle) => states.get(directory);
|
|
38
|
+
|
|
39
|
+
/** Remember the tree of `directory`. With `notify`, a mounted explorer of that folder shows it too. */
|
|
40
|
+
export function writeExplorerState(directory: FileSystemDirectoryHandle, state: ExplorerTreeState, notify = false) {
|
|
41
|
+
states.set(directory, state);
|
|
42
|
+
if (notify) for (const listener of [...listeners.get(directory) ?? []]) listener(state);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
export function subscribeExplorerState(directory: FileSystemDirectoryHandle, listener: (state: ExplorerTreeState) => void) {
|
|
46
|
+
let set = listeners.get(directory);
|
|
47
|
+
if (!set) listeners.set(directory, set = new Set());
|
|
48
|
+
set.add(listener);
|
|
49
|
+
return () => {set.delete(listener);};
|
|
50
|
+
}
|