pxt-core 7.3.3 → 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

@@ -97876,6 +97876,10 @@ var pxt;
         let _client;
         function client() { return _client; }
         auth.client = client;
+        const PREFERENCES_DEBOUNCE_MS = 5 * 1000;
+        const PREFERENCES_DEBOUNCE_MAX_MS = 30 * 1000;
+        let debouncePreferencesChangedTimeout = 0;
+        let debouncePreferencesChangedStarted = 0;
         class AuthClient {
             constructor() {
                 this.initialUserPreferences_ = undefined;
@@ -98081,15 +98085,28 @@ var pxt;
                 if (!await this.loggedInAsync()) {
                     return;
                 }
-                // If the user is logged in, save to cloud
-                const result = await this.apiAsync('/api/user/preferences', ops, 'PATCH');
-                if (result.success) {
-                    pxt.debug("Updating local user preferences w/ cloud data after result of POST");
-                    // Set user profile from returned value so we stay in-sync
-                    this.setUserPreferencesAsync(result.resp);
+                // If the user is logged in, save to cloud, but debounce the api call as this can be called frequently from skillmaps
+                clearTimeout(debouncePreferencesChangedTimeout);
+                const savePrefs = async () => {
+                    debouncePreferencesChangedStarted = 0;
+                    const result = await this.apiAsync('/api/user/preferences', ops, 'PATCH');
+                    if (result.success) {
+                        pxt.debug("Updating local user preferences w/ cloud data after result of POST");
+                        // Set user profile from returned value so we stay in-sync
+                        this.setUserPreferencesAsync(result.resp);
+                    }
+                    else {
+                        pxt.reportError("identity", "update preferences failed", result);
+                    }
+                };
+                if (!debouncePreferencesChangedStarted) {
+                    debouncePreferencesChangedStarted = pxt.U.now();
+                }
+                if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                    await savePrefs();
                 }
                 else {
-                    pxt.reportError("identity", "update preferences failed", result);
+                    debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
                 }
             }
             /*protected*/ hasUserId() {
@@ -101052,6 +101069,8 @@ var pxt;
         }
         if (!comp.switches)
             comp.switches = {};
+        if (comp.nativeType == pxtc.NATIVE_TYPE_VM)
+            comp.sourceMap = true;
         pxt.U.jsonCopyFrom(comp.switches, savedSwitches);
         // JS ref counting currently not supported
         comp.jsRefCounting = false;
@@ -103399,6 +103418,7 @@ var pxt;
         commands.electronDeployAsync = undefined; // A pointer to the Electron deploy function, so that targets can access it in their extension.ts
         commands.webUsbPairDialogAsync = undefined;
         commands.onTutorialCompleted = undefined;
+        commands.workspaceLoadedAsync = undefined;
     })(commands = pxt.commands || (pxt.commands = {}));
 })(pxt || (pxt = {}));
 /// <reference path="../localtypings/pxtarget.d.ts"/>
@@ -104645,7 +104665,7 @@ int main() {
                     .then(ret => new Promise((resolve, reject) => {
                     let retry = 0;
                     const delay = 8000; // ms
-                    const maxWait = 180000; // ms
+                    const maxWait = 300000; // ms
                     const startTry = pxt.U.now();
                     const tryGet = () => {
                         retry++;
@@ -112845,6 +112865,7 @@ var ts;
         pxtc.BINARY_ELF = "binary.elf";
         pxtc.BINARY_PXT64 = "binary.pxt64";
         pxtc.BINARY_ESP = "binary.bin";
+        pxtc.BINARY_SRCMAP = "binary.srcmap";
         pxtc.NATIVE_TYPE_THUMB = "thumb";
         pxtc.NATIVE_TYPE_VM = "vm";
         function BuildSourceMapHelpers(sourceMap, tsFile, pyFile) {
@@ -118709,7 +118730,6 @@ var pxt;
         youtube.watchUrl = watchUrl;
     })(youtube = pxt.youtube || (pxt.youtube = {}));
 })(pxt || (pxt = {}));
-/* eslint-disable no-cond-assign */
 // TODO: add a macro facility to make 8-bit assembly easier?
 var ts;
 (function (ts) {
@@ -118967,7 +118987,7 @@ var ts;
                     // recursive-descent parsing of multiplication
                     if (s.indexOf("*") >= 0) {
                         let m = null;
-                        while (m = /^([^\*]*)\*(.*)$/.exec(s)) {
+                        while (null != (m = /^([^\*]*)\*(.*)$/.exec(s))) {
                             let tmp = this.parseOneInt(m[1]);
                             if (tmp == null)
                                 return null;
@@ -119582,6 +119602,37 @@ var ts;
                         }
                     });
                 }
+                getSourceMap() {
+                    const sourceMap = {};
+                    let locFile = "";
+                    let locLn = 0;
+                    let locPos = 0;
+                    let locEnd = 0;
+                    this.lines.forEach((ln, i) => {
+                        const m = /^; ([\w\/\.-]+)\(([\d]+),\d+\):/.exec(ln.text);
+                        if (m) {
+                            flush();
+                            locFile = m[1];
+                            locLn = parseInt(m[2]);
+                        }
+                        if (ln.type == "instruction") {
+                            if (!locPos)
+                                locPos = ln.location;
+                            locEnd = ln.location;
+                        }
+                    });
+                    flush();
+                    function flush() {
+                        if (locFile && locPos) {
+                            if (!sourceMap[locFile])
+                                sourceMap[locFile] = [];
+                            sourceMap[locFile].push(locLn, locPos, locEnd - locPos);
+                        }
+                        locPos = 0;
+                        locEnd = 0;
+                    }
+                    return sourceMap;
+                }
                 getSource(clean, numStmts = 1, flashSize = 0) {
                     let lenPrev = 0;
                     let size = (lbl) => {
@@ -124092,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
@@ -124129,7 +124227,7 @@ _start_${name}:
                 vmsource += `\n.balign 8\n_end_${name}:\n`;
                 address++;
             }
-            const now = new Date();
+            const now = new Date(0); // new Date()
             let encodedName = pxtc.U.toUTF8(opts.name, true);
             if (encodedName.length > 100)
                 encodedName = encodedName.slice(0, 100);
@@ -124215,8 +124313,25 @@ _start_${name}:
             vmsource += "\n; The end.\n";
             bin.writeFile(pxtc.BINARY_ASM, vmsource);
             let res = pxtc.assemble(opts.target, bin, vmsource);
+            const srcmap = res.thumbFile.getSourceMap();
+            const encodedSrcMap = encodeSourceMap(srcmap);
             if (res.src)
-                bin.writeFile(pxtc.BINARY_ASM, res.src);
+                bin.writeFile(pxtc.BINARY_ASM, `; srcmap size: ${encodedSrcMap.length << 1} bytes\n` + res.src);
+            {
+                let binstring = "";
+                for (let v of res.buf)
+                    binstring += String.fromCharCode(v & 0xff, v >> 8);
+                const hash = pxtc.U.sha256(binstring);
+                for (let i = 0; i < 4; ++i) {
+                    res.buf[16 + i] = parseInt(hash.slice(i * 4, i * 4 + 4), 16);
+                }
+                srcmap["__meta"] = {
+                    name: opts.name,
+                    programHash: res.buf[16] | (res.buf[16 + 1] << 16),
+                    // TODO would be nice to include version number of editor...
+                };
+            }
+            bin.writeFile(pxtc.BINARY_SRCMAP, JSON.stringify(srcmap));
             if (pxt.options.debug) {
                 let pc = res.thumbFile.peepCounts;
                 let keys = Object.keys(pc);
@@ -124227,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 {
@@ -124263,7 +124382,7 @@ _start_${name}:
             emitAll();
             return resText;
             function emitAll() {
-                writeRaw(`;\n; Proc: ${proc.getFullName()}\n;`);
+                writeRaw(`;\n; ${proc.getFullName()}\n;`);
                 write(".section code");
                 if (bin.procs[0] == proc) {
                     writeRaw(`; main`);
@@ -129005,7 +129124,7 @@ var ts;
                     let name = pxtc.getDeclName(this.action);
                     if (this.action) {
                         let info = ts.pxtc.nodeLocationInfo(this.action);
-                        name += " " + info.fileName.replace("pxt_modules/", "") + ":" + (info.line + 1);
+                        name = info.fileName.replace("pxt_modules/", "") + "(" + (info.line + 1) + "," + (info.column + 1) + "): " + name;
                     }
                     return name;
                 }
@@ -132948,7 +133067,7 @@ ${lbl}: .short 0xffff
             }
             function emitBrk(node) {
                 bin.numStmts++;
-                const needsComment = pxtc.assembler.debug || pxtc.target.switches.size;
+                const needsComment = pxtc.assembler.debug || pxtc.target.switches.size || pxtc.target.sourceMap;
                 let needsBreak = !!opts.breakpoints;
                 if (!needsComment && !needsBreak)
                     return;
@@ -156153,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();
@@ -156209,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
@@ -3387,7 +3434,7 @@ _start_${name}:
                 vmsource += `\n.balign 8\n_end_${name}:\n`;
                 address++;
             }
-            const now = new Date();
+            const now = new Date(0); // new Date()
             let encodedName = pxtc.U.toUTF8(opts.name, true);
             if (encodedName.length > 100)
                 encodedName = encodedName.slice(0, 100);
@@ -3473,8 +3520,25 @@ _start_${name}:
             vmsource += "\n; The end.\n";
             bin.writeFile(pxtc.BINARY_ASM, vmsource);
             let res = pxtc.assemble(opts.target, bin, vmsource);
+            const srcmap = res.thumbFile.getSourceMap();
+            const encodedSrcMap = encodeSourceMap(srcmap);
             if (res.src)
-                bin.writeFile(pxtc.BINARY_ASM, res.src);
+                bin.writeFile(pxtc.BINARY_ASM, `; srcmap size: ${encodedSrcMap.length << 1} bytes\n` + res.src);
+            {
+                let binstring = "";
+                for (let v of res.buf)
+                    binstring += String.fromCharCode(v & 0xff, v >> 8);
+                const hash = pxtc.U.sha256(binstring);
+                for (let i = 0; i < 4; ++i) {
+                    res.buf[16 + i] = parseInt(hash.slice(i * 4, i * 4 + 4), 16);
+                }
+                srcmap["__meta"] = {
+                    name: opts.name,
+                    programHash: res.buf[16] | (res.buf[16 + 1] << 16),
+                    // TODO would be nice to include version number of editor...
+                };
+            }
+            bin.writeFile(pxtc.BINARY_SRCMAP, JSON.stringify(srcmap));
             if (pxt.options.debug) {
                 let pc = res.thumbFile.peepCounts;
                 let keys = Object.keys(pc);
@@ -3485,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 {
@@ -3521,7 +3589,7 @@ _start_${name}:
             emitAll();
             return resText;
             function emitAll() {
-                writeRaw(`;\n; Proc: ${proc.getFullName()}\n;`);
+                writeRaw(`;\n; ${proc.getFullName()}\n;`);
                 write(".section code");
                 if (bin.procs[0] == proc) {
                     writeRaw(`; main`);
@@ -8263,7 +8331,7 @@ var ts;
                     let name = pxtc.getDeclName(this.action);
                     if (this.action) {
                         let info = ts.pxtc.nodeLocationInfo(this.action);
-                        name += " " + info.fileName.replace("pxt_modules/", "") + ":" + (info.line + 1);
+                        name = info.fileName.replace("pxt_modules/", "") + "(" + (info.line + 1) + "," + (info.column + 1) + "): " + name;
                     }
                     return name;
                 }
@@ -12206,7 +12274,7 @@ ${lbl}: .short 0xffff
             }
             function emitBrk(node) {
                 bin.numStmts++;
-                const needsComment = pxtc.assembler.debug || pxtc.target.switches.size;
+                const needsComment = pxtc.assembler.debug || pxtc.target.switches.size || pxtc.target.sourceMap;
                 let needsBreak = !!opts.breakpoints;
                 if (!needsComment && !needsBreak)
                     return;

package/built/pxtlib.d.ts

@@ -47,6 +47,7 @@ declare namespace pxt.auth {
                 encoded?: string;
                 dataUrl?: string;
             };
+            pictureUrl?: string;
         };
     };
     type UserSkillmapState = {
@@ -876,6 +877,7 @@ declare namespace pxt.commands {
     let electronDeployAsync: (r: ts.pxtc.CompileResult) => Promise<void>;
     let webUsbPairDialogAsync: (pairAsync: () => Promise<boolean>, confirmAsync: (options: any) => Promise<number>) => Promise<number>;
     let onTutorialCompleted: () => void;
+    let workspaceLoadedAsync: () => Promise<void>;
 }
 declare namespace pxt {
     function lzmaDecompressAsync(buf: Uint8Array): Promise<string>;
@@ -1925,6 +1927,7 @@ declare namespace ts.pxtc {
     const BINARY_ELF = "binary.elf";
     const BINARY_PXT64 = "binary.pxt64";
     const BINARY_ESP = "binary.bin";
+    const BINARY_SRCMAP = "binary.srcmap";
     const NATIVE_TYPE_THUMB = "thumb";
     const NATIVE_TYPE_VM = "vm";
     interface BlocksInfo {
@@ -3377,6 +3380,7 @@ declare namespace ts.pxtc.assembler {
         buildLine(tx: string, lst: Line[]): void;
         private prepLines;
         private iterLines;
+        getSourceMap(): pxt.Map<number[]>;
         getSource(clean: boolean, numStmts?: number, flashSize?: number): string;
         private peepHole;
         private clearLabels;

package/built/pxtlib.js

@@ -190,6 +190,10 @@ var pxt;
         let _client;
         function client() { return _client; }
         auth.client = client;
+        const PREFERENCES_DEBOUNCE_MS = 5 * 1000;
+        const PREFERENCES_DEBOUNCE_MAX_MS = 30 * 1000;
+        let debouncePreferencesChangedTimeout = 0;
+        let debouncePreferencesChangedStarted = 0;
         class AuthClient {
             constructor() {
                 this.initialUserPreferences_ = undefined;
@@ -395,15 +399,28 @@ var pxt;
                 if (!await this.loggedInAsync()) {
                     return;
                 }
-                // If the user is logged in, save to cloud
-                const result = await this.apiAsync('/api/user/preferences', ops, 'PATCH');
-                if (result.success) {
-                    pxt.debug("Updating local user preferences w/ cloud data after result of POST");
-                    // Set user profile from returned value so we stay in-sync
-                    this.setUserPreferencesAsync(result.resp);
+                // If the user is logged in, save to cloud, but debounce the api call as this can be called frequently from skillmaps
+                clearTimeout(debouncePreferencesChangedTimeout);
+                const savePrefs = async () => {
+                    debouncePreferencesChangedStarted = 0;
+                    const result = await this.apiAsync('/api/user/preferences', ops, 'PATCH');
+                    if (result.success) {
+                        pxt.debug("Updating local user preferences w/ cloud data after result of POST");
+                        // Set user profile from returned value so we stay in-sync
+                        this.setUserPreferencesAsync(result.resp);
+                    }
+                    else {
+                        pxt.reportError("identity", "update preferences failed", result);
+                    }
+                };
+                if (!debouncePreferencesChangedStarted) {
+                    debouncePreferencesChangedStarted = pxt.U.now();
+                }
+                if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                    await savePrefs();
                 }
                 else {
-                    pxt.reportError("identity", "update preferences failed", result);
+                    debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
                 }
             }
             /*protected*/ hasUserId() {
@@ -3366,6 +3383,8 @@ var pxt;
         }
         if (!comp.switches)
             comp.switches = {};
+        if (comp.nativeType == pxtc.NATIVE_TYPE_VM)
+            comp.sourceMap = true;
         pxt.U.jsonCopyFrom(comp.switches, savedSwitches);
         // JS ref counting currently not supported
         comp.jsRefCounting = false;
@@ -5713,6 +5732,7 @@ var pxt;
         commands.electronDeployAsync = undefined; // A pointer to the Electron deploy function, so that targets can access it in their extension.ts
         commands.webUsbPairDialogAsync = undefined;
         commands.onTutorialCompleted = undefined;
+        commands.workspaceLoadedAsync = undefined;
     })(commands = pxt.commands || (pxt.commands = {}));
 })(pxt || (pxt = {}));
 /// <reference path="../localtypings/pxtarget.d.ts"/>
@@ -6959,7 +6979,7 @@ int main() {
                     .then(ret => new Promise((resolve, reject) => {
                     let retry = 0;
                     const delay = 8000; // ms
-                    const maxWait = 180000; // ms
+                    const maxWait = 300000; // ms
                     const startTry = pxt.U.now();
                     const tryGet = () => {
                         retry++;
@@ -15159,6 +15179,7 @@ var ts;
         pxtc.BINARY_ELF = "binary.elf";
         pxtc.BINARY_PXT64 = "binary.pxt64";
         pxtc.BINARY_ESP = "binary.bin";
+        pxtc.BINARY_SRCMAP = "binary.srcmap";
         pxtc.NATIVE_TYPE_THUMB = "thumb";
         pxtc.NATIVE_TYPE_VM = "vm";
         function BuildSourceMapHelpers(sourceMap, tsFile, pyFile) {
@@ -21023,7 +21044,6 @@ var pxt;
         youtube.watchUrl = watchUrl;
     })(youtube = pxt.youtube || (pxt.youtube = {}));
 })(pxt || (pxt = {}));
-/* eslint-disable no-cond-assign */
 // TODO: add a macro facility to make 8-bit assembly easier?
 var ts;
 (function (ts) {
@@ -21281,7 +21301,7 @@ var ts;
                     // recursive-descent parsing of multiplication
                     if (s.indexOf("*") >= 0) {
                         let m = null;
-                        while (m = /^([^\*]*)\*(.*)$/.exec(s)) {
+                        while (null != (m = /^([^\*]*)\*(.*)$/.exec(s))) {
                             let tmp = this.parseOneInt(m[1]);
                             if (tmp == null)
                                 return null;
@@ -21896,6 +21916,37 @@ var ts;
                         }
                     });
                 }
+                getSourceMap() {
+                    const sourceMap = {};
+                    let locFile = "";
+                    let locLn = 0;
+                    let locPos = 0;
+                    let locEnd = 0;
+                    this.lines.forEach((ln, i) => {
+                        const m = /^; ([\w\/\.-]+)\(([\d]+),\d+\):/.exec(ln.text);
+                        if (m) {
+                            flush();
+                            locFile = m[1];
+                            locLn = parseInt(m[2]);
+                        }
+                        if (ln.type == "instruction") {
+                            if (!locPos)
+                                locPos = ln.location;
+                            locEnd = ln.location;
+                        }
+                    });
+                    flush();
+                    function flush() {
+                        if (locFile && locPos) {
+                            if (!sourceMap[locFile])
+                                sourceMap[locFile] = [];
+                            sourceMap[locFile].push(locLn, locPos, locEnd - locPos);
+                        }
+                        locPos = 0;
+                        locEnd = 0;
+                    }
+                    return sourceMap;
+                }
                 getSource(clean, numStmts = 1, flashSize = 0) {
                     let lenPrev = 0;
                     let size = (lbl) => {