@dnax/core 0.69.9 → 0.69.12

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.
Files changed (3) hide show
  1. package/driver/mongo/rest.ts +47 -25
  2. package/package.json +1 -1
  3. package/types/index.ts +1 -1
package/driver/mongo/rest.ts CHANGED
@@ -47,6 +47,7 @@ type options = {
47
47
  c?: Context;
48
48
  useHook?: boolean;
49
49
  useCustomApi?: boolean;
50
+ session?: ClientSession | undefined | null;
50
51
  };
51
52
 
52
53
  type optionCb = {
@@ -130,7 +131,7 @@ class useRest {
130
131
  this.#c = options?.c;
131
132
  this.#useCustomApi = options.useCustomApi ?? true;
132
133
  this.#tenant_id = options.tenant_id;
133
- this.#session = null;
134
+ this.#session = options.session ?? null;
134
135
  this.#tenant = getTenant(this.#tenant_id);
135
136
  this.#useHook = options?.useHook ?? true;
136
137
  this.db = this.#tenant.database.db;
@@ -407,6 +408,8 @@ class useRest {
407
408
  action: "insertOne",
408
409
  session: sessionStorage(),
409
410
  rest: new useRest({
411
+ useCustomApi: false,
412
+ session: this.#session,
410
413
  useHook: false,
411
414
  tenant_id: this.#tenant_id,
412
415
  }),
@@ -424,6 +427,8 @@ class useRest {
424
427
  action: "insertOne",
425
428
  session: sessionStorage(),
426
429
  rest: new useRest({
430
+ useCustomApi: false,
431
+ session: this.#session,
427
432
  useHook: false,
428
433
  tenant_id: this.#tenant_id,
429
434
  }),
@@ -437,6 +442,7 @@ class useRest {
437
442
  session: sessionStorage(),
438
443
  data: toJson(data),
439
444
  rest: new useRest({
445
+ session: this.#session,
440
446
  useHook: false,
441
447
  tenant_id: this.#tenant_id,
442
448
  useCustomApi: false,
@@ -487,23 +493,14 @@ class useRest {
487
493
  action: "insertOne",
488
494
  session: sessionStorage(),
489
495
  rest: new useRest({
496
+ useCustomApi: false,
497
+ session: this.#session,
490
498
  useHook: false,
491
499
  tenant_id: this.#tenant_id,
492
500
  }),
493
501
  });
494
502
  }
495
503
 
496
- // meilisearch engine
497
- if (
498
- this.#tenant?.searchEngine?.meilisearch?.enabled &&
499
- col?.searchEngine?.meilisearch?.dispatchAction == "auto"
500
- ) {
501
- this.meilisearch.client
502
- .index(col?.searchEngine?.meilisearch?.index)
503
- .addDocuments([toJson(data)])
504
- .catch();
505
- }
506
-
507
504
  // if action done
508
505
  restActivity.save(this.#tenant, {
509
506
  collection: collection,
@@ -533,7 +530,7 @@ class useRest {
533
530
  options?: Omit<optionCb, "withMeta" | "elementAt"> & {
534
531
  disableReadOnlyFields?: string[];
535
532
  }
536
- ) {
533
+ ): Promise<object[]> {
537
534
  return new Promise(async (resolve, reject) => {
538
535
  try {
539
536
  let sharedData = {};
@@ -558,6 +555,7 @@ class useRest {
558
555
  rest: new useRest({
559
556
  useHook: false,
560
557
  tenant_id: this.#tenant_id,
558
+ session: this.#session,
561
559
  }),
562
560
  });
563
561
  }
@@ -575,6 +573,8 @@ class useRest {
575
573
  rest: new useRest({
576
574
  useHook: false,
577
575
  tenant_id: this.#tenant_id,
576
+ session: this.#session,
577
+ useCustomApi: false,
578
578
  }),
579
579
  });
580
580
  }
@@ -589,6 +589,7 @@ class useRest {
589
589
  useHook: false,
590
590
  tenant_id: this.#tenant_id,
591
591
  useCustomApi: false,
592
+ session: this.#session,
592
593
  }),
593
594
  });
594
595
  return resolve(result);
@@ -635,21 +636,14 @@ class useRest {
635
636
  result: toJson(data),
636
637
  session: sessionStorage(),
637
638
  rest: new useRest({
639
+ session: this.#session,
640
+ useCustomApi: false,
638
641
  useHook: false,
639
642
  tenant_id: this.#tenant_id,
640
643
  }),
641
644
  });
642
645
  }
643
646
 
644
- if (
645
- this.#tenant?.searchEngine?.meilisearch?.enabled &&
646
- col?.searchEngine?.meilisearch?.dispatchAction == "auto"
647
- ) {
648
- this.meilisearch.client
649
- .index(col?.searchEngine?.meilisearch?.index)
650
- .addDocuments(toJson(data))
651
- .catch();
652
- }
653
647
  // if insertMany done
654
648
  restActivity.save(this.#tenant, {
655
649
  collection: collection,
@@ -836,7 +830,7 @@ class useRest {
836
830
  return new Promise(async (resolve, reject) => {
837
831
  try {
838
832
  let meta = {
839
- ts: 0, // time duration
833
+ ms: 0, // time duration
840
834
  };
841
835
  let start = Date.now();
842
836
 
@@ -899,7 +893,7 @@ class useRest {
899
893
  }),
900
894
  })) as any;
901
895
  // Temp dexecution en ms
902
- meta.ts = Date.now() - start;
896
+ meta.ms = Date.now() - start;
903
897
  return resolve({
904
898
  meta: meta,
905
899
  data: result,
@@ -915,7 +909,7 @@ class useRest {
915
909
  .toArray()) || [];
916
910
 
917
911
  result.docs = toJson(result.docs);
918
- meta.ts = Date.now() - start;
912
+ meta.ms = Date.now() - start;
919
913
  if (col?.hooks?.afterFindWithMeta && useHook) {
920
914
  await col.hooks.afterFindWithMeta({
921
915
  sharedData: sharedData,
@@ -1266,6 +1260,8 @@ class useRest {
1266
1260
 
1267
1261
  session: sessionStorage(),
1268
1262
  rest: new useRest({
1263
+ useCustomApi: false,
1264
+ session: this.#session,
1269
1265
  useHook: false,
1270
1266
  tenant_id: this.#tenant_id,
1271
1267
  }),
@@ -1284,6 +1280,8 @@ class useRest {
1284
1280
  update: update,
1285
1281
  session: sessionStorage(),
1286
1282
  rest: new useRest({
1283
+ useCustomApi: false,
1284
+ session: this.#session,
1287
1285
  useHook: false,
1288
1286
  tenant_id: this.#tenant_id,
1289
1287
  }),
@@ -1298,6 +1296,7 @@ class useRest {
1298
1296
  update: update,
1299
1297
  id: id,
1300
1298
  rest: new useRest({
1299
+ session: this.#session,
1301
1300
  useHook: false,
1302
1301
  tenant_id: this.#tenant_id,
1303
1302
  useCustomApi: false,
@@ -1386,6 +1385,8 @@ class useRest {
1386
1385
  session: sessionStorage(),
1387
1386
  result: toJson(result.doc),
1388
1387
  rest: new useRest({
1388
+ useCustomApi: false,
1389
+ session: this.#session,
1389
1390
  useHook: false,
1390
1391
  tenant_id: this.#tenant_id,
1391
1392
  }),
@@ -1699,6 +1700,8 @@ class useRest {
1699
1700
  update: update,
1700
1701
  session: sessionStorage(),
1701
1702
  rest: new useRest({
1703
+ session: this.#session,
1704
+ useCustomApi: false,
1702
1705
  useHook: false,
1703
1706
  tenant_id: this.#tenant_id,
1704
1707
  }),
@@ -1716,6 +1719,8 @@ class useRest {
1716
1719
  update: update,
1717
1720
  session: sessionStorage(),
1718
1721
  rest: new useRest({
1722
+ session: this.#session,
1723
+ useCustomApi: false,
1719
1724
  useHook: false,
1720
1725
  tenant_id: this.#tenant_id,
1721
1726
  }),
@@ -1730,6 +1735,7 @@ class useRest {
1730
1735
  update: update,
1731
1736
  ids: ids,
1732
1737
  rest: new useRest({
1738
+ session: this.#session,
1733
1739
  useHook: false,
1734
1740
  tenant_id: this.#tenant_id,
1735
1741
  useCustomApi: false,
@@ -1820,6 +1826,8 @@ class useRest {
1820
1826
  result: toJson(result.docs),
1821
1827
  io: Cfg.io,
1822
1828
  rest: new useRest({
1829
+ session: this.#session,
1830
+ useCustomApi: false,
1823
1831
  useHook: false,
1824
1832
  tenant_id: this.#tenant_id,
1825
1833
  }),
@@ -1885,6 +1893,8 @@ class useRest {
1885
1893
  action: "deleteOne",
1886
1894
  session: sessionStorage(),
1887
1895
  rest: new useRest({
1896
+ session: this.#session,
1897
+ useCustomApi: false,
1888
1898
  useHook: false,
1889
1899
  tenant_id: this.#tenant_id,
1890
1900
  }),
@@ -1901,6 +1911,8 @@ class useRest {
1901
1911
  action: "deleteOne",
1902
1912
  session: sessionStorage(),
1903
1913
  rest: new useRest({
1914
+ session: this.#session,
1915
+ useCustomApi: false,
1904
1916
  useHook: false,
1905
1917
  tenant_id: this.#tenant_id,
1906
1918
  }),
@@ -1914,6 +1926,7 @@ class useRest {
1914
1926
  session: sessionStorage(),
1915
1927
  id: id,
1916
1928
  rest: new useRest({
1929
+ session: this.#session,
1917
1930
  useHook: false,
1918
1931
  tenant_id: this.#tenant_id,
1919
1932
  useCustomApi: false,
@@ -1949,6 +1962,8 @@ class useRest {
1949
1962
  io: Cfg.io,
1950
1963
  session: sessionStorage(),
1951
1964
  rest: new useRest({
1965
+ session: this.#session,
1966
+ useCustomApi: false,
1952
1967
  useHook: false,
1953
1968
  tenant_id: this.#tenant_id,
1954
1969
  }),
@@ -2014,6 +2029,8 @@ class useRest {
2014
2029
  action: "deleteMany",
2015
2030
  session: sessionStorage(),
2016
2031
  rest: new useRest({
2032
+ session: this.#session,
2033
+ useCustomApi: false,
2017
2034
  useHook: false,
2018
2035
  tenant_id: this.#tenant_id,
2019
2036
  }),
@@ -2030,6 +2047,8 @@ class useRest {
2030
2047
  action: "deleteMany",
2031
2048
  session: sessionStorage(),
2032
2049
  rest: new useRest({
2050
+ session: this.#session,
2051
+ useCustomApi: false,
2033
2052
  useHook: false,
2034
2053
  tenant_id: this.#tenant_id,
2035
2054
  }),
@@ -2043,6 +2062,7 @@ class useRest {
2043
2062
  session: sessionStorage(),
2044
2063
  ids: ids,
2045
2064
  rest: new useRest({
2065
+ session: this.#session,
2046
2066
  useHook: false,
2047
2067
  tenant_id: this.#tenant_id,
2048
2068
  useCustomApi: false,
@@ -2081,6 +2101,8 @@ class useRest {
2081
2101
  result: deletedIds,
2082
2102
  session: sessionStorage(),
2083
2103
  rest: new useRest({
2104
+ session: this.#session,
2105
+ useCustomApi: false,
2084
2106
  useHook: false,
2085
2107
  tenant_id: this.#tenant_id,
2086
2108
  }),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dnax/core",
3
- "version": "0.69.9",
3
+ "version": "0.69.12",
4
4
  "module": "index.ts",
5
5
  "type": "module",
6
6
  "bin": {},
package/types/index.ts CHANGED
@@ -237,7 +237,7 @@ export type hooksCtx = (ctx: {
237
237
  sharedData?: any;
238
238
  action?: Actions;
239
239
  c?: Context;
240
- meta?: { ts:number; [key: string]: any };
240
+ meta?: { ms:number; [key: string]: any };
241
241
  rest: InstanceType<typeof useRest>;
242
242
  session?: sessionCtx;
243
243
  io: socketIoType;