@kubohiroya/turbowarp-plus-editor-project-folder 0.5.0 → 0.6.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 -2
- package/README.md +2 -2
- package/dist/index.js +270 -187
- package/dist/source.d.ts +14 -3
- package/package.json +6 -3
- package/src/session.ts +126 -17
- package/src/source.ts +46 -28
package/dist/index.js
CHANGED
|
@@ -106,8 +106,8 @@ var g = async (e, t) => (await e.getFileHandle(t)).getFile(), _ = (e) => `${e.si
|
|
|
106
106
|
}, x = (e, t) => {
|
|
107
107
|
let n = new Set(t);
|
|
108
108
|
return e.size === n.size && [...e].every((e) => n.has(e));
|
|
109
|
-
}, S = (e, t, n) => `${e.name}/${t}.${n}`;
|
|
110
|
-
async function
|
|
109
|
+
}, S = (e, t, n) => t === "sounds" ? e.AssetType.Sound : n === "svg" ? e.AssetType.ImageVector : e.AssetType.ImageBitmap, C = (e, t, n) => `${e.name}/${t}.${n}`;
|
|
110
|
+
async function w(e, t) {
|
|
111
111
|
let n = /* @__PURE__ */ new Map(), r = async (e, t, r = "") => {
|
|
112
112
|
let i = await g(e, t);
|
|
113
113
|
return n.set(r + t, _(i)), [t, await v(i)];
|
|
@@ -115,9 +115,9 @@ async function C(e, t) {
|
|
|
115
115
|
s,
|
|
116
116
|
c,
|
|
117
117
|
l
|
|
118
|
-
], a = new Map(await Promise.all(i.map((t) => r(e, t)))), o = new TextDecoder("utf-8", { fatal: !0 }), u = o.decode(a.get(s)), m = h(u), y = p(o.decode(a.get(c))),
|
|
118
|
+
], a = new Map(await Promise.all(i.map((t) => r(e, t)))), o = new TextDecoder("utf-8", { fatal: !0 }), u = o.decode(a.get(s)), m = h(u), y = p(o.decode(a.get(c))), S = p(o.decode(a.get(l)));
|
|
119
119
|
if (y.formatVersion !== 1 || y.project !== "project.source.json" || y.embeddedExtensions !== l || y.assetsDirectory !== "assets" || !Array.isArray(y.archiveEntries)) return d("Expected an sb3-toolchain v1 folder");
|
|
120
|
-
if (
|
|
120
|
+
if (S.formatVersion !== 1 || !Array.isArray(S.extensions) || S.extensions.length || S.extensionBundles !== void 0 && (!Array.isArray(S.extensionBundles) || S.extensionBundles.length) || m.turboWarpPlus !== void 0 || m.customFonts !== void 0 || m.extensionURLs !== void 0 && (!f(m.extensionURLs) || Object.keys(m.extensionURLs).length)) return d("Custom extensions and fonts are not supported in project folders");
|
|
121
121
|
let w = /* @__PURE__ */ new Set(["project.json"]), T = /* @__PURE__ */ new Map();
|
|
122
122
|
for (let e of m.targets) for (let n of ["costumes", "sounds"]) {
|
|
123
123
|
var E;
|
|
@@ -127,7 +127,7 @@ async function C(e, t) {
|
|
|
127
127
|
if (!f(e) || typeof e.assetId != "string" || !/^[a-f0-9]{32}$/u.test(e.assetId) || typeof e.dataFormat != "string") return d("Invalid asset reference");
|
|
128
128
|
let { assetId: r, dataFormat: i } = e, a = `${r}.${i}`, o = n === "sounds" ? /^(wav|mp3)$/u.test(i) ? t.AssetType.Sound : null : i === "svg" ? t.AssetType.ImageVector : /^(png|bmp|jpg|jpeg|gif)$/u.test(i) ? t.AssetType.ImageBitmap : null;
|
|
129
129
|
if (!o || e.md5ext !== a) return d(`Unsupported asset reference: ${a}`);
|
|
130
|
-
w.add(a), T.set(
|
|
130
|
+
w.add(a), T.set(C(o, r, i), {
|
|
131
131
|
id: r,
|
|
132
132
|
format: i,
|
|
133
133
|
type: o,
|
|
@@ -155,108 +155,126 @@ async function C(e, t) {
|
|
|
155
155
|
storageAssets: A
|
|
156
156
|
};
|
|
157
157
|
}
|
|
158
|
-
var
|
|
159
|
-
async function
|
|
158
|
+
var T = (e, t) => e.length === t.length && e.every((e, n) => e === t[n]);
|
|
159
|
+
async function E(e, t) {
|
|
160
160
|
let { directory: n, versions: r } = e;
|
|
161
161
|
try {
|
|
162
162
|
let [i, a, o] = await Promise.all([
|
|
163
163
|
n.getDirectoryHandle("assets"),
|
|
164
164
|
n.getDirectoryHandle("extensions"),
|
|
165
165
|
g(n, s)
|
|
166
|
-
]), [
|
|
167
|
-
if (!x(
|
|
168
|
-
let
|
|
169
|
-
if (
|
|
170
|
-
if ((t == null ? void 0 : t.version) ===
|
|
171
|
-
let
|
|
172
|
-
return
|
|
173
|
-
version:
|
|
174
|
-
bytes:
|
|
175
|
-
project: h(new TextDecoder("utf-8", { fatal: !0 }).decode(
|
|
166
|
+
]), [c, u] = await Promise.all([b(i), b(a)]);
|
|
167
|
+
if (!x(c, e.bytes.keys()) || u.size || (await Promise.all([...["sb3-source.json", l].map(async (e) => _(await g(n, e)) === r.get(e)), ...[...c].map(async (e) => _(await g(i, e)) === r.get(`assets/${e}`))])).includes(!1)) return "structure";
|
|
168
|
+
let d = _(o);
|
|
169
|
+
if (d === r.get("project.source.json")) return null;
|
|
170
|
+
if ((t == null ? void 0 : t.version) === d) return t;
|
|
171
|
+
let f = await v(o);
|
|
172
|
+
return T(f, e.files.get("project.source.json")) ? (r.set(s, d), null) : {
|
|
173
|
+
version: d,
|
|
174
|
+
bytes: f,
|
|
175
|
+
project: h(new TextDecoder("utf-8", { fatal: !0 }).decode(f))
|
|
176
176
|
};
|
|
177
177
|
} catch (e) {
|
|
178
178
|
return e instanceof u ? "structure" : "waiting";
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
|
-
async function
|
|
181
|
+
async function D(e) {
|
|
182
182
|
try {
|
|
183
183
|
let t = await e.directory.getDirectoryHandle("assets"), n = await e.directory.getDirectoryHandle("extensions");
|
|
184
184
|
if (!x(await b(t), e.bytes.keys()) || (await b(n)).size) throw new u("conflict");
|
|
185
|
-
for (let [t, n] of e.files) if (!
|
|
186
|
-
for (let [n, r] of e.bytes) if (!
|
|
185
|
+
for (let [t, n] of e.files) if (!T(await y(e.directory, t), n)) throw new u("conflict");
|
|
186
|
+
for (let [n, r] of e.bytes) if (!T(await y(t, n), r)) throw new u("conflict");
|
|
187
187
|
} catch (e) {
|
|
188
188
|
throw e instanceof u || e instanceof DOMException && ["NotFoundError", "TypeMismatchError"].includes(e.name) ? new u("conflict") : e;
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
|
-
var
|
|
191
|
+
var O = (e, t) => {
|
|
192
192
|
if (e === t) return !0;
|
|
193
|
-
if (Array.isArray(e) && Array.isArray(t)) return e.length === t.length && e.every((e, n) =>
|
|
193
|
+
if (Array.isArray(e) && Array.isArray(t)) return e.length === t.length && e.every((e, n) => O(e, t[n]));
|
|
194
194
|
if (!f(e) || !f(t)) return !1;
|
|
195
195
|
let n = Object.keys(e);
|
|
196
|
-
return n.length === Object.keys(t).length && n.every((n) => Object.hasOwn(t, n) &&
|
|
197
|
-
},
|
|
196
|
+
return n.length === Object.keys(t).length && n.every((n) => Object.hasOwn(t, n) && O(e[n], t[n]));
|
|
197
|
+
}, k = (e, t) => !f(e) || !f(t) || [
|
|
198
198
|
"id",
|
|
199
199
|
"assetId",
|
|
200
200
|
"name",
|
|
201
201
|
"opcode"
|
|
202
|
-
].every((n) => !Object.hasOwn(e, n) || !Object.hasOwn(t, n) ||
|
|
203
|
-
if (
|
|
204
|
-
if (Array.isArray(t) && Array.isArray(n) && Array.isArray(e) && t.length === n.length && e.length === n.length && e.every((e, n) =>
|
|
202
|
+
].every((n) => !Object.hasOwn(e, n) || !Object.hasOwn(t, n) || O(e[n], t[n])), A = (e, t, n) => {
|
|
203
|
+
if (O(t, n)) return e === void 0 ? n : e;
|
|
204
|
+
if (Array.isArray(t) && Array.isArray(n) && Array.isArray(e) && t.length === n.length && e.length === n.length && e.every((e, n) => k(e, t[n]))) return n.map((n, r) => A(e[r], t[r], n));
|
|
205
205
|
if (!f(t) || !f(n)) return n;
|
|
206
206
|
let r = Object.assign(Object.create(null), f(e) ? e : {});
|
|
207
|
-
for (let e of Object.keys(t)) Object.hasOwn(n, e) ?
|
|
207
|
+
for (let e of Object.keys(t)) Object.hasOwn(n, e) ? O(t[e], n[e]) || (r[e] = A(Object.hasOwn(r, e) ? r[e] : void 0, t[e], n[e])) : delete r[e];
|
|
208
208
|
for (let e of Object.keys(n)) Object.hasOwn(t, e) || (r[e] = n[e]);
|
|
209
209
|
return r;
|
|
210
|
-
},
|
|
211
|
-
let t = /* @__PURE__ */ new
|
|
212
|
-
for (let
|
|
213
|
-
|
|
214
|
-
|
|
210
|
+
}, j = (e) => {
|
|
211
|
+
let t = /* @__PURE__ */ new Map();
|
|
212
|
+
for (let r of e.targets) for (let e of ["costumes", "sounds"]) {
|
|
213
|
+
var n;
|
|
214
|
+
let i = (n = r[e]) == null ? [] : n;
|
|
215
|
+
if (!Array.isArray(i)) return d("Invalid asset list");
|
|
216
|
+
for (let n of i) {
|
|
217
|
+
if (!f(n) || typeof n.assetId != "string" || !/^[a-f0-9]{32}$/u.test(n.assetId) || typeof n.dataFormat != "string" || n.md5ext !== `${n.assetId}.${n.dataFormat}`) return d("Invalid asset reference");
|
|
218
|
+
if (!(e === "sounds" ? /^(wav|mp3)$/u.test(n.dataFormat) : /^(svg|png|bmp|jpg|jpeg|gif)$/u.test(n.dataFormat))) return d(`Unsupported asset reference: ${n.md5ext}`);
|
|
219
|
+
t.set(n.md5ext, e);
|
|
220
|
+
}
|
|
215
221
|
}
|
|
216
222
|
return t;
|
|
217
|
-
},
|
|
218
|
-
function
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
if (
|
|
223
|
-
if (
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
223
|
+
}, M = (e) => e.turboWarpPlus !== void 0 || e.customFonts !== void 0 || e.extensionURLs !== void 0 && (!f(e.extensionURLs) || Object.keys(e.extensionURLs).length > 0);
|
|
224
|
+
function N(e, t, n, s) {
|
|
225
|
+
var c, l;
|
|
226
|
+
let u = (c = s == null ? void 0 : s.before) == null ? t.targets.map(m) : c, f = (l = s == null ? void 0 : s.after) == null ? n.targets.map(m) : l;
|
|
227
|
+
if (u.length !== t.targets.length || f.length !== n.targets.length) return d("The targets could not be identified");
|
|
228
|
+
if (j(n), M(n)) return d("Custom extensions and fonts are not saved to a project folder");
|
|
229
|
+
if (O(t, n) && O([...u], [...f])) return null;
|
|
230
|
+
let { targets: p } = e, h = r(e, i), { targets: g } = t, _ = r(t, a), { targets: v } = n, y = r(n, o), b = new Map(p.map((e) => [m(e), e])), x = new Map(g.map((e, t) => [u[t], e])), S = v.map((e, t) => {
|
|
231
|
+
let n = x.get(f[t]);
|
|
232
|
+
if (!n) return e;
|
|
233
|
+
let r = b.get(m(n));
|
|
234
|
+
return r ? A(r, n, e) : d("The original target could not be identified");
|
|
235
|
+
}), C = S;
|
|
236
|
+
if (O([...u], [...f])) {
|
|
237
|
+
let e = new Map(p.map((e, t) => [m(e), t])), t = (t) => {
|
|
238
|
+
var n;
|
|
239
|
+
return (n = e.get(m(g[t]))) == null ? t : n;
|
|
240
|
+
};
|
|
241
|
+
C = S.map((e, n) => ({
|
|
242
|
+
target: e,
|
|
243
|
+
at: t(n)
|
|
244
|
+
})).sort((e, t) => e.at - t.at).map((e) => e.target);
|
|
245
|
+
}
|
|
246
|
+
let w = A(h, _, y), T = {};
|
|
247
|
+
for (let t of Object.keys(e)) t === "targets" ? T.targets = C : Object.hasOwn(w, t) && (T[t] = w[t]);
|
|
248
|
+
for (let e of Object.keys(w)) Object.hasOwn(T, e) || (T[e] = w[e]);
|
|
249
|
+
return T;
|
|
232
250
|
}
|
|
233
251
|
// \0@oxc-project+runtime@0.156.0/helpers/esm/typeof.js
|
|
234
|
-
function
|
|
252
|
+
function P(e) {
|
|
235
253
|
"@babel/helpers - typeof";
|
|
236
|
-
return
|
|
254
|
+
return P = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(e) {
|
|
237
255
|
return typeof e;
|
|
238
256
|
} : function(e) {
|
|
239
257
|
return e && typeof Symbol == "function" && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
|
|
240
|
-
},
|
|
258
|
+
}, P(e);
|
|
241
259
|
}
|
|
242
260
|
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPrimitive.js
|
|
243
|
-
function
|
|
244
|
-
if (
|
|
261
|
+
function F(e, t) {
|
|
262
|
+
if (P(e) != "object" || !e) return e;
|
|
245
263
|
var n = e[Symbol.toPrimitive];
|
|
246
264
|
if (n !== void 0) {
|
|
247
265
|
var r = n.call(e, t || "default");
|
|
248
|
-
if (
|
|
266
|
+
if (P(r) != "object") return r;
|
|
249
267
|
throw TypeError("@@toPrimitive must return a primitive value.");
|
|
250
268
|
}
|
|
251
269
|
return (t === "string" ? String : Number)(e);
|
|
252
270
|
}
|
|
253
271
|
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPropertyKey.js
|
|
254
272
|
function ee(e) {
|
|
255
|
-
var t =
|
|
256
|
-
return
|
|
273
|
+
var t = F(e, "string");
|
|
274
|
+
return P(t) == "symbol" ? t : t + "";
|
|
257
275
|
}
|
|
258
276
|
// \0@oxc-project+runtime@0.156.0/helpers/esm/defineProperty.js
|
|
259
|
-
function
|
|
277
|
+
function I(e, t, n) {
|
|
260
278
|
return (t = ee(t)) in e ? Object.defineProperty(e, t, {
|
|
261
279
|
value: n,
|
|
262
280
|
enumerable: !0,
|
|
@@ -265,7 +283,7 @@ function te(e, t, n) {
|
|
|
265
283
|
}) : e[t] = n, e;
|
|
266
284
|
}
|
|
267
285
|
// \0@oxc-project+runtime@0.156.0/helpers/esm/objectSpread2.js
|
|
268
|
-
function
|
|
286
|
+
function L(e, t) {
|
|
269
287
|
var n = Object.keys(e);
|
|
270
288
|
if (Object.getOwnPropertySymbols) {
|
|
271
289
|
var r = Object.getOwnPropertySymbols(e);
|
|
@@ -275,29 +293,29 @@ function F(e, t) {
|
|
|
275
293
|
}
|
|
276
294
|
return n;
|
|
277
295
|
}
|
|
278
|
-
function
|
|
296
|
+
function R(e) {
|
|
279
297
|
for (var t = 1; t < arguments.length; t++) {
|
|
280
298
|
var n = arguments[t] == null ? {} : arguments[t];
|
|
281
|
-
t % 2 ?
|
|
282
|
-
|
|
283
|
-
}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) :
|
|
299
|
+
t % 2 ? L(Object(n), !0).forEach(function(t) {
|
|
300
|
+
I(e, t, n[t]);
|
|
301
|
+
}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : L(Object(n)).forEach(function(t) {
|
|
284
302
|
Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(n, t));
|
|
285
303
|
});
|
|
286
304
|
}
|
|
287
305
|
return e;
|
|
288
306
|
}
|
|
289
307
|
// src/block-reload.ts
|
|
290
|
-
var
|
|
308
|
+
var te = ["targets"], ne = ["targets"], z = ["blocks"], re = ["blocks"], ie = [
|
|
291
309
|
"inputs",
|
|
292
310
|
"fields",
|
|
293
311
|
"x",
|
|
294
312
|
"y"
|
|
295
|
-
],
|
|
313
|
+
], ae = [
|
|
296
314
|
"inputs",
|
|
297
315
|
"fields",
|
|
298
316
|
"x",
|
|
299
317
|
"y"
|
|
300
|
-
],
|
|
318
|
+
], B = (e) => typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e), V = {
|
|
301
319
|
4: ["math_number", "NUM"],
|
|
302
320
|
5: ["math_positive_number", "NUM"],
|
|
303
321
|
6: ["math_whole_number", "NUM"],
|
|
@@ -305,28 +323,28 @@ var L = ["targets"], ne = ["targets"], re = ["blocks"], ie = ["blocks"], ae = [
|
|
|
305
323
|
8: ["math_angle", "NUM"],
|
|
306
324
|
9: ["colour_picker", "COLOUR"],
|
|
307
325
|
10: ["text", "TEXT"]
|
|
308
|
-
},
|
|
326
|
+
}, H = () => d("Only values and coordinates of existing blocks can be reloaded"), U = (e, t) => O(Object.keys(e), Object.keys(t)), W = (e, t) => typeof e != "number" || typeof t != "number" || !Number.isSafeInteger(e) || !Number.isSafeInteger(t) ? H() : {
|
|
309
327
|
x: e,
|
|
310
328
|
y: t
|
|
311
329
|
};
|
|
312
|
-
function
|
|
313
|
-
let { targets: n } = e, i = r(e,
|
|
314
|
-
if (n.length !== a.length || !
|
|
330
|
+
function G(e, t) {
|
|
331
|
+
let { targets: n } = e, i = r(e, te), { targets: a } = t, o = r(t, ne);
|
|
332
|
+
if (n.length !== a.length || !O(i, o)) return H();
|
|
315
333
|
let s = [];
|
|
316
334
|
for (let [e, t] of n.entries()) {
|
|
317
|
-
let { blocks: n } = t, i = r(t,
|
|
318
|
-
if (!
|
|
335
|
+
let { blocks: n } = t, i = r(t, z), o = a[e], { blocks: c } = o;
|
|
336
|
+
if (!O(i, r(o, re))) return H();
|
|
319
337
|
if (!f(n) || !f(c)) {
|
|
320
|
-
if (
|
|
321
|
-
return
|
|
338
|
+
if (O(n, c)) continue;
|
|
339
|
+
return H();
|
|
322
340
|
}
|
|
323
|
-
if (!
|
|
341
|
+
if (!U(n, c)) return H();
|
|
324
342
|
for (let [e, i] of Object.entries(n)) {
|
|
325
343
|
let n = c[e];
|
|
326
|
-
if (
|
|
327
|
-
if (!f(i) || !f(n)) return
|
|
328
|
-
let { inputs: a, fields: o, x: l, y: u } = i, d = r(i,
|
|
329
|
-
if (!
|
|
344
|
+
if (O(i, n)) continue;
|
|
345
|
+
if (!f(i) || !f(n)) return H();
|
|
346
|
+
let { inputs: a, fields: o, x: l, y: u } = i, d = r(i, ie), { inputs: p, fields: m, x: h, y: g } = n;
|
|
347
|
+
if (!O(d, r(n, ae)) || typeof d.opcode != "string") return H();
|
|
330
348
|
let _ = {
|
|
331
349
|
id: e,
|
|
332
350
|
target: t.name,
|
|
@@ -334,24 +352,24 @@ function U(e, t) {
|
|
|
334
352
|
opcode: d.opcode
|
|
335
353
|
};
|
|
336
354
|
if (l !== h || u !== g) {
|
|
337
|
-
if (d.topLevel !== !0) return
|
|
338
|
-
s.push(
|
|
355
|
+
if (d.topLevel !== !0) return H();
|
|
356
|
+
s.push(R(R({}, _), {}, {
|
|
339
357
|
kind: "position",
|
|
340
|
-
before:
|
|
341
|
-
after:
|
|
358
|
+
before: W(l, u),
|
|
359
|
+
after: W(h, g)
|
|
342
360
|
}));
|
|
343
361
|
}
|
|
344
|
-
if (!
|
|
345
|
-
if (!f(o) || !f(m) || !
|
|
362
|
+
if (!O(o, m)) {
|
|
363
|
+
if (!f(o) || !f(m) || !U(o, m)) return H();
|
|
346
364
|
for (let [e, t] of Object.entries(o)) {
|
|
347
365
|
let n = m[e];
|
|
348
|
-
if (!
|
|
366
|
+
if (!O(t, n)) {
|
|
349
367
|
if ([
|
|
350
368
|
"VARIABLE",
|
|
351
369
|
"LIST",
|
|
352
370
|
"BROADCAST_OPTION"
|
|
353
|
-
].includes(e) || d.opcode === "sensing_of_object_menu" || !Array.isArray(t) || !Array.isArray(n) || t.length !== 1 || n.length !== 1 || !
|
|
354
|
-
s.push(
|
|
371
|
+
].includes(e) || d.opcode === "sensing_of_object_menu" || !Array.isArray(t) || !Array.isArray(n) || t.length !== 1 || n.length !== 1 || !B(t[0]) || !B(n[0])) return H();
|
|
372
|
+
s.push(R(R({}, _), {}, {
|
|
355
373
|
kind: "field",
|
|
356
374
|
name: e,
|
|
357
375
|
before: t[0],
|
|
@@ -360,18 +378,18 @@ function U(e, t) {
|
|
|
360
378
|
}
|
|
361
379
|
}
|
|
362
380
|
}
|
|
363
|
-
if (!
|
|
364
|
-
if (!f(a) || !f(p) || !
|
|
381
|
+
if (!O(a, p)) {
|
|
382
|
+
if (!f(a) || !f(p) || !U(a, p)) return H();
|
|
365
383
|
for (let [e, t] of Object.entries(a)) {
|
|
366
384
|
let n = p[e];
|
|
367
|
-
if (
|
|
368
|
-
if (!Array.isArray(t) || !Array.isArray(n) || t[0] !== n[0]) return
|
|
385
|
+
if (O(t, n)) continue;
|
|
386
|
+
if (!Array.isArray(t) || !Array.isArray(n) || t[0] !== n[0]) return H();
|
|
369
387
|
let r = t[0] === 1 ? 1 : t[0] === 3 && typeof t[1] == "string" && t[1] === n[1] ? 2 : null;
|
|
370
|
-
if (r === null || t.length !== r + 1 || n.length !== r + 1) return
|
|
388
|
+
if (r === null || t.length !== r + 1 || n.length !== r + 1) return H();
|
|
371
389
|
let i = t[r], a = n[r];
|
|
372
|
-
if (!Array.isArray(i) || !Array.isArray(a) || i.length !== 2 || a.length !== 2 || typeof i[0] != "number" || !Object.hasOwn(
|
|
390
|
+
if (!Array.isArray(i) || !Array.isArray(a) || i.length !== 2 || a.length !== 2 || typeof i[0] != "number" || !Object.hasOwn(V, i[0]) || i[0] !== a[0] || !B(i[1]) || !B(a[1])) return H();
|
|
373
391
|
let o = r === 2 ? t[1] : null;
|
|
374
|
-
s.push(
|
|
392
|
+
s.push(R(R({}, _), {}, {
|
|
375
393
|
kind: "input",
|
|
376
394
|
name: e,
|
|
377
395
|
connected: o,
|
|
@@ -385,15 +403,15 @@ function U(e, t) {
|
|
|
385
403
|
}
|
|
386
404
|
return s;
|
|
387
405
|
}
|
|
388
|
-
function
|
|
406
|
+
function K(e, t) {
|
|
389
407
|
let n = /* @__PURE__ */ new Set(), r = t.map((t) => {
|
|
390
408
|
let r = e.filter((e) => e.isStage === t.stage && (t.stage || e.isOriginal && e.getName() === t.target));
|
|
391
|
-
if (r.length !== 1) return
|
|
409
|
+
if (r.length !== 1) return H();
|
|
392
410
|
let i = r[0], a = i.blocks, o = a.getBlock(t.id);
|
|
393
|
-
if (!o || o.opcode !== t.opcode) return
|
|
411
|
+
if (!o || o.opcode !== t.opcode) return H();
|
|
394
412
|
if (n.add(i), t.kind === "position") {
|
|
395
413
|
var s, c;
|
|
396
|
-
return !o.topLevel || Math.round((s = o.x) == null ? 0 : s) !== t.before.x || Math.round((c = o.y) == null ? 0 : c) !== t.before.y ?
|
|
414
|
+
return !o.topLevel || Math.round((s = o.x) == null ? 0 : s) !== t.before.x || Math.round((c = o.y) == null ? 0 : c) !== t.before.y ? H() : (e) => a.moveBlock({
|
|
397
415
|
id: t.id,
|
|
398
416
|
newCoordinate: t[e]
|
|
399
417
|
});
|
|
@@ -402,13 +420,13 @@ function W(e, t) {
|
|
|
402
420
|
if (t.kind === "input") {
|
|
403
421
|
var d;
|
|
404
422
|
let e = o.inputs[t.name], n = e == null ? void 0 : e.shadow;
|
|
405
|
-
if (!n || e.block !== ((d = t.connected) == null ? n : d)) return
|
|
406
|
-
let r = a.getBlock(n), [i, s] =
|
|
407
|
-
if (!(r != null && r.shadow) || r.parent !== o.id || r.opcode !== i) return
|
|
423
|
+
if (!n || e.block !== ((d = t.connected) == null ? n : d)) return H();
|
|
424
|
+
let r = a.getBlock(n), [i, s] = V[t.tag];
|
|
425
|
+
if (!(r != null && r.shadow) || r.parent !== o.id || r.opcode !== i) return H();
|
|
408
426
|
l = r, u = s;
|
|
409
427
|
}
|
|
410
428
|
let f = l.fields[u];
|
|
411
|
-
return !f || f.id != null || f.value !== t.before || l.isMonitored || o.isMonitored ?
|
|
429
|
+
return !f || f.id != null || f.value !== t.before || l.isMonitored || o.isMonitored ? H() : (e) => a.changeBlock({
|
|
412
430
|
id: l.id,
|
|
413
431
|
element: "field",
|
|
414
432
|
name: u,
|
|
@@ -424,7 +442,7 @@ function W(e, t) {
|
|
|
424
442
|
return [...n];
|
|
425
443
|
}
|
|
426
444
|
// src/script-reload.ts
|
|
427
|
-
var
|
|
445
|
+
var q = ["targets"], oe = ["targets"], se = ["blocks"], ce = ["blocks"], J = (e = "Only changes to the scripts of existing targets can be reloaded in place") => d(e), le = /* @__PURE__ */ new Set([
|
|
428
446
|
"motion",
|
|
429
447
|
"looks",
|
|
430
448
|
"sound",
|
|
@@ -438,21 +456,21 @@ var G = ["targets"], K = ["targets"], se = ["blocks"], ce = ["blocks"], q = (e =
|
|
|
438
456
|
"math",
|
|
439
457
|
"text",
|
|
440
458
|
"colour"
|
|
441
|
-
]),
|
|
459
|
+
]), Y = (e) => e.split("_", 1)[0], ue = /* @__PURE__ */ new Set([
|
|
442
460
|
"VARIABLE",
|
|
443
461
|
"LIST",
|
|
444
462
|
"BROADCAST_OPTION"
|
|
445
463
|
]), de = (e) => f(e) && typeof e.parent == "string" ? e.parent : null;
|
|
446
|
-
function
|
|
464
|
+
function X(e) {
|
|
447
465
|
let t = /* @__PURE__ */ new Map();
|
|
448
466
|
for (let n of Object.keys(e)) {
|
|
449
467
|
let r = n, i = /* @__PURE__ */ new Set();
|
|
450
468
|
for (;;) {
|
|
451
|
-
if (i.has(r)) return
|
|
469
|
+
if (i.has(r)) return J("Blocks form a cycle");
|
|
452
470
|
i.add(r);
|
|
453
471
|
let t = de(e[r]);
|
|
454
472
|
if (t === null) break;
|
|
455
|
-
if (!Object.hasOwn(e, t)) return
|
|
473
|
+
if (!Object.hasOwn(e, t)) return J("A block refers to a missing parent");
|
|
456
474
|
r = t;
|
|
457
475
|
}
|
|
458
476
|
t.set(n, r);
|
|
@@ -460,23 +478,23 @@ function Y(e) {
|
|
|
460
478
|
return t;
|
|
461
479
|
}
|
|
462
480
|
function fe(e, t) {
|
|
463
|
-
for (let n of Object.values(e)) f(n) && typeof n.opcode == "string" && t.add(
|
|
481
|
+
for (let n of Object.values(e)) f(n) && typeof n.opcode == "string" && t.add(Y(n.opcode));
|
|
464
482
|
}
|
|
465
483
|
function pe(e, t) {
|
|
466
|
-
let { targets: n } = e, i = r(e,
|
|
467
|
-
if (n.length !== a.length || !
|
|
484
|
+
let { targets: n } = e, i = r(e, q), { targets: a } = t, o = r(t, oe);
|
|
485
|
+
if (n.length !== a.length || !O(i, o)) return J();
|
|
468
486
|
let s = new Set(le);
|
|
469
487
|
for (let e of n) f(e.blocks) && fe(e.blocks, s);
|
|
470
488
|
let c = [];
|
|
471
489
|
for (let [e, t] of n.entries()) {
|
|
472
490
|
let { blocks: n } = t, i = r(t, se), o = a[e], { blocks: l } = o;
|
|
473
|
-
if (!
|
|
474
|
-
if (
|
|
475
|
-
let u = f(n) ? n : {}, d = f(l) ? l : {}, p =
|
|
491
|
+
if (!O(i, r(o, ce))) return J();
|
|
492
|
+
if (O(n, l)) continue;
|
|
493
|
+
let u = f(n) ? n : {}, d = f(l) ? l : {}, p = X(u), m = X(d), h = /* @__PURE__ */ new Set(), g = /* @__PURE__ */ new Set(), _ = (e) => {
|
|
476
494
|
let t = p.get(e), n = m.get(e), r = !1;
|
|
477
495
|
return t !== void 0 && !h.has(t) && (h.add(t), r = !0), n !== void 0 && !g.has(n) && (g.add(n), r = !0), r;
|
|
478
496
|
};
|
|
479
|
-
for (let e of /* @__PURE__ */ new Set([...Object.keys(u), ...Object.keys(d)]))
|
|
497
|
+
for (let e of /* @__PURE__ */ new Set([...Object.keys(u), ...Object.keys(d)])) O(u[e], d[e]) || _(e);
|
|
480
498
|
for (let e = !0; e;) {
|
|
481
499
|
e = !1;
|
|
482
500
|
for (let [t, n] of p) h.has(n) && _(t) && (e = !0);
|
|
@@ -485,8 +503,8 @@ function pe(e, t) {
|
|
|
485
503
|
let v = {};
|
|
486
504
|
for (let [e, t] of m) g.has(t) && (v[e] = d[e]);
|
|
487
505
|
for (let e of Object.values(v)) if (f(e)) {
|
|
488
|
-
if (typeof e.opcode != "string") return
|
|
489
|
-
if (!s.has(
|
|
506
|
+
if (typeof e.opcode != "string") return J("A block has no opcode");
|
|
507
|
+
if (!s.has(Y(e.opcode))) return J(`Blocks need an extension the project does not use: ${e.opcode}`);
|
|
490
508
|
}
|
|
491
509
|
c.push({
|
|
492
510
|
target: t.name,
|
|
@@ -499,23 +517,23 @@ function pe(e, t) {
|
|
|
499
517
|
}
|
|
500
518
|
var me = (e, t) => {
|
|
501
519
|
let n = e.filter((e) => e.isStage === t.stage && (t.stage || e.isOriginal && e.getName() === t.target));
|
|
502
|
-
return n.length === 1 ? n[0] :
|
|
520
|
+
return n.length === 1 ? n[0] : J();
|
|
503
521
|
};
|
|
504
522
|
function he(e, t, n) {
|
|
505
523
|
let r = t.map((t) => {
|
|
506
524
|
let r = me(e, t), i = r.blocks;
|
|
507
525
|
for (let e of t.remove) {
|
|
508
526
|
let t = i.getBlock(e);
|
|
509
|
-
if (!t || !t.topLevel || !i._scripts.includes(e)) return
|
|
527
|
+
if (!t || !t.topLevel || !i._scripts.includes(e)) return J("The editor and the folder differ");
|
|
510
528
|
}
|
|
511
529
|
let a = Object.values(n(JSON.parse(JSON.stringify(t.blocks))));
|
|
512
530
|
for (let e of a) {
|
|
513
531
|
var o;
|
|
514
|
-
if (typeof e.id != "string" || typeof e.opcode != "string") return
|
|
515
|
-
if (e.comment && !(r.comments && Object.hasOwn(r.comments, e.comment))) return
|
|
532
|
+
if (typeof e.id != "string" || typeof e.opcode != "string") return J("A block could not be read");
|
|
533
|
+
if (e.comment && !(r.comments && Object.hasOwn(r.comments, e.comment))) return J("A block refers to a missing comment");
|
|
516
534
|
for (let [t, n] of Object.entries((o = e.fields) == null ? {} : o)) {
|
|
517
535
|
var s;
|
|
518
|
-
if ((ue.has(t) || n.variableType) && (typeof n.id != "string" || !((s = r.lookupVariableById) != null && s.call(r, n.id)))) return
|
|
536
|
+
if ((ue.has(t) || n.variableType) && (typeof n.id != "string" || !((s = r.lookupVariableById) != null && s.call(r, n.id)))) return J("A block refers to a variable, list or message the project does not have");
|
|
519
537
|
}
|
|
520
538
|
}
|
|
521
539
|
return {
|
|
@@ -526,14 +544,14 @@ function he(e, t, n) {
|
|
|
526
544
|
};
|
|
527
545
|
}), i = r.map(({ container: e }) => ({
|
|
528
546
|
container: e,
|
|
529
|
-
blocks:
|
|
547
|
+
blocks: R({}, e._blocks),
|
|
530
548
|
scripts: [...e._scripts],
|
|
531
549
|
tops: new Map(Object.entries(e._blocks).map(([e, t]) => [e, t.topLevel]))
|
|
532
550
|
}));
|
|
533
551
|
try {
|
|
534
552
|
for (let { container: e, edit: t, created: n } of r) {
|
|
535
553
|
for (let n of t.remove) e.deleteBlock(n);
|
|
536
|
-
for (let t of n) e.createBlock(t, !0), e._blocks[t.id] !== t &&
|
|
554
|
+
for (let t of n) e.createBlock(t, !0), e._blocks[t.id] !== t && J("A block id is already in use");
|
|
537
555
|
e.resetCache();
|
|
538
556
|
}
|
|
539
557
|
} catch (e) {
|
|
@@ -547,61 +565,98 @@ function he(e, t, n) {
|
|
|
547
565
|
return r.map(({ target: e }) => e);
|
|
548
566
|
}
|
|
549
567
|
// src/session.ts
|
|
550
|
-
var
|
|
551
|
-
let t =
|
|
568
|
+
var Z = /* @__PURE__ */ new WeakMap(), ge = (e) => {
|
|
569
|
+
let t = Z.get(e);
|
|
552
570
|
if (t) return t;
|
|
553
571
|
let n = { assets: null };
|
|
554
572
|
return e.addHelper({ load(e, t, r) {
|
|
555
573
|
var i;
|
|
556
|
-
let a = (i = n.assets) == null ? void 0 : i.get(
|
|
574
|
+
let a = (i = n.assets) == null ? void 0 : i.get(C(e, t, r));
|
|
557
575
|
return a ? Promise.resolve(a) : null;
|
|
558
|
-
} }, 101),
|
|
576
|
+
} }, 101), Z.set(e, n), n;
|
|
559
577
|
};
|
|
560
|
-
function
|
|
561
|
-
let n = null, r = !1, i = !1, a = 0, o = null,
|
|
578
|
+
function _e(e, t) {
|
|
579
|
+
let n = null, r = !1, i = !1, a = 0, o = null, l = () => h(e.toJSON(void 0, { allowOptimization: !1 })), f = () => {
|
|
580
|
+
var t;
|
|
581
|
+
return (t = e.runtime.targets) == null ? [] : t;
|
|
582
|
+
}, p = (e) => {
|
|
583
|
+
let t = /* @__PURE__ */ new Map();
|
|
584
|
+
for (let e of f()) e.isOriginal && e.id && t.set(e.isStage ? "stage" : `sprite:${e.getName()}`, e.id);
|
|
585
|
+
let n = e.targets.map((e) => t.get(e.isStage ? "stage" : `sprite:${e.name}`));
|
|
586
|
+
return n.every((e) => e !== void 0) ? n : void 0;
|
|
587
|
+
}, m = (e, t) => {
|
|
588
|
+
let n = p(t);
|
|
589
|
+
return e.ids && n ? {
|
|
590
|
+
before: e.ids,
|
|
591
|
+
after: n
|
|
592
|
+
} : void 0;
|
|
593
|
+
}, g = async (e, t, n, r) => {
|
|
594
|
+
let i = r ? { mode: "exclusive" } : {}, a = await t.createWritable(i);
|
|
595
|
+
try {
|
|
596
|
+
await a.write(n), r && await D(e.source), C(e), await a.close();
|
|
597
|
+
} catch (e) {
|
|
598
|
+
throw await a.abort().catch(() => {}), e;
|
|
599
|
+
}
|
|
600
|
+
}, v = async (e, t, n) => {
|
|
601
|
+
let r = await (await e.getFileHandle(t)).createWritable();
|
|
602
|
+
await r.write(n), await r.close();
|
|
603
|
+
}, y = (e) => {
|
|
604
|
+
for (let a of f()) {
|
|
605
|
+
var t, n, r, i;
|
|
606
|
+
for (let o of [...(t = (n = a.sprite) == null ? void 0 : n.costumes) == null ? [] : t, ...(r = (i = a.sprite) == null ? void 0 : i.sounds) == null ? [] : r]) {
|
|
607
|
+
let t = o.asset;
|
|
608
|
+
if (t && `${t.assetId}.${t.dataFormat}` === e && t.data) return t.data;
|
|
609
|
+
}
|
|
610
|
+
}
|
|
611
|
+
return null;
|
|
612
|
+
}, b = () => {
|
|
562
613
|
a++;
|
|
563
|
-
},
|
|
614
|
+
}, x = () => {
|
|
564
615
|
n = null;
|
|
565
616
|
};
|
|
566
|
-
e.runtime.on("PROJECT_LOADED",
|
|
567
|
-
let
|
|
617
|
+
e.runtime.on("PROJECT_LOADED", x), e.on("PROJECT_CHANGED", b);
|
|
618
|
+
let C = (t) => {
|
|
568
619
|
if (i || n !== t || e.runtime.getTargetForStage() !== t.stage) throw new u("conflict");
|
|
569
|
-
},
|
|
570
|
-
i = !0, n = null, e.runtime.off("PROJECT_LOADED",
|
|
571
|
-
},
|
|
620
|
+
}, T = () => {
|
|
621
|
+
i = !0, n = null, e.runtime.off("PROJECT_LOADED", x), e.off("PROJECT_CHANGED", b);
|
|
622
|
+
}, O = async (a, o) => {
|
|
572
623
|
if (i || r) return "cancelled";
|
|
573
624
|
r = !0;
|
|
574
625
|
let s = e.runtime.getTargetForStage();
|
|
575
626
|
try {
|
|
576
|
-
var
|
|
627
|
+
var c;
|
|
577
628
|
let r = await a();
|
|
578
629
|
if (!r || i) return "cancelled";
|
|
579
|
-
let u = e.runtime.storage, d = await
|
|
630
|
+
let u = e.runtime.storage, d = await w(r, u);
|
|
580
631
|
if (i || e.runtime.getTargetForStage() !== s || t.isProjectDirty() && !o()) return "cancelled";
|
|
581
632
|
t.beforeLoad(), n = null;
|
|
582
|
-
let f =
|
|
583
|
-
f.assets =
|
|
584
|
-
let
|
|
633
|
+
let f = ge(u), m = d.storageAssets;
|
|
634
|
+
f.assets = m;
|
|
635
|
+
let h;
|
|
585
636
|
try {
|
|
586
|
-
e.quit(), await e.loadProject(d.projectText),
|
|
637
|
+
e.quit(), await e.loadProject(d.projectText), h = e.runtime.getTargetForStage();
|
|
587
638
|
} finally {
|
|
588
|
-
f.assets ===
|
|
639
|
+
f.assets === m && (f.assets = null);
|
|
589
640
|
}
|
|
590
|
-
|
|
641
|
+
if (i || !h || e.runtime.getTargetForStage() !== h) return "cancelled";
|
|
642
|
+
t.onOpened(r.name);
|
|
643
|
+
let g = l();
|
|
644
|
+
return n = {
|
|
591
645
|
source: d,
|
|
592
|
-
stage:
|
|
593
|
-
baseline:
|
|
646
|
+
stage: h,
|
|
647
|
+
baseline: g,
|
|
648
|
+
ids: p(g),
|
|
594
649
|
pending: null
|
|
595
|
-
}, (
|
|
650
|
+
}, (c = e.renderer) == null || c.draw(), "opened";
|
|
596
651
|
} finally {
|
|
597
652
|
r = !1;
|
|
598
653
|
}
|
|
599
|
-
},
|
|
654
|
+
}, k = (e, n) => {
|
|
600
655
|
var r;
|
|
601
656
|
try {
|
|
602
657
|
return {
|
|
603
658
|
kind: "values",
|
|
604
|
-
changes:
|
|
659
|
+
changes: G(e, n)
|
|
605
660
|
};
|
|
606
661
|
} catch (e) {
|
|
607
662
|
if (!(e instanceof u)) throw e;
|
|
@@ -616,22 +671,22 @@ function ge(e, t) {
|
|
|
616
671
|
if (!(e instanceof u)) throw e;
|
|
617
672
|
return null;
|
|
618
673
|
}
|
|
619
|
-
},
|
|
674
|
+
}, A = async (e) => {
|
|
620
675
|
var t;
|
|
621
|
-
let n = typeof e.pending == "object" ? e.pending : null, r = await
|
|
622
|
-
return !r || typeof r == "string" ? r : (n == null ? void 0 : n.update) === r ?
|
|
676
|
+
let n = typeof e.pending == "object" ? e.pending : null, r = await E(e.source, (t = n == null ? void 0 : n.update) == null ? null : t);
|
|
677
|
+
return !r || typeof r == "string" ? r : (n == null ? void 0 : n.update) === r ? R(R({}, n), {}, { stable: !0 }) : {
|
|
623
678
|
update: r,
|
|
624
|
-
edits:
|
|
679
|
+
edits: k(e.source.project, r.project),
|
|
625
680
|
stable: !1
|
|
626
681
|
};
|
|
627
|
-
},
|
|
682
|
+
}, M = () => {
|
|
628
683
|
let e = n == null ? void 0 : n.pending;
|
|
629
684
|
return !e || e === "waiting" ? null : e === "structure" || e.edits === null ? "full" : "partial";
|
|
630
|
-
},
|
|
685
|
+
}, P = () => {
|
|
631
686
|
var e;
|
|
632
687
|
let i = n == null ? void 0 : n.pending;
|
|
633
|
-
return i ? r ? "busy" : i === "waiting" ? "waiting" : t.isProjectDirty() ? "dirty" : (e = t.blockReload) != null && e.isRunning() ? "running" :
|
|
634
|
-
},
|
|
688
|
+
return i ? r ? "busy" : i === "waiting" ? "waiting" : t.isProjectDirty() ? "dirty" : (e = t.blockReload) != null && e.isRunning() ? "running" : M() === "full" ? "full" : "ready" : null;
|
|
689
|
+
}, F = () => {
|
|
635
690
|
var e;
|
|
636
691
|
return !t.isProjectDirty() && !((e = t.blockReload) != null && e.isRunning());
|
|
637
692
|
};
|
|
@@ -646,14 +701,14 @@ function ge(e, t) {
|
|
|
646
701
|
return r;
|
|
647
702
|
},
|
|
648
703
|
get reloadState() {
|
|
649
|
-
return
|
|
704
|
+
return P();
|
|
650
705
|
},
|
|
651
706
|
get reloadKind() {
|
|
652
|
-
return
|
|
707
|
+
return M();
|
|
653
708
|
},
|
|
654
709
|
get canAutoReload() {
|
|
655
710
|
let e = n == null ? void 0 : n.pending;
|
|
656
|
-
return
|
|
711
|
+
return P() === "ready" && typeof e == "object" && !!e && e.stable;
|
|
657
712
|
},
|
|
658
713
|
get settling() {
|
|
659
714
|
let e = n == null ? void 0 : n.pending;
|
|
@@ -672,8 +727,8 @@ function ge(e, t) {
|
|
|
672
727
|
if (!e) return null;
|
|
673
728
|
let t = new TextDecoder(), r = t.decode(e.source.files.get(s)), i;
|
|
674
729
|
try {
|
|
675
|
-
let t =
|
|
676
|
-
i =
|
|
730
|
+
let t = l(), n = N(e.source.project, e.baseline, t, m(e, t));
|
|
731
|
+
i = n ? `${JSON.stringify(n, null, 2)}\n` : r;
|
|
677
732
|
} catch (e) {
|
|
678
733
|
if (!(e instanceof u)) throw e;
|
|
679
734
|
i = null;
|
|
@@ -695,28 +750,28 @@ function ge(e, t) {
|
|
|
695
750
|
if (i || r || !n || !t.blockReload) return Promise.resolve();
|
|
696
751
|
if (o) return o;
|
|
697
752
|
let e = n, a = e.baseline;
|
|
698
|
-
return o =
|
|
753
|
+
return o = A(e).then((t) => {
|
|
699
754
|
n === e && e.baseline === a && !r && (e.pending = t);
|
|
700
755
|
}).finally(() => {
|
|
701
756
|
o = null;
|
|
702
757
|
}), o;
|
|
703
758
|
},
|
|
704
759
|
async reload() {
|
|
705
|
-
if (!n ||
|
|
760
|
+
if (!n || P() !== "ready" || !t.blockReload) return !1;
|
|
706
761
|
let o = n;
|
|
707
|
-
|
|
762
|
+
C(o), r = !0;
|
|
708
763
|
try {
|
|
709
|
-
let r = a, d = await
|
|
710
|
-
if (n !== o || i || e.runtime.getTargetForStage() !== o.stage || (o.pending = d, !d || typeof d == "string" || d.edits === null || r !== a || !
|
|
764
|
+
let r = a, d = await A(o);
|
|
765
|
+
if (n !== o || i || e.runtime.getTargetForStage() !== o.stage || (o.pending = d, !d || typeof d == "string" || d.edits === null || r !== a || !F())) return !1;
|
|
711
766
|
let f;
|
|
712
767
|
try {
|
|
713
|
-
var
|
|
768
|
+
var c, u;
|
|
714
769
|
let { edits: n } = d;
|
|
715
|
-
f = n.kind === "values" ?
|
|
770
|
+
f = n.kind === "values" ? K((c = e.runtime.targets) == null ? [] : c, n.changes) : he((u = e.runtime.targets) == null ? [] : u, n.changes, t.blockReload.deserializeBlocks);
|
|
716
771
|
} catch (e) {
|
|
717
|
-
throw o.pending =
|
|
772
|
+
throw o.pending = R(R({}, d), {}, { edits: null }), e;
|
|
718
773
|
}
|
|
719
|
-
return o.baseline =
|
|
774
|
+
return o.baseline = l(), o.ids = p(o.baseline), o.source.project = d.update.project, o.source.files.set(s, d.update.bytes), o.source.versions.set(s, d.update.version), o.pending = null, t.blockReload.onApplied(f), !0;
|
|
720
775
|
} finally {
|
|
721
776
|
r = !1;
|
|
722
777
|
}
|
|
@@ -724,10 +779,10 @@ function ge(e, t) {
|
|
|
724
779
|
reloadAll(e) {
|
|
725
780
|
var r;
|
|
726
781
|
let i = n;
|
|
727
|
-
return !i || !i.pending || i.pending === "waiting" || (r = t.blockReload) != null && r.isRunning() ? Promise.resolve("cancelled") :
|
|
782
|
+
return !i || !i.pending || i.pending === "waiting" || (r = t.blockReload) != null && r.isRunning() ? Promise.resolve("cancelled") : O(() => Promise.resolve(n === i ? i.source.directory : null), e);
|
|
728
783
|
},
|
|
729
784
|
open(e, t) {
|
|
730
|
-
return
|
|
785
|
+
return O(async () => {
|
|
731
786
|
try {
|
|
732
787
|
return await e({
|
|
733
788
|
id: "turbowarp-plus-project-folder",
|
|
@@ -740,27 +795,55 @@ function ge(e, t) {
|
|
|
740
795
|
}, t);
|
|
741
796
|
},
|
|
742
797
|
openDirectory(e, t) {
|
|
743
|
-
return
|
|
798
|
+
return O(() => Promise.resolve(e), t);
|
|
744
799
|
},
|
|
745
800
|
async save() {
|
|
746
801
|
if (!n || r) throw new u("conflict");
|
|
747
|
-
let
|
|
748
|
-
|
|
802
|
+
let i = n;
|
|
803
|
+
C(i), r = !0;
|
|
749
804
|
try {
|
|
750
|
-
let r = a,
|
|
751
|
-
if (await
|
|
752
|
-
let
|
|
805
|
+
let r = a, o = l(), u = p(o), f = N(i.source.project, i.baseline, o, m(i, o));
|
|
806
|
+
if (await D(i.source), C(i), !f) return a === r && t.onSaved(), "unchanged";
|
|
807
|
+
let { source: h } = i, b = j(f), x = /* @__PURE__ */ new Map();
|
|
808
|
+
for (let [t, n] of b) {
|
|
809
|
+
if (h.bytes.has(t)) continue;
|
|
810
|
+
let r = y(t);
|
|
811
|
+
if (!r) return d(`The data of ${t} is not in the Editor`);
|
|
812
|
+
let [i, a] = t.split(".");
|
|
813
|
+
if (e.runtime.storage.createAsset(S(e.runtime.storage, n, a), a, r.slice(), null, !0).assetId !== i) return d(`Asset hash mismatch: ${t}`);
|
|
814
|
+
x.set(t, r);
|
|
815
|
+
}
|
|
816
|
+
let w = [...h.bytes.keys()].filter((e) => !b.has(e)), T = new TextEncoder(), E = null;
|
|
817
|
+
if (x.size || w.length) {
|
|
818
|
+
let e = JSON.parse(new TextDecoder().decode(h.files.get(c)));
|
|
819
|
+
e.archiveEntries = [...e.archiveEntries.filter((e) => !w.includes(e)), ...x.keys()], E = T.encode(`${JSON.stringify(e, null, 2)}\n`);
|
|
820
|
+
}
|
|
821
|
+
let O = await h.directory.getDirectoryHandle("assets"), k = [], A = h.files.get(c), M = !1, P = `${JSON.stringify(f, null, 2)}\n`;
|
|
753
822
|
try {
|
|
754
|
-
|
|
823
|
+
for (let [e, t] of x) {
|
|
824
|
+
let n = await O.getFileHandle(e, { create: !0 });
|
|
825
|
+
k.push(e), await g(i, n, t, !1), h.bytes.set(e, t), h.versions.set(`assets/${e}`, _(await n.getFile()));
|
|
826
|
+
}
|
|
827
|
+
if (E) {
|
|
828
|
+
let e = await h.directory.getFileHandle(c);
|
|
829
|
+
await g(i, e, E, !0), M = !0, h.files.set(c, E), h.versions.set(c, _(await e.getFile()));
|
|
830
|
+
}
|
|
831
|
+
await g(i, await h.directory.getFileHandle(s), T.encode(P), !0);
|
|
755
832
|
} catch (e) {
|
|
756
|
-
|
|
833
|
+
M && (await v(h.directory, c, A).catch(() => {}), h.files.set(c, A), h.versions.delete(c));
|
|
834
|
+
for (let e of k) await O.removeEntry(e).catch(() => {}), h.bytes.delete(e), h.versions.delete(`assets/${e}`);
|
|
835
|
+
throw e;
|
|
757
836
|
}
|
|
758
|
-
|
|
837
|
+
h.project = f, h.files.set(s, T.encode(P)), h.versions.delete(s);
|
|
838
|
+
for (let e of w) try {
|
|
839
|
+
await O.removeEntry(e), h.bytes.delete(e), h.versions.delete(`assets/${e}`);
|
|
840
|
+
} catch (e) {}
|
|
841
|
+
return i.baseline = o, i.ids = u, i.pending = null, n === i && a === r && t.onSaved(), "saved";
|
|
759
842
|
} finally {
|
|
760
843
|
r = !1;
|
|
761
844
|
}
|
|
762
845
|
},
|
|
763
|
-
dispose:
|
|
846
|
+
dispose: T
|
|
764
847
|
};
|
|
765
848
|
}
|
|
766
849
|
// src/index.ts
|
|
@@ -830,11 +913,11 @@ var Q = {
|
|
|
830
913
|
full: "この変更は作品全体の再読み込みが必要です。"
|
|
831
914
|
}
|
|
832
915
|
}, $ = /* @__PURE__ */ new WeakMap();
|
|
833
|
-
function
|
|
916
|
+
function ve({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0 }) {
|
|
834
917
|
var a;
|
|
835
918
|
let o = t.defaultView, s = o == null ? void 0 : o.showDirectoryPicker;
|
|
836
919
|
if (!s || !((a = e.runtime) != null && a.storage)) return null;
|
|
837
|
-
let c =
|
|
920
|
+
let c = _e(e, n), l = t.createElement("output");
|
|
838
921
|
l.dataset.projectFolderStatus = "", l.setAttribute("role", "status"), l.hidden = !0, Object.assign(l.style, {
|
|
839
922
|
position: "fixed",
|
|
840
923
|
insetInlineEnd: "1rem",
|
|
@@ -972,7 +1055,7 @@ function _e({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
972
1055
|
}
|
|
973
1056
|
};
|
|
974
1057
|
}
|
|
975
|
-
function
|
|
1058
|
+
function ye(e, t = "en") {
|
|
976
1059
|
let n = $.get(e);
|
|
977
1060
|
if (n) return {
|
|
978
1061
|
open: () => n.open(t),
|
|
@@ -980,7 +1063,7 @@ function ve(e, t = "en") {
|
|
|
980
1063
|
detach: () => n.session.detach()
|
|
981
1064
|
};
|
|
982
1065
|
}
|
|
983
|
-
function
|
|
1066
|
+
function be(e, { vm: t, locale: n = "en", MenuItem: r, MenuSection: i, onRequestClose: a }) {
|
|
984
1067
|
let o = $.get(t);
|
|
985
1068
|
if (!o) return null;
|
|
986
1069
|
let s = n.startsWith("ja") ? Q.ja : Q.en, c = (t) => {
|
|
@@ -1000,4 +1083,4 @@ function ye(e, { vm: t, locale: n = "en", MenuItem: r, MenuSection: i, onRequest
|
|
|
1000
1083
|
};
|
|
1001
1084
|
return e(i, null, c("open"), o.session.canSave ? c("save") : null);
|
|
1002
1085
|
}
|
|
1003
|
-
export {
|
|
1086
|
+
export { ve as mountProjectFolder, ye as projectFolderActions, be as renderProjectFolderMenu };
|