@kubohiroya/turbowarp-plus-editor-project-folder 0.3.0 → 0.5.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.d.ts +1 -1
- package/dist/index.js +400 -313
- package/dist/session.d.ts +33 -0
- package/dist/source.d.ts +5 -0
- package/package.json +1 -1
- package/src/index.ts +41 -4
- package/src/session.ts +40 -0
- package/src/source.ts +58 -22
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) => `${e.name}/${t}.${n}`;
|
|
110
|
+
async function C(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))), C = 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 (C.formatVersion !== 1 || !Array.isArray(C.extensions) || C.extensions.length || C.extensionBundles !== void 0 && (!Array.isArray(C.extensionBundles) || C.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(S(o, r, i), {
|
|
187
131
|
id: r,
|
|
188
132
|
format: i,
|
|
189
133
|
type: o,
|
|
@@ -191,94 +135,159 @@ 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 w = (e, t) => e.length === t.length && e.every((e, n) => e === t[n]);
|
|
159
|
+
async function T(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
|
+
]), [u, d] = await Promise.all([b(i), b(a)]);
|
|
167
|
+
if (!x(u, e.bytes.keys()) || d.size || (await Promise.all([...[c, l].map(async (e) => _(await g(n, e)) === r.get(e)), ...[...u].map(async (e) => _(await g(i, e)) === r.get(`assets/${e}`))])).includes(!1)) return "structure";
|
|
168
|
+
let f = _(o);
|
|
169
|
+
if (f === r.get("project.source.json")) return null;
|
|
170
|
+
if ((t == null ? void 0 : t.version) === f) return t;
|
|
171
|
+
let p = await v(o);
|
|
172
|
+
return w(p, e.files.get("project.source.json")) ? (r.set(s, f), null) : {
|
|
173
|
+
version: f,
|
|
174
|
+
bytes: p,
|
|
175
|
+
project: h(new TextDecoder("utf-8", { fatal: !0 }).decode(p))
|
|
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 E(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 (!w(await y(e.directory, t), n)) throw new u("conflict");
|
|
186
|
+
for (let [n, r] of e.bytes) if (!w(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 D = (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) => D(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) && D(e[n], t[n]));
|
|
197
|
+
}, O = (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) || D(e[n], t[n])), k = (e, t, n) => {
|
|
203
|
+
if (D(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) => O(e, t[n]))) return n.map((n, r) => k(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) ? D(t[e], n[e]) || (r[e] = k(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
|
-
}
|
|
210
|
+
}, A = (e) => {
|
|
211
|
+
let t = /* @__PURE__ */ new Set();
|
|
212
|
+
for (let n of e.targets) for (let e of ["costumes", "sounds"]) {
|
|
213
|
+
let r = n[e];
|
|
214
|
+
if (Array.isArray(r)) for (let e of r) f(e) && typeof e.md5ext == "string" && t.add(e.md5ext);
|
|
215
|
+
}
|
|
216
|
+
return t;
|
|
217
|
+
}, j = (e) => e.turboWarpPlus !== void 0 || e.customFonts !== void 0 || e.extensionURLs !== void 0 && (!f(e.extensionURLs) || Object.keys(e.extensionURLs).length > 0);
|
|
218
|
+
function M(e, t, n) {
|
|
219
|
+
let s = (e) => e.targets.map(m), c = s(t), l = s(n);
|
|
220
|
+
if (c.length !== l.length || !l.every((e) => c.includes(e))) return d("Adding, removing or renaming sprites is not saved to a project folder yet");
|
|
221
|
+
let u = A(n), f = A(t);
|
|
222
|
+
if (u.size !== f.size || [...u].some((e) => !f.has(e))) return d("Adding or removing costumes and sounds is not saved to a project folder yet");
|
|
223
|
+
if (j(n)) return d("Custom extensions and fonts are not saved to a project folder");
|
|
224
|
+
if (D(t, n)) return null;
|
|
225
|
+
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) => [m(e), e])), S = v.map((e) => {
|
|
226
|
+
let t = m(e), n = b.get(t);
|
|
227
|
+
return n ? k(n, x.get(t), e) : d("The original target could not be identified");
|
|
228
|
+
}), C = D(c, l) ? p.map(m) : l, w = new Map(S.map((e) => [m(e), e])), T = k(h, _, y), E = {};
|
|
229
|
+
for (let t of Object.keys(e)) t === "targets" ? E.targets = C.map((e) => w.get(e)) : Object.hasOwn(T, t) && (E[t] = T[t]);
|
|
230
|
+
for (let e of Object.keys(T)) Object.hasOwn(E, e) || (E[e] = T[e]);
|
|
231
|
+
return E;
|
|
232
|
+
}
|
|
233
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/typeof.js
|
|
234
|
+
function N(e) {
|
|
235
|
+
"@babel/helpers - typeof";
|
|
236
|
+
return N = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(e) {
|
|
237
|
+
return typeof e;
|
|
238
|
+
} : function(e) {
|
|
239
|
+
return e && typeof Symbol == "function" && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
|
|
240
|
+
}, N(e);
|
|
241
|
+
}
|
|
242
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPrimitive.js
|
|
243
|
+
function P(e, t) {
|
|
244
|
+
if (N(e) != "object" || !e) return e;
|
|
245
|
+
var n = e[Symbol.toPrimitive];
|
|
246
|
+
if (n !== void 0) {
|
|
247
|
+
var r = n.call(e, t || "default");
|
|
248
|
+
if (N(r) != "object") return r;
|
|
249
|
+
throw TypeError("@@toPrimitive must return a primitive value.");
|
|
250
|
+
}
|
|
251
|
+
return (t === "string" ? String : Number)(e);
|
|
252
|
+
}
|
|
253
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/toPropertyKey.js
|
|
254
|
+
function ee(e) {
|
|
255
|
+
var t = P(e, "string");
|
|
256
|
+
return N(t) == "symbol" ? t : t + "";
|
|
257
|
+
}
|
|
258
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/defineProperty.js
|
|
261
259
|
function te(e, t, n) {
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
260
|
+
return (t = ee(t)) in e ? Object.defineProperty(e, t, {
|
|
261
|
+
value: n,
|
|
262
|
+
enumerable: !0,
|
|
263
|
+
configurable: !0,
|
|
264
|
+
writable: !0
|
|
265
|
+
}) : e[t] = n, e;
|
|
266
|
+
}
|
|
267
|
+
// \0@oxc-project+runtime@0.156.0/helpers/esm/objectSpread2.js
|
|
268
|
+
function F(e, t) {
|
|
269
|
+
var n = Object.keys(e);
|
|
270
|
+
if (Object.getOwnPropertySymbols) {
|
|
271
|
+
var r = Object.getOwnPropertySymbols(e);
|
|
272
|
+
t && (r = r.filter(function(t) {
|
|
273
|
+
return Object.getOwnPropertyDescriptor(e, t).enumerable;
|
|
274
|
+
})), n.push.apply(n, r);
|
|
274
275
|
}
|
|
275
|
-
return
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
276
|
+
return n;
|
|
277
|
+
}
|
|
278
|
+
function I(e) {
|
|
279
|
+
for (var t = 1; t < arguments.length; t++) {
|
|
280
|
+
var n = arguments[t] == null ? {} : arguments[t];
|
|
281
|
+
t % 2 ? F(Object(n), !0).forEach(function(t) {
|
|
282
|
+
te(e, t, n[t]);
|
|
283
|
+
}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : F(Object(n)).forEach(function(t) {
|
|
284
|
+
Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(n, t));
|
|
285
|
+
});
|
|
286
|
+
}
|
|
287
|
+
return e;
|
|
279
288
|
}
|
|
280
289
|
// src/block-reload.ts
|
|
281
|
-
var
|
|
290
|
+
var L = ["targets"], ne = ["targets"], re = ["blocks"], ie = ["blocks"], ae = [
|
|
282
291
|
"inputs",
|
|
283
292
|
"fields",
|
|
284
293
|
"x",
|
|
@@ -288,7 +297,7 @@ var ne = ["targets"], re = ["targets"], F = ["blocks"], ie = ["blocks"], ae = [
|
|
|
288
297
|
"fields",
|
|
289
298
|
"x",
|
|
290
299
|
"y"
|
|
291
|
-
],
|
|
300
|
+
], R = (e) => typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e), z = {
|
|
292
301
|
4: ["math_number", "NUM"],
|
|
293
302
|
5: ["math_positive_number", "NUM"],
|
|
294
303
|
6: ["math_whole_number", "NUM"],
|
|
@@ -296,53 +305,53 @@ var ne = ["targets"], re = ["targets"], F = ["blocks"], ie = ["blocks"], ae = [
|
|
|
296
305
|
8: ["math_angle", "NUM"],
|
|
297
306
|
9: ["colour_picker", "COLOUR"],
|
|
298
307
|
10: ["text", "TEXT"]
|
|
299
|
-
},
|
|
308
|
+
}, B = () => d("Only values and coordinates of existing blocks can be reloaded"), V = (e, t) => D(Object.keys(e), Object.keys(t)), H = (e, t) => typeof e != "number" || typeof t != "number" || !Number.isSafeInteger(e) || !Number.isSafeInteger(t) ? B() : {
|
|
300
309
|
x: e,
|
|
301
310
|
y: t
|
|
302
311
|
};
|
|
303
|
-
function
|
|
304
|
-
let { targets: n } = e, i = r(e,
|
|
305
|
-
if (n.length !== a.length || !
|
|
312
|
+
function U(e, t) {
|
|
313
|
+
let { targets: n } = e, i = r(e, L), { targets: a } = t, o = r(t, ne);
|
|
314
|
+
if (n.length !== a.length || !D(i, o)) return B();
|
|
306
315
|
let s = [];
|
|
307
316
|
for (let [e, t] of n.entries()) {
|
|
308
|
-
let { blocks: n } = t, i = r(t,
|
|
309
|
-
if (!
|
|
310
|
-
if (!
|
|
311
|
-
if (
|
|
312
|
-
return
|
|
317
|
+
let { blocks: n } = t, i = r(t, re), o = a[e], { blocks: c } = o;
|
|
318
|
+
if (!D(i, r(o, ie))) return B();
|
|
319
|
+
if (!f(n) || !f(c)) {
|
|
320
|
+
if (D(n, c)) continue;
|
|
321
|
+
return B();
|
|
313
322
|
}
|
|
314
|
-
if (!
|
|
323
|
+
if (!V(n, c)) return B();
|
|
315
324
|
for (let [e, i] of Object.entries(n)) {
|
|
316
325
|
let n = c[e];
|
|
317
|
-
if (
|
|
318
|
-
if (!
|
|
319
|
-
let { inputs: a, fields: o, x:
|
|
320
|
-
if (!
|
|
326
|
+
if (D(i, n)) continue;
|
|
327
|
+
if (!f(i) || !f(n)) return B();
|
|
328
|
+
let { inputs: a, fields: o, x: l, y: u } = i, d = r(i, ae), { inputs: p, fields: m, x: h, y: g } = n;
|
|
329
|
+
if (!D(d, r(n, oe)) || typeof d.opcode != "string") return B();
|
|
321
330
|
let _ = {
|
|
322
331
|
id: e,
|
|
323
332
|
target: t.name,
|
|
324
333
|
stage: t.isStage,
|
|
325
|
-
opcode:
|
|
334
|
+
opcode: d.opcode
|
|
326
335
|
};
|
|
327
|
-
if (
|
|
328
|
-
if (
|
|
329
|
-
s.push(
|
|
336
|
+
if (l !== h || u !== g) {
|
|
337
|
+
if (d.topLevel !== !0) return B();
|
|
338
|
+
s.push(I(I({}, _), {}, {
|
|
330
339
|
kind: "position",
|
|
331
|
-
before:
|
|
332
|
-
after:
|
|
340
|
+
before: H(l, u),
|
|
341
|
+
after: H(h, g)
|
|
333
342
|
}));
|
|
334
343
|
}
|
|
335
|
-
if (!
|
|
336
|
-
if (!
|
|
344
|
+
if (!D(o, m)) {
|
|
345
|
+
if (!f(o) || !f(m) || !V(o, m)) return B();
|
|
337
346
|
for (let [e, t] of Object.entries(o)) {
|
|
338
347
|
let n = m[e];
|
|
339
|
-
if (!
|
|
348
|
+
if (!D(t, n)) {
|
|
340
349
|
if ([
|
|
341
350
|
"VARIABLE",
|
|
342
351
|
"LIST",
|
|
343
352
|
"BROADCAST_OPTION"
|
|
344
|
-
].includes(e) ||
|
|
345
|
-
s.push(
|
|
353
|
+
].includes(e) || d.opcode === "sensing_of_object_menu" || !Array.isArray(t) || !Array.isArray(n) || t.length !== 1 || n.length !== 1 || !R(t[0]) || !R(n[0])) return B();
|
|
354
|
+
s.push(I(I({}, _), {}, {
|
|
346
355
|
kind: "field",
|
|
347
356
|
name: e,
|
|
348
357
|
before: t[0],
|
|
@@ -351,18 +360,18 @@ function V(e, t) {
|
|
|
351
360
|
}
|
|
352
361
|
}
|
|
353
362
|
}
|
|
354
|
-
if (!
|
|
355
|
-
if (!
|
|
363
|
+
if (!D(a, p)) {
|
|
364
|
+
if (!f(a) || !f(p) || !V(a, p)) return B();
|
|
356
365
|
for (let [e, t] of Object.entries(a)) {
|
|
357
366
|
let n = p[e];
|
|
358
|
-
if (
|
|
359
|
-
if (!Array.isArray(t) || !Array.isArray(n) || t[0] !== n[0]) return
|
|
367
|
+
if (D(t, n)) continue;
|
|
368
|
+
if (!Array.isArray(t) || !Array.isArray(n) || t[0] !== n[0]) return B();
|
|
360
369
|
let r = t[0] === 1 ? 1 : t[0] === 3 && typeof t[1] == "string" && t[1] === n[1] ? 2 : null;
|
|
361
|
-
if (r === null || t.length !== r + 1 || n.length !== r + 1) return
|
|
370
|
+
if (r === null || t.length !== r + 1 || n.length !== r + 1) return B();
|
|
362
371
|
let i = t[r], a = n[r];
|
|
363
|
-
if (!Array.isArray(i) || !Array.isArray(a) || i.length !== 2 || a.length !== 2 || typeof i[0] != "number" || !Object.hasOwn(
|
|
372
|
+
if (!Array.isArray(i) || !Array.isArray(a) || i.length !== 2 || a.length !== 2 || typeof i[0] != "number" || !Object.hasOwn(z, i[0]) || i[0] !== a[0] || !R(i[1]) || !R(a[1])) return B();
|
|
364
373
|
let o = r === 2 ? t[1] : null;
|
|
365
|
-
s.push(
|
|
374
|
+
s.push(I(I({}, _), {}, {
|
|
366
375
|
kind: "input",
|
|
367
376
|
name: e,
|
|
368
377
|
connected: o,
|
|
@@ -376,15 +385,15 @@ function V(e, t) {
|
|
|
376
385
|
}
|
|
377
386
|
return s;
|
|
378
387
|
}
|
|
379
|
-
function
|
|
388
|
+
function W(e, t) {
|
|
380
389
|
let n = /* @__PURE__ */ new Set(), r = t.map((t) => {
|
|
381
390
|
let r = e.filter((e) => e.isStage === t.stage && (t.stage || e.isOriginal && e.getName() === t.target));
|
|
382
|
-
if (r.length !== 1) return
|
|
391
|
+
if (r.length !== 1) return B();
|
|
383
392
|
let i = r[0], a = i.blocks, o = a.getBlock(t.id);
|
|
384
|
-
if (!o || o.opcode !== t.opcode) return
|
|
393
|
+
if (!o || o.opcode !== t.opcode) return B();
|
|
385
394
|
if (n.add(i), t.kind === "position") {
|
|
386
395
|
var s, c;
|
|
387
|
-
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 ?
|
|
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 ? B() : (e) => a.moveBlock({
|
|
388
397
|
id: t.id,
|
|
389
398
|
newCoordinate: t[e]
|
|
390
399
|
});
|
|
@@ -393,13 +402,13 @@ function H(e, t) {
|
|
|
393
402
|
if (t.kind === "input") {
|
|
394
403
|
var d;
|
|
395
404
|
let e = o.inputs[t.name], n = e == null ? void 0 : e.shadow;
|
|
396
|
-
if (!n || e.block !== ((d = t.connected) == null ? n : d)) return
|
|
397
|
-
let r = a.getBlock(n), [i, s] =
|
|
398
|
-
if (!(r != null && r.shadow) || r.parent !== o.id || r.opcode !== i) return
|
|
405
|
+
if (!n || e.block !== ((d = t.connected) == null ? n : d)) return B();
|
|
406
|
+
let r = a.getBlock(n), [i, s] = z[t.tag];
|
|
407
|
+
if (!(r != null && r.shadow) || r.parent !== o.id || r.opcode !== i) return B();
|
|
399
408
|
l = r, u = s;
|
|
400
409
|
}
|
|
401
410
|
let f = l.fields[u];
|
|
402
|
-
return !f || f.id != null || f.value !== t.before || l.isMonitored || o.isMonitored ?
|
|
411
|
+
return !f || f.id != null || f.value !== t.before || l.isMonitored || o.isMonitored ? B() : (e) => a.changeBlock({
|
|
403
412
|
id: l.id,
|
|
404
413
|
element: "field",
|
|
405
414
|
name: u,
|
|
@@ -415,7 +424,7 @@ function H(e, t) {
|
|
|
415
424
|
return [...n];
|
|
416
425
|
}
|
|
417
426
|
// src/script-reload.ts
|
|
418
|
-
var
|
|
427
|
+
var G = ["targets"], K = ["targets"], se = ["blocks"], ce = ["blocks"], q = (e = "Only changes to the scripts of existing targets can be reloaded in place") => d(e), le = /* @__PURE__ */ new Set([
|
|
419
428
|
"motion",
|
|
420
429
|
"looks",
|
|
421
430
|
"sound",
|
|
@@ -429,11 +438,11 @@ var U = ["targets"], W = ["targets"], G = ["blocks"], K = ["blocks"], q = (e = "
|
|
|
429
438
|
"math",
|
|
430
439
|
"text",
|
|
431
440
|
"colour"
|
|
432
|
-
]), J = (e) => e.split("_", 1)[0],
|
|
441
|
+
]), J = (e) => e.split("_", 1)[0], ue = /* @__PURE__ */ new Set([
|
|
433
442
|
"VARIABLE",
|
|
434
443
|
"LIST",
|
|
435
444
|
"BROADCAST_OPTION"
|
|
436
|
-
]),
|
|
445
|
+
]), de = (e) => f(e) && typeof e.parent == "string" ? e.parent : null;
|
|
437
446
|
function Y(e) {
|
|
438
447
|
let t = /* @__PURE__ */ new Map();
|
|
439
448
|
for (let n of Object.keys(e)) {
|
|
@@ -441,7 +450,7 @@ function Y(e) {
|
|
|
441
450
|
for (;;) {
|
|
442
451
|
if (i.has(r)) return q("Blocks form a cycle");
|
|
443
452
|
i.add(r);
|
|
444
|
-
let t =
|
|
453
|
+
let t = de(e[r]);
|
|
445
454
|
if (t === null) break;
|
|
446
455
|
if (!Object.hasOwn(e, t)) return q("A block refers to a missing parent");
|
|
447
456
|
r = t;
|
|
@@ -450,51 +459,51 @@ function Y(e) {
|
|
|
450
459
|
}
|
|
451
460
|
return t;
|
|
452
461
|
}
|
|
453
|
-
function
|
|
454
|
-
for (let n of Object.values(e))
|
|
462
|
+
function fe(e, t) {
|
|
463
|
+
for (let n of Object.values(e)) f(n) && typeof n.opcode == "string" && t.add(J(n.opcode));
|
|
455
464
|
}
|
|
456
|
-
function
|
|
457
|
-
let { targets: n } = e, i = r(e,
|
|
458
|
-
if (n.length !== a.length || !
|
|
459
|
-
let s = new Set(
|
|
460
|
-
for (let e of n)
|
|
465
|
+
function pe(e, t) {
|
|
466
|
+
let { targets: n } = e, i = r(e, G), { targets: a } = t, o = r(t, K);
|
|
467
|
+
if (n.length !== a.length || !D(i, o)) return q();
|
|
468
|
+
let s = new Set(le);
|
|
469
|
+
for (let e of n) f(e.blocks) && fe(e.blocks, s);
|
|
461
470
|
let c = [];
|
|
462
471
|
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 && !
|
|
472
|
+
let { blocks: n } = t, i = r(t, se), o = a[e], { blocks: l } = o;
|
|
473
|
+
if (!D(i, r(o, ce))) return q();
|
|
474
|
+
if (D(n, l)) continue;
|
|
475
|
+
let u = f(n) ? n : {}, d = f(l) ? l : {}, p = Y(u), m = Y(d), h = /* @__PURE__ */ new Set(), g = /* @__PURE__ */ new Set(), _ = (e) => {
|
|
476
|
+
let t = p.get(e), n = m.get(e), r = !1;
|
|
477
|
+
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
478
|
};
|
|
470
|
-
for (let e of /* @__PURE__ */ new Set([...Object.keys(u), ...Object.keys(d)]))
|
|
479
|
+
for (let e of /* @__PURE__ */ new Set([...Object.keys(u), ...Object.keys(d)])) D(u[e], d[e]) || _(e);
|
|
471
480
|
for (let e = !0; e;) {
|
|
472
481
|
e = !1;
|
|
473
|
-
for (let [t, n] of
|
|
474
|
-
for (let [t, n] of
|
|
482
|
+
for (let [t, n] of p) h.has(n) && _(t) && (e = !0);
|
|
483
|
+
for (let [t, n] of m) g.has(n) && _(t) && (e = !0);
|
|
475
484
|
}
|
|
476
|
-
let
|
|
477
|
-
for (let [e, t] of
|
|
478
|
-
for (let e of Object.values(
|
|
485
|
+
let v = {};
|
|
486
|
+
for (let [e, t] of m) g.has(t) && (v[e] = d[e]);
|
|
487
|
+
for (let e of Object.values(v)) if (f(e)) {
|
|
479
488
|
if (typeof e.opcode != "string") return q("A block has no opcode");
|
|
480
489
|
if (!s.has(J(e.opcode))) return q(`Blocks need an extension the project does not use: ${e.opcode}`);
|
|
481
490
|
}
|
|
482
491
|
c.push({
|
|
483
492
|
target: t.name,
|
|
484
493
|
stage: t.isStage,
|
|
485
|
-
remove: [...
|
|
486
|
-
blocks:
|
|
494
|
+
remove: [...h],
|
|
495
|
+
blocks: v
|
|
487
496
|
});
|
|
488
497
|
}
|
|
489
498
|
return c;
|
|
490
499
|
}
|
|
491
|
-
var
|
|
500
|
+
var me = (e, t) => {
|
|
492
501
|
let n = e.filter((e) => e.isStage === t.stage && (t.stage || e.isOriginal && e.getName() === t.target));
|
|
493
502
|
return n.length === 1 ? n[0] : q();
|
|
494
503
|
};
|
|
495
|
-
function
|
|
504
|
+
function he(e, t, n) {
|
|
496
505
|
let r = t.map((t) => {
|
|
497
|
-
let r =
|
|
506
|
+
let r = me(e, t), i = r.blocks;
|
|
498
507
|
for (let e of t.remove) {
|
|
499
508
|
let t = i.getBlock(e);
|
|
500
509
|
if (!t || !t.topLevel || !i._scripts.includes(e)) return q("The editor and the folder differ");
|
|
@@ -506,7 +515,7 @@ function pe(e, t, n) {
|
|
|
506
515
|
if (e.comment && !(r.comments && Object.hasOwn(r.comments, e.comment))) return q("A block refers to a missing comment");
|
|
507
516
|
for (let [t, n] of Object.entries((o = e.fields) == null ? {} : o)) {
|
|
508
517
|
var s;
|
|
509
|
-
if ((
|
|
518
|
+
if ((ue.has(t) || n.variableType) && (typeof n.id != "string" || !((s = r.lookupVariableById) != null && s.call(r, n.id)))) return q("A block refers to a variable, list or message the project does not have");
|
|
510
519
|
}
|
|
511
520
|
}
|
|
512
521
|
return {
|
|
@@ -517,7 +526,7 @@ function pe(e, t, n) {
|
|
|
517
526
|
};
|
|
518
527
|
}), i = r.map(({ container: e }) => ({
|
|
519
528
|
container: e,
|
|
520
|
-
blocks:
|
|
529
|
+
blocks: I({}, e._blocks),
|
|
521
530
|
scripts: [...e._scripts],
|
|
522
531
|
tops: new Map(Object.entries(e._blocks).map(([e, t]) => [e, t.topLevel]))
|
|
523
532
|
}));
|
|
@@ -538,39 +547,39 @@ function pe(e, t, n) {
|
|
|
538
547
|
return r.map(({ target: e }) => e);
|
|
539
548
|
}
|
|
540
549
|
// src/session.ts
|
|
541
|
-
var X = /* @__PURE__ */ new WeakMap(),
|
|
550
|
+
var X = /* @__PURE__ */ new WeakMap(), Z = (e) => {
|
|
542
551
|
let t = X.get(e);
|
|
543
552
|
if (t) return t;
|
|
544
553
|
let n = { assets: null };
|
|
545
554
|
return e.addHelper({ load(e, t, r) {
|
|
546
555
|
var i;
|
|
547
|
-
let a = (i = n.assets) == null ? void 0 : i.get(
|
|
556
|
+
let a = (i = n.assets) == null ? void 0 : i.get(S(e, t, r));
|
|
548
557
|
return a ? Promise.resolve(a) : null;
|
|
549
558
|
} }, 101), X.set(e, n), n;
|
|
550
559
|
};
|
|
551
|
-
function
|
|
552
|
-
let n = null, r = !1, i = !1, a = 0, o = null,
|
|
560
|
+
function ge(e, t) {
|
|
561
|
+
let n = null, r = !1, i = !1, a = 0, o = null, c = () => h(e.toJSON(void 0, { allowOptimization: !1 })), l = () => {
|
|
553
562
|
a++;
|
|
554
|
-
},
|
|
563
|
+
}, d = () => {
|
|
555
564
|
n = null;
|
|
556
565
|
};
|
|
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
|
-
},
|
|
566
|
+
e.runtime.on("PROJECT_LOADED", d), e.on("PROJECT_CHANGED", l);
|
|
567
|
+
let f = (t) => {
|
|
568
|
+
if (i || n !== t || e.runtime.getTargetForStage() !== t.stage) throw new u("conflict");
|
|
569
|
+
}, p = () => {
|
|
570
|
+
i = !0, n = null, e.runtime.off("PROJECT_LOADED", d), e.off("PROJECT_CHANGED", l);
|
|
571
|
+
}, m = async (a, o) => {
|
|
563
572
|
if (i || r) return "cancelled";
|
|
564
573
|
r = !0;
|
|
565
|
-
let
|
|
574
|
+
let s = e.runtime.getTargetForStage();
|
|
566
575
|
try {
|
|
567
576
|
var l;
|
|
568
577
|
let r = await a();
|
|
569
578
|
if (!r || i) return "cancelled";
|
|
570
|
-
let u = e.runtime.storage, d = await
|
|
571
|
-
if (i || e.runtime.getTargetForStage() !==
|
|
579
|
+
let u = e.runtime.storage, d = await C(r, u);
|
|
580
|
+
if (i || e.runtime.getTargetForStage() !== s || t.isProjectDirty() && !o()) return "cancelled";
|
|
572
581
|
t.beforeLoad(), n = null;
|
|
573
|
-
let f =
|
|
582
|
+
let f = Z(u), p = d.storageAssets;
|
|
574
583
|
f.assets = p;
|
|
575
584
|
let m;
|
|
576
585
|
try {
|
|
@@ -581,38 +590,38 @@ function he(e, t) {
|
|
|
581
590
|
return i || !m || e.runtime.getTargetForStage() !== m ? "cancelled" : (t.onOpened(r.name), n = {
|
|
582
591
|
source: d,
|
|
583
592
|
stage: m,
|
|
584
|
-
baseline:
|
|
593
|
+
baseline: c(),
|
|
585
594
|
pending: null
|
|
586
595
|
}, (l = e.renderer) == null || l.draw(), "opened");
|
|
587
596
|
} finally {
|
|
588
597
|
r = !1;
|
|
589
598
|
}
|
|
590
|
-
},
|
|
599
|
+
}, g = (e, n) => {
|
|
591
600
|
var r;
|
|
592
601
|
try {
|
|
593
602
|
return {
|
|
594
603
|
kind: "values",
|
|
595
|
-
changes:
|
|
604
|
+
changes: U(e, n)
|
|
596
605
|
};
|
|
597
606
|
} catch (e) {
|
|
598
|
-
if (!(e instanceof
|
|
607
|
+
if (!(e instanceof u)) throw e;
|
|
599
608
|
}
|
|
600
609
|
if (!((r = t.blockReload) != null && r.deserializeBlocks)) return null;
|
|
601
610
|
try {
|
|
602
611
|
return {
|
|
603
612
|
kind: "scripts",
|
|
604
|
-
changes:
|
|
613
|
+
changes: pe(e, n)
|
|
605
614
|
};
|
|
606
615
|
} catch (e) {
|
|
607
|
-
if (!(e instanceof
|
|
616
|
+
if (!(e instanceof u)) throw e;
|
|
608
617
|
return null;
|
|
609
618
|
}
|
|
610
|
-
},
|
|
619
|
+
}, _ = async (e) => {
|
|
611
620
|
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 ?
|
|
621
|
+
let n = typeof e.pending == "object" ? e.pending : null, r = await T(e.source, (t = n == null ? void 0 : n.update) == null ? null : t);
|
|
622
|
+
return !r || typeof r == "string" ? r : (n == null ? void 0 : n.update) === r ? I(I({}, n), {}, { stable: !0 }) : {
|
|
614
623
|
update: r,
|
|
615
|
-
edits:
|
|
624
|
+
edits: g(e.source.project, r.project),
|
|
616
625
|
stable: !1
|
|
617
626
|
};
|
|
618
627
|
}, v = () => {
|
|
@@ -658,11 +667,35 @@ function he(e, t) {
|
|
|
658
667
|
var e;
|
|
659
668
|
return (e = n == null ? void 0 : n.source.directory) == null ? null : e;
|
|
660
669
|
},
|
|
670
|
+
async comparison() {
|
|
671
|
+
let e = n;
|
|
672
|
+
if (!e) return null;
|
|
673
|
+
let t = new TextDecoder(), r = t.decode(e.source.files.get(s)), i;
|
|
674
|
+
try {
|
|
675
|
+
let t = M(e.source.project, e.baseline, c());
|
|
676
|
+
i = t ? `${JSON.stringify(t, null, 2)}\n` : r;
|
|
677
|
+
} catch (e) {
|
|
678
|
+
if (!(e instanceof u)) throw e;
|
|
679
|
+
i = null;
|
|
680
|
+
}
|
|
681
|
+
let a;
|
|
682
|
+
try {
|
|
683
|
+
let n = await (await e.source.directory.getFileHandle(s)).getFile();
|
|
684
|
+
a = t.decode(new Uint8Array(await n.arrayBuffer()));
|
|
685
|
+
} catch (e) {
|
|
686
|
+
a = null;
|
|
687
|
+
}
|
|
688
|
+
return n === e ? {
|
|
689
|
+
base: r,
|
|
690
|
+
editor: i,
|
|
691
|
+
disk: a
|
|
692
|
+
} : null;
|
|
693
|
+
},
|
|
661
694
|
refresh() {
|
|
662
695
|
if (i || r || !n || !t.blockReload) return Promise.resolve();
|
|
663
696
|
if (o) return o;
|
|
664
697
|
let e = n, a = e.baseline;
|
|
665
|
-
return o =
|
|
698
|
+
return o = _(e).then((t) => {
|
|
666
699
|
n === e && e.baseline === a && !r && (e.pending = t);
|
|
667
700
|
}).finally(() => {
|
|
668
701
|
o = null;
|
|
@@ -671,19 +704,19 @@ function he(e, t) {
|
|
|
671
704
|
async reload() {
|
|
672
705
|
if (!n || y() !== "ready" || !t.blockReload) return !1;
|
|
673
706
|
let o = n;
|
|
674
|
-
|
|
707
|
+
f(o), r = !0;
|
|
675
708
|
try {
|
|
676
|
-
let r = a, d = await
|
|
709
|
+
let r = a, d = await _(o);
|
|
677
710
|
if (n !== o || i || e.runtime.getTargetForStage() !== o.stage || (o.pending = d, !d || typeof d == "string" || d.edits === null || r !== a || !b())) return !1;
|
|
678
711
|
let f;
|
|
679
712
|
try {
|
|
680
|
-
var
|
|
713
|
+
var l, u;
|
|
681
714
|
let { edits: n } = d;
|
|
682
|
-
f = n.kind === "values" ?
|
|
715
|
+
f = n.kind === "values" ? W((l = e.runtime.targets) == null ? [] : l, n.changes) : he((u = e.runtime.targets) == null ? [] : u, n.changes, t.blockReload.deserializeBlocks);
|
|
683
716
|
} catch (e) {
|
|
684
|
-
throw o.pending =
|
|
717
|
+
throw o.pending = I(I({}, d), {}, { edits: null }), e;
|
|
685
718
|
}
|
|
686
|
-
return o.baseline =
|
|
719
|
+
return o.baseline = c(), 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;
|
|
687
720
|
} finally {
|
|
688
721
|
r = !1;
|
|
689
722
|
}
|
|
@@ -691,10 +724,10 @@ function he(e, t) {
|
|
|
691
724
|
reloadAll(e) {
|
|
692
725
|
var r;
|
|
693
726
|
let i = n;
|
|
694
|
-
return !i || !i.pending || i.pending === "waiting" || (r = t.blockReload) != null && r.isRunning() ? Promise.resolve("cancelled") :
|
|
727
|
+
return !i || !i.pending || i.pending === "waiting" || (r = t.blockReload) != null && r.isRunning() ? Promise.resolve("cancelled") : m(() => Promise.resolve(n === i ? i.source.directory : null), e);
|
|
695
728
|
},
|
|
696
729
|
open(e, t) {
|
|
697
|
-
return
|
|
730
|
+
return m(async () => {
|
|
698
731
|
try {
|
|
699
732
|
return await e({
|
|
700
733
|
id: "turbowarp-plus-project-folder",
|
|
@@ -707,31 +740,31 @@ function he(e, t) {
|
|
|
707
740
|
}, t);
|
|
708
741
|
},
|
|
709
742
|
openDirectory(e, t) {
|
|
710
|
-
return
|
|
743
|
+
return m(() => Promise.resolve(e), t);
|
|
711
744
|
},
|
|
712
745
|
async save() {
|
|
713
|
-
if (!n || r) throw new
|
|
746
|
+
if (!n || r) throw new u("conflict");
|
|
714
747
|
let e = n;
|
|
715
|
-
|
|
748
|
+
f(e), r = !0;
|
|
716
749
|
try {
|
|
717
|
-
let r = a, i =
|
|
718
|
-
if (await
|
|
719
|
-
let
|
|
750
|
+
let r = a, i = c(), o = M(e.source.project, e.baseline, i);
|
|
751
|
+
if (await E(e.source), f(e), !o) return a === r && t.onSaved(), "unchanged";
|
|
752
|
+
let l = `${JSON.stringify(o, null, 2)}\n`, u = await (await e.source.directory.getFileHandle(s)).createWritable({ mode: "exclusive" });
|
|
720
753
|
try {
|
|
721
|
-
await
|
|
754
|
+
await u.write(l), await E(e.source), f(e), await u.close();
|
|
722
755
|
} catch (e) {
|
|
723
|
-
throw await
|
|
756
|
+
throw await u.abort().catch(() => {}), e;
|
|
724
757
|
}
|
|
725
|
-
return e.source.project = o, e.source.files.set(
|
|
758
|
+
return e.source.project = o, e.source.files.set(s, new TextEncoder().encode(l)), e.source.versions.delete(s), e.baseline = i, e.pending = null, n === e && a === r && t.onSaved(), "saved";
|
|
726
759
|
} finally {
|
|
727
760
|
r = !1;
|
|
728
761
|
}
|
|
729
762
|
},
|
|
730
|
-
dispose:
|
|
763
|
+
dispose: p
|
|
731
764
|
};
|
|
732
765
|
}
|
|
733
766
|
// src/index.ts
|
|
734
|
-
var
|
|
767
|
+
var Q = {
|
|
735
768
|
en: {
|
|
736
769
|
open: "Open Project Folder…",
|
|
737
770
|
save: "Save to Project Folder",
|
|
@@ -740,7 +773,7 @@ var Z = {
|
|
|
740
773
|
saved: "Project folder saved.",
|
|
741
774
|
unchanged: "No changes to save.",
|
|
742
775
|
conflict: "The project folder changed outside the editor or is no longer open. Your edits are still in the editor.",
|
|
743
|
-
unsupported: "This project or edit
|
|
776
|
+
unsupported: "This project or edit cannot be saved to a project folder yet.",
|
|
744
777
|
failed: "Could not access the project folder.",
|
|
745
778
|
external: "External changes detected.",
|
|
746
779
|
reload: "Reload from Disk",
|
|
@@ -748,6 +781,15 @@ var Z = {
|
|
|
748
781
|
reloadAll: "Reload Whole Project",
|
|
749
782
|
discard: "Discard Edits and Reload…",
|
|
750
783
|
discardConfirm: "Discard your unsaved edits and load the project from the folder?",
|
|
784
|
+
compare: "Compare and Choose…",
|
|
785
|
+
compareTitle: "External changes and your unsaved edits",
|
|
786
|
+
compareDescription: "The project folder changed while the Editor has unsaved edits. Loading from the folder discards your edits.",
|
|
787
|
+
compareUnsaved: "Some of your edits are outside what the project folder can save, so they are not shown here.",
|
|
788
|
+
yourEdits: "Your unsaved edits",
|
|
789
|
+
diskChanges: "Changes in the folder",
|
|
790
|
+
keep: "Keep My Edits",
|
|
791
|
+
discardLoad: "Discard Edits and Load from Folder",
|
|
792
|
+
close: "Close",
|
|
751
793
|
dirty: "You have unsaved edits.",
|
|
752
794
|
running: "Stop the project before reloading.",
|
|
753
795
|
runningAuto: "The changes load when the project stops.",
|
|
@@ -763,7 +805,7 @@ var Z = {
|
|
|
763
805
|
saved: "プロジェクトフォルダに保存しました。",
|
|
764
806
|
unchanged: "保存する変更はありません。",
|
|
765
807
|
conflict: "外部でフォルダが変更されたか、作品が切り替わりました。編集中の変更はエディターに残っています。",
|
|
766
|
-
unsupported: "
|
|
808
|
+
unsupported: "この作品または編集は、まだプロジェクトフォルダに保存できません。",
|
|
767
809
|
failed: "プロジェクトフォルダにアクセスできませんでした。",
|
|
768
810
|
external: "外部変更あり",
|
|
769
811
|
reload: "ディスクから再読み込み",
|
|
@@ -771,6 +813,15 @@ var Z = {
|
|
|
771
813
|
reloadAll: "作品全体を再読み込み",
|
|
772
814
|
discard: "編集を破棄して再読み込み…",
|
|
773
815
|
discardConfirm: "未保存の編集を破棄して、フォルダの作品を読み込みますか?",
|
|
816
|
+
compare: "比較して選ぶ…",
|
|
817
|
+
compareTitle: "外部の変更と未保存の編集",
|
|
818
|
+
compareDescription: "Editor に未保存の編集がある間に、プロジェクトフォルダが変更されました。フォルダから読み込むと、未保存の編集は失われます。",
|
|
819
|
+
compareUnsaved: "未保存の編集の一部はプロジェクトフォルダに保存できない種類のため、ここには表示していません。",
|
|
820
|
+
yourEdits: "あなたの未保存の編集",
|
|
821
|
+
diskChanges: "フォルダでの変更",
|
|
822
|
+
keep: "編集を残す",
|
|
823
|
+
discardLoad: "編集を破棄してフォルダから読み込む",
|
|
824
|
+
close: "閉じる",
|
|
774
825
|
dirty: "未保存の編集があります。",
|
|
775
826
|
running: "作品を停止してから再読み込みできます。",
|
|
776
827
|
runningAuto: "作品の停止後に反映します。",
|
|
@@ -778,12 +829,12 @@ var Z = {
|
|
|
778
829
|
waiting: "外部の書き込みが終わるのを待っています。",
|
|
779
830
|
full: "この変更は作品全体の再読み込みが必要です。"
|
|
780
831
|
}
|
|
781
|
-
},
|
|
782
|
-
function
|
|
832
|
+
}, $ = /* @__PURE__ */ new WeakMap();
|
|
833
|
+
function _e({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0 }) {
|
|
783
834
|
var a;
|
|
784
835
|
let o = t.defaultView, s = o == null ? void 0 : o.showDirectoryPicker;
|
|
785
836
|
if (!s || !((a = e.runtime) != null && a.storage)) return null;
|
|
786
|
-
let c =
|
|
837
|
+
let c = ge(e, n), l = t.createElement("output");
|
|
787
838
|
l.dataset.projectFolderStatus = "", l.setAttribute("role", "status"), l.hidden = !0, Object.assign(l.style, {
|
|
788
839
|
position: "fixed",
|
|
789
840
|
insetInlineEnd: "1rem",
|
|
@@ -796,16 +847,17 @@ function ge({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
796
847
|
border: "1px solid currentColor",
|
|
797
848
|
borderRadius: "0.4rem"
|
|
798
849
|
}), t.body.append(l);
|
|
799
|
-
let
|
|
800
|
-
l.isConnected && (l.hidden = !1, l.textContent = e, o.clearTimeout(
|
|
850
|
+
let d, f = (e) => {
|
|
851
|
+
l.isConnected && (l.hidden = !1, l.textContent = e, o.clearTimeout(d), d = o.setTimeout(() => {
|
|
801
852
|
l.hidden = !0;
|
|
802
853
|
}, 7500));
|
|
803
|
-
},
|
|
804
|
-
let n =
|
|
805
|
-
|
|
806
|
-
},
|
|
854
|
+
}, p = (e) => e.startsWith("ja") ? Q.ja : Q.en, m = (e, t) => {
|
|
855
|
+
let n = p(e), r = t instanceof u && t.message !== t.code ? ` (${t.message})` : "";
|
|
856
|
+
f((t instanceof u ? n[t.code] : n.failed) + r);
|
|
857
|
+
}, h, g = () => {};
|
|
807
858
|
if (n.blockReload) {
|
|
808
|
-
|
|
859
|
+
var _;
|
|
860
|
+
let e = p(r), a = t.createElement("aside");
|
|
809
861
|
a.dataset.projectFolderExternal = "", a.hidden = !0, Object.assign(a.style, {
|
|
810
862
|
position: "fixed",
|
|
811
863
|
insetInlineEnd: "1rem",
|
|
@@ -822,16 +874,51 @@ function ge({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
822
874
|
s.setAttribute("role", "status");
|
|
823
875
|
let l = t.createElement("button");
|
|
824
876
|
l.type = "button", l.textContent = e.reload, a.append(s, l), t.body.append(a);
|
|
825
|
-
let u
|
|
877
|
+
let u = (_ = n.blockReload.compareChanges) == null ? void 0 : _.bind(n.blockReload), d = !1, v = async (t) => {
|
|
878
|
+
if (!d) {
|
|
879
|
+
d = !0;
|
|
880
|
+
try {
|
|
881
|
+
let n = await c.comparison();
|
|
882
|
+
if (!n) return;
|
|
883
|
+
let r = [{
|
|
884
|
+
title: e.diskChanges,
|
|
885
|
+
before: n.base,
|
|
886
|
+
after: n.disk
|
|
887
|
+
}];
|
|
888
|
+
n.editor !== null && r.unshift({
|
|
889
|
+
title: e.yourEdits,
|
|
890
|
+
before: n.base,
|
|
891
|
+
after: n.editor
|
|
892
|
+
}), await t({
|
|
893
|
+
title: e.compareTitle,
|
|
894
|
+
description: e.compareDescription,
|
|
895
|
+
notes: n.editor === null ? [e.compareUnsaved] : [],
|
|
896
|
+
sections: r,
|
|
897
|
+
actions: [{
|
|
898
|
+
id: "keep",
|
|
899
|
+
label: e.keep
|
|
900
|
+
}, {
|
|
901
|
+
id: "discard",
|
|
902
|
+
label: e.discardLoad
|
|
903
|
+
}],
|
|
904
|
+
closeLabel: e.close
|
|
905
|
+
}) === "discard" && c.reloadState === "dirty" && C(() => c.reloadAll(() => !0));
|
|
906
|
+
} catch (e) {
|
|
907
|
+
m(r, e);
|
|
908
|
+
} finally {
|
|
909
|
+
d = !1, g();
|
|
910
|
+
}
|
|
911
|
+
}
|
|
912
|
+
}, y, b = null, x = null, S = null, C = (t) => {
|
|
826
913
|
let n = t();
|
|
827
|
-
|
|
828
|
-
(t === !0 || t === "opened") &&
|
|
829
|
-
}, (e) =>
|
|
914
|
+
g(), n.then((t) => {
|
|
915
|
+
(t === !0 || t === "opened") && f(e.reloaded);
|
|
916
|
+
}, (e) => m(r, e)).finally(g);
|
|
830
917
|
};
|
|
831
|
-
|
|
918
|
+
g = () => {
|
|
832
919
|
let t = c.reloadState, n = c.reloadKind;
|
|
833
|
-
if (i && c.canAutoReload && c.pendingVersion !==
|
|
834
|
-
|
|
920
|
+
if (i && c.canAutoReload && c.pendingVersion !== b) {
|
|
921
|
+
b = c.pendingVersion, C(() => c.reload());
|
|
835
922
|
return;
|
|
836
923
|
}
|
|
837
924
|
a.hidden = !t, l.hidden = !n, l.disabled = ![
|
|
@@ -839,64 +926,64 @@ function ge({ vm: e, document: t, host: n, locale: r = "en", autoReload: i = !0
|
|
|
839
926
|
"full",
|
|
840
927
|
"dirty"
|
|
841
928
|
].includes(t == null ? "" : t);
|
|
842
|
-
let r = t === "dirty" ? e.discard : n === "full" ? e.reloadAll : e.reload;
|
|
929
|
+
let r = t === "dirty" ? u ? e.compare : e.discard : n === "full" ? e.reloadAll : e.reload;
|
|
843
930
|
l.textContent !== r && (l.textContent = r);
|
|
844
|
-
let o = !t || t === "ready" ? "" : t === "running" && n === "partial" && i ? e.runningAuto : e[t],
|
|
845
|
-
s.textContent !==
|
|
846
|
-
let
|
|
847
|
-
|
|
931
|
+
let o = !t || t === "ready" ? "" : t === "running" && n === "partial" && i ? e.runningAuto : e[t], d = o ? `${e.external} ${o}` : e.external;
|
|
932
|
+
s.textContent !== d && (s.textContent = d);
|
|
933
|
+
let f = c.directory;
|
|
934
|
+
S && x !== f && (S.disconnect(), x = f, f && S.observe(f, { recursive: !0 }).catch(() => {}));
|
|
848
935
|
};
|
|
849
|
-
let
|
|
936
|
+
let w = () => {
|
|
850
937
|
t.visibilityState === "visible" && c.refresh().then(() => {
|
|
851
|
-
|
|
852
|
-
}, (e) =>
|
|
853
|
-
},
|
|
854
|
-
o.clearTimeout(
|
|
938
|
+
g(), c.settling && T(500);
|
|
939
|
+
}, (e) => m(r, e));
|
|
940
|
+
}, T = (e) => {
|
|
941
|
+
o.clearTimeout(y), y = o.setTimeout(w, e);
|
|
855
942
|
};
|
|
856
943
|
if (o.FileSystemObserver) try {
|
|
857
|
-
|
|
944
|
+
S = new o.FileSystemObserver(() => T(300));
|
|
858
945
|
} catch (e) {
|
|
859
|
-
|
|
946
|
+
S = null;
|
|
860
947
|
}
|
|
861
948
|
l.addEventListener("click", () => {
|
|
862
949
|
let t = c.reloadState;
|
|
863
|
-
t === "ready" ?
|
|
950
|
+
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)));
|
|
864
951
|
});
|
|
865
|
-
let
|
|
866
|
-
o.addEventListener("focus",
|
|
867
|
-
|
|
952
|
+
let E = n.blockReload.subscribe(g), D = o.setInterval(w, 2e3);
|
|
953
|
+
o.addEventListener("focus", w), t.addEventListener("visibilitychange", w), h = () => {
|
|
954
|
+
E(), o.clearInterval(D), o.clearTimeout(y), S == null || S.disconnect(), o.removeEventListener("focus", w), t.removeEventListener("visibilitychange", w), a.remove();
|
|
868
955
|
};
|
|
869
956
|
}
|
|
870
|
-
return
|
|
957
|
+
return $.set(e, {
|
|
871
958
|
session: c,
|
|
872
959
|
open(e) {
|
|
873
|
-
let t =
|
|
960
|
+
let t = p(e);
|
|
874
961
|
c.open((e) => s.call(o, e), () => o.confirm(t.replace)).then((e) => {
|
|
875
|
-
e === "opened" &&
|
|
876
|
-
}, (t) =>
|
|
962
|
+
e === "opened" && f(t.opened);
|
|
963
|
+
}, (t) => m(e, t)).finally(g), g();
|
|
877
964
|
},
|
|
878
965
|
save(e) {
|
|
879
|
-
c.busy || (c.save().then((t) =>
|
|
966
|
+
c.busy || (c.save().then((t) => f(p(e)[t]), (t) => m(e, t)).finally(g), g());
|
|
880
967
|
}
|
|
881
968
|
}), {
|
|
882
|
-
openDirectory: (...e) => c.openDirectory(...e).finally(
|
|
969
|
+
openDirectory: (...e) => c.openDirectory(...e).finally(g),
|
|
883
970
|
dispose() {
|
|
884
|
-
|
|
971
|
+
$.delete(e), c.dispose(), h == null || h(), o.clearTimeout(d), l.remove();
|
|
885
972
|
}
|
|
886
973
|
};
|
|
887
974
|
}
|
|
888
|
-
function
|
|
889
|
-
let n =
|
|
975
|
+
function ve(e, t = "en") {
|
|
976
|
+
let n = $.get(e);
|
|
890
977
|
if (n) return {
|
|
891
978
|
open: () => n.open(t),
|
|
892
979
|
save: n.session.canSave ? () => n.save(t) : void 0,
|
|
893
980
|
detach: () => n.session.detach()
|
|
894
981
|
};
|
|
895
982
|
}
|
|
896
|
-
function
|
|
897
|
-
let o =
|
|
983
|
+
function ye(e, { vm: t, locale: n = "en", MenuItem: r, MenuSection: i, onRequestClose: a }) {
|
|
984
|
+
let o = $.get(t);
|
|
898
985
|
if (!o) return null;
|
|
899
|
-
let s = n.startsWith("ja") ?
|
|
986
|
+
let s = n.startsWith("ja") ? Q.ja : Q.en, c = (t) => {
|
|
900
987
|
let i = () => {
|
|
901
988
|
a(), o[t](n);
|
|
902
989
|
};
|
|
@@ -913,4 +1000,4 @@ function _e(e, { vm: t, locale: n = "en", MenuItem: r, MenuSection: i, onRequest
|
|
|
913
1000
|
};
|
|
914
1001
|
return e(i, null, c("open"), o.session.canSave ? c("save") : null);
|
|
915
1002
|
}
|
|
916
|
-
export {
|
|
1003
|
+
export { _e as mountProjectFolder, ve as projectFolderActions, ye as renderProjectFolderMenu };
|