@kubohiroya/turbowarp-plus-editor-project-folder 0.4.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 +396 -304
- package/dist/source.d.ts +17 -1
- package/package.json +6 -3
- package/src/index.ts +2 -2
- package/src/session.ts +126 -17
- package/src/source.ts +80 -26
package/dist/index.js
CHANGED
|
@@ -60,93 +60,37 @@ function r(e, t) {
|
|
|
60
60
|
}
|
|
61
61
|
return a;
|
|
62
62
|
}
|
|
63
|
-
// \0@oxc-project+runtime@0.156.0/helpers/esm/typeof.js
|
|
64
|
-
function i(e) {
|
|
65
|
-
"@babel/helpers - typeof";
|
|
66
|
-
return i = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(e) {
|
|
67
|
-
return typeof e;
|
|
68
|
-
} : function(e) {
|
|
69
|
-
return e && typeof Symbol == "function" && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
|
|
70
|
-
}, i(e);
|
|
71
|
-
}
|
|
72
|
-
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPrimitive.js
|
|
73
|
-
function a(e, t) {
|
|
74
|
-
if (i(e) != "object" || !e) return e;
|
|
75
|
-
var n = e[Symbol.toPrimitive];
|
|
76
|
-
if (n !== void 0) {
|
|
77
|
-
var r = n.call(e, t || "default");
|
|
78
|
-
if (i(r) != "object") return r;
|
|
79
|
-
throw TypeError("@@toPrimitive must return a primitive value.");
|
|
80
|
-
}
|
|
81
|
-
return (t === "string" ? String : Number)(e);
|
|
82
|
-
}
|
|
83
|
-
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPropertyKey.js
|
|
84
|
-
function o(e) {
|
|
85
|
-
var t = a(e, "string");
|
|
86
|
-
return i(t) == "symbol" ? t : t + "";
|
|
87
|
-
}
|
|
88
|
-
// \0@oxc-project+runtime@0.156.0/helpers/esm/defineProperty.js
|
|
89
|
-
function s(e, t, n) {
|
|
90
|
-
return (t = o(t)) in e ? Object.defineProperty(e, t, {
|
|
91
|
-
value: n,
|
|
92
|
-
enumerable: !0,
|
|
93
|
-
configurable: !0,
|
|
94
|
-
writable: !0
|
|
95
|
-
}) : e[t] = n, e;
|
|
96
|
-
}
|
|
97
|
-
// \0@oxc-project+runtime@0.156.0/helpers/esm/objectSpread2.js
|
|
98
|
-
function c(e, t) {
|
|
99
|
-
var n = Object.keys(e);
|
|
100
|
-
if (Object.getOwnPropertySymbols) {
|
|
101
|
-
var r = Object.getOwnPropertySymbols(e);
|
|
102
|
-
t && (r = r.filter(function(t) {
|
|
103
|
-
return Object.getOwnPropertyDescriptor(e, t).enumerable;
|
|
104
|
-
})), n.push.apply(n, r);
|
|
105
|
-
}
|
|
106
|
-
return n;
|
|
107
|
-
}
|
|
108
|
-
function l(e) {
|
|
109
|
-
for (var t = 1; t < arguments.length; t++) {
|
|
110
|
-
var n = arguments[t] == null ? {} : arguments[t];
|
|
111
|
-
t % 2 ? c(Object(n), !0).forEach(function(t) {
|
|
112
|
-
s(e, t, n[t]);
|
|
113
|
-
}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : c(Object(n)).forEach(function(t) {
|
|
114
|
-
Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(n, t));
|
|
115
|
-
});
|
|
116
|
-
}
|
|
117
|
-
return e;
|
|
118
|
-
}
|
|
119
63
|
// src/source.ts
|
|
120
|
-
var
|
|
64
|
+
var i = ["targets"], a = ["targets"], o = ["targets"], s = "project.source.json", c = "sb3-source.json", l = "embedded-extensions.json", u = class extends Error {
|
|
121
65
|
constructor(e, t) {
|
|
122
66
|
super(t == null ? e : t), this.code = e;
|
|
123
67
|
}
|
|
124
|
-
},
|
|
125
|
-
throw new
|
|
126
|
-
},
|
|
68
|
+
}, d = (e) => {
|
|
69
|
+
throw new u("unsupported", e);
|
|
70
|
+
}, f = (e) => typeof e == "object" && !!e && !Array.isArray(e), p = (e) => {
|
|
127
71
|
let t = JSON.parse(e);
|
|
128
|
-
return
|
|
129
|
-
},
|
|
130
|
-
function
|
|
131
|
-
let t =
|
|
132
|
-
if (!Array.isArray(t.targets)) return
|
|
72
|
+
return f(t) ? t : d("Expected a JSON object");
|
|
73
|
+
}, m = (e) => e.isStage ? "stage" : `sprite:${e.name}`;
|
|
74
|
+
function h(e) {
|
|
75
|
+
let t = p(e);
|
|
76
|
+
if (!Array.isArray(t.targets)) return d("Missing targets");
|
|
133
77
|
let n = /* @__PURE__ */ new Set(), r = 0;
|
|
134
78
|
for (let e of t.targets) {
|
|
135
|
-
if (!
|
|
136
|
-
let t =
|
|
137
|
-
if (n.has(t)) return
|
|
138
|
-
if (n.add(t), e.isStage && r++, e.blocks !== void 0 && !
|
|
139
|
-
if (e.comments !== void 0 && !
|
|
79
|
+
if (!f(e) || typeof e.isStage != "boolean" || typeof e.name != "string") return d("Invalid target");
|
|
80
|
+
let t = m(e);
|
|
81
|
+
if (n.has(t)) return d("Ambiguous target names");
|
|
82
|
+
if (n.add(t), e.isStage && r++, e.blocks !== void 0 && !f(e.blocks)) return d("Invalid blocks");
|
|
83
|
+
if (e.comments !== void 0 && !f(e.comments)) return d("Invalid comments");
|
|
140
84
|
}
|
|
141
|
-
return r === 1 ? t :
|
|
85
|
+
return r === 1 ? t : d("Expected one stage");
|
|
142
86
|
}
|
|
143
|
-
var
|
|
87
|
+
var g = async (e, t) => (await e.getFileHandle(t)).getFile(), _ = (e) => `${e.size}:${e.lastModified}`, v = async (e) => new Uint8Array(await e.arrayBuffer()), y = async (e, t) => v(await g(e, t)), b = async (t) => {
|
|
144
88
|
let n = /* @__PURE__ */ new Set();
|
|
145
89
|
var r = !1, i = !1, a;
|
|
146
90
|
try {
|
|
147
91
|
for (var o = e(t.values()), s; r = !(s = await o.next()).done; r = !1) {
|
|
148
92
|
let e = s.value;
|
|
149
|
-
if (e.kind !== "file") return
|
|
93
|
+
if (e.kind !== "file") return d("Nested entries are outside the supported source format");
|
|
150
94
|
n.add(e.name);
|
|
151
95
|
}
|
|
152
96
|
} catch (e) {
|
|
@@ -159,31 +103,31 @@ var C = async (e, t) => (await e.getFileHandle(t)).getFile(), w = (e) => `${e.si
|
|
|
159
103
|
}
|
|
160
104
|
}
|
|
161
105
|
return n;
|
|
162
|
-
},
|
|
106
|
+
}, x = (e, t) => {
|
|
163
107
|
let n = new Set(t);
|
|
164
108
|
return e.size === n.size && [...e].every((e) => n.has(e));
|
|
165
|
-
},
|
|
166
|
-
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) {
|
|
167
111
|
let n = /* @__PURE__ */ new Map(), r = async (e, t, r = "") => {
|
|
168
|
-
let i = await
|
|
169
|
-
return n.set(r + t,
|
|
112
|
+
let i = await g(e, t);
|
|
113
|
+
return n.set(r + t, _(i)), [t, await v(i)];
|
|
170
114
|
}, i = [
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
], a = new Map(await Promise.all(i.map((t) => r(e, t)))), o = new TextDecoder("utf-8", { fatal: !0 }),
|
|
175
|
-
if (
|
|
176
|
-
if (
|
|
177
|
-
let
|
|
178
|
-
for (let e of
|
|
179
|
-
var
|
|
180
|
-
let r = (
|
|
181
|
-
if (!Array.isArray(r)) return
|
|
115
|
+
s,
|
|
116
|
+
c,
|
|
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))), S = p(o.decode(a.get(l)));
|
|
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 (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
|
+
let w = /* @__PURE__ */ new Set(["project.json"]), T = /* @__PURE__ */ new Map();
|
|
122
|
+
for (let e of m.targets) for (let n of ["costumes", "sounds"]) {
|
|
123
|
+
var E;
|
|
124
|
+
let r = (E = e[n]) == null ? [] : E;
|
|
125
|
+
if (!Array.isArray(r)) return d("Invalid asset list");
|
|
182
126
|
for (let e of r) {
|
|
183
|
-
if (!
|
|
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");
|
|
184
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;
|
|
185
|
-
if (!o || e.md5ext !== a) return
|
|
186
|
-
|
|
129
|
+
if (!o || e.md5ext !== a) return d(`Unsupported asset reference: ${a}`);
|
|
130
|
+
w.add(a), T.set(C(o, r, i), {
|
|
187
131
|
id: r,
|
|
188
132
|
format: i,
|
|
189
133
|
type: o,
|
|
@@ -191,99 +135,182 @@ async function A(e, t) {
|
|
|
191
135
|
});
|
|
192
136
|
}
|
|
193
137
|
}
|
|
194
|
-
if (
|
|
195
|
-
|
|
196
|
-
let [
|
|
197
|
-
if (!
|
|
198
|
-
let
|
|
199
|
-
for (let [e, { id: n, format: r, type: i, name: a }] of
|
|
200
|
-
let o = t.createAsset(i, r,
|
|
201
|
-
if (o.assetId !== n) return
|
|
138
|
+
if (y.archiveEntries.length !== w.size || !x(new Set(y.archiveEntries), w)) return d("Asset references and archiveEntries do not match");
|
|
139
|
+
w.delete("project.json");
|
|
140
|
+
let [D, O] = await Promise.all([e.getDirectoryHandle("assets"), e.getDirectoryHandle("extensions")]);
|
|
141
|
+
if (!x(await b(D), w) || (await b(O)).size) return d("Unexpected or missing source files");
|
|
142
|
+
let k = new Map(await Promise.all([...w].map((e) => r(D, e, "assets/")))), A = /* @__PURE__ */ new Map();
|
|
143
|
+
for (let [e, { id: n, format: r, type: i, name: a }] of T) {
|
|
144
|
+
let o = t.createAsset(i, r, k.get(a).slice(), null, !0);
|
|
145
|
+
if (o.assetId !== n) return d(`Asset hash mismatch: ${a}`);
|
|
202
146
|
A.set(e, o);
|
|
203
147
|
}
|
|
204
148
|
return {
|
|
205
149
|
versions: n,
|
|
206
150
|
files: a,
|
|
207
151
|
directory: e,
|
|
208
|
-
bytes:
|
|
209
|
-
project:
|
|
210
|
-
projectText:
|
|
152
|
+
bytes: k,
|
|
153
|
+
project: m,
|
|
154
|
+
projectText: u,
|
|
211
155
|
storageAssets: A
|
|
212
156
|
};
|
|
213
157
|
}
|
|
214
|
-
var
|
|
215
|
-
async function
|
|
158
|
+
var T = (e, t) => e.length === t.length && e.every((e, n) => e === t[n]);
|
|
159
|
+
async function E(e, t) {
|
|
216
160
|
let { directory: n, versions: r } = e;
|
|
217
161
|
try {
|
|
218
162
|
let [i, a, o] = await Promise.all([
|
|
219
163
|
n.getDirectoryHandle("assets"),
|
|
220
164
|
n.getDirectoryHandle("extensions"),
|
|
221
|
-
|
|
222
|
-
]), [
|
|
223
|
-
if (!
|
|
224
|
-
let
|
|
225
|
-
if (
|
|
226
|
-
if ((t == null ? void 0 : t.version) ===
|
|
227
|
-
let
|
|
228
|
-
return
|
|
229
|
-
version:
|
|
230
|
-
bytes:
|
|
231
|
-
project:
|
|
165
|
+
g(n, s)
|
|
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))
|
|
232
176
|
};
|
|
233
177
|
} catch (e) {
|
|
234
|
-
return e instanceof
|
|
178
|
+
return e instanceof u ? "structure" : "waiting";
|
|
235
179
|
}
|
|
236
180
|
}
|
|
237
|
-
async function
|
|
181
|
+
async function D(e) {
|
|
238
182
|
try {
|
|
239
183
|
let t = await e.directory.getDirectoryHandle("assets"), n = await e.directory.getDirectoryHandle("extensions");
|
|
240
|
-
if (!
|
|
241
|
-
for (let [t, n] of e.files) if (!
|
|
242
|
-
for (let [n, r] of e.bytes) if (!
|
|
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 (!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");
|
|
243
187
|
} catch (e) {
|
|
244
|
-
throw e instanceof
|
|
188
|
+
throw e instanceof u || e instanceof DOMException && ["NotFoundError", "TypeMismatchError"].includes(e.name) ? new u("conflict") : e;
|
|
245
189
|
}
|
|
246
190
|
}
|
|
247
|
-
var
|
|
191
|
+
var O = (e, t) => {
|
|
248
192
|
if (e === t) return !0;
|
|
249
|
-
if (Array.isArray(e) && Array.isArray(t)) return e.length === t.length && e.every((e, n) =>
|
|
250
|
-
if (!
|
|
193
|
+
if (Array.isArray(e) && Array.isArray(t)) return e.length === t.length && e.every((e, n) => O(e, t[n]));
|
|
194
|
+
if (!f(e) || !f(t)) return !1;
|
|
251
195
|
let n = Object.keys(e);
|
|
252
|
-
return n.length === Object.keys(t).length && n.every((n) => Object.hasOwn(t, n) &&
|
|
253
|
-
},
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
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
|
+
"id",
|
|
199
|
+
"assetId",
|
|
200
|
+
"name",
|
|
201
|
+
"opcode"
|
|
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
|
+
if (!f(t) || !f(n)) return n;
|
|
206
|
+
let r = Object.assign(Object.create(null), f(e) ? 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];
|
|
258
208
|
for (let e of Object.keys(n)) Object.hasOwn(t, e) || (r[e] = n[e]);
|
|
259
209
|
return r;
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
let
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
let
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
if (!P(u, n) || !P(d, a)) {
|
|
271
|
-
let e = {};
|
|
272
|
-
P(u, n) || (e.blocks = F(h.blocks, u, n)), P(d, a) || (e.comments = F(h.comments, d, a)), s.set(m, e);
|
|
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);
|
|
273
220
|
}
|
|
274
221
|
}
|
|
275
|
-
return
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
222
|
+
return t;
|
|
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;
|
|
250
|
+
}
|
|
251
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/typeof.js
|
|
252
|
+
function P(e) {
|
|
253
|
+
"@babel/helpers - typeof";
|
|
254
|
+
return P = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(e) {
|
|
255
|
+
return typeof e;
|
|
256
|
+
} : function(e) {
|
|
257
|
+
return e && typeof Symbol == "function" && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
|
|
258
|
+
}, P(e);
|
|
259
|
+
}
|
|
260
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPrimitive.js
|
|
261
|
+
function F(e, t) {
|
|
262
|
+
if (P(e) != "object" || !e) return e;
|
|
263
|
+
var n = e[Symbol.toPrimitive];
|
|
264
|
+
if (n !== void 0) {
|
|
265
|
+
var r = n.call(e, t || "default");
|
|
266
|
+
if (P(r) != "object") return r;
|
|
267
|
+
throw TypeError("@@toPrimitive must return a primitive value.");
|
|
268
|
+
}
|
|
269
|
+
return (t === "string" ? String : Number)(e);
|
|
270
|
+
}
|
|
271
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPropertyKey.js
|
|
272
|
+
function ee(e) {
|
|
273
|
+
var t = F(e, "string");
|
|
274
|
+
return P(t) == "symbol" ? t : t + "";
|
|
275
|
+
}
|
|
276
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/defineProperty.js
|
|
277
|
+
function I(e, t, n) {
|
|
278
|
+
return (t = ee(t)) in e ? Object.defineProperty(e, t, {
|
|
279
|
+
value: n,
|
|
280
|
+
enumerable: !0,
|
|
281
|
+
configurable: !0,
|
|
282
|
+
writable: !0
|
|
283
|
+
}) : e[t] = n, e;
|
|
284
|
+
}
|
|
285
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/objectSpread2.js
|
|
286
|
+
function L(e, t) {
|
|
287
|
+
var n = Object.keys(e);
|
|
288
|
+
if (Object.getOwnPropertySymbols) {
|
|
289
|
+
var r = Object.getOwnPropertySymbols(e);
|
|
290
|
+
t && (r = r.filter(function(t) {
|
|
291
|
+
return Object.getOwnPropertyDescriptor(e, t).enumerable;
|
|
292
|
+
})), n.push.apply(n, r);
|
|
293
|
+
}
|
|
294
|
+
return n;
|
|
295
|
+
}
|
|
296
|
+
function R(e) {
|
|
297
|
+
for (var t = 1; t < arguments.length; t++) {
|
|
298
|
+
var n = arguments[t] == null ? {} : arguments[t];
|
|
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) {
|
|
302
|
+
Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(n, t));
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
return e;
|
|
279
306
|
}
|
|
280
307
|
// src/block-reload.ts
|
|
281
|
-
var
|
|
308
|
+
var te = ["targets"], ne = ["targets"], z = ["blocks"], re = ["blocks"], ie = [
|
|
282
309
|
"inputs",
|
|
283
310
|
"fields",
|
|
284
311
|
"x",
|
|
285
312
|
"y"
|
|
286
|
-
],
|
|
313
|
+
], ae = [
|
|
287
314
|
"inputs",
|
|
288
315
|
"fields",
|
|
289
316
|
"x",
|
|
@@ -296,53 +323,53 @@ var ee = ["targets"], te = ["targets"], ne = ["blocks"], L = ["blocks"], R = [
|
|
|
296
323
|
8: ["math_angle", "NUM"],
|
|
297
324
|
9: ["colour_picker", "COLOUR"],
|
|
298
325
|
10: ["text", "TEXT"]
|
|
299
|
-
}, H = () =>
|
|
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() : {
|
|
300
327
|
x: e,
|
|
301
328
|
y: t
|
|
302
329
|
};
|
|
303
330
|
function G(e, t) {
|
|
304
|
-
let { targets: n } = e, i = r(e,
|
|
305
|
-
if (n.length !== a.length || !
|
|
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();
|
|
306
333
|
let s = [];
|
|
307
334
|
for (let [e, t] of n.entries()) {
|
|
308
|
-
let { blocks: n } = t, i = r(t,
|
|
309
|
-
if (!
|
|
310
|
-
if (!
|
|
311
|
-
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();
|
|
337
|
+
if (!f(n) || !f(c)) {
|
|
338
|
+
if (O(n, c)) continue;
|
|
312
339
|
return H();
|
|
313
340
|
}
|
|
314
341
|
if (!U(n, c)) return H();
|
|
315
342
|
for (let [e, i] of Object.entries(n)) {
|
|
316
343
|
let n = c[e];
|
|
317
|
-
if (
|
|
318
|
-
if (!
|
|
319
|
-
let { inputs: a, fields: o, x:
|
|
320
|
-
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();
|
|
321
348
|
let _ = {
|
|
322
349
|
id: e,
|
|
323
350
|
target: t.name,
|
|
324
351
|
stage: t.isStage,
|
|
325
|
-
opcode:
|
|
352
|
+
opcode: d.opcode
|
|
326
353
|
};
|
|
327
|
-
if (
|
|
328
|
-
if (
|
|
329
|
-
s.push(
|
|
354
|
+
if (l !== h || u !== g) {
|
|
355
|
+
if (d.topLevel !== !0) return H();
|
|
356
|
+
s.push(R(R({}, _), {}, {
|
|
330
357
|
kind: "position",
|
|
331
|
-
before: W(
|
|
358
|
+
before: W(l, u),
|
|
332
359
|
after: W(h, g)
|
|
333
360
|
}));
|
|
334
361
|
}
|
|
335
|
-
if (!
|
|
336
|
-
if (!
|
|
362
|
+
if (!O(o, m)) {
|
|
363
|
+
if (!f(o) || !f(m) || !U(o, m)) return H();
|
|
337
364
|
for (let [e, t] of Object.entries(o)) {
|
|
338
365
|
let n = m[e];
|
|
339
|
-
if (!
|
|
366
|
+
if (!O(t, n)) {
|
|
340
367
|
if ([
|
|
341
368
|
"VARIABLE",
|
|
342
369
|
"LIST",
|
|
343
370
|
"BROADCAST_OPTION"
|
|
344
|
-
].includes(e) ||
|
|
345
|
-
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({}, _), {}, {
|
|
346
373
|
kind: "field",
|
|
347
374
|
name: e,
|
|
348
375
|
before: t[0],
|
|
@@ -351,18 +378,18 @@ function G(e, t) {
|
|
|
351
378
|
}
|
|
352
379
|
}
|
|
353
380
|
}
|
|
354
|
-
if (!
|
|
355
|
-
if (!
|
|
381
|
+
if (!O(a, p)) {
|
|
382
|
+
if (!f(a) || !f(p) || !U(a, p)) return H();
|
|
356
383
|
for (let [e, t] of Object.entries(a)) {
|
|
357
384
|
let n = p[e];
|
|
358
|
-
if (
|
|
385
|
+
if (O(t, n)) continue;
|
|
359
386
|
if (!Array.isArray(t) || !Array.isArray(n) || t[0] !== n[0]) return H();
|
|
360
387
|
let r = t[0] === 1 ? 1 : t[0] === 3 && typeof t[1] == "string" && t[1] === n[1] ? 2 : null;
|
|
361
388
|
if (r === null || t.length !== r + 1 || n.length !== r + 1) return H();
|
|
362
389
|
let i = t[r], a = n[r];
|
|
363
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();
|
|
364
391
|
let o = r === 2 ? t[1] : null;
|
|
365
|
-
s.push(
|
|
392
|
+
s.push(R(R({}, _), {}, {
|
|
366
393
|
kind: "input",
|
|
367
394
|
name: e,
|
|
368
395
|
connected: o,
|
|
@@ -415,7 +442,7 @@ function K(e, t) {
|
|
|
415
442
|
return [...n];
|
|
416
443
|
}
|
|
417
444
|
// src/script-reload.ts
|
|
418
|
-
var q = ["targets"],
|
|
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([
|
|
419
446
|
"motion",
|
|
420
447
|
"looks",
|
|
421
448
|
"sound",
|
|
@@ -429,11 +456,11 @@ var q = ["targets"], re = ["targets"], ie = ["blocks"], ae = ["blocks"], J = (e
|
|
|
429
456
|
"math",
|
|
430
457
|
"text",
|
|
431
458
|
"colour"
|
|
432
|
-
]), Y = (e) => e.split("_", 1)[0],
|
|
459
|
+
]), Y = (e) => e.split("_", 1)[0], ue = /* @__PURE__ */ new Set([
|
|
433
460
|
"VARIABLE",
|
|
434
461
|
"LIST",
|
|
435
462
|
"BROADCAST_OPTION"
|
|
436
|
-
]),
|
|
463
|
+
]), de = (e) => f(e) && typeof e.parent == "string" ? e.parent : null;
|
|
437
464
|
function X(e) {
|
|
438
465
|
let t = /* @__PURE__ */ new Map();
|
|
439
466
|
for (let n of Object.keys(e)) {
|
|
@@ -441,7 +468,7 @@ function X(e) {
|
|
|
441
468
|
for (;;) {
|
|
442
469
|
if (i.has(r)) return J("Blocks form a cycle");
|
|
443
470
|
i.add(r);
|
|
444
|
-
let t =
|
|
471
|
+
let t = de(e[r]);
|
|
445
472
|
if (t === null) break;
|
|
446
473
|
if (!Object.hasOwn(e, t)) return J("A block refers to a missing parent");
|
|
447
474
|
r = t;
|
|
@@ -450,51 +477,51 @@ function X(e) {
|
|
|
450
477
|
}
|
|
451
478
|
return t;
|
|
452
479
|
}
|
|
453
|
-
function
|
|
454
|
-
for (let n of Object.values(e))
|
|
480
|
+
function fe(e, t) {
|
|
481
|
+
for (let n of Object.values(e)) f(n) && typeof n.opcode == "string" && t.add(Y(n.opcode));
|
|
455
482
|
}
|
|
456
|
-
function
|
|
457
|
-
let { targets: n } = e, i = r(e, q), { targets: a } = t, o = r(t,
|
|
458
|
-
if (n.length !== a.length || !
|
|
459
|
-
let s = new Set(
|
|
460
|
-
for (let e of n)
|
|
483
|
+
function pe(e, t) {
|
|
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();
|
|
486
|
+
let s = new Set(le);
|
|
487
|
+
for (let e of n) f(e.blocks) && fe(e.blocks, s);
|
|
461
488
|
let c = [];
|
|
462
489
|
for (let [e, t] of n.entries()) {
|
|
463
|
-
let { blocks: n } = t, i = r(t,
|
|
464
|
-
if (!
|
|
465
|
-
if (
|
|
466
|
-
let u =
|
|
467
|
-
let t =
|
|
468
|
-
return t !== void 0 && !
|
|
490
|
+
let { blocks: n } = t, i = r(t, se), o = a[e], { blocks: l } = o;
|
|
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) => {
|
|
494
|
+
let t = p.get(e), n = m.get(e), r = !1;
|
|
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;
|
|
469
496
|
};
|
|
470
|
-
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);
|
|
471
498
|
for (let e = !0; e;) {
|
|
472
499
|
e = !1;
|
|
473
|
-
for (let [t, n] of
|
|
474
|
-
for (let [t, n] of
|
|
500
|
+
for (let [t, n] of p) h.has(n) && _(t) && (e = !0);
|
|
501
|
+
for (let [t, n] of m) g.has(n) && _(t) && (e = !0);
|
|
475
502
|
}
|
|
476
|
-
let
|
|
477
|
-
for (let [e, t] of
|
|
478
|
-
for (let e of Object.values(
|
|
503
|
+
let v = {};
|
|
504
|
+
for (let [e, t] of m) g.has(t) && (v[e] = d[e]);
|
|
505
|
+
for (let e of Object.values(v)) if (f(e)) {
|
|
479
506
|
if (typeof e.opcode != "string") return J("A block has no opcode");
|
|
480
507
|
if (!s.has(Y(e.opcode))) return J(`Blocks need an extension the project does not use: ${e.opcode}`);
|
|
481
508
|
}
|
|
482
509
|
c.push({
|
|
483
510
|
target: t.name,
|
|
484
511
|
stage: t.isStage,
|
|
485
|
-
remove: [...
|
|
486
|
-
blocks:
|
|
512
|
+
remove: [...h],
|
|
513
|
+
blocks: v
|
|
487
514
|
});
|
|
488
515
|
}
|
|
489
516
|
return c;
|
|
490
517
|
}
|
|
491
|
-
var
|
|
518
|
+
var me = (e, t) => {
|
|
492
519
|
let n = e.filter((e) => e.isStage === t.stage && (t.stage || e.isOriginal && e.getName() === t.target));
|
|
493
520
|
return n.length === 1 ? n[0] : J();
|
|
494
521
|
};
|
|
495
|
-
function
|
|
522
|
+
function he(e, t, n) {
|
|
496
523
|
let r = t.map((t) => {
|
|
497
|
-
let r =
|
|
524
|
+
let r = me(e, t), i = r.blocks;
|
|
498
525
|
for (let e of t.remove) {
|
|
499
526
|
let t = i.getBlock(e);
|
|
500
527
|
if (!t || !t.topLevel || !i._scripts.includes(e)) return J("The editor and the folder differ");
|
|
@@ -506,7 +533,7 @@ function fe(e, t, n) {
|
|
|
506
533
|
if (e.comment && !(r.comments && Object.hasOwn(r.comments, e.comment))) return J("A block refers to a missing comment");
|
|
507
534
|
for (let [t, n] of Object.entries((o = e.fields) == null ? {} : o)) {
|
|
508
535
|
var s;
|
|
509
|
-
if ((
|
|
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");
|
|
510
537
|
}
|
|
511
538
|
}
|
|
512
539
|
return {
|
|
@@ -517,7 +544,7 @@ function fe(e, t, n) {
|
|
|
517
544
|
};
|
|
518
545
|
}), i = r.map(({ container: e }) => ({
|
|
519
546
|
container: e,
|
|
520
|
-
blocks:
|
|
547
|
+
blocks: R({}, e._blocks),
|
|
521
548
|
scripts: [...e._scripts],
|
|
522
549
|
tops: new Map(Object.entries(e._blocks).map(([e, t]) => [e, t.topLevel]))
|
|
523
550
|
}));
|
|
@@ -538,56 +565,93 @@ function fe(e, t, n) {
|
|
|
538
565
|
return r.map(({ target: e }) => e);
|
|
539
566
|
}
|
|
540
567
|
// src/session.ts
|
|
541
|
-
var Z = /* @__PURE__ */ new WeakMap(),
|
|
568
|
+
var Z = /* @__PURE__ */ new WeakMap(), ge = (e) => {
|
|
542
569
|
let t = Z.get(e);
|
|
543
570
|
if (t) return t;
|
|
544
571
|
let n = { assets: null };
|
|
545
572
|
return e.addHelper({ load(e, t, r) {
|
|
546
573
|
var i;
|
|
547
|
-
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));
|
|
548
575
|
return a ? Promise.resolve(a) : null;
|
|
549
576
|
} }, 101), Z.set(e, n), n;
|
|
550
577
|
};
|
|
551
|
-
function
|
|
552
|
-
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 = () => {
|
|
553
613
|
a++;
|
|
554
|
-
},
|
|
614
|
+
}, x = () => {
|
|
555
615
|
n = null;
|
|
556
616
|
};
|
|
557
|
-
e.runtime.on("PROJECT_LOADED",
|
|
558
|
-
let
|
|
559
|
-
if (i || n !== t || e.runtime.getTargetForStage() !== t.stage) throw new
|
|
560
|
-
},
|
|
561
|
-
i = !0, n = null, e.runtime.off("PROJECT_LOADED",
|
|
562
|
-
},
|
|
617
|
+
e.runtime.on("PROJECT_LOADED", x), e.on("PROJECT_CHANGED", b);
|
|
618
|
+
let C = (t) => {
|
|
619
|
+
if (i || n !== t || e.runtime.getTargetForStage() !== t.stage) throw new u("conflict");
|
|
620
|
+
}, T = () => {
|
|
621
|
+
i = !0, n = null, e.runtime.off("PROJECT_LOADED", x), e.off("PROJECT_CHANGED", b);
|
|
622
|
+
}, O = async (a, o) => {
|
|
563
623
|
if (i || r) return "cancelled";
|
|
564
624
|
r = !0;
|
|
565
|
-
let
|
|
625
|
+
let s = e.runtime.getTargetForStage();
|
|
566
626
|
try {
|
|
567
|
-
var
|
|
627
|
+
var c;
|
|
568
628
|
let r = await a();
|
|
569
629
|
if (!r || i) return "cancelled";
|
|
570
|
-
let u = e.runtime.storage, d = await
|
|
571
|
-
if (i || e.runtime.getTargetForStage() !==
|
|
630
|
+
let u = e.runtime.storage, d = await w(r, u);
|
|
631
|
+
if (i || e.runtime.getTargetForStage() !== s || t.isProjectDirty() && !o()) return "cancelled";
|
|
572
632
|
t.beforeLoad(), n = null;
|
|
573
|
-
let f =
|
|
574
|
-
f.assets =
|
|
575
|
-
let
|
|
633
|
+
let f = ge(u), m = d.storageAssets;
|
|
634
|
+
f.assets = m;
|
|
635
|
+
let h;
|
|
576
636
|
try {
|
|
577
|
-
e.quit(), await e.loadProject(d.projectText),
|
|
637
|
+
e.quit(), await e.loadProject(d.projectText), h = e.runtime.getTargetForStage();
|
|
578
638
|
} finally {
|
|
579
|
-
f.assets ===
|
|
639
|
+
f.assets === m && (f.assets = null);
|
|
580
640
|
}
|
|
581
|
-
|
|
641
|
+
if (i || !h || e.runtime.getTargetForStage() !== h) return "cancelled";
|
|
642
|
+
t.onOpened(r.name);
|
|
643
|
+
let g = l();
|
|
644
|
+
return n = {
|
|
582
645
|
source: d,
|
|
583
|
-
stage:
|
|
584
|
-
baseline:
|
|
646
|
+
stage: h,
|
|
647
|
+
baseline: g,
|
|
648
|
+
ids: p(g),
|
|
585
649
|
pending: null
|
|
586
|
-
}, (
|
|
650
|
+
}, (c = e.renderer) == null || c.draw(), "opened";
|
|
587
651
|
} finally {
|
|
588
652
|
r = !1;
|
|
589
653
|
}
|
|
590
|
-
},
|
|
654
|
+
}, k = (e, n) => {
|
|
591
655
|
var r;
|
|
592
656
|
try {
|
|
593
657
|
return {
|
|
@@ -595,34 +659,34 @@ function me(e, t) {
|
|
|
595
659
|
changes: G(e, n)
|
|
596
660
|
};
|
|
597
661
|
} catch (e) {
|
|
598
|
-
if (!(e instanceof
|
|
662
|
+
if (!(e instanceof u)) throw e;
|
|
599
663
|
}
|
|
600
664
|
if (!((r = t.blockReload) != null && r.deserializeBlocks)) return null;
|
|
601
665
|
try {
|
|
602
666
|
return {
|
|
603
667
|
kind: "scripts",
|
|
604
|
-
changes:
|
|
668
|
+
changes: pe(e, n)
|
|
605
669
|
};
|
|
606
670
|
} catch (e) {
|
|
607
|
-
if (!(e instanceof
|
|
671
|
+
if (!(e instanceof u)) throw e;
|
|
608
672
|
return null;
|
|
609
673
|
}
|
|
610
|
-
},
|
|
674
|
+
}, A = async (e) => {
|
|
611
675
|
var t;
|
|
612
|
-
let n = typeof e.pending == "object" ? e.pending : null, r = await
|
|
613
|
-
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 }) : {
|
|
614
678
|
update: r,
|
|
615
|
-
edits:
|
|
679
|
+
edits: k(e.source.project, r.project),
|
|
616
680
|
stable: !1
|
|
617
681
|
};
|
|
618
|
-
},
|
|
682
|
+
}, M = () => {
|
|
619
683
|
let e = n == null ? void 0 : n.pending;
|
|
620
684
|
return !e || e === "waiting" ? null : e === "structure" || e.edits === null ? "full" : "partial";
|
|
621
|
-
},
|
|
685
|
+
}, P = () => {
|
|
622
686
|
var e;
|
|
623
687
|
let i = n == null ? void 0 : n.pending;
|
|
624
|
-
return i ? r ? "busy" : i === "waiting" ? "waiting" : t.isProjectDirty() ? "dirty" : (e = t.blockReload) != null && e.isRunning() ? "running" :
|
|
625
|
-
},
|
|
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 = () => {
|
|
626
690
|
var e;
|
|
627
691
|
return !t.isProjectDirty() && !((e = t.blockReload) != null && e.isRunning());
|
|
628
692
|
};
|
|
@@ -637,14 +701,14 @@ function me(e, t) {
|
|
|
637
701
|
return r;
|
|
638
702
|
},
|
|
639
703
|
get reloadState() {
|
|
640
|
-
return
|
|
704
|
+
return P();
|
|
641
705
|
},
|
|
642
706
|
get reloadKind() {
|
|
643
|
-
return
|
|
707
|
+
return M();
|
|
644
708
|
},
|
|
645
709
|
get canAutoReload() {
|
|
646
710
|
let e = n == null ? void 0 : n.pending;
|
|
647
|
-
return
|
|
711
|
+
return P() === "ready" && typeof e == "object" && !!e && e.stable;
|
|
648
712
|
},
|
|
649
713
|
get settling() {
|
|
650
714
|
let e = n == null ? void 0 : n.pending;
|
|
@@ -661,17 +725,17 @@ function me(e, t) {
|
|
|
661
725
|
async comparison() {
|
|
662
726
|
let e = n;
|
|
663
727
|
if (!e) return null;
|
|
664
|
-
let t = new TextDecoder(), r = t.decode(e.source.files.get(
|
|
728
|
+
let t = new TextDecoder(), r = t.decode(e.source.files.get(s)), i;
|
|
665
729
|
try {
|
|
666
|
-
let t =
|
|
667
|
-
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;
|
|
668
732
|
} catch (e) {
|
|
669
|
-
if (!(e instanceof
|
|
733
|
+
if (!(e instanceof u)) throw e;
|
|
670
734
|
i = null;
|
|
671
735
|
}
|
|
672
736
|
let a;
|
|
673
737
|
try {
|
|
674
|
-
let n = await (await e.source.directory.getFileHandle(
|
|
738
|
+
let n = await (await e.source.directory.getFileHandle(s)).getFile();
|
|
675
739
|
a = t.decode(new Uint8Array(await n.arrayBuffer()));
|
|
676
740
|
} catch (e) {
|
|
677
741
|
a = null;
|
|
@@ -686,28 +750,28 @@ function me(e, t) {
|
|
|
686
750
|
if (i || r || !n || !t.blockReload) return Promise.resolve();
|
|
687
751
|
if (o) return o;
|
|
688
752
|
let e = n, a = e.baseline;
|
|
689
|
-
return o =
|
|
753
|
+
return o = A(e).then((t) => {
|
|
690
754
|
n === e && e.baseline === a && !r && (e.pending = t);
|
|
691
755
|
}).finally(() => {
|
|
692
756
|
o = null;
|
|
693
757
|
}), o;
|
|
694
758
|
},
|
|
695
759
|
async reload() {
|
|
696
|
-
if (!n ||
|
|
760
|
+
if (!n || P() !== "ready" || !t.blockReload) return !1;
|
|
697
761
|
let o = n;
|
|
698
|
-
|
|
762
|
+
C(o), r = !0;
|
|
699
763
|
try {
|
|
700
|
-
let r = a, d = await
|
|
701
|
-
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;
|
|
702
766
|
let f;
|
|
703
767
|
try {
|
|
704
768
|
var c, u;
|
|
705
769
|
let { edits: n } = d;
|
|
706
|
-
f = n.kind === "values" ? K((c = e.runtime.targets) == null ? [] : c, n.changes) :
|
|
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);
|
|
707
771
|
} catch (e) {
|
|
708
|
-
throw o.pending =
|
|
772
|
+
throw o.pending = R(R({}, d), {}, { edits: null }), e;
|
|
709
773
|
}
|
|
710
|
-
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;
|
|
711
775
|
} finally {
|
|
712
776
|
r = !1;
|
|
713
777
|
}
|
|
@@ -715,10 +779,10 @@ function me(e, t) {
|
|
|
715
779
|
reloadAll(e) {
|
|
716
780
|
var r;
|
|
717
781
|
let i = n;
|
|
718
|
-
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);
|
|
719
783
|
},
|
|
720
784
|
open(e, t) {
|
|
721
|
-
return
|
|
785
|
+
return O(async () => {
|
|
722
786
|
try {
|
|
723
787
|
return await e({
|
|
724
788
|
id: "turbowarp-plus-project-folder",
|
|
@@ -731,27 +795,55 @@ function me(e, t) {
|
|
|
731
795
|
}, t);
|
|
732
796
|
},
|
|
733
797
|
openDirectory(e, t) {
|
|
734
|
-
return
|
|
798
|
+
return O(() => Promise.resolve(e), t);
|
|
735
799
|
},
|
|
736
800
|
async save() {
|
|
737
|
-
if (!n || r) throw new
|
|
738
|
-
let
|
|
739
|
-
|
|
801
|
+
if (!n || r) throw new u("conflict");
|
|
802
|
+
let i = n;
|
|
803
|
+
C(i), r = !0;
|
|
740
804
|
try {
|
|
741
|
-
let r = a,
|
|
742
|
-
if (await
|
|
743
|
-
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`;
|
|
744
822
|
try {
|
|
745
|
-
|
|
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);
|
|
746
832
|
} catch (e) {
|
|
747
|
-
|
|
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;
|
|
748
836
|
}
|
|
749
|
-
|
|
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";
|
|
750
842
|
} finally {
|
|
751
843
|
r = !1;
|
|
752
844
|
}
|
|
753
845
|
},
|
|
754
|
-
dispose:
|
|
846
|
+
dispose: T
|
|
755
847
|
};
|
|
756
848
|
}
|
|
757
849
|
// src/index.ts
|
|
@@ -764,7 +856,7 @@ var Q = {
|
|
|
764
856
|
saved: "Project folder saved.",
|
|
765
857
|
unchanged: "No changes to save.",
|
|
766
858
|
conflict: "The project folder changed outside the editor or is no longer open. Your edits are still in the editor.",
|
|
767
|
-
unsupported: "This project or edit
|
|
859
|
+
unsupported: "This project or edit cannot be saved to a project folder yet.",
|
|
768
860
|
failed: "Could not access the project folder.",
|
|
769
861
|
external: "External changes detected.",
|
|
770
862
|
reload: "Reload from Disk",
|
|
@@ -796,7 +888,7 @@ var Q = {
|
|
|
796
888
|
saved: "プロジェクトフォルダに保存しました。",
|
|
797
889
|
unchanged: "保存する変更はありません。",
|
|
798
890
|
conflict: "外部でフォルダが変更されたか、作品が切り替わりました。編集中の変更はエディターに残っています。",
|
|
799
|
-
unsupported: "
|
|
891
|
+
unsupported: "この作品または編集は、まだプロジェクトフォルダに保存できません。",
|
|
800
892
|
failed: "プロジェクトフォルダにアクセスできませんでした。",
|
|
801
893
|
external: "外部変更あり",
|
|
802
894
|
reload: "ディスクから再読み込み",
|
|
@@ -821,11 +913,11 @@ var Q = {
|
|
|
821
913
|
full: "この変更は作品全体の再読み込みが必要です。"
|
|
822
914
|
}
|
|
823
915
|
}, $ = /* @__PURE__ */ new WeakMap();
|
|
824
|
-
function
|
|
916
|
+
function ve({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0 }) {
|
|
825
917
|
var a;
|
|
826
918
|
let o = t.defaultView, s = o == null ? void 0 : o.showDirectoryPicker;
|
|
827
919
|
if (!s || !((a = e.runtime) != null && a.storage)) return null;
|
|
828
|
-
let c =
|
|
920
|
+
let c = _e(e, n), l = t.createElement("output");
|
|
829
921
|
l.dataset.projectFolderStatus = "", l.setAttribute("role", "status"), l.hidden = !0, Object.assign(l.style, {
|
|
830
922
|
position: "fixed",
|
|
831
923
|
insetInlineEnd: "1rem",
|
|
@@ -838,17 +930,17 @@ function he({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
838
930
|
border: "1px solid currentColor",
|
|
839
931
|
borderRadius: "0.4rem"
|
|
840
932
|
}), t.body.append(l);
|
|
841
|
-
let
|
|
842
|
-
l.isConnected && (l.hidden = !1, l.textContent = e, o.clearTimeout(
|
|
933
|
+
let d, f = (e) => {
|
|
934
|
+
l.isConnected && (l.hidden = !1, l.textContent = e, o.clearTimeout(d), d = o.setTimeout(() => {
|
|
843
935
|
l.hidden = !0;
|
|
844
936
|
}, 7500));
|
|
845
|
-
},
|
|
846
|
-
let n =
|
|
847
|
-
|
|
848
|
-
},
|
|
937
|
+
}, p = (e) => e.startsWith("ja") ? Q.ja : Q.en, m = (e, t) => {
|
|
938
|
+
let n = p(e), r = t instanceof u && t.message !== t.code ? ` (${t.message})` : "";
|
|
939
|
+
f((t instanceof u ? n[t.code] : n.failed) + r);
|
|
940
|
+
}, h, g = () => {};
|
|
849
941
|
if (n.blockReload) {
|
|
850
|
-
var
|
|
851
|
-
let e =
|
|
942
|
+
var _;
|
|
943
|
+
let e = p(r), a = t.createElement("aside");
|
|
852
944
|
a.dataset.projectFolderExternal = "", a.hidden = !0, Object.assign(a.style, {
|
|
853
945
|
position: "fixed",
|
|
854
946
|
insetInlineEnd: "1rem",
|
|
@@ -865,9 +957,9 @@ function he({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
865
957
|
s.setAttribute("role", "status");
|
|
866
958
|
let l = t.createElement("button");
|
|
867
959
|
l.type = "button", l.textContent = e.reload, a.append(s, l), t.body.append(a);
|
|
868
|
-
let u = (
|
|
869
|
-
if (!
|
|
870
|
-
|
|
960
|
+
let u = (_ = n.blockReload.compareChanges) == null ? void 0 : _.bind(n.blockReload), d = !1, v = async (t) => {
|
|
961
|
+
if (!d) {
|
|
962
|
+
d = !0;
|
|
871
963
|
try {
|
|
872
964
|
let n = await c.comparison();
|
|
873
965
|
if (!n) return;
|
|
@@ -895,18 +987,18 @@ function he({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
895
987
|
closeLabel: e.close
|
|
896
988
|
}) === "discard" && c.reloadState === "dirty" && C(() => c.reloadAll(() => !0));
|
|
897
989
|
} catch (e) {
|
|
898
|
-
|
|
990
|
+
m(r, e);
|
|
899
991
|
} finally {
|
|
900
|
-
|
|
992
|
+
d = !1, g();
|
|
901
993
|
}
|
|
902
994
|
}
|
|
903
995
|
}, y, b = null, x = null, S = null, C = (t) => {
|
|
904
996
|
let n = t();
|
|
905
|
-
|
|
906
|
-
(t === !0 || t === "opened") &&
|
|
907
|
-
}, (e) =>
|
|
997
|
+
g(), n.then((t) => {
|
|
998
|
+
(t === !0 || t === "opened") && f(e.reloaded);
|
|
999
|
+
}, (e) => m(r, e)).finally(g);
|
|
908
1000
|
};
|
|
909
|
-
|
|
1001
|
+
g = () => {
|
|
910
1002
|
let t = c.reloadState, n = c.reloadKind;
|
|
911
1003
|
if (i && c.canAutoReload && c.pendingVersion !== b) {
|
|
912
1004
|
b = c.pendingVersion, C(() => c.reload());
|
|
@@ -926,8 +1018,8 @@ function he({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
926
1018
|
};
|
|
927
1019
|
let w = () => {
|
|
928
1020
|
t.visibilityState === "visible" && c.refresh().then(() => {
|
|
929
|
-
|
|
930
|
-
}, (e) =>
|
|
1021
|
+
g(), c.settling && T(500);
|
|
1022
|
+
}, (e) => m(r, e));
|
|
931
1023
|
}, T = (e) => {
|
|
932
1024
|
o.clearTimeout(y), y = o.setTimeout(w, e);
|
|
933
1025
|
};
|
|
@@ -940,30 +1032,30 @@ function he({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
940
1032
|
let t = c.reloadState;
|
|
941
1033
|
t === "ready" ? C(() => c.reload()) : t === "full" ? C(() => c.reloadAll(() => !0)) : t === "dirty" && u ? v(u) : t === "dirty" && C(() => c.reloadAll(() => o.confirm(e.discardConfirm)));
|
|
942
1034
|
});
|
|
943
|
-
let E = n.blockReload.subscribe(
|
|
944
|
-
o.addEventListener("focus", w), t.addEventListener("visibilitychange", w),
|
|
1035
|
+
let E = n.blockReload.subscribe(g), D = o.setInterval(w, 2e3);
|
|
1036
|
+
o.addEventListener("focus", w), t.addEventListener("visibilitychange", w), h = () => {
|
|
945
1037
|
E(), o.clearInterval(D), o.clearTimeout(y), S == null || S.disconnect(), o.removeEventListener("focus", w), t.removeEventListener("visibilitychange", w), a.remove();
|
|
946
1038
|
};
|
|
947
1039
|
}
|
|
948
1040
|
return $.set(e, {
|
|
949
1041
|
session: c,
|
|
950
1042
|
open(e) {
|
|
951
|
-
let t =
|
|
1043
|
+
let t = p(e);
|
|
952
1044
|
c.open((e) => s.call(o, e), () => o.confirm(t.replace)).then((e) => {
|
|
953
|
-
e === "opened" &&
|
|
954
|
-
}, (t) =>
|
|
1045
|
+
e === "opened" && f(t.opened);
|
|
1046
|
+
}, (t) => m(e, t)).finally(g), g();
|
|
955
1047
|
},
|
|
956
1048
|
save(e) {
|
|
957
|
-
c.busy || (c.save().then((t) =>
|
|
1049
|
+
c.busy || (c.save().then((t) => f(p(e)[t]), (t) => m(e, t)).finally(g), g());
|
|
958
1050
|
}
|
|
959
1051
|
}), {
|
|
960
|
-
openDirectory: (...e) => c.openDirectory(...e).finally(
|
|
1052
|
+
openDirectory: (...e) => c.openDirectory(...e).finally(g),
|
|
961
1053
|
dispose() {
|
|
962
|
-
$.delete(e), c.dispose(),
|
|
1054
|
+
$.delete(e), c.dispose(), h == null || h(), o.clearTimeout(d), l.remove();
|
|
963
1055
|
}
|
|
964
1056
|
};
|
|
965
1057
|
}
|
|
966
|
-
function
|
|
1058
|
+
function ye(e, t = "en") {
|
|
967
1059
|
let n = $.get(e);
|
|
968
1060
|
if (n) return {
|
|
969
1061
|
open: () => n.open(t),
|
|
@@ -971,7 +1063,7 @@ function ge(e, t = "en") {
|
|
|
971
1063
|
detach: () => n.session.detach()
|
|
972
1064
|
};
|
|
973
1065
|
}
|
|
974
|
-
function
|
|
1066
|
+
function be(e, { vm: t, locale: n = "en", MenuItem: r, MenuSection: i, onRequestClose: a }) {
|
|
975
1067
|
let o = $.get(t);
|
|
976
1068
|
if (!o) return null;
|
|
977
1069
|
let s = n.startsWith("ja") ? Q.ja : Q.en, c = (t) => {
|
|
@@ -991,4 +1083,4 @@ function _e(e, { vm: t, locale: n = "en", MenuItem: r, MenuSection: i, onRequest
|
|
|
991
1083
|
};
|
|
992
1084
|
return e(i, null, c("open"), o.session.canSave ? c("save") : null);
|
|
993
1085
|
}
|
|
994
|
-
export {
|
|
1086
|
+
export { ve as mountProjectFolder, ye as projectFolderActions, be as renderProjectFolderMenu };
|