From 6369fafcb03ff94256815b024096ccc1fc8b71d9 Mon Sep 17 00:00:00 2001
From: FreePhoenix888 <freephoenix888@gmail.com>
Date: Thu, 15 Feb 2024 13:51:29 +0600
Subject: [PATCH 1/2] ReExport createSerialOperation in clinet from gql

---
 imports/client.tsx | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/imports/client.tsx b/imports/client.tsx
index 57a63bef..da2f99a4 100644
--- a/imports/client.tsx
+++ b/imports/client.tsx
@@ -15,6 +15,8 @@ import { BoolExpCan, BoolExpHandler, QueryLink, BoolExpSelector, BoolExpTree, Bo
 import get from 'get-value';
 import {debug} from './debug.js'
 import { Traveler as NativeTraveler } from './traveler.js';
+export { createSerialOperation } from './gql/index.js';
+
 const moduleLog = debug.extend('client');
 
 const log = debug.extend('log');
@@ -804,9 +806,26 @@ export class DeepClient<L extends Link<number> = Link<number>> implements DeepCl
     return { ...q, data: (q)?.data?.m0?.returning };
   };
 
+<<<<<<< Updated upstream
   async serial({
     name, operations, returning, silent
   }: AsyncSerialParams): Promise<DeepClientResult<{ id: number }[]>> {
+=======
+  /**
+   * Performs write operations to the database in a serial manner
+   * @param options An object with data for the serial operation
+   * @returns A promise that resolves to the deleted object or an array of deleted objects with the fields configured by {@link options.returning} which is by default 'id'
+   * 
+   * @example
+   * ```
+   * 
+   * ```
+   */
+  async serial(options: AsyncSerialParams): Promise<DeepClientResult<{ id: number }[]>> {
+    const {
+      name, operations, returning, silent
+    } = options;
+>>>>>>> Stashed changes
     // @ts-ignore
     let operationsGroupedByTypeAndTable: Record<SerialOperationType, Record<Table, Array<SerialOperation>>> = {};
     operationsGroupedByTypeAndTable = operations.reduce((acc, operation) => {

From 1edf98ed6527c8650ddaa81fa401e5c2dcd18112 Mon Sep 17 00:00:00 2001
From: FreePhoenix888 <freephoenix888@gmail.com>
Date: Thu, 15 Feb 2024 13:52:53 +0600
Subject: [PATCH 2/2] Fix merge conflict

---
 imports/client.tsx | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/imports/client.tsx b/imports/client.tsx
index da2f99a4..d2a35154 100644
--- a/imports/client.tsx
+++ b/imports/client.tsx
@@ -806,26 +806,9 @@ export class DeepClient<L extends Link<number> = Link<number>> implements DeepCl
     return { ...q, data: (q)?.data?.m0?.returning };
   };
 
-<<<<<<< Updated upstream
   async serial({
     name, operations, returning, silent
   }: AsyncSerialParams): Promise<DeepClientResult<{ id: number }[]>> {
-=======
-  /**
-   * Performs write operations to the database in a serial manner
-   * @param options An object with data for the serial operation
-   * @returns A promise that resolves to the deleted object or an array of deleted objects with the fields configured by {@link options.returning} which is by default 'id'
-   * 
-   * @example
-   * ```
-   * 
-   * ```
-   */
-  async serial(options: AsyncSerialParams): Promise<DeepClientResult<{ id: number }[]>> {
-    const {
-      name, operations, returning, silent
-    } = options;
->>>>>>> Stashed changes
     // @ts-ignore
     let operationsGroupedByTypeAndTable: Record<SerialOperationType, Record<Table, Array<SerialOperation>>> = {};
     operationsGroupedByTypeAndTable = operations.reduce((acc, operation) => {