pxt-core 9.3.4 → 9.3.6

package/built/pxt.js

@@ -114404,6 +114404,17 @@ var pxt;
             const patches = pxt.appTarget.compile ? pxt.appTarget.compile.patches : undefined;
             if (!patches)
                 return undefined;
+            return parsePatches(version, patches, kind);
+        }
+        patching.computePatches = computePatches;
+        function computePyPatches(version, kind) {
+            const patches = pxt.appTarget.compile ? pxt.appTarget.compile.pyPatches : undefined;
+            if (!patches)
+                return undefined;
+            return parsePatches(version, patches, kind);
+        }
+        patching.computePyPatches = computePyPatches;
+        function parsePatches(version, patches, kind) {
             const v = pxt.semver.tryParse(version || "0.0.0") || pxt.semver.tryParse("0.0.0");
             let r = [];
             Object.keys(patches)
@@ -114413,7 +114424,6 @@ var pxt;
                 r = r.filter(p => p.type == kind);
             return r.length ? r : undefined;
         }
-        patching.computePatches = computePatches;
         function upgradePackageReference(pkgTargetVersion, pkg, val) {
             if (val != "*")
                 return pkg;
@@ -114433,6 +114443,15 @@ var pxt;
         patching.upgradePackageReference = upgradePackageReference;
         function patchJavaScript(pkgTargetVersion, fileContents) {
             const upgrades = pxt.patching.computePatches(pkgTargetVersion);
+            return patchTextCode(pkgTargetVersion, fileContents, upgrades);
+        }
+        patching.patchJavaScript = patchJavaScript;
+        function patchPython(pkgTargetVersion, fileContents) {
+            const upgrades = pxt.patching.computePyPatches(pkgTargetVersion);
+            return patchTextCode(pkgTargetVersion, fileContents, upgrades);
+        }
+        patching.patchPython = patchPython;
+        function patchTextCode(pkgTargetVersion, fileContents, upgrades) {
             let updatedContents = fileContents;
             if (upgrades) {
                 upgrades.filter(u => u.type === "api").forEach(rule => {
@@ -114452,7 +114471,6 @@ var pxt;
             }
             return updatedContents;
         }
-        patching.patchJavaScript = patchJavaScript;
     })(patching = pxt.patching || (pxt.patching = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -122389,6 +122407,16 @@ var pxt;
             });
         }
         Cloud.downloadScriptMetaAsync = downloadScriptMetaAsync;
+        async function downloadBuiltSimJsInfoAsync(id) {
+            const targetVersion = pxt.appTarget.versions && pxt.appTarget.versions.target || "";
+            const url = pxt.U.stringifyQueryString(id + "/js", { v: "v" + targetVersion }) + (id.startsWith("S") ? `&time=${Date.now()}` : "");
+            const resp = await privateRequestAsync({
+                url,
+                forceLiveEndpoint: true,
+            });
+            return resp.json;
+        }
+        Cloud.downloadBuiltSimJsInfoAsync = downloadBuiltSimJsInfoAsync;
         async function markdownAsync(docid, locale, propagateExceptions) {
             // 1h check on markdown content if not on development server
             const MARKDOWN_EXPIRATION = pxt.BrowserUtils.isLocalHostDev() ? 0 : 1 * 60 * 60 * 1000;
@@ -123226,6 +123254,9 @@ var pxt;
             return mainPkg.getCompileOptionsAsync(target);
         }).then(opts => {
             patchTS(mainPkg.targetVersion(), opts);
+            if (mainPkg.getPreferredEditor() === pxt.PYTHON_PROJECT_NAME) {
+                patchPY(mainPkg.targetVersion(), opts);
+            }
             prepPythonOptions(opts);
             return opts;
         });
@@ -123259,6 +123290,22 @@ var pxt;
         }
     }
     pxt.patchTS = patchTS;
+    function patchPY(version, opts) {
+        if (!version)
+            return;
+        pxt.debug(`applying PY patches relative to ${version}`);
+        for (let fn of Object.keys(opts.fileSystem)) {
+            if (fn.indexOf("/") == -1 && pxt.U.endsWith(fn, ".py")) {
+                const initial = opts.fileSystem[fn];
+                const patched = pxt.patching.patchPython(version, initial);
+                if (initial != patched) {
+                    pxt.debug(`applying PY patch to ${fn}`);
+                    opts.fileSystem[fn] = patched;
+                }
+            }
+        }
+    }
+    pxt.patchPY = patchPY;
     function setupSimpleCompile(cfg) {
         if (typeof global != "undefined" && !global.btoa) {
             global.btoa = function (str) { return Buffer.from(str, "binary").toString("base64"); };
@@ -141734,7 +141781,7 @@ var ts;
                         }
                         const type = checker === null || checker === void 0 ? void 0 : checker.getTypeAtLocation(param);
                         const typeSymbol = service.getPxtSymbolFromTsSymbol(type === null || type === void 0 ? void 0 : type.symbol, apis, checker);
-                        if (((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) || (typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.emitAsConstant)) && python) {
+                        if ((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) && python) {
                             return pxt.Util.snakify(paramDefl);
                         }
                         if (python) {

package/built/pxtcompiler.d.ts

@@ -31,6 +31,7 @@ declare namespace pxt {
     function simpleGetCompileOptionsAsync(files: pxt.Map<string>, simpleOptions: SimpleCompileOptions): Promise<pxtc.CompileOptions>;
     function simpleCompileAsync(files: pxt.Map<string>, optionsOrNative?: SimpleCompileOptions | boolean): Promise<CompileResultWithErrors>;
     function patchTS(version: string, opts: pxtc.CompileOptions): void;
+    function patchPY(version: string, opts: pxtc.CompileOptions): void;
     function setupSimpleCompile(cfg?: SimpleDriverCallbacks): void;
 }
 declare namespace pxt {

package/built/pxtcompiler.js

@@ -141,6 +141,9 @@ var pxt;
             return mainPkg.getCompileOptionsAsync(target);
         }).then(opts => {
             patchTS(mainPkg.targetVersion(), opts);
+            if (mainPkg.getPreferredEditor() === pxt.PYTHON_PROJECT_NAME) {
+                patchPY(mainPkg.targetVersion(), opts);
+            }
             prepPythonOptions(opts);
             return opts;
         });
@@ -174,6 +177,22 @@ var pxt;
         }
     }
     pxt.patchTS = patchTS;
+    function patchPY(version, opts) {
+        if (!version)
+            return;
+        pxt.debug(`applying PY patches relative to ${version}`);
+        for (let fn of Object.keys(opts.fileSystem)) {
+            if (fn.indexOf("/") == -1 && pxt.U.endsWith(fn, ".py")) {
+                const initial = opts.fileSystem[fn];
+                const patched = pxt.patching.patchPython(version, initial);
+                if (initial != patched) {
+                    pxt.debug(`applying PY patch to ${fn}`);
+                    opts.fileSystem[fn] = patched;
+                }
+            }
+        }
+    }
+    pxt.patchPY = patchPY;
     function setupSimpleCompile(cfg) {
         if (typeof global != "undefined" && !global.btoa) {
             global.btoa = function (str) { return Buffer.from(str, "binary").toString("base64"); };
@@ -18649,7 +18668,7 @@ var ts;
                         }
                         const type = checker === null || checker === void 0 ? void 0 : checker.getTypeAtLocation(param);
                         const typeSymbol = service.getPxtSymbolFromTsSymbol(type === null || type === void 0 ? void 0 : type.symbol, apis, checker);
-                        if (((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) || (typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.emitAsConstant)) && python) {
+                        if ((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) && python) {
                             return pxt.Util.snakify(paramDefl);
                         }
                         if (python) {

package/built/pxtlib.d.ts

@@ -1986,8 +1986,10 @@ declare namespace pxt.packetio {
 }
 declare namespace pxt.patching {
     function computePatches(version: string, kind?: string): ts.pxtc.UpgradePolicy[];
+    function computePyPatches(version: string, kind?: string): ts.pxtc.UpgradePolicy[];
     function upgradePackageReference(pkgTargetVersion: string, pkg: string, val: string): string;
     function patchJavaScript(pkgTargetVersion: string, fileContents: string): string;
+    function patchPython(pkgTargetVersion: string, fileContents: string): string;
 }
 declare namespace pxt.react {
     interface FieldEditorView<U> {
@@ -3658,6 +3660,7 @@ declare namespace pxt.Cloud {
     function downloadTargetConfigAsync(): Promise<pxt.TargetConfig>;
     function downloadScriptFilesAsync(id: string): Promise<Map<string>>;
     function downloadScriptMetaAsync(id: string): Promise<JsonScriptMeta>;
+    function downloadBuiltSimJsInfoAsync(id: string): Promise<pxtc.BuiltSimJsInfo>;
     function markdownAsync(docid: string, locale?: string, propagateExceptions?: boolean): Promise<string>;
     function privateDeleteAsync(path: string): Promise<any>;
     function privatePostAsync(path: string, data: any, forceLiveEndpoint?: boolean): Promise<any>;

package/built/pxtlib.js

@@ -16718,6 +16718,17 @@ var pxt;
             const patches = pxt.appTarget.compile ? pxt.appTarget.compile.patches : undefined;
             if (!patches)
                 return undefined;
+            return parsePatches(version, patches, kind);
+        }
+        patching.computePatches = computePatches;
+        function computePyPatches(version, kind) {
+            const patches = pxt.appTarget.compile ? pxt.appTarget.compile.pyPatches : undefined;
+            if (!patches)
+                return undefined;
+            return parsePatches(version, patches, kind);
+        }
+        patching.computePyPatches = computePyPatches;
+        function parsePatches(version, patches, kind) {
             const v = pxt.semver.tryParse(version || "0.0.0") || pxt.semver.tryParse("0.0.0");
             let r = [];
             Object.keys(patches)
@@ -16727,7 +16738,6 @@ var pxt;
                 r = r.filter(p => p.type == kind);
             return r.length ? r : undefined;
         }
-        patching.computePatches = computePatches;
         function upgradePackageReference(pkgTargetVersion, pkg, val) {
             if (val != "*")
                 return pkg;
@@ -16747,6 +16757,15 @@ var pxt;
         patching.upgradePackageReference = upgradePackageReference;
         function patchJavaScript(pkgTargetVersion, fileContents) {
             const upgrades = pxt.patching.computePatches(pkgTargetVersion);
+            return patchTextCode(pkgTargetVersion, fileContents, upgrades);
+        }
+        patching.patchJavaScript = patchJavaScript;
+        function patchPython(pkgTargetVersion, fileContents) {
+            const upgrades = pxt.patching.computePyPatches(pkgTargetVersion);
+            return patchTextCode(pkgTargetVersion, fileContents, upgrades);
+        }
+        patching.patchPython = patchPython;
+        function patchTextCode(pkgTargetVersion, fileContents, upgrades) {
             let updatedContents = fileContents;
             if (upgrades) {
                 upgrades.filter(u => u.type === "api").forEach(rule => {
@@ -16766,7 +16785,6 @@ var pxt;
             }
             return updatedContents;
         }
-        patching.patchJavaScript = patchJavaScript;
     })(patching = pxt.patching || (pxt.patching = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -24703,6 +24721,16 @@ var pxt;
             });
         }
         Cloud.downloadScriptMetaAsync = downloadScriptMetaAsync;
+        async function downloadBuiltSimJsInfoAsync(id) {
+            const targetVersion = pxt.appTarget.versions && pxt.appTarget.versions.target || "";
+            const url = pxt.U.stringifyQueryString(id + "/js", { v: "v" + targetVersion }) + (id.startsWith("S") ? `&time=${Date.now()}` : "");
+            const resp = await privateRequestAsync({
+                url,
+                forceLiveEndpoint: true,
+            });
+            return resp.json;
+        }
+        Cloud.downloadBuiltSimJsInfoAsync = downloadBuiltSimJsInfoAsync;
         async function markdownAsync(docid, locale, propagateExceptions) {
             // 1h check on markdown content if not on development server
             const MARKDOWN_EXPIRATION = pxt.BrowserUtils.isLocalHostDev() ? 0 : 1 * 60 * 60 * 1000;

package/built/pxtrunner.d.ts

@@ -115,6 +115,7 @@ declare namespace pxt.runner {
     function preloadSim(container: HTMLElement, simOpts: SimulateOptions): void;
     function currentDriver(): pxsim.SimulatorDriver;
     function postSimMessage(msg: pxsim.SimulatorMessage): void;
+    function fetchSimJsInfo(simOptions: SimulateOptions): Promise<pxtc.BuiltSimJsInfo>;
     function buildSimJsInfo(simOptions: SimulateOptions): Promise<pxtc.BuiltSimJsInfo>;
     enum LanguageMode {
         Blocks = 0,

package/built/pxtrunner.js

@@ -1734,7 +1734,7 @@ var pxt;
         runner.generateVMFileAsync = generateVMFileAsync;
         async function simulateAsync(container, simOptions) {
             var _a, _b;
-            const builtSimJS = simOptions.builtJsInfo || await buildSimJsInfo(simOptions);
+            const builtSimJS = simOptions.builtJsInfo || await fetchSimJsInfo(simOptions) || await buildSimJsInfo(simOptions);
             const { js } = builtSimJS;
             if (!js) {
                 console.error("Program failed to compile");
@@ -1815,6 +1815,17 @@ var pxt;
             simDriver === null || simDriver === void 0 ? void 0 : simDriver.postMessage(msg);
         }
         runner.postSimMessage = postSimMessage;
+        async function fetchSimJsInfo(simOptions) {
+            try {
+                return await pxt.Cloud.downloadBuiltSimJsInfoAsync(simOptions.id);
+            }
+            catch (e) {
+                // This exception will happen in the majority of cases, so we don't want to log it unless for debugging.
+                pxt.debug(e.toString());
+                return undefined;
+            }
+        }
+        runner.fetchSimJsInfo = fetchSimJsInfo;
         async function buildSimJsInfo(simOptions) {
             var _a;
             await loadPackageAsync(simOptions.id, simOptions.code, simOptions.dependencies);