pxt-core 7.4.5 → 7.4.9

package/built/pxt.js

@@ -97871,19 +97871,21 @@ var pxt;
             highContrast: false,
             language: pxt.appTarget.appTheme.defaultLocale,
             reader: "",
-            skillmap: { mapProgress: {}, completedTags: {} }
+            skillmap: { mapProgress: {}, completedTags: {} },
+            email: false
         });
         let _client;
         function client() { return _client; }
         auth.client = client;
-        const PREFERENCES_DEBOUNCE_MS = 5 * 1000;
-        const PREFERENCES_DEBOUNCE_MAX_MS = 30 * 1000;
+        const PREFERENCES_DEBOUNCE_MS = 1 * 1000;
+        const PREFERENCES_DEBOUNCE_MAX_MS = 10 * 1000;
         let debouncePreferencesChangedTimeout = 0;
         let debouncePreferencesChangedStarted = 0;
         class AuthClient {
             constructor() {
                 this.initialUserPreferences_ = undefined;
                 this.initialAuthCheck_ = undefined;
+                this.prefPatchOps = [];
                 pxt.Util.assert(!_client);
                 // Set global instance.
                 _client = this;
@@ -98073,23 +98075,41 @@ var pxt;
                 }
                 return result.success;
             }
-            async patchUserPreferencesAsync(ops) {
+            async patchUserPreferencesAsync(ops, immediate = false) {
                 ops = Array.isArray(ops) ? ops : [ops];
+                ops = ops.filter(op => !!op);
+                const curPref = await this.userPreferencesAsync();
                 if (!ops.length) {
-                    return;
+                    return { success: true, res: curPref };
                 }
-                const curPref = await this.userPreferencesAsync();
                 ts.pxtc.jsonPatch.patchInPlace(curPref, ops);
                 await this.setUserPreferencesAsync(curPref);
                 // If we're not logged in, non-persistent local state is all we'll use
                 if (!await this.loggedInAsync()) {
-                    return;
+                    return { success: true, res: curPref };
                 }
                 // If the user is logged in, save to cloud, but debounce the api call as this can be called frequently from skillmaps
+                // Replace matching patches in the queue
+                ops.forEach((incoming, iIncoming) => {
+                    this.prefPatchOps.some((existing, iExisting) => {
+                        if (!ts.pxtc.jsonPatch.opsAreEqual(existing, incoming))
+                            return false;
+                        // Patches are equivalent, replace in queue
+                        this.prefPatchOps[iExisting] = incoming;
+                        // Clear from incoming so we don't add it below
+                        ops[iIncoming] = null;
+                        return true;
+                    });
+                });
+                // Add remaining ops to the queue
+                ops.filter(op => !!op).forEach(op => this.prefPatchOps.push(op));
                 clearTimeout(debouncePreferencesChangedTimeout);
                 const savePrefs = async () => {
                     debouncePreferencesChangedStarted = 0;
-                    const result = await this.apiAsync('/api/user/preferences', ops, 'PATCH');
+                    // Clear queued patch ops before send.
+                    const prefPatchOps = this.prefPatchOps;
+                    this.prefPatchOps = [];
+                    const result = await this.apiAsync('/api/user/preferences', prefPatchOps, '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
@@ -98098,15 +98118,22 @@ var pxt;
                     else {
                         pxt.reportError("identity", "update preferences failed", result);
                     }
+                    return { success: result.success, res: result.resp };
                 };
-                if (!debouncePreferencesChangedStarted) {
-                    debouncePreferencesChangedStarted = pxt.U.now();
-                }
-                if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
-                    await savePrefs();
+                if (immediate) {
+                    return await savePrefs();
                 }
                 else {
-                    debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                    if (!debouncePreferencesChangedStarted) {
+                        debouncePreferencesChangedStarted = pxt.U.now();
+                    }
+                    if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                        return await savePrefs();
+                    }
+                    else {
+                        debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                        return { success: false, res: undefined }; // This needs to be implemented correctly to return a promise with the debouncer
+                    }
                 }
             }
             /*protected*/ hasUserId() {
@@ -98900,6 +98927,18 @@ var ts;
                 return arr;
             }
             Util.reversed = reversed;
+            function arrayEquals(a, b, compare = (c, d) => c === d) {
+                if (a == b)
+                    return true;
+                if (!a && b || !b && a || a.length !== b.length)
+                    return false;
+                for (let i = 0; i < a.length; i++) {
+                    if (!compare(a[i], b[i]))
+                        return false;
+                }
+                return true;
+            }
+            Util.arrayEquals = arrayEquals;
             function iterMap(m, f) {
                 Object.keys(m).forEach(k => f(k, m[k]));
             }
@@ -100723,6 +100762,10 @@ var ts;
                 }
             }
             jsonPatch.patchInPlace = patchInPlace;
+            function opsAreEqual(a, b) {
+                return (a.op === b.op && pxtc.U.arrayEquals(a.path, b.path));
+            }
+            jsonPatch.opsAreEqual = opsAreEqual;
         })(jsonPatch = pxtc.jsonPatch || (pxtc.jsonPatch = {}));
     })(pxtc = ts.pxtc || (ts.pxtc = {}));
 })(ts || (ts = {}));
@@ -116191,8 +116234,8 @@ var pxt;
         if (a == b)
             return true;
         if (a.id !== b.id || a.type !== b.type ||
-            !arrayEquals(a.meta.tags, b.meta.tags) ||
-            !arrayEquals(a.meta.blockIDs, b.meta.blockIDs) ||
+            !pxt.U.arrayEquals(a.meta.tags, b.meta.tags) ||
+            !pxt.U.arrayEquals(a.meta.blockIDs, b.meta.blockIDs) ||
             a.meta.displayName !== b.meta.displayName)
             return false;
         switch (a.type) {
@@ -116201,7 +116244,7 @@ var pxt;
                 return pxt.sprite.bitmapEquals(a.bitmap, b.bitmap);
             case "animation" /* Animation */:
                 const bAnimation = b;
-                return a.interval === bAnimation.interval && arrayEquals(a.frames, bAnimation.frames, pxt.sprite.bitmapEquals);
+                return a.interval === bAnimation.interval && pxt.U.arrayEquals(a.frames, bAnimation.frames, pxt.sprite.bitmapEquals);
             case "tilemap" /* Tilemap */:
                 return a.data.equals(b.data);
         }
@@ -116323,17 +116366,6 @@ var pxt;
         }
         return id;
     }
-    function arrayEquals(a, b, compare = (c, d) => c === d) {
-        if (a == b)
-            return true;
-        if (!a && b || !b && a || a.length !== b.length)
-            return false;
-        for (let i = 0; i < a.length; i++) {
-            if (!compare(a[i], b[i]))
-                return false;
-        }
-        return true;
-    }
     function serializeTilemap(tilemap, id, name) {
         const tm = tilemap.tilemap.data();
         const data = new Uint8ClampedArray(5 + tm.data.length + tilemap.layers.data.length);

package/built/pxteditor.d.ts

@@ -543,7 +543,7 @@ declare namespace pxt.editor {
         message?: string;
         data?: Map<string | number>;
     }
-    type EditorMessageTutorialEventRequest = EditorMessageTutorialProgressEventRequest | EditorMessageTutorialCompletedEventRequest | EditorMessageTutorialLoadedEventRequest;
+    type EditorMessageTutorialEventRequest = EditorMessageTutorialProgressEventRequest | EditorMessageTutorialCompletedEventRequest | EditorMessageTutorialLoadedEventRequest | EditorMessageTutorialExitEventRequest;
     interface EditorMessageTutorialProgressEventRequest extends EditorMessageRequest {
         action: "tutorialevent";
         tutorialEvent: "progress";

package/built/pxtlib.d.ts

@@ -57,6 +57,10 @@ declare namespace pxt.auth {
     type UserBadgeState = {
         badges: Badge[];
     };
+    type SetPrefResult = {
+        success: boolean;
+        res: UserPreferences;
+    };
     /**
      * User preference state that should be synced with the cloud.
      */
@@ -66,6 +70,7 @@ declare namespace pxt.auth {
         reader?: string;
         skillmap?: UserSkillmapState;
         badges?: UserBadgeState;
+        email?: boolean;
     };
     const DEFAULT_USER_PREFERENCES: () => UserPreferences;
     /**
@@ -124,7 +129,8 @@ declare namespace pxt.auth {
             username?: string;
             avatarUrl?: string;
         }): Promise<boolean>;
-        patchUserPreferencesAsync(ops: ts.pxtc.jsonPatch.PatchOperation | ts.pxtc.jsonPatch.PatchOperation[]): Promise<void>;
+        private prefPatchOps;
+        patchUserPreferencesAsync(ops: ts.pxtc.jsonPatch.PatchOperation | ts.pxtc.jsonPatch.PatchOperation[], immediate?: boolean): Promise<SetPrefResult>;
         hasUserId(): boolean;
         private fetchUserAsync;
         private setUserProfileAsync;
@@ -269,6 +275,7 @@ declare namespace ts.pxtc.Util {
     export function listsEqual<T>(a: T[], b: T[]): boolean;
     export function oops(msg?: string): Error;
     export function reversed<T>(arr: T[]): T[];
+    export function arrayEquals<U>(a: U[], b: U[], compare?: (c: U, d: U) => boolean): boolean;
     export function iterMap<T>(m: pxt.Map<T>, f: (k: string, v: T) => void): void;
     export function mapMap<T, S>(m: pxt.Map<T>, f: (k: string, v: T) => S): pxt.Map<S>;
     export function values<T>(m: pxt.Map<T>): T[];
@@ -464,6 +471,7 @@ declare namespace ts.pxtc.jsonPatch {
      * Applies a set of JSON Patch operations to the object.
      */
     function patchInPlace(obj: any, ops: PatchOperation[]): void;
+    function opsAreEqual(a: PatchOperation, b: PatchOperation): boolean;
 }
 declare namespace ts.pxtc.jsonPatch.tests {
     function diffTests(): void;

package/built/pxtlib.js

@@ -185,19 +185,21 @@ var pxt;
             highContrast: false,
             language: pxt.appTarget.appTheme.defaultLocale,
             reader: "",
-            skillmap: { mapProgress: {}, completedTags: {} }
+            skillmap: { mapProgress: {}, completedTags: {} },
+            email: false
         });
         let _client;
         function client() { return _client; }
         auth.client = client;
-        const PREFERENCES_DEBOUNCE_MS = 5 * 1000;
-        const PREFERENCES_DEBOUNCE_MAX_MS = 30 * 1000;
+        const PREFERENCES_DEBOUNCE_MS = 1 * 1000;
+        const PREFERENCES_DEBOUNCE_MAX_MS = 10 * 1000;
         let debouncePreferencesChangedTimeout = 0;
         let debouncePreferencesChangedStarted = 0;
         class AuthClient {
             constructor() {
                 this.initialUserPreferences_ = undefined;
                 this.initialAuthCheck_ = undefined;
+                this.prefPatchOps = [];
                 pxt.Util.assert(!_client);
                 // Set global instance.
                 _client = this;
@@ -387,23 +389,41 @@ var pxt;
                 }
                 return result.success;
             }
-            async patchUserPreferencesAsync(ops) {
+            async patchUserPreferencesAsync(ops, immediate = false) {
                 ops = Array.isArray(ops) ? ops : [ops];
+                ops = ops.filter(op => !!op);
+                const curPref = await this.userPreferencesAsync();
                 if (!ops.length) {
-                    return;
+                    return { success: true, res: curPref };
                 }
-                const curPref = await this.userPreferencesAsync();
                 ts.pxtc.jsonPatch.patchInPlace(curPref, ops);
                 await this.setUserPreferencesAsync(curPref);
                 // If we're not logged in, non-persistent local state is all we'll use
                 if (!await this.loggedInAsync()) {
-                    return;
+                    return { success: true, res: curPref };
                 }
                 // If the user is logged in, save to cloud, but debounce the api call as this can be called frequently from skillmaps
+                // Replace matching patches in the queue
+                ops.forEach((incoming, iIncoming) => {
+                    this.prefPatchOps.some((existing, iExisting) => {
+                        if (!ts.pxtc.jsonPatch.opsAreEqual(existing, incoming))
+                            return false;
+                        // Patches are equivalent, replace in queue
+                        this.prefPatchOps[iExisting] = incoming;
+                        // Clear from incoming so we don't add it below
+                        ops[iIncoming] = null;
+                        return true;
+                    });
+                });
+                // Add remaining ops to the queue
+                ops.filter(op => !!op).forEach(op => this.prefPatchOps.push(op));
                 clearTimeout(debouncePreferencesChangedTimeout);
                 const savePrefs = async () => {
                     debouncePreferencesChangedStarted = 0;
-                    const result = await this.apiAsync('/api/user/preferences', ops, 'PATCH');
+                    // Clear queued patch ops before send.
+                    const prefPatchOps = this.prefPatchOps;
+                    this.prefPatchOps = [];
+                    const result = await this.apiAsync('/api/user/preferences', prefPatchOps, '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
@@ -412,15 +432,22 @@ var pxt;
                     else {
                         pxt.reportError("identity", "update preferences failed", result);
                     }
+                    return { success: result.success, res: result.resp };
                 };
-                if (!debouncePreferencesChangedStarted) {
-                    debouncePreferencesChangedStarted = pxt.U.now();
-                }
-                if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
-                    await savePrefs();
+                if (immediate) {
+                    return await savePrefs();
                 }
                 else {
-                    debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                    if (!debouncePreferencesChangedStarted) {
+                        debouncePreferencesChangedStarted = pxt.U.now();
+                    }
+                    if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                        return await savePrefs();
+                    }
+                    else {
+                        debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                        return { success: false, res: undefined }; // This needs to be implemented correctly to return a promise with the debouncer
+                    }
                 }
             }
             /*protected*/ hasUserId() {
@@ -1214,6 +1241,18 @@ var ts;
                 return arr;
             }
             Util.reversed = reversed;
+            function arrayEquals(a, b, compare = (c, d) => c === d) {
+                if (a == b)
+                    return true;
+                if (!a && b || !b && a || a.length !== b.length)
+                    return false;
+                for (let i = 0; i < a.length; i++) {
+                    if (!compare(a[i], b[i]))
+                        return false;
+                }
+                return true;
+            }
+            Util.arrayEquals = arrayEquals;
             function iterMap(m, f) {
                 Object.keys(m).forEach(k => f(k, m[k]));
             }
@@ -3037,6 +3076,10 @@ var ts;
                 }
             }
             jsonPatch.patchInPlace = patchInPlace;
+            function opsAreEqual(a, b) {
+                return (a.op === b.op && pxtc.U.arrayEquals(a.path, b.path));
+            }
+            jsonPatch.opsAreEqual = opsAreEqual;
         })(jsonPatch = pxtc.jsonPatch || (pxtc.jsonPatch = {}));
     })(pxtc = ts.pxtc || (ts.pxtc = {}));
 })(ts || (ts = {}));
@@ -18505,8 +18548,8 @@ var pxt;
         if (a == b)
             return true;
         if (a.id !== b.id || a.type !== b.type ||
-            !arrayEquals(a.meta.tags, b.meta.tags) ||
-            !arrayEquals(a.meta.blockIDs, b.meta.blockIDs) ||
+            !pxt.U.arrayEquals(a.meta.tags, b.meta.tags) ||
+            !pxt.U.arrayEquals(a.meta.blockIDs, b.meta.blockIDs) ||
             a.meta.displayName !== b.meta.displayName)
             return false;
         switch (a.type) {
@@ -18515,7 +18558,7 @@ var pxt;
                 return pxt.sprite.bitmapEquals(a.bitmap, b.bitmap);
             case "animation" /* Animation */:
                 const bAnimation = b;
-                return a.interval === bAnimation.interval && arrayEquals(a.frames, bAnimation.frames, pxt.sprite.bitmapEquals);
+                return a.interval === bAnimation.interval && pxt.U.arrayEquals(a.frames, bAnimation.frames, pxt.sprite.bitmapEquals);
             case "tilemap" /* Tilemap */:
                 return a.data.equals(b.data);
         }
@@ -18637,17 +18680,6 @@ var pxt;
         }
         return id;
     }
-    function arrayEquals(a, b, compare = (c, d) => c === d) {
-        if (a == b)
-            return true;
-        if (!a && b || !b && a || a.length !== b.length)
-            return false;
-        for (let i = 0; i < a.length; i++) {
-            if (!compare(a[i], b[i]))
-                return false;
-        }
-        return true;
-    }
     function serializeTilemap(tilemap, id, name) {
         const tm = tilemap.tilemap.data();
         const data = new Uint8ClampedArray(5 + tm.data.length + tilemap.layers.data.length);