@kubohiroya/turbowarp-plus-editor-project-folder 0.10.0 → 0.12.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/dist/index.js CHANGED
@@ -1,6 +1,6 @@
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";
1
+ import { A as projectFile, C as isObject, D as planExtensionSave, E as parseProject, I as _objectWithoutProperties, L as _objectSpread2, M as readFolderUpdate, N as sameBytes, O as projectAssets, P as unsupported, S as fileVersion, T as paletteFile, _ as collapsePalette, a as projectFolderOverwriteWarning, b as expandPalette, c as parseExplorerState, d as subscribeExplorerState, f as writeExplorerState, g as assetTypeFor, h as assetKey, i as isProjectFolderEmpty, j as readFolder, k as projectChanges, l as readExplorerState, m as assertFolderUnchanged, n as registerFolder, o as editorDirectory, p as FolderError, r as createProjectFolder, t as followProjectFolder, u as screenStateFile, v as encodePalette, w as manifestFile, x as extensionsFile, y as equal } from "./shared-cwwWtggC.js";
2
2
  // src/block-reload.ts
3
- var _excluded$1 = ["targets"];
3
+ var _excluded$2 = ["targets"];
4
4
  var _excluded2$1 = ["targets"];
5
5
  var _excluded3$1 = ["blocks"];
6
6
  var _excluded4$1 = ["blocks"];
@@ -36,7 +36,7 @@ var point = (x, y) => {
36
36
  };
37
37
  };
38
38
  function planBlockReload(before, after) {
39
- const { targets: oldTargets } = before, oldProject = _objectWithoutProperties(before, _excluded$1);
39
+ const { targets: oldTargets } = before, oldProject = _objectWithoutProperties(before, _excluded$2);
40
40
  const { targets: newTargets } = after, newProject = _objectWithoutProperties(after, _excluded2$1);
41
41
  if (oldTargets.length !== newTargets.length || !equal(oldProject, newProject)) return reject$1();
42
42
  const edits = [];
@@ -164,7 +164,7 @@ function applyBlockReload(targets, edits) {
164
164
  return [...touched];
165
165
  }
166
166
  // src/script-reload.ts
167
- var _excluded = ["targets"];
167
+ var _excluded$1 = ["targets"];
168
168
  var _excluded2 = ["targets"];
169
169
  var _excluded3 = ["blocks"];
170
170
  var _excluded4 = ["blocks"];
@@ -216,7 +216,7 @@ function opcodesOf(blocks, into) {
216
216
  * project and its targets, including comments, must stay the same; otherwise the whole project is reloaded.
217
217
  */
218
218
  function planScriptReload(before, after) {
219
- const { targets: oldTargets } = before, oldProject = _objectWithoutProperties(before, _excluded);
219
+ const { targets: oldTargets } = before, oldProject = _objectWithoutProperties(before, _excluded$1);
220
220
  const { targets: newTargets } = after, newProject = _objectWithoutProperties(after, _excluded2);
221
221
  if (oldTargets.length !== newTargets.length || !equal(oldProject, newProject)) return reject();
222
222
  const known = new Set(corePrefixes);
@@ -330,6 +330,7 @@ function applyScriptReload(targets, edits, deserialize) {
330
330
  return prepared.map(({ target }) => target);
331
331
  }
332
332
  // src/session.ts
333
+ var _excluded = ["blockPalette"];
333
334
  var screenStateMaxBytes = 524288;
334
335
  var notFound = (error) => error instanceof DOMException && ["NotFoundError", "TypeMismatchError"].includes(error.name);
335
336
  /** The screen state the folder was saved with, or nothing. */
@@ -379,10 +380,13 @@ var readerFor = (storage) => {
379
380
  return reader;
380
381
  };
381
382
  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)));
383
+ function saveManifest(source, added, removed, palette) {
384
+ const _JSON$parse = JSON.parse(new TextDecoder().decode(source.files.get(manifestFile))), { blockPalette: _ } = _JSON$parse, value = _objectWithoutProperties(_JSON$parse, _excluded);
384
385
  const entries = value.archiveEntries.filter((name) => !removed.includes(name));
385
- return encodeJson(_objectSpread2(_objectSpread2({}, value), {}, { archiveEntries: [...entries, ...added] }));
386
+ return encodeJson(_objectSpread2(_objectSpread2({}, value), {}, {
387
+ formatVersion: palette ? 2 : 1,
388
+ archiveEntries: [...entries, ...added]
389
+ }, palette ? { blockPalette: paletteFile } : {}));
386
390
  }
387
391
  function createFolderSession(vm, host) {
388
392
  var _host$screenState, _host$screenState$reg;
@@ -454,15 +458,28 @@ function createFolderSession(vm, host) {
454
458
  notifyEdits();
455
459
  };
456
460
  const planSave = (session, edited) => {
461
+ var _source$files$get;
457
462
  const { source } = session;
458
- const result = projectChanges(source.project, session.baseline, edited, identity(session, edited));
463
+ const expanded = projectChanges(expandPalette(source.project, source.palette), session.baseline, edited, identity(session, edited));
464
+ const collapsed = expanded ? collapsePalette(expanded) : null;
465
+ const result = collapsed && !equal(collapsed.project, source.project) ? collapsed.project : null;
466
+ const palette = collapsed ? collapsed.document : source.palette;
467
+ const paletteBytes = palette ? encodePalette(palette) : null;
468
+ const previousPalette = (_source$files$get = source.files.get(paletteFile)) !== null && _source$files$get !== void 0 ? _source$files$get : null;
469
+ const paletteChanged = paletteBytes === null ? previousPalette !== null : previousPalette === null || !sameBytes(paletteBytes, previousPalette);
459
470
  const extensionSave = planExtensionSave(source, result !== null && result !== void 0 ? result : source.project);
460
471
  const needed = projectAssets(extensionSave.project);
472
+ const added = [...needed].filter(([name]) => !source.bytes.has(name));
473
+ const removed = [...source.bytes.keys()].filter((name) => !needed.has(name));
461
474
  return {
462
475
  result,
463
476
  extensionSave,
464
- added: [...needed].filter(([name]) => !source.bytes.has(name)),
465
- removed: [...source.bytes.keys()].filter((name) => !needed.has(name))
477
+ added,
478
+ removed,
479
+ palette,
480
+ paletteBytes,
481
+ paletteChanged,
482
+ manifestChanged: added.length > 0 || removed.length > 0 || paletteBytes === null !== (previousPalette === null)
466
483
  };
467
484
  };
468
485
  let expectingTree = false;
@@ -618,10 +635,11 @@ function createFolderSession(vm, host) {
618
635
  const paths = /* @__PURE__ */ new Set();
619
636
  if (!current) return paths;
620
637
  try {
621
- const { result, extensionSave, added, removed } = planSave(current, snapshot());
638
+ const { result, extensionSave, added, removed, paletteChanged, manifestChanged } = planSave(current, snapshot());
622
639
  if (result) paths.add(projectFile);
623
640
  if (extensionSave.manifestChanged) paths.add(extensionsFile);
624
- if (added.length || removed.length) paths.add(manifestFile);
641
+ if (manifestChanged) paths.add(manifestFile);
642
+ if (paletteChanged) paths.add(paletteFile);
625
643
  for (const name of [...added.map(([name]) => name), ...removed]) paths.add(`assets/${name}`);
626
644
  for (const name of [...extensionSave.writes.keys(), ...extensionSave.removed]) paths.add(`extensions/${name}`);
627
645
  } catch (error) {
@@ -634,10 +652,11 @@ function createFolderSession(vm, host) {
634
652
  readUnsavedFile(path) {
635
653
  if (!current || busy) return;
636
654
  try {
637
- const { result, extensionSave, added, removed } = planSave(current, snapshot());
655
+ const { result, extensionSave, added, removed, paletteBytes, paletteChanged, manifestChanged } = planSave(current, snapshot());
638
656
  if (path === "project.source.json" && result) return encodeJson(extensionSave.project);
639
657
  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);
658
+ if (path === "sb3-source.json" && manifestChanged) return saveManifest(current.source, added.map(([name]) => name), removed, paletteBytes !== null);
659
+ if (path === paletteFile && paletteChanged) return paletteBytes;
641
660
  if (path.startsWith("assets/")) {
642
661
  var _added$find, _assetData;
643
662
  const name = path.slice(7);
@@ -708,9 +727,8 @@ function createFolderSession(vm, host) {
708
727
  const base = decoder.decode(session.source.files.get(projectFile));
709
728
  let editor;
710
729
  try {
711
- const edited = snapshot();
712
- const result = projectChanges(session.source.project, session.baseline, edited, identity(session, edited));
713
- editor = result ? `${JSON.stringify(planExtensionSave(session.source, result).project, null, 2)}\n` : base;
730
+ const { result, extensionSave } = planSave(session, snapshot());
731
+ editor = result ? `${JSON.stringify(extensionSave.project, null, 2)}\n` : base;
714
732
  } catch (error) {
715
733
  if (!(error instanceof FolderError)) throw error;
716
734
  editor = null;
@@ -833,7 +851,7 @@ function createFolderSession(vm, host) {
833
851
  const saveRevision = revision;
834
852
  const edited = snapshot();
835
853
  const ids = identify(edited);
836
- const { result, extensionSave, added: newAssets, removed } = planSave(session, edited);
854
+ const { result, extensionSave, added: newAssets, removed, palette, paletteBytes, paletteChanged, manifestChanged } = planSave(session, edited);
837
855
  await assertFolderUnchanged(session.source);
838
856
  active(session);
839
857
  const { source } = session;
@@ -845,7 +863,7 @@ function createFolderSession(vm, host) {
845
863
  if (vm.runtime.storage.createAsset(assetTypeFor(vm.runtime.storage, kind, format), format, data.slice(), null, true).assetId !== id) return unsupported(`Asset hash mismatch: ${name}`);
846
864
  added.set(name, data);
847
865
  }
848
- if (!result && !removed.length && !extensionSave.removed.length) {
866
+ if (!result && !removed.length && !extensionSave.removed.length && !paletteChanged && !manifestChanged) {
849
867
  await saveScreenState(source.directory);
850
868
  if (revision === saveRevision) host.onSaved();
851
869
  notify();
@@ -854,7 +872,7 @@ function createFolderSession(vm, host) {
854
872
  sourceRemoved: []
855
873
  };
856
874
  }
857
- const manifest = added.size || removed.length ? saveManifest(source, added.keys(), removed) : null;
875
+ const manifest = manifestChanged ? saveManifest(source, added.keys(), removed, paletteBytes !== null) : null;
858
876
  const root = {
859
877
  directory: source.directory,
860
878
  files: source.files,
@@ -915,6 +933,7 @@ function createFolderSession(vm, host) {
915
933
  try {
916
934
  for (const [name, data] of added) await write(assets, name, data);
917
935
  for (const [name, data] of extensionSave.writes) await write(extensions, name, data);
936
+ if (paletteBytes && paletteChanged) await write(root, paletteFile, paletteBytes);
918
937
  if (manifest) await write(root, manifestFile, manifest);
919
938
  if (extensionSave.manifestChanged) await write(root, extensionsFile, encodeJson(extensionSave.embedded));
920
939
  if (result) await write(root, projectFile, encodeJson(extensionSave.project));
@@ -924,7 +943,13 @@ function createFolderSession(vm, host) {
924
943
  }
925
944
  source.project = extensionSave.project;
926
945
  source.embedded = extensionSave.embedded;
927
- for (const [{ directory, files, prefix }, names] of [[assets, removed], [extensions, extensionSave.removed]]) for (const name of names) {
946
+ source.palette = palette;
947
+ const removedRoot = paletteBytes === null && paletteChanged ? [paletteFile] : [];
948
+ for (const [{ directory, files, prefix }, names] of [
949
+ [root, removedRoot],
950
+ [assets, removed],
951
+ [extensions, extensionSave.removed]
952
+ ]) for (const name of names) {
928
953
  try {
929
954
  const file = await (await directory.getFileHandle(name)).getFile();
930
955
  if (!sameBytes(new Uint8Array(await file.arrayBuffer()), files.get(name))) continue;
@@ -1,4 +1,4 @@
1
- import { M as _objectSpread2 } from "./shared-zlHgCKDG.js";
1
+ import { L as _objectSpread2 } from "./shared-cwwWtggC.js";
2
2
  // node_modules/@marijn/find-cluster-break/src/index.js
3
3
  var rangeFrom = [];
4
4
  var rangeTo = [];