fix(context): merge request option issue

Co-authored-by: Mohammad Honarvar <honarvar.info@gmail.com> Co-authored-by: S. Amir Mohammad Najafi <njfamirm@gmail.com>
Alwatr · Mar 19, 2023 · e24e695 · e24e695
1 parent 5a6106d
commit e24e695
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/context/src/core.ts b/core/context/src/core.ts
@@ -121,7 +121,9 @@ finiteStateMachineProvider.defineActions<ServerContextFsm>(serverContextFsmConst
 
     try {
       const {response, options} = fsm.getContext();
-      if (options == null) return logger.error('action_request', 'invalid_fetch_options', {id: fsm.id});
+      if (options == null || options.url == null) {
+        return logger.error('action_request', 'invalid_fetch_options', {id: fsm.id, options});
+      }
       const newResponse = await serviceRequest<NonNullable<ServerContextFsmContext['response']>>(
         options as StringifyableFetchOptions,
       );
@@ -170,6 +172,7 @@ export const setOptions = (
   // prettier-ignore
   fsm.setContext({
     options: merge === false ? options : {
+      ...oldOptions,
       ...options,
       queryParameters: {
         ...oldOptions?.queryParameters,