pxt-core 10.0.9 → 10.0.10

package/built/pxt.js

@@ -111104,11 +111104,12 @@ var pxt;
             return result;
         }
         sprite_1.resizeTilemap = resizeTilemap;
-        function imageLiteralToBitmap(text) {
+        function imageLiteralToBitmap(text, templateLiteral = "img") {
             // Strip the tagged template string business and the whitespace. We don't have to exhaustively
             // replace encoded characters because the compiler will catch any disallowed characters and throw
             // an error before the decompilation happens. 96 is backtick and 9 is tab
             text = text.replace(/[ `]|(?:`)|(?:	)|(?:img)/g, "").trim();
+            text = text.replaceAll(templateLiteral, "");
             text = text.replace(/^["`\(\)]*/, '').replace(/["`\(\)]*$/, '');
             text = text.replace(/
/g, "\n");
             const rows = text.split("\n");
@@ -111270,14 +111271,14 @@ var pxt;
             pxt.sprite.trimTilemapTileset(result);
         }
         sprite_1.updateTilemapReferencesFromResult = updateTilemapReferencesFromResult;
-        function imageLiteralPrologue(fileType) {
+        function imageLiteralPrologue(fileType, templateLiteral = "img") {
             let res = '';
             switch (fileType) {
                 case "python":
-                    res = "img(\"\"\"";
+                    res = `${templateLiteral}("""`;
                     break;
                 default:
-                    res = "img`";
+                    res = `${templateLiteral}\``;
                     break;
             }
             return res;
@@ -111308,10 +111309,10 @@ var pxt;
             return res;
         }
         sprite_1.imageLiteralFromDimensions = imageLiteralFromDimensions;
-        function bitmapToImageLiteral(bitmap, fileType) {
+        function bitmapToImageLiteral(bitmap, fileType, templateLiteral = "img") {
             if (!bitmap || bitmap.height === 0 || bitmap.width === 0)
                 return "";
-            let res = imageLiteralPrologue(fileType);
+            let res = imageLiteralPrologue(fileType, templateLiteral);
             if (bitmap) {
                 const paddingBetweenPixels = (bitmap.width * bitmap.height > 300) ? "" : " ";
                 for (let r = 0; r < bitmap.height; r++) {
@@ -114228,6 +114229,9 @@ var pxt;
             opts.jres = this.getJRes();
             const functionOpts = pxt.appTarget.runtime && pxt.appTarget.runtime.functionsOptions;
             opts.allowedArgumentTypes = functionOpts && functionOpts.extraFunctionEditorTypes && functionOpts.extraFunctionEditorTypes.map(info => info.typeName).concat("number", "boolean", "string");
+            for (const dep of this.sortedDeps()) {
+                dep.patchAppTargetPalette();
+            }
             this.patchAppTargetPalette();
             return opts;
         }

package/built/pxtblocks/fields/field_animation.d.ts

@@ -8,6 +8,7 @@ export interface FieldAnimationOptions {
     disableResize: string;
     filter?: string;
     lightMode: boolean;
+    taggedTemplate?: string;
 }
 export interface ParsedFieldAnimationOptions {
     initWidth: number;
@@ -15,6 +16,7 @@ export interface ParsedFieldAnimationOptions {
     disableResize: boolean;
     filter?: string;
     lightMode: boolean;
+    taggedTemplate?: string;
 }
 export declare class FieldAnimationEditor extends FieldAssetEditor<FieldAnimationOptions, ParsedFieldAnimationOptions> {
     protected frames: string[];

package/built/pxtblocks/fields/field_sprite.d.ts

@@ -8,6 +8,7 @@ export interface FieldSpriteEditorOptions {
     disableResize: string;
     filter?: string;
     lightMode: boolean;
+    taggedTemplate?: string;
 }
 interface ParsedSpriteEditorOptions {
     initColor: number;
@@ -16,6 +17,7 @@ interface ParsedSpriteEditorOptions {
     disableResize: boolean;
     filter?: string;
     lightMode: boolean;
+    taggedTemplate?: string;
 }
 export declare class FieldSpriteEditor extends FieldAssetEditor<FieldSpriteEditorOptions, ParsedSpriteEditorOptions> {
     protected getAssetType(): pxt.AssetType;

package/built/pxtblocks/plugins/renderer/connectionPreviewer.d.ts

@@ -1,13 +1,10 @@
 import * as Blockly from "blockly";
-export declare class ConnectionPreviewer implements Blockly.IConnectionPreviewer {
+export declare class ConnectionPreviewer extends Blockly.InsertionMarkerPreviewer {
     static CONNECTION_INDICATOR_RADIUS: number;
     protected connectionLine: SVGLineElement;
-    protected staticConnectionIndicator: SVGElement;
     protected draggedConnectionIndicator: SVGElement;
     protected staticConnection: Blockly.RenderedConnection;
     previewReplacement(draggedConn: Blockly.RenderedConnection, staticConn: Blockly.RenderedConnection, replacedBlock: Blockly.BlockSvg): void;
-    previewConnection(draggedConn: Blockly.RenderedConnection, staticConn: Blockly.RenderedConnection): void;
     hidePreview(): void;
-    dispose(): void;
     protected createConnectionIndicator(connection: Blockly.RenderedConnection): SVGElement;
 }

package/built/pxtblocks/plugins/renderer/pathObject.d.ts

@@ -1,12 +1,16 @@
 import * as Blockly from "blockly";
 export declare class PathObject extends Blockly.zelos.PathObject {
+    static CONNECTION_INDICATOR_RADIUS: number;
     protected svgPathHighlighted: SVGElement;
     protected hasError: boolean;
     protected hasDottedOutlineOnHover: boolean;
     protected mouseOverData: Blockly.browserEvents.Data;
     protected mouseLeaveData: Blockly.browserEvents.Data;
+    protected connectionPointIndicators: WeakMap<Blockly.RenderedConnection, SVGElement>;
     updateHighlighted(enable: boolean): void;
     updateSelected(enable: boolean): void;
+    addConnectionHighlight(connection: Blockly.RenderedConnection, connectionPath: string, offset: Blockly.utils.Coordinate, rtl: boolean): void;
+    removeConnectionHighlight(connection: Blockly.RenderedConnection): void;
     setHasDottedOutllineOnHover(enabled: boolean): void;
     setHasError(hasError: boolean): void;
     isHighlighted(): boolean;

package/built/pxtlib.d.ts

@@ -1778,12 +1778,12 @@ declare namespace pxt.sprite {
     function formatByte(value: number, bytes: number): string;
     function resizeBitmap(img: Bitmap, width: number, height: number): Bitmap;
     function resizeTilemap(img: Tilemap, width: number, height: number): Tilemap;
-    function imageLiteralToBitmap(text: string): Bitmap;
+    function imageLiteralToBitmap(text: string, templateLiteral?: string): Bitmap;
     function encodeAnimationString(frames: BitmapData[], interval: number): string;
     function addMissingTilemapTilesAndReferences(project: TilemapProject, asset: ProjectTilemap): void;
     function updateTilemapReferencesFromResult(project: TilemapProject, assetResult: ProjectTilemap): void;
     function imageLiteralFromDimensions(width: number, height: number, color: number, fileType: "typescript" | "python"): string;
-    function bitmapToImageLiteral(bitmap: Bitmap, fileType: "typescript" | "python"): string;
+    function bitmapToImageLiteral(bitmap: Bitmap, fileType: "typescript" | "python", templateLiteral?: string): string;
     function bitmapEquals(a: pxt.sprite.BitmapData, b: pxt.sprite.BitmapData): boolean;
     function tileWidthToTileScale(tileWidth: number): string;
     function tileScaleToTileWidth(tileScale: string): number;
@@ -1938,7 +1938,7 @@ declare namespace pxt {
          */
         packageLocalizationStringsAsync(lang: string): Promise<Map<string>>;
         bundledStringsForFile(lang: string, filename: string): Map<string>;
-        protected patchAppTargetPalette(): void;
+        patchAppTargetPalette(): void;
     }
     class MainPackage extends Package {
         _host: Host;

package/built/pxtlib.js

@@ -13418,11 +13418,12 @@ var pxt;
             return result;
         }
         sprite_1.resizeTilemap = resizeTilemap;
-        function imageLiteralToBitmap(text) {
+        function imageLiteralToBitmap(text, templateLiteral = "img") {
             // Strip the tagged template string business and the whitespace. We don't have to exhaustively
             // replace encoded characters because the compiler will catch any disallowed characters and throw
             // an error before the decompilation happens. 96 is backtick and 9 is tab
             text = text.replace(/[ `]|(?:`)|(?:	)|(?:img)/g, "").trim();
+            text = text.replaceAll(templateLiteral, "");
             text = text.replace(/^["`\(\)]*/, '').replace(/["`\(\)]*$/, '');
             text = text.replace(/
/g, "\n");
             const rows = text.split("\n");
@@ -13584,14 +13585,14 @@ var pxt;
             pxt.sprite.trimTilemapTileset(result);
         }
         sprite_1.updateTilemapReferencesFromResult = updateTilemapReferencesFromResult;
-        function imageLiteralPrologue(fileType) {
+        function imageLiteralPrologue(fileType, templateLiteral = "img") {
             let res = '';
             switch (fileType) {
                 case "python":
-                    res = "img(\"\"\"";
+                    res = `${templateLiteral}("""`;
                     break;
                 default:
-                    res = "img`";
+                    res = `${templateLiteral}\``;
                     break;
             }
             return res;
@@ -13622,10 +13623,10 @@ var pxt;
             return res;
         }
         sprite_1.imageLiteralFromDimensions = imageLiteralFromDimensions;
-        function bitmapToImageLiteral(bitmap, fileType) {
+        function bitmapToImageLiteral(bitmap, fileType, templateLiteral = "img") {
             if (!bitmap || bitmap.height === 0 || bitmap.width === 0)
                 return "";
-            let res = imageLiteralPrologue(fileType);
+            let res = imageLiteralPrologue(fileType, templateLiteral);
             if (bitmap) {
                 const paddingBetweenPixels = (bitmap.width * bitmap.height > 300) ? "" : " ";
                 for (let r = 0; r < bitmap.height; r++) {
@@ -16542,6 +16543,9 @@ var pxt;
             opts.jres = this.getJRes();
             const functionOpts = pxt.appTarget.runtime && pxt.appTarget.runtime.functionsOptions;
             opts.allowedArgumentTypes = functionOpts && functionOpts.extraFunctionEditorTypes && functionOpts.extraFunctionEditorTypes.map(info => info.typeName).concat("number", "boolean", "string");
+            for (const dep of this.sortedDeps()) {
+                dep.patchAppTargetPalette();
+            }
             this.patchAppTargetPalette();
             return opts;
         }