pxt-core 13.0.6 → 13.0.8

package/built/cli.js

@@ -841,6 +841,9 @@ function gitUploadAsync(opts, uplReqs) {
     });
 }
 async function uploadToGitRepoAsync(opts, uplReqs) {
+    if (process.env["PXT_SKIP_GIT_COMMIT"]) {
+        return writeFilesToPushAsync(opts, uplReqs);
+    }
     let label = opts.label;
     if (!label) {
         console.log('no label; skip release upload');
@@ -941,6 +944,40 @@ async function uploadToGitRepoAsync(opts, uplReqs) {
         }
     });
 }
+async function writeFilesToPushAsync(opts, uplReqs) {
+    let label = opts.label;
+    if (!label) {
+        console.log('no label; skip release upload');
+        return Promise.resolve();
+    }
+    let tid = pxt.appTarget.id;
+    if (U.startsWith(label, tid + "/"))
+        label = label.slice(tid.length + 1);
+    if (!/^v\d/.test(label)) {
+        console.log(`label "${label}" is not a version; skipping release upload`);
+        return Promise.resolve();
+    }
+    const releasesDir = path.resolve("tmp/releases");
+    const outDir = path.join(releasesDir, "built");
+    console.log("writing release files to " + releasesDir);
+    nodeutil.mkdirP(outDir);
+    const info = await ciBuildInfoAsync();
+    const releaseInfo = {
+        url: info.commitUrl,
+        tag: label
+    };
+    // this gets read by the github actions workflow
+    fs.writeFileSync(path.join(releasesDir, "release.json"), JSON.stringify(releaseInfo, null, 2), { encoding: "utf8" });
+    // copy the files into the built directory. the actual push to the git repo will be
+    // handled by the github actions workflow
+    for (let u of U.values(uplReqs)) {
+        let fpath = path.join(outDir, u.filename);
+        nodeutil.mkdirP(path.dirname(fpath));
+        fs.writeFileSync(fpath, u.content, { encoding: u.encoding });
+    }
+    // make sure there's always something to commit
+    fs.writeFileSync(path.join(outDir, "stamp.txt"), new Date().toString());
+}
 function uploadedArtFileCdnUrl(fn) {
     if (!fn || /^(https?|data):/.test(fn))
         return fn; // nothing to do

package/built/pxt.js

@@ -105538,7 +105538,7 @@ int main() {
                 let m = /^:10....0[0E]41140E2FB82FA2BB(....)(....)(....)(....)(..)/.exec(ln);
                 if (m) {
                     metaLen = parseInt(swapBytes(m[1]), 16);
-                    textLen = parseInt(swapBytes(m[2]), 16);
+                    textLen = parseInt(swapBytes(m[2]), 16) + parseInt(swapBytes(m[3]), 16) * 0x10000;
                     toGo = metaLen + textLen;
                     buf = new Uint8Array(toGo);
                 }
@@ -140921,6 +140921,7 @@ var ts;
                 addr += 256;
             }
         }
+        pxtc.saveSourceToUF2 = saveSourceToUF2;
         function hexDump(bytes, startOffset = 0) {
             function toHex(n, len = 8) {
                 let r = n.toString(16);
@@ -141310,10 +141311,13 @@ _stored_program: .hex ${res}
             let metablob = pxtc.Util.toUTF8(meta);
             let totallen = metablob.length + binstring.length;
             let res = "\x41\x14\x0E\x2F\xB8\x2F\xA2\xBB";
+            // Binary header as specified in docs/source-embedding.md: 2-byte meta
+            // length, 4-byte text length, 2 reserved bytes, all little endian.
             res += pxtc.U.uint8ArrayToString([
                 metablob.length & 0xff, metablob.length >> 8,
-                binstring.length & 0xff, binstring.length >> 8,
-                0, 0, 0, 0
+                binstring.length & 0xff, (binstring.length >> 8) & 0xff,
+                (binstring.length >> 16) & 0xff, (binstring.length >> 24) & 0xff,
+                0, 0
             ]);
             res += metablob;
             res += binstring;
@@ -141321,6 +141325,7 @@ _stored_program: .hex ${res}
                 res += "\x00";
             return res;
         }
+        pxtc.packSource = packSource;
         function assembleAndPatch(src, bin, opts, cres) {
             const dummy = opts.extinfo.disabledDeps;
             if (dummy) {
@@ -158222,10 +158227,16 @@ var pxsim;
                             // not found, spin a new one
                             if (!messageFrame) {
                                 const url = new URL(simulatorExtension.url);
-                                if (this.options.parentOrigin)
-                                    url.searchParams.set("parentOrigin", encodeURIComponent(this.options.parentOrigin));
+                                // The extension's parent window is this editor, so the origin it
+                                // should trust is the editor's own. options.parentOrigin is the
+                                // editor's *embedder* origin (controller mode) - the extension's
+                                // grandparent - so an extension that validates messages against
+                                // it rejects everything the editor sends when the editor is
+                                // embedded cross-origin.
+                                // searchParams.set() encodes, so don't encode the values here.
+                                url.searchParams.set("parentOrigin", window.location.origin);
                                 if (this.options.userLanguage)
-                                    url.searchParams.set("language", encodeURIComponent(this.options.userLanguage));
+                                    url.searchParams.set("language", this.options.userLanguage);
                                 startSimulatorExtension(url.toString(), simulatorExtension.permanent, simulatorExtension.aspectRatio);
                             }
                             // not running the current run, restart
@@ -165037,6 +165048,9 @@ function gitUploadAsync(opts, uplReqs) {
     });
 }
 async function uploadToGitRepoAsync(opts, uplReqs) {
+    if (process.env["PXT_SKIP_GIT_COMMIT"]) {
+        return writeFilesToPushAsync(opts, uplReqs);
+    }
     let label = opts.label;
     if (!label) {
         console.log('no label; skip release upload');
@@ -165137,6 +165151,40 @@ async function uploadToGitRepoAsync(opts, uplReqs) {
         }
     });
 }
+async function writeFilesToPushAsync(opts, uplReqs) {
+    let label = opts.label;
+    if (!label) {
+        console.log('no label; skip release upload');
+        return Promise.resolve();
+    }
+    let tid = pxt.appTarget.id;
+    if (U.startsWith(label, tid + "/"))
+        label = label.slice(tid.length + 1);
+    if (!/^v\d/.test(label)) {
+        console.log(`label "${label}" is not a version; skipping release upload`);
+        return Promise.resolve();
+    }
+    const releasesDir = path.resolve("tmp/releases");
+    const outDir = path.join(releasesDir, "built");
+    console.log("writing release files to " + releasesDir);
+    nodeutil.mkdirP(outDir);
+    const info = await ciBuildInfoAsync();
+    const releaseInfo = {
+        url: info.commitUrl,
+        tag: label
+    };
+    // this gets read by the github actions workflow
+    fs.writeFileSync(path.join(releasesDir, "release.json"), JSON.stringify(releaseInfo, null, 2), { encoding: "utf8" });
+    // copy the files into the built directory. the actual push to the git repo will be
+    // handled by the github actions workflow
+    for (let u of U.values(uplReqs)) {
+        let fpath = path.join(outDir, u.filename);
+        nodeutil.mkdirP(path.dirname(fpath));
+        fs.writeFileSync(fpath, u.content, { encoding: u.encoding });
+    }
+    // make sure there's always something to commit
+    fs.writeFileSync(path.join(outDir, "stamp.txt"), new Date().toString());
+}
 function uploadedArtFileCdnUrl(fn) {
     if (!fn || /^(https?|data):/.test(fn))
         return fn; // nothing to do

package/built/pxtcompiler.d.ts

@@ -834,6 +834,7 @@ declare namespace ts.pxtc {
         function hexBytes(bytes: number[]): string;
         function patchHex(bin: Binary, buf: number[], shortForm: boolean, useuf2: boolean): string[];
     }
+    function saveSourceToUF2(uf2: UF2.BlockFile, bin: Binary): void;
     function hexDump(bytes: ArrayLike<number>, startOffset?: number): string;
     function asmline(s: string): string;
     function firstMethodOffset(): number;
@@ -850,6 +851,7 @@ declare namespace ts.pxtc {
         buf: number[];
         thumbFile: assembler.File;
     };
+    function packSource(meta: string, binstring: string): string;
     function processorEmit(bin: Binary, opts: CompileOptions, cres: CompileResult): void;
     let validateShim: typeof hexfile.validateShim;
 }

package/built/pxtcompiler.js

@@ -16064,6 +16064,7 @@ var ts;
                 addr += 256;
             }
         }
+        pxtc.saveSourceToUF2 = saveSourceToUF2;
         function hexDump(bytes, startOffset = 0) {
             function toHex(n, len = 8) {
                 let r = n.toString(16);
@@ -16453,10 +16454,13 @@ _stored_program: .hex ${res}
             let metablob = pxtc.Util.toUTF8(meta);
             let totallen = metablob.length + binstring.length;
             let res = "\x41\x14\x0E\x2F\xB8\x2F\xA2\xBB";
+            // Binary header as specified in docs/source-embedding.md: 2-byte meta
+            // length, 4-byte text length, 2 reserved bytes, all little endian.
             res += pxtc.U.uint8ArrayToString([
                 metablob.length & 0xff, metablob.length >> 8,
-                binstring.length & 0xff, binstring.length >> 8,
-                0, 0, 0, 0
+                binstring.length & 0xff, (binstring.length >> 8) & 0xff,
+                (binstring.length >> 16) & 0xff, (binstring.length >> 24) & 0xff,
+                0, 0
             ]);
             res += metablob;
             res += binstring;
@@ -16464,6 +16468,7 @@ _stored_program: .hex ${res}
                 res += "\x00";
             return res;
         }
+        pxtc.packSource = packSource;
         function assembleAndPatch(src, bin, opts, cres) {
             const dummy = opts.extinfo.disabledDeps;
             if (dummy) {

package/built/pxtlib.js

@@ -7817,7 +7817,7 @@ int main() {
                 let m = /^:10....0[0E]41140E2FB82FA2BB(....)(....)(....)(....)(..)/.exec(ln);
                 if (m) {
                     metaLen = parseInt(swapBytes(m[1]), 16);
-                    textLen = parseInt(swapBytes(m[2]), 16);
+                    textLen = parseInt(swapBytes(m[2]), 16) + parseInt(swapBytes(m[3]), 16) * 0x10000;
                     toGo = metaLen + textLen;
                     buf = new Uint8Array(toGo);
                 }

package/built/pxtsim.js

@@ -6721,10 +6721,16 @@ var pxsim;
                             // not found, spin a new one
                             if (!messageFrame) {
                                 const url = new URL(simulatorExtension.url);
-                                if (this.options.parentOrigin)
-                                    url.searchParams.set("parentOrigin", encodeURIComponent(this.options.parentOrigin));
+                                // The extension's parent window is this editor, so the origin it
+                                // should trust is the editor's own. options.parentOrigin is the
+                                // editor's *embedder* origin (controller mode) - the extension's
+                                // grandparent - so an extension that validates messages against
+                                // it rejects everything the editor sends when the editor is
+                                // embedded cross-origin.
+                                // searchParams.set() encodes, so don't encode the values here.
+                                url.searchParams.set("parentOrigin", window.location.origin);
                                 if (this.options.userLanguage)
-                                    url.searchParams.set("language", encodeURIComponent(this.options.userLanguage));
+                                    url.searchParams.set("language", this.options.userLanguage);
                                 startSimulatorExtension(url.toString(), simulatorExtension.permanent, simulatorExtension.aspectRatio);
                             }
                             // not running the current run, restart