pxt-core 9.3.8 → 9.3.10

package/built/cli.js

@@ -308,7 +308,8 @@ function pxtFileList(pref) {
         .concat(nodeutil.allFiles(pref + "built/web/skillmap", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/authcode", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/multiplayer", { maxDepth: 4 }))
-        .concat(nodeutil.allFiles(pref + "built/web/kiosk", { maxDepth: 4 }));
+        .concat(nodeutil.allFiles(pref + "built/web/kiosk", { maxDepth: 4 }))
+        .concat(nodeutil.allFiles(pref + "built/web/teachertool", { maxDepth: 4 }));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -392,7 +393,8 @@ function ciAsync() {
                         .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/authcode-strings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/multiplayer-strings.json"))
-                        .then(() => crowdin.execCrowdinAsync("upload", "built/kiosk-strings.json"));
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/kiosk-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/teachertool-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -922,6 +924,7 @@ function uploadCoreAsync(opts) {
             "authcodeUrl": opts.localDir + "authcode.html",
             "multiplayerUrl": opts.localDir + "multiplayer.html",
             "kioskUrl": opts.localDir + "kiosk.html",
+            "teachertoolUrl": opts.localDir + "teachertool.html",
             "isStatic": true,
         };
         const targetImageLocalPaths = targetImagePaths.map(k => `${opts.localDir}${path.join('./docs', k)}`);
@@ -972,6 +975,7 @@ function uploadCoreAsync(opts) {
         "authcode.html",
         "multiplayer.html",
         "kiosk.html",
+        "teachertool.html",
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
@@ -981,6 +985,7 @@ function uploadCoreAsync(opts) {
         "authcode.html",
         "multiplayer.html",
         "kiosk.html",
+        "teachertool.html",
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -1821,7 +1826,8 @@ async function buildSemanticUIAsync(parsed) {
     await Promise.all([
         generateReactCommonCss("skillmap"),
         generateReactCommonCss("authcode"),
-        generateReactCommonCss("multiplayer")
+        generateReactCommonCss("multiplayer"),
+        generateReactCommonCss("teachertool")
     ]);
     // Run postcss with autoprefixer and rtlcss
     pxt.debug("running postcss");
@@ -1847,7 +1853,8 @@ async function buildSemanticUIAsync(parsed) {
         "blockly.css",
         "react-common-skillmap.css",
         "react-common-authcode.css",
-        "react-common-multiplayer.css"
+        "react-common-multiplayer.css",
+        "react-common-teachertool.css"
     ];
     for (const cssFile of files) {
         const css = await readFileAsync(`built/web/${cssFile}`, "utf8");

package/built/pxt.js

@@ -97781,6 +97781,17 @@ var pxt;
             };
         }
         analytics.enable = enable;
+        function trackPerformanceReport() {
+            if (pxt.perf.perfReportLogged)
+                return;
+            const data = pxt.perf.report();
+            if (data) {
+                const { durations, milestones } = data;
+                pxt.tickEvent("performance.milestones", milestones);
+                pxt.tickEvent("performance.durations", durations);
+            }
+        }
+        analytics.trackPerformanceReport = trackPerformanceReport;
     })(analytics = pxt.analytics || (pxt.analytics = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -101171,7 +101182,7 @@ var pxt;
     // Sometimes these aren't initialized, for example in tests. We only care about them
     // doing anything in the browser.
     if (!pxt.perf.report)
-        pxt.perf.report = () => { };
+        pxt.perf.report = () => undefined;
     if (!pxt.perf.recordMilestone)
         pxt.perf.recordMilestone = () => { };
     if (!pxt.perf.measureStart)
@@ -101919,26 +101930,26 @@ var pxt;
                 },
                 'math_number': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/types/number',
                     category: 'math',
                     tooltip: (pxt.appTarget && pxt.appTarget.compile) ?
                         pxt.Util.lf("a decimal number") : pxt.Util.lf("an integer number")
                 },
                 'math_integer': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/types/number',
                     category: 'math',
                     tooltip: pxt.Util.lf("an integer number")
                 },
                 'math_whole_number': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/types/number',
                     category: 'math',
                     tooltip: pxt.Util.lf("a whole number")
                 },
                 'math_number_minmax': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/blocks/math',
                     category: 'math'
                 },
                 'math_arithmetic': {
@@ -155401,6 +155412,8 @@ var pxsim;
             let isDeferrableBroadcastMessage = false;
             const broadcastmsg = msg;
             if (source && (broadcastmsg === null || broadcastmsg === void 0 ? void 0 : broadcastmsg.broadcast)) {
+                // include index of the source iframe
+                broadcastmsg.srcFrameIndex = this.simFrames().findIndex((item) => item.contentWindow === source);
                 // if the editor is hosted in a multi-editor setting
                 // don't start extra frames
                 const single = !!((_a = this._currentRuntime) === null || _a === void 0 ? void 0 : _a.single);
@@ -155572,6 +155585,7 @@ var pxsim;
             return wrapper;
         }
         preload(aspectRatio, clearRuntime) {
+            this.addEventListeners();
             if (clearRuntime) {
                 this._currentRuntime = undefined;
                 this.container.textContent = "";
@@ -160832,7 +160846,8 @@ function pxtFileList(pref) {
         .concat(nodeutil.allFiles(pref + "built/web/skillmap", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/authcode", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/multiplayer", { maxDepth: 4 }))
-        .concat(nodeutil.allFiles(pref + "built/web/kiosk", { maxDepth: 4 }));
+        .concat(nodeutil.allFiles(pref + "built/web/kiosk", { maxDepth: 4 }))
+        .concat(nodeutil.allFiles(pref + "built/web/teachertool", { maxDepth: 4 }));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -160916,7 +160931,8 @@ function ciAsync() {
                         .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/authcode-strings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/multiplayer-strings.json"))
-                        .then(() => crowdin.execCrowdinAsync("upload", "built/kiosk-strings.json"));
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/kiosk-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/teachertool-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -161446,6 +161462,7 @@ function uploadCoreAsync(opts) {
             "authcodeUrl": opts.localDir + "authcode.html",
             "multiplayerUrl": opts.localDir + "multiplayer.html",
             "kioskUrl": opts.localDir + "kiosk.html",
+            "teachertoolUrl": opts.localDir + "teachertool.html",
             "isStatic": true,
         };
         const targetImageLocalPaths = targetImagePaths.map(k => `${opts.localDir}${path.join('./docs', k)}`);
@@ -161496,6 +161513,7 @@ function uploadCoreAsync(opts) {
         "authcode.html",
         "multiplayer.html",
         "kiosk.html",
+        "teachertool.html",
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
@@ -161505,6 +161523,7 @@ function uploadCoreAsync(opts) {
         "authcode.html",
         "multiplayer.html",
         "kiosk.html",
+        "teachertool.html",
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -162345,7 +162364,8 @@ async function buildSemanticUIAsync(parsed) {
     await Promise.all([
         generateReactCommonCss("skillmap"),
         generateReactCommonCss("authcode"),
-        generateReactCommonCss("multiplayer")
+        generateReactCommonCss("multiplayer"),
+        generateReactCommonCss("teachertool")
     ]);
     // Run postcss with autoprefixer and rtlcss
     pxt.debug("running postcss");
@@ -162371,7 +162391,8 @@ async function buildSemanticUIAsync(parsed) {
         "blockly.css",
         "react-common-skillmap.css",
         "react-common-authcode.css",
-        "react-common-multiplayer.css"
+        "react-common-multiplayer.css",
+        "react-common-teachertool.css"
     ];
     for (const cssFile of files) {
         const css = await readFileAsync(`built/web/${cssFile}`, "utf8");

package/built/pxteditor.js

@@ -613,10 +613,10 @@ var pxt;
 (function (pxt) {
     var workspace;
     (function (workspace) {
-        // 5 minutes
-        const DIFF_HISTORY_INTERVAL = 1000 * 60 * 5;
-        // 15 minutes
-        const SNAPSHOT_HISTORY_INTERVAL = 1000 * 60 * 15;
+        // 5 minutes. This is overridden in pxtarget.json
+        const DEFAULT_DIFF_HISTORY_INTERVAL = 1000 * 60 * 5;
+        // 15 minutes. This is overridden in pxtarget.json
+        const DEFAULT_SNAPSHOT_HISTORY_INTERVAL = 1000 * 60 * 15;
         const ONE_DAY = 1000 * 60 * 60 * 24;
         function collapseHistory(history, text, options, diff, patch) {
             var _a, _b;
@@ -863,7 +863,7 @@ var pxt;
             if (history.entries.length > 1) {
                 const topTime = history.entries[history.entries.length - 1].timestamp;
                 const prevTime = history.entries[history.entries.length - 2].timestamp;
-                if (currentTime - topTime < DIFF_HISTORY_INTERVAL && topTime - prevTime < DIFF_HISTORY_INTERVAL) {
+                if (currentTime - topTime < diffInterval() && topTime - prevTime < diffInterval()) {
                     shouldCombine = true;
                 }
             }
@@ -887,7 +887,7 @@ var pxt;
             if (history.snapshots.length == 0) {
                 history.snapshots.push(takeSnapshot(previousText, currentTime - 1));
             }
-            else if (currentTime - history.snapshots[history.snapshots.length - 1].timestamp >= SNAPSHOT_HISTORY_INTERVAL) {
+            else if (currentTime - history.snapshots[history.snapshots.length - 1].timestamp >= snapshotInterval()) {
                 history.snapshots.push(takeSnapshot(previousText, currentTime));
                 const trimmed = [];
                 let currentDay = Math.floor(currentTime / ONE_DAY) * ONE_DAY;
@@ -965,6 +965,20 @@ var pxt;
             }
             return true;
         }
+        function diffInterval() {
+            var _a, _b;
+            if (((_b = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.appTheme) === null || _b === void 0 ? void 0 : _b.timeMachineDiffInterval) != undefined) {
+                return pxt.appTarget.appTheme.timeMachineDiffInterval;
+            }
+            return DEFAULT_DIFF_HISTORY_INTERVAL;
+        }
+        function snapshotInterval() {
+            var _a, _b;
+            if (((_b = (_a = pxt.appTarget) === null || _a === void 0 ? void 0 : _a.appTheme) === null || _b === void 0 ? void 0 : _b.timeMachineSnapshotInterval) != undefined) {
+                return pxt.appTarget.appTheme.timeMachineSnapshotInterval;
+            }
+            return DEFAULT_SNAPSHOT_HISTORY_INTERVAL;
+        }
     })(workspace = pxt.workspace || (pxt.workspace = {}));
 })(pxt || (pxt = {}));
 /// <reference path="../localtypings/monaco.d.ts" />

package/built/pxtlib.d.ts

@@ -22,6 +22,7 @@ declare namespace pxt.analytics {
     let consoleTicks: ConsoleTickOptions;
     function addDefaultProperties(props: Map<string | number>): void;
     function enable(lang: string): void;
+    function trackPerformanceReport(): void;
 }
 declare namespace pxt {
     let appTarget: TargetBundle;
@@ -484,7 +485,14 @@ declare namespace ts.pxtc.jsonPatch.tests {
 }
 declare namespace pxt.perf {
     let perfReportLogged: boolean;
-    function report(): void;
+    function report(): {
+        milestones: {
+            [index: string]: number;
+        };
+        durations: {
+            [index: string]: number;
+        };
+    } | undefined;
     function recordMilestone(msg: string, time?: number): void;
     function measureStart(name: string): void;
     function measureEnd(name: string): void;
@@ -557,6 +565,7 @@ declare namespace pxt {
         authcodeUrl?: string;
         multiplayerUrl?: string;
         kioskUrl?: string;
+        teachertoolUrl?: string;
         isStatic?: boolean;
         verprefix?: string;
     }
@@ -3688,6 +3697,17 @@ declare namespace pxt.Cloud {
         thumb?: boolean;
         persistId?: string;
     }
+    interface JsonText {
+        "Readme.md"?: string;
+        "assets.json"?: string;
+        "images.g.jres"?: string;
+        "images.g.ts"?: string;
+        "main.blocks"?: string;
+        "main.ts"?: string;
+        "pxt.json"?: string;
+        "tilemap.g.jres"?: string;
+        "tilemap.g.ts"?: string;
+    }
 }
 declare namespace ts.pxtc {
     function f4EncodeImg(w: number, h: number, bpp: number, getPix: (x: number, y: number) => number): string;

package/built/pxtlib.js

@@ -95,6 +95,17 @@ var pxt;
             };
         }
         analytics.enable = enable;
+        function trackPerformanceReport() {
+            if (pxt.perf.perfReportLogged)
+                return;
+            const data = pxt.perf.report();
+            if (data) {
+                const { durations, milestones } = data;
+                pxt.tickEvent("performance.milestones", milestones);
+                pxt.tickEvent("performance.durations", durations);
+            }
+        }
+        analytics.trackPerformanceReport = trackPerformanceReport;
     })(analytics = pxt.analytics || (pxt.analytics = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -3485,7 +3496,7 @@ var pxt;
     // Sometimes these aren't initialized, for example in tests. We only care about them
     // doing anything in the browser.
     if (!pxt.perf.report)
-        pxt.perf.report = () => { };
+        pxt.perf.report = () => undefined;
     if (!pxt.perf.recordMilestone)
         pxt.perf.recordMilestone = () => { };
     if (!pxt.perf.measureStart)
@@ -4233,26 +4244,26 @@ var pxt;
                 },
                 'math_number': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/types/number',
                     category: 'math',
                     tooltip: (pxt.appTarget && pxt.appTarget.compile) ?
                         pxt.Util.lf("a decimal number") : pxt.Util.lf("an integer number")
                 },
                 'math_integer': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/types/number',
                     category: 'math',
                     tooltip: pxt.Util.lf("an integer number")
                 },
                 'math_whole_number': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/types/number',
                     category: 'math',
                     tooltip: pxt.Util.lf("a whole number")
                 },
                 'math_number_minmax': {
                     name: pxt.Util.lf("{id:block}number"),
-                    url: '/blocks/math/random',
+                    url: '/blocks/math',
                     category: 'math'
                 },
                 'math_arithmetic': {

package/built/pxtrunner.js

@@ -1574,6 +1574,7 @@ var pxt;
         }
         function initInnerAsync() {
             pxt.setAppTarget(window.pxtTargetBundle);
+            pxt.analytics.enable(pxt.Util.userLanguage());
             pxt.Util.assert(!!pxt.appTarget);
             const href = window.location.href;
             let force = false;
@@ -1817,7 +1818,13 @@ var pxt;
         runner.postSimMessage = postSimMessage;
         async function fetchSimJsInfo(simOptions) {
             try {
-                return await pxt.Cloud.downloadBuiltSimJsInfoAsync(simOptions.id);
+                const start = Date.now();
+                const result = await pxt.Cloud.downloadBuiltSimJsInfoAsync(simOptions.id);
+                pxt.tickEvent("perfMeasurement", {
+                    durationMs: Date.now() - start,
+                    operation: "fetchSimJsInfo",
+                });
+                return result;
             }
             catch (e) {
                 // This exception will happen in the majority of cases, so we don't want to log it unless for debugging.
@@ -1828,6 +1835,7 @@ var pxt;
         runner.fetchSimJsInfo = fetchSimJsInfo;
         async function buildSimJsInfo(simOptions) {
             var _a;
+            const start = Date.now();
             await loadPackageAsync(simOptions.id, simOptions.code, simOptions.dependencies);
             let didUpgrade = false;
             const currentTargetVersion = pxt.appTarget.versions.target;
@@ -1885,6 +1893,10 @@ var pxt;
             }
             const res = pxtc.buildSimJsInfo(compileResult);
             res.parts = compileResult.usedParts;
+            pxt.tickEvent("perfMeasurement", {
+                durationMs: Date.now() - start,
+                operation: "buildSimJsInfo",
+            });
             return res;
         }
         runner.buildSimJsInfo = buildSimJsInfo;

package/built/pxtsim.d.ts

@@ -386,6 +386,7 @@ declare namespace pxsim {
     interface SimulatorBroadcastMessage extends SimulatorMessage {
         broadcast: boolean;
         toParentIFrameOnly?: boolean;
+        srcFrameIndex?: number;
     }
     interface SimulatorControlMessage extends SimulatorBroadcastMessage {
         type: "messagepacket";

package/built/pxtsim.js

@@ -6253,6 +6253,8 @@ var pxsim;
             let isDeferrableBroadcastMessage = false;
             const broadcastmsg = msg;
             if (source && (broadcastmsg === null || broadcastmsg === void 0 ? void 0 : broadcastmsg.broadcast)) {
+                // include index of the source iframe
+                broadcastmsg.srcFrameIndex = this.simFrames().findIndex((item) => item.contentWindow === source);
                 // if the editor is hosted in a multi-editor setting
                 // don't start extra frames
                 const single = !!((_a = this._currentRuntime) === null || _a === void 0 ? void 0 : _a.single);
@@ -6424,6 +6426,7 @@ var pxsim;
             return wrapper;
         }
         preload(aspectRatio, clearRuntime) {
+            this.addEventListeners();
             if (clearRuntime) {
                 this._currentRuntime = undefined;
                 this.container.textContent = "";

package/built/server.js

@@ -24,7 +24,8 @@ let localHexCacheDir = path.join("built", "hexcache");
 let serveOptions;
 const webappNames = [
     "kiosk",
-    "multiplayer"
+    "multiplayer",
+    "eval"
     // TODO: Add other webapp names here: "skillmap", "authcode"
 ];
 function setupDocfilesdirs() {