@nice-code/action 0.2.0 → 0.2.2

package/build/index.js

@@ -143,7 +143,7 @@ class ActionBase {
     this.id = id;
     this.domain = _domain.domain;
     this.allDomains = _domain.allDomains;
-    this.schema = _domain.actions[id];
+    this.schema = _domain.actionSchema[id];
   }
   toJsonObject() {
     return {
@@ -251,8 +251,9 @@ var EActionPayloadType;
 ((EActionPayloadType2) => {
   EActionPayloadType2["request"] = "request";
   EActionPayloadType2["progress"] = "progress";
-  EActionPayloadType2["stream"] = "stream";
   EActionPayloadType2["result"] = "result";
+  EActionPayloadType2["stream"] = "stream";
+  EActionPayloadType2["push"] = "push";
 })(EActionPayloadType ||= {});
 var EActionProgressType;
 ((EActionProgressType2) => {
@@ -572,7 +573,7 @@ class RunningAction {
     return this._completeWithResult(result);
   }
 }
-// ../nice-error/build/index.js
+// ../../node_modules/.bun/@nice-code+error@0.1.3+7524df1edfed9f02/node_modules/@nice-code/error/build/index.js
 var ACCEPTED = 202;
 var BAD_GATEWAY = 502;
 var BAD_REQUEST = 400;
@@ -3257,7 +3258,7 @@ var EErrId_NiceAction;
   EErrId_NiceAction2["hydration_action_state_mismatch"] = "hydration_action_state_mismatch";
   EErrId_NiceAction2["hydration_action_id_not_found"] = "hydration_action_id_not_found";
   EErrId_NiceAction2["no_action_execution_handler"] = "no_action_execution_handler";
-  EErrId_NiceAction2["wire_action_not_primed_or_response"] = "wire_action_not_primed_or_response";
+  EErrId_NiceAction2["wire_action_not_payload"] = "wire_action_not_payload";
   EErrId_NiceAction2["wire_not_action_data"] = "wire_not_action_data";
   EErrId_NiceAction2["client_runtime_already_registered"] = "client_runtime_already_registered";
   EErrId_NiceAction2["client_runtime_not_registered"] = "client_runtime_not_registered";
@@ -3295,11 +3296,11 @@ var err_nice_action = err_nice.createChildDomain({
     ["no_action_execution_handler" /* no_action_execution_handler */]: err({
       message: ({ domain, actionId, specifiedClient }) => `${specifiedClient ? ` The targeted client runtime [${specifiedClient.stringId}] has no` : "No"} action handler registered for "${actionId}" in domain "${domain}".`
     }),
-    ["wire_action_not_primed_or_response" /* wire_action_not_primed_or_response */]: err({
-      message: ({ domain, actionId, actionState }) => `Cannot handle wire for action "${actionId}" in domain "${domain}": expected action type of "primed" or "resolved", got "${actionState}".`
+    ["wire_action_not_payload" /* wire_action_not_payload */]: err({
+      message: ({ domain, actionId, actionState }) => `Cannot handle wire for action "${actionId}" in domain "${domain}": expected action form of "${"data" /* data */}" and type of "${"request" /* request */}", "${"progress" /* progress */}" or "${"result" /* result */}", got "${actionState}".`
     }),
     ["wire_not_action_data" /* wire_not_action_data */]: err({
-      message: () => `Cannot handle wire for action: expected an object with a "domain" property of type string and a "type" property of "primed" or "resolved".`
+      message: () => `Cannot handle wire for action: expected an object with a "domain" property of type string, a "form" property of "${"data" /* data */}" and a "type" property of "${"request" /* request */}", "${"progress" /* progress */}" or "${"result" /* result */}".`
     }),
     ["client_runtime_already_registered" /* client_runtime_already_registered */]: err({
       message: ({ context, client }) => `Environment is already registered${context?.domain ? ` on domain "${context.domain}"` : ""} for client [${client.stringId}]. Each client specifier (exact match on all properties) may only be registered once.`
@@ -3348,22 +3349,17 @@ var isAction_Core_JsonObject = (obj) => {
 
 // src/utils/isActionPayload_Progress_JsonObject.ts
 var isActionPayload_Progress_JsonObject = (obj) => {
-  return isAction_Base_JsonObject(obj) && "input" in obj && obj.type === "progress" /* progress */;
+  return isAction_Base_JsonObject(obj) && "progress" in obj && obj.form === "data" /* data */ && obj.type === "progress" /* progress */;
 };
 
 // src/utils/isActionPayload_Request_JsonObject.ts
 var isActionPayload_Request_JsonObject = (obj) => {
-  return isAction_Base_JsonObject(obj) && "input" in obj && obj.type === "request" /* request */;
+  return isAction_Base_JsonObject(obj) && "input" in obj && obj.form === "data" /* data */ && obj.type === "request" /* request */;
 };
 
 // src/utils/isActionPayload_Result_JsonObject.ts
 var isActionPayload_Result_JsonObject = (obj) => {
-  if (!isAction_Base_JsonObject(obj))
-    return false;
-  if (obj.type !== "result" /* result */)
-    return false;
-  const result = obj.result;
-  return result != null && typeof result === "object" && typeof result.ok === "boolean" && (("output" in result) || ("error" in result));
+  return isAction_Base_JsonObject(obj) && obj.result != null && obj.form === "data" /* data */ && obj.type === "result" /* result */;
 };
 
 // src/utils/isActionPayload_Any_JsonObject.ts
@@ -3392,12 +3388,12 @@ function isAction_Any_Instance(value) {
 class ActionDomainBase {
   domain;
   allDomains;
-  actions;
+  actionSchema;
   _listeners = [];
   constructor(definition) {
     this.domain = definition.domain;
     this.allDomains = definition.allDomains;
-    this.actions = definition.actions;
+    this.actionSchema = definition.actionSchema;
   }
   addActionListener(listener) {
     this._listeners.push(listener);
@@ -3410,11 +3406,13 @@ class ActionDomainBase {
 // src/ActionDefinition/Domain/ActionDomain.ts
 class ActionDomain extends ActionDomainBase {
   _rootDomain;
+  _actionMap;
   constructor(definition, {
     rootDomain
   }) {
     super(definition);
     this._rootDomain = rootDomain;
+    this._actionMap = this.createActionMap();
   }
   get rootDomain() {
     return this._rootDomain;
@@ -3428,13 +3426,19 @@ class ActionDomain extends ActionDomainBase {
       });
     }
     return new ActionDomain({
-      allDomains: [subDomainDef.domain, ...this.allDomains],
+      allDomains: [...this.allDomains, subDomainDef.domain],
       domain: subDomainDef.domain,
-      actions: subDomainDef.actions
+      actionSchema: subDomainDef.actions
     }, { rootDomain: this._rootDomain });
   }
-  action(id) {
-    const actionSchema = this.actions[id];
+  get action() {
+    return this._actionMap;
+  }
+  actionsMap() {
+    return this._actionMap;
+  }
+  actionForId(id) {
+    const actionSchema = this.actionSchema[id];
     if (!actionSchema) {
       throw err_nice_action.fromId("action_id_not_in_domain" /* action_id_not_in_domain */, {
         domain: this.domain,
@@ -3460,7 +3464,7 @@ class ActionDomain extends ActionDomainBase {
   isDomainAction(action) {
     return isAction_Any_Instance(action) && action.domain === this.domain;
   }
-  hydrateRequest(serialized) {
+  hydrateRequestPayload(serialized) {
     if (serialized.type !== "request" /* request */) {
       throw err_nice_action.fromId("hydration_action_state_mismatch" /* hydration_action_state_mismatch */, {
         expected: "request" /* request */,
@@ -3474,7 +3478,7 @@ class ActionDomain extends ActionDomainBase {
       });
     }
     const id = serialized.id;
-    if (!this.actions[id]) {
+    if (!this.actionSchema[id]) {
       throw err_nice_action.fromId("hydration_action_id_not_found" /* hydration_action_id_not_found */, {
         domain: this.domain,
         actionId: serialized.id
@@ -3499,7 +3503,7 @@ class ActionDomain extends ActionDomainBase {
       });
     }
     const id = serialized.id;
-    if (!this.actions[id]) {
+    if (!this.actionSchema[id]) {
       throw err_nice_action.fromId("hydration_action_id_not_found" /* hydration_action_id_not_found */, {
         domain: this.domain,
         actionId: serialized.id
@@ -3514,13 +3518,13 @@ class ActionDomain extends ActionDomainBase {
     assertIsActionJson(actionJson);
     if (actionJson.form === "data" /* data */) {
       if (actionJson.type === "request" /* request */) {
-        return this.hydrateRequest(actionJson);
+        return this.hydrateRequestPayload(actionJson);
       }
       if (actionJson.type === "result" /* result */) {
         return this.hydrateResultPayload(actionJson);
       }
     }
-    return this.action(actionJson.id);
+    return this.actionForId(actionJson.id);
   }
   async runAction(request, options) {
     const allListeners = [
@@ -3532,6 +3536,13 @@ class ActionDomain extends ActionDomainBase {
       listeners: allListeners
     });
   }
+  createActionMap() {
+    const map = {};
+    for (const id in this.actionSchema) {
+      map[id] = new ActionCore(this, id);
+    }
+    return map;
+  }
 }
 // src/ActionRuntime/ActionRuntimeManager.ts
 class ActionRuntimeManager {
@@ -3563,7 +3574,7 @@ class ActionRuntimeManager {
       if (runtime2 == null) {
         return;
       }
-      const handler = runtime2.getHandlerForAction(action, options);
+      const handler = runtime2._getHandlerForAction(action, options);
       if (handler != null) {
         return { handler, runtime: runtime2 };
       }
@@ -3576,7 +3587,7 @@ class ActionRuntimeManager {
       }
     }
     for (const runtime2 of this._runtimes.values()) {
-      const handler = runtime2.getHandlerForAction(action);
+      const handler = runtime2._getHandlerForAction(action);
       if (handler) {
         return { handler, runtime: runtime2 };
       }
@@ -3644,7 +3655,7 @@ class ActionRootDomain extends ActionDomainBase {
     super({
       domain: domainId,
       allDomains: [domainId],
-      actions: {}
+      actionSchema: {}
     });
     this.domainDefinition = domainDefinition;
     this._actionRuntimeManager = new ActionRuntimeManager({ domain: domainId });
@@ -3658,9 +3669,9 @@ class ActionRootDomain extends ActionDomainBase {
       });
     }
     return new ActionDomain({
-      allDomains: [subDomainDef.domain, ...this.allDomains],
+      allDomains: [...this.allDomains, subDomainDef.domain],
       domain: subDomainDef.domain,
-      actions: subDomainDef.actions
+      actionSchema: subDomainDef.actions
     }, { rootDomain: this });
   }
   addActionRuntime(runtime2) {
@@ -3670,11 +3681,11 @@ class ActionRootDomain extends ActionDomainBase {
   getRuntime(clientSpecifier) {
     return this._actionRuntimeManager.getBestRuntimeForSpecifier(clientSpecifier);
   }
-  async _runAction(primed, options) {
-    const { handler, runtime: runtime2 } = this._actionRuntimeManager.getRuntimeAndHandlerForActionOrThrow(primed, options);
-    primed.context._setOriginClient(runtime2.clientSpecifier);
+  async _runAction(actionPayload, options) {
+    const { handler, runtime: runtime2 } = this._actionRuntimeManager.getRuntimeAndHandlerForActionOrThrow(actionPayload, options);
+    actionPayload.context._setOriginClient(runtime2.clientSpecifier);
     const allListeners = [...this._listeners, ...options?.listeners ?? []];
-    const runningAction = await handler.handleActionRequest(primed, {
+    const runningAction = await handler.handleActionRequest(actionPayload, {
       targetLocalRuntime: runtime2
     });
     runningAction.addUpdateListeners(allListeners);
@@ -3685,7 +3696,7 @@ class ActionRootDomain extends ActionDomainBase {
 var createActionRootDomain = (definition) => {
   return new ActionRootDomain(definition);
 };
-// ../common-errors/build/index.js
+// ../../node_modules/.bun/@nice-code+common-errors@0.1.3+51eba3db27e14993/node_modules/@nice-code/common-errors/build/index.js
 var ACCEPTED2 = 202;
 var BAD_GATEWAY2 = 502;
 var BAD_REQUEST2 = 400;
@@ -6586,7 +6597,7 @@ class ActionRuntime {
   resolveIncomingActionPayload(json) {
     if (json.type === "request" /* request */) {
       this.handleActionPayloadWire(json).catch((err3) => {
-        console.error(`[ActionRuntime] Incoming primed action [${json.domain}:${json.id}] unhandled:`, err3);
+        console.error(`[ActionRuntime] Incoming action [${json.domain}:${json.id}:${json.form}:${json.type}] unhandled:`, err3);
       });
       return;
     }
@@ -6595,10 +6606,8 @@ class ActionRuntime {
   async handleActionPayloadWire(wire) {
     let action;
     if (isActionPayload_Any_JsonObject(wire)) {
-      const domain = this.actionRouter.domainManager.getActionDomain(wire);
-      if (domain) {
-        action = domain.hydrateAnyAction(wire);
-      }
+      const domain = this.actionRouter.domainManager.getActionDomainOrThrow(wire);
+      action = domain.hydrateAnyAction(wire);
     }
     if (action == null) {
       throw err_nice_action.fromId("wire_not_action_data" /* wire_not_action_data */);
@@ -6619,7 +6628,7 @@ class ActionRuntime {
       label: `Handling incoming action payloads of type "${action.type}"`
     });
   }
-  getHandlerForAction(action, options) {
+  _getHandlerForAction(action, options) {
     const handlers = this.actionRouter.getRouteDataEntriesForAction(action);
     const targetExternalClient = options?.targetExternalClient;
     const possibleHandlers = handlers.filter((handler2) => {
@@ -6658,7 +6667,7 @@ class ActionRuntime {
     return handler;
   }
   getHandlerForActionOrThrow(action, options) {
-    const handler = this.getHandlerForAction(action, options);
+    const handler = this._getHandlerForAction(action, options);
     if (handler == null) {
       throw err_nice_action.fromId("no_action_execution_handler" /* no_action_execution_handler */, {
         actionId: action.id,
@@ -7196,9 +7205,9 @@ class TransportWebSocket extends Transport {
     };
     ws.addEventListener("message", (event) => {
       if (typeof event.data === "string") {
-        const actionJson = wsData.formatMessage?.incoming?.(event.data) ?? this._parseActionMessage(event.data);
-        if (actionJson != null) {
-          this.resolvers.onIncomingActionDataJson(actionJson);
+        const rawJson = wsData.formatMessage?.incoming?.(event.data) ?? this._parseActionMessage(event.data);
+        if (rawJson != null && isActionPayload_Any_JsonObject(rawJson)) {
+          this.resolvers.onIncomingActionDataJson(rawJson);
         }
       }
     });
@@ -7426,7 +7435,7 @@ class ActionLocalHandler extends ActionHandler {
   async handlePayloadWireOrThrow(wire, config) {
     const hydratedAction = this.actionRouter.domainManager.hydrateActionPayload(wire);
     if (!(hydratedAction instanceof ActionPayload_Request)) {
-      throw err_nice_action.fromId("wire_action_not_primed_or_response" /* wire_action_not_primed_or_response */, {
+      throw err_nice_action.fromId("wire_action_not_payload" /* wire_action_not_payload */, {
         domain: hydratedAction.domain,
         actionId: hydratedAction.id,
         actionState: hydratedAction.type ?? hydratedAction.form

package/build/react-query/index.js

@@ -3099,7 +3099,15 @@ function useMutation(options, queryClient) {
   }
   return { ...result, mutate, mutateAsync: result.mutate };
 }
-// src/react-query/index.ts
+// src/react-query/hooks/useActionMutation.ts
+function useActionMutation(action, options) {
+  const mutationOptions2 = options ?? {};
+  return useMutation({
+    mutationFn: (input) => action.request(input).runToOutput(),
+    ...mutationOptions2
+  });
+}
+// src/react-query/hooks/useActionQuery.ts
 function niceActionQueryKey(action, input) {
   if (input === undefined) {
     return ["nice-action", action.domain, action.allDomains, action.id];
@@ -3115,15 +3123,8 @@ function useNiceQuery(action, input, options) {
     ...queryOptions2
   });
 }
-function useNiceMutation(action, options) {
-  const mutationOptions2 = options ?? {};
-  return useMutation({
-    mutationFn: (input) => action.request(input).runToOutput(),
-    ...mutationOptions2
-  });
-}
 export {
   useNiceQuery,
-  useNiceMutation,
+  useActionMutation,
   niceActionQueryKey
 };

package/build/types/ActionDefinition/Action/Action.combined.types.d.ts

@@ -8,20 +8,30 @@ import type { IActionPayload_Progress_JsonObject, IActionPayload_Request_JsonObj
 import type { ActionPayload_Progress } from "./Payload/ActionPayload_Progress";
 import type { ActionPayload_Request } from "./Payload/ActionPayload_Request";
 import type { ActionPayload_Result } from "./Payload/ActionPayload_Result";
-export type TAction_Any_Instance<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> = ActionCore<DOM, ID> | TActionPayload_Any_Instance<DOM, ID> | ActionContext<DOM, ID>;
+/**
+ * Distributes a union ID into a proper discriminated union of ActionPayload_Request instances,
+ * so that narrowing on `.id` also narrows `.input`.
+ */
+export type TDistributeActionPayload_Request<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string> = ID extends keyof DOM["actionSchema"] & string ? ActionPayload_Request<DOM, ID> : never;
+/**
+ * Distributes a union ID into a proper discriminated union of ActionPayload_Result instances,
+ * so that narrowing on `.id` also narrows `.result`.
+ */
+export type TDistributeActionPayload_Result<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string> = ID extends keyof DOM["actionSchema"] & string ? ActionPayload_Result<DOM, ID> : never;
+export type TAction_Any_Instance<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> = ActionCore<DOM, ID> | TActionPayload_Any_Instance<DOM, ID> | ActionContext<DOM, ID>;
 /**
  *
  *  COMBINED JSON TYPES
  *
  */
-export type TAction_Any_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> = IActionCore_JsonObject<DOM, ID> | TActionPayload_Any_JsonObject<DOM, ID> | IActionContext_JsonObject<DOM, ID>;
+export type TAction_Any_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> = IActionCore_JsonObject<DOM, ID> | TActionPayload_Any_JsonObject<DOM, ID> | IActionContext_JsonObject<DOM, ID>;
 /**
  *
  *  UTILITY TYPES
  *
  */
 export type TDistributedDomainActions<DOM extends IActionDomain, ACT extends IActionBase<any, DOM, any>> = {
-    [ID in keyof DOM["actions"] & string]: TNarrowActionType<DOM, ACT, ID>;
-}[keyof DOM["actions"] & string];
-export type TNarrowActionType<DOM extends IActionDomain, ACT extends IActionBase<any, DOM, any>, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> = ACT extends ActionPayload_Result<any> ? ActionPayload_Result<DOM, ID> : ACT extends ActionPayload_Request<any> ? ActionPayload_Request<DOM, ID> : ACT extends ActionPayload_Progress<any> ? ActionPayload_Progress<DOM, ID> : ACT extends ActionCore<any> ? ActionCore<DOM, ID> : never;
-export type TNarrowActionJsonTypeToActionInstanceType<DOM extends IActionDomain, ACT extends TAction_Any_JsonObject<DOM>, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> = ACT extends IActionPayload_Request_JsonObject<any> ? ActionPayload_Request<DOM, ID> : ACT extends IActionPayload_Result_JsonObject<any> ? ActionPayload_Result<DOM, ID> : ACT extends IActionPayload_Progress_JsonObject<any> ? ActionPayload_Progress<DOM, ID> : ACT extends IActionCore_JsonObject<any> ? ActionCore<DOM, ID> : never;
+    [ID in keyof DOM["actionSchema"] & string]: TNarrowActionType<DOM, ACT, ID>;
+}[keyof DOM["actionSchema"] & string];
+export type TNarrowActionType<DOM extends IActionDomain, ACT extends IActionBase<any, DOM, any>, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> = ACT extends ActionPayload_Result<any> ? ActionPayload_Result<DOM, ID> : ACT extends ActionPayload_Request<any> ? ActionPayload_Request<DOM, ID> : ACT extends ActionPayload_Progress<any> ? ActionPayload_Progress<DOM, ID> : ACT extends ActionCore<any> ? ActionCore<DOM, ID> : never;
+export type TNarrowActionJsonTypeToActionInstanceType<DOM extends IActionDomain, ACT extends TAction_Any_JsonObject<DOM>, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> = ACT extends IActionPayload_Request_JsonObject<any> ? ActionPayload_Request<DOM, ID> : ACT extends IActionPayload_Result_JsonObject<any> ? ActionPayload_Result<DOM, ID> : ACT extends IActionPayload_Progress_JsonObject<any> ? ActionPayload_Progress<DOM, ID> : ACT extends IActionCore_JsonObject<any> ? ActionCore<DOM, ID> : never;

package/build/types/ActionDefinition/Action/ActionBase.d.ts

@@ -1,13 +1,13 @@
 import type { ActionDomain } from "../Domain/ActionDomain";
 import type { IActionDomain } from "../Domain/ActionDomain.types";
 import type { EActionForm, IActionBase, IActionBase_JsonObject } from "./ActionBase.types";
-export declare abstract class ActionBase<FORM extends EActionForm, DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> implements IActionBase<FORM, DOM, ID> {
+export declare abstract class ActionBase<FORM extends EActionForm, DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> implements IActionBase<FORM, DOM, ID> {
     readonly form: FORM;
     readonly _domain: ActionDomain<DOM>;
     readonly id: ID;
     readonly domain: DOM["domain"];
     readonly allDomains: DOM["allDomains"];
-    readonly schema: DOM["actions"][ID];
+    readonly schema: DOM["actionSchema"][ID];
     constructor(form: FORM, _domain: ActionDomain<DOM>, id: ID);
     protected toJsonObject(): IActionBase_JsonObject<FORM, DOM, ID>;
     protected toJsonString(): string;

package/build/types/ActionDefinition/Action/ActionBase.types.d.ts

@@ -7,16 +7,16 @@ export declare enum EActionForm {
 }
 export interface INiceActionIdAndDomain<DOM extends IActionDomain = IActionDomain> {
     domain: DOM["domain"];
-    id: keyof DOM["actions"] & string;
+    id: keyof DOM["actionSchema"] & string;
 }
-export interface IActionBase<FORM extends EActionForm, DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends INiceActionIdAndDomain<DOM> {
+export interface IActionBase<FORM extends EActionForm, DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends INiceActionIdAndDomain<DOM> {
     id: ID;
     form: FORM;
     _domain: ActionDomain<DOM>;
     allDomains: DOM["allDomains"];
-    schema: DOM["actions"][ID];
+    schema: DOM["actionSchema"][ID];
 }
-export interface IActionBase_JsonObject<FORM extends EActionForm = EActionForm, DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> {
+export interface IActionBase_JsonObject<FORM extends EActionForm = EActionForm, DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> {
     form: FORM;
     domain: DOM["domain"];
     allDomains: DOM["allDomains"];

package/build/types/ActionDefinition/Action/Context/ActionContext.d.ts

@@ -1,11 +1,10 @@
-import type { JSONSerializableValue } from "@nice-code/error";
+import { ActionClientSpecifier } from "../../../ActionRuntime/Client/ActionClientSpecifier";
 import type { ActionDomain } from "../../Domain/ActionDomain";
 import type { IActionDomain, TInferInputFromSchema, TInferOutputFromSchema } from "../../Domain/ActionDomain.types";
 import { ActionBase } from "../ActionBase";
 import { EActionForm } from "../ActionBase.types";
-import { ActionClientSpecifier } from "../../../ActionRuntime/Client/ActionClientSpecifier";
 import type { IActionContext, IActionContext_Data, IActionContext_Data_JsonObject, IActionContext_JsonObject, IActionRouteItem } from "./ActionContext.types";
-export declare class ActionContext<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends ActionBase<EActionForm.context, DOM, ID> implements IActionContext<DOM, ID> {
+export declare class ActionContext<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends ActionBase<EActionForm.context, DOM, ID> implements IActionContext<DOM, ID> {
     readonly _domain: ActionDomain<DOM>;
     readonly form = EActionForm.context;
     readonly _routing: IActionRouteItem[];
@@ -19,8 +18,8 @@ export declare class ActionContext<DOM extends IActionDomain, ID extends keyof D
     toJsonObject(): IActionContext_JsonObject<DOM, ID>;
     get routing(): IActionRouteItem[];
     addRouteItem(item: IActionRouteItem): void;
-    deserializeInput(serialized: JSONSerializableValue): TInferInputFromSchema<DOM["actions"][ID]>["Input"];
-    serializeInput(raw: TInferInputFromSchema<DOM["actions"][ID]>["Input"]): JSONSerializableValue;
-    validateInput(input: unknown): TInferInputFromSchema<DOM["actions"][ID]>["Input"];
-    validateOutput(output: unknown): TInferOutputFromSchema<DOM["actions"][ID]>["Output"];
+    deserializeInput(serialized: TInferInputFromSchema<DOM["actionSchema"][ID]>["SerdeInput"]): TInferInputFromSchema<DOM["actionSchema"][ID]>["Input"];
+    serializeInput(raw: TInferInputFromSchema<DOM["actionSchema"][ID]>["Input"]): TInferInputFromSchema<DOM["actionSchema"][ID]>["SerdeInput"];
+    validateInput(input: unknown): TInferInputFromSchema<DOM["actionSchema"][ID]>["Input"];
+    validateOutput(output: unknown): TInferOutputFromSchema<DOM["actionSchema"][ID]>["Output"];
 }

package/build/types/ActionDefinition/Action/Context/ActionContext.types.d.ts

@@ -13,7 +13,7 @@ export interface IActionContext_Data {
     routing: IActionRouteItem[];
     originClient: ActionClientSpecifier;
 }
-export interface IActionContext<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends IActionBase<EActionForm.context, DOM, ID>, IActionContext_Data {
+export interface IActionContext<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends IActionBase<EActionForm.context, DOM, ID>, IActionContext_Data {
 }
 /**
  *
@@ -31,5 +31,5 @@ export interface IActionContext_Data_JsonObject {
     routing: IActionRouteItem_JsonObject[];
     originClient: IActionClientSpecifier;
 }
-export interface IActionContext_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends IActionBase_JsonObject<EActionForm.context, DOM, ID>, IActionContext_Data_JsonObject {
+export interface IActionContext_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends IActionBase_JsonObject<EActionForm.context, DOM, ID>, IActionContext_Data_JsonObject {
 }

package/build/types/ActionDefinition/Action/Core/ActionCore.d.ts

@@ -1,4 +1,3 @@
-import type { JSONSerializableValue } from "@nice-code/error";
 import type { ActionDomain } from "../../Domain/ActionDomain";
 import type { IActionDomain, TInferInputFromSchema, TInferOutputFromSchema } from "../../Domain/ActionDomain.types";
 import type { TNarrowActionType } from "../Action.combined.types";
@@ -6,15 +5,15 @@ import { ActionBase } from "../ActionBase";
 import { EActionForm, type IActionBase, type IActionBase_JsonObject } from "../ActionBase.types";
 import { ActionPayload_Request } from "../Payload/ActionPayload_Request";
 import type { IActionCore } from "./ActionCore.types";
-export declare class ActionCore<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends ActionBase<EActionForm.core, DOM, ID> implements IActionCore<DOM, ID> {
+export declare class ActionCore<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends ActionBase<EActionForm.core, DOM, ID> implements IActionCore<DOM, ID> {
     readonly _domain: ActionDomain<DOM>;
     readonly form = EActionForm.core;
     constructor(_domain: ActionDomain<DOM>, id: ID);
     is<ACT extends IActionBase<any, any, any>>(action: ACT | unknown | null | undefined): action is TNarrowActionType<DOM, ACT, ID>;
     toJsonObject(): IActionBase_JsonObject<EActionForm.core, DOM, ID>;
-    request(input: TInferInputFromSchema<DOM["actions"][ID]>["Input"]): ActionPayload_Request<DOM, ID>;
-    deserializeInput(serialized: JSONSerializableValue): TInferInputFromSchema<DOM["actions"][ID]>["Input"];
-    serializeInput(raw: TInferInputFromSchema<DOM["actions"][ID]>["Input"]): JSONSerializableValue;
-    validateInput(input: unknown): TInferInputFromSchema<DOM["actions"][ID]>["Input"];
-    validateOutput(output: unknown): TInferOutputFromSchema<DOM["actions"][ID]>["Output"];
+    request(input: TInferInputFromSchema<DOM["actionSchema"][ID]>["Input"]): ActionPayload_Request<DOM, ID>;
+    deserializeInput(serialized: TInferInputFromSchema<DOM["actionSchema"][ID]>["SerdeInput"]): TInferInputFromSchema<DOM["actionSchema"][ID]>["Input"];
+    serializeInput(raw: TInferInputFromSchema<DOM["actionSchema"][ID]>["Input"]): TInferInputFromSchema<DOM["actionSchema"][ID]>["SerdeInput"];
+    validateInput(input: unknown): TInferInputFromSchema<DOM["actionSchema"][ID]>["Input"];
+    validateOutput(output: unknown): TInferOutputFromSchema<DOM["actionSchema"][ID]>["Output"];
 }

package/build/types/ActionDefinition/Action/Core/ActionCore.types.d.ts

@@ -1,8 +1,8 @@
 import type { IActionDomain } from "../../Domain/ActionDomain.types";
 import type { EActionForm, IActionBase } from "../ActionBase.types";
-export interface IActionCore<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends IActionBase<EActionForm.core, DOM, ID> {
+export interface IActionCore<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends IActionBase<EActionForm.core, DOM, ID> {
 }
-export type IActionCore_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> = {
+export type IActionCore_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> = {
     form: EActionForm.core;
     domain: DOM["domain"];
     allDomains: DOM["allDomains"];

package/build/types/ActionDefinition/Action/Payload/ActionPayload.d.ts

@@ -3,7 +3,7 @@ import { ActionBase } from "../ActionBase";
 import { EActionForm } from "../ActionBase.types";
 import type { ActionContext } from "../Context/ActionContext";
 import type { EActionPayloadType, IActionPayload_Base, IActionPayload_Base_JsonObject, IActionPayload_Data_Base } from "./ActionPayload.types";
-export declare abstract class ActionPayload<DT extends EActionPayloadType, DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends ActionBase<EActionForm.data, DOM, ID> implements IActionPayload_Base<DT, DOM, ID> {
+export declare abstract class ActionPayload<DT extends EActionPayloadType, DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends ActionBase<EActionForm.data, DOM, ID> implements IActionPayload_Base<DT, DOM, ID> {
     readonly form: EActionForm.data;
     readonly type: DT;
     readonly context: ActionContext<DOM, ID>;

package/build/types/ActionDefinition/Action/Payload/ActionPayload.types.d.ts

@@ -11,13 +11,14 @@ import type { ActionPayload_Result } from "./ActionPayload_Result";
 export declare enum EActionPayloadType {
     request = "request",
     progress = "progress",
+    result = "result",
     stream = "stream",
-    result = "result"
+    push = "push"
 }
 export interface IActionPayload_Data_Base {
     time: number;
 }
-export interface IActionPayload_Base<DT extends EActionPayloadType, DOM extends IActionDomain, ID extends keyof DOM["actions"] & string> extends IActionBase<EActionForm.data, DOM, ID>, IActionPayload_Data_Base {
+export interface IActionPayload_Base<DT extends EActionPayloadType, DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string> extends IActionBase<EActionForm.data, DOM, ID>, IActionPayload_Data_Base {
     readonly type: DT;
     readonly context: ActionContext<DOM, ID>;
 }
@@ -42,8 +43,8 @@ export type TActionResultOutcome<OUT, ERR> = {
     ok: false;
     error: ERR;
 };
-export interface IActionPayload_Result<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string> extends IActionPayload_Base<EActionPayloadType.result, DOM, ID> {
-    readonly result: TActionResultOutcome<TInferOutputFromSchema<DOM["actions"][ID]>["Output"], TInferActionError<DOM["actions"][ID]>>;
+export interface IActionPayload_Result<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string> extends IActionPayload_Base<EActionPayloadType.result, DOM, ID> {
+    readonly result: TActionResultOutcome<TInferOutputFromSchema<DOM["actionSchema"][ID]>["Output"], TInferActionError<DOM["actionSchema"][ID]>>;
 }
 /**
  *
@@ -68,7 +69,7 @@ export interface IActionProgress_Custom {
     data: any;
 }
 export type TActionProgress = IActionProgress_None | IActionProgress_Percentage | IActionProgress_Custom;
-export interface IActionPayload_Progress<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string> extends IActionPayload_Base<EActionPayloadType.progress, DOM, ID> {
+export interface IActionPayload_Progress<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string> extends IActionPayload_Base<EActionPayloadType.progress, DOM, ID> {
     readonly progress: TActionProgress;
 }
 /**
@@ -78,22 +79,22 @@ export interface IActionPayload_Progress<DOM extends IActionDomain, ID extends k
  *  [                   ]
  *
  */
-export interface IActionPayload_Base_JsonObject<DT extends EActionPayloadType, DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends IActionBase_JsonObject<EActionForm.data, DOM, ID> {
+export interface IActionPayload_Base_JsonObject<DT extends EActionPayloadType, DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends IActionBase_JsonObject<EActionForm.data, DOM, ID> {
     type: DT;
     context: IActionContext_Data_JsonObject;
     time: number;
 }
-export interface IActionPayload_Request_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends IActionPayload_Base_JsonObject<EActionPayloadType.request, DOM, ID> {
+export interface IActionPayload_Request_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends IActionPayload_Base_JsonObject<EActionPayloadType.request, DOM, ID> {
     type: EActionPayloadType.request;
-    input: TInferInputFromSchema<DOM["actions"][ID]>["SerdeInput"];
+    input: TInferInputFromSchema<DOM["actionSchema"][ID]>["SerdeInput"];
 }
-export interface IActionPayload_Progress_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends IActionPayload_Base_JsonObject<EActionPayloadType.progress, DOM, ID> {
+export interface IActionPayload_Progress_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends IActionPayload_Base_JsonObject<EActionPayloadType.progress, DOM, ID> {
     type: EActionPayloadType.progress;
     progress: TActionProgress;
 }
-export interface IActionPayload_Result_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends IActionPayload_Base_JsonObject<EActionPayloadType.result, DOM, ID> {
+export interface IActionPayload_Result_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends IActionPayload_Base_JsonObject<EActionPayloadType.result, DOM, ID> {
     type: EActionPayloadType.result;
-    result: TActionResultOutcome<TInferOutputFromSchema<DOM["actions"][ID]>["Output"], TInferActionError<DOM["actions"][ID]>>;
+    result: TActionResultOutcome<TInferOutputFromSchema<DOM["actionSchema"][ID]>["Output"], TInferActionError<DOM["actionSchema"][ID]>>;
 }
 /**
  *
@@ -102,5 +103,5 @@ export interface IActionPayload_Result_JsonObject<DOM extends IActionDomain = IA
  *  [                  ]
  *
  */
-export type TActionPayload_Any_Instance<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> = ActionPayload_Request<DOM, ID> | ActionPayload_Result<DOM, ID> | ActionPayload_Progress<DOM, ID>;
-export type TActionPayload_Any_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> = IActionPayload_Request_JsonObject<DOM, ID> | IActionPayload_Progress_JsonObject<DOM, ID> | IActionPayload_Result_JsonObject<DOM, ID>;
+export type TActionPayload_Any_Instance<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> = ActionPayload_Request<DOM, ID> | ActionPayload_Result<DOM, ID> | ActionPayload_Progress<DOM, ID>;
+export type TActionPayload_Any_JsonObject<DOM extends IActionDomain = IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> = IActionPayload_Request_JsonObject<DOM, ID> | IActionPayload_Progress_JsonObject<DOM, ID> | IActionPayload_Result_JsonObject<DOM, ID>;

package/build/types/ActionDefinition/Action/Payload/ActionPayload_Progress.d.ts

@@ -4,7 +4,7 @@ import { ActionPayload } from "./ActionPayload";
 import type { IActionPayload_Data_Base, IActionPayload_Progress, IActionPayload_Progress_JsonObject, TActionProgress } from "./ActionPayload.types";
 import { EActionPayloadType } from "./ActionPayload.types";
 import { ActionPayload_Request } from "./ActionPayload_Request";
-export declare class ActionPayload_Progress<DOM extends IActionDomain, ID extends keyof DOM["actions"] & string = keyof DOM["actions"] & string> extends ActionPayload<EActionPayloadType.progress, DOM, ID> implements IActionPayload_Progress<DOM, ID> {
+export declare class ActionPayload_Progress<DOM extends IActionDomain, ID extends keyof DOM["actionSchema"] & string = keyof DOM["actionSchema"] & string> extends ActionPayload<EActionPayloadType.progress, DOM, ID> implements IActionPayload_Progress<DOM, ID> {
     readonly progress: TActionProgress;
     constructor(params: {
         context: ActionContext<DOM, ID>;