pxt-core 7.5.37 → 7.5.40

package/built/cli.js

@@ -5053,6 +5053,7 @@ function checkFileSize(files) {
     return maxSize;
 }
 function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
+    var _a;
     if (!nodeutil.existsDirSync("docs"))
         return Promise.resolve();
     const docsRoot = nodeutil.targetDir;
@@ -5230,6 +5231,13 @@ function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
     // test targetconfig
     if (nodeutil.fileExistsSync("targetconfig.json")) {
         const targetConfig = nodeutil.readJson("targetconfig.json");
+        if ((_a = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _a === void 0 ? void 0 : _a.approvedRepoLib) {
+            for (const repoSlug of Object.keys(targetConfig.packages.approvedRepoLib)) {
+                if (repoSlug !== repoSlug.toLocaleLowerCase()) {
+                    U.userError(`targetconfig.json: repo slugs in approvedRepoLib must be lowercased.\n\tError: ${repoSlug}`);
+                }
+            }
+        }
         if (targetConfig && targetConfig.galleries) {
             Object.keys(targetConfig.galleries).forEach(k => {
                 pxt.log(`gallery ${k}`);
@@ -5741,7 +5749,7 @@ function testGithubPackagesAsync(parsed) {
         .then(() => nodeutil.mkdirP(pkgsroot))
         .then(() => pxt.github.searchAsync("", packages))
         .then(ghrepos => ghrepos.filter(ghrepo => ghrepo.status == pxt.github.GitRepoStatus.Approved)
-        .map(ghrepo => ghrepo.fullName).concat(packages.approvedRepos || []))
+        .map(ghrepo => ghrepo.fullName).concat(Object.keys(packages.approvedRepoLib || {})))
         .then(fullnames => {
         // remove dups
         fullnames = U.unique(fullnames, f => f.toLowerCase());

package/built/pxt.js

@@ -108170,13 +108170,13 @@ var pxt;
             return false;
         }
         function isRepoApproved(repo, config) {
+            var _a;
             if (isOrgApproved(repo, config))
                 return true;
             if (!repo || !config)
                 return false;
             if (repo.fullName
-                && config.approvedRepos
-                && config.approvedRepos.some(fn => fn.toLowerCase() == repo.fullName.toLowerCase()))
+                && ((_a = config.approvedRepoLib) === null || _a === void 0 ? void 0 : _a[repo.fullName.toLowerCase()]))
                 return true;
             return false;
         }
@@ -108309,50 +108309,59 @@ var pxt;
             return parts.filter(p => !!p).join('/');
         }
         github.join = join;
-        function upgradeRule(cfg, id) {
-            if (!cfg || !cfg.upgrades)
+        function upgradeRules(cfg, id) {
+            if (!cfg)
                 return null;
             const parsed = parseRepoId(id);
             if (!parsed)
                 return null;
-            return pxt.U.lookup(cfg.upgrades, parsed.fullName.toLowerCase());
+            const repoData = cfg.approvedRepoLib;
+            // lookup base repo for upgrade rules
+            // (since nested repoes share the same version number)
+            return cfg.approvedRepoLib && pxt.U.lookup(cfg.approvedRepoLib, parsed.slug.toLowerCase()).upgrades;
         }
         function upgradedDisablesVariants(cfg, id) {
-            const upgr = upgradeRule(cfg, id);
-            const m = /^dv:(.*)/.exec(upgr);
-            if (m) {
-                const disabled = m[1].split(/,/);
-                if (disabled.some(d => !/^\w+$/.test(d)))
-                    return null;
-                return disabled;
+            const rules = upgradeRules(cfg, id) || [];
+            if (!rules)
+                return null;
+            for (const upgr of rules) {
+                const m = /^dv:(.*)/.exec(upgr);
+                if (m) {
+                    const disabled = m[1].split(/,/);
+                    if (disabled.some(d => !/^\w+$/.test(d)))
+                        return null;
+                    return disabled;
+                }
             }
             return null;
         }
         function upgradedPackageReference(cfg, id) {
-            const upgr = upgradeRule(cfg, id);
-            if (!upgr)
+            const rules = upgradeRules(cfg, id);
+            if (!rules)
                 return null;
-            const m = /^min:(.*)/.exec(upgr);
-            const minV = m && pxt.semver.tryParse(m[1]);
-            if (minV) {
-                const parsed = parseRepoId(id);
-                const currV = pxt.semver.tryParse(parsed.tag);
-                if (currV && pxt.semver.cmp(currV, minV) < 0) {
-                    parsed.tag = m[1];
-                    pxt.debug(`upgrading ${id} to ${m[1]}`);
-                    return stringifyRepo(parsed);
+            for (const upgr of rules) {
+                const m = /^min:(.*)/.exec(upgr);
+                const minV = m && pxt.semver.tryParse(m[1]);
+                if (minV) {
+                    const parsed = parseRepoId(id);
+                    const currV = pxt.semver.tryParse(parsed.tag);
+                    if (currV && pxt.semver.cmp(currV, minV) < 0) {
+                        parsed.tag = m[1];
+                        pxt.debug(`upgrading ${id} to ${m[1]}`);
+                        return stringifyRepo(parsed);
+                    }
+                    else {
+                        if (!currV)
+                            pxt.log(`not upgrading ${id} - cannot parse version`);
+                        return null;
+                    }
                 }
                 else {
-                    if (!currV)
-                        pxt.log(`not upgrading ${id} - cannot parse version`);
-                    return null;
+                    // check if the rule looks valid at all
+                    if (!upgradedDisablesVariants(cfg, id))
+                        pxt.log(`invalid upgrade rule: ${id} -> ${upgr}`);
                 }
             }
-            else {
-                // check if the rule looks valid at all
-                if (!upgradedDisablesVariants(cfg, id))
-                    pxt.log(`invalid upgrade rule: ${id} -> ${upgr}`);
-            }
             return id;
         }
         github.upgradedPackageReference = upgradedPackageReference;
@@ -111676,7 +111685,7 @@ var pxt;
                                 // if newversion does not have tag, it's ok
                                 // note: we are upgrade major versions as well
                                 || (ghNew.tag && pxt.semver.strcmp(ghCurrent.tag, ghNew.tag) < 0)) {
-                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (installed: {1}, installing: {2})", depPkg.id, depPkg._verspec, version));
+                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (added: {1}, adding: {2})", depPkg.id, depPkg._verspec, version));
                                 conflict.pkg0 = depPkg;
                                 conflict.isVersionConflict = true;
                                 conflicts.push(conflict);
@@ -111709,7 +111718,7 @@ var pxt;
                 conflicts.forEach((c) => {
                     additionalConflicts.push.apply(additionalConflicts, allAncestors(c.pkg0).map((anc) => {
                         const confl = new pxt.cpp.PkgConflictError(c.isVersionConflict ?
-                            lf("a dependency of {0} has a version mismatch with extension {1} (installed: {1}, installing: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
+                            lf("a dependency of {0} has a version mismatch with extension {1} (added: {1}, adding: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
                             lf("conflict on yotta setting {0} between extensions {1} and {2}", c.settingName, pkgCfg.name, c.pkg0.id));
                         confl.pkg0 = anc;
                         return confl;
@@ -155114,7 +155123,7 @@ var pxsim;
                     soundQueue.push({
                         notes,
                         onFinished: resolve,
-                        onCancelled: reject
+                        onCancelled: resolve
                     });
                 });
                 if (!playing) {
@@ -162200,6 +162209,7 @@ function checkFileSize(files) {
     return maxSize;
 }
 function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
+    var _a;
     if (!nodeutil.existsDirSync("docs"))
         return Promise.resolve();
     const docsRoot = nodeutil.targetDir;
@@ -162377,6 +162387,13 @@ function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
     // test targetconfig
     if (nodeutil.fileExistsSync("targetconfig.json")) {
         const targetConfig = nodeutil.readJson("targetconfig.json");
+        if ((_a = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _a === void 0 ? void 0 : _a.approvedRepoLib) {
+            for (const repoSlug of Object.keys(targetConfig.packages.approvedRepoLib)) {
+                if (repoSlug !== repoSlug.toLocaleLowerCase()) {
+                    U.userError(`targetconfig.json: repo slugs in approvedRepoLib must be lowercased.\n\tError: ${repoSlug}`);
+                }
+            }
+        }
         if (targetConfig && targetConfig.galleries) {
             Object.keys(targetConfig.galleries).forEach(k => {
                 pxt.log(`gallery ${k}`);
@@ -162888,7 +162905,7 @@ function testGithubPackagesAsync(parsed) {
         .then(() => nodeutil.mkdirP(pkgsroot))
         .then(() => pxt.github.searchAsync("", packages))
         .then(ghrepos => ghrepos.filter(ghrepo => ghrepo.status == pxt.github.GitRepoStatus.Approved)
-        .map(ghrepo => ghrepo.fullName).concat(packages.approvedRepos || []))
+        .map(ghrepo => ghrepo.fullName).concat(Object.keys(packages.approvedRepoLib || {})))
         .then(fullnames => {
         // remove dups
         fullnames = U.unique(fullnames, f => f.toLowerCase());

package/built/pxtlib.js

@@ -10484,13 +10484,13 @@ var pxt;
             return false;
         }
         function isRepoApproved(repo, config) {
+            var _a;
             if (isOrgApproved(repo, config))
                 return true;
             if (!repo || !config)
                 return false;
             if (repo.fullName
-                && config.approvedRepos
-                && config.approvedRepos.some(fn => fn.toLowerCase() == repo.fullName.toLowerCase()))
+                && ((_a = config.approvedRepoLib) === null || _a === void 0 ? void 0 : _a[repo.fullName.toLowerCase()]))
                 return true;
             return false;
         }
@@ -10623,50 +10623,59 @@ var pxt;
             return parts.filter(p => !!p).join('/');
         }
         github.join = join;
-        function upgradeRule(cfg, id) {
-            if (!cfg || !cfg.upgrades)
+        function upgradeRules(cfg, id) {
+            if (!cfg)
                 return null;
             const parsed = parseRepoId(id);
             if (!parsed)
                 return null;
-            return pxt.U.lookup(cfg.upgrades, parsed.fullName.toLowerCase());
+            const repoData = cfg.approvedRepoLib;
+            // lookup base repo for upgrade rules
+            // (since nested repoes share the same version number)
+            return cfg.approvedRepoLib && pxt.U.lookup(cfg.approvedRepoLib, parsed.slug.toLowerCase()).upgrades;
         }
         function upgradedDisablesVariants(cfg, id) {
-            const upgr = upgradeRule(cfg, id);
-            const m = /^dv:(.*)/.exec(upgr);
-            if (m) {
-                const disabled = m[1].split(/,/);
-                if (disabled.some(d => !/^\w+$/.test(d)))
-                    return null;
-                return disabled;
+            const rules = upgradeRules(cfg, id) || [];
+            if (!rules)
+                return null;
+            for (const upgr of rules) {
+                const m = /^dv:(.*)/.exec(upgr);
+                if (m) {
+                    const disabled = m[1].split(/,/);
+                    if (disabled.some(d => !/^\w+$/.test(d)))
+                        return null;
+                    return disabled;
+                }
             }
             return null;
         }
         function upgradedPackageReference(cfg, id) {
-            const upgr = upgradeRule(cfg, id);
-            if (!upgr)
+            const rules = upgradeRules(cfg, id);
+            if (!rules)
                 return null;
-            const m = /^min:(.*)/.exec(upgr);
-            const minV = m && pxt.semver.tryParse(m[1]);
-            if (minV) {
-                const parsed = parseRepoId(id);
-                const currV = pxt.semver.tryParse(parsed.tag);
-                if (currV && pxt.semver.cmp(currV, minV) < 0) {
-                    parsed.tag = m[1];
-                    pxt.debug(`upgrading ${id} to ${m[1]}`);
-                    return stringifyRepo(parsed);
+            for (const upgr of rules) {
+                const m = /^min:(.*)/.exec(upgr);
+                const minV = m && pxt.semver.tryParse(m[1]);
+                if (minV) {
+                    const parsed = parseRepoId(id);
+                    const currV = pxt.semver.tryParse(parsed.tag);
+                    if (currV && pxt.semver.cmp(currV, minV) < 0) {
+                        parsed.tag = m[1];
+                        pxt.debug(`upgrading ${id} to ${m[1]}`);
+                        return stringifyRepo(parsed);
+                    }
+                    else {
+                        if (!currV)
+                            pxt.log(`not upgrading ${id} - cannot parse version`);
+                        return null;
+                    }
                 }
                 else {
-                    if (!currV)
-                        pxt.log(`not upgrading ${id} - cannot parse version`);
-                    return null;
+                    // check if the rule looks valid at all
+                    if (!upgradedDisablesVariants(cfg, id))
+                        pxt.log(`invalid upgrade rule: ${id} -> ${upgr}`);
                 }
             }
-            else {
-                // check if the rule looks valid at all
-                if (!upgradedDisablesVariants(cfg, id))
-                    pxt.log(`invalid upgrade rule: ${id} -> ${upgr}`);
-            }
             return id;
         }
         github.upgradedPackageReference = upgradedPackageReference;
@@ -13990,7 +13999,7 @@ var pxt;
                                 // if newversion does not have tag, it's ok
                                 // note: we are upgrade major versions as well
                                 || (ghNew.tag && pxt.semver.strcmp(ghCurrent.tag, ghNew.tag) < 0)) {
-                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (installed: {1}, installing: {2})", depPkg.id, depPkg._verspec, version));
+                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (added: {1}, adding: {2})", depPkg.id, depPkg._verspec, version));
                                 conflict.pkg0 = depPkg;
                                 conflict.isVersionConflict = true;
                                 conflicts.push(conflict);
@@ -14023,7 +14032,7 @@ var pxt;
                 conflicts.forEach((c) => {
                     additionalConflicts.push.apply(additionalConflicts, allAncestors(c.pkg0).map((anc) => {
                         const confl = new pxt.cpp.PkgConflictError(c.isVersionConflict ?
-                            lf("a dependency of {0} has a version mismatch with extension {1} (installed: {1}, installing: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
+                            lf("a dependency of {0} has a version mismatch with extension {1} (added: {1}, adding: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
                             lf("conflict on yotta setting {0} between extensions {1} and {2}", c.settingName, pkgCfg.name, c.pkg0.id));
                         confl.pkg0 = anc;
                         return confl;

package/built/pxtsim.js

@@ -8492,7 +8492,7 @@ var pxsim;
                     soundQueue.push({
                         notes,
                         onFinished: resolve,
-                        onCancelled: reject
+                        onCancelled: resolve
                     });
                 });
                 if (!playing) {