refactor: circular deps part 12

This commit is contained in:
Nathan Walker
2025-07-09 12:16:50 -07:00
parent 33d967b5b2
commit ee03774ec0
6 changed files with 74 additions and 45 deletions

View File

@ -1,21 +1,18 @@
import { Screen, Device } from '../platform';
import { PlatformContext, findMatch, stripQualifiers } from './qualifier-matcher';
import { registerModulesFromFileSystem } from './non-bundle-workflow-compat';
import { Trace } from '../trace';
import { Application } from '../application';
import { ModuleNameResolverType, ModuleListProvider, initAppForModuleResolver, getResolveInstance, _setResolver } from './helpers';
export type { PlatformContext } from './qualifier-matcher';
export type ModuleListProvider = () => string[];
export class ModuleNameResolver {
export class ModuleNameResolver implements ModuleNameResolverType {
private _cache = {};
constructor(private context: PlatformContext, private moduleListProvider: ModuleListProvider = global.getRegisteredModules) {
Application.on('livesync', (args) => clearCache());
Application.on('orientationChanged', (args) => {
resolverInstance = undefined;
});
constructor(
private context: PlatformContext,
private moduleListProvider: ModuleListProvider = global.getRegisteredModules,
) {
initAppForModuleResolver();
}
public resolveModuleName(path: string, ext: string): string {
@ -57,23 +54,23 @@ export class ModuleNameResolver {
}
}
let resolverInstance: ModuleNameResolver;
export function resolveModuleName(path: string, ext: string): string {
if (global.__snapshot) {
return resolveModuleSnapshot(path, ext);
}
if (!resolverInstance) {
resolverInstance = new ModuleNameResolver({
width: Screen.mainScreen.widthDIPs,
height: Screen.mainScreen.heightDIPs,
os: Device.os,
deviceType: Device.deviceType,
});
if (!getResolveInstance()) {
_setResolver(
new ModuleNameResolver({
width: Screen.mainScreen.widthDIPs,
height: Screen.mainScreen.heightDIPs,
os: Device.os,
deviceType: Device.deviceType,
}),
);
}
return resolverInstance.resolveModuleName(path, ext);
return getResolveInstance().resolveModuleName(path, ext);
}
function resolveModuleSnapshot(path, ext) {
@ -89,13 +86,3 @@ function resolveModuleSnapshot(path, ext) {
deviceType: 'Phone',
}).resolveModuleName(path, ext);
}
export function clearCache() {
if (resolverInstance) {
resolverInstance.clearCache();
}
}
export function _setResolver(resolver: ModuleNameResolver) {
resolverInstance = resolver;
}