composed-di 0.0.1 → 0.0.2

package/dist/serviceModule.d.ts

@@ -5,6 +5,6 @@ export declare class ServiceModule implements ServiceProvider {
     private readonly factories;
     constructor(factories: Set<ServiceFactory<unknown, ServiceKey<unknown>[]>>);
     inject<T>(key: ServiceKey<T>): Promise<T>;
-    static from(factories: ServiceFactory<unknown, ServiceKey<unknown>[]>[]): ServiceModule;
+    static from(entries: (ServiceModule | ServiceFactory<unknown, ServiceKey<unknown>[]>)[]): ServiceModule;
 }
 //# sourceMappingURL=serviceModule.d.ts.map

package/dist/serviceModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serviceModule.d.ts","sourceRoot":"","sources":["../src/serviceModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,aAAc,YAAW,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;gBAEhD,SAAS,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAQ7D,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBtD,MAAM,CAAC,IAAI,CACT,SAAS,EAAE,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,GAC1D,aAAa;CAGjB"}
+{"version":3,"file":"serviceModule.d.ts","sourceRoot":"","sources":["../src/serviceModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,aAAc,YAAW,eAAe;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;gBAEhD,SAAS,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAQ7D,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBtD,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,CAAC,aAAa,GAAG,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAC1E,aAAa;CAajB"}

package/dist/serviceModule.js

@@ -36,8 +36,15 @@ class ServiceModule {
             return factory.initialize(...dependencies);
         });
     }
-    static from(factories) {
-        return new ServiceModule(new Set(factories));
+    static from(entries) {
+        return new ServiceModule(new Set(entries.flatMap((e) => {
+            if (e instanceof ServiceModule) {
+                return e.factories;
+            }
+            else {
+                return [e];
+            }
+        })));
     }
 }
 exports.ServiceModule = ServiceModule;

package/dist/serviceModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"serviceModule.js","sourceRoot":"","sources":["../src/serviceModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,MAAa,aAAa;IAGxB,YAAY,SAA8D;QAFzD,cAAS,GAA+B,EAAE,CAAC;QAG1D,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACjC,0BAA0B,CAAC,OAAO,CAAC,CAAC;YACpC,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAEY,MAAM,CAAI,GAAkB;;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC9C,OAAO,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YAEH,+DAA+D;YAC/D,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACvE,CAAC;YAED,iCAAiC;YACjC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,aAAkC,EAAE,EAAE;gBAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACpC,CAAC,CAAC,CACH,CAAC;YAEF,8CAA8C;YAC9C,OAAO,OAAO,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,CAAC;QAC7C,CAAC;KAAA;IAED,MAAM,CAAC,IAAI,CACT,SAA2D;QAE3D,OAAO,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/C,CAAC;CACF;AArCD,sCAqCC;AAED,SAAS,0BAA0B,CACjC,OAAuD;IAEvD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE;QACzD,OAAO,aAAa,KAAK,OAAO,CAAC,QAAQ,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CACb,oCAAoC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,OAAuD,EACvD,SAAoC;IAEpC,MAAM,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAClD,CAAC,aAA8B,EAAE,EAAE;QACjC,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC,CACF,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,mBAAmB;SACvC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,OAAO,aAAa,CAAC,IAAI,EAAE,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,IAAI,KAAK,CACb,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,uCAAuC,cAAc,EAAE,CAChF,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,GAAwB,EACxB,SAAoC;IAEpC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,GAAG,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,UAAU,CACjB,GAAkB,EAClB,OAAmC;IAEnC,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAK,GAAG,CAAC;AACnC,CAAC"}
+{"version":3,"file":"serviceModule.js","sourceRoot":"","sources":["../src/serviceModule.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "composed-di",
   "private": false,
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "Juan Herrera juanhr454@gmail.com",
   "type": "commonjs",
   "main": "./dist/index.js",

package/src/serviceModule.ts

@@ -1,91 +1,101 @@
-import { ServiceKey } from './serviceKey';
-import { ServiceFactory } from './serviceFactory';
-import { ServiceProvider } from './serviceProvider';
-
-export class ServiceModule implements ServiceProvider {
-  private readonly factories: ServiceFactory<any, any>[] = [];
-
-  constructor(factories: Set<ServiceFactory<unknown, ServiceKey<unknown>[]>>) {
-    this.factories = Array.from(factories);
-    this.factories.forEach((factory) => {
-      checkRecursiveDependencies(factory);
-      checkMissingDependencies(factory, this.factories);
-    });
-  }
-
-  public async inject<T>(key: ServiceKey<T>): Promise<T> {
-    const factory = this.factories.find((factory) => {
-      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.inject(dependencyKey);
-      }),
-    );
-
-    // Call the factory to retrieve the dependency
-    return factory.initialize(...dependencies);
-  }
-
-  static from(
-    factories: ServiceFactory<unknown, ServiceKey<unknown>[]>[],
-  ): ServiceModule {
-    return new ServiceModule(new Set(factories));
-  }
-}
-
-function checkRecursiveDependencies(
-  factory: ServiceFactory<unknown, ServiceKey<unknown>[]>,
-) {
-  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: ServiceFactory<unknown, ServiceKey<unknown>[]>,
-  factories: ServiceFactory<unknown>[],
-) {
-  const missingDependencies = factory.dependsOn.filter(
-    (dependencyKey: ServiceKey<any>) => {
-      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: ServiceKey<unknown>,
-  factories: ServiceFactory<unknown>[],
-) {
-  return factories.some((factory) => factory.provides === key);
-}
-
-function isSuitable<T, D extends ServiceKey<unknown>[]>(
-  key: ServiceKey<T>,
-  factory: ServiceFactory<unknown, D>,
-): factory is ServiceFactory<T, D> {
-  return factory?.provides === key;
-}
+import { ServiceKey } from './serviceKey';
+import { ServiceFactory } from './serviceFactory';
+import { ServiceProvider } from './serviceProvider';
+
+export class ServiceModule implements ServiceProvider {
+  private readonly factories: ServiceFactory<any, any>[] = [];
+
+  constructor(factories: Set<ServiceFactory<unknown, ServiceKey<unknown>[]>>) {
+    this.factories = Array.from(factories);
+    this.factories.forEach((factory) => {
+      checkRecursiveDependencies(factory);
+      checkMissingDependencies(factory, this.factories);
+    });
+  }
+
+  public async inject<T>(key: ServiceKey<T>): Promise<T> {
+    const factory = this.factories.find((factory) => {
+      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.inject(dependencyKey);
+      }),
+    );
+
+    // Call the factory to retrieve the dependency
+    return factory.initialize(...dependencies);
+  }
+
+  static from(
+    entries: (ServiceModule | ServiceFactory<unknown, ServiceKey<unknown>[]>)[],
+  ): ServiceModule {
+    return new ServiceModule(
+      new Set(
+        entries.flatMap((e) => {
+          if (e instanceof ServiceModule) {
+            return e.factories;
+          } else {
+            return [e];
+          }
+        }),
+      ),
+    );
+  }
+}
+
+function checkRecursiveDependencies(
+  factory: ServiceFactory<unknown, ServiceKey<unknown>[]>,
+) {
+  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: ServiceFactory<unknown, ServiceKey<unknown>[]>,
+  factories: ServiceFactory<unknown>[],
+) {
+  const missingDependencies = factory.dependsOn.filter(
+    (dependencyKey: ServiceKey<any>) => {
+      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: ServiceKey<unknown>,
+  factories: ServiceFactory<unknown>[],
+) {
+  return factories.some((factory) => factory.provides === key);
+}
+
+function isSuitable<T, D extends ServiceKey<unknown>[]>(
+  key: ServiceKey<T>,
+  factory: ServiceFactory<unknown, D>,
+): factory is ServiceFactory<T, D> {
+  return factory?.provides === key;
+}