composed-di 0.2.8-ts4 → 0.2.9

package/src/{ServiceModule.ts → serviceModule.ts}

@@ -1,123 +1,123 @@
-import { ServiceKey } from './ServiceKey';
-import { ServiceFactory } from './ServiceFactory';
-import { ServiceScope } from './ServiceScope';
-
-type GenericFactory = ServiceFactory<any, readonly ServiceKey<any>[]>;
-type GenericKey = ServiceKey<any>;
-
-export class ServiceModule {
-  private constructor(readonly factories: GenericFactory[]) {
-    factories.forEach((factory) => {
-      checkRecursiveDependencies(factory);
-      checkMissingDependencies(factory, this.factories);
-    });
-  }
-
-  public async get<T>(key: ServiceKey<T>): Promise<T> {
-    const factory = this.factories.find((factory: GenericFactory) => {
-      return isSuitable(key, factory);
-    });
-
-    // Check if a factory to supply the requested key was not found
-    if (!factory) {
-      throw new Error(`Could not find a suitable factory for ${key.name}`);
-    }
-
-    // Resolve all dependencies first
-    const dependencies = await Promise.all(
-      factory.dependsOn.map((dependencyKey: ServiceKey<unknown>) => {
-        return this.get(dependencyKey);
-      }),
-    );
-
-    // Call the factory to retrieve the dependency
-    return factory.initialize(...dependencies);
-  }
-
-  /**
-   * Disposes of service factories within the specified scope or all factories if no scope is provided.
-   *
-   * This method is useful for cleaning up resources and instances held by service factories,
-   * such as singleton factories, as they may hold database connections or other resources that need to be released.
-   *
-   * @param {ServiceScope} [scope] The scope to filter the factories to be disposed.
-   * If not provided, all factories are disposed of.
-   * @return {void} No return value.
-   */
-  public dispose(scope?: ServiceScope) {
-    const factories = scope
-      ? this.factories.filter((f) => f.scope === scope)
-      : this.factories;
-
-    factories.forEach((factory) => factory.dispose?.());
-  }
-
-  /**
-   * Creates a new ServiceModule instance by aggregating and deduplicating a list of
-   * ServiceModule or GenericFactory instances.
-   * If multiple factories provide the same
-   * ServiceKey, the last one in the list takes precedence.
-   *
-   * @param {Array<ServiceModule | GenericFactory>} entries - An array of ServiceModule or GenericFactory
-   * instances to be processed into a single ServiceModule.
-   * @return {ServiceModule} A new ServiceModule containing the deduplicated factories.
-   */
-  static from(entries: (ServiceModule | GenericFactory)[]): ServiceModule {
-    // Flatten entries and keep only the last factory for each ServiceKey
-    const flattened = entries.flatMap((e) =>
-      e instanceof ServiceModule ? e.factories : [e],
-    );
-
-    const byKey = new Map<symbol, GenericFactory>();
-    // Later factories overwrite earlier ones (last-wins)
-    for (const f of flattened) {
-      byKey.set(f.provides.symbol, f);
-    }
-
-    return new ServiceModule(Array.from(byKey.values()));
-  }
-}
-
-function checkRecursiveDependencies(factory: GenericFactory) {
-  const recursive = factory.dependsOn.some((dependencyKey) => {
-    return dependencyKey === factory.provides;
-  });
-
-  if (recursive) {
-    throw new Error(
-      'Recursive dependency detected on: ' + factory.provides.name,
-    );
-  }
-}
-
-function checkMissingDependencies(
-  factory: GenericFactory,
-  factories: GenericFactory[],
-) {
-  const missingDependencies = factory.dependsOn.filter(
-    (dependencyKey: GenericKey) => {
-      return !isRegistered(dependencyKey, factories);
-    },
-  );
-  if (missingDependencies.length === 0) {
-    return;
-  }
-
-  const dependencyList = missingDependencies
-    .map((dependencyKey) => ` -> ${dependencyKey.name}`)
-    .join('\n');
-  throw new Error(
-    `${factory.provides.name} will fail because it depends on:\n ${dependencyList}`,
-  );
-}
-
-function isRegistered(key: GenericKey, factories: GenericFactory[]) {
-  return factories.some((factory) => factory.provides?.symbol === key?.symbol);
-}
-
-function isSuitable<T, D extends readonly ServiceKey<any>[]>(
-  key: ServiceKey<T>,
-  factory: ServiceFactory<any, D>,
-): factory is ServiceFactory<T, D> {
-  return factory?.provides?.symbol === key?.symbol;
-}
+import { ServiceKey } from './serviceKey';
+import { ServiceFactory } from './serviceFactory';
+import { ServiceScope } from './serviceScope';
+
+type GenericFactory = ServiceFactory<unknown, readonly ServiceKey<any>[]>;
+type GenericKey = ServiceKey<any>;
+
+export class ServiceModule {
+  private constructor(readonly factories: GenericFactory[]) {
+    factories.forEach((factory) => {
+      checkRecursiveDependencies(factory);
+      checkMissingDependencies(factory, this.factories);
+    });
+  }
+
+  public async get<T>(key: ServiceKey<T>): Promise<T> {
+    const factory = this.factories.find((factory: GenericFactory) => {
+      return isSuitable(key, factory);
+    });
+
+    // Check if a factory to supply the requested key was not found
+    if (!factory) {
+      throw new Error(`Could not find a suitable factory for ${key.name}`);
+    }
+
+    // Resolve all dependencies first
+    const dependencies = await Promise.all(
+      factory.dependsOn.map((dependencyKey: ServiceKey<unknown>) => {
+        return this.get(dependencyKey);
+      }),
+    );
+
+    // Call the factory to retrieve the dependency
+    return factory.initialize(...dependencies);
+  }
+
+  /**
+   * Disposes of service factories within the specified scope or all factories if no scope is provided.
+   *
+   * This method is useful for cleaning up resources and instances held by service factories,
+   * such as singleton factories, as they may hold database connections or other resources that need to be released.
+   *
+   * @param {ServiceScope} [scope] The scope to filter the factories to be disposed.
+   * If not provided, all factories are disposed of.
+   * @return {void} No return value.
+   */
+  public dispose(scope?: ServiceScope) {
+    const factories = scope
+      ? this.factories.filter((f) => f.scope === scope)
+      : this.factories;
+
+    factories.forEach((factory) => factory.dispose?.());
+  }
+
+  /**
+   * Creates a new ServiceModule instance by aggregating and deduplicating a list of
+   * ServiceModule or GenericFactory instances.
+   * If multiple factories provide the same
+   * ServiceKey, the last one in the list takes precedence.
+   *
+   * @param {Array<ServiceModule | GenericFactory>} entries - An array of ServiceModule or GenericFactory
+   * instances to be processed into a single ServiceModule.
+   * @return {ServiceModule} A new ServiceModule containing the deduplicated factories.
+   */
+  static from(entries: (ServiceModule | GenericFactory)[]): ServiceModule {
+    // Flatten entries and keep only the last factory for each ServiceKey
+    const flattened = entries.flatMap((e) =>
+      e instanceof ServiceModule ? e.factories : [e],
+    );
+
+    const byKey = new Map<symbol, GenericFactory>();
+    // Later factories overwrite earlier ones (last-wins)
+    for (const f of flattened) {
+      byKey.set(f.provides.symbol, f);
+    }
+
+    return new ServiceModule(Array.from(byKey.values()));
+  }
+}
+
+function checkRecursiveDependencies(factory: GenericFactory) {
+  const recursive = factory.dependsOn.some((dependencyKey) => {
+    return dependencyKey === factory.provides;
+  });
+
+  if (recursive) {
+    throw new Error(
+      'Recursive dependency detected on: ' + factory.provides.name,
+    );
+  }
+}
+
+function checkMissingDependencies(
+  factory: GenericFactory,
+  factories: GenericFactory[],
+) {
+  const missingDependencies = factory.dependsOn.filter(
+    (dependencyKey: GenericKey) => {
+      return !isRegistered(dependencyKey, factories);
+    },
+  );
+  if (missingDependencies.length === 0) {
+    return;
+  }
+
+  const dependencyList = missingDependencies
+    .map((dependencyKey) => ` -> ${dependencyKey.name}`)
+    .join('\n');
+  throw new Error(
+    `${factory.provides.name} will fail because it depends on:\n ${dependencyList}`,
+  );
+}
+
+function isRegistered(key: GenericKey, factories: GenericFactory[]) {
+  return factories.some((factory) => factory.provides?.symbol === key?.symbol);
+}
+
+function isSuitable<T, D extends readonly ServiceKey<any>[]>(
+  key: ServiceKey<T>,
+  factory: ServiceFactory<any, D>,
+): factory is ServiceFactory<T, D> {
+  return factory?.provides?.symbol === key?.symbol;
+}

package/src/{ServiceScope.ts → serviceScope.ts}

@@ -1,7 +1,7 @@
-export class ServiceScope {
-  readonly symbol: symbol;
-
-  constructor(readonly name: string) {
-    this.symbol = Symbol(name);
-  }
-}
+export class ServiceScope {
+  readonly symbol: symbol;
+
+  constructor(readonly name: string) {
+    this.symbol = Symbol(name);
+  }
+}

package/src/utils.ts

@@ -1,5 +1,5 @@
-import { ServiceModule } from './ServiceModule';
-import { ServiceKey } from './ServiceKey';
+import { ServiceModule } from './serviceModule';
+import { ServiceKey } from './serviceKey';
 
 export interface DotGraphOptions {
   /** Graph direction: 'TB' (top-bottom), 'LR' (left-right), 'BT' (bottom-top), 'RL' (right-left) */

package/dist/ServiceScope.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServiceScope.d.ts","sourceRoot":"","sources":["../src/ServiceScope.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAY;IAGX,QAAQ,CAAC,IAAI,EAAE,MAAM;IAFjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEH,IAAI,EAAE,MAAM;CAGlC"}

package/dist/ServiceScope.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServiceScope.js","sourceRoot":"","sources":["../src/ServiceScope.ts"],"names":[],"mappings":";;;AAAA,MAAa,YAAY;IAGvB,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AAND,oCAMC"}