pxt-core 8.2.11 → 8.2.13

package/built/cli.js

@@ -3891,11 +3891,6 @@ async function testSnippetsAsync(snippets, re, pyStrictSyntaxCheck) {
             }
             return;
         }
-        if (++codeSnippetCount % 40 == 0) {
-            // clean up cache every once in a while to speed up / clear up mem
-            // TODO probably this should be handled in the service host as it does become a perf concern
-            cleanService();
-        }
         const isPy = snippet.ext === "py";
         const inFiles = Object.assign({ [pxt.MAIN_TS]: isPy ? "" : snippet.code, [pxt.MAIN_PY]: isPy ? snippet.code : "", [pxt.MAIN_BLOCKS]: "" }, (snippet.extraFiles || {}));
         const { pkg, opts } = await getCompileResources(inFiles, snippet.packages);

package/built/pxt.js

@@ -121892,7 +121892,7 @@ var ts;
         // Assumptions:
         // - registers can hold a pointer (data or code)
         // - special registers include: sp
-        // - fixed registers are r0, r1, r2, r3, r5, r6 
+        // - fixed registers are r0, r1, r2, r3, r5, r6
         //   - r0 is the current value (from expression evaluation)
         //   - registers for runtime calls (r0, r1,r2,r3)
         //   - r5 is for captured locals in lambda
@@ -121905,7 +121905,7 @@ var ts;
         class AssemblerSnippets {
             nop() { return "TBD(nop)"; }
             reg_gets_imm(reg, imm) { return "TBD(reg_gets_imm)"; }
-            // Registers are stored on the stack in numerical order 
+            // Registers are stored on the stack in numerical order
             proc_setup(numlocals, main) { return "TBD(proc_setup)"; }
             push_fixed(reg) { return "TBD(push_fixed)"; }
             push_local(reg) { return "TBD(push_local)"; }
@@ -122120,7 +122120,7 @@ ${baseLabel}_nochk:
                         }
                     }
                 };
-                if (this.bin.options.breakpoints) {
+                if (this.bin.breakpoints) {
                     this.write(this.t.debugger_proc(bkptLabel));
                 }
                 this.baseStackSize = 1; // push {lr}
@@ -122163,7 +122163,7 @@ ${baseLabel}_nochk:
                             this.write(`; ${s.expr.data}`);
                             break;
                         case pxtc.ir.SK.Breakpoint:
-                            if (this.bin.options.breakpoints) {
+                            if (this.bin.breakpoints) {
                                 let lbl = `__brkp_${s.breakpointInfo.id}`;
                                 if (s.breakpointInfo.isDebuggerStmt) {
                                     this.write(this.t.debugger_stmt(lbl));
@@ -123562,7 +123562,7 @@ var ts;
             "bind",
             "leaveAccessor"
         ];
-        function jsEmit(bin) {
+        function jsEmit(bin, cres) {
             let jssource = "(function (ectx) {\n'use strict';\n";
             for (let n of evalIfaceFields) {
                 jssource += `const ${n} = ectx.${n};\n`;
@@ -123574,7 +123574,7 @@ var ts;
             jssource += "pxsim.setTitle(" + JSON.stringify(bin.getTitle()) + ");\n";
             let cfg = {};
             let cfgKey = {};
-            for (let ce of bin.res.configData || []) {
+            for (let ce of cres.configData || []) {
                 cfg[ce.key + ""] = ce.value;
                 cfgKey[ce.name] = ce.key;
             }
@@ -123604,8 +123604,8 @@ var ts;
             bin.usedClassInfos.forEach(info => {
                 jssource += vtableToJs(info);
             });
-            if (bin.res.breakpoints)
-                jssource += `\nconst breakpoints = setupDebugger(${bin.res.breakpoints.length}, [${bin.globals.filter(c => c.isUserVariable).map(c => `"${c.uniqueName()}"`).join(",")}])\n`;
+            if (cres.breakpoints)
+                jssource += `\nconst breakpoints = setupDebugger(${cres.breakpoints.length}, [${bin.globals.filter(c => c.isUserVariable).map(c => `"${c.uniqueName()}"`).join(",")}])\n`;
             jssource += `\nreturn ${bin.procs[0] ? bin.procs[0].label() : "null"}\n})\n`;
             const total = jssource.length;
             const perc = (n) => ((100 * n) / total).toFixed(2) + "%";
@@ -123739,7 +123739,7 @@ function ${id}(s) {
                 let id = s.breakpointInfo.id;
                 let lbl;
                 write(`s.lastBrkId = ${id};`);
-                if (bin.options.breakpoints) {
+                if (bin.breakpoints) {
                     lbl = ++lblIdx;
                     let brkCall = `return breakpoint(s, ${lbl}, ${id}, r0);`;
                     if (s.breakpointInfo.isDebuggerStmt) {
@@ -123747,12 +123747,12 @@ function ${id}(s) {
                     }
                     else {
                         write(`if ((breakpoints[0] && isBreakFrame(s)) || breakpoints[${id}]) ${brkCall}`);
-                        if (bin.options.trace) {
+                        if (bin.trace) {
                             write(`else return trace(${id}, s, ${lbl}, ${proc.label()}.info);`);
                         }
                     }
                 }
-                else if (bin.options.trace) {
+                else if (bin.trace) {
                     lbl = ++lblIdx;
                     write(`return trace(${id}, s, ${lbl}, ${proc.label()}.info);`);
                 }
@@ -124694,7 +124694,7 @@ ${info.id}_IfaceVT:
             }
         }
         /* eslint-disable no-trailing-spaces */
-        function vmEmit(bin, opts) {
+        function vmEmit(bin, opts, cres) {
             let vmsource = `; VM start
 _img_start:
 ${pxtc.hexfile.hexPrelude()}
@@ -124798,7 +124798,7 @@ _start_${name}:
                 + "\n.word 0, 0, 0 ; dummy entry to make sure not empty");
             section("numberLiterals", SectionType.NumberLiterals, () => ctx.dblText.join("\n")
                 + "\n.word 0, 0 ; dummy entry to make sure not empty");
-            const cfg = bin.res.configData || [];
+            const cfg = cres.configData || [];
             section("configData", SectionType.ConfigData, () => cfg.map(d => `    .word ${d.key}, ${d.value}  ; ${d.name}=${d.value}`).join("\n")
                 + "\n    .word 0, 0");
             let s = ctx.opcodes.map(s => s == null ? "" : s).join("\x00") + "\x00";
@@ -130982,8 +130982,9 @@ var ts;
             }
             let bin = new Binary();
             let proc;
-            bin.res = res;
-            bin.options = opts;
+            bin.trace = opts.trace;
+            bin.breakpoints = opts.breakpoints;
+            bin.name = opts.name;
             bin.target = opts.target;
             function reset() {
                 bin.reset();
@@ -131209,29 +131210,8 @@ var ts;
                     info.captured = true;
                 }
             }
-            function recordAction(f) {
-                const r = f(bin);
-                if (needsUsingInfo)
-                    bin.recordAction(currUsingContext, f);
-                return r;
-            }
             function getIfaceMemberId(name, markUsed = false) {
-                return recordAction(bin => {
-                    if (markUsed) {
-                        if (!pxtc.U.lookup(bin.explicitlyUsedIfaceMembers, name)) {
-                            pxtc.U.assert(!bin.finalPass);
-                            bin.explicitlyUsedIfaceMembers[name] = true;
-                        }
-                    }
-                    let v = pxtc.U.lookup(bin.ifaceMemberMap, name);
-                    if (v != null)
-                        return v;
-                    pxtc.U.assert(!bin.finalPass);
-                    // this gets renumbered before the final pass
-                    v = bin.ifaceMemberMap[name] = -1;
-                    bin.emitString(name);
-                    return v;
-                });
+                return recordGetInterfaceId(bin, name, markUsed, needsUsingInfo, currUsingContext);
             }
             function finalEmit() {
                 if (opts.noEmit)
@@ -131255,13 +131235,16 @@ var ts;
                             bin.writeFile("platformio.json", JSON.stringify(extinfo.platformio, null, 2));
                     });
                     if (opts.target.nativeType == pxtc.NATIVE_TYPE_VM)
-                        pxtc.vmEmit(bin, opts);
+                        pxtc.vmEmit(bin, opts, res);
                     else
                         pxtc.processorEmit(bin, opts, res);
                 }
                 else {
-                    pxtc.jsEmit(bin);
+                    pxtc.jsEmit(bin, res);
                 }
+                // Clear writeFile so that we don't leak the reference to res, which
+                // includes the entire source of the program
+                bin.writeFile = undefined;
             }
             function typeCheckVar(tp) {
                 if (tp.flags & ts.TypeFlags.Void) {
@@ -131978,9 +131961,7 @@ ${lbl}: .short 0xffff
                 markUsed(decl);
             }
             function emitAndMarkString(str) {
-                return recordAction(bin => {
-                    return bin.emitString(str);
-                });
+                return recordEmitAndMarkString(bin, str, needsUsingInfo, currUsingContext);
             }
             function recordUsage(decl) {
                 if (!needsUsingInfo)
@@ -132827,7 +132808,7 @@ ${lbl}: .short 0xffff
                     pinfo.proc = myProc;
                     myProc.usingCtx = currUsingContext;
                     proc = myProc;
-                    recordAction(bin => bin.addProc(myProc));
+                    recordAddProc(bin, myProc, needsUsingInfo, currUsingContext);
                 }
                 proc.captured = locals;
                 const initalizedFields = [];
@@ -134744,7 +134725,7 @@ ${lbl}: .short 0xffff
                 this.numStmts = 0;
             }
             getTitle() {
-                const title = this.options.name || pxtc.U.lf("Untitled");
+                const title = this.name || pxtc.U.lf("Untitled");
                 if (title.length >= 90)
                     return title.slice(0, 87) + "...";
                 else
@@ -134832,6 +134813,36 @@ ${lbl}: .short 0xffff
                 return !!(type.flags & (ts.TypeFlags.NumberLike | ts.TypeFlags.EnumLike | ts.TypeFlags.BooleanLike));
             }
         }
+        function recordAction(bin, needsUsingInfo, currUsingContext, f) {
+            const r = f(bin);
+            if (needsUsingInfo)
+                bin.recordAction(currUsingContext, f);
+            return r;
+        }
+        function recordAddProc(bin, proc, needsUsingInfo, currUsingContext) {
+            recordAction(bin, needsUsingInfo, currUsingContext, b => b.addProc(proc));
+        }
+        function recordGetInterfaceId(bin, name, markUsed, needsUsingInfo, currUsingContext) {
+            return recordAction(bin, needsUsingInfo, currUsingContext, bin => {
+                if (markUsed) {
+                    if (!pxtc.U.lookup(bin.explicitlyUsedIfaceMembers, name)) {
+                        pxtc.U.assert(!bin.finalPass);
+                        bin.explicitlyUsedIfaceMembers[name] = true;
+                    }
+                }
+                let v = pxtc.U.lookup(bin.ifaceMemberMap, name);
+                if (v != null)
+                    return v;
+                pxtc.U.assert(!bin.finalPass);
+                // this gets renumbered before the final pass
+                v = bin.ifaceMemberMap[name] = -1;
+                bin.emitString(name);
+                return v;
+            });
+        }
+        function recordEmitAndMarkString(bin, str, needsUsingInfo, currUsingContext) {
+            return recordAction(bin, needsUsingInfo, currUsingContext, b => b.emitString(str));
+        }
     })(pxtc = ts.pxtc || (ts.pxtc = {}));
 })(ts || (ts = {}));
 /// <reference path="../../localtypings/pxtarget.d.ts"/>
@@ -136855,7 +136866,7 @@ var ts;
                     for (let i = 0; i < hd.length; ++i)
                         pxt.HF2.write16(resbuf, i * 2 + ctx.jmpStartAddr, hd[i]);
                     if (uf2 && !bin.target.switches.rawELF) {
-                        let bn = bin.options.name || "pxt";
+                        let bn = bin.name || "pxt";
                         bn = bn.replace(/[^a-zA-Z0-9\-\.]+/g, "_");
                         uf2.filename = "Projects/" + bn + ".elf";
                         pxtc.UF2.writeBytes(uf2, 0, resbuf);
@@ -137102,7 +137113,7 @@ ${lbl}: ${snippets.obj_header("pxt::number_vt")}
             }
         }
         pxtc.computeHashMultiplier = computeHashMultiplier;
-        function vtableToAsm(info, opts, bin) {
+        function vtableToAsm(info, opts, bin, res) {
             /*
             uint16_t numbytes;
             ValType objectType;
@@ -137190,7 +137201,7 @@ ${hexfile.hexPrelude()}
     .hex 873266330af9dbdb ; replaced in binary by program hash
 `;
         }
-        function serialize(bin, opts) {
+        function serialize(bin, opts, res) {
             let asmsource = `
     .short ${bin.globalsWords}   ; num. globals
     .short 0 ; patched with number of 64 bit words resulting from assembly
@@ -137225,7 +137236,7 @@ ${hexfile.hexPrelude()}
             asmsource += snippets.arithmetic();
             asmsource += "_helpers_end:\n\n";
             bin.usedClassInfos.forEach(info => {
-                asmsource += vtableToAsm(info, opts, bin);
+                asmsource += vtableToAsm(info, opts, bin, res);
             });
             asmsource += `\n.balign 4\n.object _pxt_iface_member_names\n_pxt_iface_member_names:\n`;
             asmsource += `    .word ${bin.ifaceMembers.length}\n`;
@@ -137237,7 +137248,7 @@ ${hexfile.hexPrelude()}
             asmsource += `    .word 0\n`;
             asmsource += "_vtables_end:\n\n";
             asmsource += `\n.balign 4\n.object _pxt_config_data\n_pxt_config_data:\n`;
-            const cfg = bin.res.configData || [];
+            const cfg = res.configData || [];
             // asmsource += `    .word ${cfg.length}, 0 ; num. entries`
             for (let d of cfg) {
                 asmsource += `    .word ${d.key}, ${d.value}  ; ${d.name}=${d.value}\n`;
@@ -137506,7 +137517,7 @@ __flash_checksums:
             return elts.map(s => `"${s}"`).join(",");
         }
         function processorEmit(bin, opts, cres) {
-            const src = serialize(bin, opts);
+            const src = serialize(bin, opts, cres);
             const opts0 = pxtc.U.flatClone(opts);
             // normally, this would already have been done, but if the main variant
             // is disabled, another variant may be set up
@@ -139699,14 +139710,13 @@ var ts;
             }
             service.snippetAddsDefinitions = snippetAddsDefinitions;
             function getSnippet(context, fn, decl, python, recursionDepth = 0) {
-                var _a;
+                var _a, _b;
                 // TODO: a lot of this is duplicate logic with blocklyloader.ts:buildBlockFromDef; we should
                 //  unify these approaches
                 let { apis, takenNames, blocksInfo, screenSize, checker } = context;
                 const PY_INDENT = pxt.py.INDENT;
                 const fileType = python ? "python" : "typescript";
                 let snippetPrefix = fn.namespace;
-                let isInstance = false;
                 let addNamespace = false;
                 let namespaceToUse = "";
                 let functionCount = 0;
@@ -139756,6 +139766,11 @@ var ts;
                         if (python && snippetPrefix)
                             snippetPrefix = pxtc.U.snakify(snippetPrefix);
                     }
+                    else if (((_b = params.thisParameter) === null || _b === void 0 ? void 0 : _b.shadowBlockId) === "variables_get") {
+                        snippetPrefix = params.thisParameter.defaultValue || params.thisParameter.definitionName;
+                        if (python && snippetPrefix)
+                            snippetPrefix = pxtc.U.snakify(snippetPrefix);
+                    }
                     else if (element.namespace) { // some blocks don't have a namespace such as parseInt
                         const nsInfo = apis.byQName[element.namespace];
                         if (nsInfo.attributes.fixedInstances) {
@@ -139794,7 +139809,6 @@ var ts;
                             if (namespaceToUse) {
                                 addNamespace = true;
                             }
-                            isInstance = true;
                         }
                         else if (element.kind == 1 /* Method */ || element.kind == 2 /* Property */) {
                             if (params.thisParameter) {
@@ -139808,7 +139822,6 @@ var ts;
                                 if (python && snippetPrefix)
                                     snippetPrefix = pxtc.U.snakify(snippetPrefix);
                             }
-                            isInstance = true;
                         }
                         else if (nsInfo.kind === 8 /* Class */) {
                             return undefined;
@@ -161739,11 +161752,6 @@ async function testSnippetsAsync(snippets, re, pyStrictSyntaxCheck) {
             }
             return;
         }
-        if (++codeSnippetCount % 40 == 0) {
-            // clean up cache every once in a while to speed up / clear up mem
-            // TODO probably this should be handled in the service host as it does become a perf concern
-            cleanService();
-        }
         const isPy = snippet.ext === "py";
         const inFiles = Object.assign({ [pxt.MAIN_TS]: isPy ? "" : snippet.code, [pxt.MAIN_PY]: isPy ? snippet.code : "", [pxt.MAIN_BLOCKS]: "" }, (snippet.extraFiles || {}));
         const { pkg, opts } = await getCompileResources(inFiles, snippet.packages);

package/built/pxtcompiler.d.ts

@@ -156,7 +156,7 @@ declare namespace ts.pxtc {
 declare namespace ts.pxtc {
     function isBuiltinSimOp(name: string): boolean;
     function shimToJs(shimName: string): string;
-    function jsEmit(bin: Binary): void;
+    function jsEmit(bin: Binary, cres: CompileResult): void;
 }
 declare namespace ts.pxtc {
     const thumbCmpMap: pxt.Map<string>;
@@ -203,7 +203,7 @@ declare namespace ts.pxtc {
     }
 }
 declare namespace ts.pxtc {
-    function vmEmit(bin: Binary, opts: CompileOptions): void;
+    function vmEmit(bin: Binary, opts: CompileOptions, cres: CompileResult): void;
 }
 declare namespace ts.pxtc.decompiler {
     export enum DecompileParamKeys {
@@ -709,8 +709,9 @@ declare namespace ts.pxtc {
         finalPass: boolean;
         target: CompileTarget;
         writeFile: (fn: string, cont: string) => void;
-        res: CompileResult;
-        options: CompileOptions;
+        trace: boolean;
+        breakpoints: boolean;
+        name: string;
         usedClassInfos: ClassInfo[];
         checksumBlock: number[];
         numStmts: number;
@@ -833,7 +834,7 @@ declare namespace ts.pxtc {
         mapping: Uint16Array;
         size: number;
     };
-    function vtableToAsm(info: ClassInfo, opts: CompileOptions, bin: Binary): string;
+    function vtableToAsm(info: ClassInfo, opts: CompileOptions, bin: Binary, res: CompileResult): string;
     function processorInlineAssemble(target: CompileTarget, src: string): number[];
     function assemble(target: CompileTarget, bin: Binary, src: string): {
         src: string;