pxt-core 9.2.8 → 9.2.10

package/built/pxtlib.d.ts

@@ -996,42 +996,7 @@ declare namespace pxt.hexloader {
 declare namespace pxt.crowdin {
     const KEY_VARIABLE = "CROWDIN_KEY";
     let testMode: boolean;
-    const TEST_KEY = "!!!testmode!!!";
     function setTestMode(): void;
-    interface CrowdinFileInfo {
-        name: string;
-        fullName?: string;
-        id: number;
-        node_type: "file" | "directory" | "branch";
-        phrases?: number;
-        translated?: number;
-        approved?: number;
-        branch?: string;
-        files?: CrowdinFileInfo[];
-    }
-    interface CrowdinProjectInfo {
-        languages: {
-            name: string;
-            code: string;
-        }[];
-        files: CrowdinFileInfo[];
-    }
-    interface DownloadOptions {
-        translatedOnly?: boolean;
-        validatedOnly?: boolean;
-    }
-    function downloadTranslationsAsync(branch: string, prj: string, key: string, filename: string, options?: DownloadOptions): Promise<Map<Map<string>>>;
-    function createDirectoryAsync(branch: string, prj: string, key: string, name: string, incr?: () => void): Promise<void>;
-    function uploadTranslationAsync(branch: string, prj: string, key: string, filename: string, data: string): Promise<void>;
-    function projectInfoAsync(prj: string, key: string): Promise<CrowdinProjectInfo>;
-    /**
-     * Scans files in crowdin and report files that are not on disk anymore
-     */
-    function listFilesAsync(prj: string, key: string, crowdinPath: string): Promise<{
-        fullName: string;
-        branch: string;
-    }[]>;
-    function languageStatsAsync(prj: string, key: string, lang: string): Promise<CrowdinFileInfo[]>;
     function inContextLoadAsync(text: string): Promise<string>;
 }
 declare namespace pxt.diff {
@@ -1759,12 +1724,12 @@ declare namespace pxt.sprite {
     function formatByte(value: number, bytes: number): string;
     function resizeBitmap(img: Bitmap, width: number, height: number): Bitmap;
     function resizeTilemap(img: Tilemap, width: number, height: number): Tilemap;
-    function imageLiteralToBitmap(text: string): Bitmap;
+    function imageLiteralToBitmap(text: string, templateLiteral?: string): Bitmap;
     function encodeAnimationString(frames: BitmapData[], interval: number): string;
     function addMissingTilemapTilesAndReferences(project: TilemapProject, asset: ProjectTilemap): void;
     function updateTilemapReferencesFromResult(project: TilemapProject, assetResult: ProjectTilemap): void;
     function imageLiteralFromDimensions(width: number, height: number, color: number, fileType: "typescript" | "python"): string;
-    function bitmapToImageLiteral(bitmap: Bitmap, fileType: "typescript" | "python"): string;
+    function bitmapToImageLiteral(bitmap: Bitmap, fileType: "typescript" | "python", templateLiteral?: string): string;
     function bitmapEquals(a: pxt.sprite.BitmapData, b: pxt.sprite.BitmapData): boolean;
     function tileWidthToTileScale(tileWidth: number): string;
     function tileScaleToTileWidth(tileScale: string): number;
@@ -1919,6 +1884,7 @@ declare namespace pxt {
          */
         packageLocalizationStringsAsync(lang: string): Promise<Map<string>>;
         bundledStringsForFile(lang: string, filename: string): Map<string>;
+        patchAppTargetPalette(): void;
     }
     class MainPackage extends Package {
         _host: Host;

package/built/pxtlib.js

@@ -7618,251 +7618,11 @@ var pxt;
     (function (crowdin) {
         crowdin.KEY_VARIABLE = "CROWDIN_KEY";
         crowdin.testMode = false;
-        crowdin.TEST_KEY = "!!!testmode!!!";
         function setTestMode() {
             pxt.crowdin.testMode = true;
             pxt.log(`CROWDIN TEST MODE - files will NOT be uploaded`);
         }
         crowdin.setTestMode = setTestMode;
-        function multipartPostAsync(key, uri, data = {}, filename = null, filecontents = null) {
-            if (crowdin.testMode || key == crowdin.TEST_KEY) {
-                const resp = {
-                    success: true
-                };
-                return Promise.resolve({ statusCode: 200, headers: {}, text: JSON.stringify(resp), json: resp });
-            }
-            return pxt.Util.multipartPostAsync(uri, data, filename, filecontents);
-        }
-        function apiUri(branch, prj, key, cmd, args) {
-            pxt.Util.assert(!!prj && !!key && !!cmd);
-            const apiRoot = "https://api.crowdin.com/api/project/" + prj + "/";
-            args = args || {};
-            if (crowdin.testMode)
-                delete args["key"]; // ensure no key is passed in test mode
-            else
-                args["key"] = key;
-            if (branch)
-                args["branch"] = branch;
-            return apiRoot + cmd + "?" + Object.keys(args).map(k => `${k}=${encodeURIComponent(args[k])}`).join("&");
-        }
-        function downloadTranslationsAsync(branch, prj, key, filename, options = {}) {
-            const q = { json: "true" };
-            const infoUri = apiUri(branch, prj, key, "info", q);
-            const r = {};
-            filename = normalizeFileName(filename);
-            return pxt.Util.httpGetTextAsync(infoUri).then(respText => {
-                const info = JSON.parse(respText);
-                if (!info)
-                    throw new Error("info failed");
-                let todo = info.languages.filter(l => l.code != "en");
-                if (pxt.appTarget && pxt.appTarget.appTheme && pxt.appTarget.appTheme.availableLocales)
-                    todo = todo.filter(l => pxt.appTarget.appTheme.availableLocales.indexOf(l.code) > -1);
-                pxt.log('languages: ' + todo.map(l => l.code).join(', '));
-                const nextFile = () => {
-                    const item = todo.pop();
-                    if (!item)
-                        return Promise.resolve();
-                    const exportFileUri = apiUri(branch, prj, key, "export-file", {
-                        file: filename,
-                        language: item.code,
-                        export_translated_only: options.translatedOnly ? "1" : "0",
-                        export_approved_only: options.validatedOnly ? "1" : "0"
-                    });
-                    pxt.log(`downloading ${item.name} - ${item.code} (${todo.length} more)`);
-                    return pxt.Util.httpGetTextAsync(exportFileUri).then((transationsText) => {
-                        try {
-                            const translations = JSON.parse(transationsText);
-                            if (translations)
-                                r[item.code] = translations;
-                        }
-                        catch (e) {
-                            pxt.log(exportFileUri + ' ' + e);
-                        }
-                        return nextFile();
-                    }).then(() => pxt.Util.delay(1000)); // throttling otherwise crowdin fails
-                };
-                return nextFile();
-            }).then(() => r);
-        }
-        crowdin.downloadTranslationsAsync = downloadTranslationsAsync;
-        function mkIncr(filename) {
-            let cnt = 0;
-            return function incr() {
-                if (cnt++ > 10) {
-                    throw new Error("Too many API calls for " + filename);
-                }
-            };
-        }
-        function createDirectoryAsync(branch, prj, key, name, incr) {
-            name = normalizeFileName(name);
-            pxt.debug(`create directory ${branch || ""}/${name}`);
-            if (!incr)
-                incr = mkIncr(name);
-            return multipartPostAsync(key, apiUri(branch, prj, key, "add-directory"), { json: "true", name: name })
-                .then(resp => {
-                pxt.debug(`crowdin resp: ${resp.statusCode}`);
-                // 400 returned by folder already exists
-                if (resp.statusCode == 200 || resp.statusCode == 400)
-                    return Promise.resolve();
-                if (resp.statusCode == 500 && resp.text) {
-                    const json = JSON.parse(resp.text);
-                    if (json.error.code === 50) {
-                        pxt.log('directory already exists');
-                        return Promise.resolve();
-                    }
-                }
-                const data = resp.json || JSON.parse(resp.text) || { error: {} };
-                if (resp.statusCode == 404 && data.error.code == 17) {
-                    pxt.log(`parent directory missing for ${name}`);
-                    const par = name.replace(/\/[^\/]+$/, "");
-                    if (par != name) {
-                        return createDirectoryAsync(branch, prj, key, par, incr)
-                            .then(() => createDirectoryAsync(branch, prj, key, name, incr)); // retry
-                    }
-                }
-                throw new Error(`cannot create directory ${branch || ""}/${name}: ${resp.statusCode} ${JSON.stringify(data)}`);
-            });
-        }
-        crowdin.createDirectoryAsync = createDirectoryAsync;
-        function normalizeFileName(filename) {
-            return filename.replace(/\\/g, '/');
-        }
-        function uploadTranslationAsync(branch, prj, key, filename, data) {
-            pxt.Util.assert(!!prj);
-            pxt.Util.assert(!!key);
-            filename = normalizeFileName(filename);
-            const incr = mkIncr(filename);
-            function startAsync() {
-                return uploadAsync("update-file", { update_option: "update_as_unapproved" });
-            }
-            function uploadAsync(op, opts) {
-                opts["type"] = "auto";
-                opts["json"] = "";
-                opts["escape_quotes"] = "0";
-                incr();
-                return multipartPostAsync(key, apiUri(branch, prj, key, op), opts, filename, data)
-                    .then(resp => handleResponseAsync(resp));
-            }
-            function handleResponseAsync(resp) {
-                var _a, _b, _c;
-                const code = resp.statusCode;
-                const errorData = pxt.Util.jsonTryParse(resp.text) || {};
-                pxt.debug(`upload result: ${code}`);
-                if (code == 404 && errorData.error && errorData.error.code == 8) {
-                    pxt.log(`create new translation file: ${filename}`);
-                    return uploadAsync("add-file", {});
-                }
-                else if (code == 404 && ((_a = errorData.error) === null || _a === void 0 ? void 0 : _a.code) == 17) {
-                    return createDirectoryAsync(branch, prj, key, filename.replace(/\/[^\/]+$/, ""), incr)
-                        .then(() => startAsync());
-                }
-                else if (!errorData.success && ((_b = errorData.error) === null || _b === void 0 ? void 0 : _b.code) == 53) {
-                    // file is being updated
-                    pxt.log(`${filename} being updated, waiting 5s and retry...`);
-                    return pxt.U.delay(5000) // wait 5s and try again
-                        .then(() => uploadTranslationAsync(branch, prj, key, filename, data));
-                }
-                else if (code == 429 && ((_c = errorData.error) === null || _c === void 0 ? void 0 : _c.code) == 55) {
-                    // Too many concurrent requests
-                    pxt.log(`Maximum concurrent requests reached, waiting 10s and retry...`);
-                    return pxt.U.delay(10 * 1000) // wait 10s and try again
-                        .then(() => uploadTranslationAsync(branch, prj, key, filename, data));
-                }
-                else if (code == 200 || errorData.success) {
-                    // something crowdin reports 500 with success=true
-                    return Promise.resolve();
-                }
-                else {
-                    throw new Error(`Error, upload translation: ${filename}, ${code}, ${resp.text}`);
-                }
-            }
-            return startAsync();
-        }
-        crowdin.uploadTranslationAsync = uploadTranslationAsync;
-        function flatten(allFiles, node, parentDir, branch) {
-            const n = node.name;
-            const d = parentDir ? parentDir + "/" + n : n;
-            node.fullName = d;
-            node.branch = branch || "";
-            switch (node.node_type) {
-                case "file":
-                    allFiles.push(node);
-                    break;
-                case "directory":
-                    (node.files || []).forEach(f => flatten(allFiles, f, d, branch));
-                    break;
-                case "branch":
-                    (node.files || []).forEach(f => flatten(allFiles, f, parentDir, node.name));
-                    break;
-            }
-        }
-        function filterAndFlattenFiles(files, crowdinPath) {
-            const pxtCrowdinBranch = pxt.appTarget.versions.pxtCrowdinBranch || "";
-            const targetCrowdinBranch = pxt.appTarget.versions.targetCrowdinBranch || "";
-            let allFiles = [];
-            // flatten the files
-            files.forEach(f => flatten(allFiles, f, ""));
-            // top level files are for PXT, subolder are targets
-            allFiles = allFiles.filter(f => {
-                if (f.fullName.indexOf('/') < 0)
-                    return f.branch == pxtCrowdinBranch; // pxt file
-                else
-                    return f.branch == targetCrowdinBranch;
-            });
-            // folder filter
-            if (crowdinPath) {
-                // filter out crowdin folder
-                allFiles = allFiles.filter(f => f.fullName.indexOf(crowdinPath) == 0);
-            }
-            // filter out non-target files
-            if (pxt.appTarget.id != "core") {
-                const id = pxt.appTarget.id + '/';
-                allFiles = allFiles.filter(f => {
-                    return f.fullName.indexOf('/') < 0 // top level file
-                        || f.fullName.substr(0, id.length) == id // from the target folder
-                        || f.fullName.indexOf('common-docs') >= 0; // common docs
-                });
-            }
-            return allFiles;
-        }
-        function projectInfoAsync(prj, key) {
-            const q = { json: "true" };
-            const infoUri = apiUri("", prj, key, "info", q);
-            return pxt.Util.httpGetTextAsync(infoUri).then(respText => {
-                const info = JSON.parse(respText);
-                return info;
-            });
-        }
-        crowdin.projectInfoAsync = projectInfoAsync;
-        /**
-         * Scans files in crowdin and report files that are not on disk anymore
-         */
-        function listFilesAsync(prj, key, crowdinPath) {
-            pxt.log(`crowdin: listing files under ${crowdinPath}`);
-            return projectInfoAsync(prj, key)
-                .then(info => {
-                if (!info)
-                    throw new Error("info failed");
-                let allFiles = filterAndFlattenFiles(info.files, crowdinPath);
-                pxt.debug(`crowdin: found ${allFiles.length} under ${crowdinPath}`);
-                return allFiles.map(f => {
-                    return {
-                        fullName: f.fullName,
-                        branch: f.branch || ""
-                    };
-                });
-            });
-        }
-        crowdin.listFilesAsync = listFilesAsync;
-        function languageStatsAsync(prj, key, lang) {
-            const uri = apiUri("", prj, key, "language-status", { language: lang, json: "true" });
-            return pxt.Util.httpGetJsonAsync(uri)
-                .then(info => {
-                const allFiles = filterAndFlattenFiles(info.files);
-                return allFiles;
-            });
-        }
-        crowdin.languageStatsAsync = languageStatsAsync;
         function inContextLoadAsync(text) {
             const node = document.createElement("input");
             node.type = "text";
@@ -13353,11 +13113,12 @@ var pxt;
             return result;
         }
         sprite_1.resizeTilemap = resizeTilemap;
-        function imageLiteralToBitmap(text) {
+        function imageLiteralToBitmap(text, templateLiteral = "img") {
             // Strip the tagged template string business and the whitespace. We don't have to exhaustively
             // replace encoded characters because the compiler will catch any disallowed characters and throw
             // an error before the decompilation happens. 96 is backtick and 9 is tab
             text = text.replace(/[ `]|(?:&#96;)|(?:&#9;)|(?:img)/g, "").trim();
+            text = text.replaceAll(templateLiteral, "");
             text = text.replace(/^["`\(\)]*/, '').replace(/["`\(\)]*$/, '');
             text = text.replace(/&#10;/g, "\n");
             const rows = text.split("\n");
@@ -13519,14 +13280,14 @@ var pxt;
             pxt.sprite.trimTilemapTileset(result);
         }
         sprite_1.updateTilemapReferencesFromResult = updateTilemapReferencesFromResult;
-        function imageLiteralPrologue(fileType) {
+        function imageLiteralPrologue(fileType, templateLiteral = "img") {
             let res = '';
             switch (fileType) {
                 case "python":
-                    res = "img(\"\"\"";
+                    res = `${templateLiteral}("""`;
                     break;
                 default:
-                    res = "img`";
+                    res = `${templateLiteral}\``;
                     break;
             }
             return res;
@@ -13557,10 +13318,10 @@ var pxt;
             return res;
         }
         sprite_1.imageLiteralFromDimensions = imageLiteralFromDimensions;
-        function bitmapToImageLiteral(bitmap, fileType) {
+        function bitmapToImageLiteral(bitmap, fileType, templateLiteral = "img") {
             if (!bitmap || bitmap.height === 0 || bitmap.width === 0)
                 return "";
-            let res = imageLiteralPrologue(fileType);
+            let res = imageLiteralPrologue(fileType, templateLiteral);
             if (bitmap) {
                 const paddingBetweenPixels = (bitmap.width * bitmap.height > 300) ? "" : " ";
                 for (let r = 0; r < bitmap.height; r++) {
@@ -16061,11 +15822,7 @@ var pxt;
             };
             await loadDepsRecursive(null, this);
             // get paletter config loading deps, so the more higher level packages take precedence
-            if (this.config.palette && pxt.appTarget.runtime) {
-                pxt.appTarget.runtime.palette = pxt.U.clone(this.config.palette);
-                if (this.config.paletteNames)
-                    pxt.appTarget.runtime.paletteNames = this.config.paletteNames;
-            }
+            this.patchAppTargetPalette();
             // get screen size loading deps, so the more higher level packages take precedence
             if (this.config.screenSize && pxt.appTarget.runtime)
                 pxt.appTarget.runtime.screenSize = pxt.U.clone(this.config.screenSize);
@@ -16211,6 +15968,13 @@ var pxt;
             }
             return r;
         }
+        patchAppTargetPalette() {
+            if (this.config.palette && pxt.appTarget.runtime) {
+                pxt.appTarget.runtime.palette = pxt.U.clone(this.config.palette);
+                if (this.config.paletteNames)
+                    pxt.appTarget.runtime.paletteNames = this.config.paletteNames;
+            }
+        }
     }
     Package.depWarnings = {};
     pxt.Package = Package;
@@ -16472,6 +16236,10 @@ var pxt;
             opts.jres = this.getJRes();
             const functionOpts = pxt.appTarget.runtime && pxt.appTarget.runtime.functionsOptions;
             opts.allowedArgumentTypes = functionOpts && functionOpts.extraFunctionEditorTypes && functionOpts.extraFunctionEditorTypes.map(info => info.typeName).concat("number", "boolean", "string");
+            for (const dep of this.sortedDeps()) {
+                dep.patchAppTargetPalette();
+            }
+            this.patchAppTargetPalette();
             return opts;
         }
         prepareConfigToBePublished() {