pxt-core 7.5.49 → 7.5.52

package/built/pxt.js

@@ -111928,15 +111928,22 @@ var pxt;
                         // this may be an issue if the user does not create releases
                         // and pulls from master
                         const modtag = (modid === null || modid === void 0 ? void 0 : modid.tag) || ((_a = mod.config) === null || _a === void 0 ? void 0 : _a.version);
+                        const vertag = verid.tag;
+                        // if there is no tag on the current dependency, 
+                        // assume same as existing module version if any
+                        if (modtag && !vertag) {
+                            pxt.debug(`unversioned ${ver}, using ${modtag}`);
+                            return;
+                        }
                         const c = pxt.semver.strcmp(modtag, verid.tag);
                         if (c == 0) {
                             // turns out to be the same versions
                             pxt.debug(`resolved version are ${modtag}`);
                             return;
                         }
-                        else if (c < 0) {
-                            // already loaded version of dependencies is greater
-                            // than current version, use it instead
+                        else if (c > 0) {
+                            // already loaded version of dependencies (modtag) is greater
+                            // than current version (ver), use it instead
                             pxt.debug(`auto-upgraded ${ver} to ${modtag}`);
                             return;
                         }
@@ -111962,6 +111969,28 @@ var pxt;
                     pxt.debug(`dep: load ${from.id}.${id}${isCpp ? "++" : ""}: ${ver}`);
                     if (id == "hw" && pxt.hwVariant)
                         id = "hw---" + pxt.hwVariant;
+                    // for github references, make sure the version is compatible with previously
+                    // loaded references, regardless of the id
+                    const ghver = pxt.github.parseRepoId(ver);
+                    if (ghver === null || ghver === void 0 ? void 0 : ghver.slug) {
+                        // let's start by resolving the maximum version
+                        // number of the parent repo already loaded
+                        const repoVersions = Object.values(from.parent.deps)
+                            .map(p => pxt.github.parseRepoId(p._verspec))
+                            .filter(v => (v === null || v === void 0 ? void 0 : v.slug) === ghver.slug)
+                            .map(v => v.tag);
+                        const repoVersion = repoVersions
+                            .reduce((v1, v2) => pxt.semver.strcmp(v1, v2) > 0 ? v1 : v2, "0.0.0");
+                        pxt.debug(`dep: common repo ${ghver.slug} version found ${repoVersion}`);
+                        if (pxt.semver.strcmp(repoVersion, "0.0.0") > 0) {
+                            // now let's check if we have a higher version to use
+                            if (!ghver.tag || pxt.semver.strcmp(repoVersion, ghver.tag) > 0) {
+                                pxt.debug(`dep: upgrade from ${ghver.tag} to ${repoVersion}`);
+                                ghver.tag = repoVersion;
+                                ver = pxt.github.stringifyRepo(ghver);
+                            }
+                        }
+                    }
                     let mod = from.resolveDep(id);
                     if (mod) {
                         // check if the current dependecy matches the ones
@@ -112834,6 +112863,11 @@ var pxt;
             return aa.major - bb.major;
         }
         semver.majorCmp = majorCmp;
+        /**
+         * Compares two semver version strings and returns -1 if a < b, 1 if a > b and 0
+         * if versions are equivalent. If a and b are invalid versions, classic strcmp is called.
+         * If a (or b) is an invalid version, it is considered greater than any version (strmp(undefined, "0.0.0") = 1)
+         */
         function strcmp(a, b) {
             let aa = tryParse(a);
             let bb = tryParse(b);

package/built/pxteditor.d.ts

@@ -349,7 +349,6 @@ declare namespace pxt.editor {
         collapsed?: boolean;
         simSerialActive?: boolean;
         devSerialActive?: boolean;
-        csvSerialActive?: boolean;
     }
     interface IFieldCustomOptions {
         selector: string;

package/built/pxtlib.d.ts

@@ -1930,6 +1930,11 @@ declare namespace pxt.semver {
     function normalize(v: string): string;
     function stringify(v: Version): string;
     function majorCmp(a: string, b: string): number;
+    /**
+     * Compares two semver version strings and returns -1 if a < b, 1 if a > b and 0
+     * if versions are equivalent. If a and b are invalid versions, classic strcmp is called.
+     * If a (or b) is an invalid version, it is considered greater than any version (strmp(undefined, "0.0.0") = 1)
+     */
     function strcmp(a: string, b: string): number;
     function inRange(rng: string, v: Version): boolean;
     /**

package/built/pxtlib.js

@@ -14242,15 +14242,22 @@ var pxt;
                         // this may be an issue if the user does not create releases
                         // and pulls from master
                         const modtag = (modid === null || modid === void 0 ? void 0 : modid.tag) || ((_a = mod.config) === null || _a === void 0 ? void 0 : _a.version);
+                        const vertag = verid.tag;
+                        // if there is no tag on the current dependency, 
+                        // assume same as existing module version if any
+                        if (modtag && !vertag) {
+                            pxt.debug(`unversioned ${ver}, using ${modtag}`);
+                            return;
+                        }
                         const c = pxt.semver.strcmp(modtag, verid.tag);
                         if (c == 0) {
                             // turns out to be the same versions
                             pxt.debug(`resolved version are ${modtag}`);
                             return;
                         }
-                        else if (c < 0) {
-                            // already loaded version of dependencies is greater
-                            // than current version, use it instead
+                        else if (c > 0) {
+                            // already loaded version of dependencies (modtag) is greater
+                            // than current version (ver), use it instead
                             pxt.debug(`auto-upgraded ${ver} to ${modtag}`);
                             return;
                         }
@@ -14276,6 +14283,28 @@ var pxt;
                     pxt.debug(`dep: load ${from.id}.${id}${isCpp ? "++" : ""}: ${ver}`);
                     if (id == "hw" && pxt.hwVariant)
                         id = "hw---" + pxt.hwVariant;
+                    // for github references, make sure the version is compatible with previously
+                    // loaded references, regardless of the id
+                    const ghver = pxt.github.parseRepoId(ver);
+                    if (ghver === null || ghver === void 0 ? void 0 : ghver.slug) {
+                        // let's start by resolving the maximum version
+                        // number of the parent repo already loaded
+                        const repoVersions = Object.values(from.parent.deps)
+                            .map(p => pxt.github.parseRepoId(p._verspec))
+                            .filter(v => (v === null || v === void 0 ? void 0 : v.slug) === ghver.slug)
+                            .map(v => v.tag);
+                        const repoVersion = repoVersions
+                            .reduce((v1, v2) => pxt.semver.strcmp(v1, v2) > 0 ? v1 : v2, "0.0.0");
+                        pxt.debug(`dep: common repo ${ghver.slug} version found ${repoVersion}`);
+                        if (pxt.semver.strcmp(repoVersion, "0.0.0") > 0) {
+                            // now let's check if we have a higher version to use
+                            if (!ghver.tag || pxt.semver.strcmp(repoVersion, ghver.tag) > 0) {
+                                pxt.debug(`dep: upgrade from ${ghver.tag} to ${repoVersion}`);
+                                ghver.tag = repoVersion;
+                                ver = pxt.github.stringifyRepo(ghver);
+                            }
+                        }
+                    }
                     let mod = from.resolveDep(id);
                     if (mod) {
                         // check if the current dependecy matches the ones
@@ -15148,6 +15177,11 @@ var pxt;
             return aa.major - bb.major;
         }
         semver.majorCmp = majorCmp;
+        /**
+         * Compares two semver version strings and returns -1 if a < b, 1 if a > b and 0
+         * if versions are equivalent. If a and b are invalid versions, classic strcmp is called.
+         * If a (or b) is an invalid version, it is considered greater than any version (strmp(undefined, "0.0.0") = 1)
+         */
         function strcmp(a, b) {
             let aa = tryParse(a);
             let bb = tryParse(b);