milkio 1.0.0-alpha.4 → 1.0.0-alpha.6

package/context/index.ts

@@ -1,4 +1,4 @@
-import { type MilkioHttpRequest, type MilkioHttpResponse, type $types, type Logger, Steps } from "..";
+import { type MilkioHttpRequest, type MilkioHttpResponse, type $types, type Logger, type Steps, type Execute } from "..";
 
 export interface $context {
   executeId: string;
@@ -6,6 +6,7 @@ export interface $context {
   logger: Logger;
   http?: ContextHttp<Record<any, any>>;
   step: Steps<{}>["step"];
+  execute: Execute;
 }
 
 export type ContextHttp<ParamsParsed = any> = {

package/execute/index.ts

@@ -13,6 +13,7 @@ export const __initExecuter = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
       path: string;
       headers: Record<string, string> | Headers;
       mixinContext: Record<any, any> | undefined;
+      extendContext?: $context;
     } & (
       | {
           params: Record<any, any>;
@@ -60,13 +61,16 @@ export const __initExecuter = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
       params = { ...paramsRand, ...params };
     }
     if (options.mixinContext?.http?.params?.string) options.mixinContext.http.params.parsed = params; // listen でパースしたパラメータを渡す
-    const context = {
-      ...(options.mixinContext ? options.mixinContext : {}),
-      path: options.path,
-      logger: options.createdLogger,
-      executeId: options.createdExecuteId,
-      step: createStep(),
-    } as unknown as $context;
+    const context =
+      options.extendContext ??
+      ({
+        ...(options.mixinContext ? options.mixinContext : {}),
+        path: options.path,
+        logger: options.createdLogger,
+        executeId: options.createdExecuteId,
+        execute: (path: any, options: any) => runtime.runtime.app.execute(path, options, context),
+        step: createStep(),
+      } as unknown as $context);
     const results: Results<unknown> = { value: undefined };
 
     if (runtime.develop) {
@@ -81,20 +85,21 @@ export const __initExecuter = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
       if (!validation.success) throw reject("PARAMS_TYPE_INCORRECT", { ...validation.errors[0], message: `The value '${validation.errors[0].path}' is '${validation.errors[0].value}', which does not meet '${validation.errors[0].expected}' requirements.` });
     }
 
-    await runtime.emit("milkio:executeBefore", { executeId: options.createdExecuteId, logger: options.createdLogger, path: options.path, context });
+    if (!options.extendContext) await runtime.emit("milkio:executeBefore", { executeId: options.createdExecuteId, logger: options.createdLogger, path: options.path, context });
 
     results.value = await module.default.handler(context, params);
 
-    await runtime.emit("milkio:executeAfter", { executeId: options.createdExecuteId, logger: options.createdLogger, path: options.path, context, results });
+    if (!options.extendContext) await runtime.emit("milkio:executeAfter", { executeId: options.createdExecuteId, logger: options.createdLogger, path: options.path, context, results });
 
     return { executeId, headers, params, results, context, meta, type: module.$milkioType };
   };
 
-  const execute = async (path: string, options?: ExecuteOptions): Promise<any> => {
+  const execute = async (path: string, options?: ExecuteOptions, context?: $context): Promise<any> => {
     if (!options) options = {};
-    const executeId = createId();
-    const logger = createLogger(runtime, path, executeId);
-    runtime.runtime.request.set(executeId, { logger: logger });
+
+    const executeId = context?.executeId ?? createId();
+    const logger = context?.logger ?? createLogger(runtime, path, executeId);
+    if (!context?.logger) runtime.runtime.request.set(executeId, { logger: logger });
 
     try {
       const routeSchema = generated.routeSchema.routes.get(path);
@@ -110,6 +115,7 @@ export const __initExecuter = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
         mixinContext: {},
         params: options.params ?? {},
         paramsType: "raw",
+        extendContext: context,
       });
 
       if (routeSchema.type === "stream") {

package/package.json

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

package/types/index.ts

@@ -1,4 +1,4 @@
-import { type $rejectCode } from "..";
+import { type $context, type $rejectCode } from "..";
 
 export interface $types {
   [key: string]: Record<any, any>;
@@ -10,7 +10,19 @@ export type Mixin<T, U> = U & Omit<T, keyof U>;
 
 export type GeneratorGeneric<T> = T extends AsyncGenerator<infer I> ? I : never;
 
-export type ToEmptyObject<T> = T extends undefined | null | never ? {} : T extends object ? T : {};
+export type DBCreate<T, K extends keyof T | never = never> = Omit<
+  {
+    [K in keyof T]: T[K] extends null ? undefined : T[K];
+  },
+  K
+>;
+
+export type DBUpdate<T, K extends keyof T | never = never> = Omit<
+  Partial<{
+    [K in keyof T]: T[K] extends null ? undefined : T[K];
+  }>,
+  K
+>;
 
 export type ExecuteId = string | "global";
 

package/world/index.ts

@@ -25,6 +25,7 @@ export type MilkioRuntimeInit<T extends MilkioInit> = Mixin<
     executeId: (request: Request) => string | Promise<string>;
     runtime: {
       request: Map<ExecuteId, { logger: Logger }>;
+      app: any;
     };
     on: Awaited<ReturnType<typeof __initEventManager>>["on"];
     off: Awaited<ReturnType<typeof __initEventManager>>["off"];
@@ -71,6 +72,8 @@ export const createWorld = async <MilkioOptions extends MilkioInit>(generated: G
     listener,
   };
 
+  runtime.app = app;
+
   return app as MilkioWorld<MilkioOptions>;
 };