pxt-core 9.2.4 → 9.2.6

package/built/pxt.js

@@ -114388,6 +114388,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)
@@ -114397,7 +114408,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;
@@ -114417,6 +114427,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 => {
@@ -114436,7 +114455,6 @@ var pxt;
             }
             return updatedContents;
         }
-        patching.patchJavaScript = patchJavaScript;
     })(patching = pxt.patching || (pxt.patching = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -123210,6 +123228,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;
         });
@@ -123243,6 +123264,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"); };
@@ -141718,7 +141755,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> {

package/built/pxtlib.js

@@ -16702,6 +16702,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)
@@ -16711,7 +16722,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;
@@ -16731,6 +16741,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 => {
@@ -16750,7 +16769,6 @@ var pxt;
             }
             return updatedContents;
         }
-        patching.patchJavaScript = patchJavaScript;
     })(patching = pxt.patching || (pxt.patching = {}));
 })(pxt || (pxt = {}));
 var pxt;