pxt-core 12.2.2 → 12.2.3

package/built/backendutils.js

@@ -143,13 +143,13 @@ var pxtc = ts.pxtc;
             function htmlEscape(_input) {
                 if (!_input)
                     return _input; // null, undefined, empty string test
-                return _input.replace(/([^\w .!?\-$])/g, c => "&#" + c.charCodeAt(0) + ";");
+                return _input.replace(/([^\w .!?\-$])/ug, c => "&#" + c.codePointAt(0) + ";");
             }
             Util.htmlEscape = htmlEscape;
             function htmlUnescape(_input) {
                 if (!_input)
                     return _input; // null, undefined, empty string test
-                return _input.replace(/(&#\d+;)/g, c => String.fromCharCode(Number(c.substr(2, c.length - 3))));
+                return _input.replace(/(&#\d+;)/g, c => String.fromCodePoint(Number(c.substr(2, c.length - 3))));
             }
             Util.htmlUnescape = htmlUnescape;
             function jsStringQuote(s) {

package/built/pxt.js

@@ -98753,13 +98753,13 @@ var pxtc = ts.pxtc;
             function htmlEscape(_input) {
                 if (!_input)
                     return _input; // null, undefined, empty string test
-                return _input.replace(/([^\w .!?\-$])/g, c => "&#" + c.charCodeAt(0) + ";");
+                return _input.replace(/([^\w .!?\-$])/ug, c => "&#" + c.codePointAt(0) + ";");
             }
             Util.htmlEscape = htmlEscape;
             function htmlUnescape(_input) {
                 if (!_input)
                     return _input; // null, undefined, empty string test
-                return _input.replace(/(&#\d+;)/g, c => String.fromCharCode(Number(c.substr(2, c.length - 3))));
+                return _input.replace(/(&#\d+;)/g, c => String.fromCodePoint(Number(c.substr(2, c.length - 3))));
             }
             Util.htmlUnescape = htmlUnescape;
             function jsStringQuote(s) {
@@ -102104,8 +102104,19 @@ var pxt;
         }
         blocks.hasHandler = hasHandler;
         function getHelpUrl(fn) {
-            if (fn.attributes.help) {
-                const helpUrl = fn.attributes.help.replace(/^\//, '');
+            var _a, _b, _c;
+            let helpAttr = fn.attributes.help;
+            if ((_a = fn.attributes.blockId) === null || _a === void 0 ? void 0 : _a.endsWith(`_blockCombine_get`)) {
+                helpAttr = fn.attributes.blockCombineGetHelp || helpAttr;
+            }
+            else if ((_b = fn.attributes.blockId) === null || _b === void 0 ? void 0 : _b.endsWith(`_blockCombine_set`)) {
+                helpAttr = fn.attributes.blockCombineSetHelp || helpAttr;
+            }
+            else if ((_c = fn.attributes.blockId) === null || _c === void 0 ? void 0 : _c.endsWith(`_blockCombine_change`)) {
+                helpAttr = fn.attributes.blockCombineChangeHelp || helpAttr;
+            }
+            if (helpAttr) {
+                const helpUrl = helpAttr.replace(/^\//, '');
                 if (/^github:/.test(helpUrl)) {
                     return helpUrl;
                 }
@@ -115593,6 +115604,22 @@ var ts;
                     }
                     blocks.push(ex);
                 }
+                function copyOverHelp(param) {
+                    if (s.attributes[param]) {
+                        if (ex.attributes[param]) {
+                            if (ex.attributes[param] !== s.attributes[param]) {
+                                console.warn(`Ignoring duplicate ${param} for get/set/change block: ${s.attributes[param]}`);
+                            }
+                        }
+                        else {
+                            ex.attributes[param] = s.attributes[param];
+                        }
+                    }
+                }
+                copyOverHelp("blockCombineChangeHelp");
+                copyOverHelp("blockCombineGetHelp");
+                copyOverHelp("blockCombineSetHelp");
+                copyOverHelp("help");
                 ex.combinedProperties.push(s.qName);
             }
             for (let s of pxtc.Util.values(info.byQName)) {
@@ -118066,7 +118093,7 @@ var pxt;
             this.nextID = 0;
             this.nextInternalID = 0;
             this.committedState = {
-                revision: 0,
+                revision: TilemapProject.nextRevision++,
                 assets: {
                     ["image" /* AssetType.Image */]: new AssetCollection("image" /* AssetType.Image */),
                     ["tile" /* AssetType.Tile */]: new AssetCollection("tile" /* AssetType.Tile */),
@@ -118077,7 +118104,7 @@ var pxt;
                 }
             };
             this.state = {
-                revision: this.nextID++,
+                revision: TilemapProject.nextRevision++,
                 assets: {
                     ["image" /* AssetType.Image */]: new AssetCollection("image" /* AssetType.Image */),
                     ["tile" /* AssetType.Tile */]: new AssetCollection("tile" /* AssetType.Tile */),
@@ -118575,7 +118602,7 @@ var pxt;
             return this.getAssetCollection(type).getSnapshot();
         }
         getGalleryAssets(type) {
-            return this.getAssetCollection(type).getSnapshot();
+            return this.getAssetCollection(type, true).getSnapshot();
         }
         lookupBlockAsset(type, blockID) {
             let filter = (a) => { var _a, _b; return ((_b = (_a = a.meta) === null || _a === void 0 ? void 0 : _a.blockIDs) === null || _b === void 0 ? void 0 : _b.indexOf(blockID)) !== -1; };
@@ -118928,7 +118955,7 @@ var pxt;
         }
         onChange() {
             this.needsRebuild = true;
-            this.state.revision = this.nextID++;
+            this.state.revision = TilemapProject.nextRevision++;
         }
         readImages(allJRes, isProjectFile = false) {
             const assets = [];
@@ -118980,6 +119007,7 @@ var pxt;
             }
         }
     }
+    TilemapProject.nextRevision = 0;
     pxt.TilemapProject = TilemapProject;
     function getTilemaps(allJRes) {
         const res = [];
@@ -126598,15 +126626,15 @@ var ts;
             "leaveAccessor"
         ];
         function jsEmit(bin, cres) {
-            let jssource = "(function (ectx) {\n'use strict';\n";
+            let jsheader = "(function (ectx) {\n'use strict';\n";
             for (let n of evalIfaceFields) {
-                jssource += `const ${n} = ectx.${n};\n`;
+                jsheader += `const ${n} = ectx.${n};\n`;
             }
-            jssource += `const __this = runtime;\n`;
-            jssource += `const pxtrt = pxsim.pxtrt;\n`;
-            jssource += `let yieldSteps = 1;\n`;
-            jssource += `ectx.setupYield(function() { yieldSteps = 100; })\n`;
-            jssource += "pxsim.setTitle(" + JSON.stringify(bin.getTitle()) + ");\n";
+            jsheader += `const __this = runtime;\n`;
+            jsheader += `const pxtrt = pxsim.pxtrt;\n`;
+            jsheader += `let yieldSteps = 1;\n`;
+            jsheader += `ectx.setupYield(function() { yieldSteps = 100; })\n`;
+            let jssource = "pxsim.setTitle(" + JSON.stringify(bin.getTitle()) + ");\n";
             let cfg = {};
             let cfgKey = {};
             for (let ce of cres.configData || []) {
@@ -126628,6 +126656,9 @@ var ts;
                 if (p.cachedJS) {
                     curr = p.cachedJS;
                     cachedLen += curr.length;
+                    for (const hexlit of Object.keys(p.cachedJSHexLiterals)) {
+                        bin.hexlits[hexlit] = p.cachedJSHexLiterals[hexlit];
+                    }
                 }
                 else {
                     curr = irToJS(bin, p);
@@ -126642,6 +126673,10 @@ var ts;
             if (cres.breakpoints)
                 jssource += `\nconst breakpoints = setupDebugger(${cres.breakpoints.length}, [${bin.globals.filter(c => c.isUserVariable).map(c => `"${c.uniqueName()}"`).join(",")}])\n`;
             jssource += `\nreturn ${bin.procs[0] ? bin.procs[0].label() : "null"}\n})\n`;
+            for (const hexlit of Object.keys(bin.hexlits)) {
+                jsheader += bin.hexlits[hexlit];
+            }
+            jssource = jsheader + jssource;
             const total = jssource.length;
             const perc = (n) => ((100 * n) / total).toFixed(2) + "%";
             const sizes = `// total=${jssource.length} new=${perc(newLen)} cached=${perc(cachedLen)} other=${perc(total - newLen - cachedLen)}\n`;
@@ -126658,7 +126693,6 @@ var ts;
             let exprStack = [];
             let maxStack = 0;
             let localsCache = {};
-            let hexlits = "";
             writeRaw(`
 function ${proc.label()}(s) {
 let r0 = s.r0, step = s.pc;
@@ -126748,7 +126782,6 @@ switch (step) {
             if (proc.isRoot)
                 writeRaw(`${proc.label()}.continuations = [ ${asyncContinuations.join(",")} ]`);
             writeRaw(fnctor(proc.label() + "_mk", proc.label(), maxStack, Object.keys(localsCache)));
-            writeRaw(hexlits);
             proc.cachedJS = resText;
             return resText;
             // pre-create stack frame for this procedure with all the fields we need, so the
@@ -126869,7 +126902,9 @@ function ${id}(s) {
                             return e.ptrlabel().lblId + "";
                         }
                         else if (e.hexlit() != null) {
-                            hexlits += `const ${e.data} = pxsim.BufferMethods.createBufferFromHex("${e.hexlit()}")\n`;
+                            const lit = `const ${e.data} = pxsim.BufferMethods.createBufferFromHex("${e.hexlit()}")\n`;
+                            proc.cachedJSHexLiterals[e.data] = lit;
+                            bin.hexlits[e.data] = lit;
                             return e.data;
                         }
                         else if (typeof e.jsInfo == "string") {
@@ -132765,6 +132800,7 @@ var ts;
                     this.lblNo = 0;
                     this.action = null;
                     this.cachedJS = null;
+                    this.cachedJSHexLiterals = {};
                     this.usingCtx = null;
                 }
                 reset() {

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

@@ -13,9 +13,11 @@ export declare type TilesetDropdownOption = [ImageJSON, string, pxt.Tile];
 export declare class FieldTileset extends FieldImages implements FieldCustom {
     protected selectedOption_: TilesetDropdownOption;
     protected static referencedTiles: TilesetDropdownOption[];
+    protected static cachedPalette: string;
     protected static cachedRevision: number;
-    protected static cachedWorkspaceId: string;
+    protected static bitmapCache: Map<string, string>;
     protected static getReferencedTiles(workspace: Blockly.Workspace): TilesetDropdownOption[];
+    static getTileImage(t: pxt.Tile): string;
     isFieldCustom_: boolean;
     protected selected: pxt.Tile;
     protected blocksInfo: pxtc.BlocksInfo;

package/built/pxtcompiler.d.ts

@@ -510,6 +510,7 @@ declare namespace ts.pxtc.ir {
         action: ts.FunctionLikeDeclaration;
         inlineBody: ir.Expr;
         cachedJS: string;
+        cachedJSHexLiterals: pxt.Map<string>;
         usingCtx: PxtNode;
         reset(): void;
         isGetter(): boolean;

package/built/pxtcompiler.js

@@ -2310,15 +2310,15 @@ var ts;
             "leaveAccessor"
         ];
         function jsEmit(bin, cres) {
-            let jssource = "(function (ectx) {\n'use strict';\n";
+            let jsheader = "(function (ectx) {\n'use strict';\n";
             for (let n of evalIfaceFields) {
-                jssource += `const ${n} = ectx.${n};\n`;
+                jsheader += `const ${n} = ectx.${n};\n`;
             }
-            jssource += `const __this = runtime;\n`;
-            jssource += `const pxtrt = pxsim.pxtrt;\n`;
-            jssource += `let yieldSteps = 1;\n`;
-            jssource += `ectx.setupYield(function() { yieldSteps = 100; })\n`;
-            jssource += "pxsim.setTitle(" + JSON.stringify(bin.getTitle()) + ");\n";
+            jsheader += `const __this = runtime;\n`;
+            jsheader += `const pxtrt = pxsim.pxtrt;\n`;
+            jsheader += `let yieldSteps = 1;\n`;
+            jsheader += `ectx.setupYield(function() { yieldSteps = 100; })\n`;
+            let jssource = "pxsim.setTitle(" + JSON.stringify(bin.getTitle()) + ");\n";
             let cfg = {};
             let cfgKey = {};
             for (let ce of cres.configData || []) {
@@ -2340,6 +2340,9 @@ var ts;
                 if (p.cachedJS) {
                     curr = p.cachedJS;
                     cachedLen += curr.length;
+                    for (const hexlit of Object.keys(p.cachedJSHexLiterals)) {
+                        bin.hexlits[hexlit] = p.cachedJSHexLiterals[hexlit];
+                    }
                 }
                 else {
                     curr = irToJS(bin, p);
@@ -2354,6 +2357,10 @@ var ts;
             if (cres.breakpoints)
                 jssource += `\nconst breakpoints = setupDebugger(${cres.breakpoints.length}, [${bin.globals.filter(c => c.isUserVariable).map(c => `"${c.uniqueName()}"`).join(",")}])\n`;
             jssource += `\nreturn ${bin.procs[0] ? bin.procs[0].label() : "null"}\n})\n`;
+            for (const hexlit of Object.keys(bin.hexlits)) {
+                jsheader += bin.hexlits[hexlit];
+            }
+            jssource = jsheader + jssource;
             const total = jssource.length;
             const perc = (n) => ((100 * n) / total).toFixed(2) + "%";
             const sizes = `// total=${jssource.length} new=${perc(newLen)} cached=${perc(cachedLen)} other=${perc(total - newLen - cachedLen)}\n`;
@@ -2370,7 +2377,6 @@ var ts;
             let exprStack = [];
             let maxStack = 0;
             let localsCache = {};
-            let hexlits = "";
             writeRaw(`
 function ${proc.label()}(s) {
 let r0 = s.r0, step = s.pc;
@@ -2460,7 +2466,6 @@ switch (step) {
             if (proc.isRoot)
                 writeRaw(`${proc.label()}.continuations = [ ${asyncContinuations.join(",")} ]`);
             writeRaw(fnctor(proc.label() + "_mk", proc.label(), maxStack, Object.keys(localsCache)));
-            writeRaw(hexlits);
             proc.cachedJS = resText;
             return resText;
             // pre-create stack frame for this procedure with all the fields we need, so the
@@ -2581,7 +2586,9 @@ function ${id}(s) {
                             return e.ptrlabel().lblId + "";
                         }
                         else if (e.hexlit() != null) {
-                            hexlits += `const ${e.data} = pxsim.BufferMethods.createBufferFromHex("${e.hexlit()}")\n`;
+                            const lit = `const ${e.data} = pxsim.BufferMethods.createBufferFromHex("${e.hexlit()}")\n`;
+                            proc.cachedJSHexLiterals[e.data] = lit;
+                            bin.hexlits[e.data] = lit;
                             return e.data;
                         }
                         else if (typeof e.jsInfo == "string") {
@@ -8477,6 +8484,7 @@ var ts;
                     this.lblNo = 0;
                     this.action = null;
                     this.cachedJS = null;
+                    this.cachedJSHexLiterals = {};
                     this.usingCtx = null;
                 }
                 reset() {

package/built/pxtlib.d.ts

@@ -3028,6 +3028,7 @@ declare namespace pxt {
     }
     export class TilemapProject {
         needsRebuild: boolean;
+        protected static nextRevision: number;
         protected extensionTileSets: TileSetCollection[];
         protected state: AssetSnapshot;
         protected committedState: AssetSnapshot;

package/built/pxtlib.js

@@ -1032,13 +1032,13 @@ var pxtc = ts.pxtc;
             function htmlEscape(_input) {
                 if (!_input)
                     return _input; // null, undefined, empty string test
-                return _input.replace(/([^\w .!?\-$])/g, c => "&#" + c.charCodeAt(0) + ";");
+                return _input.replace(/([^\w .!?\-$])/ug, c => "&#" + c.codePointAt(0) + ";");
             }
             Util.htmlEscape = htmlEscape;
             function htmlUnescape(_input) {
                 if (!_input)
                     return _input; // null, undefined, empty string test
-                return _input.replace(/(&#\d+;)/g, c => String.fromCharCode(Number(c.substr(2, c.length - 3))));
+                return _input.replace(/(&#\d+;)/g, c => String.fromCodePoint(Number(c.substr(2, c.length - 3))));
             }
             Util.htmlUnescape = htmlUnescape;
             function jsStringQuote(s) {
@@ -4383,8 +4383,19 @@ var pxt;
         }
         blocks.hasHandler = hasHandler;
         function getHelpUrl(fn) {
-            if (fn.attributes.help) {
-                const helpUrl = fn.attributes.help.replace(/^\//, '');
+            var _a, _b, _c;
+            let helpAttr = fn.attributes.help;
+            if ((_a = fn.attributes.blockId) === null || _a === void 0 ? void 0 : _a.endsWith(`_blockCombine_get`)) {
+                helpAttr = fn.attributes.blockCombineGetHelp || helpAttr;
+            }
+            else if ((_b = fn.attributes.blockId) === null || _b === void 0 ? void 0 : _b.endsWith(`_blockCombine_set`)) {
+                helpAttr = fn.attributes.blockCombineSetHelp || helpAttr;
+            }
+            else if ((_c = fn.attributes.blockId) === null || _c === void 0 ? void 0 : _c.endsWith(`_blockCombine_change`)) {
+                helpAttr = fn.attributes.blockCombineChangeHelp || helpAttr;
+            }
+            if (helpAttr) {
+                const helpUrl = helpAttr.replace(/^\//, '');
                 if (/^github:/.test(helpUrl)) {
                     return helpUrl;
                 }
@@ -17872,6 +17883,22 @@ var ts;
                     }
                     blocks.push(ex);
                 }
+                function copyOverHelp(param) {
+                    if (s.attributes[param]) {
+                        if (ex.attributes[param]) {
+                            if (ex.attributes[param] !== s.attributes[param]) {
+                                console.warn(`Ignoring duplicate ${param} for get/set/change block: ${s.attributes[param]}`);
+                            }
+                        }
+                        else {
+                            ex.attributes[param] = s.attributes[param];
+                        }
+                    }
+                }
+                copyOverHelp("blockCombineChangeHelp");
+                copyOverHelp("blockCombineGetHelp");
+                copyOverHelp("blockCombineSetHelp");
+                copyOverHelp("help");
                 ex.combinedProperties.push(s.qName);
             }
             for (let s of pxtc.Util.values(info.byQName)) {
@@ -20345,7 +20372,7 @@ var pxt;
             this.nextID = 0;
             this.nextInternalID = 0;
             this.committedState = {
-                revision: 0,
+                revision: TilemapProject.nextRevision++,
                 assets: {
                     ["image" /* AssetType.Image */]: new AssetCollection("image" /* AssetType.Image */),
                     ["tile" /* AssetType.Tile */]: new AssetCollection("tile" /* AssetType.Tile */),
@@ -20356,7 +20383,7 @@ var pxt;
                 }
             };
             this.state = {
-                revision: this.nextID++,
+                revision: TilemapProject.nextRevision++,
                 assets: {
                     ["image" /* AssetType.Image */]: new AssetCollection("image" /* AssetType.Image */),
                     ["tile" /* AssetType.Tile */]: new AssetCollection("tile" /* AssetType.Tile */),
@@ -20854,7 +20881,7 @@ var pxt;
             return this.getAssetCollection(type).getSnapshot();
         }
         getGalleryAssets(type) {
-            return this.getAssetCollection(type).getSnapshot();
+            return this.getAssetCollection(type, true).getSnapshot();
         }
         lookupBlockAsset(type, blockID) {
             let filter = (a) => { var _a, _b; return ((_b = (_a = a.meta) === null || _a === void 0 ? void 0 : _a.blockIDs) === null || _b === void 0 ? void 0 : _b.indexOf(blockID)) !== -1; };
@@ -21207,7 +21234,7 @@ var pxt;
         }
         onChange() {
             this.needsRebuild = true;
-            this.state.revision = this.nextID++;
+            this.state.revision = TilemapProject.nextRevision++;
         }
         readImages(allJRes, isProjectFile = false) {
             const assets = [];
@@ -21259,6 +21286,7 @@ var pxt;
             }
         }
     }
+    TilemapProject.nextRevision = 0;
     pxt.TilemapProject = TilemapProject;
     function getTilemaps(allJRes) {
         const res = [];