pxt-core 8.4.8 → 8.4.9

package/built/cli.js

@@ -1848,10 +1848,20 @@ function buildReactAppAsync(app, parsed, opts) {
         .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`);
+        if (!opts.expandedPxtTarget) {
+            // 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));
+        }
+        else {
+            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`);
+        }
+        else {
+            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-${app}.css`, `${appRoot}/public/blb`);
@@ -1879,7 +1889,11 @@ function buildAuthcodeAsync(parsed) {
     return buildReactAppAsync("authcode", parsed, { copyAssets: false });
 }
 function buildMultiplayerAsync(parsed) {
-    return buildReactAppAsync("multiplayer", parsed, { copyAssets: false });
+    return buildReactAppAsync("multiplayer", parsed, {
+        copyAssets: false,
+        usePxtEmbed: true,
+        expandedPxtTarget: true
+    });
 }
 function updateDefaultProjects(cfg) {
     let defaultProjects = [

package/built/pxt.js

@@ -114202,12 +114202,14 @@ var ts;
         }
         pxtc.computeUsedParts = computeUsedParts;
         function buildSimJsInfo(compileResult) {
+            var _a;
             return {
                 js: compileResult.outfiles[pxtc.BINARY_JS],
                 targetVersion: pxt.appTarget.versions.target,
                 fnArgs: compileResult.usedArguments,
                 parts: pxtc.computeUsedParts(compileResult, "ignorebuiltin"),
                 usedBuiltinParts: pxtc.computeUsedParts(compileResult, "onlybuiltin"),
+                breakpoints: (_a = compileResult.breakpoints) === null || _a === void 0 ? void 0 : _a.map(bp => bp.id),
             };
         }
         pxtc.buildSimJsInfo = buildSimJsInfo;
@@ -154559,11 +154561,12 @@ var pxsim;
             return frames;
         }
         getSimUrl() {
-            const simUrl = this.options.simUrl || (window.pxtConfig || {}).simUrl || `${location.origin}/sim/simulator.html`;
+            var _a, _b;
+            const simUrl = this.options.simUrl || ((_a = window.pxtConfig) === null || _a === void 0 ? void 0 : _a.simUrl) || ((_b = pxt.webConfig) === null || _b === void 0 ? void 0 : _b.simUrl) || `${location.origin}/sim/simulator.html`;
             try {
                 return new URL(simUrl);
             }
-            catch (_a) {
+            catch (_c) {
                 // Failed to parse set url; try based off origin in case path defined as relative (e.g. /simulator.html)
                 return new URL(simUrl, location.origin);
             }
@@ -154932,14 +154935,15 @@ var pxsim;
         }
         // ensure _currentRuntime is ready
         startFrame(frame) {
-            var _a, _b;
+            var _a, _b, _c;
             if (!this._currentRuntime || !frame.contentWindow)
                 return false;
             const msg = JSON.parse(JSON.stringify(this._currentRuntime));
             msg.frameCounter = ++this.frameCounter;
+            const mpRole = ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.mpRole) || ((_c = (_b = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _b === void 0 ? void 0 : _b[1]) === null || _c === void 0 ? void 0 : _c.toLowerCase());
             msg.options = {
                 theme: this.themes[this.nextFrameId++ % this.themes.length],
-                mpRole: (_b = (_a = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.toLowerCase()
+                mpRole
             };
             msg.id = `${msg.options.theme}-${this.nextId()}`;
             frame.dataset['runid'] = this.runId;
@@ -160818,10 +160822,20 @@ function buildReactAppAsync(app, parsed, opts) {
         .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`);
+        if (!opts.expandedPxtTarget) {
+            // 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));
+        }
+        else {
+            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`);
+        }
+        else {
+            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-${app}.css`, `${appRoot}/public/blb`);
@@ -160849,7 +160863,11 @@ function buildAuthcodeAsync(parsed) {
     return buildReactAppAsync("authcode", parsed, { copyAssets: false });
 }
 function buildMultiplayerAsync(parsed) {
-    return buildReactAppAsync("multiplayer", parsed, { copyAssets: false });
+    return buildReactAppAsync("multiplayer", parsed, {
+        copyAssets: false,
+        usePxtEmbed: true,
+        expandedPxtTarget: true
+    });
 }
 function updateDefaultProjects(cfg) {
     let defaultProjects = [

package/built/pxtlib.js

@@ -16516,12 +16516,14 @@ var ts;
         }
         pxtc.computeUsedParts = computeUsedParts;
         function buildSimJsInfo(compileResult) {
+            var _a;
             return {
                 js: compileResult.outfiles[pxtc.BINARY_JS],
                 targetVersion: pxt.appTarget.versions.target,
                 fnArgs: compileResult.usedArguments,
                 parts: pxtc.computeUsedParts(compileResult, "ignorebuiltin"),
                 usedBuiltinParts: pxtc.computeUsedParts(compileResult, "onlybuiltin"),
+                breakpoints: (_a = compileResult.breakpoints) === null || _a === void 0 ? void 0 : _a.map(bp => bp.id),
             };
         }
         pxtc.buildSimJsInfo = buildSimJsInfo;

package/built/pxtrunner.d.ts

@@ -100,13 +100,18 @@ declare namespace pxt.runner {
         hideSimButtons?: boolean;
         autofocus?: boolean;
         additionalQueryParameters?: string;
+        debug?: boolean;
+        mpRole?: "server" | "client";
     }
     let mainPkg: pxt.MainPackage;
+    function initHost(): void;
     function initFooter(footer: HTMLElement, shareId?: string): void;
     function showError(msg: string): void;
     function generateHexFileAsync(options: SimulateOptions): Promise<string>;
     function generateVMFileAsync(options: SimulateOptions): Promise<any>;
     function simulateAsync(container: HTMLElement, simOptions: SimulateOptions): Promise<pxtc.BuiltSimJsInfo>;
+    function currentDriver(): pxsim.SimulatorDriver;
+    function postSimMessage(msg: pxsim.SimulatorMessage): void;
     function buildSimJsInfo(simOptions: SimulateOptions): Promise<pxtc.BuiltSimJsInfo>;
     enum LanguageMode {
         Blocks = 0,

package/built/pxtrunner.js

@@ -1609,10 +1609,12 @@ var pxt;
                 targetBranch: versions ? versions.targetCrowdinBranch : "",
                 force: force,
             })
-                .then(() => {
-                runner.mainPkg = new pxt.MainPackage(new Host());
-            });
+                .then(() => initHost());
+        }
+        function initHost() {
+            runner.mainPkg = new pxt.MainPackage(new Host());
         }
+        runner.initHost = initHost;
         function initFooter(footer, shareId) {
             if (!footer)
                 return;
@@ -1728,6 +1730,7 @@ var pxt;
             });
         }
         runner.generateVMFileAsync = generateVMFileAsync;
+        let simDriver;
         async function simulateAsync(container, simOptions) {
             var _a, _b;
             const builtSimJS = simOptions.builtJsInfo || await buildSimJsInfo(simOptions);
@@ -1740,7 +1743,7 @@ var pxt;
             options.onSimulatorCommand = msg => {
                 if (msg.command === "restart") {
                     runOptions.storedState = getStoredState(simOptions.id);
-                    driver.run(js, runOptions);
+                    simDriver.run(js, runOptions);
                 }
                 if (msg.command == "setstate") {
                     if (msg.stateKey && msg.stateValue) {
@@ -1749,10 +1752,11 @@ var pxt;
                 }
             };
             options.messageSimulators = (_b = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.simulator) === null || _b === void 0 ? void 0 : _b.messageSimulators;
-            let driver = new pxsim.SimulatorDriver(container, options);
+            simDriver = new pxsim.SimulatorDriver(container, options);
             let board = pxt.appTarget.simulator.boardDefinition;
             let storedState = getStoredState(simOptions.id);
             let runOptions = {
+                debug: simOptions.debug,
                 boardDefinition: board,
                 parts: parts,
                 builtinParts: usedBuiltinParts,
@@ -1766,15 +1770,27 @@ var pxt;
                 hideSimButtons: simOptions.hideSimButtons,
                 autofocus: simOptions.autofocus,
                 queryParameters: simOptions.additionalQueryParameters,
+                mpRole: simOptions.mpRole,
             };
             if (pxt.appTarget.simulator && !simOptions.fullScreen)
                 runOptions.aspectRatio = parts.length && pxt.appTarget.simulator.partsAspectRatio
                     ? pxt.appTarget.simulator.partsAspectRatio
                     : pxt.appTarget.simulator.aspectRatio;
-            driver.run(js, runOptions);
+            if (builtSimJS.breakpoints && simOptions.debug) {
+                simDriver.setBreakpoints(builtSimJS.breakpoints);
+            }
+            simDriver.run(js, runOptions);
             return builtSimJS;
         }
         runner.simulateAsync = simulateAsync;
+        function currentDriver() {
+            return simDriver;
+        }
+        runner.currentDriver = currentDriver;
+        function postSimMessage(msg) {
+            simDriver === null || simDriver === void 0 ? void 0 : simDriver.postMessage(msg);
+        }
+        runner.postSimMessage = postSimMessage;
         async function buildSimJsInfo(simOptions) {
             var _a;
             await loadPackageAsync(simOptions.id, simOptions.code, simOptions.dependencies);
@@ -1782,6 +1798,8 @@ var pxt;
             const currentTargetVersion = pxt.appTarget.versions.target;
             let compileResult = await compileAsync(false, opts => {
                 var _a;
+                if (simOptions.debug)
+                    opts.breakpoints = true;
                 if (simOptions.assets) {
                     const parsedAssets = JSON.parse(simOptions.assets);
                     for (const key of Object.keys(parsedAssets)) {

package/built/pxtsim.d.ts

@@ -1281,6 +1281,7 @@ declare namespace pxsim {
         hideSimButtons?: boolean;
         autofocus?: boolean;
         queryParameters?: string;
+        mpRole?: "server" | "client";
     }
     interface HwDebugger {
         postMessage: (msg: pxsim.SimulatorMessage) => void;

package/built/pxtsim.js

@@ -6215,11 +6215,12 @@ var pxsim;
             return frames;
         }
         getSimUrl() {
-            const simUrl = this.options.simUrl || (window.pxtConfig || {}).simUrl || `${location.origin}/sim/simulator.html`;
+            var _a, _b;
+            const simUrl = this.options.simUrl || ((_a = window.pxtConfig) === null || _a === void 0 ? void 0 : _a.simUrl) || ((_b = pxt.webConfig) === null || _b === void 0 ? void 0 : _b.simUrl) || `${location.origin}/sim/simulator.html`;
             try {
                 return new URL(simUrl);
             }
-            catch (_a) {
+            catch (_c) {
                 // Failed to parse set url; try based off origin in case path defined as relative (e.g. /simulator.html)
                 return new URL(simUrl, location.origin);
             }
@@ -6588,14 +6589,15 @@ var pxsim;
         }
         // ensure _currentRuntime is ready
         startFrame(frame) {
-            var _a, _b;
+            var _a, _b, _c;
             if (!this._currentRuntime || !frame.contentWindow)
                 return false;
             const msg = JSON.parse(JSON.stringify(this._currentRuntime));
             msg.frameCounter = ++this.frameCounter;
+            const mpRole = ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.mpRole) || ((_c = (_b = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _b === void 0 ? void 0 : _b[1]) === null || _c === void 0 ? void 0 : _c.toLowerCase());
             msg.options = {
                 theme: this.themes[this.nextFrameId++ % this.themes.length],
-                mpRole: (_b = (_a = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.toLowerCase()
+                mpRole
             };
             msg.id = `${msg.options.theme}-${this.nextId()}`;
             frame.dataset['runid'] = this.runId;