pxt-core 8.4.9 → 8.4.11

package/built/cli.js

@@ -1857,7 +1857,7 @@ function buildReactAppAsync(app, parsed, opts) {
             nodeutil.cp("built/target.js", `${appRoot}/public/blb`);
         }
         if (opts.usePxtEmbed) {
-            nodeutil.cp("node_modules/pxt-core/built/web/pxtembed.js", `${appRoot}/public/blb/web`);
+            nodeutil.cp("node_modules/pxt-core/built/web/pxtembed.js", `${appRoot}/public/blb`);
         }
         else {
             nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);

package/built/pxt.js

@@ -140243,7 +140243,7 @@ var ts;
                         position: v.position,
                         type: v.infoType
                     };
-                    const isPython = opts.target.preferredEditor == pxt.PYTHON_PROJECT_NAME;
+                    const isPython = v.fileName.endsWith(".py");
                     const isSymbolReq = opts.syntaxInfo.type === "symbol";
                     const isSignatureReq = opts.syntaxInfo.type === "signature";
                     if (isPython) {
@@ -143889,7 +143889,13 @@ var pxt;
                     fn = B.mkText("super");
                 }
                 else {
-                    fn = methName ? B.mkInfix(expr(recv), ".", B.mkText(methName)) : expr(n.func);
+                    if (methName) {
+                        fn = B.mkInfix(expr(recv), ".", B.mkText(methName));
+                        markInfoNode(n.func, "memberCompletion");
+                    }
+                    else {
+                        fn = expr(n.func);
+                    }
                 }
                 let nodes = [
                     fn,
@@ -154733,8 +154739,10 @@ var pxsim;
                 this.applyAspectRatioToFrame(frame);
             return wrapper;
         }
-        preload(aspectRatio) {
+        preload(aspectRatio, clearRuntime) {
             if (!this.simFrames().length) {
+                if (clearRuntime)
+                    this._currentRuntime = undefined;
                 this.container.appendChild(this.createFrame());
                 this.applyAspectRatio(aspectRatio);
                 this.setStarting();
@@ -154875,8 +154883,11 @@ var pxsim;
                 this.options.unhideElement(frame.parentElement);
             });
         }
-        run(js, opts = {}) {
+        setRunOptions(opts = {}) {
             this._runOptions = opts;
+        }
+        run(js, opts = {}) {
+            this.setRunOptions(opts);
             this.runId = this.nextId();
             // store information
             this._currentRuntime = {
@@ -160831,7 +160842,7 @@ function buildReactAppAsync(app, parsed, opts) {
             nodeutil.cp("built/target.js", `${appRoot}/public/blb`);
         }
         if (opts.usePxtEmbed) {
-            nodeutil.cp("node_modules/pxt-core/built/web/pxtembed.js", `${appRoot}/public/blb/web`);
+            nodeutil.cp("node_modules/pxt-core/built/web/pxtembed.js", `${appRoot}/public/blb`);
         }
         else {
             nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);

package/built/pxtcompiler.js

@@ -17878,7 +17878,7 @@ var ts;
                         position: v.position,
                         type: v.infoType
                     };
-                    const isPython = opts.target.preferredEditor == pxt.PYTHON_PROJECT_NAME;
+                    const isPython = v.fileName.endsWith(".py");
                     const isSymbolReq = opts.syntaxInfo.type === "symbol";
                     const isSignatureReq = opts.syntaxInfo.type === "signature";
                     if (isPython) {

package/built/pxtpy.js

@@ -2217,7 +2217,13 @@ var pxt;
                     fn = B.mkText("super");
                 }
                 else {
-                    fn = methName ? B.mkInfix(expr(recv), ".", B.mkText(methName)) : expr(n.func);
+                    if (methName) {
+                        fn = B.mkInfix(expr(recv), ".", B.mkText(methName));
+                        markInfoNode(n.func, "memberCompletion");
+                    }
+                    else {
+                        fn = expr(n.func);
+                    }
                 }
                 let nodes = [
                     fn,

package/built/pxtrunner.d.ts

@@ -88,6 +88,7 @@ declare namespace pxt.runner {
 }
 declare namespace pxt.runner {
     interface SimulateOptions {
+        embedId?: string;
         id?: string;
         code?: string;
         assets?: string;
@@ -110,6 +111,7 @@ declare namespace pxt.runner {
     function generateHexFileAsync(options: SimulateOptions): Promise<string>;
     function generateVMFileAsync(options: SimulateOptions): Promise<any>;
     function simulateAsync(container: HTMLElement, simOptions: SimulateOptions): Promise<pxtc.BuiltSimJsInfo>;
+    function preloadSim(container: HTMLElement, simOpts: SimulateOptions): void;
     function currentDriver(): pxsim.SimulatorDriver;
     function postSimMessage(msg: pxsim.SimulatorMessage): void;
     function buildSimJsInfo(simOptions: SimulateOptions): Promise<pxtc.BuiltSimJsInfo>;

package/built/pxtrunner.js

@@ -1730,17 +1730,17 @@ var pxt;
             });
         }
         runner.generateVMFileAsync = generateVMFileAsync;
-        let simDriver;
         async function simulateAsync(container, simOptions) {
             var _a, _b;
             const builtSimJS = simOptions.builtJsInfo || await buildSimJsInfo(simOptions);
-            const { js, fnArgs, parts, usedBuiltinParts, } = builtSimJS;
+            const { js } = builtSimJS;
             if (!js) {
                 console.error("Program failed to compile");
                 return undefined;
             }
-            let options = {};
-            options.onSimulatorCommand = msg => {
+            const runOptions = initDriverAndOptions(container, simOptions, builtSimJS);
+            simDriver.options.messageSimulators = (_b = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.simulator) === null || _b === void 0 ? void 0 : _b.messageSimulators;
+            simDriver.options.onSimulatorCommand = msg => {
                 if (msg.command === "restart") {
                     runOptions.storedState = getStoredState(simOptions.id);
                     simDriver.run(js, runOptions);
@@ -1751,8 +1751,25 @@ var pxt;
                     }
                 }
             };
-            options.messageSimulators = (_b = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.simulator) === null || _b === void 0 ? void 0 : _b.messageSimulators;
-            simDriver = new pxsim.SimulatorDriver(container, options);
+            if (builtSimJS.breakpoints && simOptions.debug) {
+                simDriver.setBreakpoints(builtSimJS.breakpoints);
+            }
+            simDriver.run(js, runOptions);
+            return builtSimJS;
+        }
+        runner.simulateAsync = simulateAsync;
+        let simDriver;
+        // iff matches and truthy, reuse existing simdriver
+        let currDriverId;
+        function initDriverAndOptions(container, simOptions, compileInfo) {
+            if (!simDriver || !simOptions.embedId || currDriverId !== simOptions.embedId) {
+                simDriver = new pxsim.SimulatorDriver(container);
+                currDriverId = simOptions.embedId;
+            }
+            else {
+                simDriver.container = container;
+            }
+            const { fnArgs, parts, usedBuiltinParts, } = compileInfo || {};
             let board = pxt.appTarget.simulator.boardDefinition;
             let storedState = getStoredState(simOptions.id);
             let runOptions = {
@@ -1776,13 +1793,15 @@ var pxt;
                 runOptions.aspectRatio = parts.length && pxt.appTarget.simulator.partsAspectRatio
                     ? pxt.appTarget.simulator.partsAspectRatio
                     : pxt.appTarget.simulator.aspectRatio;
-            if (builtSimJS.breakpoints && simOptions.debug) {
-                simDriver.setBreakpoints(builtSimJS.breakpoints);
-            }
-            simDriver.run(js, runOptions);
-            return builtSimJS;
+            simDriver.setRunOptions(runOptions);
+            return runOptions;
         }
-        runner.simulateAsync = simulateAsync;
+        function preloadSim(container, simOpts) {
+            var _a, _b;
+            initDriverAndOptions(container, simOpts);
+            simDriver.preload(((_b = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.simulator) === null || _b === void 0 ? void 0 : _b.aspectRatio) || 1, true /** no auto run **/);
+        }
+        runner.preloadSim = preloadSim;
         function currentDriver() {
             return simDriver;
         }

package/built/pxtsim.d.ts

@@ -1327,7 +1327,7 @@ declare namespace pxsim {
         postMessage(msg: pxsim.SimulatorMessage, source?: Window, frameID?: string): void;
         private postMessageCore;
         private createFrame;
-        preload(aspectRatio: number): void;
+        preload(aspectRatio: number, clearRuntime?: boolean): void;
         stop(unload?: boolean, starting?: boolean): void;
         suspend(): void;
         private unload;
@@ -1345,6 +1345,7 @@ declare namespace pxsim {
         private cleanupFrames;
         hide(completeHandler?: () => void): void;
         unhide(): void;
+        setRunOptions(opts?: SimulatorRunOptions): void;
         run(js: string, opts?: SimulatorRunOptions): void;
         restart(): void;
         areBreakpointsSet(): boolean;

package/built/pxtsim.js

@@ -6387,8 +6387,10 @@ var pxsim;
                 this.applyAspectRatioToFrame(frame);
             return wrapper;
         }
-        preload(aspectRatio) {
+        preload(aspectRatio, clearRuntime) {
             if (!this.simFrames().length) {
+                if (clearRuntime)
+                    this._currentRuntime = undefined;
                 this.container.appendChild(this.createFrame());
                 this.applyAspectRatio(aspectRatio);
                 this.setStarting();
@@ -6529,8 +6531,11 @@ var pxsim;
                 this.options.unhideElement(frame.parentElement);
             });
         }
-        run(js, opts = {}) {
+        setRunOptions(opts = {}) {
             this._runOptions = opts;
+        }
+        run(js, opts = {}) {
+            this.setRunOptions(opts);
             this.runId = this.nextId();
             // store information
             this._currentRuntime = {