pxt-core 7.3.7 → 7.4.3

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

@@ -98356,6 +98356,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 +139059,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 +139092,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 +139110,6 @@ var ts;
                     default: p,
                     isLiteral: true
                 }));
-                const element = fn;
                 if (element.attributes.block) {
                     if (element.attributes.defaultInstance) {
                         snippetPrefix = element.attributes.defaultInstance;
@@ -139141,7 +139157,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 +157652,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 +157722,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/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;
     /**
@@ -165,6 +169,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

@@ -670,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