pxt-core 11.3.54 → 11.3.55

package/built/pxt.js

@@ -117607,6 +117607,11 @@ var pxt;
             if (this.takenNames[id]) {
                 const existing = this.lookupByID(id);
                 if (!assetEquals(existing, newValue)) {
+                    if (!validateAsset(newValue) && validateAsset(existing)) {
+                        pxt.warn("Refusing to overwrite asset with invalid version");
+                        pxt.tickEvent("assets.invalidAssetOverwrite", { assetType: newValue.type });
+                        return existing;
+                    }
                     this.removeByID(id);
                     asset = this.add(newValue);
                     this.notifyListener(newValue.internalID);
@@ -118870,6 +118875,9 @@ var pxt;
     }
     function cloneAsset(asset) {
         asset.meta = Object.assign({}, asset.meta);
+        if (asset.meta.temporaryInfo) {
+            asset.meta.temporaryInfo = Object.assign({}, asset.meta.temporaryInfo);
+        }
         switch (asset.type) {
             case "tile" /* AssetType.Tile */:
             case "image" /* AssetType.Image */:
@@ -119070,6 +119078,62 @@ var pxt;
         return getShortIDCore(asset.type, asset.id);
     }
     pxt.getShortIDForAsset = getShortIDForAsset;
+    function validateAsset(asset) {
+        if (!asset)
+            return false;
+        switch (asset.type) {
+            case "image" /* AssetType.Image */:
+            case "tile" /* AssetType.Tile */:
+                return validateImageAsset(asset);
+            case "tilemap" /* AssetType.Tilemap */:
+                return validateTilemap(asset);
+            case "animation" /* AssetType.Animation */:
+                return validateAnimation(asset);
+            case "song" /* AssetType.Song */:
+                return validateSong(asset);
+        }
+    }
+    pxt.validateAsset = validateAsset;
+    function validateImageAsset(asset) {
+        if (!asset.bitmap)
+            return false;
+        return validateBitmap(pxt.sprite.Bitmap.fromData(asset.bitmap));
+    }
+    function validateTilemap(tilemap) {
+        var _a;
+        if (!tilemap.data ||
+            !tilemap.data.tilemap ||
+            !tilemap.data.tileset ||
+            !tilemap.data.tileset.tileWidth ||
+            !((_a = tilemap.data.tileset.tiles) === null || _a === void 0 ? void 0 : _a.length) ||
+            !tilemap.data.layers) {
+            return false;
+        }
+        return validateBitmap(pxt.sprite.Bitmap.fromData(tilemap.data.layers)) &&
+            validateBitmap(tilemap.data.tilemap);
+    }
+    function validateAnimation(animation) {
+        var _a;
+        if (!((_a = animation.frames) === null || _a === void 0 ? void 0 : _a.length) || animation.interval <= 0) {
+            return false;
+        }
+        return !animation.frames.some(frame => !validateBitmap(pxt.sprite.Bitmap.fromData(frame)));
+    }
+    function validateBitmap(bitmap) {
+        return bitmap.width > 0 &&
+            bitmap.height > 0 &&
+            !Number.isNaN(bitmap.x0) &&
+            !Number.isNaN(bitmap.y0) &&
+            bitmap.data().data.length === bitmap.dataLength();
+    }
+    function validateSong(song) {
+        return song.song &&
+            song.song.ticksPerBeat > 0 &&
+            song.song.beatsPerMeasure > 0 &&
+            song.song.measures > 0 &&
+            song.song.beatsPerMinute > 0 &&
+            !!song.song.tracks;
+    }
     function getShortIDCore(assetType, id, allowNoPrefix = false) {
         let prefix;
         switch (assetType) {
@@ -119170,10 +119234,6 @@ var pxt;
             }
         };
     }
-    function set16Bit(buf, offset, value) {
-        buf[offset] = value & 0xff;
-        buf[offset + 1] = (value >> 8) & 0xff;
-    }
     function read16Bit(buf, offset) {
         return buf[offset] | (buf[offset + 1] << 8);
     }
@@ -119186,6 +119246,21 @@ var pxt;
             case "song" /* AssetType.Song */: return snapshot.songs;
         }
     }
+    function patchTemporaryAsset(oldValue, newValue, project) {
+        if (!oldValue || assetEquals(oldValue, newValue))
+            return newValue;
+        newValue = cloneAsset(newValue);
+        const wasTemporary = !oldValue.meta.displayName;
+        const isTemporary = !newValue.meta.displayName;
+        // if we went from being temporary to no longer being temporary,
+        // make sure we replace the junk id with a new value
+        if (wasTemporary && !isTemporary) {
+            newValue.id = project.generateNewID(newValue.type);
+            newValue.internalID = project.getNewInternalId();
+        }
+        return newValue;
+    }
+    pxt.patchTemporaryAsset = patchTemporaryAsset;
 })(pxt || (pxt = {}));
 var pxt;
 (function (pxt) {

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

@@ -52,6 +52,7 @@ export declare abstract class FieldAssetEditor<U extends FieldAssetEditorOptions
     protected updateAssetListener(): void;
     protected assetChangeListener: () => void;
     protected isFullscreen(): boolean;
+    protected temporaryAssetId(): string;
 }
 export declare class BlocklyTilemapChange extends Blockly.Events.BlockChange {
     protected oldRevision: number;

package/built/pxtlib.d.ts

@@ -1834,7 +1834,7 @@ declare namespace pxt.sprite {
         protected coordToIndex(col: number, row: number): number;
         protected getCore(index: number): number;
         protected setCore(index: number, value: number): void;
-        protected dataLength(): number;
+        dataLength(): number;
     }
     class Tilemap extends Bitmap {
         static fromData(data: BitmapData): Tilemap;
@@ -1842,7 +1842,7 @@ declare namespace pxt.sprite {
         resize(width: number, height: number): Tilemap;
         protected getCore(index: number): number;
         protected setCore(index: number, value: number): void;
-        protected dataLength(): number;
+        dataLength(): number;
     }
     class TilemapData {
         tilemap: Tilemap;
@@ -3143,6 +3143,8 @@ declare namespace pxt {
     export function lookupProjectAssetByTSReference(ts: string, project: TilemapProject): Tile | ProjectImage | Animation | ProjectTilemap | Song;
     export function getDefaultAssetDisplayName(type: pxt.AssetType): string;
     export function getShortIDForAsset(asset: pxt.Asset): string;
+    export function validateAsset(asset: pxt.Asset): boolean;
+    export function patchTemporaryAsset(oldValue: pxt.Asset, newValue: pxt.Asset, project: TilemapProject): Asset;
     export {};
 }
 declare namespace pxt.toolbox {

package/built/pxtlib.js

@@ -19921,6 +19921,11 @@ var pxt;
             if (this.takenNames[id]) {
                 const existing = this.lookupByID(id);
                 if (!assetEquals(existing, newValue)) {
+                    if (!validateAsset(newValue) && validateAsset(existing)) {
+                        pxt.warn("Refusing to overwrite asset with invalid version");
+                        pxt.tickEvent("assets.invalidAssetOverwrite", { assetType: newValue.type });
+                        return existing;
+                    }
                     this.removeByID(id);
                     asset = this.add(newValue);
                     this.notifyListener(newValue.internalID);
@@ -21184,6 +21189,9 @@ var pxt;
     }
     function cloneAsset(asset) {
         asset.meta = Object.assign({}, asset.meta);
+        if (asset.meta.temporaryInfo) {
+            asset.meta.temporaryInfo = Object.assign({}, asset.meta.temporaryInfo);
+        }
         switch (asset.type) {
             case "tile" /* AssetType.Tile */:
             case "image" /* AssetType.Image */:
@@ -21384,6 +21392,62 @@ var pxt;
         return getShortIDCore(asset.type, asset.id);
     }
     pxt.getShortIDForAsset = getShortIDForAsset;
+    function validateAsset(asset) {
+        if (!asset)
+            return false;
+        switch (asset.type) {
+            case "image" /* AssetType.Image */:
+            case "tile" /* AssetType.Tile */:
+                return validateImageAsset(asset);
+            case "tilemap" /* AssetType.Tilemap */:
+                return validateTilemap(asset);
+            case "animation" /* AssetType.Animation */:
+                return validateAnimation(asset);
+            case "song" /* AssetType.Song */:
+                return validateSong(asset);
+        }
+    }
+    pxt.validateAsset = validateAsset;
+    function validateImageAsset(asset) {
+        if (!asset.bitmap)
+            return false;
+        return validateBitmap(pxt.sprite.Bitmap.fromData(asset.bitmap));
+    }
+    function validateTilemap(tilemap) {
+        var _a;
+        if (!tilemap.data ||
+            !tilemap.data.tilemap ||
+            !tilemap.data.tileset ||
+            !tilemap.data.tileset.tileWidth ||
+            !((_a = tilemap.data.tileset.tiles) === null || _a === void 0 ? void 0 : _a.length) ||
+            !tilemap.data.layers) {
+            return false;
+        }
+        return validateBitmap(pxt.sprite.Bitmap.fromData(tilemap.data.layers)) &&
+            validateBitmap(tilemap.data.tilemap);
+    }
+    function validateAnimation(animation) {
+        var _a;
+        if (!((_a = animation.frames) === null || _a === void 0 ? void 0 : _a.length) || animation.interval <= 0) {
+            return false;
+        }
+        return !animation.frames.some(frame => !validateBitmap(pxt.sprite.Bitmap.fromData(frame)));
+    }
+    function validateBitmap(bitmap) {
+        return bitmap.width > 0 &&
+            bitmap.height > 0 &&
+            !Number.isNaN(bitmap.x0) &&
+            !Number.isNaN(bitmap.y0) &&
+            bitmap.data().data.length === bitmap.dataLength();
+    }
+    function validateSong(song) {
+        return song.song &&
+            song.song.ticksPerBeat > 0 &&
+            song.song.beatsPerMeasure > 0 &&
+            song.song.measures > 0 &&
+            song.song.beatsPerMinute > 0 &&
+            !!song.song.tracks;
+    }
     function getShortIDCore(assetType, id, allowNoPrefix = false) {
         let prefix;
         switch (assetType) {
@@ -21484,10 +21548,6 @@ var pxt;
             }
         };
     }
-    function set16Bit(buf, offset, value) {
-        buf[offset] = value & 0xff;
-        buf[offset + 1] = (value >> 8) & 0xff;
-    }
     function read16Bit(buf, offset) {
         return buf[offset] | (buf[offset + 1] << 8);
     }
@@ -21500,6 +21560,21 @@ var pxt;
             case "song" /* AssetType.Song */: return snapshot.songs;
         }
     }
+    function patchTemporaryAsset(oldValue, newValue, project) {
+        if (!oldValue || assetEquals(oldValue, newValue))
+            return newValue;
+        newValue = cloneAsset(newValue);
+        const wasTemporary = !oldValue.meta.displayName;
+        const isTemporary = !newValue.meta.displayName;
+        // if we went from being temporary to no longer being temporary,
+        // make sure we replace the junk id with a new value
+        if (wasTemporary && !isTemporary) {
+            newValue.id = project.generateNewID(newValue.type);
+            newValue.internalID = project.getNewInternalId();
+        }
+        return newValue;
+    }
+    pxt.patchTemporaryAsset = patchTemporaryAsset;
 })(pxt || (pxt = {}));
 var pxt;
 (function (pxt) {