@bbn/bbn 1.0.340 → 1.0.342

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.
@@ -54,4 +54,4 @@
54
54
  *
55
55
  * @returns {Promise} The Promise created by the generated XHR.
56
56
  */
57
- export default function ajax(url: any, datatype?: any, data?: any, success?: any, failure?: any, abort?: any): any;
57
+ export default function ajax(...args: any[]): Promise<any>;
@@ -1,3 +1,39 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ var __generator = (this && this.__generator) || function (thisArg, body) {
11
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
12
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
13
+ function verb(n) { return function (v) { return step([n, v]); }; }
14
+ function step(op) {
15
+ if (f) throw new TypeError("Generator is already executing.");
16
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
18
+ if (y = 0, t) op = [op[0] & 2, t.value];
19
+ switch (op[0]) {
20
+ case 0: case 1: t = op; break;
21
+ case 4: _.label++; return { value: op[1], done: false };
22
+ case 5: _.label++; y = op[1]; op = [0]; continue;
23
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
24
+ default:
25
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
26
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
27
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
28
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
29
+ if (t[2]) _.ops.pop();
30
+ _.trys.pop(); continue;
31
+ }
32
+ op = body.call(thisArg, _);
33
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
34
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
35
+ }
36
+ };
1
37
  import isObject from '../type/isObject.js';
2
38
  import replaceAll from '../string/replaceAll.js';
3
39
  import getRequestId from './getRequestId.js';
@@ -63,110 +99,137 @@ import _addLoader from './_addLoader.js';
63
99
  *
64
100
  * @returns {Promise} The Promise created by the generated XHR.
65
101
  */
66
- export default function ajax(url, datatype, data, success, failure, abort) {
67
- if (datatype === void 0) { datatype = null; }
68
- if (data === void 0) { data = null; }
69
- if (success === void 0) { success = null; }
70
- if (failure === void 0) { failure = null; }
71
- if (abort === void 0) { abort = null; }
72
- if (arguments.length === 1 && url && typeof url === "object" && url.url) {
73
- if (url.abort) {
74
- abort = url.abort;
75
- }
76
- if (url.failure) {
77
- failure = url.failure;
78
- }
79
- if (url.success) {
80
- success = url.success;
81
- }
82
- if (url.data) {
83
- data = url.data;
84
- }
85
- if (url.datatype) {
86
- datatype = url.datatype;
87
- }
88
- url = url.url;
89
- }
90
- if (!url) {
91
- return;
102
+ export default function ajax() {
103
+ var args = [];
104
+ for (var _i = 0; _i < arguments.length; _i++) {
105
+ args[_i] = arguments[_i];
92
106
  }
93
- if (url && typeof url === "string") {
94
- if (url.indexOf("://") === -1) {
95
- // Prevent protocol mismatch by Axios
96
- url = replaceAll("//", "/", url);
97
- }
98
- if (!datatype) {
99
- datatype = "json";
100
- }
101
- var requestId_1 = getRequestId(url, data, datatype);
102
- var loaderObj = getLoader(requestId_1);
103
- if (loaderObj === null || loaderObj === void 0 ? void 0 : loaderObj.loader) {
104
- return loaderObj.loader;
105
- }
106
- if (bbn.env.token) {
107
- extend(data || {}, { _bbn_token: bbn.env.token });
108
- }
109
- var aborter = new AbortController();
110
- var options = {
111
- responseType: datatype,
112
- signal: aborter.signal
113
- };
114
- if (datatype === "text") {
115
- options['headers'] = {
116
- accept: "text/javascript",
117
- "Content-Type": "text/javascript",
118
- };
119
- }
120
- var args = [url];
121
- if (isObject(data) && numProperties(data) > 0) {
122
- args.push(data);
123
- }
124
- args.push(options);
125
- var axiosMethod = args.length === 2 ? "get" : "post";
126
- var loader_1 = axios[axiosMethod]
127
- .apply(null, args)
128
- .then(function (res) {
129
- _deleteLoader(requestId_1, res);
130
- bbn.fn.defaultEndLoadingFunction(url, tst_1, data, res);
131
- switch (res.status) {
132
- case 200:
133
- if (isFunction(success)) {
134
- //bbn.fn.log(["THERE US A SUCCESS FUNCTION", res, loader]);
135
- success(res.data, res.headers);
136
- }
137
- break;
138
- default:
139
- //bbn.fn.log(["THIS IS THE DEFAULT FUNCTION", res, loader]);
140
- bbn.fn.defaultAjaxErrorFunction(loader_1, res);
141
- }
142
- return res;
143
- })
144
- .catch(function (err) {
145
- var isAbort = axios.isCancel(err);
146
- _deleteLoader(requestId_1, err.message || err.response.data, isAbort);
147
- bbn.fn.defaultEndLoadingFunction(url, tst_1, data, err);
148
- if (isAbort) {
149
- var ok = 1;
150
- if (isFunction(abort)) {
151
- ok = abort(err.message, url);
152
- }
153
- if (ok) {
154
- bbn.fn.defaultAjaxAbortFunction(err.message, url);
107
+ return __awaiter(this, void 0, void 0, function () {
108
+ var url, datatype, data, success, failure, abort, requestId_1, loaderObj, aborter, options, args_1, axiosMethod, loader_1, tst_1;
109
+ return __generator(this, function (_a) {
110
+ datatype = null;
111
+ data = null;
112
+ success = null;
113
+ failure = null;
114
+ abort = null;
115
+ if (args.length === 1 && args[0] && (typeof args[0] === "object") && args[0].url) {
116
+ url = args[0].url;
117
+ if (args[0].abort) {
118
+ abort = args[0].abort;
119
+ }
120
+ if (args[0].failure) {
121
+ failure = args[0].failure;
122
+ }
123
+ if (args[0].success) {
124
+ success = args[0].success;
125
+ }
126
+ if (args[0].data) {
127
+ data = args[0].data;
128
+ }
129
+ if (args[0].datatype) {
130
+ datatype = args[0].datatype;
155
131
  }
156
132
  }
157
133
  else {
158
- var ok = 1;
159
- if (isFunction(failure)) {
160
- ok = failure(loader_1, err.message, err);
134
+ if (args.length > 0) {
135
+ url = args[0];
136
+ }
137
+ if (args.length > 1) {
138
+ datatype = args[1];
139
+ }
140
+ if (args.length > 2) {
141
+ data = args[2];
161
142
  }
162
- if (ok) {
163
- bbn.fn.defaultAjaxErrorFunction(loader_1, err.message, err);
143
+ if (args.length > 3) {
144
+ success = args[3];
145
+ }
146
+ if (args.length > 4) {
147
+ failure = args[4];
148
+ }
149
+ if (args.length > 5) {
150
+ abort = args[5];
164
151
  }
165
152
  }
153
+ if (typeof url === "string") {
154
+ if (url.indexOf("://") === -1) {
155
+ // Prevent protocol mismatch by Axios
156
+ url = replaceAll("//", "/", url);
157
+ }
158
+ if (!datatype) {
159
+ datatype = "json";
160
+ }
161
+ requestId_1 = getRequestId(url, data, datatype);
162
+ loaderObj = getLoader(requestId_1);
163
+ if (loaderObj === null || loaderObj === void 0 ? void 0 : loaderObj.loader) {
164
+ return [2 /*return*/, loaderObj.loader];
165
+ }
166
+ if (bbn.env.token) {
167
+ extend(data || {}, { _bbn_token: bbn.env.token });
168
+ }
169
+ aborter = new AbortController();
170
+ options = {
171
+ responseType: datatype,
172
+ signal: aborter.signal
173
+ };
174
+ if (datatype === "text") {
175
+ options['headers'] = {
176
+ accept: "text/javascript",
177
+ "Content-Type": "text/javascript",
178
+ };
179
+ }
180
+ args_1 = [url];
181
+ if (isObject(data) && numProperties(data) > 0) {
182
+ args_1.push(data);
183
+ }
184
+ args_1.push(options);
185
+ axiosMethod = args_1.length === 2 ? "get" : "post";
186
+ loader_1 = axios[axiosMethod]
187
+ .apply(null, args_1)
188
+ .then(function (res) {
189
+ _deleteLoader(requestId_1, res);
190
+ bbn.fn.defaultEndLoadingFunction(url, tst_1, data, res);
191
+ switch (res.status) {
192
+ case 200:
193
+ if (isFunction(success)) {
194
+ //bbn.fn.log(["THERE US A SUCCESS FUNCTION", res, loader]);
195
+ success(res.data, res.headers);
196
+ }
197
+ break;
198
+ default:
199
+ //bbn.fn.log(["THIS IS THE DEFAULT FUNCTION", res, loader]);
200
+ bbn.fn.defaultAjaxErrorFunction(loader_1, res);
201
+ }
202
+ return res;
203
+ })
204
+ .catch(function (err) {
205
+ var isAbort = axios.isCancel(err);
206
+ _deleteLoader(requestId_1, err.message || err.response.data, isAbort);
207
+ bbn.fn.defaultEndLoadingFunction(url, tst_1, data, err);
208
+ if (isAbort) {
209
+ var ok = 1;
210
+ if (isFunction(abort)) {
211
+ ok = abort(err.message, url);
212
+ }
213
+ if (ok) {
214
+ bbn.fn.defaultAjaxAbortFunction(err.message, url);
215
+ }
216
+ }
217
+ else {
218
+ var ok = 1;
219
+ if (isFunction(failure)) {
220
+ ok = failure(loader_1, err.message, err);
221
+ }
222
+ if (ok) {
223
+ bbn.fn.defaultAjaxErrorFunction(loader_1, err.message, err);
224
+ }
225
+ }
226
+ });
227
+ tst_1 = _addLoader(requestId_1, loader_1, aborter);
228
+ bbn.fn.defaultStartLoadingFunction(url, tst_1, data, requestId_1);
229
+ return [2 /*return*/, loader_1];
230
+ }
231
+ return [2 /*return*/];
166
232
  });
167
- var tst_1 = _addLoader(requestId_1, loader_1, aborter);
168
- bbn.fn.defaultStartLoadingFunction(url, tst_1, data, requestId_1);
169
- return loader_1;
170
- }
233
+ });
171
234
  }
172
235
  ;
@@ -26,4 +26,4 @@
26
26
  *
27
27
  * @returns {undefined}
28
28
  */
29
- export default function download(url: any, filename?: string, params?: any): any;
29
+ export default function download(url: any, filename?: string, params?: any): Promise<any>;
@@ -22,4 +22,4 @@
22
22
  *
23
23
  * @returns
24
24
  */
25
- export default function link(...args: any[]): any;
25
+ export default function link(...args: any[]): boolean | Promise<any>;
@@ -31,4 +31,4 @@
31
31
  *
32
32
  * @returns {undefined|Promise}
33
33
  */
34
- export default function post(...args: any[]): any;
34
+ export default function post(...args: any[]): Promise<any>;
package/dist/index.d.ts CHANGED
@@ -1,8 +1,4 @@
1
1
  import axios from 'axios';
2
2
  import dayjs from 'dayjs';
3
- declare const _default: {
4
- bbn: Bbn;
5
- dayjs: typeof dayjs;
6
- axios: axios.AxiosStatic;
7
- };
8
- export default _default;
3
+ declare const bbn: Bbn;
4
+ export { bbn as default, bbn, dayjs, axios };
package/dist/index.js CHANGED
@@ -60,8 +60,4 @@ if ('undefined' !== typeof window) {
60
60
  window.dayjs = dayjs;
61
61
  window.bbn = bbn;
62
62
  }
63
- export default {
64
- bbn: bbn,
65
- dayjs: dayjs,
66
- axios: axios
67
- };
63
+ export { bbn as default, bbn, dayjs, axios };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bbn/bbn",
3
- "version": "1.0.340",
3
+ "version": "1.0.342",
4
4
  "description": "Javascript toolkit",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",