pxt-core 7.5.26 → 7.5.29

package/built/pxt.js

@@ -104499,6 +104499,7 @@ var pxt;
                 });
                 res.generatedFiles["/codal.json"] = JSON.stringify(codalJson, null, 4) + "\n";
                 pxt.debug(`codal.json: ${res.generatedFiles["/codal.json"]}`);
+                res.codal = codalJson;
             }
             else if (isPlatformio) {
                 const iniLines = compileService.platformioIni.slice();
@@ -113087,20 +113088,18 @@ var ts;
         function computeUsedParts(resp, filter) {
             if (!resp.usedSymbols || !pxt.appTarget.simulator || !pxt.appTarget.simulator.parts)
                 return [];
+            const parseParts = (partsRaw, ps) => {
+                if (partsRaw) {
+                    const partsSplit = partsRaw.split(/[ ,]+/g);
+                    ps.push(...partsSplit.filter(p => !!p && ps.indexOf(p) < 0));
+                }
+            };
             let parts = [];
+            let hiddenParts = [];
             Object.keys(resp.usedSymbols).forEach(symbol => {
-                let info = resp.usedSymbols[symbol];
-                if (info && info.attributes.parts) {
-                    let partsRaw = info.attributes.parts;
-                    if (partsRaw) {
-                        let partsSplit = partsRaw.split(/[ ,]+/);
-                        partsSplit.forEach(p => {
-                            if (0 < p.length && parts.indexOf(p) < 0) {
-                                parts.push(p);
-                            }
-                        });
-                    }
-                }
+                const info = resp.usedSymbols[symbol];
+                parseParts(info === null || info === void 0 ? void 0 : info.attributes.parts, parts);
+                parseParts(info === null || info === void 0 ? void 0 : info.attributes.hiddenParts, hiddenParts);
             });
             if (filter) {
                 const builtinParts = pxt.appTarget.simulator.boardDefinition.onboardComponents;
@@ -113113,6 +113112,8 @@ var ts;
                     }
                 }
             }
+            // apply hidden parts filter
+            parts = parts.filter(p => hiddenParts.indexOf(p) < 0);
             //sort parts (so breadboarding layout is stable w.r.t. code ordering)
             parts.sort();
             parts = parts.reverse(); //not strictly necessary, but it's a little
@@ -130915,10 +130916,15 @@ var ts;
                 if (pxtc.target.isNative)
                     bin.procs = bin.procs.filter(p => p.inlineBody && !p.info.usedAsIface && !p.info.usedAsValue ? false : true);
                 if (opts.target.isNative) {
-                    if (opts.extinfo.yotta)
-                        bin.writeFile("yotta.json", JSON.stringify(opts.extinfo.yotta, null, 2));
-                    if (opts.extinfo.platformio)
-                        bin.writeFile("platformio.json", JSON.stringify(opts.extinfo.platformio, null, 2));
+                    // collect various output files from all variants
+                    [...(opts.otherMultiVariants || []), opts].forEach(({ extinfo }) => {
+                        if (extinfo.yotta)
+                            bin.writeFile("yotta.json", JSON.stringify(extinfo.yotta, null, 2));
+                        if (extinfo.codal)
+                            bin.writeFile("codal.json", JSON.stringify(extinfo.codal, null, 2));
+                        if (extinfo.platformio)
+                            bin.writeFile("platformio.json", JSON.stringify(extinfo.platformio, null, 2));
+                    });
                     if (opts.target.nativeType == pxtc.NATIVE_TYPE_VM)
                         pxtc.vmEmit(bin, opts);
                     else
@@ -138730,7 +138736,6 @@ var ts;
             // don't export, fuse is internal only
             let lastFuse;
             let lastProjectFuse;
-            let lastExtensionFuse;
             function fileDiags(fn) {
                 if (!/\.ts$/.test(fn))
                     return [];
@@ -139151,26 +139156,6 @@ var ts;
                     const fns = lastFuse.search(search.term);
                     return fns.slice(0, SEARCH_RESULT_COUNT);
                 },
-                extensionSearch: v => {
-                    const extensions = v.extensions.srcs;
-                    const searchFor = v.search.term;
-                    const fuseOptions = {
-                        shouldSort: true,
-                        threshold: 0.6,
-                        location: 0,
-                        distance: 100,
-                        maxPatternLength: 16,
-                        minMatchCharLength: 2,
-                        findAllMatches: false,
-                        caseSensitive: false,
-                        keys: [
-                            { name: 'name', weight: 1 }
-                        ]
-                    };
-                    lastExtensionFuse = new Fuse(extensions, fuseOptions);
-                    const found = lastExtensionFuse.search(searchFor);
-                    return found;
-                },
                 projectSearch: v => {
                     const search = v.projectSearch;
                     const searchSet = search.headers;
@@ -141480,9 +141465,27 @@ var pxt;
                     unifyTypeOf(n.target, tpNumber);
                     let start = r.args.length == 1 ? B.mkText("0") : expr(r.args[0]);
                     let stop = expr(r.args[r.args.length == 1 ? 0 : 1]);
-                    return B.mkStmt(B.mkText("for ("), B.mkInfix(def, "=", start), B.mkText("; "), B.mkInfix(ref, "<", stop), B.mkText("; "), r.args.length >= 3 ?
-                        B.mkInfix(ref, "+=", expr(r.args[2])) :
-                        B.mkPostfix([ref], "++"), B.mkText(")"), stmts(n.body));
+                    if (r.args.length <= 2) {
+                        return B.mkStmt(B.mkText("for ("), B.mkInfix(def, "=", start), B.mkText("; "), B.mkInfix(ref, "<", stop), B.mkText("; "), B.mkPostfix([ref], "++"), B.mkText(")"), stmts(n.body));
+                    }
+                    // If there are three range arguments, the comparator we need to use
+                    // will either be > or < depending on the sign of the third argument.
+                    let numValue = r.args[2].kind === "Num" ? r.args[2].n : undefined;
+                    if (numValue == undefined && r.args[2].kind === "UnaryOp") {
+                        const uOp = r.args[2];
+                        if (uOp.operand.kind === "Num") {
+                            if (uOp.op === "UAdd")
+                                numValue = uOp.operand.n;
+                            else if (uOp.op === "USub")
+                                numValue = -uOp.operand.n;
+                        }
+                    }
+                    // If the third argument is not a number, we can't know the sign so we
+                    // have to emit a for-of loop instead
+                    if (numValue !== undefined) {
+                        const comparator = numValue > 0 ? "<" : ">";
+                        return B.mkStmt(B.mkText("for ("), B.mkInfix(def, "=", start), B.mkText("; "), B.mkInfix(ref, comparator, stop), B.mkText("; "), B.mkInfix(ref, "+=", expr(r.args[2])), B.mkText(")"), stmts(n.body));
+                    }
                 }
                 if (currIteration > 1) {
                     const typeOfTarget = typeOf(n.target);

package/built/pxtcompiler.d.ts

@@ -985,7 +985,6 @@ declare namespace ts.pxtc.service {
         snippet: (v: OpArg) => string;
         blocksInfo: (v: OpArg) => BlocksInfo;
         apiSearch: (v: OpArg) => SearchInfo[];
-        extensionSearch: (v: OpArg) => ExtensionMeta[];
         projectSearch: (v: OpArg) => ProjectSearchInfo[];
         projectSearchClear: () => void;
     }

package/built/pxtcompiler.js

@@ -9862,10 +9862,15 @@ var ts;
                 if (pxtc.target.isNative)
                     bin.procs = bin.procs.filter(p => p.inlineBody && !p.info.usedAsIface && !p.info.usedAsValue ? false : true);
                 if (opts.target.isNative) {
-                    if (opts.extinfo.yotta)
-                        bin.writeFile("yotta.json", JSON.stringify(opts.extinfo.yotta, null, 2));
-                    if (opts.extinfo.platformio)
-                        bin.writeFile("platformio.json", JSON.stringify(opts.extinfo.platformio, null, 2));
+                    // collect various output files from all variants
+                    [...(opts.otherMultiVariants || []), opts].forEach(({ extinfo }) => {
+                        if (extinfo.yotta)
+                            bin.writeFile("yotta.json", JSON.stringify(extinfo.yotta, null, 2));
+                        if (extinfo.codal)
+                            bin.writeFile("codal.json", JSON.stringify(extinfo.codal, null, 2));
+                        if (extinfo.platformio)
+                            bin.writeFile("platformio.json", JSON.stringify(extinfo.platformio, null, 2));
+                    });
                     if (opts.target.nativeType == pxtc.NATIVE_TYPE_VM)
                         pxtc.vmEmit(bin, opts);
                     else
@@ -17677,7 +17682,6 @@ var ts;
             // don't export, fuse is internal only
             let lastFuse;
             let lastProjectFuse;
-            let lastExtensionFuse;
             function fileDiags(fn) {
                 if (!/\.ts$/.test(fn))
                     return [];
@@ -18098,26 +18102,6 @@ var ts;
                     const fns = lastFuse.search(search.term);
                     return fns.slice(0, SEARCH_RESULT_COUNT);
                 },
-                extensionSearch: v => {
-                    const extensions = v.extensions.srcs;
-                    const searchFor = v.search.term;
-                    const fuseOptions = {
-                        shouldSort: true,
-                        threshold: 0.6,
-                        location: 0,
-                        distance: 100,
-                        maxPatternLength: 16,
-                        minMatchCharLength: 2,
-                        findAllMatches: false,
-                        caseSensitive: false,
-                        keys: [
-                            { name: 'name', weight: 1 }
-                        ]
-                    };
-                    lastExtensionFuse = new Fuse(extensions, fuseOptions);
-                    const found = lastExtensionFuse.search(searchFor);
-                    return found;
-                },
                 projectSearch: v => {
                     const search = v.projectSearch;
                     const searchSet = search.headers;

package/built/pxtlib.js

@@ -6813,6 +6813,7 @@ var pxt;
                 });
                 res.generatedFiles["/codal.json"] = JSON.stringify(codalJson, null, 4) + "\n";
                 pxt.debug(`codal.json: ${res.generatedFiles["/codal.json"]}`);
+                res.codal = codalJson;
             }
             else if (isPlatformio) {
                 const iniLines = compileService.platformioIni.slice();
@@ -15401,20 +15402,18 @@ var ts;
         function computeUsedParts(resp, filter) {
             if (!resp.usedSymbols || !pxt.appTarget.simulator || !pxt.appTarget.simulator.parts)
                 return [];
+            const parseParts = (partsRaw, ps) => {
+                if (partsRaw) {
+                    const partsSplit = partsRaw.split(/[ ,]+/g);
+                    ps.push(...partsSplit.filter(p => !!p && ps.indexOf(p) < 0));
+                }
+            };
             let parts = [];
+            let hiddenParts = [];
             Object.keys(resp.usedSymbols).forEach(symbol => {
-                let info = resp.usedSymbols[symbol];
-                if (info && info.attributes.parts) {
-                    let partsRaw = info.attributes.parts;
-                    if (partsRaw) {
-                        let partsSplit = partsRaw.split(/[ ,]+/);
-                        partsSplit.forEach(p => {
-                            if (0 < p.length && parts.indexOf(p) < 0) {
-                                parts.push(p);
-                            }
-                        });
-                    }
-                }
+                const info = resp.usedSymbols[symbol];
+                parseParts(info === null || info === void 0 ? void 0 : info.attributes.parts, parts);
+                parseParts(info === null || info === void 0 ? void 0 : info.attributes.hiddenParts, hiddenParts);
             });
             if (filter) {
                 const builtinParts = pxt.appTarget.simulator.boardDefinition.onboardComponents;
@@ -15427,6 +15426,8 @@ var ts;
                     }
                 }
             }
+            // apply hidden parts filter
+            parts = parts.filter(p => hiddenParts.indexOf(p) < 0);
             //sort parts (so breadboarding layout is stable w.r.t. code ordering)
             parts.sort();
             parts = parts.reverse(); //not strictly necessary, but it's a little

package/built/pxtpy.js

@@ -1231,9 +1231,27 @@ var pxt;
                     unifyTypeOf(n.target, tpNumber);
                     let start = r.args.length == 1 ? B.mkText("0") : expr(r.args[0]);
                     let stop = expr(r.args[r.args.length == 1 ? 0 : 1]);
-                    return B.mkStmt(B.mkText("for ("), B.mkInfix(def, "=", start), B.mkText("; "), B.mkInfix(ref, "<", stop), B.mkText("; "), r.args.length >= 3 ?
-                        B.mkInfix(ref, "+=", expr(r.args[2])) :
-                        B.mkPostfix([ref], "++"), B.mkText(")"), stmts(n.body));
+                    if (r.args.length <= 2) {
+                        return B.mkStmt(B.mkText("for ("), B.mkInfix(def, "=", start), B.mkText("; "), B.mkInfix(ref, "<", stop), B.mkText("; "), B.mkPostfix([ref], "++"), B.mkText(")"), stmts(n.body));
+                    }
+                    // If there are three range arguments, the comparator we need to use
+                    // will either be > or < depending on the sign of the third argument.
+                    let numValue = r.args[2].kind === "Num" ? r.args[2].n : undefined;
+                    if (numValue == undefined && r.args[2].kind === "UnaryOp") {
+                        const uOp = r.args[2];
+                        if (uOp.operand.kind === "Num") {
+                            if (uOp.op === "UAdd")
+                                numValue = uOp.operand.n;
+                            else if (uOp.op === "USub")
+                                numValue = -uOp.operand.n;
+                        }
+                    }
+                    // If the third argument is not a number, we can't know the sign so we
+                    // have to emit a for-of loop instead
+                    if (numValue !== undefined) {
+                        const comparator = numValue > 0 ? "<" : ">";
+                        return B.mkStmt(B.mkText("for ("), B.mkInfix(def, "=", start), B.mkText("; "), B.mkInfix(ref, comparator, stop), B.mkText("; "), B.mkInfix(ref, "+=", expr(r.args[2])), B.mkText(")"), stmts(n.body));
+                    }
                 }
                 if (currIteration > 1) {
                     const typeOfTarget = typeOf(n.target);