pxt-core 7.3.4 → 7.3.8

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() {
@@ -653,6 +670,17 @@ var pxt;
             }
         }
         auth.generateUserProfilePicDataUrl = generateUserProfilePicDataUrl;
+        /**
+         * Checks only the ID and sourceURL
+         */
+        function badgeEquals(badgeA, badgeB) {
+            return badgeA.id === badgeB.id && badgeA.sourceURL === badgeB.sourceURL;
+        }
+        auth.badgeEquals = badgeEquals;
+        function hasBadge(preferences, badge) {
+            return preferences.badges.some(toCheck => badgeEquals(toCheck, badge));
+        }
+        auth.hasBadge = hasBadge;
     })(auth = pxt.auth || (pxt.auth = {}));
 })(pxt || (pxt = {}));
 // Needs to be in its own file to avoid a circular dependency: util.ts -> main.ts -> util.ts
@@ -3366,6 +3394,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;
@@ -6960,7 +6990,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++;
@@ -15160,6 +15190,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) {
@@ -21024,7 +21055,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) {
@@ -21282,7 +21312,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;
@@ -21897,6 +21927,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) => {