@spaceteams/warp 0.3.0 → 0.3.2

package/dist/index.d.mts

@@ -1,8 +1,37 @@
+//#region src/component/component-meta.d.ts
+type ComponentKind = "repo" | "service" | "usecase" | "client";
+type ComponentMeta = {
+  name?: string;
+  kind?: ComponentKind;
+  tags?: string[];
+};
+//#endregion
 //#region src/run.d.ts
+type WarpMeta = {
+  component?: ComponentMeta;
+  componentPath?: string;
+  componentKey?: string;
+};
 type Run<AmbientContext, ScopeContext = unknown, RunOptions = unknown> = AmbientContext & {
   run: <T>(options: RunOptions, inner: (app: Run<AmbientContext & ScopeContext, ScopeContext, RunOptions>) => Promise<T> | T) => Promise<T> | T;
+  warp?: WarpMeta;
 };
 //#endregion
+//#region src/middleware.d.ts
+type NoRunOptions = NonNullable<unknown>;
+type NoScopeContext = NonNullable<unknown>;
+type Middleware<AmbientContext, RunOptions = NoRunOptions, ScopeContext = NoScopeContext> = <T>(ctx: AmbientContext, options: Partial<RunOptions>, next: (ctx: AmbientContext & ScopeContext) => Promise<T> | T, warp?: WarpMeta | undefined) => Promise<T> | T;
+//#endregion
+//#region src/component/infer.d.ts
+type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+type AnyFactory = ((...args: never[]) => unknown) & {
+  meta?: ComponentMeta;
+};
+type InferCtx<T> = T extends ComponentFactory<infer Ctx, infer _SC, infer _RO, infer _Deps, infer _Out> ? Ctx : unknown;
+type InferScopeContext<T> = T extends ComponentFactory<infer _Ctx, infer SC, infer _RO, infer _Deps, infer _Out> ? SC : NoScopeContext;
+type InferRunOptions<T> = T extends ComponentFactory<infer _Ctx, infer _SC, infer RO, infer _Deps, infer _Out> ? RO : NoRunOptions;
+type InferOut<T> = T extends ComponentFactory<infer _Ctx, infer _SC, infer _RO, infer _Deps, infer Out> ? Out : never;
+//#endregion
 //#region src/component/index.d.ts
 type NoDeps = NonNullable<unknown>;
 declare const COMPONENT: unique symbol;
@@ -13,12 +42,6 @@ type ComponentRef<Ctx, ScopeContext, RunOptions, Out> = {
   readonly __runOptions?: RunOptions;
   readonly __out?: Out;
 };
-type ComponentKind = "repo" | "service" | "usecase" | "client";
-type ComponentMeta = {
-  name?: string;
-  kind?: ComponentKind;
-  tags?: string[];
-};
 type ComponentFactoryFn<Ctx, ScopeContext, RunOptions, Deps, Out> = (ctx: Run<Ctx & Deps, ScopeContext, RunOptions>) => Out;
 type ComponentFactory<Ctx, ScopeContext, RunOptions, Deps, Out> = ComponentFactoryFn<Ctx, ScopeContext, RunOptions, Deps, Out> & {
   meta?: ComponentMeta;
@@ -37,11 +60,6 @@ type ComponentDefinition<Ctx, ScopeContext, RunOptions, Deps, Out> = {
 declare function brandComponent<T extends object, Ctx, ScopeContext, RunOptions, Out>(obj: T): T & ComponentRef<Ctx, ScopeContext, RunOptions, Out>;
 declare function isComponent(value: unknown): value is Component<unknown, unknown, unknown, unknown, unknown>;
 //#endregion
-//#region src/middleware.d.ts
-type NoRunOptions = NonNullable<unknown>;
-type NoScopeContext = NonNullable<unknown>;
-type Middleware<AmbientContext, RunOptions = NoRunOptions, ScopeContext = NoScopeContext> = <T>(ctx: AmbientContext, options: Partial<RunOptions>, next: (ctx: AmbientContext & ScopeContext) => Promise<T> | T) => Promise<T> | T;
-//#endregion
 //#region src/explain/index.d.ts
 type ExplainResult = {
   name: string | undefined;
@@ -51,11 +69,11 @@ type ExplainResult = {
 };
 //#endregion
 //#region src/lazy.d.ts
-type Lazy<T> = () => T;
+type Lazy<T, Args extends unknown[] = []> = (...args: Args) => T;
 declare const Lazy: {
-  cached<T>(factory: () => T): Lazy<T>;
-  and<S, T>(l: Lazy<S>, r: Lazy<T>): Lazy<S & T>;
-  map<S, T>(l: Lazy<S>, fn: (v: S) => T): Lazy<T>;
+  cached<T, Args extends unknown[] = []>(factory: Lazy<T, Args>): Lazy<T, Args>;
+  and<S, T, Args extends unknown[] = []>(l: Lazy<S, Args>, r: Lazy<T, Args>): Lazy<S & T, Args>;
+  map<S, T, Args extends unknown[] = []>(l: Lazy<S, Args>, fn: (v: S) => T): Lazy<T, Args>;
 };
 //#endregion
 //#region src/runtime/runtime.d.ts
@@ -71,9 +89,13 @@ declare class Runtime<Ctx, ActualContext extends Ctx, ScopeContext, RunOptions,
   require<Extension>(): Runtime<Ctx, ActualContext, ScopeContext, RunOptions, SafeIntersect<Requirements, Extension>>;
   resolve: <Deps, Out>(component: Component<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps, Out>, ...requirements: OptionalArg<Requirements>) => Out | Promise<Out>;
   get component(): <Deps, F extends ComponentFactory<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps, ReturnType<F>>>(factory: F, deps?: { [T in keyof Deps]: ComponentInput<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps[T]> } | undefined, meta?: ComponentMeta | undefined) => Component<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps, ReturnType<F>>;
+  get singleton(): <Deps, F extends ComponentFactory<SafeIntersect<Requirements, ActualContext>, {}, RunOptions, Deps, ReturnType<F>>>(factory: F, deps?: { [T in keyof Deps]: ComponentInput<SafeIntersect<Requirements, ActualContext>, {}, RunOptions, Deps[T]> } | undefined, meta?: ComponentMeta | undefined) => Component<SafeIntersect<Requirements, ActualContext>, {}, RunOptions, Deps, ReturnType<F>>;
   get classComponent(): <Deps, Ctor extends (new (deps: Run<SafeIntersect<Requirements, ActualContext> & Deps, ScopeContext, RunOptions>) => InstanceType<Ctor>) & {
     meta?: ComponentMeta | undefined;
   }>(ctor: Ctor, deps?: { [K in keyof Deps]: ComponentInput<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps[K]> } | undefined, meta?: ComponentMeta | undefined) => Component<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps, InstanceType<Ctor>>;
+  get classSingleton(): <Deps, Ctor extends (new (deps: Run<SafeIntersect<Requirements, ActualContext> & Deps, {}, RunOptions>) => InstanceType<Ctor>) & {
+    meta?: ComponentMeta | undefined;
+  }>(ctor: Ctor, deps?: { [K in keyof Deps]: ComponentInput<SafeIntersect<Requirements, ActualContext>, {}, RunOptions, Deps[K]> } | undefined, meta?: ComponentMeta | undefined) => Component<SafeIntersect<Requirements, ActualContext>, {}, RunOptions, Deps, InstanceType<Ctor>>;
   explain<Deps, Out>(component: Component<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps, Out>, format: "native", showMeta?: boolean): ExplainResult;
   explain<Deps, Out>(component: Component<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps, Out>, format: "ascii", showMeta?: boolean): string;
   explain<Deps, Out>(component: Component<SafeIntersect<Requirements, ActualContext>, ScopeContext, RunOptions, Deps, Out>, format: "mermaid", showMeta?: boolean): string;
@@ -103,6 +125,11 @@ type Client<Ctx, ScopeContext, Out, RunOptions> = ComponentFactory<Ctx, ScopeCon
 declare function client<Ctx, Out, RunOptions = NoRunOptions, ScopeContext = NoScopeContext>(options: Omit<ComponentMeta, "kind">, fn: (app: Run<Ctx, ScopeContext, RunOptions>) => Out): Client<Ctx, ScopeContext, Out, RunOptions>;
 type InferClient<T> = T extends Client<infer _Ctx, infer _ScopeContext, infer Out, infer _RunOptions> ? Out : never;
 //#endregion
+//#region src/semantic/combine.d.ts
+type CombinedOutput<T extends Record<string, AnyFactory>> = { [K in keyof T]: ReturnType<T[K]> };
+declare function combine<const T extends Record<string, AnyFactory>>(factories: T): ComponentFactory<UnionToIntersection<InferCtx<T[keyof T]>>, UnionToIntersection<InferScopeContext<T[keyof T]>>, UnionToIntersection<InferRunOptions<T[keyof T]>>, unknown, CombinedOutput<T>>;
+type InferCombined<T> = T extends ComponentFactory<infer _Ctx, infer _ScopeContext, infer _RunOptions, infer _Deps, infer Out> ? Out : never;
+//#endregion
 //#region src/semantic/repo.d.ts
 type Repo<Ctx, ScopeContext, Out, RunOptions> = ComponentFactory<Ctx, ScopeContext, RunOptions, unknown, Out>;
 declare function repo<Ctx, Out, RunOptions = NoRunOptions, ScopeContext = NoScopeContext>(options: Omit<ComponentMeta, "kind">, fn: (app: Run<Ctx, ScopeContext, RunOptions>) => Out): Repo<Ctx, ScopeContext, Out, RunOptions>;
@@ -118,4 +145,4 @@ type Usecase<Ctx, ScopeContext, Args extends unknown[], Result, RunOptions> = Ca
 declare function usecase<Ctx, Args extends unknown[], Result, RunOptions = NoRunOptions, ScopeContext = NoScopeContext>(options: RunOptions & Omit<ComponentMeta, "kind">, fn: (app: Run<Ctx, ScopeContext, RunOptions>) => (...args: Args) => Promise<Result>): Usecase<Ctx, ScopeContext, Args, Result, RunOptions>;
 type InferUsecase<T> = InferCallable<T>;
 //#endregion
-export { Callable, Client, Component, ComponentDefinition, ComponentFactory, ComponentFactoryFn, ComponentInput, ComponentKind, ComponentMeta, ComponentRef, InferCallable, InferClient, InferRepo, InferService, InferUsecase, Middleware, NoDeps, NoRunOptions, NoScopeContext, Repo, Run, Service, Usecase, brandComponent, buildRuntime, callable, client, isComponent, repo, service, usecase };
+export { type AnyFactory, Callable, Client, CombinedOutput, Component, ComponentDefinition, ComponentFactory, ComponentFactoryFn, ComponentInput, ComponentKind, ComponentMeta, ComponentRef, InferCallable, InferClient, InferCombined, type InferCtx, type InferOut, InferRepo, type InferRunOptions, type InferScopeContext, InferService, InferUsecase, Middleware, NoDeps, NoRunOptions, NoScopeContext, Repo, Run, Service, type UnionToIntersection, Usecase, WarpMeta, brandComponent, buildRuntime, callable, client, combine, isComponent, repo, service, usecase };

package/dist/index.mjs

@@ -17,19 +17,19 @@ function isComponent(value) {
 const Lazy = {
 	cached(factory) {
 		let cached;
-		return () => {
-			if (cached === void 0) cached = factory();
+		return (...args) => {
+			if (cached === void 0) cached = factory(...args);
 			return cached;
 		};
 	},
 	and(l, r) {
-		return () => ({
-			...l(),
-			...r()
+		return (...args) => ({
+			...l(...args),
+			...r(...args)
 		});
 	},
 	map(l, fn) {
-		return () => fn(l());
+		return (...args) => fn(l(...args));
 	}
 };
 //#endregion
@@ -51,6 +51,24 @@ function defineClassComponent() {
 	};
 }
 //#endregion
+//#region src/component/class-singleton.ts
+function defineClassSingleton() {
+	return (ctor, deps, meta) => {
+		const factory = (ctx) => {
+			return new ctor(ctx);
+		};
+		return brandComponent({
+			factory: Lazy.cached(factory),
+			deps,
+			meta: {
+				name: (meta?.name ?? ctor.meta?.name) || void 0,
+				tags: (meta?.tags ?? ctor.meta?.tags) || void 0,
+				kind: (meta?.kind ?? ctor.meta?.kind) || void 0
+			}
+		});
+	};
+}
+//#endregion
 //#region src/component/functional-component.ts
 function defineFunctionalComponent() {
 	return (factory, deps, meta) => {
@@ -66,6 +84,21 @@ function defineFunctionalComponent() {
 	};
 }
 //#endregion
+//#region src/component/functional-singleton.ts
+function defineFunctionalSingleton() {
+	return (factory, deps, meta) => {
+		return brandComponent({
+			factory: Lazy.cached(factory),
+			deps,
+			meta: {
+				name: (meta?.name ?? factory.meta?.name) || void 0,
+				tags: (meta?.tags ?? factory.meta?.tags) || void 0,
+				kind: (meta?.kind ?? factory.meta?.kind) || void 0
+			}
+		});
+	};
+}
+//#endregion
 //#region src/explain/index.ts
 const explain = (c) => {
 	const deps = {};
@@ -146,7 +179,7 @@ function createResolver(mw) {
 				get() {
 					if (cache.has(depName)) return cache.get(depName);
 					checkCyclicDependency(depPath);
-					const out = withStackTracking(depPath, () => bindInScope(depComp, scopeCtx, depPath));
+					const out = withStackTracking(depPath, () => bindInScope(depComp, scopeCtx, depPath, depName));
 					cache.set(depName, out);
 					return out;
 				}
@@ -155,29 +188,34 @@ function createResolver(mw) {
 		const attachDependencies = (runCtx, deps, scopeCtx, pathPrefix, cache) => {
 			for (const [depName, depComp] of Object.entries(deps)) defineDependencyProperty(runCtx, depName, pathPrefix ? `${pathPrefix}.${depName}` : depName, depComp, scopeCtx, cache);
 		};
-		const createBaseRunContext = (scopeCtx) => {
+		const createBaseRunContext = (scopeCtx, warp) => {
 			return {
 				...scopeCtx,
-				run: (nestedOptions, nestedInner) => runWithContext(scopeCtx, nestedOptions, nestedInner)
+				warp,
+				run: (nestedOptions, nestedInner) => runWithContext(scopeCtx, nestedOptions, nestedInner, warp)
 			};
 		};
-		const bindInScope = (comp, scopeCtx, path) => {
+		const bindInScope = (comp, scopeCtx, path, depName) => {
 			const localDepCache = /* @__PURE__ */ new Map();
-			const runCtx = createBaseRunContext(scopeCtx);
 			if (!isComponent(comp)) return comp;
+			const runCtx = createBaseRunContext(scopeCtx, {
+				component: comp.meta,
+				componentPath: path,
+				componentKey: depName
+			});
 			attachDependencies(runCtx, comp.deps ?? {}, scopeCtx, path, localDepCache);
 			return comp.factory(runCtx);
 		};
 		const makeRootRunContext = (scopeCtx) => {
 			const rootCache = /* @__PURE__ */ new Map();
-			const runCtx = createBaseRunContext(scopeCtx);
+			const runCtx = createBaseRunContext(scopeCtx, { component: root.meta });
 			attachDependencies(runCtx, root.deps ?? {}, scopeCtx, "", rootCache);
 			return runCtx;
 		};
-		const runWithContext = async (currentCtx, options, inner) => {
+		const runWithContext = async (currentCtx, options, inner, warp) => {
 			return await mw(currentCtx, options, (scopedCtx) => {
 				return inner(makeRootRunContext(scopedCtx));
-			});
+			}, warp);
 		};
 		return root.factory(makeRootRunContext(ctx));
 	};
@@ -211,9 +249,15 @@ var Runtime = class Runtime {
 	get component() {
 		return defineFunctionalComponent();
 	}
+	get singleton() {
+		return defineFunctionalSingleton();
+	}
 	get classComponent() {
 		return defineClassComponent();
 	}
+	get classSingleton() {
+		return defineClassSingleton();
+	}
 	explain(component, format = "native", showMeta = false) {
 		const result = explain(component);
 		switch (format) {
@@ -284,6 +328,16 @@ function client(options, fn) {
 	return factory;
 }
 //#endregion
+//#region src/semantic/combine.ts
+function combine(factories) {
+	const factory = (ctx) => {
+		const result = {};
+		for (const [key, f] of Object.entries(factories)) result[key] = f(ctx);
+		return result;
+	};
+	return factory;
+}
+//#endregion
 //#region src/semantic/repo.ts
 function repo(options, fn) {
 	const factory = fn;
@@ -314,4 +368,4 @@ function usecase(options, fn) {
 	}, fn);
 }
 //#endregion
-export { brandComponent, buildRuntime, callable, client, isComponent, repo, service, usecase };
+export { brandComponent, buildRuntime, callable, client, combine, isComponent, repo, service, usecase };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceteams/warp",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Type-safe composition with execution scopes ",
   "type": "module",
   "files": [