pxt-core 12.2.3 → 12.2.4

package/built/pxt.js

@@ -112229,6 +112229,7 @@ var pxt;
         let currentValue = null;
         let listStack = [];
         let currentIndent = 0;
+        let currentCodeBlock = null;
         for (const line of lines) {
             if (!line.trim()) {
                 if (currentValue) {
@@ -112236,6 +112237,33 @@ var pxt;
                 }
                 continue;
             }
+            if (line.startsWith("```")) {
+                if (currentCodeBlock) {
+                    if (currentSection) {
+                        if (!currentSection.codeBlocks) {
+                            currentSection.codeBlocks = [currentCodeBlock];
+                        }
+                        else {
+                            currentSection.codeBlocks.push(currentCodeBlock);
+                        }
+                    }
+                    currentCodeBlock = null;
+                    continue;
+                }
+                else {
+                    const match = /^```([a-zA-Z_\-]*)$/.exec(line);
+                    if (match) {
+                        currentCodeBlock = {
+                            content: "",
+                            languageCode: match[1]
+                        };
+                        continue;
+                    }
+                }
+            }
+            else if (currentCodeBlock) {
+                currentCodeBlock.content += line + "\n";
+            }
             if (line.startsWith("#")) {
                 const headerMatch = /^(#+)\s*(.+)$/.exec(line);
                 if (headerMatch) {
@@ -132053,16 +132081,25 @@ var ts;
                     let outlines = [];
                     let values = {};
                     let seq = 1;
+                    const isLdLit = (line) => line.type == "instruction" && line.instruction && line.instruction.name == "ldlit";
                     for (let i = 0; i < f.lines.length; ++i) {
                         let line = f.lines[i];
                         outlines.push(line);
-                        if (line.type == "instruction" && line.instruction && line.instruction.name == "ldlit") {
+                        if (isLdLit(line)) {
                             if (!nextGoodSpot) {
                                 let limit = line.location + 900; // leave some space - real limit is 1020
                                 let j = i + 1;
+                                let numLdLits = 0;
                                 for (; j < f.lines.length; ++j) {
                                     if (f.lines[j].location > limit)
                                         break;
+                                    if (isLdLit(f.lines[j])) {
+                                        numLdLits++;
+                                        // Short branches have 256 bytes range. We don't want to move code by anywhere
+                                        // close to that. Each ldlit is 4 bytes.
+                                        if (numLdLits >= 160 / 4)
+                                            break;
+                                    }
                                     let op = f.lines[j].getOp();
                                     if (op == "b" || op == "bb" || (op == "pop" && f.lines[j].words[2] == "pc"))
                                         nextGoodSpot = f.lines[j];
@@ -133775,6 +133812,14 @@ var ts;
             return null;
         }
         function isArrayType(t) {
+            if (t.flags & ts.TypeFlags.Union && t.types) {
+                for (const subtype of t.types) {
+                    if (!isArrayType(subtype)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
             if (!isObjectType(t)) {
                 return false;
             }
@@ -133813,7 +133858,12 @@ var ts;
         }
         function arrayElementType(t, idx = -1) {
             if (isArrayType(t))
-                return checkType(t.typeArguments[0]);
+                if (t.flags & ts.TypeFlags.Union) {
+                    return checkType(t.getNumberIndexType());
+                }
+                else {
+                    return checkType(t.typeArguments[0]);
+                }
             return checker.getIndexTypeOfType(t, ts.IndexKind.Number);
         }
         function isFunctionType(t) {
@@ -134844,9 +134894,12 @@ ${lbl}: .short 0xffff
                 let eltT = arrayElementType(typeOf(node));
                 let coll = pxtc.ir.shared(pxtc.ir.rtcall("Array_::mk", []));
                 for (let elt of node.elements) {
-                    let mask = isRefCountedExpr(elt) ? 2 : 0;
+                    let mask = isRefCountedExpr(elt) ? (1 << 1) : 0;
                     proc.emitExpr(pxtc.ir.rtcall("Array_::push", [coll, emitExpr(elt)], mask));
                 }
+                if (node.elements.length > 0)
+                    // Make sure there is at least one use of the array, so it doesn't get GC-ed away in the last push.
+                    proc.emitExpr(pxtc.ir.rtcall("langsupp::ignore", [coll], 1));
                 return coll;
             }
             function emitObjectLiteral(node) {
@@ -134855,6 +134908,7 @@ ${lbl}: .short 0xffff
                     pxtc.assert(!p.questionToken); // should be disallowed by TS grammar checker
                     let keyName;
                     let init;
+                    let mask = 0;
                     if (p.kind == pxtc.SK.ShorthandPropertyAssignment) {
                         const sp = p;
                         pxtc.assert(!sp.equalsToken && !sp.objectAssignmentInitializer); // disallowed by TS grammar checker
@@ -134880,6 +134934,8 @@ ${lbl}: .short 0xffff
                         keyName = p.name.kind == pxtc.SK.StringLiteral ?
                             p.name.text : p.name.getText();
                         init = emitExpr(p.initializer);
+                        if (isRefCountedExpr(p.initializer))
+                            mask |= 1 << 2;
                     }
                     const fieldId = pxtc.target.isNative
                         ? pxtc.ir.numlit(getIfaceMemberId(keyName))
@@ -134889,8 +134945,11 @@ ${lbl}: .short 0xffff
                         fieldId,
                         init
                     ];
-                    proc.emitExpr(pxtc.ir.rtcall(pxtc.target.isNative ? "pxtrt::mapSet" : "pxtrt::mapSetByString", args));
+                    proc.emitExpr(pxtc.ir.rtcall(pxtc.target.isNative ? "pxtrt::mapSet" : "pxtrt::mapSetByString", args, mask));
                 });
+                // Make sure there is at least one use of the map, so it doesn't get GC-ed away in the last mapSet.
+                if (node.properties.length > 0)
+                    proc.emitExpr(pxtc.ir.rtcall("langsupp::ignore", [expr], 1));
                 return expr;
             }
             function emitPropertyAssignment(node) {

package/built/pxtcompiler.js

@@ -7737,16 +7737,25 @@ var ts;
                     let outlines = [];
                     let values = {};
                     let seq = 1;
+                    const isLdLit = (line) => line.type == "instruction" && line.instruction && line.instruction.name == "ldlit";
                     for (let i = 0; i < f.lines.length; ++i) {
                         let line = f.lines[i];
                         outlines.push(line);
-                        if (line.type == "instruction" && line.instruction && line.instruction.name == "ldlit") {
+                        if (isLdLit(line)) {
                             if (!nextGoodSpot) {
                                 let limit = line.location + 900; // leave some space - real limit is 1020
                                 let j = i + 1;
+                                let numLdLits = 0;
                                 for (; j < f.lines.length; ++j) {
                                     if (f.lines[j].location > limit)
                                         break;
+                                    if (isLdLit(f.lines[j])) {
+                                        numLdLits++;
+                                        // Short branches have 256 bytes range. We don't want to move code by anywhere
+                                        // close to that. Each ldlit is 4 bytes.
+                                        if (numLdLits >= 160 / 4)
+                                            break;
+                                    }
                                     let op = f.lines[j].getOp();
                                     if (op == "b" || op == "bb" || (op == "pop" && f.lines[j].words[2] == "pc"))
                                         nextGoodSpot = f.lines[j];
@@ -9459,6 +9468,14 @@ var ts;
             return null;
         }
         function isArrayType(t) {
+            if (t.flags & ts.TypeFlags.Union && t.types) {
+                for (const subtype of t.types) {
+                    if (!isArrayType(subtype)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
             if (!isObjectType(t)) {
                 return false;
             }
@@ -9497,7 +9514,12 @@ var ts;
         }
         function arrayElementType(t, idx = -1) {
             if (isArrayType(t))
-                return checkType(t.typeArguments[0]);
+                if (t.flags & ts.TypeFlags.Union) {
+                    return checkType(t.getNumberIndexType());
+                }
+                else {
+                    return checkType(t.typeArguments[0]);
+                }
             return checker.getIndexTypeOfType(t, ts.IndexKind.Number);
         }
         function isFunctionType(t) {
@@ -10528,9 +10550,12 @@ ${lbl}: .short 0xffff
                 let eltT = arrayElementType(typeOf(node));
                 let coll = pxtc.ir.shared(pxtc.ir.rtcall("Array_::mk", []));
                 for (let elt of node.elements) {
-                    let mask = isRefCountedExpr(elt) ? 2 : 0;
+                    let mask = isRefCountedExpr(elt) ? (1 << 1) : 0;
                     proc.emitExpr(pxtc.ir.rtcall("Array_::push", [coll, emitExpr(elt)], mask));
                 }
+                if (node.elements.length > 0)
+                    // Make sure there is at least one use of the array, so it doesn't get GC-ed away in the last push.
+                    proc.emitExpr(pxtc.ir.rtcall("langsupp::ignore", [coll], 1));
                 return coll;
             }
             function emitObjectLiteral(node) {
@@ -10539,6 +10564,7 @@ ${lbl}: .short 0xffff
                     pxtc.assert(!p.questionToken); // should be disallowed by TS grammar checker
                     let keyName;
                     let init;
+                    let mask = 0;
                     if (p.kind == pxtc.SK.ShorthandPropertyAssignment) {
                         const sp = p;
                         pxtc.assert(!sp.equalsToken && !sp.objectAssignmentInitializer); // disallowed by TS grammar checker
@@ -10564,6 +10590,8 @@ ${lbl}: .short 0xffff
                         keyName = p.name.kind == pxtc.SK.StringLiteral ?
                             p.name.text : p.name.getText();
                         init = emitExpr(p.initializer);
+                        if (isRefCountedExpr(p.initializer))
+                            mask |= 1 << 2;
                     }
                     const fieldId = pxtc.target.isNative
                         ? pxtc.ir.numlit(getIfaceMemberId(keyName))
@@ -10573,8 +10601,11 @@ ${lbl}: .short 0xffff
                         fieldId,
                         init
                     ];
-                    proc.emitExpr(pxtc.ir.rtcall(pxtc.target.isNative ? "pxtrt::mapSet" : "pxtrt::mapSetByString", args));
+                    proc.emitExpr(pxtc.ir.rtcall(pxtc.target.isNative ? "pxtrt::mapSet" : "pxtrt::mapSetByString", args, mask));
                 });
+                // Make sure there is at least one use of the map, so it doesn't get GC-ed away in the last mapSet.
+                if (node.properties.length > 0)
+                    proc.emitExpr(pxtc.ir.rtcall("langsupp::ignore", [expr], 1));
                 return expr;
             }
             function emitPropertyAssignment(node) {

package/built/pxtlib.d.ts

@@ -1986,6 +1986,11 @@ declare namespace pxt {
         header: string;
         attributes: pxt.Map<string>;
         listAttributes?: pxt.Map<MarkdownList>;
+        codeBlocks?: MarkdownCodeBlock[];
+    }
+    interface MarkdownCodeBlock {
+        content: string;
+        languageCode?: string;
     }
     interface MarkdownList {
         key: string;

package/built/pxtlib.js

@@ -14508,6 +14508,7 @@ var pxt;
         let currentValue = null;
         let listStack = [];
         let currentIndent = 0;
+        let currentCodeBlock = null;
         for (const line of lines) {
             if (!line.trim()) {
                 if (currentValue) {
@@ -14515,6 +14516,33 @@ var pxt;
                 }
                 continue;
             }
+            if (line.startsWith("```")) {
+                if (currentCodeBlock) {
+                    if (currentSection) {
+                        if (!currentSection.codeBlocks) {
+                            currentSection.codeBlocks = [currentCodeBlock];
+                        }
+                        else {
+                            currentSection.codeBlocks.push(currentCodeBlock);
+                        }
+                    }
+                    currentCodeBlock = null;
+                    continue;
+                }
+                else {
+                    const match = /^```([a-zA-Z_\-]*)$/.exec(line);
+                    if (match) {
+                        currentCodeBlock = {
+                            content: "",
+                            languageCode: match[1]
+                        };
+                        continue;
+                    }
+                }
+            }
+            else if (currentCodeBlock) {
+                currentCodeBlock.content += line + "\n";
+            }
             if (line.startsWith("#")) {
                 const headerMatch = /^(#+)\s*(.+)$/.exec(line);
                 if (headerMatch) {