pxt-core 8.6.12 → 8.6.13

package/built/pxt.js

@@ -103551,9 +103551,9 @@ var pxt;
             ["localEdits"]: {
                 value: "localEdits",
                 icon: "cloud-saving-b",
-                tooltip: lf("Saving project to the cloud..."),
-                shortStatus: lf("saving..."),
-                longStatus: lf("Saving to cloud..."),
+                tooltip: lf("Project has local changes and will save to cloud soon."),
+                shortStatus: "",
+                longStatus: "",
                 indicator: "*"
             },
         };
@@ -114038,7 +114038,8 @@ var pxt;
                 mimeType,
                 tilemapTile: v.tilemapTile,
                 displayName: v.displayName,
-                tileset: v.tileset
+                tileset: v.tileset,
+                tags: v.tags
             };
         }
         return allres;
@@ -117731,13 +117732,28 @@ var pxt;
                 }
             }
         }
+        clone() {
+            var _a;
+            const clone = new TilemapProject();
+            clone.committedState = cloneSnapshot(this.committedState);
+            clone.state = cloneSnapshot(this.state);
+            clone.gallery = cloneSnapshot(this.gallery);
+            clone.extensionTileSets = (_a = this.extensionTileSets) === null || _a === void 0 ? void 0 : _a.map(t => (Object.assign(Object.assign({}, t), { tileSets: t.tileSets.map(ts => (Object.assign(Object.assign({}, ts), { tiles: ts.tiles.map(tl => cloneAsset(tl)) }))) })));
+            clone.needsRebuild = this.needsRebuild;
+            clone.nextID = this.nextID;
+            clone.nextInternalID = this.nextInternalID;
+            clone.undoStack = this.undoStack.map(u => cloneSnapshotDiff(u));
+            clone.redoStack = this.undoStack.map(r => cloneSnapshotDiff(r));
+            return clone;
+        }
         generateImage(entry, type) {
             return {
                 internalID: this.getNewInternalId(),
                 type: type,
                 id: entry.id,
                 meta: {
-                    displayName: entry.displayName
+                    displayName: entry.displayName,
+                    tags: entry.tags,
                 },
                 jresData: entry.data,
                 bitmap: pxt.sprite.getBitmapFromJResURL(`data:${pxt.IMAGE_MIME_TYPE};base64,${entry.data}`).data()
@@ -117749,7 +117765,8 @@ var pxt;
                 type: "song" /* AssetType.Song */,
                 id: entry.id,
                 meta: {
-                    displayName: entry.displayName
+                    displayName: entry.displayName,
+                    tags: entry.tags
                 },
                 song: pxt.assets.music.decodeSongFromHex(entry.data)
             };
@@ -117767,7 +117784,8 @@ var pxt;
                     internalID: this.getNewInternalId(),
                     type: "animation" /* AssetType.Animation */,
                     meta: {
-                        displayName: entry.displayName
+                        displayName: entry.displayName,
+                        tags: entry.tags
                     },
                     id: entry.id,
                     frames: [],
@@ -117999,27 +118017,51 @@ var pxt;
         }
     }
     pxt.cloneAsset = cloneAsset;
+    function cloneSnapshot(toClone) {
+        return {
+            revision: toClone.revision,
+            tilemaps: toClone.tilemaps.clone(),
+            images: toClone.images.clone(),
+            animations: toClone.animations.clone(),
+            songs: toClone.songs.clone(),
+            tiles: toClone.tiles.clone()
+        };
+    }
+    function cloneSnapshotDiff(toClone) {
+        return Object.assign(Object.assign({}, toClone), { animations: cloneAssetCollectionDiff(toClone.animations), tiles: cloneAssetCollectionDiff(toClone.tiles), images: cloneAssetCollectionDiff(toClone.images), tilemaps: cloneAssetCollectionDiff(toClone.tilemaps), songs: cloneAssetCollectionDiff(toClone.songs) });
+    }
+    function cloneAssetCollectionDiff(toClone) {
+        return Object.assign(Object.assign({}, toClone), { before: toClone.before.map(entry => cloneAsset(entry)), after: toClone.after.map(entry => cloneAsset(entry)) });
+    }
     function addAssetToJRes(asset, allJRes) {
         // Get the last part of the fully qualified name
         const id = asset.id.substr(asset.id.lastIndexOf(".") + 1);
+        const tags = asset.meta.tags;
         switch (asset.type) {
             case "image" /* AssetType.Image */:
                 allJRes[id] = asset.jresData;
-                if (asset.meta.displayName) {
-                    allJRes[id] = {
+                if (asset.meta.displayName || (tags === null || tags === void 0 ? void 0 : tags.length)) {
+                    const imgJres = {
                         data: asset.jresData,
                         mimeType: pxt.IMAGE_MIME_TYPE,
-                        displayName: asset.meta.displayName
                     };
+                    if (asset.meta.displayName)
+                        imgJres.displayName = asset.meta.displayName;
+                    if (tags === null || tags === void 0 ? void 0 : tags.length)
+                        imgJres.tags = tags;
+                    allJRes[id] = imgJres;
                 }
                 break;
             case "tile" /* AssetType.Tile */:
-                allJRes[id] = {
+                const tileJres = {
                     data: asset.jresData,
                     mimeType: pxt.IMAGE_MIME_TYPE,
                     tilemapTile: true,
                     displayName: asset.meta.displayName
                 };
+                if (tags === null || tags === void 0 ? void 0 : tags.length)
+                    tileJres.tags = tags;
+                allJRes[id] = tileJres;
                 break;
             case "tilemap" /* AssetType.Tilemap */:
                 // we include the full ID for tilemaps
@@ -118030,11 +118072,15 @@ var pxt;
                 allJRes[id] = serializeAnimation(asset);
                 break;
             case "song" /* AssetType.Song */:
-                allJRes[id] = {
+                const songJres = {
                     data: pxt.assets.music.encodeSongToHex(asset.song),
                     mimeType: pxt.SONG_MIME_TYPE,
-                    displayName: asset.meta.displayName
+                    displayName: asset.meta.displayName,
+                    namespace: pxt.sprite.SONG_NAMESPACE + "."
                 };
+                if (tags === null || tags === void 0 ? void 0 : tags.length)
+                    songJres.tags = tags;
+                allJRes[id] = songJres;
                 break;
         }
     }
@@ -118204,13 +118250,17 @@ var pxt;
         };
     }
     function serializeAnimation(asset) {
-        return {
+        var _a;
+        const animationJres = {
             namespace: asset.id.substr(0, asset.id.lastIndexOf(".")),
             id: asset.id.substr(asset.id.lastIndexOf(".") + 1),
             mimeType: pxt.ANIMATION_MIME_TYPE,
             data: pxt.sprite.encodeAnimationString(asset.frames, asset.interval),
-            displayName: asset.meta.displayName
+            displayName: asset.meta.displayName,
         };
+        if ((_a = asset.meta.tags) === null || _a === void 0 ? void 0 : _a.length)
+            animationJres.tags = asset.meta.tags;
+        return animationJres;
     }
     function decodeAnimation(jres) {
         const hex = atob(jres.data);
@@ -118245,7 +118295,8 @@ var pxt;
             interval,
             frames: decodedFrames,
             meta: {
-                displayName: jres.displayName
+                displayName: jres.displayName,
+                tags: jres.tags
             }
         };
     }

package/built/pxteditor.d.ts

@@ -90,6 +90,7 @@ declare namespace pxt.editor {
         screenshoting?: boolean;
         extensionsVisible?: boolean;
         isMultiplayerGame?: boolean;
+        onboarding?: boolean;
     }
     interface EditorState {
         filters?: pxt.editor.ProjectFilters;
@@ -314,6 +315,8 @@ declare namespace pxt.editor {
         startActivity(options: StartActivityOptions): void;
         showLightbox(): void;
         hideLightbox(): void;
+        showOnboarding(): void;
+        hideOnboarding(): void;
         showKeymap(show: boolean): void;
         toggleKeymap(): void;
         showReportAbuse(): void;

package/built/pxtlib.d.ts

@@ -2911,6 +2911,7 @@ declare namespace pxt {
         loadTilemapJRes(jres: Map<JRes>, skipDuplicates?: boolean, gallery?: boolean): void;
         loadAssetsJRes(jres: Map<JRes>, gallery?: boolean): void;
         removeInactiveBlockAssets(activeBlockIDs: string[]): void;
+        clone(): TilemapProject;
         protected generateImage(entry: JRes, type: AssetType.Image): ProjectImage;
         protected generateImage(entry: JRes, type: AssetType.Tile): Tile;
         protected generateSong(entry: JRes): Song;

package/built/pxtlib.js

@@ -5865,9 +5865,9 @@ var pxt;
             ["localEdits"]: {
                 value: "localEdits",
                 icon: "cloud-saving-b",
-                tooltip: lf("Saving project to the cloud..."),
-                shortStatus: lf("saving..."),
-                longStatus: lf("Saving to cloud..."),
+                tooltip: lf("Project has local changes and will save to cloud soon."),
+                shortStatus: "",
+                longStatus: "",
                 indicator: "*"
             },
         };
@@ -16352,7 +16352,8 @@ var pxt;
                 mimeType,
                 tilemapTile: v.tilemapTile,
                 displayName: v.displayName,
-                tileset: v.tileset
+                tileset: v.tileset,
+                tags: v.tags
             };
         }
         return allres;
@@ -20045,13 +20046,28 @@ var pxt;
                 }
             }
         }
+        clone() {
+            var _a;
+            const clone = new TilemapProject();
+            clone.committedState = cloneSnapshot(this.committedState);
+            clone.state = cloneSnapshot(this.state);
+            clone.gallery = cloneSnapshot(this.gallery);
+            clone.extensionTileSets = (_a = this.extensionTileSets) === null || _a === void 0 ? void 0 : _a.map(t => (Object.assign(Object.assign({}, t), { tileSets: t.tileSets.map(ts => (Object.assign(Object.assign({}, ts), { tiles: ts.tiles.map(tl => cloneAsset(tl)) }))) })));
+            clone.needsRebuild = this.needsRebuild;
+            clone.nextID = this.nextID;
+            clone.nextInternalID = this.nextInternalID;
+            clone.undoStack = this.undoStack.map(u => cloneSnapshotDiff(u));
+            clone.redoStack = this.undoStack.map(r => cloneSnapshotDiff(r));
+            return clone;
+        }
         generateImage(entry, type) {
             return {
                 internalID: this.getNewInternalId(),
                 type: type,
                 id: entry.id,
                 meta: {
-                    displayName: entry.displayName
+                    displayName: entry.displayName,
+                    tags: entry.tags,
                 },
                 jresData: entry.data,
                 bitmap: pxt.sprite.getBitmapFromJResURL(`data:${pxt.IMAGE_MIME_TYPE};base64,${entry.data}`).data()
@@ -20063,7 +20079,8 @@ var pxt;
                 type: "song" /* AssetType.Song */,
                 id: entry.id,
                 meta: {
-                    displayName: entry.displayName
+                    displayName: entry.displayName,
+                    tags: entry.tags
                 },
                 song: pxt.assets.music.decodeSongFromHex(entry.data)
             };
@@ -20081,7 +20098,8 @@ var pxt;
                     internalID: this.getNewInternalId(),
                     type: "animation" /* AssetType.Animation */,
                     meta: {
-                        displayName: entry.displayName
+                        displayName: entry.displayName,
+                        tags: entry.tags
                     },
                     id: entry.id,
                     frames: [],
@@ -20313,27 +20331,51 @@ var pxt;
         }
     }
     pxt.cloneAsset = cloneAsset;
+    function cloneSnapshot(toClone) {
+        return {
+            revision: toClone.revision,
+            tilemaps: toClone.tilemaps.clone(),
+            images: toClone.images.clone(),
+            animations: toClone.animations.clone(),
+            songs: toClone.songs.clone(),
+            tiles: toClone.tiles.clone()
+        };
+    }
+    function cloneSnapshotDiff(toClone) {
+        return Object.assign(Object.assign({}, toClone), { animations: cloneAssetCollectionDiff(toClone.animations), tiles: cloneAssetCollectionDiff(toClone.tiles), images: cloneAssetCollectionDiff(toClone.images), tilemaps: cloneAssetCollectionDiff(toClone.tilemaps), songs: cloneAssetCollectionDiff(toClone.songs) });
+    }
+    function cloneAssetCollectionDiff(toClone) {
+        return Object.assign(Object.assign({}, toClone), { before: toClone.before.map(entry => cloneAsset(entry)), after: toClone.after.map(entry => cloneAsset(entry)) });
+    }
     function addAssetToJRes(asset, allJRes) {
         // Get the last part of the fully qualified name
         const id = asset.id.substr(asset.id.lastIndexOf(".") + 1);
+        const tags = asset.meta.tags;
         switch (asset.type) {
             case "image" /* AssetType.Image */:
                 allJRes[id] = asset.jresData;
-                if (asset.meta.displayName) {
-                    allJRes[id] = {
+                if (asset.meta.displayName || (tags === null || tags === void 0 ? void 0 : tags.length)) {
+                    const imgJres = {
                         data: asset.jresData,
                         mimeType: pxt.IMAGE_MIME_TYPE,
-                        displayName: asset.meta.displayName
                     };
+                    if (asset.meta.displayName)
+                        imgJres.displayName = asset.meta.displayName;
+                    if (tags === null || tags === void 0 ? void 0 : tags.length)
+                        imgJres.tags = tags;
+                    allJRes[id] = imgJres;
                 }
                 break;
             case "tile" /* AssetType.Tile */:
-                allJRes[id] = {
+                const tileJres = {
                     data: asset.jresData,
                     mimeType: pxt.IMAGE_MIME_TYPE,
                     tilemapTile: true,
                     displayName: asset.meta.displayName
                 };
+                if (tags === null || tags === void 0 ? void 0 : tags.length)
+                    tileJres.tags = tags;
+                allJRes[id] = tileJres;
                 break;
             case "tilemap" /* AssetType.Tilemap */:
                 // we include the full ID for tilemaps
@@ -20344,11 +20386,15 @@ var pxt;
                 allJRes[id] = serializeAnimation(asset);
                 break;
             case "song" /* AssetType.Song */:
-                allJRes[id] = {
+                const songJres = {
                     data: pxt.assets.music.encodeSongToHex(asset.song),
                     mimeType: pxt.SONG_MIME_TYPE,
-                    displayName: asset.meta.displayName
+                    displayName: asset.meta.displayName,
+                    namespace: pxt.sprite.SONG_NAMESPACE + "."
                 };
+                if (tags === null || tags === void 0 ? void 0 : tags.length)
+                    songJres.tags = tags;
+                allJRes[id] = songJres;
                 break;
         }
     }
@@ -20518,13 +20564,17 @@ var pxt;
         };
     }
     function serializeAnimation(asset) {
-        return {
+        var _a;
+        const animationJres = {
             namespace: asset.id.substr(0, asset.id.lastIndexOf(".")),
             id: asset.id.substr(asset.id.lastIndexOf(".") + 1),
             mimeType: pxt.ANIMATION_MIME_TYPE,
             data: pxt.sprite.encodeAnimationString(asset.frames, asset.interval),
-            displayName: asset.meta.displayName
+            displayName: asset.meta.displayName,
         };
+        if ((_a = asset.meta.tags) === null || _a === void 0 ? void 0 : _a.length)
+            animationJres.tags = asset.meta.tags;
+        return animationJres;
     }
     function decodeAnimation(jres) {
         const hex = atob(jres.data);
@@ -20559,7 +20609,8 @@ var pxt;
             interval,
             frames: decodedFrames,
             meta: {
-                displayName: jres.displayName
+                displayName: jres.displayName,
+                tags: jres.tags
             }
         };
     }