pxt-core 8.2.6 → 8.2.9

package/built/pxtblocks.js

@@ -3185,6 +3185,22 @@ var pxt;
                 }
             });
         }
+        function validateAllReferencedBlocksExist(xml) {
+            pxt.U.assert(!!(Blockly === null || Blockly === void 0 ? void 0 : Blockly.Blocks), "Called validateAllReferencedBlocksExist before initializing Blockly");
+            const dom = Blockly.Xml.textToDom(xml);
+            const blocks = dom.querySelectorAll("block");
+            for (let i = 0; i < blocks.length; i++) {
+                if (!Blockly.Blocks[blocks.item(i).getAttribute("type")])
+                    return false;
+            }
+            const shadows = dom.querySelectorAll("shadow");
+            for (let i = 0; i < shadows.length; i++) {
+                if (!Blockly.Blocks[shadows.item(i).getAttribute("type")])
+                    return false;
+            }
+            return true;
+        }
+        blocks_2.validateAllReferencedBlocksExist = validateAllReferencedBlocksExist;
     })(blocks = pxt.blocks || (pxt.blocks = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -3206,6 +3222,7 @@ var pxt;
                 const newDom = Blockly.Xml.workspaceToDom(newWs, true);
                 pxt.Util.toArray(oldDom.childNodes)
                     .filter((n) => n.nodeType == Node.ELEMENT_NODE && n.localName == "block" && n.getAttribute("disabled") == "true")
+                    .filter((n) => !!Blockly.Blocks[n.getAttribute("type")])
                     .forEach(n => newDom.appendChild(newDom.ownerDocument.importNode(n, true)));
                 const updatedXml = Blockly.Xml.domToText(newDom);
                 return updatedXml;
@@ -4151,6 +4168,14 @@ var pxt;
                 blocksXml: `<xml xmlns="http://www.w3.org/1999/xhtml">${cleanOuterHTML(blockXml)}</xml>`,
             };
         }
+        function attachCardInfo(blockInfo, qName) {
+            const toModify = blockInfo.apis.byQName[qName];
+            if (toModify) {
+                const comp = blocks_4.compileInfo(toModify);
+                const xml = createToolboxBlock(blockInfo, toModify, comp);
+                return mkCard(toModify, xml);
+            }
+        }
         function isSubtype(apis, specific, general) {
             if (specific == general)
                 return true;
@@ -4498,7 +4523,7 @@ var pxt;
          * Used by pxtrunner to initialize blocks in the docs
          */
         function initializeAndInject(blockInfo) {
-            init();
+            init(blockInfo);
             injectBlocks(blockInfo);
         }
         blocks_4.initializeAndInject = initializeAndInject;
@@ -4507,12 +4532,12 @@ var pxt;
          * Blocks are injected separately by called injectBlocks
          */
         function initialize(blockInfo) {
-            init();
+            init(blockInfo);
             initJresIcons(blockInfo);
         }
         blocks_4.initialize = initialize;
         let blocklyInitialized = false;
-        function init() {
+        function init(blockInfo) {
             if (blocklyInitialized)
                 return;
             blocklyInitialized = true;
@@ -4523,7 +4548,7 @@ var pxt;
             blocks_4.initFieldEditors();
             initContextMenu();
             initOnStart();
-            initMath();
+            initMath(blockInfo);
             initVariables();
             initFunctions();
             initLists();
@@ -5383,9 +5408,10 @@ var pxt;
                 }
             };
         }
-        function initMath() {
+        function initMath(blockInfo) {
             // math_op2
             const mathOp2Id = "math_op2";
+            const mathOp2qName = "Math.min"; // TODO: implement logic so that this changes based on which is used (min or max)
             const mathOp2Def = pxt.blocks.getBlockDefinition(mathOp2Id);
             const mathOp2Tooltips = mathOp2Def.tooltip;
             Blockly.Blocks[mathOp2Id] = {
@@ -5421,11 +5447,13 @@ var pxt;
                     setHelpResources(this, mathOp2Id, mathOp2Def.name, function (block) {
                         return mathOp2Tooltips[block.getFieldValue('op')];
                     }, mathOp2Def.url, pxt.toolbox.getNamespaceColor(mathOp2Def.category));
-                }
+                },
+                codeCard: attachCardInfo(blockInfo, mathOp2qName)
             };
             // math_op3
             const mathOp3Id = "math_op3";
             const mathOp3Def = pxt.blocks.getBlockDefinition(mathOp3Id);
+            const mathOp3qName = "Math.abs";
             Blockly.Blocks[mathOp3Id] = {
                 init: function () {
                     this.jsonInit({
@@ -5443,7 +5471,8 @@ var pxt;
                         "colour": pxt.toolbox.getNamespaceColor('math')
                     });
                     setBuiltinHelpInfo(this, mathOp3Id);
-                }
+                },
+                codeCard: attachCardInfo(blockInfo, mathOp3qName)
             };
             // builtin math_number, math_integer, math_whole_number, math_number_minmax
             //XXX Integer validation needed.
@@ -8389,7 +8418,6 @@ var pxtblockly;
             this.fieldGroup_.appendChild(bg.el);
             const icon = new svg.Text("\uf008")
                 .at(X_PADDING, 5 + (TOTAL_HEIGHT >> 1))
-                .fill(this.sourceBlock_.getColourSecondary())
                 .setClass("semanticIcon");
             this.fieldGroup_.appendChild(icon.el);
             if (this.asset) {
@@ -9907,7 +9935,7 @@ var pxtblockly;
         return function () {
             const res = [];
             const that = this;
-            if (that.sourceBlock_ && that.sourceBlock_.workspace) {
+            if (that.sourceBlock_ && that.sourceBlock_.workspace && !that.sourceBlock_.isInFlyout) {
                 const options = that.sourceBlock_.workspace.getVariablesOfType(kindType(opts.name));
                 options.forEach(model => {
                     res.push([model.name, model.name]);

package/built/pxtcompiler.js

@@ -6258,7 +6258,7 @@ ${output}</xml>`;
                             if (alias) {
                                 info.decompilerBlockAlias = env.aliasBlocks[info.qName];
                             }
-                            else {
+                            else if (!env.opts.snippetMode) {
                                 return pxtc.Util.lf("No output expressions as statements");
                             }
                         }
@@ -13817,7 +13817,7 @@ var ts;
                 snippetMode: opts.snippetMode || false,
                 alwaysEmitOnStart: opts.alwaysDecompileOnStart,
                 includeGreyBlockMessages,
-                generateSourceMap: !!opts.ast,
+                generateSourceMap: opts.generateSourceMap !== undefined ? opts.generateSourceMap : !!opts.ast,
                 allowedArgumentTypes: opts.allowedArgumentTypes || ["number", "boolean", "string"],
                 errorOnGreyBlocks: !!opts.errorOnGreyBlocks
             };
@@ -13835,7 +13835,7 @@ var ts;
                 snippetMode: opts.snippetMode || false,
                 alwaysEmitOnStart: opts.alwaysDecompileOnStart,
                 includeGreyBlockMessages,
-                generateSourceMap: !!opts.ast,
+                generateSourceMap: opts.generateSourceMap !== undefined ? opts.generateSourceMap : !!opts.ast,
                 allowedArgumentTypes: opts.allowedArgumentTypes || ["number", "boolean", "string"],
                 errorOnGreyBlocks: !!opts.errorOnGreyBlocks
             };

package/built/pxteditor.js

@@ -558,6 +558,11 @@ var pxt;
                         name: lf("Blocks Error List"),
                         description: lf("Show an error list panel for Blocks")
                     },
+                    {
+                        id: "palettePicker",
+                        name: lf("Change Color Palette"),
+                        description: lf("Change the game palette in project settings")
+                    },
                 ].filter(experiment => ids.indexOf(experiment.id) > -1 && !(pxt.BrowserUtils.isPxtElectron() && experiment.enableOnline));
             }
             experiments_1.all = all;

package/built/pxtlib.js

@@ -4110,7 +4110,7 @@ var pxt;
                         MATH_ADDITION_SYMBOL: pxt.Util.lf("{id:op}+"),
                         MATH_SUBTRACTION_SYMBOL: pxt.Util.lf("{id:op}-"),
                         MATH_MULTIPLICATION_SYMBOL: pxt.Util.lf("{id:op}×"),
-                        MATH_DIVISION_SYMBOL: pxt.Util.lf("{id:op}÷"),
+                        MATH_DIVISION_SYMBOL: pxt.Util.lf("{id:op}/"),
                         MATH_POWER_SYMBOL: pxt.Util.lf("{id:op}**")
                     }
                 },
@@ -4120,7 +4120,7 @@ var pxt;
                     url: '/blocks/math',
                     category: 'math',
                     block: {
-                        MATH_MODULO_TITLE: pxt.Util.lf("remainder of %1 ÷ %2")
+                        MATH_MODULO_TITLE: pxt.Util.lf("remainder of %1 / %2")
                     }
                 },
                 'math_js_op': {
@@ -4149,7 +4149,7 @@ var pxt;
                         "acos": pxt.Util.lf("{id:op}acos"),
                         "tan": pxt.Util.lf("{id:op}tan"),
                         "atan2": pxt.Util.lf("{id:op}atan2"),
-                        "idiv": pxt.Util.lf("{id:op}integer ÷"),
+                        "idiv": pxt.Util.lf("{id:op}integer /"),
                         "imul": pxt.Util.lf("{id:op}integer ×"),
                     }
                 },
@@ -19318,6 +19318,7 @@ var pxt;
                 diffify(steps, activities);
             }
             const assetFiles = parseAssetJson(assetJson);
+            const globalBlockConfig = parseTutorialBlockConfig("global", tutorialmd);
             // strip hidden snippets
             steps.forEach(step => {
                 step.contentMd = stripHiddenSnippets(step.contentMd);
@@ -19337,7 +19338,8 @@ var pxt;
                 jres,
                 assetFiles,
                 customTs,
-                tutorialValidationRules
+                tutorialValidationRules,
+                globalBlockConfig
             };
         }
         tutorial.parseTutorial = parseTutorial;
@@ -19364,6 +19366,8 @@ var pxt;
                 switch (m1) {
                     case "block":
                     case "blocks":
+                    case "blockconfig.local":
+                    case "blockconfig.global":
                     case "requiredTutorialBlock":
                     case "filterblocks":
                         if (!checkTutorialEditor(pxt.BLOCKS_PROJECT_NAME))
@@ -19516,6 +19520,7 @@ ${code}
             markdown.replace(stepRegex, function (match, flags, step) {
                 step = step.trim();
                 let { header, hint, requiredBlocks } = parseTutorialHint(step, metadata && metadata.explicitHints, metadata.tutorialCodeValidation);
+                const blockConfig = parseTutorialBlockConfig("local", step);
                 // if title is not hidden ("{TITLE HERE}"), strip flags
                 const title = !flags.match(/^\{.*\}$/)
                     ? flags.replace(/@(fullscreen|unplugged|showdialog|showhint|tutorialCompleted|resetDiff)/gi, "").trim()
@@ -19523,7 +19528,8 @@ ${code}
                 let info = {
                     title,
                     contentMd: step,
-                    headerContentMd: header
+                    headerContentMd: header,
+                    localBlockConfig: blockConfig
                 };
                 if (/@(fullscreen|unplugged|showdialog|showhint)/i.test(flags))
                     info.showHint = true;
@@ -19578,6 +19584,18 @@ ${code}
             }
             return { header, hint, requiredBlocks };
         }
+        function parseTutorialBlockConfig(scope, content) {
+            let blockConfig = {
+                md: "",
+                blocks: [],
+            };
+            const regex = new RegExp(`\`\`\`\\s*blockconfig\\.${scope}\\s*\\n([\\s\\S]*?)\\n\`\`\``, "gmi");
+            content.replace(regex, (m0, m1) => {
+                blockConfig.md += `${m1}\n`;
+                return "";
+            });
+            return blockConfig;
+        }
         function categorizingValidationRules(listOfRules, title) {
             const ruleNames = Object.keys(listOfRules);
             for (let i = 0; i < ruleNames.length; i++) {
@@ -19593,7 +19611,7 @@ ${code}
         function stripHiddenSnippets(str) {
             if (!str)
                 return str;
-            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts)\s*\n([\s\S]*?)\n```/gmi;
+            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global)\s*\n([\s\S]*?)\n```/gmi;
             return str.replace(hiddenSnippetRegex, '').trim();
         }
         /*
@@ -19675,7 +19693,8 @@ ${code}
                 jres: tutorialInfo.jres,
                 assetFiles: tutorialInfo.assetFiles,
                 customTs: tutorialInfo.customTs,
-                tutorialValidationRules: tutorialInfo.tutorialValidationRules
+                tutorialValidationRules: tutorialInfo.tutorialValidationRules,
+                globalBlockConfig: tutorialInfo.globalBlockConfig
             };
             return { options: tutorialOptions, editor: tutorialInfo.editor };
         }

package/built/pxtpy.d.ts

@@ -145,6 +145,7 @@ declare namespace pxt.py {
         vars: Map<ScopeSymbolInfo>;
         parent?: ScopeDef;
         blockDepth?: number;
+        nextHelperVariableId?: number;
     }
     interface FunctionDef extends Symbol, ScopeDef {
         kind: "FunctionDef";

package/built/pxtpy.js

@@ -342,6 +342,13 @@ var pxt;
                 error(a, 9503, pxt.U.lf("No module named '{0}'", name));
             return sym;
         }
+        function getHelperVariableName() {
+            const scope = currentScope();
+            if (scope.nextHelperVariableId === undefined) {
+                scope.nextHelperVariableId = 0;
+            }
+            return "___tempvar" + scope.nextHelperVariableId++;
+        }
         function defvar(name, opts, modifier, scope) {
             if (!scope)
                 scope = currentScope();
@@ -1648,20 +1655,7 @@ var pxt;
                 return B.mkStmt(B.mkText(pref), B.mkInfix(expr(target), "=", expr(value)));
             }
             if (!pref && target.kind == "Tuple") {
-                let tup = target;
-                let targs = [B.mkText("let "), B.mkText("[")];
-                let nonNames = tup.elts.filter(e => e.kind !== "Name");
-                if (nonNames.length) {
-                    error(n, 9556, pxt.U.lf("non-trivial tuple assignment unsupported"));
-                    return stmtTODO(n);
-                }
-                let tupNames = tup.elts
-                    .map(e => e)
-                    .map(convertName);
-                targs.push(B.mkCommaSep(tupNames));
-                targs.push(B.mkText("]"));
-                let res = B.mkStmt(B.mkInfix(B.mkGroup(targs), "=", expr(value)));
-                return res;
+                return convertDestructuring(n, target, value);
             }
             if (target.kind === "Name") {
                 const scopeSym = currentScope().vars[nm];
@@ -1689,12 +1683,41 @@ var pxt;
             if (!lExp)
                 lExp = expr(target);
             return B.mkStmt(B.mkText(pref), B.mkInfix(lExp, "=", expr(value)));
-            function convertName(n) {
+        }
+        function convertDestructuring(parent, targets, value) {
+            let nonNames = targets.elts.filter(e => e.kind !== "Name");
+            if (nonNames.length) {
+                error(parent, 9556, pxt.U.lf("non-trivial tuple assignment unsupported"));
+                return stmtTODO(parent);
+            }
+            const names = targets.elts.map(tryGetName);
+            const symbols = names
+                .map(nm => nm ? currentScope().vars[nm] : undefined);
+            if (symbols.some(s => (s === null || s === void 0 ? void 0 : s.modifier) !== undefined)) {
+                const helperVar = getHelperVariableName();
+                const valueAssign = B.mkStmt(B.mkInfix(B.mkGroup([B.mkText("let "), B.mkText(helperVar)]), "=", expr(value)));
+                const assignStatements = [valueAssign];
+                for (let i = 0; i < symbols.length; i++) {
+                    const name = convertName(targets.elts[i]);
+                    assignStatements.push(B.mkStmt(B.mkInfix(name, "=", B.mkGroup([B.mkText(helperVar), B.mkText(`[${i}]`)]))));
+                }
+                return B.mkGroup(assignStatements);
+            }
+            else {
+                let targs = [B.mkText("let "), B.mkText("[")];
+                let tupNames = targets.elts
+                    .map(e => e)
+                    .map(e => convertName(e, true));
+                targs.push(B.mkCommaSep(tupNames));
+                targs.push(B.mkText("]"));
+                return B.mkStmt(B.mkInfix(B.mkGroup(targs), "=", expr(value)));
+            }
+            function convertName(n, excludeLet = false) {
                 // TODO resuse with Name expr
                 markInfoNode(n, "identifierCompletion");
                 typeOf(n);
                 let v = lookupName(n);
-                return possibleDef(n, /*excludeLet*/ true);
+                return possibleDef(n, excludeLet);
             }
         }
         function possibleDef(n, excludeLet = false) {

package/built/pxtrunner.js

@@ -1319,6 +1319,18 @@ var pxt;
                 c = c.parent();
             c.remove();
         }
+        function renderBlockConfig(options) {
+            function render(scope) {
+                $(`code.lang-blockconfig.${scope}`).each((i, c) => {
+                    let $c = $(c);
+                    if (options.snippetReplaceParent)
+                        $c = $c.parent();
+                    $c.remove();
+                });
+            }
+            render("local");
+            render("global");
+        }
         function renderSims(options) {
             if (!options.simulatorClass)
                 return;
@@ -1359,6 +1371,7 @@ var pxt;
             readAssetJson(options);
             renderQueue = [];
             renderGhost(options);
+            renderBlockConfig(options);
             renderSims(options);
             renderTypeScript(options);
             renderDirectPython(options);