composed-di 0.2.6 → 0.2.8

package/README.md

@@ -1,4 +1,4 @@
-# composed-di
+# lazy-di
 
 A tiny, type-friendly dependency injection helper for composing services via keys and factories.
 

package/dist/plugin/index.d.ts

@@ -0,0 +1,66 @@
+import * as ts from 'typescript';
+import { ServiceModule } from '../ServiceModule';
+import { DotGraphOptions } from '../utils';
+export interface GraphGeneratorOptions {
+    /** Output directory for generated graph files (default: './graphs') */
+    outputDir?: string;
+    /** Options to pass to createDotGraph */
+    graphOptions?: DotGraphOptions;
+    /** File extension for output files (default: '.dot') */
+    fileExtension?: string;
+    /** Whether to require compiled JS files instead of TS (default: false) */
+    useCompiledFiles?: boolean;
+}
+interface ServiceModuleInfo {
+    name: string;
+    filePath: string;
+    line: number;
+}
+/**
+ * Finds all ServiceModule constant declarations in a TypeScript project.
+ *
+ * @param projectPath - Path to the tsconfig.json or project directory
+ * @returns Array of information about found ServiceModule declarations
+ */
+export declare function findServiceModuleDeclarations(projectPath: string): ServiceModuleInfo[];
+/**
+ * Evaluates a TypeScript/JavaScript file and extracts ServiceModule instances.
+ *
+ * @param filePath - Path to the file to evaluate
+ * @param moduleNames - Names of the ServiceModule variables to extract
+ * @returns Map of variable names to ServiceModule instances
+ */
+export declare function evaluateServiceModules(filePath: string, moduleNames: string[]): Promise<Map<string, ServiceModule>>;
+/**
+ * Generates DOT graph files for all ServiceModule declarations found in a project.
+ *
+ * @param projectPath - Path to the tsconfig.json or project directory
+ * @param options - Options for graph generation
+ */
+export declare function generateGraphFiles(projectPath: string, options?: GraphGeneratorOptions): Promise<void>;
+/**
+ * Creates a ts-node plugin that automatically finds ServiceModule declarations
+ * and generates DOT graph files.
+ *
+ * Usage in tsconfig.json:
+ * {
+ *   "compilerOptions": {
+ *     "plugins": [
+ *       {
+ *         "name": "composed-di/plugin",
+ *         "outputDir": "./graphs"
+ *       }
+ *     ]
+ *   }
+ * }
+ */
+export declare function createPlugin(options?: GraphGeneratorOptions): {
+    create(info: ts.server.PluginCreateInfo): ts.LanguageService;
+};
+/**
+ * CLI entry point for generating graph files.
+ * Can be run directly: npx ts-node src/plugin/index.ts [projectPath] [outputDir]
+ */
+export declare function main(args?: string[]): Promise<void>;
+export default createPlugin;
+//# sourceMappingURL=index.d.ts.map

package/dist/plugin/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAIjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAkB,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,WAAW,qBAAqB;IACpC,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,wDAAwD;IACxD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAgDtF;AAoID;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAyErC;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,IAAI,CAAC,CAwDf;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,qBAA0B;iBAE/C,EAAE,CAAC,MAAM,CAAC,gBAAgB;EAkB1C;AAED;;;GAGG;AACH,wBAAsB,IAAI,CAAC,IAAI,GAAE,MAAM,EAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAShF;AAGD,eAAe,YAAY,CAAC"}

package/dist/plugin/index.js

@@ -0,0 +1,397 @@
+"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;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findServiceModuleDeclarations = findServiceModuleDeclarations;
+exports.evaluateServiceModules = evaluateServiceModules;
+exports.generateGraphFiles = generateGraphFiles;
+exports.createPlugin = createPlugin;
+exports.main = main;
+const ts = __importStar(require("typescript"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const ServiceModule_1 = require("../ServiceModule");
+const ServiceFactory_1 = require("../ServiceFactory");
+const ServiceKey_1 = require("../ServiceKey");
+const utils_1 = require("../utils");
+/**
+ * Finds all ServiceModule constant declarations in a TypeScript project.
+ *
+ * @param projectPath - Path to the tsconfig.json or project directory
+ * @returns Array of information about found ServiceModule declarations
+ */
+function findServiceModuleDeclarations(projectPath) {
+    const configPath = projectPath.endsWith('.json')
+        ? projectPath
+        : ts.findConfigFile(projectPath, ts.sys.fileExists, 'tsconfig.json');
+    if (!configPath) {
+        throw new Error(`Could not find tsconfig.json in ${projectPath}`);
+    }
+    const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
+    if (configFile.error) {
+        throw new Error(`Error reading tsconfig.json: ${ts.flattenDiagnosticMessageText(configFile.error.messageText, '\n')}`);
+    }
+    const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath));
+    const program = ts.createProgram(parsedConfig.fileNames, parsedConfig.options);
+    const checker = program.getTypeChecker();
+    const serviceModules = [];
+    for (const sourceFile of program.getSourceFiles()) {
+        if (sourceFile.isDeclarationFile)
+            continue;
+        ts.forEachChild(sourceFile, function visit(node) {
+            if (ts.isVariableStatement(node)) {
+                for (const declaration of node.declarationList.declarations) {
+                    if (ts.isIdentifier(declaration.name) && declaration.initializer) {
+                        // Check if the initializer is a call to ServiceModule.from()
+                        if (isServiceModuleFromCall(declaration.initializer, checker)) {
+                            const { line } = sourceFile.getLineAndCharacterOfPosition(declaration.getStart());
+                            serviceModules.push({
+                                name: declaration.name.text,
+                                filePath: sourceFile.fileName,
+                                line: line + 1
+                            });
+                        }
+                    }
+                }
+            }
+            ts.forEachChild(node, visit);
+        });
+    }
+    return serviceModules;
+}
+/**
+ * Checks if a node is a call to ServiceModule.from()
+ */
+function isServiceModuleFromCall(node, checker) {
+    if (!ts.isCallExpression(node))
+        return false;
+    const expression = node.expression;
+    // Check for ServiceModule.from() pattern
+    if (ts.isPropertyAccessExpression(expression)) {
+        const propertyName = expression.name.text;
+        const objectExpression = expression.expression;
+        if (propertyName === 'from' && ts.isIdentifier(objectExpression)) {
+            const symbol = checker.getSymbolAtLocation(objectExpression);
+            if (symbol) {
+                const name = symbol.getName();
+                if (name === 'ServiceModule') {
+                    return true;
+                }
+            }
+            // Fallback: check by identifier name
+            if (objectExpression.text === 'ServiceModule') {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Compiles TypeScript source code to JavaScript.
+ *
+ * @param sourceCode - TypeScript source code
+ * @param fileName - Name of the file (for error reporting)
+ * @returns Compiled JavaScript code
+ */
+function compileTypeScript(sourceCode, fileName) {
+    const result = ts.transpileModule(sourceCode, {
+        compilerOptions: {
+            module: ts.ModuleKind.CommonJS,
+            target: ts.ScriptTarget.ES2020,
+            esModuleInterop: true,
+            strict: false,
+        },
+        fileName,
+    });
+    return result.outputText;
+}
+/**
+ * Creates a custom require function for the sandbox environment.
+ *
+ * @param basePath - Base path for resolving relative imports
+ * @returns Custom require function
+ */
+function createSandboxRequire(basePath) {
+    const customRequire = ((modulePath) => {
+        // Handle relative imports
+        if (modulePath.startsWith('./') || modulePath.startsWith('../')) {
+            const resolvedPath = path.resolve(basePath, modulePath);
+            // Try to find the module (could be .ts, .js, or directory with index)
+            const possiblePaths = [
+                resolvedPath,
+                resolvedPath + '.ts',
+                resolvedPath + '.js',
+                path.join(resolvedPath, 'index.ts'),
+                path.join(resolvedPath, 'index.js'),
+            ];
+            for (const p of possiblePaths) {
+                if (fs.existsSync(p) && fs.statSync(p).isFile()) {
+                    const source = fs.readFileSync(p, 'utf-8');
+                    if (p.endsWith('.ts')) {
+                        const compiled = compileTypeScript(source, p);
+                        const moduleExports = {};
+                        const moduleObj = { exports: moduleExports };
+                        const wrappedCode = `(function(exports, require, module, __filename, __dirname) { ${compiled} })`;
+                        const fn = eval(wrappedCode);
+                        fn(moduleExports, createSandboxRequire(path.dirname(p)), moduleObj, p, path.dirname(p));
+                        return moduleObj.exports;
+                    }
+                    else {
+                        return require(p);
+                    }
+                }
+            }
+        }
+        // Handle package imports (including our own package)
+        if (modulePath === 'composed-di' || modulePath.startsWith('composed-di/')) {
+            // Return our own exports
+            return {
+                ServiceModule: ServiceModule_1.ServiceModule,
+                ServiceFactory: ServiceFactory_1.ServiceFactory,
+                ServiceKey: ServiceKey_1.ServiceKey,
+                createDotGraph: utils_1.createDotGraph,
+            };
+        }
+        // Fall back to Node's require for other modules
+        return require(modulePath);
+    });
+    // Add required properties to make it a valid NodeRequire
+    customRequire.resolve = require.resolve;
+    customRequire.cache = require.cache;
+    customRequire.extensions = require.extensions;
+    customRequire.main = require.main;
+    return customRequire;
+}
+/**
+ * Checks if a value is a ServiceModule instance using duck typing.
+ * This is necessary because the ServiceModule class might be loaded from different
+ * module instances, causing instanceof checks to fail.
+ */
+function isServiceModule(value) {
+    if (!value || typeof value !== 'object')
+        return false;
+    // Duck typing: check for ServiceModule's characteristic properties and methods
+    return (Array.isArray(value.factories) &&
+        typeof value.get === 'function' &&
+        typeof value.dispose === 'function');
+}
+/**
+ * Evaluates a TypeScript/JavaScript file and extracts ServiceModule instances.
+ *
+ * @param filePath - Path to the file to evaluate
+ * @param moduleNames - Names of the ServiceModule variables to extract
+ * @returns Map of variable names to ServiceModule instances
+ */
+function evaluateServiceModules(filePath, moduleNames) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const results = new Map();
+        try {
+            // Resolve the absolute path
+            const absolutePath = path.resolve(filePath);
+            const basePath = path.dirname(absolutePath);
+            // Read and compile the TypeScript file
+            const sourceCode = fs.readFileSync(absolutePath, 'utf-8');
+            const compiledCode = compileTypeScript(sourceCode, absolutePath);
+            // Create a sandbox context with necessary globals
+            const moduleExports = {};
+            const moduleObj = { exports: moduleExports };
+            // Create custom require for the sandbox
+            const sandboxRequire = createSandboxRequire(basePath);
+            // Execute the compiled code
+            const wrappedCode = `(function(exports, require, module, __filename, __dirname) { 
+      ${compiledCode}
+    })`;
+            const fn = eval(wrappedCode);
+            fn(moduleExports, sandboxRequire, moduleObj, absolutePath, basePath);
+            // Check for ServiceModule instances in exports using duck typing
+            for (const name of moduleNames) {
+                // Check direct exports (exports.name = ...)
+                if (isServiceModule(moduleExports[name])) {
+                    results.set(name, moduleExports[name]);
+                }
+                // Check module.exports (module.exports.name = ...)
+                else if (isServiceModule(moduleObj.exports[name])) {
+                    results.set(name, moduleObj.exports[name]);
+                }
+            }
+            // Debug: log what we found in exports
+            if (process.env.DEBUG_PLUGIN) {
+                console.log(`  Debug: exports keys = [${Object.keys(moduleExports).join(', ')}]`);
+                console.log(`  Debug: results size = ${results.size}`);
+            }
+            // If no exports found, the variables might be local (not exported)
+            // In this case, we need to modify the code to capture them
+            if (results.size === 0 && moduleNames.length > 0) {
+                // Try to capture local variables by returning them
+                const captureCode = `(function(exports, require, module, __filename, __dirname) { 
+        ${compiledCode}
+        return { ${moduleNames.map(n => `"${n}": typeof ${n} !== 'undefined' ? ${n} : undefined`).join(', ')} };
+      })`;
+                try {
+                    const captureFn = eval(captureCode);
+                    const localVars = captureFn(moduleExports, sandboxRequire, moduleObj, absolutePath, basePath);
+                    for (const name of moduleNames) {
+                        const value = localVars[name];
+                        if (isServiceModule(value)) {
+                            results.set(name, value);
+                        }
+                    }
+                }
+                catch (captureError) {
+                    // Silently ignore capture errors - variables might be in nested scopes
+                }
+            }
+        }
+        catch (error) {
+            console.warn(`Warning: Could not evaluate ${filePath}:`, error);
+        }
+        return results;
+    });
+}
+/**
+ * Generates DOT graph files for all ServiceModule declarations found in a project.
+ *
+ * @param projectPath - Path to the tsconfig.json or project directory
+ * @param options - Options for graph generation
+ */
+function generateGraphFiles(projectPath_1) {
+    return __awaiter(this, arguments, void 0, function* (projectPath, options = {}) {
+        const { outputDir = './graphs', graphOptions = {
+            direction: 'TB',
+            highlightLeaves: true,
+            highlightRoots: true,
+        }, fileExtension = '.dot' } = options;
+        // Find all ServiceModule declarations
+        const declarations = findServiceModuleDeclarations(projectPath);
+        if (declarations.length === 0) {
+            console.log('No ServiceModule declarations found.');
+            return;
+        }
+        console.log(`Found ${declarations.length} ServiceModule declaration(s):`);
+        declarations.forEach(d => {
+            console.log(`  - ${d.name} in ${d.filePath}:${d.line}`);
+        });
+        // Create output directory if it doesn't exist
+        const absoluteOutputDir = path.resolve(outputDir);
+        if (!fs.existsSync(absoluteOutputDir)) {
+            fs.mkdirSync(absoluteOutputDir, { recursive: true });
+        }
+        // Group declarations by file
+        const byFile = new Map();
+        for (const decl of declarations) {
+            const existing = byFile.get(decl.filePath) || [];
+            existing.push(decl);
+            byFile.set(decl.filePath, existing);
+        }
+        // Process each file
+        for (const [filePath, decls] of byFile) {
+            const moduleNames = decls.map(d => d.name);
+            const modules = yield evaluateServiceModules(filePath, moduleNames);
+            for (const [name, module] of modules) {
+                const graphContent = (0, utils_1.createDotGraph)(module, Object.assign(Object.assign({}, graphOptions), { title: graphOptions.title || `${name} Dependency Graph` }));
+                const outputFileName = `${name}${fileExtension}`;
+                const outputPath = path.join(absoluteOutputDir, outputFileName);
+                fs.writeFileSync(outputPath, graphContent, 'utf-8');
+                console.log(`Generated: ${outputPath}`);
+            }
+        }
+    });
+}
+/**
+ * Creates a ts-node plugin that automatically finds ServiceModule declarations
+ * and generates DOT graph files.
+ *
+ * Usage in tsconfig.json:
+ * {
+ *   "compilerOptions": {
+ *     "plugins": [
+ *       {
+ *         "name": "composed-di/plugin",
+ *         "outputDir": "./graphs"
+ *       }
+ *     ]
+ *   }
+ * }
+ */
+function createPlugin(options = {}) {
+    return {
+        create(info) {
+            const proxy = Object.create(null);
+            for (const k of Object.keys(info.languageService)) {
+                const x = info.languageService[k];
+                // @ts-ignore
+                proxy[k] = (...args) => x.apply(info.languageService, args);
+            }
+            // Generate graphs when the plugin is initialized
+            const projectPath = info.project.getCurrentDirectory();
+            generateGraphFiles(projectPath, options).catch(err => {
+                console.error('Error generating graph files:', err);
+            });
+            return proxy;
+        }
+    };
+}
+/**
+ * CLI entry point for generating graph files.
+ * Can be run directly: npx ts-node src/plugin/index.ts [projectPath] [outputDir]
+ */
+function main() {
+    return __awaiter(this, arguments, void 0, function* (args = process.argv.slice(2)) {
+        const projectPath = args[0] || '.';
+        const outputDir = args[1] || './graphs';
+        console.log(`Scanning project at: ${path.resolve(projectPath)}`);
+        console.log(`Output directory: ${path.resolve(outputDir)}`);
+        console.log('');
+        yield generateGraphFiles(projectPath, { outputDir });
+    });
+}
+// Export default for ts-node plugin compatibility
+exports.default = createPlugin;
+// Run main if executed directly
+if (require.main === module) {
+    main().catch(err => {
+        console.error('Error:', err);
+        process.exit(1);
+    });
+}
+//# sourceMappingURL=index.js.map

package/dist/plugin/index.js.map

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

package/dist/serviceModule.d.ts

@@ -1,7 +1,7 @@
 import { ServiceKey } from './ServiceKey';
 import { ServiceFactory } from './ServiceFactory';
 import { ServiceScope } from './ServiceScope';
-type GenericFactory = ServiceFactory<unknown, readonly ServiceKey<unknown>[]>;
+type GenericFactory = ServiceFactory<unknown, readonly ServiceKey<any>[]>;
 export declare class ServiceModule {
     readonly factories: GenericFactory[];
     private constructor();

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,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,KAAK,cAAc,GAAG,cAAc,CAAC,OAAO,EAAE,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAG9E,qBAAa,aAAa;IACJ,QAAQ,CAAC,SAAS,EAAE,cAAc,EAAE;IAAxD,OAAO;IAOM,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBnD;;;;;;;;;OASG;IACI,OAAO,CAAC,KAAK,CAAC,EAAE,YAAY;IAQnC;;;;;;;;;OASG;IACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,aAAa,GAAG,cAAc,CAAC,EAAE,GAAG,aAAa;CAcxE"}
+{"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,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,KAAK,cAAc,GAAG,cAAc,CAAC,OAAO,EAAE,SAAS,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAG1E,qBAAa,aAAa;IACJ,QAAQ,CAAC,SAAS,EAAE,cAAc,EAAE;IAAxD,OAAO;IAOM,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBnD;;;;;;;;;OASG;IACI,OAAO,CAAC,KAAK,CAAC,EAAE,YAAY;IAQnC;;;;;;;;;OASG;IACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,aAAa,GAAG,cAAc,CAAC,EAAE,GAAG,aAAa;CAcxE"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "composed-di",
   "private": false,
-  "version": "0.2.6",
+  "version": "0.2.8",
   "author": "Juan Herrera juanhr454@gmail.com",
   "type": "commonjs",
   "main": "./dist/index.js",
@@ -9,7 +9,8 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "default": "./dist/index.js"
     }
   },
   "files": [
@@ -24,7 +25,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/imherrera/composed-di"
+    "url": "git+https://github.com/imherrera/composed-di.git"
   },
   "scripts": {
     "build": "tsc --build",

package/src/ServiceModule.ts

@@ -2,8 +2,8 @@ import { ServiceKey } from './ServiceKey';
 import { ServiceFactory } from './ServiceFactory';
 import { ServiceScope } from './ServiceScope';
 
-type GenericFactory = ServiceFactory<unknown, readonly ServiceKey<unknown>[]>;
-type GenericKey = ServiceKey<unknown>;
+type GenericFactory = ServiceFactory<unknown, readonly ServiceKey<any>[]>;
+type GenericKey = ServiceKey<any>;
 
 export class ServiceModule {
   private constructor(readonly factories: GenericFactory[]) {