@antelopejs/core 1.13.5 → 1.15.0

package/dist/core/resolution/interface-instances.js

@@ -0,0 +1,188 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InterfaceInstances = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const node_crypto_1 = require("node:crypto");
+const instance_copies_1 = require("./instance-copies");
+const package_resolution_1 = require("./package-resolution");
+const NODE_MODULES = "node_modules";
+const INSTANCES_FOLDER = ".ajs-instances";
+const KEY_HASH_LENGTH = 16;
+function evictFolder(folder) {
+    const isInFolder = (0, package_resolution_1.createPathWithinMatcher)(folder);
+    for (const filePath of Object.keys(require.cache)) {
+        if (isInFolder(filePath)) {
+            delete require.cache[filePath];
+        }
+    }
+}
+function hashKey(key) {
+    return (0, node_crypto_1.createHash)("sha256")
+        .update(key)
+        .digest("hex")
+        .slice(0, KEY_HASH_LENGTH);
+}
+function nearestNodeModules(folder) {
+    let current = folder;
+    while (node_path_1.default.dirname(current) !== current) {
+        if (node_path_1.default.basename(current) === NODE_MODULES) {
+            return current;
+        }
+        current = node_path_1.default.dirname(current);
+    }
+    return undefined;
+}
+function relocate(filePath, from, to) {
+    const relative = node_path_1.default.relative(from, filePath);
+    if (relative.startsWith("..") || node_path_1.default.isAbsolute(relative)) {
+        return undefined;
+    }
+    return node_path_1.default.join(to, relative);
+}
+class InterfaceInstances {
+    onRootsChanged;
+    onDispose;
+    descriptors = new Map();
+    keysByPackage = new Map();
+    canonical = new Map();
+    fixedRoots = new Map();
+    canonicalOwners = new Map();
+    copies = new Map();
+    prunedAnchors = new Set();
+    constructor(onRootsChanged, onDispose = () => undefined) {
+        this.onRootsChanged = onRootsChanged;
+        this.onDispose = onDispose;
+    }
+    update(graph, canonical, fixedRoots = new Map()) {
+        const previous = this.descriptors;
+        const previousFixedRoots = this.fixedRoots;
+        const previousCanonical = this.canonical;
+        this.canonical = new Map(canonical);
+        this.fixedRoots = new Map(fixedRoots);
+        this.descriptors = new Map([...graph.instances].filter(([, { interfaceName }]) => canonical.has(interfaceName)));
+        this.releaseUnreached(previous, previousFixedRoots, previousCanonical);
+        this.keysByPackage = new Map();
+        for (const [key, { interfaceName }] of this.descriptors) {
+            const keys = this.keysByPackage.get(interfaceName) ?? [];
+            keys.push(key);
+            this.keysByPackage.set(interfaceName, keys.sort());
+        }
+        this.assignCanonicalOwners();
+        this.onRootsChanged();
+    }
+    assignCanonicalOwners() {
+        for (const [packageName, keys] of this.keysByPackage) {
+            const owner = this.canonicalOwners.get(packageName);
+            if (owner && keys.includes(owner)) {
+                continue;
+            }
+            const free = keys.find((key) => !this.copies.has(key));
+            if (free) {
+                this.canonicalOwners.set(packageName, free);
+            }
+            else {
+                this.canonicalOwners.delete(packageName);
+            }
+        }
+    }
+    describe(key) {
+        return this.descriptors.get(key);
+    }
+    keysOf(packageName) {
+        return this.keysByPackage.get(packageName) ?? [];
+    }
+    isCanonical(key) {
+        const descriptor = this.descriptors.get(key);
+        return (descriptor !== undefined &&
+            this.canonicalOwners.get(descriptor.interfaceName) === key);
+    }
+    rootOf(key) {
+        const descriptor = this.descriptors.get(key);
+        const canonical = descriptor && this.canonical.get(descriptor.interfaceName);
+        if (!descriptor || !canonical) {
+            return undefined;
+        }
+        const fixed = this.fixedRoots.get(key);
+        if (fixed) {
+            return fixed;
+        }
+        if (this.isCanonical(key)) {
+            return canonical.realRoot;
+        }
+        return (this.copies.get(key)?.root ?? this.createCopy(key, descriptor, canonical));
+    }
+    locate(key, canonicalFile) {
+        const descriptor = this.descriptors.get(key);
+        const canonical = descriptor && this.canonical.get(descriptor.interfaceName);
+        const root = this.rootOf(key);
+        if (!canonical || !root) {
+            return undefined;
+        }
+        return (relocate(canonicalFile, canonical.realRoot, root) ??
+            relocate(canonicalFile, canonical.root, root));
+    }
+    roots() {
+        const roots = new Map();
+        for (const [key, { interfaceName }] of this.descriptors) {
+            const root = this.fixedRoots.get(key) ??
+                (this.isCanonical(key)
+                    ? this.canonical.get(interfaceName)?.realRoot
+                    : this.copies.get(key)?.root);
+            if (root) {
+                roots.set(key, root);
+            }
+        }
+        return roots;
+    }
+    releaseUnreached(previous, previousFixedRoots, previousCanonical) {
+        for (const [key, { interfaceName }] of previous) {
+            if (this.descriptors.has(key)) {
+                continue;
+            }
+            const copy = this.copies.get(key);
+            if (copy) {
+                evictFolder(copy.generation);
+                (0, instance_copies_1.removeInstanceCopy)(copy.generation);
+                this.copies.delete(key);
+            }
+            else if (this.canonicalOwners.get(interfaceName) === key) {
+                this.canonicalOwners.delete(interfaceName);
+                const root = previousCanonical.get(interfaceName)?.realRoot;
+                if (root && !previousFixedRoots.has(key)) {
+                    evictFolder(root);
+                }
+            }
+            this.onDispose(key);
+        }
+    }
+    release() {
+        for (const { generation } of this.copies.values()) {
+            evictFolder(generation);
+            (0, instance_copies_1.removeInstanceCopy)(generation);
+        }
+        this.copies.clear();
+        this.canonicalOwners.clear();
+        this.onRootsChanged();
+    }
+    createCopy(key, descriptor, canonical) {
+        const anchor = nearestNodeModules(canonical.realRoot) ??
+            node_path_1.default.dirname(canonical.realRoot);
+        const instancesFolder = node_path_1.default.join(anchor, INSTANCES_FOLDER);
+        if (!this.prunedAnchors.has(instancesFolder)) {
+            (0, instance_copies_1.pruneStaleInstanceCopies)(instancesFolder);
+            this.prunedAnchors.add(instancesFolder);
+        }
+        const base = node_path_1.default.join(instancesFolder, hashKey(key));
+        const generation = (0, instance_copies_1.nextInstanceCopyPath)(base);
+        const root = node_path_1.default.join(generation, NODE_MODULES, ...descriptor.interfaceName.split("/"));
+        (0, instance_copies_1.createInstanceCopy)(canonical.realRoot, root);
+        this.copies.set(key, { root, generation });
+        this.onRootsChanged();
+        return root;
+    }
+}
+exports.InterfaceInstances = InterfaceInstances;
+//# sourceMappingURL=interface-instances.js.map

package/dist/core/resolution/interface-instances.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface-instances.js","sourceRoot":"","sources":["../../../src/core/resolution/interface-instances.ts"],"names":[],"mappings":"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"}

package/dist/core/resolution/resolver-detour.js

@@ -66,29 +66,22 @@ class ResolverDetourCoordinator {
     }
     load(request, parent, isMain) {
         const activeResolver = this.findResolver(request, parent);
-        if (!activeResolver?.requiresPreResolution(request, parent)) {
+        const instance = activeResolver?.instanceToLoad(request, parent);
+        if (!activeResolver || !instance) {
             return this.originalLoader?.(request, parent, isMain);
         }
-        const result = activeResolver.resolve(request, parent);
-        if (!result) {
-            return this.originalLoader?.(request, parent, isMain);
+        const resolvedPath = this.resolveWith(activeResolver, request, parent, isMain, undefined);
+        const entry = activeResolver.entryToPrime(request, parent, resolvedPath);
+        activeResolver.recordInstanceFile(instance, resolvedPath);
+        if (entry) {
+            activeResolver.recordInstanceFile(instance, entry);
         }
-        const resolvedPath = this.resolveResult(activeResolver, result, parent, isMain, undefined);
-        this.primeInterfaceEntry(activeResolver, result, resolvedPath, parent, isMain);
-        const isCircularImport = require.cache[resolvedPath]?.loaded === false;
-        const value = activeResolver.runInInterfaceContext(result, () => this.originalLoader?.(resolvedPath, parent, isMain));
-        return isCircularImport
-            ? value
-            : activeResolver.bindProviderRoutes(result, value);
-    }
-    primeInterfaceEntry(resolver, result, resolvedPath, parent, isMain) {
-        const entryResult = resolver.getInterfaceEntryToPrime(result, resolvedPath);
-        if (!entryResult) {
-            return;
-        }
-        const entryPath = this.resolveResult(resolver, entryResult, parent, isMain, undefined);
-        const value = resolver.runInInterfaceContext(entryResult, () => this.originalLoader?.(entryPath, parent, isMain));
-        resolver.bindProviderRoutes(entryResult, value);
+        return activeResolver.runInInstance(instance, () => {
+            if (entry) {
+                this.originalLoader?.(entry, parent, isMain);
+            }
+            return this.originalLoader?.(resolvedPath, parent, isMain);
+        });
     }
     resolve(request, parent, isMain, options) {
         const activeResolver = this.findResolver(request, parent);
@@ -104,8 +97,7 @@ class ResolverDetourCoordinator {
     resolveResult(activeResolver, result, parent, isMain, options) {
         const contextParent = this.createResolutionParent(parent, result.resolveFrom);
         const resolvedPath = this.originalResolver?.(result.resolvedPath, contextParent, isMain, options);
-        activeResolver.trackInterfaceFile(result, resolvedPath);
-        return resolvedPath;
+        return activeResolver.locate(result, resolvedPath);
     }
     createResolutionParent(parent, resolveFrom) {
         if (!resolveFrom) {

package/dist/core/resolution/resolver-detour.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver-detour.js","sourceRoot":"","sources":["../../../src/core/resolution/resolver-detour.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver-detour.js","sourceRoot":"","sources":["../../../src/core/resolution/resolver-detour.ts"],"names":[],"mappings":"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"}

package/dist/core/resolution/resolver.d.ts

@@ -1,5 +1,7 @@
 import type { PathMapper } from "./path-mapper";
 import type { ModuleManifest } from "../module-manifest";
+import type { BindingGraph } from "./binding-graph-types";
+import { InterfaceInstances } from "./interface-instances";
 export interface ModuleRef {
     id: string;
     manifest: ModuleManifest;
@@ -10,11 +12,9 @@ interface ResolverParent {
 export interface ResolveResult {
     resolvedPath: string;
     resolveFrom?: string;
-    bindExports?: boolean;
-    sharedExports?: boolean;
-    interfaceName?: string;
-    provider?: string;
+    instance?: string;
 }
+export declare function connectionPath(index: number, packageName: string): string;
 export declare class Resolver {
     private pathMapper;
     readonly moduleByFolder: Map<string, ModuleRef>;
@@ -25,79 +25,37 @@ export declare class Resolver {
     readonly lifecycleInterfacePackages: Set<string>;
     readonly stubbedInterfacePackages: Set<string>;
     stubModulePath?: string;
-    private readonly resolverIdentity;
-    private readonly localModuleOwners;
-    private readonly interfacePackageOwners;
-    private readonly interfaceGraphFiles;
-    private readonly interfaceDependencies;
-    private readonly boundValues;
-    private readonly routedEvents;
-    private readonly proxyOwners;
-    private readonly providerlessContexts;
-    private readonly sharedInterfaceContexts;
-    private readonly interfaceBodyContexts;
-    private readonly interfaceBodySharedContexts;
-    private readonly sharedContexts;
-    private readonly sharedStubInterfaces;
-    private readonly adoptedContexts;
-    private readonly stubbedContexts;
+    readonly instances: InterfaceInstances;
+    private bindings?;
+    private readonly instanceFiles;
+    private readonly owners;
     constructor(pathMapper: PathMapper);
+    setBindings(graph: BindingGraph): void;
     resolve(request: string, parent?: ResolverParent): ResolveResult | undefined;
+    locate(result: ResolveResult, resolvedPath: string): string;
     ownsResolutionContext(_request: string, parent?: ResolverParent): boolean;
-    requiresPreResolution(request: string, parent?: ResolverParent): boolean;
-    bindProviderRoutes(result: ResolveResult, value: unknown): unknown;
-    runInInterfaceContext<T>(result: ResolveResult, load: () => T): T;
-    private isSharedInterfaceLoad;
-    trackInterfaceFile(result: ResolveResult, resolvedPath: string): void;
-    getInterfaceEntryToPrime(result: ResolveResult, resolvedPath: string): ResolveResult | undefined;
+    instanceToLoad(request: string, parent?: ResolverParent): string | undefined;
+    recordInstanceFile(instance: string, filePath: string): void;
+    runInInstance<T>(instance: string, load: () => T): T;
+    loadInstance(instance: string): string | undefined;
+    entryToPrime(request: string, parent: ResolverParent | undefined, resolvedPath: string): string | undefined;
+    private instanceEntry;
     getInterfaceGraphRoot(filePath: string): string | undefined;
-    buildProviderRoutes(moduleId: string): Readonly<Record<string, string>>;
+    releaseInstances(): void;
     clearCache(): void;
-    private registerProxyOwners;
-    private bindImportedRoutes;
-    private replayKnownRoutes;
-    private bindKnownRoutes;
-    private bindRoute;
+    private retireInstance;
+    private canonicalPackages;
+    private fixedRoots;
     private resolveInterfaceCore;
-    private resolveInterfacePackage;
-    private resolveRelativeInterface;
-    private bindResultProvider;
-    private isInterfacePackageFile;
-    private resolveProvider;
-    private resolveRequestProvider;
-    private resolveChildProvider;
-    private resolveProviders;
-    private collectChildProviders;
-    private trackInterfaceDependency;
-    private findRequestedInterface;
-    private findInterfacePackageRequest;
-    private findInterfacePackageByPath;
-    private listInterfacePackageRoots;
-    private bindInterfaceValue;
-    private bindPassedValue;
-    private needsFacade;
-    private holdsFacadeMember;
-    private bindStubbedInterfaceValue;
-    private getBindingContext;
-    private getSharedInterfaceContext;
-    private getInterfaceBodyContext;
-    private createInterfaceBodyContext;
-    private effectiveContext;
-    private getAdoptedContext;
-    private adoptedProvider;
-    private chainProviderRoutes;
-    private getProviderlessContext;
-    private filterStubbedProviderRoutes;
-    private isBindableValue;
-    private isClass;
-    private createObjectFacade;
-    private bindObjectFunction;
-    private createFunctionFacade;
-    private bindFunctionResult;
-    private getRoutedEvent;
-    private bindRoutedEvent;
-    private createEventFacade;
-    private resolveLocalModule;
-    private listModuleRoots;
+    private resolveInterfaceRequest;
+    private canonicalRequest;
+    private findInterfacePackage;
+    private contextOwner;
+    private scopeOf;
+    private instanceScope;
+    private describeOwner;
+    private instanceFor;
+    private connectionInstance;
+    private listOwnerRoots;
 }
 export {};