pxt-core 7.3.12 → 7.3.16

package/built/pxt.js

@@ -98076,6 +98076,7 @@ var pxt;
             }
             async patchUserPreferencesAsync(ops, immediate = false) {
                 ops = Array.isArray(ops) ? ops : [ops];
+                ops = ops.filter(op => !!op);
                 if (!ops.length) {
                     return;
                 }
@@ -98087,8 +98088,20 @@ var pxt;
                     return;
                 }
                 // If the user is logged in, save to cloud, but debounce the api call as this can be called frequently from skillmaps
-                // Accumulate the ops and send to cloud in batch.
-                this.prefPatchOps.push(...ops);
+                // 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;
@@ -98911,6 +98924,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]));
             }
@@ -100734,6 +100759,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 = {}));
@@ -116202,8 +116231,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) {
@@ -116212,7 +116241,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);
         }
@@ -116334,17 +116363,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/pxtlib.d.ts

@@ -270,6 +270,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[];
@@ -465,6 +466,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

@@ -390,6 +390,7 @@ var pxt;
             }
             async patchUserPreferencesAsync(ops, immediate = false) {
                 ops = Array.isArray(ops) ? ops : [ops];
+                ops = ops.filter(op => !!op);
                 if (!ops.length) {
                     return;
                 }
@@ -401,8 +402,20 @@ var pxt;
                     return;
                 }
                 // If the user is logged in, save to cloud, but debounce the api call as this can be called frequently from skillmaps
-                // Accumulate the ops and send to cloud in batch.
-                this.prefPatchOps.push(...ops);
+                // 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;
@@ -1225,6 +1238,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]));
             }
@@ -3048,6 +3073,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 = {}));
@@ -18516,8 +18545,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) {
@@ -18526,7 +18555,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);
         }
@@ -18648,17 +18677,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);