pxt-core 8.6.47 → 8.6.48

package/built/pxt.js

@@ -102740,15 +102740,19 @@ var pxt;
         }
         BrowserUtils.loadCanvasAsync = loadCanvasAsync;
         function scaleImageData(img, scale) {
-            const cvs = document.createElement("canvas");
-            cvs.width = img.width * scale;
-            cvs.height = img.height * scale;
-            const ctx = cvs.getContext("2d");
+            const inputCanvas = document.createElement("canvas");
+            const outputCanvas = document.createElement("canvas");
+            inputCanvas.width = img.width;
+            inputCanvas.height = img.height;
+            outputCanvas.width = img.width * scale;
+            outputCanvas.height = img.height * scale;
+            const ctx = inputCanvas.getContext("2d");
+            const outCtx = outputCanvas.getContext("2d");
             ctx.putImageData(img, 0, 0);
-            ctx.imageSmoothingEnabled = false;
-            ctx.scale(scale, scale);
-            ctx.drawImage(cvs, 0, 0);
-            return ctx.getImageData(0, 0, img.width * scale, img.height * scale);
+            outCtx.imageSmoothingEnabled = false;
+            outCtx.scale(scale, scale);
+            outCtx.drawImage(inputCanvas, 0, 0);
+            return outCtx.getImageData(0, 0, img.width * scale, img.height * scale);
         }
         BrowserUtils.scaleImageData = scaleImageData;
         function imageDataToPNG(img, scale = 1) {
@@ -120557,6 +120561,19 @@ var pxt;
                     return pxt.U.delay(500);
                 });
             }
+            async forgetAsync() {
+                var _a;
+                if (!((_a = this.dev) === null || _a === void 0 ? void 0 : _a.forget))
+                    return false;
+                try {
+                    await this.dev.forget();
+                    return true;
+                    // connection changed listener will handle disconnecting when access is revoked.
+                }
+                catch (e) {
+                    return false;
+                }
+            }
             reconnectAsync() {
                 this.log("reconnect");
                 this.setConnecting(true);
@@ -120787,6 +120804,7 @@ var pxt;
                 return [];
             }
         }
+        usb.tryGetDevicesAsync = tryGetDevicesAsync;
         let _hid;
         function mkWebUSBHIDPacketIOAsync() {
             pxt.debug(`packetio: mk webusb io`);
@@ -120796,6 +120814,16 @@ var pxt;
             return Promise.resolve(_hid);
         }
         usb.mkWebUSBHIDPacketIOAsync = mkWebUSBHIDPacketIOAsync;
+        // returns true if device has been successfully forgotten, false otherwise.
+        async function forgetDeviceAsync() {
+            pxt.debug(`packetio: forget webusb io`);
+            if (!_hid) {
+                // No device to forget
+                return false;
+            }
+            return _hid.forgetAsync();
+        }
+        usb.forgetDeviceAsync = forgetDeviceAsync;
         usb.isEnabled = false;
         function setEnabled(v) {
             if (!isAvailable())
@@ -148740,7 +148768,8 @@ var pxt;
             }
             function emitMultiLnStrLitExp(s) {
                 if (ts.isNoSubstitutionTemplateLiteral(s)) {
-                    return asExpRes(`"""\n${py.indent1(s.text.trim())}\n"""`);
+                    // manually perform indent1(), trimming existing indentation for multiline strings.
+                    return asExpRes(`"""\n${s.text.trim().split('\n').map(x => `${py.INDENT}${x.trim()}`).join('\n')}\n${py.INDENT}"""`);
                 }
                 let [tag, tagSup] = emitExp(s.tag);
                 let [temp, tempSup] = emitExp(s.template);
@@ -158993,9 +159022,11 @@ var pxsim;
                 return this.view;
             }
             screenshotAsync(width) {
-                const svg = this.view.cloneNode(true);
-                svg.setAttribute('width', this.view.viewBox.baseVal.width + "");
-                svg.setAttribute('height', this.view.viewBox.baseVal.height + "");
+                // only clone the svg node with class="sim" so that screenshot doesn't include external parts
+                const simEl = this.view.querySelector(".sim");
+                const svg = simEl.cloneNode(true);
+                svg.setAttribute('width', svg.viewBox.baseVal.width + "");
+                svg.setAttribute('height', svg.viewBox.baseVal.height + "");
                 const xml = new XMLSerializer().serializeToString(svg);
                 const data = "data:image/svg+xml,"
                     + encodeURIComponent(xml.replace(/\s+/g, ' ').replace(/"/g, "'"));

package/built/pxtlib.d.ts

@@ -919,6 +919,7 @@ declare namespace pxt.commands {
         jsx: any;
         helpUrl: string;
     };
+    let showUsbDeviceForgottenDialog: (confirmAsync: (options: any) => Promise<number>) => Promise<void>;
     let showUploadInstructionsAsync: (fn: string, url: string, confirmAsync: (options: any) => Promise<number>, saveOnly?: boolean, redeploy?: () => Promise<void>) => Promise<void>;
     let showProgramTooLargeErrorAsync: (variants: string[], confirmAsync: (options: any) => Promise<number>, saveOnly?: boolean) => Promise<RecompileOptions>;
     let saveProjectAsync: (project: pxt.cpp.HexFile) => Promise<void>;
@@ -3403,9 +3404,12 @@ declare namespace pxt.usb {
         isochronousTransferIn(endpointNumber: number, packetLengths: number[]): Promise<USBIsochronousInTransferResult>;
         isochronousTransferOut(endpointNumber: number, data: BufferSource, packetLengths: number[]): Promise<USBIsochronousOutTransferResult>;
         reset(): Promise<void>;
+        forget?(): Promise<void>;
     }
     function pairAsync(): Promise<boolean>;
+    function tryGetDevicesAsync(): Promise<USBDevice[]>;
     function mkWebUSBHIDPacketIOAsync(): Promise<pxt.packetio.PacketIO>;
+    function forgetDeviceAsync(): Promise<boolean>;
     let isEnabled: boolean;
     function setEnabled(v: boolean): void;
     function checkAvailableAsync(): Promise<void>;

package/built/pxtlib.js

@@ -5054,15 +5054,19 @@ var pxt;
         }
         BrowserUtils.loadCanvasAsync = loadCanvasAsync;
         function scaleImageData(img, scale) {
-            const cvs = document.createElement("canvas");
-            cvs.width = img.width * scale;
-            cvs.height = img.height * scale;
-            const ctx = cvs.getContext("2d");
+            const inputCanvas = document.createElement("canvas");
+            const outputCanvas = document.createElement("canvas");
+            inputCanvas.width = img.width;
+            inputCanvas.height = img.height;
+            outputCanvas.width = img.width * scale;
+            outputCanvas.height = img.height * scale;
+            const ctx = inputCanvas.getContext("2d");
+            const outCtx = outputCanvas.getContext("2d");
             ctx.putImageData(img, 0, 0);
-            ctx.imageSmoothingEnabled = false;
-            ctx.scale(scale, scale);
-            ctx.drawImage(cvs, 0, 0);
-            return ctx.getImageData(0, 0, img.width * scale, img.height * scale);
+            outCtx.imageSmoothingEnabled = false;
+            outCtx.scale(scale, scale);
+            outCtx.drawImage(inputCanvas, 0, 0);
+            return outCtx.getImageData(0, 0, img.width * scale, img.height * scale);
         }
         BrowserUtils.scaleImageData = scaleImageData;
         function imageDataToPNG(img, scale = 1) {
@@ -22871,6 +22875,19 @@ var pxt;
                     return pxt.U.delay(500);
                 });
             }
+            async forgetAsync() {
+                var _a;
+                if (!((_a = this.dev) === null || _a === void 0 ? void 0 : _a.forget))
+                    return false;
+                try {
+                    await this.dev.forget();
+                    return true;
+                    // connection changed listener will handle disconnecting when access is revoked.
+                }
+                catch (e) {
+                    return false;
+                }
+            }
             reconnectAsync() {
                 this.log("reconnect");
                 this.setConnecting(true);
@@ -23101,6 +23118,7 @@ var pxt;
                 return [];
             }
         }
+        usb.tryGetDevicesAsync = tryGetDevicesAsync;
         let _hid;
         function mkWebUSBHIDPacketIOAsync() {
             pxt.debug(`packetio: mk webusb io`);
@@ -23110,6 +23128,16 @@ var pxt;
             return Promise.resolve(_hid);
         }
         usb.mkWebUSBHIDPacketIOAsync = mkWebUSBHIDPacketIOAsync;
+        // returns true if device has been successfully forgotten, false otherwise.
+        async function forgetDeviceAsync() {
+            pxt.debug(`packetio: forget webusb io`);
+            if (!_hid) {
+                // No device to forget
+                return false;
+            }
+            return _hid.forgetAsync();
+        }
+        usb.forgetDeviceAsync = forgetDeviceAsync;
         usb.isEnabled = false;
         function setEnabled(v) {
             if (!isAvailable())

package/built/pxtpy.js

@@ -6209,7 +6209,8 @@ var pxt;
             }
             function emitMultiLnStrLitExp(s) {
                 if (ts.isNoSubstitutionTemplateLiteral(s)) {
-                    return asExpRes(`"""\n${py.indent1(s.text.trim())}\n"""`);
+                    // manually perform indent1(), trimming existing indentation for multiline strings.
+                    return asExpRes(`"""\n${s.text.trim().split('\n').map(x => `${py.INDENT}${x.trim()}`).join('\n')}\n${py.INDENT}"""`);
                 }
                 let [tag, tagSup] = emitExp(s.tag);
                 let [temp, tempSup] = emitExp(s.template);

package/built/pxtsim.js

@@ -9782,9 +9782,11 @@ var pxsim;
                 return this.view;
             }
             screenshotAsync(width) {
-                const svg = this.view.cloneNode(true);
-                svg.setAttribute('width', this.view.viewBox.baseVal.width + "");
-                svg.setAttribute('height', this.view.viewBox.baseVal.height + "");
+                // only clone the svg node with class="sim" so that screenshot doesn't include external parts
+                const simEl = this.view.querySelector(".sim");
+                const svg = simEl.cloneNode(true);
+                svg.setAttribute('width', svg.viewBox.baseVal.width + "");
+                svg.setAttribute('height', svg.viewBox.baseVal.height + "");
                 const xml = new XMLSerializer().serializeToString(svg);
                 const data = "data:image/svg+xml,"
                     + encodeURIComponent(xml.replace(/\s+/g, ' ').replace(/"/g, "'"));