composed-di 0.0.1 → 0.0.3-alpha

package/dist/main.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=main.d.ts.map

package/dist/main.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":""}

package/dist/main.js

@@ -1,284 +1,15 @@
 "use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// src/lib/serviceModule.ts
-var ServiceModule = class _ServiceModule {
-  constructor(factories) {
-    this.factories = [];
-    this.factories = Array.from(factories);
-    this.factories.forEach((factory) => {
-      checkRecursiveDependencies(factory);
-      checkMissingDependencies(factory, this.factories);
-    });
-  }
-  async inject(key) {
-    const factory = this.factories.find((factory2) => {
-      return isSuitable(key, factory2);
-    });
-    if (!factory) {
-      throw new Error(`Could not find a suitable factory for ${key.name}`);
-    }
-    const dependencies = await Promise.all(
-      factory.dependsOn.map((dependencyKey) => {
-        return this.inject(dependencyKey);
-      })
-    );
-    return factory.initialize(...dependencies);
-  }
-  static from(factories) {
-    return new _ServiceModule(new Set(factories));
-  }
-};
-function checkRecursiveDependencies(factory) {
-  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, factories) {
-  const missingDependencies = factory.dependsOn.filter(
-    (dependencyKey) => {
-      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:
- ${dependencyList}`
-  );
-}
-function isRegistered(key, factories) {
-  return factories.some((factory) => factory.provides === key);
-}
-function isSuitable(key, factory) {
-  return factory?.provides === key;
-}
-
-// src/lib/serviceKey.ts
-var ServiceKey = class {
-  constructor(name) {
-    this.name = name;
-    this.symbol = Symbol(name);
-  }
-};
-
-// src/lib/serviceFactory.ts
-function singletonFactory({
-  provides,
-  dependsOn = [],
-  initialize,
-  dispose = () => {
-  }
-}) {
-  let instance;
-  return {
-    provides,
-    dependsOn,
-    async initialize(...dependencies) {
-      if (instance) {
-        return instance;
-      }
-      instance = await initialize(...dependencies);
-      return instance;
+Object.defineProperty(exports, "__esModule", { value: true });
+const serviceKey_1 = require("./serviceKey");
+const serviceFactory_1 = require("./serviceFactory");
+const TEST_SERVICE_KEY = new serviceKey_1.ServiceKey('testService');
+const FOO_KEY = new serviceKey_1.ServiceKey('foo');
+const BAR_KEY = new serviceKey_1.ServiceKey('bar');
+const TestServiceFactory = (0, serviceFactory_1.singletonFactory)({
+    provides: TEST_SERVICE_KEY,
+    dependsOn: [FOO_KEY, BAR_KEY],
+    initialize: (foo, bar) => {
+        return { foo, bar };
     },
-    dispose(serviceInstance) {
-      if (instance === serviceInstance) {
-        dispose(serviceInstance);
-        instance = void 0;
-      }
-    }
-  };
-}
-
-// src/core/sms/di/smsModule.ts
-var import_node_process = __toESM(require("node:process"));
-
-// src/core/sms/noOpSmsService.ts
-var NoOpSmsService = class {
-  send(recipient, text) {
-    console.warn(`NoOpSmsService: Sending sms to ${recipient}: ${text}`);
-  }
-};
-
-// src/core/sms/tigoSmsService.ts
-var TigoSmsService = class {
-  send(_recipient, _text) {
-    throw new Error("Not yet implemented");
-  }
-};
-
-// src/core/logger/emailAlertLogger.ts
-var EmailAlertLogger = class {
-  constructor(bufferSize = 50, recipients = []) {
-    this.buffer = [];
-    this.emailQueue = [];
-    this.bufferSize = bufferSize;
-    this.recipients = recipients;
-  }
-  addToBuffer(event) {
-    if (this.buffer.length >= this.bufferSize) {
-      this.buffer.shift();
-    }
-    this.buffer.push({ ...event, date: /* @__PURE__ */ new Date() });
-  }
-  info(message, payload) {
-    this.addToBuffer({ level: "INFO", message, payload });
-  }
-  error(message, error, payload) {
-    this.addToBuffer({ level: "ERROR", message, payload });
-    this.emailQueue.push(createTableString(this.buffer, error));
-    this.buffer.length = 0;
-  }
-  debug(message, payload) {
-    this.addToBuffer({ level: "DEBUG", message, payload });
-  }
-  async flush() {
-    for (const email of this.emailQueue) {
-      console.error(email);
-    }
-    this.buffer.length = 0;
-    this.emailQueue.length = 0;
-  }
-};
-function createTableString(events, error) {
-  if (events.length === 0) {
-    return "No events to display";
-  }
-  const dateWidth = Math.max(
-    4,
-    ...events.map((e) => e.date.toISOString().length)
-  );
-  const levelWidth = Math.max(
-    5,
-    ...events.map((e) => e.level.length)
-  );
-  const messageWidth = Math.max(7, ...events.map((e) => e.message.length));
-  const payloadWidth = Math.max(
-    7,
-    ...events.map((e) => e.payload ? JSON.stringify(e.payload).length : 0)
-  );
-  const header = [
-    "DATE".padEnd(dateWidth),
-    "LEVEL".padEnd(levelWidth),
-    "MESSAGE".padEnd(messageWidth),
-    "PAYLOAD".padEnd(payloadWidth)
-  ].join(" | ");
-  const separator = [
-    "-".repeat(dateWidth),
-    "-".repeat(levelWidth),
-    "-".repeat(messageWidth),
-    "-".repeat(payloadWidth)
-  ].join("-|-");
-  const rows = events.map((event) => {
-    const date = event.date.toISOString().padEnd(dateWidth);
-    const level = event.level.padEnd(levelWidth);
-    const message = event.message.padEnd(messageWidth);
-    const payload = (event.payload ? JSON.stringify(event.payload) : "").padEnd(
-      payloadWidth
-    );
-    return [date, level, message, payload].join(" | ");
-  });
-  const errorSection = error ? "\n\nError Details:\n" + "-".repeat(20) + "\n" + (error instanceof Error ? `${error.name}: ${error.message}
-${error.stack || ""}` : String(error)) : "";
-  return [header, separator, ...rows].join("\n") + errorSection;
-}
-
-// src/core/logger/di/loggerModule.ts
-var LOGGER = new ServiceKey("Logger");
-var LoggerFactory = singletonFactory({
-  provides: LOGGER,
-  dependsOn: [],
-  initialize: () => {
-    return Promise.resolve(new EmailAlertLogger(100, ["juanhr454@gmail.com"]));
-  }
 });
-
-// src/core/sms/di/smsModule.ts
-var SMS_SERVICE = new ServiceKey("SmsService");
-var SmsServiceFactory = singletonFactory({
-  provides: SMS_SERVICE,
-  dependsOn: [LOGGER],
-  initialize(logger) {
-    logger.info("Initializing SmsService");
-    if (import_node_process.default.env.environment === "dev") {
-      return Promise.resolve(new NoOpSmsService());
-    } else {
-      return Promise.resolve(new TigoSmsService());
-    }
-  }
-});
-var SmsServiceTestFactory = singletonFactory({
-  provides: SMS_SERVICE,
-  dependsOn: [],
-  initialize() {
-    return Promise.resolve(new NoOpSmsService());
-  }
-});
-
-// src/main.ts
-var authModule = ServiceModule.from([SmsServiceFactory, LoggerFactory]);
-function module2(module3, fn) {
-  return (event, context) => {
-    fn(event, { services: module3, ...context });
-  };
-}
-var handler = module2(authModule, login);
-(async function() {
-  await deeplyNestedFunction({ services: authModule });
-  const logger = await authModule.inject(LOGGER);
-  if (logger instanceof EmailAlertLogger) {
-    await logger.flush();
-  }
-  console.log("Done");
-})();
-async function deeplyNestedFunction(context) {
-  await login({}, context);
-}
-async function login(event, context) {
-  const state = authorize(event);
-  const logger = await context.services.inject(LOGGER);
-  if (state === "DEVICE_CHANGED") {
-    logger.info("Device changed", { "user": "asad" });
-    const sms = await context.services.inject(SMS_SERVICE);
-    logger.debug("Sending sms");
-    try {
-      sms.send(971233149, "Hola Juan, tu pin es 22222");
-    } catch (e) {
-      logger.error("Error sending sms", e);
-    }
-    const sms1 = await context.services.inject(SMS_SERVICE);
-  }
-  return;
-}
-function authorize(_request) {
-  return "DEVICE_CHANGED";
-}
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../src/lib/serviceModule.ts", "../src/lib/serviceKey.ts", "../src/lib/serviceFactory.ts", "../src/core/sms/di/smsModule.ts", "../src/core/sms/noOpSmsService.ts", "../src/core/sms/tigoSmsService.ts", "../src/core/logger/emailAlertLogger.ts", "../src/core/logger/di/loggerModule.ts", "../src/main.ts"],
  "sourcesContent": ["import { ServiceKey } from './serviceKey';\r\nimport { ServiceFactory } from './serviceFactory';\r\nimport { ServiceProvider } from './serviceProvider';\r\n\r\nexport class ServiceModule implements ServiceProvider {\r\n  private readonly factories: ServiceFactory<any, any>[] = [];\r\n\r\n  constructor(factories: Set<ServiceFactory<unknown, ServiceKey<unknown>[]>>) {\r\n    this.factories = Array.from(factories);\r\n    this.factories.forEach((factory) => {\r\n      checkRecursiveDependencies(factory);\r\n      checkMissingDependencies(factory, this.factories);\r\n    });\r\n  }\r\n\r\n  public async inject<T>(key: ServiceKey<T>): Promise<T> {\r\n    const factory = this.factories.find((factory) => {\r\n      return isSuitable(key, factory);\r\n    });\r\n\r\n    // Check if a factory to supply the requested key was not found\r\n    if (!factory) {\r\n      throw new Error(`Could not find a suitable factory for ${key.name}`);\r\n    }\r\n\r\n    // Resolve all dependencies first\r\n    const dependencies = await Promise.all(\r\n      factory.dependsOn.map((dependencyKey: ServiceKey<unknown>) => {\r\n        return this.inject(dependencyKey);\r\n      }),\r\n    );\r\n\r\n    // Call the factory to retrieve the dependency\r\n    return factory.initialize(...dependencies);\r\n  }\r\n\r\n  static from(\r\n    factories: ServiceFactory<unknown, ServiceKey<unknown>[]>[],\r\n  ): ServiceModule {\r\n    return new ServiceModule(new Set(factories));\r\n  }\r\n}\r\n\r\nfunction checkRecursiveDependencies(\r\n  factory: ServiceFactory<unknown, ServiceKey<unknown>[]>,\r\n) {\r\n  const recursive = factory.dependsOn.some((dependencyKey) => {\r\n    return dependencyKey === factory.provides;\r\n  });\r\n\r\n  if (recursive) {\r\n    throw new Error(\r\n      'Recursive dependency detected on: ' + factory.provides.name,\r\n    );\r\n  }\r\n}\r\n\r\nfunction checkMissingDependencies(\r\n  factory: ServiceFactory<unknown, ServiceKey<unknown>[]>,\r\n  factories: ServiceFactory<unknown>[],\r\n) {\r\n  const missingDependencies = factory.dependsOn.filter(\r\n    (dependencyKey: ServiceKey<any>) => {\r\n      return !isRegistered(dependencyKey, factories);\r\n    },\r\n  );\r\n  if (missingDependencies.length === 0) {\r\n    return;\r\n  }\r\n\r\n  const dependencyList = missingDependencies\r\n    .map((dependencyKey) => ` -> ${dependencyKey.name}`)\r\n    .join('\\n');\r\n  throw new Error(\r\n    `${factory.provides.name} will fail because it depends on:\\n ${dependencyList}`,\r\n  );\r\n}\r\n\r\nfunction isRegistered(\r\n  key: ServiceKey<unknown>,\r\n  factories: ServiceFactory<unknown>[],\r\n) {\r\n  return factories.some((factory) => factory.provides === key);\r\n}\r\n\r\nfunction isSuitable<T, D extends ServiceKey<unknown>[]>(\r\n  key: ServiceKey<T>,\r\n  factory: ServiceFactory<unknown, D>,\r\n): factory is ServiceFactory<T, D> {\r\n  return factory?.provides === key;\r\n}\r\n", "// @ts-ignore\r\nexport class ServiceKey<T> {\r\n  private readonly symbol: symbol;\r\n\r\n  constructor(public readonly name: string) {\r\n    this.symbol = Symbol(name);\r\n  }\r\n}\r\n", "import { ServiceKey } from './serviceKey';\r\n\r\n// Helper types to extract the type from ServiceKey\r\ntype ServiceType<T> = T extends ServiceKey<infer U> ? U : never;\r\n\r\n// Helper types to convert an array of ServiceKey to tuple of their types\r\ntype DependencyTypes<T extends ServiceKey<unknown>[]> = {\r\n  [K in keyof T]: ServiceType<T[K]>;\r\n};\r\n\r\nexport interface ServiceFactory<T, D extends ServiceKey<unknown>[] = []> {\r\n  provides: ServiceKey<T>;\r\n  dependsOn: D;\r\n\r\n  initialize(...dependencies: DependencyTypes<D>): Promise<T>;\r\n\r\n  dispose(instance: T): void;\r\n}\r\n\r\nexport function singletonFactory<T, D extends ServiceKey<unknown>[] = []>({\r\n  provides,\r\n  dependsOn = [] as unknown as D,\r\n  initialize,\r\n  dispose = () => {},\r\n}: {\r\n  provides: ServiceKey<T>;\r\n  dependsOn?: D;\r\n  initialize: (...dependencies: DependencyTypes<D>) => Promise<T>;\r\n  dispose?: (instance: T) => void;\r\n}): ServiceFactory<T, D> {\r\n  let instance: T | undefined;\r\n\r\n  return {\r\n    provides,\r\n    dependsOn,\r\n    async initialize(...dependencies: DependencyTypes<D>): Promise<T> {\r\n      if (instance) {\r\n        return instance;\r\n      }\r\n      instance = await initialize(...dependencies);\r\n      return instance;\r\n    },\r\n    dispose(serviceInstance: T): void {\r\n      if (instance === serviceInstance) {\r\n        dispose(serviceInstance);\r\n        instance = undefined;\r\n      }\r\n    },\r\n  };\r\n}\r\n\r\nexport function oneShotFactory<T, D extends ServiceKey<unknown>[] = []>({\r\n  provides,\r\n  dependsOn,\r\n  initialize,\r\n  dispose = () => {},\r\n}: {\r\n  provides: ServiceKey<T>;\r\n  dependsOn: D;\r\n  initialize: (...dependencies: DependencyTypes<D>) => Promise<T>;\r\n  dispose?: (instance: T) => void;\r\n}): ServiceFactory<T, D> {\r\n  return {\r\n    provides,\r\n    dependsOn,\r\n    initialize,\r\n    dispose,\r\n  };\r\n}\r\n", "import { ServiceKey } from '../../../lib/serviceKey';\nimport { SmsService } from '../smsService';\nimport { singletonFactory } from '../../../lib/serviceFactory';\nimport process from 'node:process';\nimport { NoOpSmsService } from '../noOpSmsService';\nimport { TigoSmsService } from '../tigoSmsService';\nimport { LOGGER } from '../../logger/di/loggerModule';\nimport { Logger } from '../../logger/logger';\n\nexport const SMS_SERVICE = new ServiceKey<SmsService>('SmsService');\n\nexport const SmsServiceFactory = singletonFactory({\n  provides: SMS_SERVICE,\n  dependsOn: [LOGGER],\n  initialize(logger: Logger): Promise<SmsService> {\n    logger.info('Initializing SmsService');\n    // Since the create method is async, we could instantiate a different\n    // implementation on demand by retrieving some configuration from a db\n    // or a config file.\n    if (process.env.environment === 'dev') {\n      return Promise.resolve(new NoOpSmsService());\n    } else {\n      return Promise.resolve(new TigoSmsService());\n    }\n  },\n});\n\nexport const SmsServiceTestFactory = singletonFactory({\n  provides: SMS_SERVICE,\n  dependsOn: [],\n  initialize(): Promise<SmsService> {\n    return Promise.resolve(new NoOpSmsService());\n  },\n})", "import { SmsService } from './smsService';\r\n\r\nexport class NoOpSmsService implements SmsService {\r\n  send(recipient: number, text: string) {\r\n    console.warn(`NoOpSmsService: Sending sms to ${recipient}: ${text}`);\r\n  }\r\n}\r\n", "import { SmsService } from './smsService';\r\n\r\nexport class TigoSmsService implements SmsService {\r\n  send(_recipient: number, _text: string) {\r\n    throw new Error('Not yet implemented');\r\n  }\r\n}\r\n", "import { Logger, LogEvent, LogEventPayload } from './logger';\r\n\r\nexport class EmailAlertLogger implements Logger {\r\n  private readonly buffer: LogEvent[] = [];\r\n  private readonly bufferSize: number;\r\n  private readonly recipients: string[];\r\n  private readonly emailQueue: string[] = [];\r\n\r\n  constructor(bufferSize: number = 50, recipients: string[] = []) {\r\n    this.bufferSize = bufferSize;\r\n    this.recipients = recipients;\r\n  }\r\n\r\n  private addToBuffer(event: Omit<LogEvent, 'date'>): void {\r\n    // Keep the buffer to the specified size\r\n    if (this.buffer.length >= this.bufferSize) {\r\n      this.buffer.shift();\r\n    }\r\n    this.buffer.push({ ...event, date: new Date() });\r\n  }\r\n\r\n  public info(message: string, payload?: LogEventPayload): void {\r\n    this.addToBuffer({ level: 'INFO', message, payload });\r\n  }\r\n\r\n  public error(\r\n    message: string,\r\n    error?: unknown,\r\n    payload?: LogEventPayload,\r\n  ): void {\r\n    this.addToBuffer({ level: 'ERROR', message, payload });\r\n    this.emailQueue.push(createTableString(this.buffer, error));\r\n    this.buffer.length = 0;\r\n  }\r\n\r\n  public debug(message: string, payload?: LogEventPayload): void {\r\n    this.addToBuffer({ level: 'DEBUG', message, payload });\r\n  }\r\n\r\n  public async flush(): Promise<void> {\r\n    for (const email of this.emailQueue) {\r\n      console.error(email);\r\n    }\r\n    // Clear all buffers\r\n    this.buffer.length = 0;\r\n    this.emailQueue.length = 0;\r\n  }\r\n}\r\n\r\nfunction createTableString(events: LogEvent[], error?: unknown): string {\r\n  if (events.length === 0) {\r\n    return 'No events to display';\r\n  }\r\n\r\n  // Calculate column widths\r\n  const dateWidth = Math.max(\r\n    4,\r\n    ...events.map((e) => e.date.toISOString().length),\r\n  );\r\n  const levelWidth = Math.max(\r\n    5, // \"Level\" header length\r\n    ...events.map((e) => e.level.length),\r\n  );\r\n  const messageWidth = Math.max(7, ...events.map((e) => e.message.length));\r\n  const payloadWidth = Math.max(\r\n    7,\r\n    ...events.map((e) => (e.payload ? JSON.stringify(e.payload).length : 0)),\r\n  );\r\n\r\n  // Create header\r\n  const header = [\r\n    'DATE'.padEnd(dateWidth),\r\n    'LEVEL'.padEnd(levelWidth),\r\n    'MESSAGE'.padEnd(messageWidth),\r\n    'PAYLOAD'.padEnd(payloadWidth),\r\n  ].join(' | ');\r\n\r\n  // Create separator\r\n  const separator = [\r\n    '-'.repeat(dateWidth),\r\n    '-'.repeat(levelWidth),\r\n    '-'.repeat(messageWidth),\r\n    '-'.repeat(payloadWidth),\r\n  ].join('-|-');\r\n\r\n  // Create rows\r\n  const rows = events.map((event) => {\r\n    const date = event.date.toISOString().padEnd(dateWidth);\r\n    const level = event.level.padEnd(levelWidth);\r\n    const message = event.message.padEnd(messageWidth);\r\n    const payload = (event.payload ? JSON.stringify(event.payload) : '').padEnd(\r\n      payloadWidth,\r\n    );\r\n    return [date, level, message, payload].join(' | ');\r\n  });\r\n\r\n  // Create error section if error exists\r\n  const errorSection = error\r\n    ? '\\n\\nError Details:\\n' +\r\n      '-'.repeat(20) +\r\n      '\\n' +\r\n      (error instanceof Error\r\n        ? `${error.name}: ${error.message}\\n${error.stack || ''}`\r\n        : String(error))\r\n    : '';\r\n\r\n  // Combine all parts\r\n  return [header, separator, ...rows].join('\\n') + errorSection;\r\n}\r\n", "import { singletonFactory } from '../../../lib/serviceFactory';\r\nimport { ServiceKey } from '../../../lib/serviceKey';\r\nimport { EmailAlertLogger } from '../emailAlertLogger';\r\nimport { Logger } from '../logger';\r\nimport { SMS_SERVICE } from '../../sms/di/smsModule';\r\nimport { SmsService } from '../../sms/smsService';\r\n\r\nexport const LOGGER = new ServiceKey<Logger>('Logger');\r\n\r\nexport const LoggerFactory = singletonFactory({\r\n  provides: LOGGER,\r\n  dependsOn: [],\r\n  initialize: () => {\r\n    return Promise.resolve(new EmailAlertLogger(100, ['juanhr454@gmail.com']));\r\n  },\r\n});\r\n", "import { ServiceModule } from './lib/serviceModule';\r\nimport { ServiceProvider } from './lib/serviceProvider';\r\nimport { SMS_SERVICE, SmsServiceFactory } from './core/sms/di/smsModule';\r\nimport { LOGGER, LoggerFactory } from './core/logger/di/loggerModule';\r\nimport { EmailAlertLogger } from './core/logger/emailAlertLogger';\r\n\r\nconst authModule = ServiceModule.from([SmsServiceFactory, LoggerFactory]);\r\n\r\nfunction module(\r\n  module: ServiceModule,\r\n  fn: (event: object, context: Context) => void,\r\n) {\r\n  return (event: object, context: object) => {\r\n    fn(event, { services: module, ...context });\r\n  };\r\n}\r\n\r\nconst handler = module(authModule, login);\r\n\r\n(async function () {\r\n  await deeplyNestedFunction({ services: authModule });\r\n  const logger = await authModule.inject(LOGGER);\r\n  if (logger instanceof EmailAlertLogger) {\r\n    await logger.flush();\r\n  }\r\n  console.log('Done');\r\n})();\r\n\r\nasync function deeplyNestedFunction(context: Context) {\r\n  await login({}, context);\r\n}\r\n\r\ninterface Context {\r\n  services: ServiceProvider;\r\n}\r\n\r\nasync function login(event: any, context: Context) {\r\n  const state = authorize(event);\r\n  const logger = await context.services.inject(LOGGER);\r\n  if (state === 'DEVICE_CHANGED') {\r\n    logger.info('Device changed', {'user': 'asad'});\r\n    // With the service key we get type safety/inference and navigate to definition for free,\r\n    // there is no magic no annotations, we can see all the\r\n    // factories that provide this dependency and see all places where this is retrieved.\r\n    const sms = await context.services.inject(SMS_SERVICE);\r\n    logger.debug('Sending sms');\r\n    try {\r\n      sms.send(971233149, 'Hola Juan, tu pin es 22222');\r\n    } catch (e) {\r\n      logger.error('Error sending sms', e);\r\n    }\r\n\r\n    // Retrieving the service a second time would have virtually zero cost if the\r\n    // underlying factory provides a singleton.\r\n    const sms1 = await context.services.inject(SMS_SERVICE);\r\n  }\r\n\r\n  return;\r\n}\r\n\r\nfunction authorize(_request: any): 'OK' | 'DEVICE_CHANGED' {\r\n  return 'DEVICE_CHANGED';\r\n}\r\n"],
  "mappings": "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",
  "names": ["factory", "process", "module"]
}

+//# sourceMappingURL=main.js.map

package/dist/main.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,6CAA0C;AAC1C,qDAAoD;AAEpD,MAAM,gBAAgB,GAAG,IAAI,uBAAU,CAAc,aAAa,CAAC,CAAC;AACpE,MAAM,OAAO,GAAG,IAAI,uBAAU,CAAS,KAAK,CAAC,CAAC;AAC9C,MAAM,OAAO,GAAG,IAAI,uBAAU,CAAS,KAAK,CAAC,CAAC;AAO9C,MAAM,kBAAkB,GAAG,IAAA,iCAAgB,EAAC;IAC1C,QAAQ,EAAE,gBAAgB;IAC1B,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;IAC7B,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvB,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACtB,CAAC;CACF,CAAC,CAAC"}

package/dist/serviceFactory.d.ts

@@ -1,24 +1,24 @@
 import { ServiceKey } from './serviceKey';
 type ServiceType<T> = T extends ServiceKey<infer U> ? U : never;
-type DependencyTypes<T extends ServiceKey<unknown>[]> = {
+type DependencyTypes<T extends readonly ServiceKey<unknown>[]> = {
     [K in keyof T]: ServiceType<T[K]>;
 };
-export interface ServiceFactory<T, D extends ServiceKey<unknown>[] = []> {
+export interface ServiceFactory<T, D extends readonly ServiceKey<unknown>[] = []> {
     provides: ServiceKey<T>;
     dependsOn: D;
-    initialize(...dependencies: DependencyTypes<D>): Promise<T>;
+    initialize(...dependencies: DependencyTypes<D>): T | Promise<T>;
     dispose(instance: T): void;
 }
-export declare function singletonFactory<T, D extends ServiceKey<unknown>[] = []>({ provides, dependsOn, initialize, dispose, }: {
+export declare function singletonFactory<T, const D extends readonly ServiceKey<unknown>[] = []>({ provides, dependsOn, initialize, dispose, }: {
     provides: ServiceKey<T>;
     dependsOn?: D;
-    initialize: (...dependencies: DependencyTypes<D>) => Promise<T>;
+    initialize: (...dependencies: DependencyTypes<D>) => T | Promise<T>;
     dispose?: (instance: T) => void;
 }): ServiceFactory<T, D>;
-export declare function oneShotFactory<T, D extends ServiceKey<unknown>[] = []>({ provides, dependsOn, initialize, dispose, }: {
+export declare function oneShotFactory<T, const D extends readonly ServiceKey<unknown>[] = []>({ provides, dependsOn, initialize, dispose, }: {
     provides: ServiceKey<T>;
     dependsOn: D;
-    initialize: (...dependencies: DependencyTypes<D>) => Promise<T>;
+    initialize: (...dependencies: DependencyTypes<D>) => T | Promise<T>;
     dispose?: (instance: T) => void;
 }): ServiceFactory<T, D>;
 export {};

package/dist/serviceFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serviceFactory.d.ts","sourceRoot":"","sources":["../src/serviceFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAGhE,KAAK,eAAe,CAAC,CAAC,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI;KACrD,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE;IACrE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC;IAEb,UAAU,CAAC,GAAG,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE5D,OAAO,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;CAC5B;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,EACxE,QAAQ,EACR,SAA8B,EAC9B,UAAU,EACV,OAAkB,GACnB,EAAE;IACD,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxB,SAAS,CAAC,EAAE,CAAC,CAAC;IACd,UAAU,EAAE,CAAC,GAAG,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAChE,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAC;CACjC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAoBvB;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,EACtE,QAAQ,EACR,SAAS,EACT,UAAU,EACV,OAAkB,GACnB,EAAE;IACD,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC;IACb,UAAU,EAAE,CAAC,GAAG,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAChE,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAC;CACjC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAOvB"}
+{"version":3,"file":"serviceFactory.d.ts","sourceRoot":"","sources":["../src/serviceFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAGhE,KAAK,eAAe,CAAC,CAAC,SAAS,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI;KAC9D,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,cAAc,CAC7B,CAAC,EACD,CAAC,SAAS,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE;IAE7C,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC;IAEb,UAAU,CAAC,GAAG,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAEhE,OAAO,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;CAC5B;AAED,wBAAgB,gBAAgB,CAC9B,CAAC,EACD,KAAK,CAAC,CAAC,SAAS,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EACnD,EACA,QAAQ,EACR,SAA8B,EAC9B,UAAU,EACV,OAAkB,GACnB,EAAE;IACD,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxB,SAAS,CAAC,EAAE,CAAC,CAAC;IACd,UAAU,EAAE,CAAC,GAAG,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAC;CACjC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAoBvB;AAED,wBAAgB,cAAc,CAC5B,CAAC,EACD,KAAK,CAAC,CAAC,SAAS,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EACnD,EACA,QAAQ,EACR,SAAS,EACT,UAAU,EACV,OAAkB,GACnB,EAAE;IACD,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC;IACb,UAAU,EAAE,CAAC,GAAG,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAC;CACjC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAOvB"}

package/dist/serviceFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"serviceFactory.js","sourceRoot":"","sources":["../src/serviceFactory.ts"],"names":[],"mappings":";;;;;;;;;;;AAmBA,4CA8BC;AAED,wCAiBC;AAjDD,SAAgB,gBAAgB,CAA0C,EACxE,QAAQ,EACR,SAAS,GAAG,EAAkB,EAC9B,UAAU,EACV,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,GAMnB;IACC,IAAI,QAAuB,CAAC;IAE5B,OAAO;QACL,QAAQ;QACR,SAAS;QACH,UAAU,CAAC,GAAG,YAAgC;;gBAClD,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,QAAQ,CAAC;gBAClB,CAAC;gBACD,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,YAAY,CAAC,CAAC;gBAC7C,OAAO,QAAQ,CAAC;YAClB,CAAC;SAAA;QACD,OAAO,CAAC,eAAkB;YACxB,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;gBACjC,OAAO,CAAC,eAAe,CAAC,CAAC;gBACzB,QAAQ,GAAG,SAAS,CAAC;YACvB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAA0C,EACtE,QAAQ,EACR,SAAS,EACT,UAAU,EACV,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,GAMnB;IACC,OAAO;QACL,QAAQ;QACR,SAAS;QACT,UAAU;QACV,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"serviceFactory.js","sourceRoot":"","sources":["../src/serviceFactory.ts"],"names":[],"mappings":";;;;;;;;;;;AAsBA,4CAiCC;AAED,wCAoBC;AAvDD,SAAgB,gBAAgB,CAG9B,EACA,QAAQ,EACR,SAAS,GAAG,EAAkB,EAC9B,UAAU,EACV,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,GAMnB;IACC,IAAI,QAAuB,CAAC;IAE5B,OAAO;QACL,QAAQ;QACR,SAAS;QACH,UAAU,CAAC,GAAG,YAAgC;;gBAClD,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,QAAQ,CAAC;gBAClB,CAAC;gBACD,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,YAAY,CAAC,CAAC;gBAC7C,OAAO,QAAQ,CAAC;YAClB,CAAC;SAAA;QACD,OAAO,CAAC,eAAkB;YACxB,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;gBACjC,OAAO,CAAC,eAAe,CAAC,CAAC;gBACzB,QAAQ,GAAG,SAAS,CAAC;YACvB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAG5B,EACA,QAAQ,EACR,SAAS,EACT,UAAU,EACV,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,GAMnB;IACC,OAAO;QACL,QAAQ;QACR,SAAS;QACT,UAAU;QACV,OAAO;KACR,CAAC;AACJ,CAAC"}

package/dist/serviceModule.d.ts

@@ -3,8 +3,8 @@ import { ServiceFactory } from './serviceFactory';
 import { ServiceProvider } from './serviceProvider';
 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;
+    constructor(factories: Set<ServiceFactory<unknown, readonly ServiceKey<unknown>[]>>);
+    get<T>(key: ServiceKey<T>): Promise<T>;
+    static from(entries: (ServiceModule | ServiceFactory<unknown, readonly 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;gBAG1D,SAAS,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAS5D,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBnD,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,CAAC,aAAa,GAAG,cAAc,CAAC,OAAO,EAAE,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GACnF,aAAa;CAajB"}

package/dist/serviceModule.js

@@ -19,7 +19,7 @@ class ServiceModule {
             checkMissingDependencies(factory, this.factories);
         });
     }
-    inject(key) {
+    get(key) {
         return __awaiter(this, void 0, void 0, function* () {
             const factory = this.factories.find((factory) => {
                 return isSuitable(key, factory);
@@ -30,14 +30,21 @@ class ServiceModule {
             }
             // Resolve all dependencies first
             const dependencies = yield Promise.all(factory.dependsOn.map((dependencyKey) => {
-                return this.inject(dependencyKey);
+                return this.get(dependencyKey);
             }));
             // Call the factory to retrieve the dependency
             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/dist/serviceProvider.d.ts

@@ -1,5 +1,5 @@
 import { ServiceKey } from './serviceKey';
 export interface ServiceProvider {
-    inject<T>(key: ServiceKey<T>): Promise<T>;
+    get<T>(key: ServiceKey<T>): Promise<T>;
 }
 //# sourceMappingURL=serviceProvider.d.ts.map

package/dist/serviceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serviceProvider.d.ts","sourceRoot":"","sources":["../src/serviceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC3C"}
+{"version":3,"file":"serviceProvider.d.ts","sourceRoot":"","sources":["../src/serviceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACxC"}

package/package.json

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

package/src/main.ts

@@ -0,0 +1,19 @@
+import { ServiceKey } from './serviceKey';
+import { singletonFactory } from './serviceFactory';
+
+const TEST_SERVICE_KEY = new ServiceKey<TestService>('testService');
+const FOO_KEY = new ServiceKey<string>('foo');
+const BAR_KEY = new ServiceKey<number>('bar');
+
+interface TestService {
+  foo: string;
+  bar: number;
+}
+
+const TestServiceFactory = singletonFactory({
+  provides: TEST_SERVICE_KEY,
+  dependsOn: [FOO_KEY, BAR_KEY],
+  initialize: (foo, bar) => {
+    return { foo, bar };
+  },
+});

package/src/serviceFactory.ts

@@ -1,69 +1,78 @@
-import { ServiceKey } from './serviceKey';
-
-// Helper types to extract the type from ServiceKey
-type ServiceType<T> = T extends ServiceKey<infer U> ? U : never;
-
-// Helper types to convert an array of ServiceKey to tuple of their types
-type DependencyTypes<T extends ServiceKey<unknown>[]> = {
-  [K in keyof T]: ServiceType<T[K]>;
-};
-
-export interface ServiceFactory<T, D extends ServiceKey<unknown>[] = []> {
-  provides: ServiceKey<T>;
-  dependsOn: D;
-
-  initialize(...dependencies: DependencyTypes<D>): Promise<T>;
-
-  dispose(instance: T): void;
-}
-
-export function singletonFactory<T, D extends ServiceKey<unknown>[] = []>({
-  provides,
-  dependsOn = [] as unknown as D,
-  initialize,
-  dispose = () => {},
-}: {
-  provides: ServiceKey<T>;
-  dependsOn?: D;
-  initialize: (...dependencies: DependencyTypes<D>) => Promise<T>;
-  dispose?: (instance: T) => void;
-}): ServiceFactory<T, D> {
-  let instance: T | undefined;
-
-  return {
-    provides,
-    dependsOn,
-    async initialize(...dependencies: DependencyTypes<D>): Promise<T> {
-      if (instance) {
-        return instance;
-      }
-      instance = await initialize(...dependencies);
-      return instance;
-    },
-    dispose(serviceInstance: T): void {
-      if (instance === serviceInstance) {
-        dispose(serviceInstance);
-        instance = undefined;
-      }
-    },
-  };
-}
-
-export function oneShotFactory<T, D extends ServiceKey<unknown>[] = []>({
-  provides,
-  dependsOn,
-  initialize,
-  dispose = () => {},
-}: {
-  provides: ServiceKey<T>;
-  dependsOn: D;
-  initialize: (...dependencies: DependencyTypes<D>) => Promise<T>;
-  dispose?: (instance: T) => void;
-}): ServiceFactory<T, D> {
-  return {
-    provides,
-    dependsOn,
-    initialize,
-    dispose,
-  };
-}
+import { ServiceKey } from './serviceKey';
+
+// Helper types to extract the type from ServiceKey
+type ServiceType<T> = T extends ServiceKey<infer U> ? U : never;
+
+// Helper types to convert an array/tuple of ServiceKey to tuple of their types
+type DependencyTypes<T extends readonly ServiceKey<unknown>[]> = {
+  [K in keyof T]: ServiceType<T[K]>;
+};
+
+export interface ServiceFactory<
+  T,
+  D extends readonly ServiceKey<unknown>[] = [],
+> {
+  provides: ServiceKey<T>;
+  dependsOn: D;
+
+  initialize(...dependencies: DependencyTypes<D>): T | Promise<T>;
+
+  dispose(instance: T): void;
+}
+
+export function singletonFactory<
+  T,
+  const D extends readonly ServiceKey<unknown>[] = [],
+>({
+  provides,
+  dependsOn = [] as unknown as D,
+  initialize,
+  dispose = () => {},
+}: {
+  provides: ServiceKey<T>;
+  dependsOn?: D;
+  initialize: (...dependencies: DependencyTypes<D>) => T | Promise<T>;
+  dispose?: (instance: T) => void;
+}): ServiceFactory<T, D> {
+  let instance: T | undefined;
+
+  return {
+    provides,
+    dependsOn,
+    async initialize(...dependencies: DependencyTypes<D>): Promise<T> {
+      if (instance) {
+        return instance;
+      }
+      instance = await initialize(...dependencies);
+      return instance;
+    },
+    dispose(serviceInstance: T): void {
+      if (instance === serviceInstance) {
+        dispose(serviceInstance);
+        instance = undefined;
+      }
+    },
+  };
+}
+
+export function oneShotFactory<
+  T,
+  const D extends readonly ServiceKey<unknown>[] = [],
+>({
+  provides,
+  dependsOn,
+  initialize,
+  dispose = () => {},
+}: {
+  provides: ServiceKey<T>;
+  dependsOn: D;
+  initialize: (...dependencies: DependencyTypes<D>) => T | Promise<T>;
+  dispose?: (instance: T) => void;
+}): ServiceFactory<T, D> {
+  return {
+    provides,
+    dependsOn,
+    initialize,
+    dispose,
+  };
+}

package/src/serviceModule.ts

@@ -1,91 +1,103 @@
-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, readonly ServiceKey<unknown>[]>>,
+  ) {
+    this.factories = Array.from(factories);
+    this.factories.forEach((factory) => {
+      checkRecursiveDependencies(factory);
+      checkMissingDependencies(factory, this.factories);
+    });
+  }
+
+  public async get<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.get(dependencyKey);
+      }),
+    );
+
+    // Call the factory to retrieve the dependency
+    return factory.initialize(...dependencies);
+  }
+
+  static from(
+    entries: (ServiceModule | ServiceFactory<unknown, readonly 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, readonly 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, readonly 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 readonly ServiceKey<unknown>[]>(
+  key: ServiceKey<T>,
+  factory: ServiceFactory<unknown, D>,
+): factory is ServiceFactory<T, D> {
+  return factory?.provides === key;
+}

package/src/serviceProvider.ts

@@ -1,5 +1,5 @@
 import { ServiceKey } from './serviceKey';
 
 export interface ServiceProvider {
-  inject<T>(key: ServiceKey<T>): Promise<T>;
+  get<T>(key: ServiceKey<T>): Promise<T>;
 }