pxt-core 7.3.6 → 7.3.7

package/built/cli.js

@@ -403,6 +403,8 @@ function ciAsync() {
     pxt.log(`pull request: ${pullRequest}`);
     pxt.log(`upload api strings: ${uploadApiStrings}`);
     pxt.log(`upload docs: ${uploadDocs}`);
+    lintJSONInDirectory(path.resolve("."));
+    lintJSONInDirectory(path.resolve("docs"));
     function npmPublishAsync() {
         if (!npmPublish)
             return Promise.resolve();
@@ -459,6 +461,21 @@ function ciAsync() {
         });
     }
 }
+function lintJSONInDirectory(dir) {
+    for (const file of fs.readdirSync(dir)) {
+        const fullPath = path.join(dir, file);
+        if (file.endsWith(".json")) {
+            const contents = fs.readFileSync(fullPath, "utf8");
+            try {
+                JSON.parse(contents);
+            }
+            catch (e) {
+                console.log("Could not parse " + fullPath);
+                process.exit(1);
+            }
+        }
+    }
+}
 function bumpPxtCoreDepAsync() {
     let pkg = readJson("package.json");
     if (pkg["name"] == "pxt-core")

package/built/pxt.js

@@ -124143,6 +124143,53 @@ ${info.id}_IfaceVT:
             else
                 return `0xffffffff, 0xffffffff ; -> ${vt}`;
         }
+        function encodeSourceMap(srcmap) {
+            // magic: 0x4d435253 0x2d4e1588 0x719986aa ('SRCM' ... )
+            const res = [0x53, 0x52, 0x43, 0x4d, 0x88, 0x15, 0x4e, 0x2d, 0xaa, 0x86, 0x99, 0x71, 0x00, 0x00, 0x00, 0x00];
+            for (const fn of Object.keys(srcmap)) {
+                for (const c of pxtc.U.stringToUint8Array(fn))
+                    res.push(c);
+                res.push(0);
+                const arr = srcmap[fn];
+                let prevLn = 0;
+                let prevOff = 0;
+                for (let i = 0; i < arr.length; i += 3) {
+                    encodeNumber(arr[i] - prevLn);
+                    encodeNumber((arr[i + 1] - prevOff) >> 1);
+                    encodeNumber(arr[i + 2] >> 1);
+                    prevLn = arr[i];
+                    prevOff = arr[i + 1];
+                }
+                res.push(0xff); // end-marker
+            }
+            res.push(0);
+            if (res.length & 1)
+                res.push(0);
+            const res2 = [];
+            for (let i = 0; i < res.length; i += 2)
+                res2.push(res[i] | (res[i + 1] << 8));
+            return res2;
+            function encodeNumber(k) {
+                if (0 <= k && k < 0xf0)
+                    res.push(k);
+                else {
+                    let mark = 0xf0;
+                    if (k < 0) {
+                        k = -k;
+                        mark |= 0x08;
+                    }
+                    const idx = res.length;
+                    res.push(null); // placeholder
+                    let len = 0;
+                    while (k != 0) {
+                        res.push(k & 0xff);
+                        k >>>= 8;
+                        len++;
+                    }
+                    res[idx] = mark | len;
+                }
+            }
+        }
         /* eslint-disable no-trailing-spaces */
         function vmEmit(bin, opts) {
             let vmsource = `; VM start
@@ -124266,9 +124313,10 @@ _start_${name}:
             vmsource += "\n; The end.\n";
             bin.writeFile(pxtc.BINARY_ASM, vmsource);
             let res = pxtc.assemble(opts.target, bin, vmsource);
-            if (res.src)
-                bin.writeFile(pxtc.BINARY_ASM, res.src);
             const srcmap = res.thumbFile.getSourceMap();
+            const encodedSrcMap = encodeSourceMap(srcmap);
+            if (res.src)
+                bin.writeFile(pxtc.BINARY_ASM, `; srcmap size: ${encodedSrcMap.length << 1} bytes\n` + res.src);
             {
                 let binstring = "";
                 for (let v of res.buf)
@@ -124294,12 +124342,16 @@ _start_${name}:
             }
             if (res.buf) {
                 let binstring = "";
-                for (let v of res.buf)
+                const buf = res.buf;
+                while (buf.length & 0xf)
+                    buf.push(0);
+                pxtc.U.pushRange(buf, encodedSrcMap);
+                for (let v of buf)
                     binstring += String.fromCharCode(v & 0xff, v >> 8);
                 binstring = ts.pxtc.encodeBase64(binstring);
                 if (embedVTs()) {
                     bin.writeFile(pxtc.BINARY_PXT64, binstring);
-                    const patched = pxtc.hexfile.patchHex(bin, res.buf, false, !!pxtc.target.useUF2)[0];
+                    const patched = pxtc.hexfile.patchHex(bin, buf, false, !!pxtc.target.useUF2)[0];
                     bin.writeFile(pxt.outputName(pxtc.target), ts.pxtc.encodeBase64(patched));
                 }
                 else {
@@ -156220,6 +156272,8 @@ function ciAsync() {
     pxt.log(`pull request: ${pullRequest}`);
     pxt.log(`upload api strings: ${uploadApiStrings}`);
     pxt.log(`upload docs: ${uploadDocs}`);
+    lintJSONInDirectory(path.resolve("."));
+    lintJSONInDirectory(path.resolve("docs"));
     function npmPublishAsync() {
         if (!npmPublish)
             return Promise.resolve();
@@ -156276,6 +156330,21 @@ function ciAsync() {
         });
     }
 }
+function lintJSONInDirectory(dir) {
+    for (const file of fs.readdirSync(dir)) {
+        const fullPath = path.join(dir, file);
+        if (file.endsWith(".json")) {
+            const contents = fs.readFileSync(fullPath, "utf8");
+            try {
+                JSON.parse(contents);
+            }
+            catch (e) {
+                console.log("Could not parse " + fullPath);
+                process.exit(1);
+            }
+        }
+    }
+}
 function bumpPxtCoreDepAsync() {
     let pkg = readJson("package.json");
     if (pkg["name"] == "pxt-core")

package/built/pxtcompiler.js

@@ -3350,6 +3350,53 @@ ${info.id}_IfaceVT:
             else
                 return `0xffffffff, 0xffffffff ; -> ${vt}`;
         }
+        function encodeSourceMap(srcmap) {
+            // magic: 0x4d435253 0x2d4e1588 0x719986aa ('SRCM' ... )
+            const res = [0x53, 0x52, 0x43, 0x4d, 0x88, 0x15, 0x4e, 0x2d, 0xaa, 0x86, 0x99, 0x71, 0x00, 0x00, 0x00, 0x00];
+            for (const fn of Object.keys(srcmap)) {
+                for (const c of pxtc.U.stringToUint8Array(fn))
+                    res.push(c);
+                res.push(0);
+                const arr = srcmap[fn];
+                let prevLn = 0;
+                let prevOff = 0;
+                for (let i = 0; i < arr.length; i += 3) {
+                    encodeNumber(arr[i] - prevLn);
+                    encodeNumber((arr[i + 1] - prevOff) >> 1);
+                    encodeNumber(arr[i + 2] >> 1);
+                    prevLn = arr[i];
+                    prevOff = arr[i + 1];
+                }
+                res.push(0xff); // end-marker
+            }
+            res.push(0);
+            if (res.length & 1)
+                res.push(0);
+            const res2 = [];
+            for (let i = 0; i < res.length; i += 2)
+                res2.push(res[i] | (res[i + 1] << 8));
+            return res2;
+            function encodeNumber(k) {
+                if (0 <= k && k < 0xf0)
+                    res.push(k);
+                else {
+                    let mark = 0xf0;
+                    if (k < 0) {
+                        k = -k;
+                        mark |= 0x08;
+                    }
+                    const idx = res.length;
+                    res.push(null); // placeholder
+                    let len = 0;
+                    while (k != 0) {
+                        res.push(k & 0xff);
+                        k >>>= 8;
+                        len++;
+                    }
+                    res[idx] = mark | len;
+                }
+            }
+        }
         /* eslint-disable no-trailing-spaces */
         function vmEmit(bin, opts) {
             let vmsource = `; VM start
@@ -3473,9 +3520,10 @@ _start_${name}:
             vmsource += "\n; The end.\n";
             bin.writeFile(pxtc.BINARY_ASM, vmsource);
             let res = pxtc.assemble(opts.target, bin, vmsource);
-            if (res.src)
-                bin.writeFile(pxtc.BINARY_ASM, res.src);
             const srcmap = res.thumbFile.getSourceMap();
+            const encodedSrcMap = encodeSourceMap(srcmap);
+            if (res.src)
+                bin.writeFile(pxtc.BINARY_ASM, `; srcmap size: ${encodedSrcMap.length << 1} bytes\n` + res.src);
             {
                 let binstring = "";
                 for (let v of res.buf)
@@ -3501,12 +3549,16 @@ _start_${name}:
             }
             if (res.buf) {
                 let binstring = "";
-                for (let v of res.buf)
+                const buf = res.buf;
+                while (buf.length & 0xf)
+                    buf.push(0);
+                pxtc.U.pushRange(buf, encodedSrcMap);
+                for (let v of buf)
                     binstring += String.fromCharCode(v & 0xff, v >> 8);
                 binstring = ts.pxtc.encodeBase64(binstring);
                 if (embedVTs()) {
                     bin.writeFile(pxtc.BINARY_PXT64, binstring);
-                    const patched = pxtc.hexfile.patchHex(bin, res.buf, false, !!pxtc.target.useUF2)[0];
+                    const patched = pxtc.hexfile.patchHex(bin, buf, false, !!pxtc.target.useUF2)[0];
                     bin.writeFile(pxt.outputName(pxtc.target), ts.pxtc.encodeBase64(patched));
                 }
                 else {