coc-pyright 1.1.235 → 1.1.243

package/lib/index.js

@@ -76,7 +76,7 @@ var require_re = __commonJS({
     var R = 0;
     var createToken = (name, value, isGlobal) => {
       const index = R++;
-      debug(index, value);
+      debug(name, index, value);
       t[name] = index;
       src[index] = value;
       re[index] = new RegExp(value, isGlobal ? "g" : void 0);
@@ -122,8 +122,8 @@ var require_re = __commonJS({
     createToken("HYPHENRANGE", `^\\s*(${src[t.XRANGEPLAIN]})\\s+-\\s+(${src[t.XRANGEPLAIN]})\\s*$`);
     createToken("HYPHENRANGELOOSE", `^\\s*(${src[t.XRANGEPLAINLOOSE]})\\s+-\\s+(${src[t.XRANGEPLAINLOOSE]})\\s*$`);
     createToken("STAR", "(<|>)?=?\\s*\\*");
-    createToken("GTE0", "^\\s*>=\\s*0.0.0\\s*$");
-    createToken("GTE0PRE", "^\\s*>=\\s*0.0.0-0\\s*$");
+    createToken("GTE0", "^\\s*>=\\s*0\\.0\\.0\\s*$");
+    createToken("GTE0PRE", "^\\s*>=\\s*0\\.0\\.0-0\\s*$");
   }
 });
 
@@ -131,9 +131,9 @@ var require_re = __commonJS({
 var require_parse_options = __commonJS({
   "node_modules/semver/internal/parse-options.js"(exports, module2) {
     var opts = ["includePrerelease", "loose", "rtl"];
-    var parseOptions = (options) => !options ? {} : typeof options !== "object" ? { loose: true } : opts.filter((k) => options[k]).reduce((options2, k) => {
-      options2[k] = true;
-      return options2;
+    var parseOptions = (options) => !options ? {} : typeof options !== "object" ? { loose: true } : opts.filter((k) => options[k]).reduce((o, k) => {
+      o[k] = true;
+      return o;
     }, {});
     module2.exports = parseOptions;
   }
@@ -363,7 +363,7 @@ var require_semver = __commonJS({
               }
             }
             if (identifier) {
-              if (this.prerelease[0] === identifier) {
+              if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
                 if (isNaN(this.prerelease[1])) {
                   this.prerelease = [identifier, 0];
                 }
@@ -450,7 +450,7 @@ var require_inc = __commonJS({
         options = void 0;
       }
       try {
-        return new SemVer2(version, options).inc(release, identifier).version;
+        return new SemVer2(version instanceof SemVer2 ? version.version : version, options).inc(release, identifier).version;
       } catch (er) {
         return null;
       }
@@ -650,16 +650,20 @@ var require_cmp = __commonJS({
     var cmp = (a, op, b, loose) => {
       switch (op) {
         case "===":
-          if (typeof a === "object")
+          if (typeof a === "object") {
             a = a.version;
-          if (typeof b === "object")
+          }
+          if (typeof b === "object") {
             b = b.version;
+          }
           return a === b;
         case "!==":
-          if (typeof a === "object")
+          if (typeof a === "object") {
             a = a.version;
-          if (typeof b === "object")
+          }
+          if (typeof b === "object") {
             b = b.version;
+          }
           return a !== b;
         case "":
         case "=":
@@ -713,8 +717,9 @@ var require_coerce = __commonJS({
         }
         re[t.COERCERTL].lastIndex = -1;
       }
-      if (match === null)
+      if (match === null) {
         return null;
+      }
       return parse(`${match[2]}.${match[3] || "0"}.${match[4] || "0"}`, options);
     };
     module2.exports = coerce;
@@ -1395,16 +1400,16 @@ var require_range = __commonJS({
         this.loose = !!options.loose;
         this.includePrerelease = !!options.includePrerelease;
         this.raw = range;
-        this.set = range.split(/\s*\|\|\s*/).map((range2) => this.parseRange(range2.trim())).filter((c) => c.length);
+        this.set = range.split("||").map((r) => this.parseRange(r.trim())).filter((c) => c.length);
         if (!this.set.length) {
           throw new TypeError(`Invalid SemVer Range: ${range}`);
         }
         if (this.set.length > 1) {
           const first = this.set[0];
           this.set = this.set.filter((c) => !isNullSet(c[0]));
-          if (this.set.length === 0)
+          if (this.set.length === 0) {
             this.set = [first];
-          else if (this.set.length > 1) {
+          } else if (this.set.length > 1) {
             for (const c of this.set) {
               if (c.length === 1 && isAny(c[0])) {
                 this.set = [c];
@@ -1429,28 +1434,37 @@ var require_range = __commonJS({
         const memoOpts = Object.keys(this.options).join(",");
         const memoKey = `parseRange:${memoOpts}:${range}`;
         const cached = cache.get(memoKey);
-        if (cached)
+        if (cached) {
           return cached;
+        }
         const loose = this.options.loose;
         const hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE];
         range = range.replace(hr, hyphenReplace(this.options.includePrerelease));
         debug("hyphen replace", range);
         range = range.replace(re[t.COMPARATORTRIM], comparatorTrimReplace);
-        debug("comparator trim", range, re[t.COMPARATORTRIM]);
+        debug("comparator trim", range);
         range = range.replace(re[t.TILDETRIM], tildeTrimReplace);
         range = range.replace(re[t.CARETTRIM], caretTrimReplace);
         range = range.split(/\s+/).join(" ");
-        const compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
-        const rangeList = range.split(" ").map((comp) => parseComparator(comp, this.options)).join(" ").split(/\s+/).map((comp) => replaceGTE0(comp, this.options)).filter(this.options.loose ? (comp) => !!comp.match(compRe) : () => true).map((comp) => new Comparator(comp, this.options));
-        const l = rangeList.length;
+        let rangeList = range.split(" ").map((comp) => parseComparator(comp, this.options)).join(" ").split(/\s+/).map((comp) => replaceGTE0(comp, this.options));
+        if (loose) {
+          rangeList = rangeList.filter((comp) => {
+            debug("loose invalid filter", comp, this.options);
+            return !!comp.match(re[t.COMPARATORLOOSE]);
+          });
+        }
+        debug("range list", rangeList);
         const rangeMap = /* @__PURE__ */ new Map();
-        for (const comp of rangeList) {
-          if (isNullSet(comp))
+        const comparators = rangeList.map((comp) => new Comparator(comp, this.options));
+        for (const comp of comparators) {
+          if (isNullSet(comp)) {
             return [comp];
+          }
           rangeMap.set(comp.value, comp);
         }
-        if (rangeMap.size > 1 && rangeMap.has(""))
+        if (rangeMap.size > 1 && rangeMap.has("")) {
           rangeMap.delete("");
+        }
         const result = [...rangeMap.values()];
         cache.set(memoKey, result);
         return result;
@@ -1529,8 +1543,8 @@ var require_range = __commonJS({
       return comp;
     };
     var isX = (id) => !id || id.toLowerCase() === "x" || id === "*";
-    var replaceTildes = (comp, options) => comp.trim().split(/\s+/).map((comp2) => {
-      return replaceTilde(comp2, options);
+    var replaceTildes = (comp, options) => comp.trim().split(/\s+/).map((c) => {
+      return replaceTilde(c, options);
     }).join(" ");
     var replaceTilde = (comp, options) => {
       const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
@@ -1553,8 +1567,8 @@ var require_range = __commonJS({
         return ret;
       });
     };
-    var replaceCarets = (comp, options) => comp.trim().split(/\s+/).map((comp2) => {
-      return replaceCaret(comp2, options);
+    var replaceCarets = (comp, options) => comp.trim().split(/\s+/).map((c) => {
+      return replaceCaret(c, options);
     }).join(" ");
     var replaceCaret = (comp, options) => {
       debug("caret", comp, options);
@@ -1602,8 +1616,8 @@ var require_range = __commonJS({
     };
     var replaceXRanges = (comp, options) => {
       debug("replaceXRanges", comp, options);
-      return comp.split(/\s+/).map((comp2) => {
-        return replaceXRange(comp2, options);
+      return comp.split(/\s+/).map((c) => {
+        return replaceXRange(c, options);
       }).join(" ");
     };
     var replaceXRange = (comp, options) => {
@@ -1648,8 +1662,9 @@ var require_range = __commonJS({
               m = +m + 1;
             }
           }
-          if (gtlt === "<")
+          if (gtlt === "<") {
             pr = "-0";
+          }
           ret = `${gtlt + M}.${m}.${p}${pr}`;
         } else if (xm) {
           ret = `>=${M}.0.0${pr} <${+M + 1}.0.0-0`;
@@ -1946,8 +1961,9 @@ var require_min_version = __commonJS({
               throw new Error(`Unexpected operation: ${comparator.operator}`);
           }
         });
-        if (setMin && (!minver || gt(minver, setMin)))
+        if (setMin && (!minver || gt(minver, setMin))) {
           minver = setMin;
+        }
       }
       if (minver && range.test(minver)) {
         return minver;
@@ -2079,37 +2095,40 @@ var require_simplify = __commonJS({
     var compare = require_compare();
     module2.exports = (versions, range, options) => {
       const set = [];
-      let min = null;
+      let first = null;
       let prev = null;
       const v = versions.sort((a, b) => compare(a, b, options));
       for (const version of v) {
         const included = satisfies(version, range, options);
         if (included) {
           prev = version;
-          if (!min)
-            min = version;
+          if (!first) {
+            first = version;
+          }
         } else {
           if (prev) {
-            set.push([min, prev]);
+            set.push([first, prev]);
           }
           prev = null;
-          min = null;
+          first = null;
         }
       }
-      if (min)
-        set.push([min, null]);
+      if (first) {
+        set.push([first, null]);
+      }
       const ranges = [];
-      for (const [min2, max] of set) {
-        if (min2 === max)
-          ranges.push(min2);
-        else if (!max && min2 === v[0])
+      for (const [min, max] of set) {
+        if (min === max) {
+          ranges.push(min);
+        } else if (!max && min === v[0]) {
           ranges.push("*");
-        else if (!max)
-          ranges.push(`>=${min2}`);
-        else if (min2 === v[0])
+        } else if (!max) {
+          ranges.push(`>=${min}`);
+        } else if (min === v[0]) {
           ranges.push(`<=${max}`);
-        else
-          ranges.push(`${min2} - ${max}`);
+        } else {
+          ranges.push(`${min} - ${max}`);
+        }
       }
       const simplified = ranges.join(" || ");
       const original = typeof range.raw === "string" ? range.raw : String(range);
@@ -2127,8 +2146,9 @@ var require_subset = __commonJS({
     var satisfies = require_satisfies();
     var compare = require_compare();
     var subset = (sub, dom, options = {}) => {
-      if (sub === dom)
+      if (sub === dom) {
         return true;
+      }
       sub = new Range11(sub, options);
       dom = new Range11(dom, options);
       let sawNonNull = false;
@@ -2137,59 +2157,70 @@ var require_subset = __commonJS({
           for (const simpleDom of dom.set) {
             const isSub = simpleSubset(simpleSub, simpleDom, options);
             sawNonNull = sawNonNull || isSub !== null;
-            if (isSub)
+            if (isSub) {
               continue OUTER;
+            }
           }
-          if (sawNonNull)
+          if (sawNonNull) {
             return false;
+          }
         }
       return true;
     };
     var simpleSubset = (sub, dom, options) => {
-      if (sub === dom)
+      if (sub === dom) {
         return true;
+      }
       if (sub.length === 1 && sub[0].semver === ANY) {
-        if (dom.length === 1 && dom[0].semver === ANY)
+        if (dom.length === 1 && dom[0].semver === ANY) {
           return true;
-        else if (options.includePrerelease)
+        } else if (options.includePrerelease) {
           sub = [new Comparator(">=0.0.0-0")];
-        else
+        } else {
           sub = [new Comparator(">=0.0.0")];
+        }
       }
       if (dom.length === 1 && dom[0].semver === ANY) {
-        if (options.includePrerelease)
+        if (options.includePrerelease) {
           return true;
-        else
+        } else {
           dom = [new Comparator(">=0.0.0")];
+        }
       }
       const eqSet = /* @__PURE__ */ new Set();
       let gt, lt2;
       for (const c of sub) {
-        if (c.operator === ">" || c.operator === ">=")
+        if (c.operator === ">" || c.operator === ">=") {
           gt = higherGT(gt, c, options);
-        else if (c.operator === "<" || c.operator === "<=")
+        } else if (c.operator === "<" || c.operator === "<=") {
           lt2 = lowerLT(lt2, c, options);
-        else
+        } else {
           eqSet.add(c.semver);
+        }
       }
-      if (eqSet.size > 1)
+      if (eqSet.size > 1) {
         return null;
+      }
       let gtltComp;
       if (gt && lt2) {
         gtltComp = compare(gt.semver, lt2.semver, options);
-        if (gtltComp > 0)
+        if (gtltComp > 0) {
           return null;
-        else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<="))
+        } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
           return null;
+        }
       }
       for (const eq of eqSet) {
-        if (gt && !satisfies(eq, String(gt), options))
+        if (gt && !satisfies(eq, String(gt), options)) {
           return null;
-        if (lt2 && !satisfies(eq, String(lt2), options))
+        }
+        if (lt2 && !satisfies(eq, String(lt2), options)) {
           return null;
+        }
         for (const c of dom) {
-          if (!satisfies(eq, String(c), options))
+          if (!satisfies(eq, String(c), options)) {
             return false;
+          }
         }
         return true;
       }
@@ -2211,10 +2242,12 @@ var require_subset = __commonJS({
           }
           if (c.operator === ">" || c.operator === ">=") {
             higher = higherGT(gt, c, options);
-            if (higher === c && higher !== gt)
+            if (higher === c && higher !== gt) {
               return false;
-          } else if (gt.operator === ">=" && !satisfies(gt.semver, String(c), options))
+            }
+          } else if (gt.operator === ">=" && !satisfies(gt.semver, String(c), options)) {
             return false;
+          }
         }
         if (lt2) {
           if (needDomLTPre) {
@@ -2224,31 +2257,39 @@ var require_subset = __commonJS({
           }
           if (c.operator === "<" || c.operator === "<=") {
             lower = lowerLT(lt2, c, options);
-            if (lower === c && lower !== lt2)
+            if (lower === c && lower !== lt2) {
               return false;
-          } else if (lt2.operator === "<=" && !satisfies(lt2.semver, String(c), options))
+            }
+          } else if (lt2.operator === "<=" && !satisfies(lt2.semver, String(c), options)) {
             return false;
+          }
         }
-        if (!c.operator && (lt2 || gt) && gtltComp !== 0)
+        if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
           return false;
+        }
       }
-      if (gt && hasDomLT && !lt2 && gtltComp !== 0)
+      if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
         return false;
-      if (lt2 && hasDomGT && !gt && gtltComp !== 0)
+      }
+      if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
         return false;
-      if (needDomGTPre || needDomLTPre)
+      }
+      if (needDomGTPre || needDomLTPre) {
         return false;
+      }
       return true;
     };
     var higherGT = (a, b, options) => {
-      if (!a)
+      if (!a) {
         return b;
+      }
       const comp = compare(a.semver, b.semver, options);
       return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
     };
     var lowerLT = (a, b, options) => {
-      if (!a)
+      if (!a) {
         return b;
+      }
       const comp = compare(a.semver, b.semver, options);
       return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
     };
@@ -3325,7 +3366,6 @@ var require_fs = __commonJS({
     api.forEach((method2) => {
       exports[method2] = u(fs6[method2]);
     });
-    exports.realpath.native = u(fs6.realpath.native);
     exports.exists = function(filename, callback) {
       if (typeof callback === "function") {
         return fs6.exists(filename, callback);
@@ -3372,6 +3412,11 @@ var require_fs = __commonJS({
         });
       };
     }
+    if (typeof fs6.realpath.native === "function") {
+      exports.realpath.native = u(fs6.realpath.native);
+    } else {
+      process.emitWarning("fs.realpath.native is not a function. Is fs being monkey-patched?", "Warning", "fs-extra-WARN0003");
+    }
   }
 });
 
@@ -3646,9 +3691,7 @@ var require_copy = __commonJS({
       opts.clobber = "clobber" in opts ? !!opts.clobber : true;
       opts.overwrite = "overwrite" in opts ? !!opts.overwrite : opts.clobber;
       if (opts.preserveTimestamps && process.arch === "ia32") {
-        console.warn(`fs-extra: Using the preserveTimestamps option in 32-bit node is not recommended;
-
-    see https://github.com/jprichardson/node-fs-extra/issues/269`);
+        process.emitWarning("Using the preserveTimestamps option in 32-bit node is not recommended;\n\n	see https://github.com/jprichardson/node-fs-extra/issues/269", "Warning", "fs-extra-WARN0001");
       }
       stat.checkPaths(src, dest, "copy", opts, (err, stats) => {
         if (err)
@@ -3867,9 +3910,7 @@ var require_copy_sync = __commonJS({
       opts.clobber = "clobber" in opts ? !!opts.clobber : true;
       opts.overwrite = "overwrite" in opts ? !!opts.overwrite : opts.clobber;
       if (opts.preserveTimestamps && process.arch === "ia32") {
-        console.warn(`fs-extra: Using the preserveTimestamps option in 32-bit node is not recommended;
-
-    see https://github.com/jprichardson/node-fs-extra/issues/269`);
+        process.emitWarning("Using the preserveTimestamps option in 32-bit node is not recommended;\n\n	see https://github.com/jprichardson/node-fs-extra/issues/269", "Warning", "fs-extra-WARN0002");
       }
       const { srcStat, destStat } = stat.checkPathsSync(src, dest, "copy", opts);
       stat.checkParentPathsSync(src, srcStat, dest, "copy");
@@ -4911,6 +4952,7 @@ var require_move = __commonJS({
         cb = opts;
         opts = {};
       }
+      opts = opts || {};
       const overwrite = opts.overwrite || opts.clobber || false;
       stat.checkPaths(src, dest, "move", opts, (err, stats) => {
         if (err)
@@ -21230,7 +21272,8 @@ var _PythonSettings = class {
   }
   resolvePythonFromVENV() {
     function pythonBinFromPath(p) {
-      return process.platform === "win32" ? import_path.default.join(p, "Scripts", "python.exe") : import_path.default.join(p, "bin", "python");
+      const fullPath = process.platform === "win32" ? import_path.default.join(p, "Scripts", "python.exe") : import_path.default.join(p, "bin", "python");
+      return import_fs_extra.default.existsSync(fullPath) ? fullPath : void 0;
     }
     try {
       if (process.env.VIRTUAL_ENV && import_fs_extra.default.existsSync(import_path.default.join(process.env.VIRTUAL_ENV, "pyvenv.cfg"))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.235",
+  "version": "1.1.243",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -1403,6 +1403,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.235"
+    "pyright": "^1.1.243"
   }
 }