pxt-core 7.3.7 → 7.3.11

package/built/cli.js

@@ -1768,7 +1768,9 @@ function buildSemanticUIAsync(parsed) {
         // Append icons.css to semantic.css (custom pxt icons)
         const iconsFile = (pkg["name"] == "pxt-core") ? 'built/web/icons.css' : 'node_modules/pxt-core/built/web/icons.css';
         const iconsCss = fs.readFileSync(iconsFile, "utf-8");
-        semCss = semCss + "\n" + iconsCss;
+        const reactCommonFile = (pkg["name"] == "pxt-core") ? 'built/web/react-common.css' : 'node_modules/pxt-core/built/web/react-common.css';
+        const reactCommonCss = fs.readFileSync(reactCommonFile, "utf-8");
+        semCss = semCss + "\n" + iconsCss + "\n" + reactCommonCss;
         nodeutil.writeFileSync('built/web/semantic.css', semCss);
     }).then(() => {
         // generate blockly css
@@ -1836,6 +1838,7 @@ function buildSkillMapAsync(parsed) {
         nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${skillmapRoot}/public/blb`);
         nodeutil.cp("built/web/semantic.css", `${skillmapRoot}/public/blb`);
         nodeutil.cp("node_modules/pxt-core/built/web/icons.css", `${skillmapRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/web/react-common.css", `${skillmapRoot}/public/blb`);
         // copy 'assets' over from docs/static
         nodeutil.cpR("docs/static/skillmap/assets", `${skillmapRoot}/public/assets`);
         if (docsPath) {

package/built/pxt.js

@@ -97876,14 +97876,15 @@ var pxt;
         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,7 +98074,7 @@ var pxt;
                 }
                 return result.success;
             }
-            async patchUserPreferencesAsync(ops) {
+            async patchUserPreferencesAsync(ops, immediate = false) {
                 ops = Array.isArray(ops) ? ops : [ops];
                 if (!ops.length) {
                     return;
@@ -98086,10 +98087,15 @@ 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);
                 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
@@ -98099,14 +98105,19 @@ var pxt;
                         pxt.reportError("identity", "update preferences failed", result);
                     }
                 };
-                if (!debouncePreferencesChangedStarted) {
-                    debouncePreferencesChangedStarted = pxt.U.now();
-                }
-                if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                if (immediate) {
                     await savePrefs();
                 }
                 else {
-                    debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                    if (!debouncePreferencesChangedStarted) {
+                        debouncePreferencesChangedStarted = pxt.U.now();
+                    }
+                    if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                        await savePrefs();
+                    }
+                    else {
+                        debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                    }
                 }
             }
             /*protected*/ hasUserId() {
@@ -98356,6 +98367,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
@@ -139048,6 +139070,7 @@ var ts;
             }
             service.snippetAddsDefinitions = snippetAddsDefinitions;
             function getSnippet(context, fn, decl, python, recursionDepth = 0) {
+                var _a;
                 // TODO: a lot of this is duplicate logic with blocklyloader.ts:buildBlockFromDef; we should
                 //  unify these approaches
                 let { apis, takenNames, blocksInfo, screenSize, checker } = context;
@@ -139080,10 +139103,15 @@ var ts;
                 if (attrs.shim === "TD_ID" && recursionDepth && decl.parameters.length) {
                     return getParameterDefault(decl.parameters[0]);
                 }
+                const element = fn;
+                const params = pxt.blocks.compileInfo(element);
                 const blocksById = blocksInfo.blocksById;
                 // TODO: move out of getSnippet for general reuse
+                const blockParameters = ((_a = attrs._def) === null || _a === void 0 ? void 0 : _a.parameters.filter(param => !!params.definitionNameToParam[param.name]).map(param => params.definitionNameToParam[param.name].actualName)) || [];
                 const includedParameters = decl.parameters ? decl.parameters
-                    .filter(param => !param.initializer && !param.questionToken) : [];
+                    // Only keep required parameters and parameters included in the blockdef
+                    .filter(param => (!param.initializer && !param.questionToken)
+                    || (blockParameters.indexOf(param.name.getText()) >= 0)) : [];
                 const args = includedParameters
                     .map(getParameterDefault)
                     .map(p => 
@@ -139093,7 +139121,6 @@ var ts;
                     default: p,
                     isLiteral: true
                 }));
-                const element = fn;
                 if (element.attributes.block) {
                     if (element.attributes.defaultInstance) {
                         snippetPrefix = element.attributes.defaultInstance;
@@ -139141,7 +139168,6 @@ var ts;
                             isInstance = true;
                         }
                         else if (element.kind == 1 /* Method */ || element.kind == 2 /* Property */) {
-                            const params = pxt.blocks.compileInfo(element);
                             if (params.thisParameter) {
                                 let varName = undefined;
                                 if (params.thisParameter.definitionName) {
@@ -157637,7 +157663,9 @@ function buildSemanticUIAsync(parsed) {
         // Append icons.css to semantic.css (custom pxt icons)
         const iconsFile = (pkg["name"] == "pxt-core") ? 'built/web/icons.css' : 'node_modules/pxt-core/built/web/icons.css';
         const iconsCss = fs.readFileSync(iconsFile, "utf-8");
-        semCss = semCss + "\n" + iconsCss;
+        const reactCommonFile = (pkg["name"] == "pxt-core") ? 'built/web/react-common.css' : 'node_modules/pxt-core/built/web/react-common.css';
+        const reactCommonCss = fs.readFileSync(reactCommonFile, "utf-8");
+        semCss = semCss + "\n" + iconsCss + "\n" + reactCommonCss;
         nodeutil.writeFileSync('built/web/semantic.css', semCss);
     }).then(() => {
         // generate blockly css
@@ -157705,6 +157733,7 @@ function buildSkillMapAsync(parsed) {
         nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${skillmapRoot}/public/blb`);
         nodeutil.cp("built/web/semantic.css", `${skillmapRoot}/public/blb`);
         nodeutil.cp("node_modules/pxt-core/built/web/icons.css", `${skillmapRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/web/react-common.css", `${skillmapRoot}/public/blb`);
         // copy 'assets' over from docs/static
         nodeutil.cpR("docs/static/skillmap/assets", `${skillmapRoot}/public/assets`);
         if (docsPath) {

package/built/pxtcompiler.js

@@ -18255,6 +18255,7 @@ var ts;
             }
             service.snippetAddsDefinitions = snippetAddsDefinitions;
             function getSnippet(context, fn, decl, python, recursionDepth = 0) {
+                var _a;
                 // TODO: a lot of this is duplicate logic with blocklyloader.ts:buildBlockFromDef; we should
                 //  unify these approaches
                 let { apis, takenNames, blocksInfo, screenSize, checker } = context;
@@ -18287,10 +18288,15 @@ var ts;
                 if (attrs.shim === "TD_ID" && recursionDepth && decl.parameters.length) {
                     return getParameterDefault(decl.parameters[0]);
                 }
+                const element = fn;
+                const params = pxt.blocks.compileInfo(element);
                 const blocksById = blocksInfo.blocksById;
                 // TODO: move out of getSnippet for general reuse
+                const blockParameters = ((_a = attrs._def) === null || _a === void 0 ? void 0 : _a.parameters.filter(param => !!params.definitionNameToParam[param.name]).map(param => params.definitionNameToParam[param.name].actualName)) || [];
                 const includedParameters = decl.parameters ? decl.parameters
-                    .filter(param => !param.initializer && !param.questionToken) : [];
+                    // Only keep required parameters and parameters included in the blockdef
+                    .filter(param => (!param.initializer && !param.questionToken)
+                    || (blockParameters.indexOf(param.name.getText()) >= 0)) : [];
                 const args = includedParameters
                     .map(getParameterDefault)
                     .map(p => 
@@ -18300,7 +18306,6 @@ var ts;
                     default: p,
                     isLiteral: true
                 }));
-                const element = fn;
                 if (element.attributes.block) {
                     if (element.attributes.defaultInstance) {
                         snippetPrefix = element.attributes.defaultInstance;
@@ -18348,7 +18353,6 @@ var ts;
                             isInstance = true;
                         }
                         else if (element.kind == 1 /* Method */ || element.kind == 2 /* Property */) {
-                            const params = pxt.blocks.compileInfo(element);
                             if (params.thisParameter) {
                                 let varName = undefined;
                                 if (params.thisParameter.definitionName) {

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

@@ -54,6 +54,9 @@ declare namespace pxt.auth {
         mapProgress: any;
         completedTags: any;
     };
+    type UserBadgeState = {
+        badges: Badge[];
+    };
     /**
      * User preference state that should be synced with the cloud.
      */
@@ -62,6 +65,7 @@ declare namespace pxt.auth {
         highContrast?: boolean;
         reader?: string;
         skillmap?: UserSkillmapState;
+        badges?: UserBadgeState;
     };
     const DEFAULT_USER_PREFERENCES: () => UserPreferences;
     /**
@@ -120,7 +124,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<void>;
         hasUserId(): boolean;
         private fetchUserAsync;
         private setUserProfileAsync;
@@ -165,6 +170,11 @@ declare namespace pxt.auth {
     function userName(user: pxt.auth.UserProfile): string;
     function userInitials(user: pxt.auth.UserProfile): string;
     function generateUserProfilePicDataUrl(profile: pxt.auth.UserProfile): void;
+    /**
+     * Checks only the ID and sourceURL
+     */
+    function badgeEquals(badgeA: pxt.auth.Badge, badgeB: pxt.auth.Badge): boolean;
+    function hasBadge(preferences: pxt.auth.UserBadgeState, badge: pxt.auth.Badge): boolean;
 }
 declare namespace pxt {
     interface TelemetryEventOptions {

package/built/pxtlib.js

@@ -190,14 +190,15 @@ var pxt;
         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,7 +388,7 @@ var pxt;
                 }
                 return result.success;
             }
-            async patchUserPreferencesAsync(ops) {
+            async patchUserPreferencesAsync(ops, immediate = false) {
                 ops = Array.isArray(ops) ? ops : [ops];
                 if (!ops.length) {
                     return;
@@ -400,10 +401,15 @@ 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);
                 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
@@ -413,14 +419,19 @@ var pxt;
                         pxt.reportError("identity", "update preferences failed", result);
                     }
                 };
-                if (!debouncePreferencesChangedStarted) {
-                    debouncePreferencesChangedStarted = pxt.U.now();
-                }
-                if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                if (immediate) {
                     await savePrefs();
                 }
                 else {
-                    debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                    if (!debouncePreferencesChangedStarted) {
+                        debouncePreferencesChangedStarted = pxt.U.now();
+                    }
+                    if (PREFERENCES_DEBOUNCE_MAX_MS < pxt.U.now() - debouncePreferencesChangedStarted) {
+                        await savePrefs();
+                    }
+                    else {
+                        debouncePreferencesChangedTimeout = setTimeout(savePrefs, PREFERENCES_DEBOUNCE_MS);
+                    }
                 }
             }
             /*protected*/ hasUserId() {
@@ -670,6 +681,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