prostgles-client 4.0.359 → 4.0.360

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,15 +3,17 @@ import type { getSubscriptionHandler } from "./getSubscriptionHandler";
3
3
  import type { getSyncHandler } from "./getSyncHandler";
4
4
  import { type DBHandlerClient, type InitOptions } from "./prostgles";
5
5
  import { type SyncedTable } from "./SyncedTable/SyncedTable";
6
+ import type { getSyncHandlerV2 } from "./getSyncHandlerV2";
6
7
  type Args = {
7
8
  tableSchema: DBSchemaTable[] | undefined;
8
9
  onDebug: InitOptions["onDebug"];
9
10
  socket: InitOptions["socket"];
10
11
  syncedTable: typeof SyncedTable | undefined;
11
12
  syncHandler: ReturnType<typeof getSyncHandler>;
13
+ syncHandlerV2: ReturnType<typeof getSyncHandlerV2>;
12
14
  subscriptionHandler: ReturnType<typeof getSubscriptionHandler>;
13
15
  };
14
- export declare const getDB: <DBSchema = void>({ tableSchema, onDebug, syncedTable, syncHandler, subscriptionHandler, socket, }: Args) => {
16
+ export declare const getDB: <DBSchema = void>({ tableSchema, onDebug, syncedTable, syncHandler, syncHandlerV2, subscriptionHandler, socket, }: Args) => {
15
17
  db: Partial<DBHandlerClient<DBSchema>>;
16
18
  };
17
19
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAKnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAKL,KAAK,WAAW,EAIjB,MAAM,2BAA2B,CAAC;AAEnC,KAAK,IAAI,GAAG;IACV,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAO,WAAW,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IAC/C,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,GAAI,QAAQ,GAAG,IAAI,EAAE,kFAOpC,IAAI;QAgNc,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;CACtD,CAAC"}
1
+ {"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAKnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAKL,KAAK,WAAW,EAIjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,KAAK,IAAI,GAAG;IACV,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAO,WAAW,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IAC/C,aAAa,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;IACnD,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,GAAI,QAAQ,GAAG,IAAI,EAAE,iGAQpC,IAAI;QAyNc,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;CACtD,CAAC"}
@@ -7,7 +7,7 @@ const useSubscribe_1 = require("./hooks/useSubscribe");
7
7
  const useSync_1 = require("./hooks/useSync");
8
8
  const SyncedTable_1 = require("./SyncedTable/SyncedTable");
9
9
  const preffix = prostgles_types_1.CHANNELS._preffix;
10
- const getDB = ({ tableSchema, onDebug, syncedTable, syncHandler, subscriptionHandler, socket, }) => {
10
+ const getDB = ({ tableSchema, onDebug, syncedTable, syncHandler, syncHandlerV2, subscriptionHandler, socket, }) => {
11
11
  var _a;
12
12
  /* Building DB object */
13
13
  const checkSubscriptionArgs = (basicFilter, options, onChange, onError) => {
@@ -60,8 +60,9 @@ const getDB = ({ tableSchema, onDebug, syncedTable, syncHandler, subscriptionHan
60
60
  data: { basicFilter, options },
61
61
  }));
62
62
  checkSubscriptionArgs(basicFilter, options, onChange, onError);
63
- const syncedTable = await upsertSyncTable(basicFilter, options, onError);
64
- return await syncedTable.syncOne(basicFilter, onChange, options.handlesOnData);
63
+ // const syncedTable = await upsertSyncTable(basicFilter, options, onError);
64
+ // return await syncedTable.syncOne(basicFilter, onChange as any, options.handlesOnData);
65
+ return (await syncHandlerV2.getTableSyncFunctions({ db, tableName, columns })).addSyncOne(basicFilter, options, onChange, onError);
65
66
  });
66
67
  const sync = (async (basicFilter, options = { handlesOnData: true }, onChange, onError) => {
67
68
  await (onDebug === null || onDebug === void 0 ? void 0 : onDebug({
@@ -71,8 +72,9 @@ const getDB = ({ tableSchema, onDebug, syncedTable, syncHandler, subscriptionHan
71
72
  data: { basicFilter, options },
72
73
  }));
73
74
  checkSubscriptionArgs(basicFilter, options, onChange, onError);
74
- const s = await upsertSyncTable(basicFilter, options, onError);
75
- return await s.sync(onChange, options.handlesOnData);
75
+ // const syncedTable = await upsertSyncTable(basicFilter, options, onError);
76
+ // return await syncedTable.sync(onChange as any, options.handlesOnData);
77
+ return (await syncHandlerV2.getTableSyncFunctions({ db, tableName, columns })).addSync(basicFilter, options, onChange, onError);
76
78
  });
77
79
  dboTable.sync = sync;
78
80
  dboTable.syncOne = syncOne;
@@ -90,7 +92,7 @@ const getDB = ({ tableSchema, onDebug, syncedTable, syncHandler, subscriptionHan
90
92
  tableName,
91
93
  data: { filter, select, syncHandles },
92
94
  }));
93
- return syncHandler.addSync({ tableName, command, filter, select }, syncHandles);
95
+ return syncHandler.addSync({ tableName, command, param1: filter, param2: select }, syncHandles);
94
96
  };
95
97
  }
96
98
  else if (subscribeCommands.includes(command)) {
@@ -1 +1 @@
1
- {"version":3,"file":"getSyncHandler.d.ts","sourceRoot":"","sources":["../lib/getSyncHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAe,WAAW,EAAY,UAAU,EAAE,MAAM,aAAa,CAAC;AAElF,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQ1E,eAAO,MAAM,cAAc,GAAI,qBAAqB,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;;;sBA4E1D,UAAU,YAAY,iBAAiB,KAAG,OAAO,CAAC,GAAG,CAAC;;CA4ItF,CAAC"}
1
+ {"version":3,"file":"getSyncHandler.d.ts","sourceRoot":"","sources":["../lib/getSyncHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAe,WAAW,EAAY,UAAU,EAAE,MAAM,aAAa,CAAC;AAElF,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQ1E,eAAO,MAAM,cAAc,GAAI,qBAAqB,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;;;sBA4E1D,UAAU,YAAY,iBAAiB,KAAG,OAAO,CAAC,GAAG,CAAC;;CAgJtF,CAAC"}
@@ -36,19 +36,19 @@ const getSyncHandler = ({ socket, onDebug }) => {
36
36
  }
37
37
  });
38
38
  }
39
- function addServerSync({ tableName, command, filter = {}, select }, onSyncRequest) {
39
+ function addServerSync({ tableName, command, param1 = {}, param2 }, onSyncRequest) {
40
40
  return new Promise((resolve, reject) => {
41
41
  socket.emit(prostgles_types_1.CHANNEL_PREFIX, {
42
42
  tableName,
43
43
  command,
44
- param1: filter,
45
- param2: select,
44
+ param1,
45
+ param2,
46
46
  }, (err, syncInfo) => {
47
47
  onDebug === null || onDebug === void 0 ? void 0 : onDebug({
48
48
  type: "table",
49
49
  command: "sync",
50
50
  tableName,
51
- data: { filter, select },
51
+ data: { param1, param2 },
52
52
  });
53
53
  if (err) {
54
54
  console.error(err);
@@ -68,7 +68,7 @@ const getSyncHandler = ({ socket, onDebug }) => {
68
68
  async function addSync(params, triggers) {
69
69
  return addSyncQueuer.run([params, triggers]);
70
70
  }
71
- async function _addSync({ tableName, command, filter, select }, clientSyncHandlers) {
71
+ async function _addSync({ tableName, command, param1, param2 }, clientSyncHandlers) {
72
72
  const { onSyncRequest } = clientSyncHandlers;
73
73
  function makeHandler(channelName) {
74
74
  const unsync = function () {
@@ -88,7 +88,9 @@ const getSyncHandler = ({ socket, onDebug }) => {
88
88
  return Object.freeze({ unsync, syncData });
89
89
  }
90
90
  const matchingSync = Array.from(syncs.entries()).find(([ch, s]) => {
91
- return s.tableName === tableName && (0, prostgles_types_1.isEqual)(s.filter, filter) && (0, prostgles_types_1.isEqual)(s.select, select);
91
+ return (s.tableName === tableName &&
92
+ (0, prostgles_types_1.isEqual)(s.param1, param1) &&
93
+ (0, prostgles_types_1.isEqual)(s.param2.select, param2.select));
92
94
  });
93
95
  if (matchingSync) {
94
96
  const [existingChannel, existingSync] = matchingSync;
@@ -96,7 +98,7 @@ const getSyncHandler = ({ socket, onDebug }) => {
96
98
  return makeHandler(existingChannel);
97
99
  }
98
100
  else {
99
- const sync_info = await addServerSync({ tableName, command, filter, select }, onSyncRequest);
101
+ const sync_info = await addServerSync({ tableName, command, param1, param2 }, onSyncRequest);
100
102
  const { channelName } = sync_info;
101
103
  const onCall = function (data, cb) {
102
104
  /*
@@ -158,8 +160,8 @@ const getSyncHandler = ({ socket, onDebug }) => {
158
160
  syncs.set(channelName, {
159
161
  tableName,
160
162
  command,
161
- filter,
162
- select,
163
+ param1,
164
+ param2,
163
165
  clientSyncHandles: [clientSyncHandlers],
164
166
  syncInfo: sync_info,
165
167
  onCall,
@@ -1,9 +1,9 @@
1
- import { type AnyObject, type DBHandler, type ValidatedColumnInfo } from "prostgles-types";
2
- import type { InitOptions } from "./prostgles";
1
+ import { type AnyObject, type ValidatedColumnInfo } from "prostgles-types";
2
+ import type { DBHandlerClient, InitOptions } from "./prostgles";
3
3
  import type { Sync, SyncOne } from "./SyncedTable/SyncedTable";
4
4
  export declare const getSyncHandlerV2: ({ socket, onDebug }: Pick<InitOptions, "socket" | "onDebug">) => {
5
5
  getTableSyncFunctions: ({ db, tableName, columns, }: {
6
- db: DBHandler;
6
+ db: Partial<DBHandlerClient>;
7
7
  tableName: string;
8
8
  columns: ValidatedColumnInfo[];
9
9
  }) => Promise<{
@@ -1 +1 @@
1
- {"version":3,"file":"getSyncHandlerV2.d.ts","sourceRoot":"","sources":["../lib/getSyncHandlerV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,SAAS,EAGd,KAAK,mBAAmB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAmB,WAAW,EAAE,MAAM,aAAa,CAAC;AAEhE,OAAO,KAAK,EAAwB,IAAI,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAErF,eAAO,MAAM,gBAAgB,GAAI,qBAAqB,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;yDA8CxF;QACD,EAAE,EAAE,SAAS,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,mBAAmB,EAAE,CAAC;KAChC;;;;CAiBF,CAAC"}
1
+ {"version":3,"file":"getSyncHandlerV2.d.ts","sourceRoot":"","sources":["../lib/getSyncHandlerV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EAId,KAAK,mBAAmB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEhE,OAAO,KAAK,EAAwB,IAAI,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAErF,eAAO,MAAM,gBAAgB,GAAI,qBAAqB,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;yDA8CxF;QACD,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,mBAAmB,EAAE,CAAC;KAChC;;;;CAiBF,CAAC"}