pxt-core 9.3.7 → 9.3.9

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

@@ -155401,6 +155401,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);
@@ -160832,7 +160834,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 +160919,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 +161450,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 +161501,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 +161511,7 @@ function uploadCoreAsync(opts) {
         "authcode.html",
         "multiplayer.html",
         "kiosk.html",
+        "teachertool.html",
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -162345,7 +162352,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 +162379,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/pxtblockly.js

@@ -16327,12 +16327,21 @@ var pxtblockly;
                 return project.lookupAsset("image" /* pxt.AssetType.Image */, this.getBlockData());
             }
             const bmp = text ? pxt.sprite.imageLiteralToBitmap(text) : new pxt.sprite.Bitmap(this.params.initWidth, this.params.initHeight);
+            let data;
             if (!bmp) {
-                this.isGreyBlock = true;
-                this.valueText = text;
-                return undefined;
+                // check for qualified name
+                data = qNameToBitmapData(text);
+                if (!data) {
+                    this.isGreyBlock = true;
+                    this.valueText = text;
+                    return undefined;
+                }
+                else {
+                    this.qName = text;
+                }
             }
-            const data = bmp.data();
+            if (!data)
+                data = bmp.data();
             const newAsset = {
                 internalID: -1,
                 id: this.sourceBlock_.id,
@@ -16347,6 +16356,13 @@ var pxtblockly;
             if (this.asset && !this.isTemporaryAsset()) {
                 return pxt.getTSReferenceForAsset(this.asset);
             }
+            else if (this.qName) {
+                // check if image has been edited
+                const data = qNameToBitmapData(this.qName);
+                if (data && pxt.sprite.bitmapEquals(data, this.asset.bitmap)) {
+                    return this.qName;
+                }
+            }
             return pxt.sprite.bitmapToImageLiteral(this.asset && pxt.sprite.Bitmap.fromData(this.asset.bitmap), "typescript" /* pxt.editor.FileType.TypeScript */);
         }
         parseFieldOptions(opts) {
@@ -16411,6 +16427,15 @@ var pxtblockly;
             return res;
         }
     }
+    function qNameToBitmapData(qName) {
+        const project = pxt.react.getTilemapProject();
+        const images = project.getGalleryAssets("image" /* pxt.AssetType.Image */).filter(asset => asset.id === qName);
+        const img = images.length && images[0];
+        if (img) {
+            return img.bitmap;
+        }
+        return undefined;
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/pxtblockly.d.ts" />
 var pxtblockly;

package/built/pxtblocks.d.ts

@@ -448,6 +448,7 @@ declare namespace pxtblockly {
         protected undoRedoState: any;
         protected pendingEdit: boolean;
         protected isEmpty: boolean;
+        protected qName?: string;
         isGreyBlock: boolean;
         constructor(text: string, params: any, validator?: Function);
         protected abstract getAssetType(): pxt.AssetType;

package/built/pxtblocks.js

@@ -12765,12 +12765,21 @@ var pxtblockly;
                 return project.lookupAsset("image" /* pxt.AssetType.Image */, this.getBlockData());
             }
             const bmp = text ? pxt.sprite.imageLiteralToBitmap(text) : new pxt.sprite.Bitmap(this.params.initWidth, this.params.initHeight);
+            let data;
             if (!bmp) {
-                this.isGreyBlock = true;
-                this.valueText = text;
-                return undefined;
+                // check for qualified name
+                data = qNameToBitmapData(text);
+                if (!data) {
+                    this.isGreyBlock = true;
+                    this.valueText = text;
+                    return undefined;
+                }
+                else {
+                    this.qName = text;
+                }
             }
-            const data = bmp.data();
+            if (!data)
+                data = bmp.data();
             const newAsset = {
                 internalID: -1,
                 id: this.sourceBlock_.id,
@@ -12785,6 +12794,13 @@ var pxtblockly;
             if (this.asset && !this.isTemporaryAsset()) {
                 return pxt.getTSReferenceForAsset(this.asset);
             }
+            else if (this.qName) {
+                // check if image has been edited
+                const data = qNameToBitmapData(this.qName);
+                if (data && pxt.sprite.bitmapEquals(data, this.asset.bitmap)) {
+                    return this.qName;
+                }
+            }
             return pxt.sprite.bitmapToImageLiteral(this.asset && pxt.sprite.Bitmap.fromData(this.asset.bitmap), "typescript" /* pxt.editor.FileType.TypeScript */);
         }
         parseFieldOptions(opts) {
@@ -12849,6 +12865,15 @@ var pxtblockly;
             return res;
         }
     }
+    function qNameToBitmapData(qName) {
+        const project = pxt.react.getTilemapProject();
+        const images = project.getGalleryAssets("image" /* pxt.AssetType.Image */).filter(asset => asset.id === qName);
+        const img = images.length && images[0];
+        if (img) {
+            return img.bitmap;
+        }
+        return undefined;
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/pxtblockly.d.ts" />
 var pxtblockly;

package/built/pxtlib.d.ts

@@ -557,6 +557,7 @@ declare namespace pxt {
         authcodeUrl?: string;
         multiplayerUrl?: string;
         kioskUrl?: string;
+        teachertoolUrl?: string;
         isStatic?: boolean;
         verprefix?: string;
     }

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);

package/built/server.js

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