@antelopejs/core 1.18.2 → 1.19.0

package/dist/core/modules/module-locks.js

@@ -0,0 +1,205 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleLockStore = exports.MissingModuleLockError = exports.MODULE_LOCK_FOLDER = void 0;
+exports.reportRecordedLocks = reportRecordedLocks;
+const path = __importStar(require("node:path"));
+const semver_1 = require("semver");
+const filesystem_1 = require("../filesystem");
+const output_1 = require("../output");
+exports.MODULE_LOCK_FOLDER = "antelope-lock";
+const BUILD_COMMAND = "ajs project build";
+const UPDATE_COMMAND = "ajs project modules update";
+class MissingModuleLockError extends output_1.CliError {
+    constructor(key) {
+        super({
+            title: `No module lock for ${key.package}${VERSION_SEPARATOR}${key.version}`,
+            reason: `--frozen-modules installs only from ${ModuleLockStore.relativePath(key)}, and the project has none.`,
+            fixes: [
+                `Run ${BUILD_COMMAND} without --frozen-modules (or ${UPDATE_COMMAND} ${key.package}) and commit the lock it writes`,
+            ],
+        });
+    }
+}
+exports.MissingModuleLockError = MissingModuleLockError;
+const PACKAGE_NAME_PATTERN = /^(?:@[A-Za-z0-9][\w.~-]*\/)?[A-Za-z0-9][\w.~-]*$/;
+const VERSION_SEPARATOR = "@";
+const SCOPE_PREFIX = "@";
+function normalizeKey(key) {
+    const version = (0, semver_1.valid)(key.version);
+    if (!PACKAGE_NAME_PATTERN.test(key.package) || version === null) {
+        throw new Error(`Invalid module lock key ${key.package}${VERSION_SEPARATOR}${key.version}`);
+    }
+    return { package: key.package, version };
+}
+function parseRecordName(name) {
+    const separator = name.lastIndexOf(VERSION_SEPARATOR);
+    if (separator <= 0) {
+        return undefined;
+    }
+    const key = {
+        package: name.slice(0, separator),
+        version: name.slice(separator + 1),
+    };
+    const isValid = PACKAGE_NAME_PATTERN.test(key.package) && (0, semver_1.valid)(key.version) !== null;
+    return isValid ? key : undefined;
+}
+function recordName(key) {
+    const { package: pkg, version } = normalizeKey(key);
+    return `${pkg}${VERSION_SEPARATOR}${version}`;
+}
+function keptVersions(requirement, recorded) {
+    const exact = (0, semver_1.valid)(requirement.spec);
+    if (exact !== null) {
+        return [exact];
+    }
+    const range = (0, semver_1.validRange)(requirement.spec);
+    if (range === null) {
+        return recorded;
+    }
+    const best = (0, semver_1.maxSatisfying)(recorded, range);
+    return best === null ? [] : [best];
+}
+class ModuleLockStore {
+    fs;
+    folder;
+    recorded = new Map();
+    constructor(projectFolder, fs = new filesystem_1.NodeFileSystem()) {
+        this.fs = fs;
+        this.folder = path.join(projectFolder, exports.MODULE_LOCK_FOLDER);
+    }
+    static relativePath(key) {
+        return path.join(exports.MODULE_LOCK_FOLDER, recordName(key));
+    }
+    recordFolder(key) {
+        return path.join(this.folder, recordName(key));
+    }
+    async read(requested) {
+        const key = normalizeKey(requested);
+        const folder = this.recordFolder(key);
+        if (!(await this.fs.exists(folder))) {
+            return undefined;
+        }
+        const entries = await this.fs.readdir(folder);
+        const lockfile = output_1.MODULE_LOCKFILE_NAMES.find((name) => entries.includes(name));
+        if (lockfile === undefined) {
+            return undefined;
+        }
+        const content = await this.fs.readFileString(path.join(folder, lockfile));
+        return { ...key, lockfile, content };
+    }
+    async replaceRecordFolder(record) {
+        const folder = this.recordFolder(record);
+        const staging = path.join(path.dirname(folder), `.${path.basename(folder)}.${process.pid}.tmp`);
+        const discard = { recursive: true, force: true };
+        try {
+            await this.fs.rm(staging, discard);
+            await this.fs.mkdir(staging, { recursive: true });
+            await this.fs.writeFile(path.join(staging, record.lockfile), record.content);
+            await this.fs.rm(folder, discard);
+            await this.fs.rename(staging, folder);
+        }
+        finally {
+            await this.fs.rm(staging, discard);
+        }
+    }
+    async write(record) {
+        const previous = await this.read(record);
+        if (previous?.lockfile === record.lockfile &&
+            previous.content === record.content) {
+            return "unchanged";
+        }
+        await this.replaceRecordFolder(record);
+        this.recorded.set(recordName(record), normalizeKey(record));
+        return previous ? "changed" : "added";
+    }
+    takeRecorded() {
+        const keys = [...this.recorded.values()];
+        this.recorded.clear();
+        return keys;
+    }
+    async remove(key) {
+        await this.fs.rm(this.recordFolder(key), { recursive: true, force: true });
+        const parent = path.dirname(this.recordFolder(key));
+        if (parent !== this.folder &&
+            (await this.fs.readdir(parent)).length === 0) {
+            await this.fs.rm(parent, { recursive: true, force: true });
+        }
+    }
+    async entryNames(folder) {
+        return (await this.fs.exists(folder)) ? this.fs.readdir(folder) : [];
+    }
+    async list() {
+        const names = [];
+        for (const entry of await this.entryNames(this.folder)) {
+            if (!entry.startsWith(SCOPE_PREFIX)) {
+                names.push(entry);
+                continue;
+            }
+            const scoped = await this.entryNames(path.join(this.folder, entry));
+            names.push(...scoped.map((name) => `${entry}/${name}`));
+        }
+        return names.flatMap((name) => parseRecordName(name) ?? []);
+    }
+    async versions(pkg) {
+        return (await this.list())
+            .filter((key) => key.package === pkg)
+            .map((key) => key.version);
+    }
+    async prune(requirements) {
+        const recorded = await this.list();
+        const kept = new Set();
+        requirements.forEach((requirement) => {
+            const versions = recorded
+                .filter((key) => key.package === requirement.package)
+                .map((key) => key.version);
+            keptVersions(requirement, versions).forEach((version) => kept.add(recordName({ package: requirement.package, version })));
+        });
+        const removed = recorded.filter((key) => !kept.has(recordName(key)));
+        for (const key of removed) {
+            await this.remove(key);
+        }
+        return removed;
+    }
+}
+exports.ModuleLockStore = ModuleLockStore;
+function reportRecordedLocks(store) {
+    const count = store.takeRecorded().length;
+    if (count === 0) {
+        return;
+    }
+    (0, output_1.getProcessUi)().message("info", `Recorded ${(0, output_1.pluralize)(count, "module lock")} in ${exports.MODULE_LOCK_FOLDER}/: commit ${count === 1 ? "it" : "them"} so every install gets the same dependencies`);
+}
+//# sourceMappingURL=module-locks.js.map

package/dist/core/modules/module-locks.js.map

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

package/dist/core/modules/module-manager-context.d.ts

@@ -28,8 +28,13 @@ export interface InterfacePackageConsumer {
     range: string;
     resolvedPackage?: ResolvedPackage;
 }
+export interface StubbedInterfacePackage {
+    canonicalPackage: ResolvedPackage;
+    provider: string;
+}
 export interface InterfacePackagePlan {
     canonicalPackage: ResolvedPackage;
+    provider?: string;
     consumers: InterfacePackageConsumer[];
 }
 export type ModuleOperation = (module: Module) => Promise<void>;
@@ -52,7 +57,7 @@ interface ManagerFields {
     selectedProviders: Map<string, Map<string, string>>;
     staticModules: ManagedModule[];
     loaded: Map<string, ManagedModule>;
-    stubbedInterfacePackages: Map<string, ResolvedPackage>;
+    stubbedInterfacePackages: Map<string, StubbedInterfacePackage>;
     interfacePackagePlans: Map<string, InterfacePackagePlan>;
     configVars: ConfigVarStore;
     pendingCleanup: ManagedModule[];
@@ -130,6 +135,7 @@ export interface ManagerMethods {
     collectInterfacePackageConsumers(packageName: string): InterfacePackageConsumer[];
     registerInterfacePackage(packageName: string, resolvedPackage: ResolvedPackage, isStubbed?: boolean): void;
     validateInterfacePackages(): void;
+    findInterfaceRangeConflicts(): InterfaceRangeConflict[];
     findRangeConflicts(packageName: string, plan: InterfacePackagePlan): InterfaceRangeConflict[];
     findPreloadedCopies(packageName: string, plan: InterfacePackagePlan): PreloadedInterfaceCopy[];
     buildModuleAssociations(interfaceSources: Map<string, Module[]>): void;
@@ -140,7 +146,7 @@ export interface ManagerMethods {
     validateOverrideSource(consumerId: string, interfaceName: string, source: string | undefined): void;
     validateSelfHostedConnection(consumerId: string, interfaceName: string): void;
 }
-type ContextMethods = Pick<ManagerMethods, "restoreModules" | "getModuleEntry" | "getAllManagedModules" | "evictModuleFiles" | "collectAvoidedFolders" | "belongsToInterfacePackageTree" | "placeModule" | "registerStubbedInterfacePackage" | "applyInterfaceStubs" | "neutralizeInstances" | "collectImplementedInterfaces" | "startModules" | "destroyAll" | "constructModule" | "planConfigVars" | "runProvidePhase" | "constructReadyModules" | "constructOrDisable" | "rejectCallsIntoDeadModules" | "orphanedInterfaces" | "hasLiveImplementer" | "rejectCallsInto" | "findFailedProvider" | "provideEntry" | "provideModule" | "constructEntry" | "getReverseLifecycleModules" | "clearManagedState" | "releaseRuntimeState" | "trackModuleStart" | "rebuildAssociations" | "buildBindings" | "runningBindings" | "logBindingWarnings" | "bindablePackages" | "collectBindingInterfaces" | "collectBindingModules" | "collectInterfaceSources" | "resolveInterfacePackagePaths" | "resolveImplementedPackage" | "collectInterfacePackageConsumers" | "registerInterfacePackage" | "validateInterfacePackages" | "findRangeConflicts" | "findPreloadedCopies" | "buildModuleAssociations" | "addDefaultAssociations" | "applyImportOverrides" | "addInterfaceSource" | "validateImportOverrides" | "validateOverrideSource" | "validateSelfHostedConnection">;
+type ContextMethods = Pick<ManagerMethods, "restoreModules" | "getModuleEntry" | "getAllManagedModules" | "evictModuleFiles" | "collectAvoidedFolders" | "belongsToInterfacePackageTree" | "placeModule" | "registerStubbedInterfacePackage" | "applyInterfaceStubs" | "neutralizeInstances" | "collectImplementedInterfaces" | "startModules" | "destroyAll" | "constructModule" | "planConfigVars" | "runProvidePhase" | "constructReadyModules" | "constructOrDisable" | "rejectCallsIntoDeadModules" | "orphanedInterfaces" | "hasLiveImplementer" | "rejectCallsInto" | "findFailedProvider" | "provideEntry" | "provideModule" | "constructEntry" | "getReverseLifecycleModules" | "clearManagedState" | "releaseRuntimeState" | "trackModuleStart" | "rebuildAssociations" | "buildBindings" | "runningBindings" | "logBindingWarnings" | "bindablePackages" | "collectBindingInterfaces" | "collectBindingModules" | "collectInterfaceSources" | "resolveInterfacePackagePaths" | "resolveImplementedPackage" | "collectInterfacePackageConsumers" | "registerInterfacePackage" | "validateInterfacePackages" | "findInterfaceRangeConflicts" | "findRangeConflicts" | "findPreloadedCopies" | "buildModuleAssociations" | "addDefaultAssociations" | "applyImportOverrides" | "addInterfaceSource" | "validateImportOverrides" | "validateOverrideSource" | "validateSelfHostedConnection">;
 export type ManagerContext = ManagerFields & ContextMethods;
 type FieldReaders = {
     [K in keyof ManagerFields]: () => ManagerFields[K];

package/dist/core/modules/module-manager-context.js

@@ -186,6 +186,7 @@ function bindOperations(context) {
         collectInterfacePackageConsumers: packages.collectInterfacePackageConsumers.bind(context),
         registerInterfacePackage: packages.registerInterfacePackage.bind(context),
         validateInterfacePackages: packages.validateInterfacePackages.bind(context),
+        findInterfaceRangeConflicts: packages.findInterfaceRangeConflicts.bind(context),
         findRangeConflicts: packages.findRangeConflicts.bind(context),
         findPreloadedCopies: packages.findPreloadedCopies.bind(context),
         buildModuleAssociations: bindings.buildModuleAssociations.bind(context),

package/dist/core/modules/module-manager-context.js.map

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

package/dist/core/modules/module-manager-lifecycle.js

@@ -19,19 +19,33 @@ const module_manager_logger_1 = require("./module-manager-logger");
 const MS_PER_SECOND = 1000;
 const START_SLOW_WARNING_MS = 10 * MS_PER_SECOND;
 const START_TIMEOUT_MS = 120 * MS_PER_SECOND;
+const DESTROY_TIMEOUT_MS = 10 * MS_PER_SECOND;
 function startWithinDeadline(module) {
     const timers = [];
     const deadline = new Promise((_, reject) => {
         timers.push(setTimeout(() => {
             module_manager_logger_1.Logger.Warn(`Module '${module.id}' is still starting after ${START_SLOW_WARNING_MS / MS_PER_SECOND} s`);
         }, START_SLOW_WARNING_MS), setTimeout(() => {
-            reject(new Error(`Module '${module.id}' did not start within ${START_TIMEOUT_MS / MS_PER_SECOND} s`));
+            const late = new Error(`Module '${module.id}' did not start within ${START_TIMEOUT_MS / MS_PER_SECOND} s`);
+            module_manager_logger_1.Logger.Error(late.message);
+            reject(late);
         }, START_TIMEOUT_MS));
     });
     return Promise.race([module.start(), deadline]).finally(() => {
         timers.forEach(clearTimeout);
     });
 }
+function destroyWithinDeadline(module) {
+    const timers = [];
+    const deadline = new Promise((_, reject) => {
+        timers.push(setTimeout(() => {
+            reject(new Error(`Module '${module.id}' did not stop within ${DESTROY_TIMEOUT_MS / MS_PER_SECOND} s`));
+        }, DESTROY_TIMEOUT_MS));
+    });
+    return Promise.race([module.destroy(), deadline]).finally(() => {
+        timers.forEach(clearTimeout);
+    });
+}
 async function runModuleOperations(modules, operation) {
     return (await runTrackedModuleOperations(modules, operation)).errors;
 }
@@ -87,7 +101,7 @@ async function stopAll() {
 async function destroyAll() {
     (0, lifecycle_signals_1.announceModulesStopping)();
     const modules = this.getReverseLifecycleModules();
-    const results = await runTrackedModuleOperations(modules, (module) => module.destroy());
+    const results = await runTrackedModuleOperations(modules, destroyWithinDeadline);
     this.pendingCleanup = results.failed.filter(({ module }) => module.state !== types_1.ModuleState.Loaded);
     (0, utils_1.clearPathResolutionCache)();
     for (const id of this.loaded.keys()) {

package/dist/core/modules/module-manager-lifecycle.js.map

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

package/dist/core/modules/module-manager-packages.d.ts

@@ -12,6 +12,7 @@ export declare function resolveInterfacePackagePaths(this: ManagerContext, inter
 export declare function resolveImplementedPackage(this: ManagerContext, packageName: string, module: Module): ResolvedPackage | undefined;
 export declare function collectInterfacePackageConsumers(this: ManagerContext, packageName: string): InterfacePackageConsumer[];
 export declare function registerInterfacePackage(this: ManagerContext, packageName: string, resolvedPackage: ResolvedPackage, isStubbed?: boolean): void;
+export declare function findInterfaceRangeConflicts(this: ManagerContext): InterfaceRangeConflict[];
 export declare function validateInterfacePackages(this: ManagerContext): void;
 export declare function findRangeConflicts(this: ManagerContext, packageName: string, plan: InterfacePackagePlan): InterfaceRangeConflict[];
 export declare function findPreloadedCopies(this: ManagerContext, packageName: string, plan: InterfacePackagePlan): PreloadedInterfaceCopy[];

package/dist/core/modules/module-manager-packages.js

@@ -9,6 +9,7 @@ exports.resolveInterfacePackagePaths = resolveInterfacePackagePaths;
 exports.resolveImplementedPackage = resolveImplementedPackage;
 exports.collectInterfacePackageConsumers = collectInterfacePackageConsumers;
 exports.registerInterfacePackage = registerInterfacePackage;
+exports.findInterfaceRangeConflicts = findInterfaceRangeConflicts;
 exports.validateInterfacePackages = validateInterfacePackages;
 exports.findRangeConflicts = findRangeConflicts;
 exports.findPreloadedCopies = findPreloadedCopies;
@@ -30,15 +31,20 @@ function registerStubbedInterfaces(stubbed) {
 }
 function registerStubbedInterfacePackage(packageName, entries) {
     const consumers = this.collectInterfacePackageConsumers(packageName);
-    const canonicalPackage = [...consumers]
+    const provider = [...consumers]
         .sort((left, right) => compareModuleIds(left.moduleId, right.moduleId))
-        .find((consumer) => consumer.resolvedPackage)?.resolvedPackage;
+        .find((consumer) => consumer.resolvedPackage);
+    const canonicalPackage = provider?.resolvedPackage;
     if (!canonicalPackage) {
         return;
     }
-    this.stubbedInterfacePackages.set(packageName, canonicalPackage);
+    this.stubbedInterfacePackages.set(packageName, {
+        canonicalPackage,
+        provider: provider.moduleId,
+    });
     this.interfacePackagePlans.set(packageName, {
         canonicalPackage,
+        provider: provider.moduleId,
         consumers,
     });
     this.registerInterfacePackage(packageName, canonicalPackage, true);
@@ -47,14 +53,14 @@ function registerStubbedInterfacePackage(packageName, entries) {
 function applyInterfaceStubs() {
     const implemented = this.collectImplementedInterfaces();
     const stubbed = Array.from(this.stubbedInterfacePackages);
-    for (const [interfaceName, resolvedPackage] of stubbed) {
+    for (const [interfaceName, { canonicalPackage }] of stubbed) {
         if (implemented.has(interfaceName)) {
             this.stubbedInterfacePackages.delete(interfaceName);
             this.resolver.stubbedInterfacePackages.delete(interfaceName);
             continue;
         }
         if (!this.resolver.interfacePackages.has(interfaceName)) {
-            this.registerInterfacePackage(interfaceName, resolvedPackage, true);
+            this.registerInterfacePackage(interfaceName, canonicalPackage, true);
         }
         this.neutralizeInstances(interfaceName);
     }
@@ -97,19 +103,21 @@ function resolveInterfacePackagePaths(interfaceSources) {
         }
         this.interfacePackagePlans.set(ifacePkg, {
             canonicalPackage,
+            provider: module.id,
             consumers: this.collectInterfacePackageConsumers(ifacePkg),
         });
         this.registerInterfacePackage(ifacePkg, canonicalPackage, false);
     }
-    for (const [packageName, canonicalPackage] of this.stubbedInterfacePackages) {
+    for (const [packageName, stub] of this.stubbedInterfacePackages) {
         if (interfaceSources.has(packageName)) {
             continue;
         }
         this.interfacePackagePlans.set(packageName, {
-            canonicalPackage,
+            canonicalPackage: stub.canonicalPackage,
+            provider: stub.provider,
             consumers: this.collectInterfacePackageConsumers(packageName),
         });
-        this.registerInterfacePackage(packageName, canonicalPackage, true);
+        this.registerInterfacePackage(packageName, stub.canonicalPackage, true);
     }
 }
 function resolveImplementedPackage(packageName, module) {
@@ -159,9 +167,12 @@ function registerInterfacePackage(packageName, resolvedPackage, isStubbed = fals
     }
     this.resolver.lifecycleInterfacePackages.delete(packageName);
 }
+function findInterfaceRangeConflicts() {
+    return [...this.interfacePackagePlans].flatMap(([name, plan]) => this.findRangeConflicts(name, plan));
+}
 function validateInterfacePackages() {
     const plans = [...this.interfacePackagePlans];
-    const rangeConflicts = plans.flatMap(([name, plan]) => this.findRangeConflicts(name, plan));
+    const rangeConflicts = this.findInterfaceRangeConflicts();
     const preloadedCopies = plans.flatMap(([name, plan]) => this.findPreloadedCopies(name, plan));
     if (rangeConflicts.length === 0 && preloadedCopies.length === 0) {
         return;
@@ -180,6 +191,7 @@ function findRangeConflicts(packageName, plan) {
                 packageName,
                 range: consumer.range,
                 canonical: plan.canonicalPackage,
+                provider: plan.provider,
                 consumerCopy: consumer.resolvedPackage,
             },
         ];

package/dist/core/modules/module-manager-packages.js.map

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

package/dist/core/modules/module-manager.d.ts

@@ -1,3 +1,4 @@
+import type { InterfaceRangeConflict } from "../output";
 import type { BindingGraph, UnresolvedInterface } from "../resolution";
 import { InterfaceRegistry } from "./interface-registry";
 import { Module } from "./module";
@@ -101,6 +102,7 @@ export declare class ModuleManager {
     private collectInterfacePackageConsumers;
     private registerInterfacePackage;
     private validateInterfacePackages;
+    findInterfaceRangeConflicts(): InterfaceRangeConflict[];
     private findRangeConflicts;
     private findPreloadedCopies;
     private buildModuleAssociations;

package/dist/core/modules/module-manager.js

@@ -112,6 +112,7 @@ class ModuleManager {
                 collectInterfacePackageConsumers: (...args) => manager.collectInterfacePackageConsumers(...args),
                 registerInterfacePackage: (...args) => manager.registerInterfacePackage(...args),
                 validateInterfacePackages: (...args) => manager.validateInterfacePackages(...args),
+                findInterfaceRangeConflicts: (...args) => manager.findInterfaceRangeConflicts(...args),
                 findRangeConflicts: (...args) => manager.findRangeConflicts(...args),
                 findPreloadedCopies: (...args) => manager.findPreloadedCopies(...args),
                 buildModuleAssociations: (...args) => manager.buildModuleAssociations(...args),
@@ -313,6 +314,9 @@ class ModuleManager {
     validateInterfacePackages() {
         return (0, module_manager_context_1.operations)(this).validateInterfacePackages();
     }
+    findInterfaceRangeConflicts() {
+        return (0, module_manager_context_1.operations)(this).findInterfaceRangeConflicts();
+    }
     findRangeConflicts(...args) {
         return (0, module_manager_context_1.operations)(this).findRangeConflicts(...args);
     }

package/dist/core/modules/module-manager.js.map

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