prostgles-client 4.0.223 → 4.0.225

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.
@@ -1 +1 @@
1
- {"version":3,"file":"react-hooks.d.ts","sourceRoot":"","sources":["../lib/react-hooks.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,mBAAmB,EAA8B,MAAM,iBAAiB,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACnE,KAAK,MAAM,GAAG,cAAc,OAAO,CAAC,CAAC;AASrC,eAAO,MAAM,QAAQ,gBAAiB,OAAO,KAAG,MAQ/C,CAAC;AAWF,eAAO,MAAM,KAAK,gEAOjB,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,GAAG,cAQ/C,CAAC;AAEF,eAAO,MAAM,WAAW,gCAGD,CAAC;AAExB,eAAO,MAAM,aAAa,kCAGD,CAAC;AAiB1B,KAAK,UAAU,GAAG,MAAM,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAY,UAAU,QAAQ,GAAG,EAAE,SA6ClE,CAAC;AACF,eAAO,MAAM,cAAc,WAAY,MAAM,QAAQ,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,GAAG,EAAE,SAsBvF,CAAC;AAEF,eAAO,MAAM,YAAY,qBAaxB,CAAC;AAEF,KAAK,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;AACtC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE/C,eAAO,MAAM,UAAU,qDAEf,GAAG,EAAE,wJA2DZ,CAAC;AAOF,eAAO,MAAM,YAAY,qBACL,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,KAAK,QAAQ,mBAAmB,CAAC,cACnF,OAAO,UACX,GAAG,WACF,GAAG,gBACE,WAAW;;;;CA0C1B,CAAC;AAEF,eAAO,MAAM,OAAO,aACR,SAAS,kBAAkB,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,kBAAkB,CAAC,CAAC,SAAS,CAAC,eAC3E,WAAW,SAAS,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,eACnD,WAAW,SAAS,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,gBAClD,WAAW;;;;CA4B1B,CAAC;AAEF,eAAO,MAAM,QAAQ,wBACE,GAAG,KAAK,QAAQ,GAAG,CAAC,SACnC,GAAG,EAAE,gBACG,WAAW;;;;CAmB1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,eAA0C,CAAC"}
1
+ {"version":3,"file":"react-hooks.d.ts","sourceRoot":"","sources":["../lib/react-hooks.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,mBAAmB,EAA8B,MAAM,iBAAiB,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACnE,KAAK,MAAM,GAAG,cAAc,OAAO,CAAC,CAAC;AASrC,eAAO,MAAM,QAAQ,gBAAiB,OAAO,KAAG,MAQ/C,CAAC;AAWF,eAAO,MAAM,KAAK,gEAOjB,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,GAAG,cAQ/C,CAAC;AAEF,eAAO,MAAM,WAAW,gCAGD,CAAC;AAExB,eAAO,MAAM,aAAa,kCAGD,CAAC;AAe1B,KAAK,UAAU,GAAG,MAAM,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAY,UAAU,QAAQ,GAAG,EAAE,SAkDlE,CAAC;AACF,eAAO,MAAM,cAAc,WAAY,MAAM,QAAQ,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,GAAG,EAAE,SAsBvF,CAAC;AAEF,eAAO,MAAM,YAAY,qBAaxB,CAAC;AAEF,KAAK,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;AACtC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE/C,eAAO,MAAM,UAAU,qDAEf,GAAG,EAAE,wJA2DZ,CAAC;AAOF,eAAO,MAAM,YAAY,qBACL,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,KAAK,QAAQ,mBAAmB,CAAC,cACnF,OAAO,UACX,GAAG,WACF,GAAG,gBACE,WAAW;;;;CA0C1B,CAAC;AAEF,eAAO,MAAM,OAAO,aACR,SAAS,kBAAkB,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,kBAAkB,CAAC,CAAC,SAAS,CAAC,eAC3E,WAAW,SAAS,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,eACnD,WAAW,SAAS,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,gBAClD,WAAW;;;;CA4B1B,CAAC;AAEF,eAAO,MAAM,QAAQ,wBACE,GAAG,KAAK,QAAQ,GAAG,CAAC,SACnC,GAAG,EAAE,gBACG,WAAW;;;;CAmB1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,eAA0C,CAAC"}
@@ -61,42 +61,46 @@ const useAsyncEffectQueue = (effect, deps) => {
61
61
  const queue = useRef({
62
62
  activeEffect: undefined,
63
63
  newEffect: undefined,
64
- history: [],
65
64
  });
66
- const onCleanup = async (effectFunc) => {
67
- var _a, _b, _c, _d, _e;
68
- /** New effect did not start. Just remove */
69
- if (((_a = queue.current.newEffect) === null || _a === void 0 ? void 0 : _a.effect) === effectFunc) {
70
- queue.current.newEffect = undefined;
71
- /** Very likely it's an unmount */
72
- }
73
- else if (((_b = queue.current.activeEffect) === null || _b === void 0 ? void 0 : _b.effect) === effectFunc) {
74
- queue.current.activeEffect.didCleanup = true;
75
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
76
- await ((_e = (_d = (_c = (await queue.current.activeEffect.resolvedCleanup)) === null || _c === void 0 ? void 0 : _c.run) === null || _d === void 0 ? void 0 : _d.call(_c)) === null || _e === void 0 ? void 0 : _e.catch(console.error));
77
- }
78
- };
65
+ // const onCleanup = async (effectFunc: EffectFunc) => {
66
+ // /** New effect did not start. Just remove */
67
+ // if (queue.current.newEffect?.effect === effectFunc) {
68
+ // queue.current.newEffect = undefined;
69
+ // /** Very likely it's an unmount */
70
+ // } else if (queue.current.activeEffect?.effect === effectFunc) {
71
+ // await (await queue.current.activeEffect.resolvingCleanup)?.run?.()?.catch(console.error);
72
+ // }
73
+ // };
79
74
  const onRender = async (newEffect) => {
80
75
  var _a, _b, _c, _d;
81
76
  queue.current.newEffect = newEffect;
82
- queue.current.history.push(newEffect);
83
77
  /**
84
- * Await and cleanup previous effect
85
- * Need to wait to ensure activeEffect cleanup finished
78
+ * Await and cleanup existing effect
86
79
  * */
87
- await ((_d = (_c = (_b = (await ((_a = queue.current.activeEffect) === null || _a === void 0 ? void 0 : _a.resolvedCleanup))) === null || _b === void 0 ? void 0 : _b.run) === null || _c === void 0 ? void 0 : _c.call(_b)) === null || _d === void 0 ? void 0 : _d.catch(console.error));
88
- queue.current.activeEffect = newEffect;
80
+ await ((_d = (_c = (_b = (await ((_a = queue.current.activeEffect) === null || _a === void 0 ? void 0 : _a.resolvingCleanup))) === null || _b === void 0 ? void 0 : _b.run) === null || _c === void 0 ? void 0 : _c.call(_b)) === null || _d === void 0 ? void 0 : _d.catch(console.error));
81
+ if (!newEffect)
82
+ return;
89
83
  queue.current.newEffect = undefined;
90
84
  /**
91
85
  * Execute the new effect
92
86
  */
93
- queue.current.activeEffect.resolvedCleanup = newEffect.effect().then((run) => ({ run }));
87
+ queue.current.activeEffect = newEffect;
88
+ queue.current.activeEffect.resolvingCleanup = newEffect.effect().then((run) => {
89
+ return {
90
+ /**
91
+ * Wrapped in a promise to ensure cleanup is awaited
92
+ */
93
+ run: async () => {
94
+ await (run === null || run === void 0 ? void 0 : run());
95
+ },
96
+ };
97
+ });
94
98
  };
95
99
  (0, exports.useEffectDeep)(() => {
96
- const newEffect = { effect, deps, didCleanup: false };
100
+ const newEffect = { effect, deps };
97
101
  onRender(newEffect);
98
102
  return () => {
99
- onCleanup(effect);
103
+ onRender(undefined);
100
104
  };
101
105
  }, deps);
102
106
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-client",
3
- "version": "4.0.223",
3
+ "version": "4.0.225",
4
4
  "description": "Reactive client for Postgres",
5
5
  "main": "dist/prostgles-full.js",
6
6
  "types": "dist/prostgles-full.d.ts",