@zzzen/pyright-internal 1.2.0-dev.20250209 → 1.2.0-dev.20250216

package/dist/partialStubService.js

@@ -0,0 +1,138 @@
+"use strict";
+/*
+ * partialStubService.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * A service that maps partial stub packages into the original directory of the installed library.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PartialStubService = exports.SupportPartialStubs = void 0;
+const pyTypedUtils_1 = require("./analyzer/pyTypedUtils");
+const pathConsts_1 = require("./common/pathConsts");
+const uriUtils_1 = require("./common/uri/uriUtils");
+var SupportPartialStubs;
+(function (SupportPartialStubs) {
+    function is(value) {
+        return (value.isPartialStubPackagesScanned &&
+            value.isPathScanned &&
+            value.processPartialStubPackages &&
+            value.clearPartialStubs);
+    }
+    SupportPartialStubs.is = is;
+})(SupportPartialStubs || (exports.SupportPartialStubs = SupportPartialStubs = {}));
+class PartialStubService {
+    constructor(_realFs) {
+        this._realFs = _realFs;
+        // Root paths processed
+        this._rootSearched = new Set();
+        // Partial stub package paths processed
+        this._partialStubPackagePaths = new Set();
+        // Disposables to cleanup moved directories
+        this._movedDirectories = [];
+    }
+    isPartialStubPackagesScanned(execEnv) {
+        return execEnv.root ? this.isPathScanned(execEnv.root) : false;
+    }
+    isPathScanned(uri) {
+        return this._rootSearched.has(uri.key);
+    }
+    processPartialStubPackages(paths, roots, bundledStubPath, allowMoving) {
+        const allowMovingFn = allowMoving ?? this._allowMoving.bind(this);
+        for (const path of paths) {
+            this._rootSearched.add(path.key);
+            if (!this._realFs.existsSync(path) || !(0, uriUtils_1.isDirectory)(this._realFs, path)) {
+                continue;
+            }
+            let dirEntries = [];
+            try {
+                dirEntries = this._realFs.readdirEntriesSync(path);
+            }
+            catch {
+                // Leave empty set of dir entries to process.
+            }
+            const isBundledStub = path.equals(bundledStubPath);
+            for (const entry of dirEntries) {
+                const partialStubPackagePath = path.combinePaths(entry.name);
+                const isDirectory = !entry.isSymbolicLink()
+                    ? entry.isDirectory()
+                    : !!(0, uriUtils_1.tryStat)(this._realFs, partialStubPackagePath)?.isDirectory();
+                if (!isDirectory || !entry.name.endsWith(pathConsts_1.stubsSuffix)) {
+                    continue;
+                }
+                const pyTypedInfo = (0, pyTypedUtils_1.getPyTypedInfo)(this._realFs, partialStubPackagePath);
+                if (!pyTypedInfo || !pyTypedInfo.isPartiallyTyped) {
+                    // Stub-Package is fully typed.
+                    continue;
+                }
+                // We found partially typed stub-packages.
+                this._partialStubPackagePaths.add(partialStubPackagePath.key);
+                // Search the root to see whether we have matching package installed.
+                const packageName = entry.name.substr(0, entry.name.length - pathConsts_1.stubsSuffix.length);
+                for (const root of roots) {
+                    const packagePath = root.combinePaths(packageName);
+                    try {
+                        const stat = (0, uriUtils_1.tryStat)(this._realFs, packagePath);
+                        if (!stat?.isDirectory()) {
+                            continue;
+                        }
+                        // If partial stub we found is from bundled stub and library installed is marked as py.typed
+                        // ignore bundled partial stub.
+                        if (!allowMovingFn(isBundledStub, (0, pyTypedUtils_1.getPyTypedInfo)(this._realFs, packagePath), pyTypedInfo)) {
+                            continue;
+                        }
+                        // Merge partial stub packages to the library.
+                        this._movedDirectories.push(this._realFs.mapDirectory(packagePath, partialStubPackagePath, (u, fs) => u.hasExtension('.pyi') || (fs.existsSync(u) && fs.statSync(u).isDirectory())));
+                    }
+                    catch {
+                        // ignore
+                    }
+                }
+            }
+        }
+    }
+    clearPartialStubs() {
+        this._rootSearched.clear();
+        this._partialStubPackagePaths.clear();
+        this._movedDirectories.forEach((d) => d.dispose());
+        this._movedDirectories = [];
+    }
+    _allowMoving(isBundled, packagePyTyped, _stubPyTyped) {
+        if (!isBundled) {
+            return true;
+        }
+        // If partial stub we found is from bundled stub and library installed is marked as py.typed
+        // allow moving only if the package is marked as partially typed.
+        return !packagePyTyped || packagePyTyped.isPartiallyTyped;
+    }
+    _getRelativePathPartialStubs(partialStubPath) {
+        const relativePaths = [];
+        const searchAllStubs = (uri) => {
+            for (const entry of this._realFs.readdirEntriesSync(uri)) {
+                const filePath = uri.combinePaths(entry.name);
+                let isDirectory = entry.isDirectory();
+                let isFile = entry.isFile();
+                if (entry.isSymbolicLink()) {
+                    const stat = (0, uriUtils_1.tryStat)(this._realFs, filePath);
+                    if (stat) {
+                        isDirectory = stat.isDirectory();
+                        isFile = stat.isFile();
+                    }
+                }
+                if (isDirectory) {
+                    searchAllStubs(filePath);
+                }
+                if (isFile && entry.name.endsWith('.pyi')) {
+                    const relative = partialStubPath.getRelativePathComponents(filePath).join('/');
+                    if (relative) {
+                        relativePaths.push(relative);
+                    }
+                }
+            }
+        };
+        searchAllStubs(partialStubPath);
+        return relativePaths;
+    }
+}
+exports.PartialStubService = PartialStubService;
+//# sourceMappingURL=partialStubService.js.map

package/dist/partialStubService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"partialStubService.js","sourceRoot":"","sources":["../../../../src/partialStubService.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,0DAAsE;AAGtE,oDAAkD;AAElD,oDAA6D;AAU7D,IAAiB,mBAAmB,CASnC;AATD,WAAiB,mBAAmB;IAChC,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,CACH,KAAK,CAAC,4BAA4B;YAClC,KAAK,CAAC,aAAa;YACnB,KAAK,CAAC,0BAA0B;YAChC,KAAK,CAAC,iBAAiB,CAC1B,CAAC;IACN,CAAC;IAPe,sBAAE,KAOjB,CAAA;AACL,CAAC,EATgB,mBAAmB,mCAAnB,mBAAmB,QASnC;AAED,MAAa,kBAAkB;IAU3B,YAAoB,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;QATvC,uBAAuB;QACN,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAEnD,uCAAuC;QACtB,6BAAwB,GAAG,IAAI,GAAG,EAAU,CAAC;QAE9D,2CAA2C;QACnC,sBAAiB,GAAiB,EAAE,CAAC;IAEH,CAAC;IAE3C,4BAA4B,CAAC,OAA6B;QACtD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,CAAC;IAED,aAAa,CAAC,GAAQ;QAClB,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,0BAA0B,CACtB,KAAY,EACZ,KAAY,EACZ,eAAqB,EACrB,WAIY;QAEZ,MAAM,aAAa,GAAG,WAAW,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEjC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,sBAAW,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBACrE,SAAS;YACb,CAAC;YAED,IAAI,UAAU,GAAgB,EAAE,CAAC;YAEjC,IAAI,CAAC;gBACD,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC;gBACL,6CAA6C;YACjD,CAAC;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACnD,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;gBAC7B,MAAM,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7D,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE;oBACvC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE;oBACrB,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAO,EAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,EAAE,WAAW,EAAE,CAAC;gBAErE,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAW,CAAC,EAAE,CAAC;oBACpD,SAAS;gBACb,CAAC;gBAED,MAAM,WAAW,GAAG,IAAA,6BAAc,EAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;gBACzE,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;oBAChD,+BAA+B;oBAC/B,SAAS;gBACb,CAAC;gBAED,0CAA0C;gBAC1C,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;gBAE9D,qEAAqE;gBACrE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,wBAAW,CAAC,MAAM,CAAC,CAAC;gBACjF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACvB,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;oBACnD,IAAI,CAAC;wBACD,MAAM,IAAI,GAAG,IAAA,kBAAO,EAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;wBAChD,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC;4BACvB,SAAS;wBACb,CAAC;wBAED,4FAA4F;wBAC5F,+BAA+B;wBAC/B,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAA,6BAAc,EAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC;4BACxF,SAAS;wBACb,CAAC;wBACD,8CAA8C;wBAC9C,IAAI,CAAC,iBAAiB,CAAC,IAAI,CACvB,IAAI,CAAC,OAAO,CAAC,YAAY,CACrB,WAAW,EACX,sBAAsB,EACtB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAC1F,CACJ,CAAC;oBACN,CAAC;oBAAC,MAAM,CAAC;wBACL,SAAS;oBACb,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,iBAAiB;QACb,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACtC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAChC,CAAC;IAEO,YAAY,CAChB,SAAkB,EAClB,cAAuC,EACvC,YAAyB;QAEzB,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,4FAA4F;QAC5F,iEAAiE;QACjE,OAAO,CAAC,cAAc,IAAI,cAAc,CAAC,gBAAgB,CAAC;IAC9D,CAAC;IAEO,4BAA4B,CAAC,eAAoB;QACrD,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,MAAM,cAAc,GAAG,CAAC,GAAQ,EAAE,EAAE;YAChC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvD,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAE9C,IAAI,WAAW,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtC,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC5B,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;oBACzB,MAAM,IAAI,GAAG,IAAA,kBAAO,EAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;oBAC7C,IAAI,IAAI,EAAE,CAAC;wBACP,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;wBACjC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;oBAC3B,CAAC;gBACL,CAAC;gBAED,IAAI,WAAW,EAAE,CAAC;oBACd,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAC7B,CAAC;gBAED,IAAI,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACxC,MAAM,QAAQ,GAAG,eAAe,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC/E,IAAI,QAAQ,EAAE,CAAC;wBACX,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACjC,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC,CAAC;QAEF,cAAc,CAAC,eAAe,CAAC,CAAC;QAChC,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ;AAtJD,gDAsJC"}

package/dist/pyrightFileSystem.d.ts

@@ -1,23 +1,10 @@
 import type * as fs from 'fs';
-import { PyTypedInfo } from './analyzer/pyTypedUtils';
-import { ExecutionEnvironment } from './common/configOptions';
 import { FileSystem, MkDirOptions } from './common/fileSystem';
 import { Uri } from './common/uri/uri';
 import { ReadOnlyAugmentedFileSystem } from './readonlyAugmentedFileSystem';
-export interface SupportPartialStubs {
-    isPartialStubPackagesScanned(execEnv: ExecutionEnvironment): boolean;
-    isPathScanned(path: Uri): boolean;
-    processPartialStubPackages(paths: Uri[], roots: Uri[], bundledStubPath?: Uri): void;
-    clearPartialStubs(): void;
-}
-export declare namespace SupportPartialStubs {
-    function is(value: any): value is SupportPartialStubs;
-}
-export interface IPyrightFileSystem extends FileSystem, SupportPartialStubs {
+export interface IPyrightFileSystem extends FileSystem {
 }
 export declare class PyrightFileSystem extends ReadOnlyAugmentedFileSystem implements IPyrightFileSystem {
-    private readonly _rootSearched;
-    private readonly _partialStubPackagePaths;
     constructor(realFS: FileSystem);
     mkdirSync(uri: Uri, options?: MkDirOptions): void;
     chdir(uri: Uri): void;
@@ -26,11 +13,4 @@ export declare class PyrightFileSystem extends ReadOnlyAugmentedFileSystem imple
     unlinkSync(uri: Uri): void;
     createWriteStream(uri: Uri): fs.WriteStream;
     copyFileSync(src: Uri, dst: Uri): void;
-    isPartialStubPackagesScanned(execEnv: ExecutionEnvironment): boolean;
-    isPathScanned(uri: Uri): boolean;
-    processPartialStubPackages(paths: Uri[], roots: Uri[], bundledStubPath?: Uri, allowMoving?: (isBundled: boolean, packagePyTyped: PyTypedInfo | undefined, _stubPyTyped: PyTypedInfo) => boolean): void;
-    clearPartialStubs(): void;
-    protected isMovedEntry(uri: Uri): boolean;
-    private _allowMoving;
-    private _getRelativePathPartialStubs;
 }

package/dist/pyrightFileSystem.js

@@ -4,34 +4,14 @@
  * Copyright (c) Microsoft Corporation.
  * Licensed under the MIT license.
  *
- * A file system that knows how to deal with partial stub files.
- * Files within a partial stub package act as though they are
- * copied into the associated package, and the combined set of
- * files is treated as one.
+ * A file system that knows how to deal with remapping files from one folder to another.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PyrightFileSystem = exports.SupportPartialStubs = void 0;
-const pyTypedUtils_1 = require("./analyzer/pyTypedUtils");
-const pathConsts_1 = require("./common/pathConsts");
-const uriUtils_1 = require("./common/uri/uriUtils");
+exports.PyrightFileSystem = void 0;
 const readonlyAugmentedFileSystem_1 = require("./readonlyAugmentedFileSystem");
-var SupportPartialStubs;
-(function (SupportPartialStubs) {
-    function is(value) {
-        return (value.isPartialStubPackagesScanned &&
-            value.isPathScanned &&
-            value.processPartialStubPackages &&
-            value.clearPartialStubs);
-    }
-    SupportPartialStubs.is = is;
-})(SupportPartialStubs || (exports.SupportPartialStubs = SupportPartialStubs = {}));
 class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedFileSystem {
     constructor(realFS) {
         super(realFS);
-        // Root paths processed
-        this._rootSearched = new Set();
-        // Partial stub package paths processed
-        this._partialStubPackagePaths = new Set();
     }
     mkdirSync(uri, options) {
         this.realFS.mkdirSync(uri, options);
@@ -40,129 +20,19 @@ class PyrightFileSystem extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedF
         this.realFS.chdir(uri);
     }
     writeFileSync(uri, data, encoding) {
-        this.realFS.writeFileSync(this.getOriginalPath(uri), data, encoding);
+        this.realFS.writeFileSync(this.getOriginalUri(uri), data, encoding);
     }
     rmdirSync(uri) {
-        this.realFS.rmdirSync(this.getOriginalPath(uri));
+        this.realFS.rmdirSync(this.getOriginalUri(uri));
     }
     unlinkSync(uri) {
-        this.realFS.unlinkSync(this.getOriginalPath(uri));
+        this.realFS.unlinkSync(this.getOriginalUri(uri));
     }
     createWriteStream(uri) {
-        return this.realFS.createWriteStream(this.getOriginalPath(uri));
+        return this.realFS.createWriteStream(this.getOriginalUri(uri));
     }
     copyFileSync(src, dst) {
-        this.realFS.copyFileSync(this.getOriginalPath(src), this.getOriginalPath(dst));
-    }
-    isPartialStubPackagesScanned(execEnv) {
-        return execEnv.root ? this.isPathScanned(execEnv.root) : false;
-    }
-    isPathScanned(uri) {
-        return this._rootSearched.has(uri.key);
-    }
-    processPartialStubPackages(paths, roots, bundledStubPath, allowMoving) {
-        const allowMovingFn = allowMoving ?? this._allowMoving.bind(this);
-        for (const path of paths) {
-            this._rootSearched.add(path.key);
-            if (!this.realFS.existsSync(path) || !(0, uriUtils_1.isDirectory)(this.realFS, path)) {
-                continue;
-            }
-            let dirEntries = [];
-            try {
-                dirEntries = this.realFS.readdirEntriesSync(path);
-            }
-            catch {
-                // Leave empty set of dir entries to process.
-            }
-            const isBundledStub = path.equals(bundledStubPath);
-            for (const entry of dirEntries) {
-                const partialStubPackagePath = path.combinePaths(entry.name);
-                const isDirectory = !entry.isSymbolicLink()
-                    ? entry.isDirectory()
-                    : !!(0, uriUtils_1.tryStat)(this.realFS, partialStubPackagePath)?.isDirectory();
-                if (!isDirectory || !entry.name.endsWith(pathConsts_1.stubsSuffix)) {
-                    continue;
-                }
-                const pyTypedInfo = (0, pyTypedUtils_1.getPyTypedInfo)(this.realFS, partialStubPackagePath);
-                if (!pyTypedInfo || !pyTypedInfo.isPartiallyTyped) {
-                    // Stub-Package is fully typed.
-                    continue;
-                }
-                // We found partially typed stub-packages.
-                this._partialStubPackagePaths.add(partialStubPackagePath.key);
-                // Search the root to see whether we have matching package installed.
-                let partialStubs;
-                const packageName = entry.name.substr(0, entry.name.length - pathConsts_1.stubsSuffix.length);
-                for (const root of roots) {
-                    const packagePath = root.combinePaths(packageName);
-                    try {
-                        const stat = (0, uriUtils_1.tryStat)(this.realFS, packagePath);
-                        if (!stat?.isDirectory()) {
-                            continue;
-                        }
-                        // If partial stub we found is from bundled stub and library installed is marked as py.typed
-                        // ignore bundled partial stub.
-                        if (!allowMovingFn(isBundledStub, (0, pyTypedUtils_1.getPyTypedInfo)(this.realFS, packagePath), pyTypedInfo)) {
-                            continue;
-                        }
-                        // Merge partial stub packages to the library.
-                        partialStubs = partialStubs ?? this._getRelativePathPartialStubs(partialStubPackagePath);
-                        for (const partialStub of partialStubs) {
-                            const originalPyiFile = partialStubPackagePath.resolvePaths(partialStub);
-                            const mappedPyiFile = packagePath.resolvePaths(partialStub);
-                            this.recordMovedEntry(mappedPyiFile, originalPyiFile, packagePath);
-                        }
-                    }
-                    catch {
-                        // ignore
-                    }
-                }
-            }
-        }
-    }
-    clearPartialStubs() {
-        super.clear();
-        this._rootSearched.clear();
-        this._partialStubPackagePaths.clear();
-    }
-    isMovedEntry(uri) {
-        return this._partialStubPackagePaths.has(uri.key) || super.isMovedEntry(uri);
-    }
-    _allowMoving(isBundled, packagePyTyped, _stubPyTyped) {
-        if (!isBundled) {
-            return true;
-        }
-        // If partial stub we found is from bundled stub and library installed is marked as py.typed
-        // allow moving only if the package is marked as partially typed.
-        return !packagePyTyped || packagePyTyped.isPartiallyTyped;
-    }
-    _getRelativePathPartialStubs(partialStubPath) {
-        const relativePaths = [];
-        const searchAllStubs = (uri) => {
-            for (const entry of this.realFS.readdirEntriesSync(uri)) {
-                const filePath = uri.combinePaths(entry.name);
-                let isDirectory = entry.isDirectory();
-                let isFile = entry.isFile();
-                if (entry.isSymbolicLink()) {
-                    const stat = (0, uriUtils_1.tryStat)(this.realFS, filePath);
-                    if (stat) {
-                        isDirectory = stat.isDirectory();
-                        isFile = stat.isFile();
-                    }
-                }
-                if (isDirectory) {
-                    searchAllStubs(filePath);
-                }
-                if (isFile && entry.name.endsWith('.pyi')) {
-                    const relative = partialStubPath.getRelativePathComponents(filePath).join('/');
-                    if (relative) {
-                        relativePaths.push(relative);
-                    }
-                }
-            }
-        };
-        searchAllStubs(partialStubPath);
-        return relativePaths;
+        this.realFS.copyFileSync(this.getOriginalUri(src), this.getOriginalUri(dst));
     }
 }
 exports.PyrightFileSystem = PyrightFileSystem;

package/dist/pyrightFileSystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"pyrightFileSystem.js","sourceRoot":"","sources":["../../../../src/pyrightFileSystem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pyrightFileSystem.js","sourceRoot":"","sources":["../../../../src/pyrightFileSystem.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAMH,+EAA4E;AAI5E,MAAa,iBAAkB,SAAQ,yDAA2B;IAC9D,YAAY,MAAkB;QAC1B,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAEQ,SAAS,CAAC,GAAQ,EAAE,OAAsB;QAC/C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAEQ,KAAK,CAAC,GAAQ;QACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAEQ,aAAa,CAAC,GAAQ,EAAE,IAAqB,EAAE,QAA+B;QACnF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAEQ,SAAS,CAAC,GAAQ;QACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACpD,CAAC;IAEQ,UAAU,CAAC,GAAQ;QACxB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IAEQ,iBAAiB,CAAC,GAAQ;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IAEQ,YAAY,CAAC,GAAQ,EAAE,GAAQ;QACpC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC;CACJ;AAhCD,8CAgCC"}

package/dist/readonlyAugmentedFileSystem.d.ts

@@ -2,11 +2,11 @@ import type * as fs from 'fs';
 import { FileSystem, MkDirOptions, Stats } from './common/fileSystem';
 import { FileWatcher, FileWatcherEventHandler } from './common/fileWatcher';
 import { Uri } from './common/uri/uri';
+import { Disposable } from 'vscode-jsonrpc';
 export declare class ReadOnlyAugmentedFileSystem implements FileSystem {
     protected realFS: FileSystem;
     private readonly _entryMap;
     private readonly _reverseEntryMap;
-    private readonly _folderMap;
     constructor(realFS: FileSystem);
     existsSync(uri: Uri): boolean;
     mkdirSync(uri: Uri, options?: MkDirOptions): void;
@@ -32,8 +32,11 @@ export declare class ReadOnlyAugmentedFileSystem implements FileSystem {
     getOriginalUri(mappedFileUri: Uri): Uri;
     getMappedUri(originalFileUri: Uri): Uri;
     isInZip(uri: Uri): boolean;
-    protected recordMovedEntry(mappedUri: Uri, originalUri: Uri, rootPath: Uri): void;
-    protected getOriginalPath(mappedFileUri: Uri): Uri;
-    protected isMovedEntry(uri: Uri): boolean;
+    mapDirectory(mappedUri: Uri, originalUri: Uri, filter?: (originalUri: Uri, fs: FileSystem) => boolean): Disposable;
     protected clear(): void;
+    private _findClosestMatch;
+    private _getOriginalEntry;
+    private _getInternalOriginalUri;
+    private _getMappedEntry;
+    private _isOriginalPath;
 }