pxt-core 11.4.18 → 11.4.21

package/built/nodeutil.js

@@ -260,7 +260,7 @@ exports.getLocalTagPointingAtHeadAsync = getLocalTagPointingAtHeadAsync;
 async function npmVersionBumpAsync(bumpType, tagCommit = true) {
     const output = await spawnWithPipeAsync({
         cmd: addCmd("npm"),
-        args: ["version", bumpType, "--message", `"[pxt-cli] bump version to %s"`, "--git-tag-version", tagCommit ? "true" : "false"],
+        args: ["version", bumpType, "--message", quoteIfNeeded(`[pxt-cli] bump version to %s`), "--git-tag-version", tagCommit ? "true" : "false"],
         cwd: ".",
         silent: true,
     });
@@ -275,7 +275,7 @@ async function npmVersionBumpAsync(bumpType, tagCommit = true) {
         });
         await spawnAsync({
             cmd: "git",
-            args: ["commit", "-m", `"[pxt-cli] bump version to ${ver}"`],
+            args: ["commit", "-m", quoteIfNeeded(`[pxt-cli] bump version to ${ver}`)],
             cwd: ".",
             silent: true,
         });
@@ -283,6 +283,12 @@ async function npmVersionBumpAsync(bumpType, tagCommit = true) {
     return ver;
 }
 exports.npmVersionBumpAsync = npmVersionBumpAsync;
+function quoteIfNeeded(arg) {
+    if (os.platform() === "win32") {
+        return `"${arg}"`;
+    }
+    return arg;
+}
 function gitPushAsync(followTags = true) {
     const args = ["push"];
     if (followTags)

package/built/pxt.js

@@ -108978,11 +108978,35 @@ var pxt;
             }
             return null;
         }
-        function upgradedPackageReference(cfg, id) {
+        async function upgradedPackageReferenceAsync(cfg, id) {
             const rules = upgradeRules(cfg, id);
             if (!rules)
                 return null;
             for (const upgr of rules) {
+                const mv = /^move:(.*)$/.exec(upgr);
+                if (mv) {
+                    const new_repo = parseRepoId(mv[1]);
+                    if (new_repo) {
+                        if (!new_repo.tag) {
+                            new_repo.tag = await latestVersionAsync(mv[1], cfg);
+                        }
+                        const repo = parseRepoId(id);
+                        if (!new_repo.fileName && repo.fileName) {
+                            new_repo.fileName = repo.fileName;
+                            new_repo.fullName = join(new_repo.owner, new_repo.project, new_repo.fileName);
+                        }
+                        const new_repo_s = stringifyRepo(new_repo);
+                        pxt.debug(`upgrading ${id} to ${new_repo_s}}`);
+                        const np = await upgradedPackageReferenceAsync(cfg, new_repo_s);
+                        if (np)
+                            return np;
+                        else
+                            return new_repo_s;
+                    }
+                    else {
+                        pxt.log(`cannot parse move target: ${mv[1]}`);
+                    }
+                }
                 const m = /^min:(.*)/.exec(upgr);
                 const minV = m && pxt.semver.tryParse(m[1]);
                 if (minV) {
@@ -109007,7 +109031,7 @@ var pxt;
             }
             return id;
         }
-        github.upgradedPackageReference = upgradedPackageReference;
+        github.upgradedPackageReferenceAsync = upgradedPackageReferenceAsync;
         function upgradedPackageId(cfg, id) {
             const dv = upgradedDisablesVariants(cfg, id);
             if (dv)
@@ -113738,20 +113762,25 @@ var pxt;
             if (!this.config)
                 this.loadConfig();
             return pxt.packagesConfigAsync()
-                .then(packagesConfig => {
+                .then(async (packagesConfig) => {
                 let numfixes = 0;
                 let fixes = {};
+                const promises = [];
                 pxt.U.iterMap(this.config.dependencies, (pkg, ver) => {
-                    if (pxt.github.isGithubId(ver)) {
-                        const upgraded = pxt.github.upgradedPackageReference(packagesConfig, ver);
-                        if (upgraded && upgraded != ver) {
-                            pxt.log(`upgrading dep ${pkg}: ${ver} -> ${upgraded}`);
-                            fixes[ver] = upgraded;
-                            this.config.dependencies[pkg] = upgraded;
-                            numfixes++;
+                    const doit = async () => {
+                        if (pxt.github.isGithubId(ver)) {
+                            const upgraded = await pxt.github.upgradedPackageReferenceAsync(packagesConfig, ver);
+                            if (upgraded && upgraded != ver) {
+                                pxt.log(`upgrading dep ${pkg}: ${ver} -> ${upgraded}`);
+                                fixes[ver] = upgraded;
+                                this.config.dependencies[pkg] = upgraded;
+                                numfixes++;
+                            }
                         }
-                    }
+                    };
+                    promises.push(doit());
                 });
+                await Promise.all(promises);
                 if (numfixes)
                     this.saveConfig();
                 return numfixes && fixes;
@@ -113993,7 +114022,7 @@ var pxt;
             }
             // if we are installing this script, we haven't yet downloaded the config
             // do upgrade later
-            if (this.level == 0 && !isInstall) {
+            if (!isInstall) {
                 await this.upgradePackagesAsync();
             }
             if (isInstall) {
@@ -114009,13 +114038,14 @@ var pxt;
             }
             // we are installing the script, and we've download the original version and we haven't upgraded it yet
             // do upgrade and reload as needed
-            if (this.level == 0 && isInstall) {
+            if (isInstall) {
                 const fixes = await this.upgradePackagesAsync();
                 if (fixes) {
                     // worst case scenario with double load
                     Object.keys(fixes).forEach(key => pxt.tickEvent("package.doubleload", { "extension": key }));
                     pxt.log(`upgraded, downloading again`);
                     pxt.debug(fixes);
+                    // TODO: we should cache
                     await this.downloadAsync();
                 }
             }

package/built/pxtlib.d.ts

@@ -1506,7 +1506,7 @@ declare namespace pxt.github {
     function stringifyRepo(p: ParsedRepo, ignoreCase?: boolean): string;
     function normalizeRepoId(id: string, defaultTag?: string): string;
     function join(...parts: string[]): string;
-    function upgradedPackageReference(cfg: PackagesConfig, id: string): string;
+    function upgradedPackageReferenceAsync(cfg: PackagesConfig, id: string): Promise<string>;
     function upgradedPackageId(cfg: PackagesConfig, id: string): string;
     function latestVersionAsync(repopath: string, config: PackagesConfig, useProxy?: boolean, noCache?: boolean): Promise<string>;
     function resolveMonoRepoVersions(deps: pxt.Map<string>): pxt.Map<string>;

package/built/pxtlib.js

@@ -11292,11 +11292,35 @@ var pxt;
             }
             return null;
         }
-        function upgradedPackageReference(cfg, id) {
+        async function upgradedPackageReferenceAsync(cfg, id) {
             const rules = upgradeRules(cfg, id);
             if (!rules)
                 return null;
             for (const upgr of rules) {
+                const mv = /^move:(.*)$/.exec(upgr);
+                if (mv) {
+                    const new_repo = parseRepoId(mv[1]);
+                    if (new_repo) {
+                        if (!new_repo.tag) {
+                            new_repo.tag = await latestVersionAsync(mv[1], cfg);
+                        }
+                        const repo = parseRepoId(id);
+                        if (!new_repo.fileName && repo.fileName) {
+                            new_repo.fileName = repo.fileName;
+                            new_repo.fullName = join(new_repo.owner, new_repo.project, new_repo.fileName);
+                        }
+                        const new_repo_s = stringifyRepo(new_repo);
+                        pxt.debug(`upgrading ${id} to ${new_repo_s}}`);
+                        const np = await upgradedPackageReferenceAsync(cfg, new_repo_s);
+                        if (np)
+                            return np;
+                        else
+                            return new_repo_s;
+                    }
+                    else {
+                        pxt.log(`cannot parse move target: ${mv[1]}`);
+                    }
+                }
                 const m = /^min:(.*)/.exec(upgr);
                 const minV = m && pxt.semver.tryParse(m[1]);
                 if (minV) {
@@ -11321,7 +11345,7 @@ var pxt;
             }
             return id;
         }
-        github.upgradedPackageReference = upgradedPackageReference;
+        github.upgradedPackageReferenceAsync = upgradedPackageReferenceAsync;
         function upgradedPackageId(cfg, id) {
             const dv = upgradedDisablesVariants(cfg, id);
             if (dv)
@@ -16052,20 +16076,25 @@ var pxt;
             if (!this.config)
                 this.loadConfig();
             return pxt.packagesConfigAsync()
-                .then(packagesConfig => {
+                .then(async (packagesConfig) => {
                 let numfixes = 0;
                 let fixes = {};
+                const promises = [];
                 pxt.U.iterMap(this.config.dependencies, (pkg, ver) => {
-                    if (pxt.github.isGithubId(ver)) {
-                        const upgraded = pxt.github.upgradedPackageReference(packagesConfig, ver);
-                        if (upgraded && upgraded != ver) {
-                            pxt.log(`upgrading dep ${pkg}: ${ver} -> ${upgraded}`);
-                            fixes[ver] = upgraded;
-                            this.config.dependencies[pkg] = upgraded;
-                            numfixes++;
+                    const doit = async () => {
+                        if (pxt.github.isGithubId(ver)) {
+                            const upgraded = await pxt.github.upgradedPackageReferenceAsync(packagesConfig, ver);
+                            if (upgraded && upgraded != ver) {
+                                pxt.log(`upgrading dep ${pkg}: ${ver} -> ${upgraded}`);
+                                fixes[ver] = upgraded;
+                                this.config.dependencies[pkg] = upgraded;
+                                numfixes++;
+                            }
                         }
-                    }
+                    };
+                    promises.push(doit());
                 });
+                await Promise.all(promises);
                 if (numfixes)
                     this.saveConfig();
                 return numfixes && fixes;
@@ -16307,7 +16336,7 @@ var pxt;
             }
             // if we are installing this script, we haven't yet downloaded the config
             // do upgrade later
-            if (this.level == 0 && !isInstall) {
+            if (!isInstall) {
                 await this.upgradePackagesAsync();
             }
             if (isInstall) {
@@ -16323,13 +16352,14 @@ var pxt;
             }
             // we are installing the script, and we've download the original version and we haven't upgraded it yet
             // do upgrade and reload as needed
-            if (this.level == 0 && isInstall) {
+            if (isInstall) {
                 const fixes = await this.upgradePackagesAsync();
                 if (fixes) {
                     // worst case scenario with double load
                     Object.keys(fixes).forEach(key => pxt.tickEvent("package.doubleload", { "extension": key }));
                     pxt.log(`upgraded, downloading again`);
                     pxt.debug(fixes);
+                    // TODO: we should cache
                     await this.downloadAsync();
                 }
             }