pxt-core 11.3.58 → 11.3.61

package/built/pxt.js

@@ -111061,23 +111061,14 @@ var pxt;
                 this.layers = layers;
                 this.nextId = 0;
             }
-            cloneData(includeEditorData = false) {
-                var _a, _c, _d, _e;
+            cloneData() {
                 const tm = this.tilemap.copy();
                 const tileset = {
                     tileWidth: this.tileset.tileWidth,
                     tiles: this.tileset.tiles.map(t => (Object.assign(Object.assign({}, t), { bitmap: Bitmap.fromData(t.bitmap).copy().data() })))
                 };
                 const layers = Bitmap.fromData(this.layers).copy().data();
-                const result = new TilemapData(tm, tileset, layers);
-                if (includeEditorData) {
-                    result.nextId = this.nextId;
-                    result.projectReferences = (_a = this.projectReferences) === null || _a === void 0 ? void 0 : _a.slice();
-                    result.tileOrder = (_c = this.tileOrder) === null || _c === void 0 ? void 0 : _c.slice();
-                    result.editedTiles = (_d = this.editedTiles) === null || _d === void 0 ? void 0 : _d.slice();
-                    result.deletedTiles = (_e = this.deletedTiles) === null || _e === void 0 ? void 0 : _e.slice();
-                }
-                return result;
+                return new TilemapData(tm, tileset, layers);
             }
             equals(other) {
                 return this.tilemap.equals(other.tilemap) &&
@@ -117607,20 +117598,15 @@ var pxt;
         }
         getSnapshot(filter) {
             if (filter) {
-                return this.assets.filter(a => filter(a)).map(a => cloneAsset(a));
+                return this.assets.filter(a => filter(a)).map(cloneAsset);
             }
-            return this.assets.map(a => cloneAsset(a));
+            return this.assets.map(cloneAsset);
         }
         update(id, newValue) {
             let asset;
             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);
@@ -118882,11 +118868,8 @@ var pxt;
         const layers = new pxt.sprite.Bitmap(tmWidth, tmHeight, 0, 0, new Uint8ClampedArray(bitmapData)).data();
         return new pxt.sprite.TilemapData(tilemap, tileset, layers);
     }
-    function cloneAsset(asset, includeEditorData = false) {
+    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 */:
@@ -118894,7 +118877,7 @@ var pxt;
             case "animation" /* AssetType.Animation */:
                 return Object.assign(Object.assign({}, asset), { frames: asset.frames.map(frame => cloneBitmap(frame)) });
             case "tilemap" /* AssetType.Tilemap */:
-                return Object.assign(Object.assign({}, asset), { data: asset.data.cloneData(includeEditorData) });
+                return Object.assign(Object.assign({}, asset), { data: asset.data.cloneData() });
             case "song" /* AssetType.Song */:
                 return Object.assign(Object.assign({}, asset), { song: pxt.assets.music.cloneSong(asset.song) });
         }
@@ -119087,62 +119070,6 @@ 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) {
@@ -119243,6 +119170,10 @@ 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);
     }
@@ -119255,21 +119186,6 @@ var pxt;
             case "song" /* AssetType.Song */: return snapshot.songs;
         }
     }
-    function patchTemporaryAsset(oldValue, newValue, project) {
-        if (!oldValue || assetEquals(oldValue, newValue))
-            return newValue;
-        newValue = cloneAsset(newValue, true);
-        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,7 +52,6 @@ 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;
-        dataLength(): number;
+        protected 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;
-        dataLength(): number;
+        protected dataLength(): number;
     }
     class TilemapData {
         tilemap: Tilemap;
@@ -1854,7 +1854,7 @@ declare namespace pxt.sprite {
         editedTiles: string[];
         deletedTiles: string[];
         constructor(tilemap: Tilemap, tileset: TileSet, layers: BitmapData);
-        cloneData(includeEditorData?: boolean): TilemapData;
+        cloneData(): TilemapData;
         equals(other: TilemapData): boolean;
     }
     class Bitmask {
@@ -3132,7 +3132,7 @@ declare namespace pxt {
     export function emitGalleryDeclarations(jres: pxt.Map<JRes>, namespaceName: string): [pxt.Map<JRes>, string];
     export function emitTilemapsFromJRes(jres: pxt.Map<JRes>): string;
     export function emitProjectImages(jres: pxt.Map<JRes | string>): string;
-    export function cloneAsset<U extends Asset>(asset: U, includeEditorData?: boolean): U;
+    export function cloneAsset<U extends Asset>(asset: U): U;
     export function assetEquals(a: Asset, b: Asset, valueOnly?: boolean): boolean;
     export function validateAssetName(name: string): boolean;
     export function getTSReferenceForAsset(asset: pxt.Asset, isPython?: boolean): string;
@@ -3143,8 +3143,6 @@ 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

@@ -13375,23 +13375,14 @@ var pxt;
                 this.layers = layers;
                 this.nextId = 0;
             }
-            cloneData(includeEditorData = false) {
-                var _a, _c, _d, _e;
+            cloneData() {
                 const tm = this.tilemap.copy();
                 const tileset = {
                     tileWidth: this.tileset.tileWidth,
                     tiles: this.tileset.tiles.map(t => (Object.assign(Object.assign({}, t), { bitmap: Bitmap.fromData(t.bitmap).copy().data() })))
                 };
                 const layers = Bitmap.fromData(this.layers).copy().data();
-                const result = new TilemapData(tm, tileset, layers);
-                if (includeEditorData) {
-                    result.nextId = this.nextId;
-                    result.projectReferences = (_a = this.projectReferences) === null || _a === void 0 ? void 0 : _a.slice();
-                    result.tileOrder = (_c = this.tileOrder) === null || _c === void 0 ? void 0 : _c.slice();
-                    result.editedTiles = (_d = this.editedTiles) === null || _d === void 0 ? void 0 : _d.slice();
-                    result.deletedTiles = (_e = this.deletedTiles) === null || _e === void 0 ? void 0 : _e.slice();
-                }
-                return result;
+                return new TilemapData(tm, tileset, layers);
             }
             equals(other) {
                 return this.tilemap.equals(other.tilemap) &&
@@ -19921,20 +19912,15 @@ var pxt;
         }
         getSnapshot(filter) {
             if (filter) {
-                return this.assets.filter(a => filter(a)).map(a => cloneAsset(a));
+                return this.assets.filter(a => filter(a)).map(cloneAsset);
             }
-            return this.assets.map(a => cloneAsset(a));
+            return this.assets.map(cloneAsset);
         }
         update(id, newValue) {
             let asset;
             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);
@@ -21196,11 +21182,8 @@ var pxt;
         const layers = new pxt.sprite.Bitmap(tmWidth, tmHeight, 0, 0, new Uint8ClampedArray(bitmapData)).data();
         return new pxt.sprite.TilemapData(tilemap, tileset, layers);
     }
-    function cloneAsset(asset, includeEditorData = false) {
+    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 */:
@@ -21208,7 +21191,7 @@ var pxt;
             case "animation" /* AssetType.Animation */:
                 return Object.assign(Object.assign({}, asset), { frames: asset.frames.map(frame => cloneBitmap(frame)) });
             case "tilemap" /* AssetType.Tilemap */:
-                return Object.assign(Object.assign({}, asset), { data: asset.data.cloneData(includeEditorData) });
+                return Object.assign(Object.assign({}, asset), { data: asset.data.cloneData() });
             case "song" /* AssetType.Song */:
                 return Object.assign(Object.assign({}, asset), { song: pxt.assets.music.cloneSong(asset.song) });
         }
@@ -21401,62 +21384,6 @@ 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) {
@@ -21557,6 +21484,10 @@ 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);
     }
@@ -21569,21 +21500,6 @@ var pxt;
             case "song" /* AssetType.Song */: return snapshot.songs;
         }
     }
-    function patchTemporaryAsset(oldValue, newValue, project) {
-        if (!oldValue || assetEquals(oldValue, newValue))
-            return newValue;
-        newValue = cloneAsset(newValue, true);
-        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) {