@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/src/session.ts CHANGED
@@ -90,6 +90,13 @@ type SaveResult = {status: 'saved' | 'unchanged'; sourceRemoved: string[]};
90
90
  type SaveDirectory = {directory: FileSystemDirectoryHandle; files: Map<string, Uint8Array>; prefix: string};
91
91
 
92
92
  type VMAsset = {assetId: string; dataFormat: string; data?: Uint8Array};
93
+ const encodeJson = (value: unknown) => new TextEncoder().encode(`${JSON.stringify(value, null, 2)}\n`);
94
+
95
+ function saveManifest(source: FolderSource, added: Iterable<string>, removed: readonly string[]) {
96
+ const value = JSON.parse(new TextDecoder().decode(source.files.get(manifestFile))) as JsonObject;
97
+ const entries = (value.archiveEntries as string[]).filter(name => !removed.includes(name));
98
+ return encodeJson({...value, archiveEntries: [...entries, ...added]});
99
+ }
93
100
 
94
101
  export function createFolderSession(vm: FolderVM, host: FolderHost) {
95
102
  let current: Session | null = null;
@@ -285,6 +292,29 @@ export function createFolderSession(vm: FolderVM, host: FolderHost) {
285
292
  }
286
293
  return paths;
287
294
  },
295
+ /** The bytes the next save would write, null for a deletion, or undefined when no preview is available. */
296
+ readUnsavedFile(path: string): Uint8Array | null | undefined {
297
+ if (!current || busy) return;
298
+ try {
299
+ const {result, extensionSave, added, removed} = planSave(current, snapshot());
300
+ if (path === projectFile && result) return encodeJson(extensionSave.project);
301
+ if (path === extensionsFile && extensionSave.manifestChanged) return encodeJson(extensionSave.embedded);
302
+ if (path === manifestFile && (added.length || removed.length))
303
+ return saveManifest(current.source, added.map(([name]) => name), removed);
304
+ if (path.startsWith('assets/')) {
305
+ const name = path.slice('assets/'.length);
306
+ if (removed.includes(name)) return null;
307
+ const kind = added.find(([asset]) => asset === name)?.[1];
308
+ if (kind) return assetData(name, kind) ?? undefined;
309
+ }
310
+ if (path.startsWith('extensions/')) {
311
+ const name = path.slice('extensions/'.length);
312
+ return extensionSave.removed.includes(name) ? null : extensionSave.writes.get(name);
313
+ }
314
+ } catch (error) {
315
+ if (!(error instanceof FolderError)) throw error;
316
+ }
317
+ },
288
318
  get canSave() {return current !== null;},
289
319
  get busy() {return busy;},
290
320
  get reloadState() {return reloadState();},
@@ -417,18 +447,23 @@ export function createFolderSession(vm: FolderVM, host: FolderHost) {
417
447
  openDirectory(directory: FileSystemDirectoryHandle, confirmReplace: () => boolean): Promise<OpenResult> {
418
448
  return openFrom(() => Promise.resolve(directory), confirmReplace);
419
449
  },
420
- createFromSnapshot(getDirectory: () => Promise<FileSystemDirectoryHandle | null>,
450
+ createFromSnapshot(selectDestination: () => Promise<{directory: FileSystemDirectoryHandle; overwrite: boolean} | null>,
421
451
  prepareFiles: () => Promise<ReadonlyMap<string, Uint8Array>>, isCurrent: () => boolean): Promise<OpenResult> {
422
452
  const stage = vm.runtime.getTargetForStage();
423
453
  let savedRevision: number | undefined;
424
454
  const currentProject = () => !disposed && vm.runtime.getTargetForStage() === stage &&
425
455
  (savedRevision === undefined || revision === savedRevision) && isCurrent();
426
- return openFrom(getDirectory, currentProject, async directory => {
456
+ let overwrite = false;
457
+ return openFrom(async () => {
458
+ const destination = await selectDestination();
459
+ overwrite = destination?.overwrite ?? false;
460
+ return destination?.directory ?? null;
461
+ }, currentProject, async directory => {
427
462
  if (!currentProject()) return null;
428
463
  savedRevision = revision;
429
464
  const files = await prepareFiles();
430
465
  if (!currentProject()) return null;
431
- return createProjectFolder({directory, files, storage: vm.runtime.storage, current: currentProject});
466
+ return createProjectFolder({directory, files, storage: vm.runtime.storage, overwrite, current: currentProject});
432
467
  }, currentProject);
433
468
  },
434
469
  async save(): Promise<SaveResult> {
@@ -458,14 +493,7 @@ export function createFolderSession(vm: FolderVM, host: FolderHost) {
458
493
  notify();
459
494
  return {status: 'unchanged', sourceRemoved: []};
460
495
  }
461
- const encoder = new TextEncoder();
462
- let manifest: Uint8Array | null = null;
463
- if (added.size || removed.length) {
464
- const value = JSON.parse(new TextDecoder().decode(source.files.get(manifestFile))) as JsonObject;
465
- const entries = (value.archiveEntries as string[]).filter(name => !removed.includes(name));
466
- value.archiveEntries = [...entries, ...added.keys()];
467
- manifest = encoder.encode(`${JSON.stringify(value, null, 2)}\n`);
468
- }
496
+ const manifest = added.size || removed.length ? saveManifest(source, added.keys(), removed) : null;
469
497
  const root = {directory: source.directory, files: source.files, prefix: ''};
470
498
  const assets = {directory: await source.directory.getDirectoryHandle('assets', {create: true}), files: source.bytes, prefix: 'assets/'};
471
499
  const extensions = {directory: await source.directory.getDirectoryHandle('extensions', {create: true}),
@@ -522,9 +550,9 @@ export function createFolderSession(vm: FolderVM, host: FolderHost) {
522
550
  for (const [name, data] of extensionSave.writes) await write(extensions, name, data);
523
551
  if (manifest) await write(root, manifestFile, manifest);
524
552
  if (extensionSave.manifestChanged) {
525
- await write(root, extensionsFile, encoder.encode(`${JSON.stringify(extensionSave.embedded, null, 2)}\n`));
553
+ await write(root, extensionsFile, encodeJson(extensionSave.embedded));
526
554
  }
527
- if (result) await write(root, projectFile, encoder.encode(`${JSON.stringify(extensionSave.project, null, 2)}\n`));
555
+ if (result) await write(root, projectFile, encodeJson(extensionSave.project));
528
556
  } catch (error) {
529
557
  for (const restore of undo.reverse()) await restore().catch(() => {});
530
558
  throw error;
@@ -120,6 +120,8 @@ type TextFileOptions = {
120
120
  readHandle(): Promise<FileSystemFileHandle>;
121
121
  readBaseline?(): Promise<FileBaseline | null>;
122
122
  close(): void;
123
+ hostSaveShortcut?: boolean;
124
+ onDirtyChange?(): void;
123
125
  };
124
126
 
125
127
  export function mountTextFile(parent: HTMLElement, options: TextFileOptions) {
@@ -199,15 +201,21 @@ export function mountTextFile(parent: HTMLElement, options: TextFileOptions) {
199
201
  common, mixed ? EditorState.lineSeparator.of('\n') : [], history(), drawSelection(), highlightSpecialChars(),
200
202
  highlightActiveLine(), EditorView.contentAttributes.of({'aria-label': options.path}),
201
203
  keymap.of([...defaultKeymap, ...historyKeymap]),
202
- EditorView.updateListener.of(update => {if (update.docChanged) updateSaveState();})
204
+ EditorView.updateListener.of(update => {if (update.docChanged) updateSaveState(undefined, true);})
203
205
  ]
204
206
  });
205
207
  const dirty = () => !view.state.doc.eq(savedDoc);
206
208
  const serialize = () => bom + (newline === '\n' ? view.state.doc.toString() : view.state.doc.toString().replace(/\n/gu, newline));
207
209
 
208
- function updateSaveState(text = saving ? message.saving : dirty() ? message.unsaved : '') {
209
- saveButton.disabled = saving || !dirty();
210
+ let wasDirty = false;
211
+ function updateSaveState(text = saving ? message.saving : dirty() ? message.unsaved : '', contentChanged = false) {
212
+ const isDirty = dirty();
213
+ saveButton.disabled = saving || !isDirty;
210
214
  setStatus(status, text);
215
+ if (isDirty !== wasDirty || contentChanged && isDirty) {
216
+ wasDirty = isDirty;
217
+ options.onDirtyChange?.();
218
+ }
211
219
  }
212
220
 
213
221
  async function unchanged(handle: FileSystemFileHandle) {
@@ -334,6 +342,8 @@ export function mountTextFile(parent: HTMLElement, options: TextFileOptions) {
334
342
  };
335
343
  panel.addEventListener('keydown', event => {
336
344
  if (!(event.metaKey || event.ctrlKey) || event.key.toLowerCase() !== 's') return;
345
+ // Let the main window's save shortcut choose the target when the host manages it.
346
+ if (options.hostSaveShortcut && panel.ownerDocument === document) return;
337
347
  event.preventDefault();
338
348
  event.stopPropagation();
339
349
  void save();
@@ -342,6 +352,9 @@ export function mountTextFile(parent: HTMLElement, options: TextFileOptions) {
342
352
  showDiff(false);
343
353
  updateSaveState();
344
354
  return {
355
+ save,
356
+ isDirty: dirty,
357
+ readUnsaved: () => !disposed && dirty() ? encoder.encode(serialize()) : undefined,
345
358
  requestClose() {
346
359
  if (!saving && (!dirty() || browser?.confirm(message.close))) options.close();
347
360
  },