ts-ioc-container 32.16.0 → 32.18.0

package/cjm/by.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.by = exports.byAlias = exports.byAliases = exports.IMemoKey = exports.all = void 0;
+exports.useRegistrationBuilder = exports.by = exports.byAlias = exports.byAliases = exports.IMemoKey = exports.all = void 0;
+const Registration_1 = require("./registration/Registration");
+const Provider_1 = require("./provider/Provider");
+const utils_1 = require("./utils");
 const all = () => true;
 exports.all = all;
 exports.IMemoKey = Symbol('IMemo');
@@ -45,3 +48,30 @@ exports.by = {
         create: (...tags) => (l) => l.createScope(...tags),
     },
 };
+const useRegistrationBuilder = (key = (0, utils_1.generateUUID)()) => {
+    let isValidWhen;
+    const mappers = [];
+    return {
+        register: (fn) => {
+            const registration = new Registration_1.Registration(() => new Provider_1.Provider(fn), key).pipe(...mappers);
+            if (isValidWhen) {
+                registration.when(isValidWhen);
+            }
+            return registration;
+        },
+        resolve: (s, ...args) => exports.by.key(key)(s, ...args),
+        pipe(...values) {
+            mappers.push(...values);
+            return this;
+        },
+        to(target) {
+            key = target;
+            return this;
+        },
+        when(value) {
+            isValidWhen = value;
+            return this;
+        },
+    };
+};
+exports.useRegistrationBuilder = useRegistrationBuilder;

package/cjm/container/IContainer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTagsPath = exports.serializeTagsPath = exports.isConstructor = exports.isDependencyKey = void 0;
+exports.isConstructor = exports.isDependencyKey = void 0;
 function isDependencyKey(token) {
     return ['string', 'symbol'].includes(typeof token);
 }
@@ -9,7 +9,3 @@ function isConstructor(token) {
     return typeof token === 'function';
 }
 exports.isConstructor = isConstructor;
-const serializeTagsPath = (path) => path.map((tags) => tags.join(',')).join('/');
-exports.serializeTagsPath = serializeTagsPath;
-const parseTagsPath = (path) => path.split('/').map((tags) => tags.split(','));
-exports.parseTagsPath = parseTagsPath;

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.useRegistrationBuilder = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -68,6 +68,7 @@ Object.defineProperty(exports, "by", { enumerable: true, get: function () { retu
 Object.defineProperty(exports, "IMemoKey", { enumerable: true, get: function () { return by_1.IMemoKey; } });
 Object.defineProperty(exports, "byAlias", { enumerable: true, get: function () { return by_1.byAlias; } });
 Object.defineProperty(exports, "byAliases", { enumerable: true, get: function () { return by_1.byAliases; } });
+Object.defineProperty(exports, "useRegistrationBuilder", { enumerable: true, get: function () { return by_1.useRegistrationBuilder; } });
 var metadata_1 = require("./metadata");
 Object.defineProperty(exports, "setMetadata", { enumerable: true, get: function () { return metadata_1.setMetadata; } });
 Object.defineProperty(exports, "getMetadata", { enumerable: true, get: function () { return metadata_1.getMetadata; } });

package/cjm/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isInstance = exports.promisify = exports.lazyProxy = exports.isConstructor = exports.constant = exports.fillEmptyIndexes = exports.pipe = void 0;
+exports.generateUUID = exports.isInstance = exports.promisify = exports.lazyProxy = exports.isConstructor = exports.constant = exports.fillEmptyIndexes = exports.pipe = void 0;
 const pipe = (...mappers) => (value) => mappers.reduce((acc, current) => current(acc), value);
 exports.pipe = pipe;
 function fillEmptyIndexes(baseArr, insertArr) {
@@ -35,3 +35,11 @@ function isInstance(target) {
     return Object.prototype.hasOwnProperty.call(target, 'constructor');
 }
 exports.isInstance = isInstance;
+const generateUUID = () => {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        const r = (Math.random() * 16) | 0;
+        const v = c === 'x' ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+    });
+};
+exports.generateUUID = generateUUID;

package/esm/by.js

@@ -1,3 +1,6 @@
+import { Registration } from './registration/Registration';
+import { Provider } from './provider/Provider';
+import { generateUUID } from './utils';
 export const all = () => true;
 export const IMemoKey = Symbol('IMemo');
 export const byAliases = (predicate, { memoize, lazy } = {}) => (c) => {
@@ -39,3 +42,29 @@ export const by = {
         create: (...tags) => (l) => l.createScope(...tags),
     },
 };
+export const useRegistrationBuilder = (key = generateUUID()) => {
+    let isValidWhen;
+    const mappers = [];
+    return {
+        register: (fn) => {
+            const registration = new Registration(() => new Provider(fn), key).pipe(...mappers);
+            if (isValidWhen) {
+                registration.when(isValidWhen);
+            }
+            return registration;
+        },
+        resolve: (s, ...args) => by.key(key)(s, ...args),
+        pipe(...values) {
+            mappers.push(...values);
+            return this;
+        },
+        to(target) {
+            key = target;
+            return this;
+        },
+        when(value) {
+            isValidWhen = value;
+            return this;
+        },
+    };
+};

package/esm/container/IContainer.js

@@ -4,5 +4,3 @@ export function isDependencyKey(token) {
 export function isConstructor(token) {
     return typeof token === 'function';
 }
-export const serializeTagsPath = (path) => path.map((tags) => tags.join(',')).join('/');
-export const parseTagsPath = (path) => path.split('/').map((tags) => tags.split(','));

package/esm/index.js

@@ -25,5 +25,5 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { getHooks, hook, hasHooks, runHooks, runHooksAsync, injectProp } from './hooks/hook';
 export { HookContext } from './hooks/HookContext';
 // Others
-export { by, IMemoKey, byAlias, byAliases } from './by';
+export { by, IMemoKey, byAlias, byAliases, useRegistrationBuilder } from './by';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/esm/utils.js

@@ -25,3 +25,10 @@ export const promisify = (arg) => (arg instanceof Promise ? arg : Promise.resolv
 export function isInstance(target) {
     return Object.prototype.hasOwnProperty.call(target, 'constructor');
 }
+export const generateUUID = () => {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        const r = (Math.random() * 16) | 0;
+        const v = c === 'x' ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "32.16.0",
+  "version": "32.18.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "35d35987c4c2a08c30a650e4e973083d0019dc51"
+  "gitHead": "c4c7829f56deebf20327698c4541940902af68d9"
 }

package/typings/by.d.ts

@@ -1,6 +1,8 @@
 import { DependencyKey, IContainer, InjectionToken } from './container/IContainer';
-import { ProviderResolveOptions } from './provider/IProvider';
+import { IProvider, ProviderResolveOptions } from './provider/IProvider';
 import { InjectFn } from './hooks/HookContext';
+import { IRegistration, ScopePredicate } from './registration/IRegistration';
+import { MapFn } from './utils';
 export type InstancePredicate = (dep: unknown) => boolean;
 export declare const all: InstancePredicate;
 export type IMemo = Map<string, DependencyKey[]>;
@@ -24,4 +26,11 @@ export declare const by: {
         create: (...tags: string[]) => (l: IContainer) => IContainer;
     };
 };
+export declare const useRegistrationBuilder: <T>(key?: DependencyKey) => {
+    register: (fn: (s: IContainer, ...args: unknown[]) => T) => IRegistration<T>;
+    resolve: (s: IContainer, ...args: unknown[]) => T;
+    pipe(...values: MapFn<IProvider<T>>[]): any;
+    to(target: DependencyKey): any;
+    when(value: ScopePredicate): any;
+};
 export {};

package/typings/container/IContainer.d.ts

@@ -24,8 +24,6 @@ export interface Tagged {
 }
 export type TagPath = Array<Tag[]>;
 export type MatchTags = (scope: IContainer, tags: Tag[]) => boolean;
-export declare const serializeTagsPath: (path: TagPath) => string;
-export declare const parseTagsPath: (path: string) => TagPath;
 export type Alias = string;
 export type AliasPredicate = (aliases: Set<Alias>) => boolean;
 export interface IContainer extends Resolvable, Tagged {

package/typings/index.d.ts

@@ -13,13 +13,13 @@ export { singleton, SingletonProvider } from './provider/singleton/SingletonProv
 export { MultiCache, multiCache } from './provider/singleton/MultiCache';
 export { Cache } from './provider/singleton/Cache';
 export { decorate, DecorateFn } from './provider/DecoratorProvider';
-export { key, IRegistration, scope, register } from './registration/IRegistration';
+export { key, IRegistration, ReturnTypeOfRegistration, scope, register } from './registration/IRegistration';
 export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { getHooks, hook, hasHooks, Hook, runHooks, runHooksAsync, injectProp } from './hooks/hook';
 export { HookContext, InjectFn, IHookContext } from './hooks/HookContext';
-export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases } from './by';
+export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases, useRegistrationBuilder } from './by';
 export { constructor } from './utils';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/typings/registration/IRegistration.d.ts

@@ -7,6 +7,7 @@ export interface IRegistration<T = unknown> extends IContainerModule {
     to(key: DependencyKey): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
 }
+export type ReturnTypeOfRegistration<T> = T extends IRegistration<infer R> ? R : never;
 export declare const key: (key: DependencyKey) => MapFn<IRegistration>;
 export declare const scope: (predicate: ScopePredicate) => MapFn<IRegistration>;
 export declare const getTransformers: (Target: constructor<unknown>) => MapFn<IRegistration<unknown>>[];

package/typings/utils.d.ts

@@ -10,3 +10,4 @@ export interface InstanceOfClass<T = unknown> {
     new (...args: unknown[]): T;
 }
 export declare function isInstance(target: object): target is InstanceOfClass<unknown>;
+export declare const generateUUID: () => string;