pxt-core 12.2.9 → 12.2.11

package/built/pxt.js

@@ -119050,6 +119050,15 @@ var pxt;
                     return this.generateNewIDInternal("json" /* AssetType.Json */, pxt.sprite.JSON_PREFIX, pxt.sprite.JSON_NAMESPACE);
             }
         }
+        generateNewName(type, name) {
+            const defaultName = name || pxt.getDefaultAssetDisplayName(type);
+            let newName = defaultName;
+            let index = 0;
+            while (this.isNameTaken(type, newName)) {
+                newName = defaultName + (index++);
+            }
+            return newName;
+        }
         generateNewIDInternal(type, varPrefix, namespaceString) {
             varPrefix = varPrefix.replace(/\d+$/, "");
             const prefix = namespaceString ? namespaceString + "." + varPrefix : varPrefix;
@@ -119540,7 +119549,7 @@ var pxt;
     }
     pxt.getTSReferenceForAsset = getTSReferenceForAsset;
     function parseAssetTSReference(ts) {
-        const match = /^\s*(?:(?:assets\s*\.\s*(image|tile|animation|tilemap|song))|(tilemap))\s*(?:`|\(""")([^`"]+)(?:`|"""\))\s*$/m.exec(ts);
+        const match = /^\s*(?:(?:assets\s*\.\s*(image|tile|animation|tilemap|song))|(tilemap))\s*(?:`|\(""")([^`"]*)(?:`|"""\))\s*$/m.exec(ts);
         if (match) {
             const type = match[1] || match[2];
             const name = match[3].trim();
@@ -157569,6 +157578,7 @@ var pxsim;
             var _a;
             const wrapper = document.createElement("div");
             wrapper.className = `simframe ui embed`;
+            wrapper.setAttribute('tabindex', '0');
             const frame = document.createElement('iframe');
             frame.id = 'sim-frame-' + this.nextId();
             frame.title = pxsim.localization.lf("Simulator");

package/built/pxtlib.d.ts

@@ -3206,6 +3206,7 @@ declare namespace pxt {
         protected generateAnimation(entry: JRes): [Animation, boolean];
         protected inflateAnimation(animation: Animation, assets: (Tile | ProjectImage | Animation | Song | JsonAsset)[]): Animation;
         generateNewID(type: AssetType): string;
+        generateNewName(type: AssetType, name?: string): string;
         protected generateNewIDInternal(type: AssetType, varPrefix: string, namespaceString?: string): string;
         protected onChange(): void;
         protected readImages(allJRes: Map<JRes>, isProjectFile?: boolean): (Tile | ProjectImage | Animation | Song | JsonAsset)[];

package/built/pxtlib.js

@@ -21329,6 +21329,15 @@ var pxt;
                     return this.generateNewIDInternal("json" /* AssetType.Json */, pxt.sprite.JSON_PREFIX, pxt.sprite.JSON_NAMESPACE);
             }
         }
+        generateNewName(type, name) {
+            const defaultName = name || pxt.getDefaultAssetDisplayName(type);
+            let newName = defaultName;
+            let index = 0;
+            while (this.isNameTaken(type, newName)) {
+                newName = defaultName + (index++);
+            }
+            return newName;
+        }
         generateNewIDInternal(type, varPrefix, namespaceString) {
             varPrefix = varPrefix.replace(/\d+$/, "");
             const prefix = namespaceString ? namespaceString + "." + varPrefix : varPrefix;
@@ -21819,7 +21828,7 @@ var pxt;
     }
     pxt.getTSReferenceForAsset = getTSReferenceForAsset;
     function parseAssetTSReference(ts) {
-        const match = /^\s*(?:(?:assets\s*\.\s*(image|tile|animation|tilemap|song))|(tilemap))\s*(?:`|\(""")([^`"]+)(?:`|"""\))\s*$/m.exec(ts);
+        const match = /^\s*(?:(?:assets\s*\.\s*(image|tile|animation|tilemap|song))|(tilemap))\s*(?:`|\(""")([^`"]*)(?:`|"""\))\s*$/m.exec(ts);
         if (match) {
             const type = match[1] || match[2];
             const name = match[3].trim();

package/built/pxtsim.js

@@ -6833,6 +6833,7 @@ var pxsim;
             var _a;
             const wrapper = document.createElement("div");
             wrapper.className = `simframe ui embed`;
+            wrapper.setAttribute('tabindex', '0');
             const frame = document.createElement('iframe');
             frame.id = 'sim-frame-' + this.nextId();
             frame.title = pxsim.localization.lf("Simulator");

package/built/server.js

@@ -964,6 +964,10 @@ function serveAsync(options) {
         }
         // Rebuild pathname without leading version number
         pathname = "/" + elts.join("/");
+        const originalRouteSegment = (elts[0] || "");
+        const hyphenPrefixMatch = originalRouteSegment.match(/^-+/);
+        const hyphenPrefix = hyphenPrefixMatch ? hyphenPrefixMatch[0] : "";
+        const normalizedRouteSegment = originalRouteSegment.replace(/^-+/, "").toLowerCase();
         const expandWebappHtml = (appname, html) => {
             // Expand templates
             html = expandHtml(html);
@@ -1009,12 +1013,17 @@ function serveAsync(options) {
                 error(500, e.message);
             });
         };
-        const webappNames = subwebapp_1.SUB_WEBAPPS.filter(w => w.localServeEndpoint).map(w => w.localServeEndpoint);
-        const webappIdx = webappNames.findIndex(s => new RegExp(`^-{0,3}${s}$`).test(elts[0] || ''));
-        if (webappIdx >= 0) {
-            const webappName = webappNames[webappIdx];
+        const devSubapp = subwebapp_1.SUB_WEBAPPS.find(w => !!w.localServeEndpoint && w.localServeEndpoint.toLowerCase() === normalizedRouteSegment);
+        if (devSubapp) {
             const webappPath = pathname.split("/").slice(2).join('/'); // remove /<webappName>/ from path
-            return serveWebappFile(webappName, webappPath);
+            elts[0] = `${hyphenPrefix}${devSubapp.name}`;
+            const escapedEndpoint = devSubapp.localServeEndpoint.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+            const aliasRegex = new RegExp(`^/(-{0,3})${escapedEndpoint}(?=/|$)`, "i");
+            pathname = pathname.replace(aliasRegex, (_match, hyphens) => `/${hyphens}${devSubapp.name}`);
+            if (normalizedRouteSegment === devSubapp.name.toLowerCase()) {
+                serveWebappFile(devSubapp.name, webappPath);
+                return;
+            }
         }
         if (elts[0] == "api") {
             if (elts[1] == "streams") {