@kubohiroya/turbowarp-plus-editor-project-folder 0.9.1 → 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/create-folder.d.ts +4 -1
- package/dist/explorer.d.ts +5 -2
- package/dist/explorer.js +43 -22
- package/dist/index.d.ts +3 -2
- package/dist/index.js +22 -102
- package/dist/session.d.ts +4 -1
- package/dist/{shared-kI7qYraF.js → shared-Dco5rGKE.js} +1 -1
- package/dist/{shared-JdaDvk2R.js → shared-Dz9dzxQF.js} +186 -1
- package/package.json +1 -1
- package/src/create-folder.ts +118 -46
- package/src/explorer.tsx +48 -13
- package/src/index.ts +13 -4
- package/src/session.ts +8 -3
package/dist/create-folder.d.ts
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import type { Storage } from './source.js';
|
|
2
|
+
export declare function isProjectFolderEmpty(directory: FileSystemDirectoryHandle): Promise<boolean>;
|
|
3
|
+
export declare function projectFolderOverwriteWarning(locale?: string): "指定されたフォルダに保存されている内容は上書きされます" | "Contents in the selected folder will be overwritten.";
|
|
2
4
|
/** Create and validate a project-folder snapshot in a directory chosen by the user. */
|
|
3
|
-
export declare function createProjectFolder({ directory, files, storage, current }: {
|
|
5
|
+
export declare function createProjectFolder({ directory, files, storage, overwrite, current }: {
|
|
4
6
|
directory: FileSystemDirectoryHandle;
|
|
5
7
|
files: ReadonlyMap<string, Uint8Array>;
|
|
6
8
|
storage: Storage;
|
|
9
|
+
overwrite?: boolean;
|
|
7
10
|
current?: () => boolean;
|
|
8
11
|
}): Promise<import("./source.js").FolderSource>;
|
package/dist/explorer.d.ts
CHANGED
|
@@ -64,6 +64,8 @@ export type FollowFileStatuses = (directory: FileSystemDirectoryHandle, update:
|
|
|
64
64
|
type FolderViewProps = {
|
|
65
65
|
vm: object;
|
|
66
66
|
locale?: string;
|
|
67
|
+
/** Saves the current project to a local folder. */
|
|
68
|
+
createFolder?(): Promise<unknown>;
|
|
67
69
|
marks?: FollowMarks;
|
|
68
70
|
fileStatuses?: FollowFileStatuses;
|
|
69
71
|
git?: FollowExplorerGit;
|
|
@@ -76,7 +78,8 @@ export type { FileBaseline, FilePreviewRequest, ReadFileBaseline } from './file-
|
|
|
76
78
|
/**
|
|
77
79
|
* Renders the explorer of the project folder open for `vm`, for a side panel of the host: its files with what each is
|
|
78
80
|
* for, and `marks` (such as the Git status) when given. It follows the folder as it opens, closes and saves; with no
|
|
79
|
-
* folder open it offers
|
|
81
|
+
* folder open it offers to create one when the host supplies a command, or to open an existing one.
|
|
82
|
+
* It renders nothing while no project folder is mounted for `vm`.
|
|
80
83
|
* Pass the same `marks` function across renders, or the marks are followed again.
|
|
81
84
|
*/
|
|
82
|
-
export declare function renderProjectFolderExplorer(createElement: (component: any, props: any, ...children: any[]) => any,
|
|
85
|
+
export declare function renderProjectFolderExplorer(createElement: (component: any, props: any, ...children: any[]) => any, props: FolderViewProps): any;
|
package/dist/explorer.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { E as _asyncIterator, T as _objectSpread2, a as projectFolderOverwriteWarning, m as manifestFile, o as FolderError, p as isObject, t as followProjectFolder, y as projectFile } from "./shared-Dz9dzxQF.js";
|
|
2
2
|
import * as React from "react";
|
|
3
3
|
import { useEffect, useState } from "react";
|
|
4
4
|
import { createPortal } from "react-dom";
|
|
@@ -1420,7 +1420,7 @@ function createFilePreview(directory, documentId, { name, path }, locale, readBa
|
|
|
1420
1420
|
status.textContent = message.large;
|
|
1421
1421
|
return;
|
|
1422
1422
|
}
|
|
1423
|
-
const [bytes, { decodeText, mountTextFile }] = await Promise.all([file.arrayBuffer(), import("./shared-
|
|
1423
|
+
const [bytes, { decodeText, mountTextFile }] = await Promise.all([file.arrayBuffer(), import("./shared-Dco5rGKE.js")]);
|
|
1424
1424
|
if (disposed) return;
|
|
1425
1425
|
const content = decodeText(bytes);
|
|
1426
1426
|
if (content === null) {
|
|
@@ -1466,6 +1466,9 @@ var messages = {
|
|
|
1466
1466
|
empty: "This folder is empty.",
|
|
1467
1467
|
noFolder: "Open a project folder to show its files here.",
|
|
1468
1468
|
open: "Open Project Folder…",
|
|
1469
|
+
create: "Create Project Folder",
|
|
1470
|
+
creating: "Creating project folder…",
|
|
1471
|
+
createFailed: "Could not create the project folder.",
|
|
1469
1472
|
unavailable: "File tabs are unavailable in this editor layout.",
|
|
1470
1473
|
failed: "This folder could not be read.",
|
|
1471
1474
|
denied: "Permission to read this folder was not granted.",
|
|
@@ -1499,6 +1502,9 @@ var messages = {
|
|
|
1499
1502
|
empty: "このフォルダは空です。",
|
|
1500
1503
|
noFolder: "プロジェクトフォルダを開くと、ここにファイルを表示します。",
|
|
1501
1504
|
open: "プロジェクトフォルダを開く…",
|
|
1505
|
+
create: "プロジェクトフォルダを作成",
|
|
1506
|
+
creating: "プロジェクトフォルダを作成しています…",
|
|
1507
|
+
createFailed: "プロジェクトフォルダを作成できませんでした。",
|
|
1502
1508
|
unavailable: "このエディターのレイアウトではファイルをタブで開けません。",
|
|
1503
1509
|
failed: "このフォルダを読み込めません。",
|
|
1504
1510
|
denied: "このフォルダを読む許可がありません。",
|
|
@@ -1575,7 +1581,8 @@ var failure = (error, message) => error instanceof DOMException && (error.name =
|
|
|
1575
1581
|
var prefix = "twpf-explorer";
|
|
1576
1582
|
var entryDragType = "application/x-twpf-explorer-entry";
|
|
1577
1583
|
var css = `.${prefix}{font:inherit;color:inherit}
|
|
1578
|
-
.${prefix}-item{display:
|
|
1584
|
+
.${prefix}-item{display:grid;grid-template-columns:1em 20px minmax(0,1fr);align-items:center;gap:.2em .4em;
|
|
1585
|
+
width:100%;box-sizing:border-box;margin:0;border:0;border-radius:3px;
|
|
1579
1586
|
padding-block:.15em;padding-inline-end:.4em;background:none;color:inherit;font:inherit;text-align:start;cursor:pointer;white-space:nowrap}
|
|
1580
1587
|
.${prefix}-item:hover{background:rgba(128,128,128,.12)}
|
|
1581
1588
|
.${prefix}-item[aria-selected="true"]{background:rgba(128,128,128,.24)}
|
|
@@ -1585,6 +1592,7 @@ padding-block:.15em;padding-inline-end:.4em;background:none;color:inherit;font:i
|
|
|
1585
1592
|
.${prefix}-icon img{width:20px;height:20px;object-fit:contain;border-radius:2px;
|
|
1586
1593
|
background:repeating-conic-gradient(rgba(128,128,128,.22) 0 25%,transparent 0 50%) 0 0/8px 8px}
|
|
1587
1594
|
.${prefix}-icon img[hidden]{display:none}
|
|
1595
|
+
.${prefix}-label{grid-column:3;display:flex;align-items:center;gap:.4em;min-width:0}
|
|
1588
1596
|
.${prefix}-filename{display:inline-flex;min-width:0}
|
|
1589
1597
|
.${prefix}-name{overflow:hidden;text-overflow:ellipsis}
|
|
1590
1598
|
.${prefix}-item[data-staged] .${prefix}-filename{font-weight:700}
|
|
@@ -1593,7 +1601,9 @@ background:repeating-conic-gradient(rgba(128,128,128,.22) 0 25%,transparent 0 50
|
|
|
1593
1601
|
.${prefix}-item[data-revision="merged"] .${prefix}-filename{color:#17603e;color:light-dark(#17603e,#85e3ad)}
|
|
1594
1602
|
.${prefix}-unsaved{flex:none}
|
|
1595
1603
|
.${prefix}-mark{flex:none;font-size:.85em;padding:0 .3em;border:1px solid currentColor;border-radius:3px;opacity:.85}
|
|
1596
|
-
.${prefix}-description{
|
|
1604
|
+
.${prefix}-description{grid-column:3;min-width:0;padding:.2em .4em;border-radius:3px;background:rgba(128,128,128,.12);
|
|
1605
|
+
color:inherit;color:color-mix(in srgb,currentColor 78%,transparent);font-size:.75em;line-height:1.4;
|
|
1606
|
+
white-space:normal;overflow-wrap:anywhere}
|
|
1597
1607
|
.${prefix}-status{opacity:.7;font-style:italic;padding-block:.15em}
|
|
1598
1608
|
.${prefix}-empty{padding:.5em}
|
|
1599
1609
|
.${prefix}-empty p{margin:0 0 .6em}
|
|
@@ -2132,7 +2142,7 @@ function Explorer({ directory, locale, descriptions, marks, fileStatuses, unsave
|
|
|
2132
2142
|
"data-path": data === null || data === void 0 ? void 0 : data.path,
|
|
2133
2143
|
"data-staged": (status === null || status === void 0 ? void 0 : status.staged) ? "" : void 0,
|
|
2134
2144
|
"data-revision": status === null || status === void 0 ? void 0 : status.revision,
|
|
2135
|
-
title:
|
|
2145
|
+
title: accessibleName || void 0,
|
|
2136
2146
|
"data-drop-directory": (entry === null || entry === void 0 ? void 0 : entry.kind) === "directory" ? entry.path : entry ? parentPath(entry.path) : void 0,
|
|
2137
2147
|
"data-drop-active": (entry === null || entry === void 0 ? void 0 : entry.kind) === "directory" && drag === entry.path ? "" : void 0,
|
|
2138
2148
|
"data-move-directory": (entry === null || entry === void 0 ? void 0 : entry.kind) === "directory" ? entry.path : void 0,
|
|
@@ -2155,13 +2165,13 @@ function Explorer({ directory, locale, descriptions, marks, fileStatuses, unsave
|
|
|
2155
2165
|
kind: icon,
|
|
2156
2166
|
path: data.path,
|
|
2157
2167
|
readFile: icon === "image" ? readFile : void 0
|
|
2158
|
-
}) : null, /* @__PURE__ */ React.createElement("span", { className: `${prefix}-filename` }, /* @__PURE__ */ React.createElement("span", { className: `${prefix}-name` }, item.getItemName()), unsaved ? /* @__PURE__ */ React.createElement("span", {
|
|
2168
|
+
}) : null, /* @__PURE__ */ React.createElement("span", { className: `${prefix}-label` }, /* @__PURE__ */ React.createElement("span", { className: `${prefix}-filename` }, /* @__PURE__ */ React.createElement("span", { className: `${prefix}-name` }, item.getItemName()), unsaved ? /* @__PURE__ */ React.createElement("span", {
|
|
2159
2169
|
className: `${prefix}-unsaved`,
|
|
2160
2170
|
"aria-hidden": "true"
|
|
2161
2171
|
}, "*") : null), markLabel ? /* @__PURE__ */ React.createElement("span", {
|
|
2162
2172
|
className: `${prefix}-mark`,
|
|
2163
2173
|
"aria-hidden": "true"
|
|
2164
|
-
}, markLabel) : null, description ? /* @__PURE__ */ React.createElement("span", {
|
|
2174
|
+
}, markLabel) : null), description ? /* @__PURE__ */ React.createElement("span", {
|
|
2165
2175
|
className: `${prefix}-description`,
|
|
2166
2176
|
"aria-hidden": "true"
|
|
2167
2177
|
}, description) : null)];
|
|
@@ -2264,8 +2274,22 @@ function ProjectFolderExplorer(props) {
|
|
|
2264
2274
|
return /* @__PURE__ */ React.createElement(Explorer, _objectSpread2({ key: keyFor(props.directory) }, props));
|
|
2265
2275
|
}
|
|
2266
2276
|
var readJson = async (directory, name) => JSON.parse(await (await (await directory.getFileHandle(name)).getFile()).text());
|
|
2267
|
-
function FolderView({ vm, locale = "en", marks: followMarks, fileStatuses: followStatuses, git: followGit, openFile, readBaseline }) {
|
|
2277
|
+
function FolderView({ vm, locale = "en", marks: followMarks, fileStatuses: followStatuses, git: followGit, openFile, readBaseline, createFolder }) {
|
|
2268
2278
|
const message = messagesFor(locale);
|
|
2279
|
+
const [creating, setCreating] = React.useState(false);
|
|
2280
|
+
const [createError, setCreateError] = React.useState("");
|
|
2281
|
+
const create = async () => {
|
|
2282
|
+
if (!createFolder || creating) return;
|
|
2283
|
+
setCreating(true);
|
|
2284
|
+
setCreateError("");
|
|
2285
|
+
try {
|
|
2286
|
+
await createFolder();
|
|
2287
|
+
} catch (_unused4) {
|
|
2288
|
+
setCreateError(message.createFailed);
|
|
2289
|
+
} finally {
|
|
2290
|
+
setCreating(false);
|
|
2291
|
+
}
|
|
2292
|
+
};
|
|
2269
2293
|
const [{ folder, directory, version }, setFollowed] = React.useState({
|
|
2270
2294
|
directory: null,
|
|
2271
2295
|
version: 0
|
|
@@ -2341,10 +2365,14 @@ function FolderView({ vm, locale = "en", marks: followMarks, fileStatuses: follo
|
|
|
2341
2365
|
}));
|
|
2342
2366
|
}, [directory, followGit]);
|
|
2343
2367
|
if (!folder) return null;
|
|
2344
|
-
if (!directory) return /* @__PURE__ */ React.createElement("div", { className: `${prefix}-empty` }, /* @__PURE__ */ React.createElement("style", null, css), /* @__PURE__ */ React.createElement("p", null,
|
|
2368
|
+
if (!directory) return /* @__PURE__ */ React.createElement("div", { className: `${prefix}-empty` }, /* @__PURE__ */ React.createElement("style", null, css), createFolder ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("p", null, projectFolderOverwriteWarning(locale)), /* @__PURE__ */ React.createElement("button", {
|
|
2345
2369
|
type: "button",
|
|
2346
|
-
|
|
2347
|
-
|
|
2370
|
+
disabled: creating,
|
|
2371
|
+
onClick: () => void create()
|
|
2372
|
+
}, message.create), creating && /* @__PURE__ */ React.createElement("p", { role: "status" }, message.creating), createError && /* @__PURE__ */ React.createElement("p", { role: "alert" }, createError)) : /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("p", null, message.noFolder), /* @__PURE__ */ React.createElement("button", {
|
|
2373
|
+
type: "button",
|
|
2374
|
+
onClick: () => folder.open(locale)
|
|
2375
|
+
}, message.open)));
|
|
2348
2376
|
return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ProjectFolderExplorer, {
|
|
2349
2377
|
directory,
|
|
2350
2378
|
locale,
|
|
@@ -2368,18 +2396,11 @@ function FolderView({ vm, locale = "en", marks: followMarks, fileStatuses: follo
|
|
|
2368
2396
|
/**
|
|
2369
2397
|
* Renders the explorer of the project folder open for `vm`, for a side panel of the host: its files with what each is
|
|
2370
2398
|
* for, and `marks` (such as the Git status) when given. It follows the folder as it opens, closes and saves; with no
|
|
2371
|
-
* folder open it offers
|
|
2399
|
+
* folder open it offers to create one when the host supplies a command, or to open an existing one.
|
|
2400
|
+
* It renders nothing while no project folder is mounted for `vm`.
|
|
2372
2401
|
* Pass the same `marks` function across renders, or the marks are followed again.
|
|
2373
2402
|
*/
|
|
2374
|
-
function renderProjectFolderExplorer(createElement,
|
|
2375
|
-
return createElement(FolderView,
|
|
2376
|
-
vm,
|
|
2377
|
-
locale,
|
|
2378
|
-
marks,
|
|
2379
|
-
fileStatuses,
|
|
2380
|
-
git,
|
|
2381
|
-
openFile,
|
|
2382
|
-
readBaseline
|
|
2383
|
-
});
|
|
2403
|
+
function renderProjectFolderExplorer(createElement, props) {
|
|
2404
|
+
return createElement(FolderView, props);
|
|
2384
2405
|
}
|
|
2385
2406
|
export { ProjectFolderExplorer, describeProjectFolder, renderProjectFolderExplorer };
|
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;
|
|
@@ -29,8 +29,9 @@ export declare function mountProjectFolder({ vm, document, host, locale, autoRel
|
|
|
29
29
|
status: "saved" | "unchanged";
|
|
30
30
|
sourceRemoved: string[];
|
|
31
31
|
}>;
|
|
32
|
-
createFromSnapshot({ prepareFiles, directory, current }: {
|
|
32
|
+
createFromSnapshot({ prepareFiles, collectEdits, directory, current }: {
|
|
33
33
|
prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>;
|
|
34
|
+
collectEdits?: () => Promise<void>;
|
|
34
35
|
directory?: FileSystemDirectoryHandle;
|
|
35
36
|
current?: () => boolean;
|
|
36
37
|
}): 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) => {
|
|
@@ -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(
|
|
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
|
-
|
|
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
|
-
|
|
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(
|
|
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
|
};
|
|
@@ -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 };
|
package/package.json
CHANGED
package/src/create-folder.ts
CHANGED
|
@@ -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
|
|
14
|
-
for await (const _entry of (directory as IterableDirectory).values())
|
|
15
|
-
|
|
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
|
|
38
|
-
|
|
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
|
-
|
|
48
|
-
|
|
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
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
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
|
-
|
|
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
|
-
|
|
77
|
-
|
|
78
|
-
if (
|
|
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
|
-
|
|
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
|
-
|
|
86
|
-
|
|
87
|
-
|
|
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();
|
package/src/explorer.tsx
CHANGED
|
@@ -3,6 +3,7 @@ import {asyncDataLoaderFeature, hotkeysCoreFeature, selectionFeature} from '@hea
|
|
|
3
3
|
import type {ItemInstance} from '@headless-tree/core';
|
|
4
4
|
import {useTree} from '@headless-tree/react/react17';
|
|
5
5
|
import {FolderError, isObject, manifestFile, projectFile} from './source.js';
|
|
6
|
+
import {projectFolderOverwriteWarning} from './create-folder.js';
|
|
6
7
|
import {followProjectFolder} from './folder-registry.js';
|
|
7
8
|
import type {ExplorerMutation, FollowedFolder} from './folder-registry.js';
|
|
8
9
|
import type {Json, Project} from './source.js';
|
|
@@ -52,6 +53,8 @@ const messages = {
|
|
|
52
53
|
en: {
|
|
53
54
|
label: 'Project folder', loading: 'Loading…', empty: 'This folder is empty.',
|
|
54
55
|
noFolder: 'Open a project folder to show its files here.', open: 'Open Project Folder…',
|
|
56
|
+
create: 'Create Project Folder', creating: 'Creating project folder…',
|
|
57
|
+
createFailed: 'Could not create the project folder.',
|
|
55
58
|
unavailable: 'File tabs are unavailable in this editor layout.',
|
|
56
59
|
failed: 'This folder could not be read.', denied: 'Permission to read this folder was not granted.',
|
|
57
60
|
separator: ', ',
|
|
@@ -68,6 +71,8 @@ const messages = {
|
|
|
68
71
|
ja: {
|
|
69
72
|
label: '作品フォルダ', loading: '読み込んでいます…', empty: 'このフォルダは空です。',
|
|
70
73
|
noFolder: 'プロジェクトフォルダを開くと、ここにファイルを表示します。', open: 'プロジェクトフォルダを開く…',
|
|
74
|
+
create: 'プロジェクトフォルダを作成', creating: 'プロジェクトフォルダを作成しています…',
|
|
75
|
+
createFailed: 'プロジェクトフォルダを作成できませんでした。',
|
|
71
76
|
unavailable: 'このエディターのレイアウトではファイルをタブで開けません。',
|
|
72
77
|
failed: 'このフォルダを読み込めません。', denied: 'このフォルダを読む許可がありません。',
|
|
73
78
|
separator: '、',
|
|
@@ -146,7 +151,8 @@ const prefix = 'twpf-explorer';
|
|
|
146
151
|
const entryDragType = 'application/x-twpf-explorer-entry';
|
|
147
152
|
// Colors come from the host's text color, so the tree follows light and dark themes.
|
|
148
153
|
const css = `.${prefix}{font:inherit;color:inherit}
|
|
149
|
-
.${prefix}-item{display:
|
|
154
|
+
.${prefix}-item{display:grid;grid-template-columns:1em 20px minmax(0,1fr);align-items:center;gap:.2em .4em;
|
|
155
|
+
width:100%;box-sizing:border-box;margin:0;border:0;border-radius:3px;
|
|
150
156
|
padding-block:.15em;padding-inline-end:.4em;background:none;color:inherit;font:inherit;text-align:start;cursor:pointer;white-space:nowrap}
|
|
151
157
|
.${prefix}-item:hover{background:rgba(128,128,128,.12)}
|
|
152
158
|
.${prefix}-item[aria-selected="true"]{background:rgba(128,128,128,.24)}
|
|
@@ -156,6 +162,7 @@ padding-block:.15em;padding-inline-end:.4em;background:none;color:inherit;font:i
|
|
|
156
162
|
.${prefix}-icon img{width:20px;height:20px;object-fit:contain;border-radius:2px;
|
|
157
163
|
background:repeating-conic-gradient(rgba(128,128,128,.22) 0 25%,transparent 0 50%) 0 0/8px 8px}
|
|
158
164
|
.${prefix}-icon img[hidden]{display:none}
|
|
165
|
+
.${prefix}-label{grid-column:3;display:flex;align-items:center;gap:.4em;min-width:0}
|
|
159
166
|
.${prefix}-filename{display:inline-flex;min-width:0}
|
|
160
167
|
.${prefix}-name{overflow:hidden;text-overflow:ellipsis}
|
|
161
168
|
.${prefix}-item[data-staged] .${prefix}-filename{font-weight:700}
|
|
@@ -164,7 +171,9 @@ background:repeating-conic-gradient(rgba(128,128,128,.22) 0 25%,transparent 0 50
|
|
|
164
171
|
.${prefix}-item[data-revision="merged"] .${prefix}-filename{color:#17603e;color:light-dark(#17603e,#85e3ad)}
|
|
165
172
|
.${prefix}-unsaved{flex:none}
|
|
166
173
|
.${prefix}-mark{flex:none;font-size:.85em;padding:0 .3em;border:1px solid currentColor;border-radius:3px;opacity:.85}
|
|
167
|
-
.${prefix}-description{
|
|
174
|
+
.${prefix}-description{grid-column:3;min-width:0;padding:.2em .4em;border-radius:3px;background:rgba(128,128,128,.12);
|
|
175
|
+
color:inherit;color:color-mix(in srgb,currentColor 78%,transparent);font-size:.75em;line-height:1.4;
|
|
176
|
+
white-space:normal;overflow-wrap:anywhere}
|
|
168
177
|
.${prefix}-status{opacity:.7;font-style:italic;padding-block:.15em}
|
|
169
178
|
.${prefix}-empty{padding:.5em}
|
|
170
179
|
.${prefix}-empty p{margin:0 0 .6em}
|
|
@@ -567,7 +576,7 @@ function Explorer({directory, locale, descriptions, marks, fileStatuses, unsaved
|
|
|
567
576
|
<button {...itemProps} key={item.getId()} type="button" aria-label={accessibleName}
|
|
568
577
|
className={`${prefix}-item${data?.kind === 'error' ? ` ${prefix}-error` : ''}`} style={indent(level)}
|
|
569
578
|
data-path={data?.path} data-staged={status?.staged ? '' : undefined} data-revision={status?.revision}
|
|
570
|
-
title={
|
|
579
|
+
title={accessibleName || undefined}
|
|
571
580
|
data-drop-directory={entry?.kind === 'directory' ? entry.path : entry ? parentPath(entry.path) : undefined}
|
|
572
581
|
data-drop-active={entry?.kind === 'directory' && drag === entry.path ? '' : undefined}
|
|
573
582
|
data-move-directory={entry?.kind === 'directory' ? entry.path : undefined}
|
|
@@ -584,11 +593,13 @@ function Explorer({directory, locale, descriptions, marks, fileStatuses, unsaved
|
|
|
584
593
|
} : itemProps.onKeyDown}>
|
|
585
594
|
<span className={`${prefix}-caret`} aria-hidden="true">{folder ? (expanded ? '▾' : '▸') : ''}</span>
|
|
586
595
|
{icon ? <Icon kind={icon} path={data!.path} readFile={icon === 'image' ? readFile : undefined} /> : null}
|
|
587
|
-
<span className={`${prefix}-
|
|
588
|
-
<span className={`${prefix}-
|
|
589
|
-
|
|
596
|
+
<span className={`${prefix}-label`}>
|
|
597
|
+
<span className={`${prefix}-filename`}>
|
|
598
|
+
<span className={`${prefix}-name`}>{item.getItemName()}</span>
|
|
599
|
+
{unsaved ? <span className={`${prefix}-unsaved`} aria-hidden="true">*</span> : null}
|
|
600
|
+
</span>
|
|
601
|
+
{markLabel ? <span className={`${prefix}-mark`} aria-hidden="true">{markLabel}</span> : null}
|
|
590
602
|
</span>
|
|
591
|
-
{markLabel ? <span className={`${prefix}-mark`} aria-hidden="true">{markLabel}</span> : null}
|
|
592
603
|
{description ? <span className={`${prefix}-description`} aria-hidden="true">{description}</span> : null}
|
|
593
604
|
</button>
|
|
594
605
|
];
|
|
@@ -677,6 +688,8 @@ export type FollowFileStatuses = (directory: FileSystemDirectoryHandle,
|
|
|
677
688
|
type FolderViewProps = {
|
|
678
689
|
vm: object;
|
|
679
690
|
locale?: string;
|
|
691
|
+
/** Saves the current project to a local folder. */
|
|
692
|
+
createFolder?(): Promise<unknown>;
|
|
680
693
|
marks?: FollowMarks;
|
|
681
694
|
fileStatuses?: FollowFileStatuses;
|
|
682
695
|
git?: FollowExplorerGit;
|
|
@@ -691,8 +704,22 @@ const readJson = async (directory: FileSystemDirectoryHandle, name: string): Pro
|
|
|
691
704
|
JSON.parse(await (await (await directory.getFileHandle(name)).getFile()).text());
|
|
692
705
|
|
|
693
706
|
function FolderView({vm, locale = 'en', marks: followMarks, fileStatuses: followStatuses, git: followGit,
|
|
694
|
-
openFile, readBaseline}: FolderViewProps) {
|
|
707
|
+
openFile, readBaseline, createFolder}: FolderViewProps) {
|
|
695
708
|
const message = messagesFor(locale);
|
|
709
|
+
const [creating, setCreating] = React.useState(false);
|
|
710
|
+
const [createError, setCreateError] = React.useState('');
|
|
711
|
+
const create = async () => {
|
|
712
|
+
if (!createFolder || creating) return;
|
|
713
|
+
setCreating(true);
|
|
714
|
+
setCreateError('');
|
|
715
|
+
try {
|
|
716
|
+
await createFolder();
|
|
717
|
+
} catch {
|
|
718
|
+
setCreateError(message.createFailed);
|
|
719
|
+
} finally {
|
|
720
|
+
setCreating(false);
|
|
721
|
+
}
|
|
722
|
+
};
|
|
696
723
|
const [{folder, directory, version}, setFollowed] = React.useState<{
|
|
697
724
|
folder?: FollowedFolder; directory: FileSystemDirectoryHandle | null; version: number;
|
|
698
725
|
}>({directory: null, version: 0});
|
|
@@ -746,8 +773,15 @@ function FolderView({vm, locale = 'en', marks: followMarks, fileStatuses: follow
|
|
|
746
773
|
if (!directory) {
|
|
747
774
|
return <div className={`${prefix}-empty`}>
|
|
748
775
|
<style>{css}</style>
|
|
749
|
-
|
|
750
|
-
|
|
776
|
+
{createFolder ? <>
|
|
777
|
+
<p>{projectFolderOverwriteWarning(locale)}</p>
|
|
778
|
+
<button type="button" disabled={creating} onClick={() => void create()}>{message.create}</button>
|
|
779
|
+
{creating && <p role="status">{message.creating}</p>}
|
|
780
|
+
{createError && <p role="alert">{createError}</p>}
|
|
781
|
+
</> : <>
|
|
782
|
+
<p>{message.noFolder}</p>
|
|
783
|
+
<button type="button" onClick={() => folder.open(locale)}>{message.open}</button>
|
|
784
|
+
</>}
|
|
751
785
|
</div>;
|
|
752
786
|
}
|
|
753
787
|
return <>
|
|
@@ -767,10 +801,11 @@ function FolderView({vm, locale = 'en', marks: followMarks, fileStatuses: follow
|
|
|
767
801
|
/**
|
|
768
802
|
* Renders the explorer of the project folder open for `vm`, for a side panel of the host: its files with what each is
|
|
769
803
|
* for, and `marks` (such as the Git status) when given. It follows the folder as it opens, closes and saves; with no
|
|
770
|
-
* folder open it offers
|
|
804
|
+
* folder open it offers to create one when the host supplies a command, or to open an existing one.
|
|
805
|
+
* It renders nothing while no project folder is mounted for `vm`.
|
|
771
806
|
* Pass the same `marks` function across renders, or the marks are followed again.
|
|
772
807
|
*/
|
|
773
808
|
export function renderProjectFolderExplorer(createElement: (component: any, props: any, ...children: any[]) => any,
|
|
774
|
-
|
|
775
|
-
return createElement(FolderView,
|
|
809
|
+
props: FolderViewProps) {
|
|
810
|
+
return createElement(FolderView, props);
|
|
776
811
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {FolderError} from './source.js';
|
|
2
2
|
import {createFolderSession} from './session.js';
|
|
3
|
+
import {isProjectFolderEmpty} from './create-folder.js';
|
|
3
4
|
import {registerFolder} from './folder-registry.js';
|
|
4
5
|
import type {FolderHost, FolderVM, PickerWindow} from './session.js';
|
|
5
6
|
|
|
@@ -8,7 +9,7 @@ export type {ReloadTarget} from './block-reload.js';
|
|
|
8
9
|
export {followProjectFolder} from './folder-registry.js';
|
|
9
10
|
export type {FollowedFolder} from './folder-registry.js';
|
|
10
11
|
export type {DeserializeBlocks} from './script-reload.js';
|
|
11
|
-
export {createProjectFolder} from './create-folder.js';
|
|
12
|
+
export {createProjectFolder, projectFolderOverwriteWarning} from './create-folder.js';
|
|
12
13
|
|
|
13
14
|
const messages = {
|
|
14
15
|
en: {
|
|
@@ -262,15 +263,23 @@ export function mountProjectFolder({vm, document, host, locale = 'en', autoReloa
|
|
|
262
263
|
openDirectory: (...args: Parameters<typeof session.openDirectory>) =>
|
|
263
264
|
session.openDirectory(...args).finally(renderReload),
|
|
264
265
|
save: () => session.save().finally(renderReload),
|
|
265
|
-
createFromSnapshot({prepareFiles, directory, current = () => true}: {
|
|
266
|
+
createFromSnapshot({prepareFiles, collectEdits, directory, current = () => true}: {
|
|
266
267
|
prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>;
|
|
268
|
+
collectEdits?: () => Promise<void>;
|
|
267
269
|
directory?: FileSystemDirectoryHandle;
|
|
268
270
|
current?: () => boolean;
|
|
269
271
|
}) {
|
|
272
|
+
const message = locale.startsWith('ja') ?
|
|
273
|
+
'指定されたフォルダは空ではありません。フォルダに保存されている内容が上書きされる場合があります。よろしいですか?' :
|
|
274
|
+
'The selected folder is not empty. Contents in the folder may be overwritten. Continue?';
|
|
270
275
|
return session.createFromSnapshot(async () => {
|
|
271
|
-
if (directory) return directory;
|
|
272
276
|
try {
|
|
273
|
-
|
|
277
|
+
const selected = directory ?? await pickDirectory.call(view, {id: 'turbowarp-plus-project-folder', mode: 'readwrite'});
|
|
278
|
+
if (!current()) return null;
|
|
279
|
+
const overwrite = !await isProjectFolderEmpty(selected);
|
|
280
|
+
if (!current() || (overwrite && !view.confirm(message))) return null;
|
|
281
|
+
await collectEdits?.();
|
|
282
|
+
return current() ? {directory: selected, overwrite} : null;
|
|
274
283
|
} catch (error) {
|
|
275
284
|
if (error instanceof DOMException && error.name === 'AbortError') return null;
|
|
276
285
|
throw error;
|
package/src/session.ts
CHANGED
|
@@ -417,18 +417,23 @@ export function createFolderSession(vm: FolderVM, host: FolderHost) {
|
|
|
417
417
|
openDirectory(directory: FileSystemDirectoryHandle, confirmReplace: () => boolean): Promise<OpenResult> {
|
|
418
418
|
return openFrom(() => Promise.resolve(directory), confirmReplace);
|
|
419
419
|
},
|
|
420
|
-
createFromSnapshot(
|
|
420
|
+
createFromSnapshot(selectDestination: () => Promise<{directory: FileSystemDirectoryHandle; overwrite: boolean} | null>,
|
|
421
421
|
prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>, isCurrent: () => boolean): Promise<OpenResult> {
|
|
422
422
|
const stage = vm.runtime.getTargetForStage();
|
|
423
423
|
let savedRevision: number | undefined;
|
|
424
424
|
const currentProject = () => !disposed && vm.runtime.getTargetForStage() === stage &&
|
|
425
425
|
(savedRevision === undefined || revision === savedRevision) && isCurrent();
|
|
426
|
-
|
|
426
|
+
let overwrite = false;
|
|
427
|
+
return openFrom(async () => {
|
|
428
|
+
const destination = await selectDestination();
|
|
429
|
+
overwrite = destination?.overwrite ?? false;
|
|
430
|
+
return destination?.directory ?? null;
|
|
431
|
+
}, currentProject, async directory => {
|
|
427
432
|
if (!currentProject()) return null;
|
|
428
433
|
savedRevision = revision;
|
|
429
434
|
const files = await prepareFiles();
|
|
430
435
|
if (!currentProject()) return null;
|
|
431
|
-
return createProjectFolder({directory, files, storage: vm.runtime.storage, current: currentProject});
|
|
436
|
+
return createProjectFolder({directory, files, storage: vm.runtime.storage, overwrite, current: currentProject});
|
|
432
437
|
}, currentProject);
|
|
433
438
|
},
|
|
434
439
|
async save(): Promise<SaveResult> {
|