pxt-core 8.5.3 → 8.5.4

package/built/pxt.js

@@ -113654,7 +113654,7 @@ var pxt;
                 v = { data: v };
             }
             let ns = v.namespace || base.namespace || "";
-            if (ns)
+            if (ns && !ns.endsWith("."))
                 ns += ".";
             let id = v.id || ns + k;
             let icon = v.icon;
@@ -117245,28 +117245,36 @@ var pxt;
             this.undoStack = [];
             this.redoStack = [];
         }
-        loadTilemapJRes(jres, skipDuplicates = false) {
+        loadTilemapJRes(jres, skipDuplicates = false, gallery = false) {
             jres = pxt.inflateJRes(jres);
-            const tiles = this.readImages(jres, true).filter(im => im.type === "tile" /* pxt.AssetType.Tile */);
+            const tiles = this.readImages(jres, !gallery).filter(im => im.type === "tile" /* pxt.AssetType.Tile */);
             // If we are loading JRES into an existing project (i.e. in multipart tutorials)
             // we need to correct the tile ids because the user may have created new tiles
             // and taken some of the ids that were used by the tutorial author
             let tileMapping = {};
-            for (const tile of tiles) {
-                if (skipDuplicates) {
-                    const existing = this.resolveTileByBitmap(tile.bitmap);
-                    if (existing) {
-                        tileMapping[tile.id] = existing.id;
-                        continue;
-                    }
+            if (gallery) {
+                for (const tile of tiles) {
+                    this.gallery.tiles.add(tile);
                 }
-                const newTile = this.createNewTile(tile.bitmap, tile.id, tile.meta.displayName);
-                if (newTile.id !== tile.id) {
-                    tileMapping[tile.id] = newTile.id;
+            }
+            else {
+                for (const tile of tiles) {
+                    if (skipDuplicates) {
+                        const existing = this.resolveTileByBitmap(tile.bitmap);
+                        if (existing) {
+                            tileMapping[tile.id] = existing.id;
+                            continue;
+                        }
+                    }
+                    const newTile = this.createNewTile(tile.bitmap, tile.id, tile.meta.displayName);
+                    if (newTile.id !== tile.id) {
+                        tileMapping[tile.id] = newTile.id;
+                    }
                 }
             }
+            const state = gallery ? this.gallery : this.state;
             for (const tm of getTilemaps(jres)) {
-                this.state.tilemaps.add({
+                state.tilemaps.add({
                     internalID: this.getNewInternalId(),
                     type: "tilemap" /* AssetType.Tilemap */,
                     id: tm.id,
@@ -117283,16 +117291,17 @@ var pxt;
                 });
             }
         }
-        loadAssetsJRes(jres) {
+        loadAssetsJRes(jres, gallery = false) {
             jres = pxt.inflateJRes(jres);
             const toInflate = [];
+            const state = gallery ? this.gallery : this.state;
             for (const key of Object.keys(jres)) {
                 const entry = jres[key];
                 if (entry.tilemapTile) {
-                    this.state.tiles.add(this.generateImage(entry, "tile" /* AssetType.Tile */));
+                    state.tiles.add(this.generateImage(entry, "tile" /* AssetType.Tile */));
                 }
                 else if (entry.mimeType === pxt.IMAGE_MIME_TYPE) {
-                    this.state.images.add(this.generateImage(entry, "image" /* AssetType.Image */));
+                    state.images.add(this.generateImage(entry, "image" /* AssetType.Image */));
                 }
                 else if (entry.mimeType === pxt.ANIMATION_MIME_TYPE) {
                     const [animation, needsInflation] = this.generateAnimation(entry);
@@ -117300,15 +117309,15 @@ var pxt;
                         toInflate.push(animation);
                     }
                     else {
-                        this.state.animations.add(animation);
+                        state.animations.add(animation);
                     }
                 }
                 else if (entry.mimeType === pxt.SONG_MIME_TYPE) {
-                    this.state.songs.add(this.generateSong(entry));
+                    state.songs.add(this.generateSong(entry));
                 }
             }
             for (const animation of toInflate) {
-                this.state.animations.add(this.inflateAnimation(animation, this.state.images.getSnapshot()));
+                state.animations.add(this.inflateAnimation(animation, state.images.getSnapshot()));
             }
         }
         removeInactiveBlockAssets(activeBlockIDs) {
@@ -117488,8 +117497,12 @@ var pxt;
             const entry = jres[key];
             if (entry.tilemapTile) {
                 // FIXME: we should get the "image.ofBuffer" and blockIdentity from pxtarget probably
+                let varName = key;
+                if (varName.indexOf(".") !== -1) {
+                    varName = varName.split(".").slice(-1)[0];
+                }
                 out += `${indent}//% fixedInstance jres blockIdentity=images._tile\n`;
-                out += `${indent}export const ${key} = image.ofBuffer(hex\`\`);\n`;
+                out += `${indent}export const ${varName} = image.ofBuffer(hex\`\`);\n`;
                 tileEntries.push({ keys: [entry.displayName, getShortIDCore("tile" /* AssetType.Tile */, key, true)], expression: key });
             }
             if (entry.mimeType === pxt.TILEMAP_MIME_TYPE) {

package/built/pxtlib.d.ts

@@ -2910,8 +2910,8 @@ declare namespace pxt {
         addChangeListener(asset: Asset, listener: () => void): void;
         removeChangeListener(type: AssetType, listener: () => void): void;
         loadPackage(pack: MainPackage): void;
-        loadTilemapJRes(jres: Map<JRes>, skipDuplicates?: boolean): void;
-        loadAssetsJRes(jres: Map<JRes>): void;
+        loadTilemapJRes(jres: Map<JRes>, skipDuplicates?: boolean, gallery?: boolean): void;
+        loadAssetsJRes(jres: Map<JRes>, gallery?: boolean): void;
         removeInactiveBlockAssets(activeBlockIDs: string[]): void;
         protected generateImage(entry: JRes, type: AssetType.Image): ProjectImage;
         protected generateImage(entry: JRes, type: AssetType.Tile): Tile;

package/built/pxtlib.js

@@ -15968,7 +15968,7 @@ var pxt;
                 v = { data: v };
             }
             let ns = v.namespace || base.namespace || "";
-            if (ns)
+            if (ns && !ns.endsWith("."))
                 ns += ".";
             let id = v.id || ns + k;
             let icon = v.icon;
@@ -19559,28 +19559,36 @@ var pxt;
             this.undoStack = [];
             this.redoStack = [];
         }
-        loadTilemapJRes(jres, skipDuplicates = false) {
+        loadTilemapJRes(jres, skipDuplicates = false, gallery = false) {
             jres = pxt.inflateJRes(jres);
-            const tiles = this.readImages(jres, true).filter(im => im.type === "tile" /* pxt.AssetType.Tile */);
+            const tiles = this.readImages(jres, !gallery).filter(im => im.type === "tile" /* pxt.AssetType.Tile */);
             // If we are loading JRES into an existing project (i.e. in multipart tutorials)
             // we need to correct the tile ids because the user may have created new tiles
             // and taken some of the ids that were used by the tutorial author
             let tileMapping = {};
-            for (const tile of tiles) {
-                if (skipDuplicates) {
-                    const existing = this.resolveTileByBitmap(tile.bitmap);
-                    if (existing) {
-                        tileMapping[tile.id] = existing.id;
-                        continue;
-                    }
+            if (gallery) {
+                for (const tile of tiles) {
+                    this.gallery.tiles.add(tile);
                 }
-                const newTile = this.createNewTile(tile.bitmap, tile.id, tile.meta.displayName);
-                if (newTile.id !== tile.id) {
-                    tileMapping[tile.id] = newTile.id;
+            }
+            else {
+                for (const tile of tiles) {
+                    if (skipDuplicates) {
+                        const existing = this.resolveTileByBitmap(tile.bitmap);
+                        if (existing) {
+                            tileMapping[tile.id] = existing.id;
+                            continue;
+                        }
+                    }
+                    const newTile = this.createNewTile(tile.bitmap, tile.id, tile.meta.displayName);
+                    if (newTile.id !== tile.id) {
+                        tileMapping[tile.id] = newTile.id;
+                    }
                 }
             }
+            const state = gallery ? this.gallery : this.state;
             for (const tm of getTilemaps(jres)) {
-                this.state.tilemaps.add({
+                state.tilemaps.add({
                     internalID: this.getNewInternalId(),
                     type: "tilemap" /* AssetType.Tilemap */,
                     id: tm.id,
@@ -19597,16 +19605,17 @@ var pxt;
                 });
             }
         }
-        loadAssetsJRes(jres) {
+        loadAssetsJRes(jres, gallery = false) {
             jres = pxt.inflateJRes(jres);
             const toInflate = [];
+            const state = gallery ? this.gallery : this.state;
             for (const key of Object.keys(jres)) {
                 const entry = jres[key];
                 if (entry.tilemapTile) {
-                    this.state.tiles.add(this.generateImage(entry, "tile" /* AssetType.Tile */));
+                    state.tiles.add(this.generateImage(entry, "tile" /* AssetType.Tile */));
                 }
                 else if (entry.mimeType === pxt.IMAGE_MIME_TYPE) {
-                    this.state.images.add(this.generateImage(entry, "image" /* AssetType.Image */));
+                    state.images.add(this.generateImage(entry, "image" /* AssetType.Image */));
                 }
                 else if (entry.mimeType === pxt.ANIMATION_MIME_TYPE) {
                     const [animation, needsInflation] = this.generateAnimation(entry);
@@ -19614,15 +19623,15 @@ var pxt;
                         toInflate.push(animation);
                     }
                     else {
-                        this.state.animations.add(animation);
+                        state.animations.add(animation);
                     }
                 }
                 else if (entry.mimeType === pxt.SONG_MIME_TYPE) {
-                    this.state.songs.add(this.generateSong(entry));
+                    state.songs.add(this.generateSong(entry));
                 }
             }
             for (const animation of toInflate) {
-                this.state.animations.add(this.inflateAnimation(animation, this.state.images.getSnapshot()));
+                state.animations.add(this.inflateAnimation(animation, state.images.getSnapshot()));
             }
         }
         removeInactiveBlockAssets(activeBlockIDs) {
@@ -19802,8 +19811,12 @@ var pxt;
             const entry = jres[key];
             if (entry.tilemapTile) {
                 // FIXME: we should get the "image.ofBuffer" and blockIdentity from pxtarget probably
+                let varName = key;
+                if (varName.indexOf(".") !== -1) {
+                    varName = varName.split(".").slice(-1)[0];
+                }
                 out += `${indent}//% fixedInstance jres blockIdentity=images._tile\n`;
-                out += `${indent}export const ${key} = image.ofBuffer(hex\`\`);\n`;
+                out += `${indent}export const ${varName} = image.ofBuffer(hex\`\`);\n`;
                 tileEntries.push({ keys: [entry.displayName, getShortIDCore("tile" /* AssetType.Tile */, key, true)], expression: key });
             }
             if (entry.mimeType === pxt.TILEMAP_MIME_TYPE) {