@dnax/core 0.69.10 → 0.69.13

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 +51 -22
  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;
@@ -253,6 +254,13 @@ class useRest {
253
254
  };
254
255
  }
255
256
 
257
+ /**
258
+ * Check if the session is active
259
+ * @returns boolean
260
+ */
261
+ hasSession() {
262
+ return this.#session ? true : false;
263
+ }
256
264
  async aggregate(
257
265
  collection: string,
258
266
  pipeline: Array<object>,
@@ -407,6 +415,8 @@ class useRest {
407
415
  action: "insertOne",
408
416
  session: sessionStorage(),
409
417
  rest: new useRest({
418
+ useCustomApi: false,
419
+ session: this.#session,
410
420
  useHook: false,
411
421
  tenant_id: this.#tenant_id,
412
422
  }),
@@ -424,6 +434,8 @@ class useRest {
424
434
  action: "insertOne",
425
435
  session: sessionStorage(),
426
436
  rest: new useRest({
437
+ useCustomApi: false,
438
+ session: this.#session,
427
439
  useHook: false,
428
440
  tenant_id: this.#tenant_id,
429
441
  }),
@@ -437,6 +449,7 @@ class useRest {
437
449
  session: sessionStorage(),
438
450
  data: toJson(data),
439
451
  rest: new useRest({
452
+ session: this.#session,
440
453
  useHook: false,
441
454
  tenant_id: this.#tenant_id,
442
455
  useCustomApi: false,
@@ -487,23 +500,14 @@ class useRest {
487
500
  action: "insertOne",
488
501
  session: sessionStorage(),
489
502
  rest: new useRest({
503
+ useCustomApi: false,
504
+ session: this.#session,
490
505
  useHook: false,
491
506
  tenant_id: this.#tenant_id,
492
507
  }),
493
508
  });
494
509
  }
495
510
 
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
511
  // if action done
508
512
  restActivity.save(this.#tenant, {
509
513
  collection: collection,
@@ -533,7 +537,7 @@ class useRest {
533
537
  options?: Omit<optionCb, "withMeta" | "elementAt"> & {
534
538
  disableReadOnlyFields?: string[];
535
539
  }
536
- ) {
540
+ ): Promise<object[]> {
537
541
  return new Promise(async (resolve, reject) => {
538
542
  try {
539
543
  let sharedData = {};
@@ -558,6 +562,7 @@ class useRest {
558
562
  rest: new useRest({
559
563
  useHook: false,
560
564
  tenant_id: this.#tenant_id,
565
+ session: this.#session,
561
566
  }),
562
567
  });
563
568
  }
@@ -575,6 +580,8 @@ class useRest {
575
580
  rest: new useRest({
576
581
  useHook: false,
577
582
  tenant_id: this.#tenant_id,
583
+ session: this.#session,
584
+ useCustomApi: false,
578
585
  }),
579
586
  });
580
587
  }
@@ -589,6 +596,7 @@ class useRest {
589
596
  useHook: false,
590
597
  tenant_id: this.#tenant_id,
591
598
  useCustomApi: false,
599
+ session: this.#session,
592
600
  }),
593
601
  });
594
602
  return resolve(result);
@@ -635,21 +643,14 @@ class useRest {
635
643
  result: toJson(data),
636
644
  session: sessionStorage(),
637
645
  rest: new useRest({
646
+ session: this.#session,
647
+ useCustomApi: false,
638
648
  useHook: false,
639
649
  tenant_id: this.#tenant_id,
640
650
  }),
641
651
  });
642
652
  }
643
653
 
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
654
  // if insertMany done
654
655
  restActivity.save(this.#tenant, {
655
656
  collection: collection,
@@ -1266,6 +1267,8 @@ class useRest {
1266
1267
 
1267
1268
  session: sessionStorage(),
1268
1269
  rest: new useRest({
1270
+ useCustomApi: false,
1271
+ session: this.#session,
1269
1272
  useHook: false,
1270
1273
  tenant_id: this.#tenant_id,
1271
1274
  }),
@@ -1284,6 +1287,8 @@ class useRest {
1284
1287
  update: update,
1285
1288
  session: sessionStorage(),
1286
1289
  rest: new useRest({
1290
+ useCustomApi: false,
1291
+ session: this.#session,
1287
1292
  useHook: false,
1288
1293
  tenant_id: this.#tenant_id,
1289
1294
  }),
@@ -1298,6 +1303,7 @@ class useRest {
1298
1303
  update: update,
1299
1304
  id: id,
1300
1305
  rest: new useRest({
1306
+ session: this.#session,
1301
1307
  useHook: false,
1302
1308
  tenant_id: this.#tenant_id,
1303
1309
  useCustomApi: false,
@@ -1386,6 +1392,8 @@ class useRest {
1386
1392
  session: sessionStorage(),
1387
1393
  result: toJson(result.doc),
1388
1394
  rest: new useRest({
1395
+ useCustomApi: false,
1396
+ session: this.#session,
1389
1397
  useHook: false,
1390
1398
  tenant_id: this.#tenant_id,
1391
1399
  }),
@@ -1699,6 +1707,8 @@ class useRest {
1699
1707
  update: update,
1700
1708
  session: sessionStorage(),
1701
1709
  rest: new useRest({
1710
+ session: this.#session,
1711
+ useCustomApi: false,
1702
1712
  useHook: false,
1703
1713
  tenant_id: this.#tenant_id,
1704
1714
  }),
@@ -1716,6 +1726,8 @@ class useRest {
1716
1726
  update: update,
1717
1727
  session: sessionStorage(),
1718
1728
  rest: new useRest({
1729
+ session: this.#session,
1730
+ useCustomApi: false,
1719
1731
  useHook: false,
1720
1732
  tenant_id: this.#tenant_id,
1721
1733
  }),
@@ -1730,6 +1742,7 @@ class useRest {
1730
1742
  update: update,
1731
1743
  ids: ids,
1732
1744
  rest: new useRest({
1745
+ session: this.#session,
1733
1746
  useHook: false,
1734
1747
  tenant_id: this.#tenant_id,
1735
1748
  useCustomApi: false,
@@ -1820,6 +1833,8 @@ class useRest {
1820
1833
  result: toJson(result.docs),
1821
1834
  io: Cfg.io,
1822
1835
  rest: new useRest({
1836
+ session: this.#session,
1837
+ useCustomApi: false,
1823
1838
  useHook: false,
1824
1839
  tenant_id: this.#tenant_id,
1825
1840
  }),
@@ -1885,6 +1900,8 @@ class useRest {
1885
1900
  action: "deleteOne",
1886
1901
  session: sessionStorage(),
1887
1902
  rest: new useRest({
1903
+ session: this.#session,
1904
+ useCustomApi: false,
1888
1905
  useHook: false,
1889
1906
  tenant_id: this.#tenant_id,
1890
1907
  }),
@@ -1901,6 +1918,8 @@ class useRest {
1901
1918
  action: "deleteOne",
1902
1919
  session: sessionStorage(),
1903
1920
  rest: new useRest({
1921
+ session: this.#session,
1922
+ useCustomApi: false,
1904
1923
  useHook: false,
1905
1924
  tenant_id: this.#tenant_id,
1906
1925
  }),
@@ -1914,6 +1933,7 @@ class useRest {
1914
1933
  session: sessionStorage(),
1915
1934
  id: id,
1916
1935
  rest: new useRest({
1936
+ session: this.#session,
1917
1937
  useHook: false,
1918
1938
  tenant_id: this.#tenant_id,
1919
1939
  useCustomApi: false,
@@ -1949,6 +1969,8 @@ class useRest {
1949
1969
  io: Cfg.io,
1950
1970
  session: sessionStorage(),
1951
1971
  rest: new useRest({
1972
+ session: this.#session,
1973
+ useCustomApi: false,
1952
1974
  useHook: false,
1953
1975
  tenant_id: this.#tenant_id,
1954
1976
  }),
@@ -2014,6 +2036,8 @@ class useRest {
2014
2036
  action: "deleteMany",
2015
2037
  session: sessionStorage(),
2016
2038
  rest: new useRest({
2039
+ session: this.#session,
2040
+ useCustomApi: false,
2017
2041
  useHook: false,
2018
2042
  tenant_id: this.#tenant_id,
2019
2043
  }),
@@ -2030,6 +2054,8 @@ class useRest {
2030
2054
  action: "deleteMany",
2031
2055
  session: sessionStorage(),
2032
2056
  rest: new useRest({
2057
+ session: this.#session,
2058
+ useCustomApi: false,
2033
2059
  useHook: false,
2034
2060
  tenant_id: this.#tenant_id,
2035
2061
  }),
@@ -2043,6 +2069,7 @@ class useRest {
2043
2069
  session: sessionStorage(),
2044
2070
  ids: ids,
2045
2071
  rest: new useRest({
2072
+ session: this.#session,
2046
2073
  useHook: false,
2047
2074
  tenant_id: this.#tenant_id,
2048
2075
  useCustomApi: false,
@@ -2081,6 +2108,8 @@ class useRest {
2081
2108
  result: deletedIds,
2082
2109
  session: sessionStorage(),
2083
2110
  rest: new useRest({
2111
+ session: this.#session,
2112
+ useCustomApi: false,
2084
2113
  useHook: false,
2085
2114
  tenant_id: this.#tenant_id,
2086
2115
  }),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dnax/core",
3
- "version": "0.69.10",
3
+ "version": "0.69.13",
4
4
  "module": "index.ts",
5
5
  "type": "module",
6
6
  "bin": {},
package/types/index.ts CHANGED
@@ -311,7 +311,7 @@ export type Collection = {
311
311
  customApi?: {
312
312
  aggregate?: (ctx: ctxApi) => Array<object> | null | undefined | typeof fn.error;
313
313
  insertOne?: (ctx: ctxApi) => object | null | undefined | typeof fn.error;
314
- insertMany?: (ctx: ctxApi) => Array<object> | null | undefined | typeof fn.error;
314
+ insertMany?: (ctx: ctxApi) => Array<any> | null | undefined | typeof fn.error;
315
315
  updateOne?: (ctx: ctxApi) => object | null | undefined | typeof fn.error;
316
316
  updateMany?: (ctx: ctxApi) => object | null | undefined | typeof fn.error;
317
317
  deleteOne?: (ctx: ctxApi) => object | null | undefined | typeof fn.error;