pxt-core 7.4.26 → 7.5.3

package/built/cli.js

@@ -342,7 +342,8 @@ function pxtFileList(pref) {
         .concat(onlyExts(nodeutil.allFiles(pref + "built/web", 1), [".js", ".css"]))
         .concat(nodeutil.allFiles(pref + "built/web/fonts", 1))
         .concat(nodeutil.allFiles(pref + "built/web/vs", 4))
-        .concat(nodeutil.allFiles(pref + "built/web/skillmap", 4));
+        .concat(nodeutil.allFiles(pref + "built/web/skillmap", 4))
+        .concat(nodeutil.allFiles(pref + "built/web/authcode", 4));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -422,7 +423,8 @@ function ciAsync() {
                     p = p
                         .then(() => buildWebStringsAsync())
                         .then(() => crowdin.execCrowdinAsync("upload", "built/webstrings.json"))
-                        .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"));
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/authcode-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -940,6 +942,7 @@ function uploadCoreAsync(opts) {
             "multiUrl": opts.localDir + "multi.html",
             "asseteditorUrl": opts.localDir + "asseteditor.html",
             "skillmapUrl": opts.localDir + "skillmap.html",
+            "authcodeUrl": opts.localDir + "authcode.html",
             "isStatic": true,
         };
         const targetImagePaths = targetImages.map(k => `${opts.localDir}${path.join('./docs', logos[k])}`);
@@ -985,13 +988,15 @@ function uploadCoreAsync(opts) {
         "workerConfig.js",
         "multi.html",
         "asseteditor.html",
-        "skillmap.html"
+        "skillmap.html",
+        "authcode.html"
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
     let expandFiles = [
         "index.html",
-        "skillmap.html"
+        "skillmap.html",
+        "authcode.html"
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -1785,7 +1790,7 @@ async function buildSemanticUIAsync(parsed) {
             ]
         });
     }
-    // Generate react-common css for skillmap
+    // Generate react-common css for skillmap and authcode
     const skillmapFile = isPxtCore ? "react-common/styles/react-common-skillmap-core.less" :
         "node_modules/pxt-core/react-common/styles/react-common-skillmap.less";
     await nodeutil.spawnAsync({
@@ -1797,6 +1802,17 @@ async function buildSemanticUIAsync(parsed) {
             "--include-path=" + lessIncludePaths
         ]
     });
+    const authcodeFile = isPxtCore ? "react-common/styles/react-common-authcode-core.less" :
+        "node_modules/pxt-core/react-common/styles/react-common-authcode.less";
+    await nodeutil.spawnAsync({
+        cmd: "node",
+        args: [
+            lessCPath,
+            authcodeFile,
+            "built/web/react-common-authcode.css",
+            "--include-path=" + lessIncludePaths
+        ]
+    });
     let skillmapCss = await readFileAsync(`built/web/react-common-skillmap.css`, "utf8");
     skillmapCss = await linkFontAsync("fa-solid-900", skillmapCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
     skillmapCss = await linkFontAsync("fa-regular-400", skillmapCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
@@ -1890,6 +1906,31 @@ function buildSkillMapAsync(parsed) {
         });
     });
 }
+function buildAuthcodeAsync(parsed) {
+    // local serve
+    const appRoot = "node_modules/pxt-core/authcode";
+    return rimrafAsync(`${appRoot}/public/blb`, {})
+        .then(() => rimrafAsync(`${appRoot}/build/assets`, {}))
+        .then(() => rimrafAsync(`${appRoot}/public/docs`, {}))
+        .then(() => rimrafAsync(`${appRoot}/public/static`, {}))
+        .then(() => {
+        // read pxtarget.json, save into 'pxtTargetBundle' global variable
+        let cfg = readLocalPxTarget();
+        nodeutil.writeFileSync(`${appRoot}/public/blb/target.js`, "// eslint-disable-next-line \n" + targetJsPrefix + JSON.stringify(cfg));
+        nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);
+        nodeutil.cp("built/web/semantic.css", `${appRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/web/icons.css", `${appRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/web/react-common-authcode.css", `${appRoot}/public/blb`);
+        // copy 'assets' over from docs/static
+        nodeutil.cpR("docs/static/authcode/assets", `${appRoot}/public/assets`);
+        return nodeutil.spawnAsync({
+            cmd: os.platform() === "win32" ? "npm.cmd" : "npm",
+            args: ["run-script", "start"],
+            cwd: appRoot,
+            shell: true
+        });
+    });
+}
 function updateDefaultProjects(cfg) {
     let defaultProjects = [
         pxt.BLOCKS_PROJECT_NAME,
@@ -6252,6 +6293,17 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             }
         }
     }, buildSkillMapAsync);
+    p.defineCommand({
+        name: "buildauthcode",
+        aliases: ["authcode"],
+        advanced: true,
+        help: "Serves the authcode webapp",
+        flags: {
+            serve: {
+                description: "Serve the authcode app locally after building (npm start)"
+            }
+        }
+    }, buildAuthcodeAsync);
     advancedCommand("augmentdocs", "test markdown docs replacements", augmnetDocsAsync, "<temlate.md> <doc.md>");
     advancedCommand("crowdin", "upload, download, clean, stats files to/from crowdin", pc => crowdin.execCrowdinAsync.apply(undefined, pc.args), "<cmd> <path> [output]");
     advancedCommand("hidlist", "list HID devices", hid.listAsync);

package/built/pxt.js

@@ -101595,6 +101595,25 @@ var pxt;
             });
         }
         blocks.hasHandler = hasHandler;
+        function getHelpUrl(fn) {
+            if (fn.attributes.help) {
+                const helpUrl = fn.attributes.help.replace(/^\//, '');
+                if (/^github:/.test(helpUrl)) {
+                    return helpUrl;
+                }
+                else if (helpUrl !== "none") {
+                    return "/reference/" + helpUrl;
+                }
+            }
+            else if (fn.pkg && !pxt.appTarget.bundledpkgs[fn.pkg]) { // added package
+                let anchor = fn.qName.toLowerCase().split('.');
+                if (anchor[0] == fn.pkg)
+                    anchor.shift();
+                return `/pkg/${fn.pkg}#${encodeURIComponent(anchor.join('-'))}`;
+            }
+            return undefined;
+        }
+        blocks.getHelpUrl = getHelpUrl;
         /**
          * Returns which Blockly block type to use for an argument reporter based
          * on the specified TypeScript type.
@@ -101606,6 +101625,9 @@ var pxt;
             if (varType === "boolean" || varType === "number" || varType === "string") {
                 reporterType = `argument_reporter_${varType}`;
             }
+            if (/^(?:Array<(?:.+)>)|(?:(?:.+)\[\])$/.test(varType)) {
+                reporterType = "argument_reporter_array";
+            }
             return reporterType;
         }
         blocks.reporterTypeForArgType = reporterTypeForArgType;
@@ -125490,6 +125512,8 @@ ${output}</xml>`;
                                 return getTaggedTemplateExpression(n);
                             case SK.CallExpression:
                                 return getStatementBlock(n, undefined, undefined, true);
+                            case SK.AsExpression:
+                                return getOutputBlock(n.expression);
                             default:
                                 error(n, pxtc.Util.lf("Unsupported syntax kind for output expression block: {0}", SK[n.kind]));
                                 break;
@@ -126370,11 +126394,14 @@ ${output}</xml>`;
                         r.mutationChildren = [];
                         n.parameters.forEach(p => {
                             const paramName = p.name.getText();
+                            let type = normalizeType(p.type.getText());
+                            if (pxt.U.endsWith(type, "[]"))
+                                type = "Array";
                             r.mutationChildren.push({
                                 nodeName: "arg",
                                 attributes: {
                                     name: paramName,
-                                    type: p.type.getText(),
+                                    type,
                                     id: env.functionParamIds[name][paramName]
                                 }
                             });
@@ -126450,11 +126477,14 @@ ${output}</xml>`;
                                     env.declaredFunctions[name].parameters.forEach((p, i) => {
                                         const paramName = p.name.getText();
                                         const argId = env.functionParamIds[name][paramName];
+                                        let type = normalizeType(p.type.getText());
+                                        if (pxt.U.endsWith(type, "[]"))
+                                            type = "Array";
                                         r.mutationChildren.push({
                                             nodeName: "arg",
                                             attributes: {
                                                 name: paramName,
-                                                type: p.type.getText(),
+                                                type: type,
                                                 id: argId
                                             }
                                         });
@@ -127322,7 +127352,8 @@ ${output}</xml>`;
                                 if (!type) {
                                     return pxtc.Util.lf("Function parameters must declare a type");
                                 }
-                                if (env.opts.allowedArgumentTypes.indexOf(normalizeType(type)) === -1) {
+                                const normalized = normalizeType(type);
+                                if (env.opts.allowedArgumentTypes.indexOf(normalized) === -1 && !pxtc.U.endsWith(normalized, "[]")) {
                                     return pxtc.Util.lf("Only types that can be added in blocks can be used for function arguments");
                                 }
                             }
@@ -127597,6 +127628,8 @@ ${output}</xml>`;
                         return checkStatement(n, env, true, undefined);
                     case SK.TaggedTemplateExpression:
                         return checkTaggedTemplateExpression(n, env);
+                    case SK.AsExpression:
+                        return checkAsExpression(n);
                 }
                 return pxtc.Util.lf("Unsupported syntax kind for output expression block: {0}", SK[n.kind]);
                 function checkStringLiteral(n) {
@@ -127693,6 +127726,31 @@ ${output}</xml>`;
                 // The compiler will have already caught any invalid tags or templates
                 return undefined;
             }
+            function checkAsExpression(n) {
+                // The only time we allow casts to decompile is in the very special case where someone has
+                // written a program comparing two string, boolean, or numeric literals in blocks and
+                // converted to text. e.g. 3 == 5 or true != false
+                if (n.type.getText().trim() === "any" && (ts.isStringOrNumericLiteral(n.expression) ||
+                    n.expression.kind === SK.TrueKeyword || n.expression.kind === SK.FalseKeyword)) {
+                    const [parent] = getParent(n);
+                    if (parent.kind === SK.BinaryExpression) {
+                        switch (parent.operatorToken.kind) {
+                            case SK.EqualsEqualsToken:
+                            case SK.EqualsEqualsEqualsToken:
+                            case SK.ExclamationEqualsToken:
+                            case SK.ExclamationEqualsEqualsToken:
+                            case SK.LessThanToken:
+                            case SK.LessThanEqualsToken:
+                            case SK.GreaterThanToken:
+                            case SK.GreaterThanEqualsToken:
+                                return undefined;
+                            default:
+                                break;
+                        }
+                    }
+                }
+                return pxtc.Util.lf("Casting not supported in blocks");
+            }
             function getParent(node) {
                 if (!node.parent) {
                     return [undefined, node];
@@ -133485,8 +133543,10 @@ ${lbl}: .short 0xffff
                     return needsNumberConversions() ? pxtc.ir.rtcall("pxt::toInt", [e]) : e;
                 };
                 // c = a[i]
-                if (iterVar)
+                if (iterVar) {
                     proc.emitExpr(iterVar.storeByRef(pxtc.ir.rtcall(indexer, [collectionVar.loadCore(), toInt(intVarIter.loadCore())])));
+                    emitBrk(node.initializer);
+                }
                 flushHoistedFunctionDefinitions();
                 emit(node.statement);
                 proc.emitLblDirect(l.cont);
@@ -140954,6 +141014,14 @@ var pxt;
             FloorDiv: 1,
             Mult: 1, // this can be also used on strings and arrays, but let's ignore that for now
         };
+        const arithmeticCompareOps = {
+            Eq: 1,
+            NotEq: 1,
+            Lt: 1,
+            LtE: 1,
+            Gt: 1,
+            GtE: 1
+        };
         const opMapping = {
             Add: "+",
             Sub: "-",
@@ -141825,9 +141893,24 @@ var pxt;
                     let idx = B.mkInfix(expr(n.comparators[0]), ".", B.H.mkCall("indexOf", [expr(n.left)]));
                     return B.mkInfix(idx, n.ops[0] == "In" ? ">=" : "<", B.mkText("0"));
                 }
-                let r = binop(expr(n.left), n.ops[0], expr(n.comparators[0]));
+                let left = expr(n.left);
+                let right = expr(n.comparators[0]);
+                // Special handling for comparisons of literal types, e.g. 0 === 5
+                const castIfLiteralComparison = (op, leftExpr, rightExpr) => {
+                    if (arithmeticCompareOps[op]) {
+                        if (isNumStringOrBool(leftExpr) && isNumStringOrBool(rightExpr) && B.flattenNode([left]) !== B.flattenNode([right])) {
+                            left = B.H.mkParenthesizedExpression(B.mkGroup([left, B.mkText(" as any")]));
+                            right = B.H.mkParenthesizedExpression(B.mkGroup([right, B.mkText(" as any")]));
+                        }
+                    }
+                };
+                castIfLiteralComparison(n.ops[0], n.left, n.comparators[0]);
+                let r = binop(left, n.ops[0], right);
                 for (let i = 1; i < n.ops.length; ++i) {
-                    r = binop(r, "And", binop(expr(n.comparators[i - 1]), n.ops[i], expr(n.comparators[i])));
+                    left = expr(n.comparators[i - 1]);
+                    right = expr(n.comparators[i]);
+                    castIfLiteralComparison(n.ops[i], n.comparators[i - 1], n.comparators[i]);
+                    r = binop(r, "And", binop(left, n.ops[i], right));
                 }
                 return r;
             },
@@ -142615,6 +142698,16 @@ var pxt;
             const t = canonicalize(typeOf(expr));
             return t && t.primType === "@array";
         }
+        function isNumStringOrBool(expr) {
+            switch (expr.kind) {
+                case "Num":
+                case "Str":
+                    return true;
+                case "NameConstant":
+                    return expr.value !== null;
+            }
+            return false;
+        }
         function buildOverride(override, args, recv) {
             const result = [];
             for (const part of override.parts) {
@@ -145986,6 +146079,42 @@ var pxt;
                 }
                 return fn(s);
             }
+            function getParent(node) {
+                if (!node.parent) {
+                    return undefined;
+                }
+                else if (node.parent.kind === ts.SyntaxKind.ParenthesizedExpression) {
+                    return getParent(node.parent);
+                }
+                else {
+                    return node.parent;
+                }
+            }
+            function isDecompilableAsExpression(n) {
+                // The only time we allow casts to decompile is in the very special case where someone has
+                // written a program comparing two string, boolean, or numeric literals in blocks and
+                // converted to text. e.g. 3 == 5 or true != false
+                if (n.type.getText().trim() === "any" && (ts.isNumericLiteral(n.expression) || ts.isStringLiteral(n.expression) ||
+                    n.expression.kind === ts.SyntaxKind.TrueKeyword || n.expression.kind === ts.SyntaxKind.FalseKeyword)) {
+                    const parent = getParent(n);
+                    if ((parent === null || parent === void 0 ? void 0 : parent.kind) === ts.SyntaxKind.BinaryExpression) {
+                        switch (parent.operatorToken.kind) {
+                            case ts.SyntaxKind.EqualsEqualsToken:
+                            case ts.SyntaxKind.EqualsEqualsEqualsToken:
+                            case ts.SyntaxKind.ExclamationEqualsToken:
+                            case ts.SyntaxKind.ExclamationEqualsEqualsToken:
+                            case ts.SyntaxKind.LessThanToken:
+                            case ts.SyntaxKind.LessThanEqualsToken:
+                            case ts.SyntaxKind.GreaterThanToken:
+                            case ts.SyntaxKind.GreaterThanEqualsToken:
+                                return true;
+                            default:
+                                break;
+                        }
+                    }
+                }
+                return false;
+            }
             function isConstExp(s) {
                 let isConst = (s) => {
                     switch (s.kind) {
@@ -146068,6 +146197,8 @@ var pxt;
                     return asExpRes(s.getText());
                 if (ts.isConditionalExpression(s))
                     return emitCondExp(s);
+                if (ts.isAsExpression(s) && isDecompilableAsExpression(s))
+                    return emitExp(s.expression);
                 // TODO handle more expressions
                 pxt.tickEvent("depython.todo.expression", { kind: s.kind });
                 // return asExpRes(s.getText(), ["# unknown expression:  " + s.kind]) // uncomment for easier locating
@@ -156292,7 +156423,8 @@ function pxtFileList(pref) {
         .concat(onlyExts(nodeutil.allFiles(pref + "built/web", 1), [".js", ".css"]))
         .concat(nodeutil.allFiles(pref + "built/web/fonts", 1))
         .concat(nodeutil.allFiles(pref + "built/web/vs", 4))
-        .concat(nodeutil.allFiles(pref + "built/web/skillmap", 4));
+        .concat(nodeutil.allFiles(pref + "built/web/skillmap", 4))
+        .concat(nodeutil.allFiles(pref + "built/web/authcode", 4));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -156372,7 +156504,8 @@ function ciAsync() {
                     p = p
                         .then(() => buildWebStringsAsync())
                         .then(() => crowdin.execCrowdinAsync("upload", "built/webstrings.json"))
-                        .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"));
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/authcode-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -156890,6 +157023,7 @@ function uploadCoreAsync(opts) {
             "multiUrl": opts.localDir + "multi.html",
             "asseteditorUrl": opts.localDir + "asseteditor.html",
             "skillmapUrl": opts.localDir + "skillmap.html",
+            "authcodeUrl": opts.localDir + "authcode.html",
             "isStatic": true,
         };
         const targetImagePaths = targetImages.map(k => `${opts.localDir}${path.join('./docs', logos[k])}`);
@@ -156935,13 +157069,15 @@ function uploadCoreAsync(opts) {
         "workerConfig.js",
         "multi.html",
         "asseteditor.html",
-        "skillmap.html"
+        "skillmap.html",
+        "authcode.html"
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
     let expandFiles = [
         "index.html",
-        "skillmap.html"
+        "skillmap.html",
+        "authcode.html"
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -157735,7 +157871,7 @@ async function buildSemanticUIAsync(parsed) {
             ]
         });
     }
-    // Generate react-common css for skillmap
+    // Generate react-common css for skillmap and authcode
     const skillmapFile = isPxtCore ? "react-common/styles/react-common-skillmap-core.less" :
         "node_modules/pxt-core/react-common/styles/react-common-skillmap.less";
     await nodeutil.spawnAsync({
@@ -157747,6 +157883,17 @@ async function buildSemanticUIAsync(parsed) {
             "--include-path=" + lessIncludePaths
         ]
     });
+    const authcodeFile = isPxtCore ? "react-common/styles/react-common-authcode-core.less" :
+        "node_modules/pxt-core/react-common/styles/react-common-authcode.less";
+    await nodeutil.spawnAsync({
+        cmd: "node",
+        args: [
+            lessCPath,
+            authcodeFile,
+            "built/web/react-common-authcode.css",
+            "--include-path=" + lessIncludePaths
+        ]
+    });
     let skillmapCss = await readFileAsync(`built/web/react-common-skillmap.css`, "utf8");
     skillmapCss = await linkFontAsync("fa-solid-900", skillmapCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
     skillmapCss = await linkFontAsync("fa-regular-400", skillmapCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
@@ -157840,6 +157987,31 @@ function buildSkillMapAsync(parsed) {
         });
     });
 }
+function buildAuthcodeAsync(parsed) {
+    // local serve
+    const appRoot = "node_modules/pxt-core/authcode";
+    return rimrafAsync(`${appRoot}/public/blb`, {})
+        .then(() => rimrafAsync(`${appRoot}/build/assets`, {}))
+        .then(() => rimrafAsync(`${appRoot}/public/docs`, {}))
+        .then(() => rimrafAsync(`${appRoot}/public/static`, {}))
+        .then(() => {
+        // read pxtarget.json, save into 'pxtTargetBundle' global variable
+        let cfg = readLocalPxTarget();
+        nodeutil.writeFileSync(`${appRoot}/public/blb/target.js`, "// eslint-disable-next-line \n" + targetJsPrefix + JSON.stringify(cfg));
+        nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);
+        nodeutil.cp("built/web/semantic.css", `${appRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/web/icons.css", `${appRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/web/react-common-authcode.css", `${appRoot}/public/blb`);
+        // copy 'assets' over from docs/static
+        nodeutil.cpR("docs/static/authcode/assets", `${appRoot}/public/assets`);
+        return nodeutil.spawnAsync({
+            cmd: os.platform() === "win32" ? "npm.cmd" : "npm",
+            args: ["run-script", "start"],
+            cwd: appRoot,
+            shell: true
+        });
+    });
+}
 function updateDefaultProjects(cfg) {
     let defaultProjects = [
         pxt.BLOCKS_PROJECT_NAME,
@@ -162202,6 +162374,17 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             }
         }
     }, buildSkillMapAsync);
+    p.defineCommand({
+        name: "buildauthcode",
+        aliases: ["authcode"],
+        advanced: true,
+        help: "Serves the authcode webapp",
+        flags: {
+            serve: {
+                description: "Serve the authcode app locally after building (npm start)"
+            }
+        }
+    }, buildAuthcodeAsync);
     advancedCommand("augmentdocs", "test markdown docs replacements", augmnetDocsAsync, "<temlate.md> <doc.md>");
     advancedCommand("crowdin", "upload, download, clean, stats files to/from crowdin", pc => crowdin.execCrowdinAsync.apply(undefined, pc.args), "<cmd> <path> [output]");
     advancedCommand("hidlist", "list HID devices", hid.listAsync);