@evlop/commons 1.0.319 → 1.0.320
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.
- package/dist/cjs/src/middlewares/dataSourceMiddleware.d.ts.map +1 -1
- package/dist/cjs/src/middlewares/dataSourceMiddleware.js +8 -8
- package/dist/cjs/src/middlewares/dataSourceMiddleware.js.map +1 -1
- package/dist/esm/src/middlewares/dataSourceMiddleware.d.ts.map +1 -1
- package/dist/esm/src/middlewares/dataSourceMiddleware.js +8 -8
- package/dist/esm/src/middlewares/dataSourceMiddleware.js.map +1 -1
- package/dist/types/src/middlewares/dataSourceMiddleware.d.ts.map +1 -1
- package/package.json +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dataSourceMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB,GAAG,UAAK,MAAI,SAAI,MAAU,WAAM,
|
1
|
+
{"version":3,"file":"dataSourceMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB,GAAG,UAAK,MAAI,SAAI,MAAU,WAAM,iBA8EhE,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
@@ -49,10 +49,10 @@ const dataSourceMiddleware = store => next => async (action) => {
|
|
49
49
|
const { datasourceName, options, scope, key } = action;
|
50
50
|
const dataSource = getDataSource(store, datasourceName);
|
51
51
|
const currentState = getCurrentState(store, key);
|
52
|
-
if (!providers_1.DataSource)
|
52
|
+
if (!providers_1.DataSource || currentState.isLoading)
|
53
53
|
return null;
|
54
|
-
const requestOptions = (0, lodash_1.defaults)({}, options, { page: 1, pageSize: 20 });
|
55
54
|
next({ type: reducers_1.DATA_SOURCE_UPDATE_DATA, key, data: (0, lodash_1.assign)({}, currentState, { isLoading: true, isRefreshing: true }) });
|
55
|
+
const requestOptions = (0, lodash_1.defaults)({}, options, { page: 1, pageSize: 20 });
|
56
56
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
57
57
|
let newState = data;
|
58
58
|
if ((0, lodash_1.get)(dataSource, 'type') === 'Array') {
|
@@ -68,10 +68,10 @@ const dataSourceMiddleware = store => next => async (action) => {
|
|
68
68
|
const { datasourceName, options, scope, key } = action;
|
69
69
|
const currentState = getCurrentState(store, key);
|
70
70
|
const dataSource = getDataSource(store, datasourceName);
|
71
|
-
if (!providers_1.DataSource)
|
71
|
+
if (!providers_1.DataSource || currentState.isLoading)
|
72
72
|
return null;
|
73
|
-
const requestOptions = (0, lodash_1.defaults)({ page: (0, lodash_1.get)(currentState, 'page', 0) + 1 }, options, (0, lodash_1.get)(currentState, 'options'));
|
74
73
|
next({ type: reducers_1.DATA_SOURCE_UPDATE_DATA, key, data: (0, lodash_1.assign)({}, currentState, { isLoading: true, isRefreshing: false }) });
|
74
|
+
const requestOptions = (0, lodash_1.defaults)({ page: (0, lodash_1.get)(currentState, 'page', 0) + 1 }, options, (0, lodash_1.get)(currentState, 'options'));
|
75
75
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
76
76
|
const newItems = (0, lodash_1.union)((0, lodash_1.get)(currentState, 'items'), (0, lodash_1.get)(data, 'items'));
|
77
77
|
const newState = arrayDataToState(requestOptions, (0, lodash_1.assign)({}, data, { items: newItems }));
|
@@ -85,10 +85,10 @@ const dataSourceMiddleware = store => next => async (action) => {
|
|
85
85
|
const { datasourceName, options, scope, key } = action;
|
86
86
|
const currentState = getCurrentState(store, key);
|
87
87
|
const dataSource = getDataSource(store, datasourceName);
|
88
|
-
if (!providers_1.DataSource)
|
88
|
+
if (!providers_1.DataSource || currentState.isLoading)
|
89
89
|
return null;
|
90
|
-
const requestOptions = (0, lodash_1.defaults)({ page: (0, lodash_1.get)(currentState, 'page', 0) + 1 }, options, { pageSize: 20 });
|
91
90
|
next({ type: reducers_1.DATA_SOURCE_UPDATE_DATA, key, data: (0, lodash_1.assign)({}, currentState, { isLoading: true, isRefreshing: false }) });
|
91
|
+
const requestOptions = (0, lodash_1.defaults)({ page: (0, lodash_1.get)(currentState, 'page', 0) + 1 }, options, { pageSize: 20 });
|
92
92
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
93
93
|
let newState = data;
|
94
94
|
if ((0, lodash_1.get)(dataSource, 'type') === 'Array') {
|
@@ -104,10 +104,10 @@ const dataSourceMiddleware = store => next => async (action) => {
|
|
104
104
|
const { datasourceName, options, scope, key } = action;
|
105
105
|
const currentState = getCurrentState(store, key);
|
106
106
|
const dataSource = getDataSource(store, datasourceName);
|
107
|
-
if (!providers_1.DataSource)
|
107
|
+
if (!providers_1.DataSource || currentState.isLoading)
|
108
108
|
return null;
|
109
|
-
const requestOptions = (0, lodash_1.defaults)({ page: Math.max(1, (0, lodash_1.get)(currentState, 'page', 1) - 1) }, options, { pageSize: 20 });
|
110
109
|
next({ type: reducers_1.DATA_SOURCE_UPDATE_DATA, key, data: (0, lodash_1.assign)({}, currentState, { isLoading: true, isRefreshing: false }) });
|
110
|
+
const requestOptions = (0, lodash_1.defaults)({ page: Math.max(1, (0, lodash_1.get)(currentState, 'page', 1) - 1) }, options, { pageSize: 20 });
|
111
111
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
112
112
|
let newState = data;
|
113
113
|
if ((0, lodash_1.get)(dataSource, 'type') === 'Array') {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dataSourceMiddleware.js","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":";;;AAAA,mCAA+D;AAC/D,4CAA0C;AAC1C,0CAA4L;AAE5L,SAAS,aAAa,CAAC,KAAK,EAAE,cAAc;IACxC,MAAM,EAAC,UAAU,EAAE,EAAC,WAAW,EAAE,IAAI,EAAE,aAAa,EAAC,EAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC1E,OAAO,WAAW,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,4DAA4D;AAC5D,SAAS,eAAe,CAAC,KAAK,EAAE,GAAG;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,mDAAmD;AACnD,KAAK,UAAU,SAAS,CAAE,UAAU,EAAE,OAAO,EAAE,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC;IAChE,IAAG,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;IACjF,OAAO,IAAI,CAAC;AAChB,CAAC;AAAA,CAAC;AAEF,mDAAmD;AACnD,SAAS,gBAAgB,CAAC,OAAO,EAAE,iBAAiB;IAChD,MAAM,KAAK,GAAG,IAAA,YAAG,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAC7C,MAAM,IAAI,GAAG,IAAA,YAAG,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,IAAA,YAAG,EAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAA,YAAG,EAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAA,YAAG,EAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;IACvD,MAAM,IAAI,GAAG,IAAA,YAAG,EAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAC/C,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAO,EAAC,KAAK,CAAC,CAAA;IAChE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAA;IAC5B,OAAO;QACH,KAAK;QACL,OAAO;QACP,IAAI;QACJ,QAAQ;QACR,YAAY;QACZ,UAAU;QACV,OAAO;QACP,WAAW;QACX,IAAI,EAAE,IAAI,IAAI,EAAE;KACnB,CAAA;AACL,CAAC;AAEM,MAAM,oBAAoB,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAC,MAAM,EAAE,EAAE;IACjE,QAAO,MAAM,CAAC,IAAI,EAAC,CAAC;QAChB,KAAK,gCAAqB,CAAC,CAAA,CAAC;YACxB,MAAM,EAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAC,GAAG,MAAM,CAAC;YACrD,MAAM,UAAU,GAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjD,IAAG,CAAC,sBAAU;gBAAE,OAAO,IAAI,CAAC;
|
1
|
+
{"version":3,"file":"dataSourceMiddleware.js","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dataSourceMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB,GAAG,UAAK,MAAI,SAAI,MAAU,WAAM,
|
1
|
+
{"version":3,"file":"dataSourceMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB,GAAG,UAAK,MAAI,SAAI,MAAU,WAAM,iBA8EhE,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
@@ -46,10 +46,10 @@ export const dataSourceMiddleware = store => next => async (action) => {
|
|
46
46
|
const { datasourceName, options, scope, key } = action;
|
47
47
|
const dataSource = getDataSource(store, datasourceName);
|
48
48
|
const currentState = getCurrentState(store, key);
|
49
|
-
if (!DataSource)
|
49
|
+
if (!DataSource || currentState.isLoading)
|
50
50
|
return null;
|
51
|
-
const requestOptions = defaults({}, options, { page: 1, pageSize: 20 });
|
52
51
|
next({ type: DATA_SOURCE_UPDATE_DATA, key, data: assign({}, currentState, { isLoading: true, isRefreshing: true }) });
|
52
|
+
const requestOptions = defaults({}, options, { page: 1, pageSize: 20 });
|
53
53
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
54
54
|
let newState = data;
|
55
55
|
if (get(dataSource, 'type') === 'Array') {
|
@@ -65,10 +65,10 @@ export const dataSourceMiddleware = store => next => async (action) => {
|
|
65
65
|
const { datasourceName, options, scope, key } = action;
|
66
66
|
const currentState = getCurrentState(store, key);
|
67
67
|
const dataSource = getDataSource(store, datasourceName);
|
68
|
-
if (!DataSource)
|
68
|
+
if (!DataSource || currentState.isLoading)
|
69
69
|
return null;
|
70
|
-
const requestOptions = defaults({ page: get(currentState, 'page', 0) + 1 }, options, get(currentState, 'options'));
|
71
70
|
next({ type: DATA_SOURCE_UPDATE_DATA, key, data: assign({}, currentState, { isLoading: true, isRefreshing: false }) });
|
71
|
+
const requestOptions = defaults({ page: get(currentState, 'page', 0) + 1 }, options, get(currentState, 'options'));
|
72
72
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
73
73
|
const newItems = union(get(currentState, 'items'), get(data, 'items'));
|
74
74
|
const newState = arrayDataToState(requestOptions, assign({}, data, { items: newItems }));
|
@@ -82,10 +82,10 @@ export const dataSourceMiddleware = store => next => async (action) => {
|
|
82
82
|
const { datasourceName, options, scope, key } = action;
|
83
83
|
const currentState = getCurrentState(store, key);
|
84
84
|
const dataSource = getDataSource(store, datasourceName);
|
85
|
-
if (!DataSource)
|
85
|
+
if (!DataSource || currentState.isLoading)
|
86
86
|
return null;
|
87
|
-
const requestOptions = defaults({ page: get(currentState, 'page', 0) + 1 }, options, { pageSize: 20 });
|
88
87
|
next({ type: DATA_SOURCE_UPDATE_DATA, key, data: assign({}, currentState, { isLoading: true, isRefreshing: false }) });
|
88
|
+
const requestOptions = defaults({ page: get(currentState, 'page', 0) + 1 }, options, { pageSize: 20 });
|
89
89
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
90
90
|
let newState = data;
|
91
91
|
if (get(dataSource, 'type') === 'Array') {
|
@@ -101,10 +101,10 @@ export const dataSourceMiddleware = store => next => async (action) => {
|
|
101
101
|
const { datasourceName, options, scope, key } = action;
|
102
102
|
const currentState = getCurrentState(store, key);
|
103
103
|
const dataSource = getDataSource(store, datasourceName);
|
104
|
-
if (!DataSource)
|
104
|
+
if (!DataSource || currentState.isLoading)
|
105
105
|
return null;
|
106
|
-
const requestOptions = defaults({ page: Math.max(1, get(currentState, 'page', 1) - 1) }, options, { pageSize: 20 });
|
107
106
|
next({ type: DATA_SOURCE_UPDATE_DATA, key, data: assign({}, currentState, { isLoading: true, isRefreshing: false }) });
|
107
|
+
const requestOptions = defaults({ page: Math.max(1, get(currentState, 'page', 1) - 1) }, options, { pageSize: 20 });
|
108
108
|
const data = await fetchData(dataSource, requestOptions, { scope, store, state: currentState });
|
109
109
|
let newState = data;
|
110
110
|
if (get(dataSource, 'type') === 'Array') {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dataSourceMiddleware.js","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,+BAA+B,EAAE,mCAAmC,EAAE,uBAAuB,EAAe,MAAM,aAAa,CAAC;AAE5L,SAAS,aAAa,CAAC,KAAK,EAAE,cAAc;IACxC,MAAM,EAAC,UAAU,EAAE,EAAC,WAAW,EAAE,IAAI,EAAE,aAAa,EAAC,EAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC1E,OAAO,WAAW,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,4DAA4D;AAC5D,SAAS,eAAe,CAAC,KAAK,EAAE,GAAG;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,mDAAmD;AACnD,KAAK,UAAU,SAAS,CAAE,UAAU,EAAE,OAAO,EAAE,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC;IAChE,IAAG,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;IACjF,OAAO,IAAI,CAAC;AAChB,CAAC;AAAA,CAAC;AAEF,mDAAmD;AACnD,SAAS,gBAAgB,CAAC,OAAO,EAAE,iBAAiB;IAChD,MAAM,KAAK,GAAG,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAC7C,MAAM,IAAI,GAAG,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;IACvD,MAAM,IAAI,GAAG,GAAG,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAC/C,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAChE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAA;IAC5B,OAAO;QACH,KAAK;QACL,OAAO;QACP,IAAI;QACJ,QAAQ;QACR,YAAY;QACZ,UAAU;QACV,OAAO;QACP,WAAW;QACX,IAAI,EAAE,IAAI,IAAI,EAAE;KACnB,CAAA;AACL,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAC,MAAM,EAAE,EAAE;IACjE,QAAO,MAAM,CAAC,IAAI,EAAC,CAAC;QAChB,KAAK,qBAAqB,CAAC,CAAA,CAAC;YACxB,MAAM,EAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAC,GAAG,MAAM,CAAC;YACrD,MAAM,UAAU,GAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjD,IAAG,CAAC,UAAU;gBAAE,OAAO,IAAI,CAAC;
|
1
|
+
{"version":3,"file":"dataSourceMiddleware.js","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,+BAA+B,EAAE,mCAAmC,EAAE,uBAAuB,EAAe,MAAM,aAAa,CAAC;AAE5L,SAAS,aAAa,CAAC,KAAK,EAAE,cAAc;IACxC,MAAM,EAAC,UAAU,EAAE,EAAC,WAAW,EAAE,IAAI,EAAE,aAAa,EAAC,EAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC1E,OAAO,WAAW,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,4DAA4D;AAC5D,SAAS,eAAe,CAAC,KAAK,EAAE,GAAG;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,mDAAmD;AACnD,KAAK,UAAU,SAAS,CAAE,UAAU,EAAE,OAAO,EAAE,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC;IAChE,IAAG,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;IACjF,OAAO,IAAI,CAAC;AAChB,CAAC;AAAA,CAAC;AAEF,mDAAmD;AACnD,SAAS,gBAAgB,CAAC,OAAO,EAAE,iBAAiB;IAChD,MAAM,KAAK,GAAG,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAC7C,MAAM,IAAI,GAAG,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;IACvD,MAAM,IAAI,GAAG,GAAG,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAC/C,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAChE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAA;IAC5B,OAAO;QACH,KAAK;QACL,OAAO;QACP,IAAI;QACJ,QAAQ;QACR,YAAY;QACZ,UAAU;QACV,OAAO;QACP,WAAW;QACX,IAAI,EAAE,IAAI,IAAI,EAAE;KACnB,CAAA;AACL,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAC,MAAM,EAAE,EAAE;IACjE,QAAO,MAAM,CAAC,IAAI,EAAC,CAAC;QAChB,KAAK,qBAAqB,CAAC,CAAA,CAAC;YACxB,MAAM,EAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAC,GAAG,MAAM,CAAC;YACrD,MAAM,UAAU,GAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjD,IAAG,CAAC,UAAU,IAAI,YAAY,CAAC,SAAS;gBAAE,OAAO,IAAI,CAAC;YACtD,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAC,CAAC,EAAC,CAAC,CAAC;YAEjH,MAAM,cAAc,GAAG,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,EAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAC,CAAC,CAAC;YACtE,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAC,CAAC,CAAC;YAC9F,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAG,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,OAAO,EAAC,CAAC;gBACpC,QAAQ,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO,IAAI,CAAC;gBACR,IAAI,EAAE,uBAAuB;gBAC7B,GAAG;gBACH,IAAI,EAAE,QAAQ;aACjB,CAAC,CAAC;QACP,CAAC;QACD,KAAK,0BAA0B,CAAC,CAAA,CAAC;YAC7B,MAAM,EAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAC,GAAG,MAAM,CAAC;YACrD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjD,MAAM,UAAU,GAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACrE,IAAG,CAAC,UAAU,IAAI,YAAY,CAAC,SAAS;gBAAE,OAAO,IAAI,CAAC;YACtD,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,CAAC,CAAC;YAEnH,MAAM,cAAc,GAAG,QAAQ,CAAC,EAAC,IAAI,EAAE,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;YAClH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAC,CAAC,CAAC;YAC9F,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;YACvE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC,CAAC;YACvF,OAAO,IAAI,CAAC;gBACR,IAAI,EAAE,uBAAuB;gBAC7B,GAAG;gBACH,IAAI,EAAE,QAAQ;aACjB,CAAC,CAAC;QACP,CAAC;QACD,KAAK,+BAA+B,CAAC,CAAA,CAAC;YAClC,MAAM,EAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAC,GAAG,MAAM,CAAC;YACrD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjD,MAAM,UAAU,GAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACrE,IAAG,CAAC,UAAU,IAAI,YAAY,CAAC,SAAS;gBAAE,OAAO,IAAI,CAAC;YACtD,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,CAAC,CAAC;YAElH,MAAM,cAAc,GAAG,QAAQ,CAAC,EAAC,IAAI,EAAE,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,EAAC,EAAE,OAAO,EAAE,EAAC,QAAQ,EAAE,EAAE,EAAC,CAAC,CAAC;YACnG,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAC,CAAC,CAAC;YAC9F,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAG,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,OAAO,EAAC,CAAC;gBACpC,QAAQ,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO,IAAI,CAAC;gBACR,IAAI,EAAE,uBAAuB;gBAC7B,GAAG;gBACH,IAAI,EAAE,QAAQ;aACjB,CAAC,CAAC;QACP,CAAC;QACD,KAAK,mCAAmC,CAAC,CAAA,CAAC;YACtC,MAAM,EAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAC,GAAG,MAAM,CAAC;YACrD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjD,MAAM,UAAU,GAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACrE,IAAG,CAAC,UAAU,IAAI,YAAY,CAAC,SAAS;gBAAE,OAAO,IAAI,CAAC;YACtD,IAAI,CAAC,EAAC,IAAI,EAAE,uBAAuB,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,CAAC,CAAC;YAElH,MAAM,cAAc,GAAG,QAAQ,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAC,EAAE,OAAO,EAAE,EAAC,QAAQ,EAAE,EAAE,EAAC,CAAC,CAAC;YAChH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAC,CAAC,CAAC;YAC9F,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAG,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,OAAO,EAAC,CAAC;gBACpC,QAAQ,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO,IAAI,CAAC;gBACR,IAAI,EAAE,uBAAuB;gBAC7B,GAAG;gBACH,IAAI,EAAE,QAAQ;aACjB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dataSourceMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB,GAAG,UAAK,MAAI,SAAI,MAAU,WAAM,
|
1
|
+
{"version":3,"file":"dataSourceMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/middlewares/dataSourceMiddleware.ts"],"names":[],"mappings":"AA6CA,eAAO,MAAM,oBAAoB,GAAG,UAAK,MAAI,SAAI,MAAU,WAAM,iBA8EhE,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|