@ruiapp/rapid-core 0.1.34 → 0.1.36

package/dist/index.js

@@ -2107,7 +2107,7 @@ async function createEntity(server, dataAccessor, options, plugin) {
         }
     }
     const newRow = await dataAccessor.create(row);
-    const newEntity = mapDbRowToEntity(model, newRow, false);
+    const newEntity = mapDbRowToEntity(model, newRow, true);
     // save many-relation properties
     for (const property of manyRelationPropertiesToCreate) {
         newEntity[property.code] = [];
@@ -3339,8 +3339,12 @@ async function handler$h(plugin, ctx, options) {
     if (operation) {
         delete mergedInput.$operation;
     }
+    const stateProperty = mergedInput.$stateProperty;
+    if (stateProperty) {
+        delete mergedInput.$stateProperty;
+    }
     const entityManager = server.getEntityManager(options.singularCode);
-    const output = await entityManager.updateEntityById({ id: mergedInput.id, entityToSave: mergedInput, operation }, plugin);
+    const output = await entityManager.updateEntityById({ id: mergedInput.id, entityToSave: mergedInput, operation, stateProperty }, plugin);
     ctx.output = output;
 }
 
@@ -5036,7 +5040,6 @@ class CronJobPlugin {
 }
 
 async function getStateMachineNextSnapshot(server, options) {
-    debugger;
     const { machineConfig, currentState, event } = options;
     machineConfig.initial = currentState;
     const machine = xstate.createMachine(machineConfig);

package/dist/plugins/stateMachine/StateMachinePluginTypes.d.ts

@@ -1,4 +1,4 @@
-import { MachineConfig } from "xstate";
+import { AnyActorRef, AnyEventObject, EventObject, MachineConfig, MachineContext, MachineSnapshot, MetaObject, StateValue } from "xstate";
 export type PropertyStateMachineConfig = {
     enabled: boolean;
     config: MachineConfig<any, any>;
@@ -7,18 +7,25 @@ export type PropertyStateMachineConfig = {
 export type SendStateMachineEventOptions = {
     code: string;
 };
+export type StateMachineEvent = AnyEventObject;
 export type SendStateMachineEventInput = {
     code?: string;
     context: any;
     currentState: string;
     event: StateMachineEvent;
 };
-export type StateMachineEvent = {
-    type: string;
-};
 export type GetStateMachineNextSnapshotOptions = {
     machineConfig: MachineConfig<any, any>;
     context: any;
     currentState: string;
     event: StateMachineEvent;
 };
+export type DefaultStateMachineSnapshot = MachineSnapshot<MachineContext, EventObject, Record<string, AnyActorRef | undefined>, StateValue, string, unknown, MetaObject>;
+export type TryGetStateMachineNextSnapshotResult = TryGetStateMachineNextSnapshotPositiveResult | TryGetStateMachineNextSnapshotNegativeResult;
+export type TryGetStateMachineNextSnapshotPositiveResult = {
+    canTransfer: true;
+    nextSnapshot: DefaultStateMachineSnapshot;
+};
+export type TryGetStateMachineNextSnapshotNegativeResult = {
+    canTransfer: false;
+};

package/dist/plugins/stateMachine/StateMachineService.d.ts

@@ -1,3 +1,4 @@
 import { IRpdServer } from "../../core/server";
-import { GetStateMachineNextSnapshotOptions } from "./StateMachinePluginTypes";
+import { GetStateMachineNextSnapshotOptions, TryGetStateMachineNextSnapshotResult } from "./StateMachinePluginTypes";
 export declare function getStateMachineNextSnapshot(server: IRpdServer, options: GetStateMachineNextSnapshotOptions): Promise<import("xstate").MachineSnapshot<any, import("xstate").AnyEventObject, Record<string, import("xstate").AnyActorRef>, import("xstate").StateValue, string, unknown, import("xstate").MetaObject, never>>;
+export declare function tryGetStateMachineNextSnapshot(server: IRpdServer, options: GetStateMachineNextSnapshotOptions): Promise<TryGetStateMachineNextSnapshotResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/entityManager.ts

@@ -491,7 +491,7 @@ async function createEntity(
   }
 
   const newRow = await dataAccessor.create(row);
-  const newEntity = mapDbRowToEntity(model, newRow, false);
+  const newEntity = mapDbRowToEntity(model, newRow, true);
 
   // save many-relation properties
   for (const property of manyRelationPropertiesToCreate) {

package/src/plugins/dataManage/actionHandlers/updateCollectionEntityById.ts

@@ -16,13 +16,17 @@ export async function handler(
   const mergedInput = mergeInput(defaultInput, input, fixedInput);
   logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
-
   const operation = mergedInput.$operation;
   if (operation) {
     delete mergedInput.$operation;
   }
 
+  const stateProperty = mergedInput.$stateProperty;
+  if (stateProperty) {
+    delete mergedInput.$stateProperty;
+  }
+
   const entityManager = server.getEntityManager(options.singularCode);
-  const output = await entityManager.updateEntityById({ id: mergedInput.id, entityToSave: mergedInput, operation }, plugin);
+  const output = await entityManager.updateEntityById({ id: mergedInput.id, entityToSave: mergedInput, operation, stateProperty }, plugin);
   ctx.output = output;
 }

package/src/plugins/stateMachine/StateMachinePluginTypes.ts

@@ -1,4 +1,4 @@
-import { MachineConfig } from "xstate";
+import { AnyActorRef, AnyEventObject, EventObject, MachineConfig, MachineContext, MachineSnapshot, MetaObject, StateValue } from "xstate";
 
 
 export type PropertyStateMachineConfig = {
@@ -11,6 +11,8 @@ export type SendStateMachineEventOptions = {
   code: string;
 }
 
+export type StateMachineEvent = AnyEventObject;
+
 export type SendStateMachineEventInput = {
   code?: string;
   context: any;
@@ -18,13 +20,22 @@ export type SendStateMachineEventInput = {
   event: StateMachineEvent;
 }
 
-export type StateMachineEvent = {
-  type: string;
-}
-
 export type GetStateMachineNextSnapshotOptions = {
   machineConfig: MachineConfig<any, any>;
   context: any;
   currentState: string;
   event: StateMachineEvent;
+}
+
+export type DefaultStateMachineSnapshot = MachineSnapshot<MachineContext, EventObject, Record<string, AnyActorRef | undefined>, StateValue, string, unknown, MetaObject>;
+
+export type TryGetStateMachineNextSnapshotResult = TryGetStateMachineNextSnapshotPositiveResult | TryGetStateMachineNextSnapshotNegativeResult;
+
+export type TryGetStateMachineNextSnapshotPositiveResult = {
+  canTransfer: true;
+  nextSnapshot: DefaultStateMachineSnapshot;
+}
+
+export type TryGetStateMachineNextSnapshotNegativeResult = {
+  canTransfer: false;
 }

package/src/plugins/stateMachine/StateMachineService.ts

@@ -1,9 +1,8 @@
 import { IRpdServer } from "~/core/server";
-import { GetStateMachineNextSnapshotOptions } from "./StateMachinePluginTypes";
+import { DefaultStateMachineSnapshot, GetStateMachineNextSnapshotOptions, TryGetStateMachineNextSnapshotResult } from "./StateMachinePluginTypes";
 import { createMachine, getInitialSnapshot, getNextSnapshot } from "xstate";
 
 export async function getStateMachineNextSnapshot(server: IRpdServer, options: GetStateMachineNextSnapshotOptions) {
-  debugger
   const { machineConfig, currentState, event } = options;
   machineConfig.initial = currentState;
 
@@ -17,3 +16,22 @@ export async function getStateMachineNextSnapshot(server: IRpdServer, options: G
   const nextSnapshot = getNextSnapshot(machine, snapshot, event);
   return nextSnapshot;
 }
+
+export async function tryGetStateMachineNextSnapshot(server: IRpdServer, options: GetStateMachineNextSnapshotOptions): Promise<TryGetStateMachineNextSnapshotResult> {
+  const { machineConfig, currentState, event } = options;
+  machineConfig.initial = currentState;
+
+  const machine = createMachine(machineConfig);
+  const snapshot = getInitialSnapshot(machine);
+
+  const canTransfer = snapshot.can(event);
+  let nextSnapshot: DefaultStateMachineSnapshot;
+  if (canTransfer) {
+    nextSnapshot = getNextSnapshot(machine, snapshot, event);
+  }
+
+  return {
+    canTransfer,
+    nextSnapshot,
+  };
+}