milkio 0.7.0-alpha.4 → 0.7.0-alpha.6

package/kernel/context.ts

@@ -1,4 +1,4 @@
-import type { ExecuteId, Logger, MilkioHttpResponse, Mixin, ToEmptyObject } from "..";
+import type { ExecuteId, Logger, MilkioHttpResponse, Mixin, ToEmptyObject, Remove$ } from "..";
 
 export type MilkioContext = {
 	path: string;
@@ -11,7 +11,7 @@ export type MilkioContext = {
 	 * During testing or when calling between microservices, some or all of the values may be undefined
 	 */
 	detail: FrameworkHttpDetail;
-	steps: Steps<{}>;
+	step: Steps<{}>['step'];
 };
 
 export type FrameworkHttpDetail = {
@@ -25,22 +25,31 @@ export type FrameworkHttpDetail = {
 
 export type Steps<StageT extends Record<any, any>> = {
 	step: StepFunction<StageT>,
-	run: <HandlerT extends (stage: StageT) => Record<any, any> | Promise<Record<any, any>>>(handler: HandlerT) => Promise<Awaited<ReturnType<HandlerT>>>,
+	// run: <HandlerT extends (stage: StageT) => Record<any, any> | Promise<Record<any, any>>>(handler: HandlerT) => Promise<Awaited<ReturnType<HandlerT>>>,
+	run: () => Promise<Remove$<StageT>>
 }
 
 type StepFunction<StageT extends Record<any, any>> = <HandlerT extends ((stage: Readonly<StageT>) => Record<any, any> | Promise<Record<any, any>>) >(handler: HandlerT) => Steps<Mixin<StageT, ToEmptyObject<Awaited<ReturnType<HandlerT>>>>>
 
-export const createSteps = () => ({
-	_steps: [],
-	step(handler: (stage: any) => Promise<any>) {
-		this.steps.push(handler);
-		return this;
-	},
-	async run(handler: any) {
-		let stage = {};
-		for (const step of this._steps) {
-			stage = { ...stage, ...(await step(stage)) }
+export const createStep = () => {
+	const stepController = {
+		_steps: [] as Array<(stage: any) => Promise<any>>,
+		step(handler: (stage: any) => Promise<any>) {
+			stepController._steps.push(handler);
+			return stepController;
+		},
+		async run() {
+			let stage = {};
+			for (const step of stepController._steps) {
+				stage = { ...stage, ...(await step(stage)) }
+			}
+			let result: Record<any, any> = {};
+			for (const key in stage) {
+				const value = (stage as any)[key];
+				if (!key.startsWith('$')) result[key] = value;
+			}
+			return stage;
 		}
-		return await handler(stage);
 	}
-}) as any as Steps<{}>;
+	return stepController.step as any as Steps<{}>['step'];
+};

package/kernel/execute.ts

@@ -1,7 +1,7 @@
 import type { Context } from "../../../src/context";
 import { failCode } from "../../../src/fail-code";
 import schema from "../../../generated/api-schema";
-import { type ExecuteId, type ExecuteOptions, type ExecuteResult, createUlid, useLogger, runtime, loggerPushTags, headerToPlainObject, loggerSubmit, type ExecuteCoreOptions, TSON, MiddlewareEvent, reject, _validate, ExecuteStreamResult, createSteps } from "..";
+import { type ExecuteId, type ExecuteOptions, type ExecuteResult, createUlid, useLogger, runtime, loggerPushTags, headerToPlainObject, loggerSubmit, type ExecuteCoreOptions, TSON, MiddlewareEvent, reject, _validate, ExecuteStreamResult, createStep } from "..";
 import { handleCatchError } from "../utils/handle-catch-error";
 
 const apis = new Map<string, any>();
@@ -56,7 +56,7 @@ export async function _call(
 		headers,
 		logger: options.logger,
 		detail: options?.detail ?? {} as any,
-		steps: createSteps(),
+		step: createStep(),
 	};
 
 	let result: { value: unknown };

package/package.json

@@ -2,7 +2,7 @@
   "name": "milkio",
   "type": "module",
   "module": "index.ts",
-  "version": "0.7.0-alpha.4",
+  "version": "0.7.0-alpha.6",
   "peerDependencies": {
     "typescript": "^5.4.2"
   },

package/types.ts

@@ -99,4 +99,8 @@ export type ToEmptyObject<T> = T extends undefined | null | never
 	? {}
 	: T extends object
 	? T
-	: {};
+	: {};
+
+type Remove$<T> = {
+	[K in keyof T as K extends `$${string}` ? never : K]: T[K];
+};