@civet/core 1.3.1 → 1.4.1

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/lib/DataProvider.js +5 -4
  2. package/package.json +1 -1
  3. package/src/DataProvider.js +26 -15
package/lib/DataProvider.js CHANGED
@@ -76,7 +76,7 @@ var DataProvider = /*#__PURE__*/function () {
76
76
  }
77
77
  }, {
78
78
  key: "get",
79
- value: function get(resource, query, options, meta) {
79
+ value: function get(resource, query, options, meta, abortSignal) {
80
80
  var _this = this;
81
81
  return new Promise(function (resolve, reject) {
82
82
  return _this.continuousGet(resource, query, options, meta, function (error, done, result) {
@@ -85,7 +85,7 @@ var DataProvider = /*#__PURE__*/function () {
85
85
  return;
86
86
  }
87
87
  if (done) resolve(result);
88
- });
88
+ }, abortSignal);
89
89
  });
90
90
  }
91
91
  }, {
@@ -105,9 +105,10 @@ var DataProvider = /*#__PURE__*/function () {
105
105
  }
106
106
  if (error != null) callback(error, true, []);else if (result == null) callback(undefined, done, []);else if (Array.isArray(result)) callback(undefined, done, result);else callback(undefined, done, [result]);
107
107
  };
108
- resolve(Promise.resolve(_this2.handleGet(resource, query, options, getMeta(meta))).then(function (result) {
108
+ var proxy = signal.proxy();
109
+ resolve(Promise.resolve(_this2.handleGet(resource, query, options, getMeta(meta), proxy)).then(function (result) {
109
110
  if (typeof result === 'function') {
110
- result(cb, signal.proxy());
111
+ result(cb, proxy);
111
112
  } else {
112
113
  cb(undefined, true, result);
113
114
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@civet/core",
3
- "version": "1.3.1",
3
+ "version": "1.4.1",
4
4
  "description": "Civet",
5
5
  "main": "./lib/index.js",
6
6
  "exports": {
package/src/DataProvider.js CHANGED
@@ -56,15 +56,22 @@ class DataProvider {
56
56
  this.notifier.trigger(resource);
57
57
  }
58
58
 
59
- get(resource, query, options, meta) {
59
+ get(resource, query, options, meta, abortSignal) {
60
60
  return new Promise((resolve, reject) =>
61
- this.continuousGet(resource, query, options, meta, (error, done, result) => {
62
- if (error != null) {
63
- reject(error);
64
- return;
65
- }
66
- if (done) resolve(result);
67
- }),
61
+ this.continuousGet(
62
+ resource,
63
+ query,
64
+ options,
65
+ meta,
66
+ (error, done, result) => {
67
+ if (error != null) {
68
+ reject(error);
69
+ return;
70
+ }
71
+ if (done) resolve(result);
72
+ },
73
+ abortSignal,
74
+ ),
68
75
  );
69
76
  }
70
77
 
@@ -87,14 +94,18 @@ class DataProvider {
87
94
  else callback(undefined, done, [result]);
88
95
  };
89
96
 
97
+ const proxy = signal.proxy();
98
+
90
99
  resolve(
91
- Promise.resolve(this.handleGet(resource, query, options, getMeta(meta))).then((result) => {
92
- if (typeof result === 'function') {
93
- result(cb, signal.proxy());
94
- } else {
95
- cb(undefined, true, result);
96
- }
97
- }),
100
+ Promise.resolve(this.handleGet(resource, query, options, getMeta(meta), proxy)).then(
101
+ (result) => {
102
+ if (typeof result === 'function') {
103
+ result(cb, proxy);
104
+ } else {
105
+ cb(undefined, true, result);
106
+ }
107
+ },
108
+ ),
98
109
  );
99
110
  }).catch((e) => {
100
111
  if (!signal.locked) callback(e, true, []);