@data-loom/service-js 0.4.8 → 0.4.9-alpha.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.
- package/dist/main/services/session-service/index.d.ts.map +1 -1
- package/dist/main/services/session-service/index.js +7 -3
- package/dist/main/services/session-service/index.js.map +1 -1
- package/dist/main/services/user-service/index.js +2 -2
- package/dist/main/services/user-service/index.js.map +1 -1
- package/dist/module/services/session-service/index.d.ts.map +1 -1
- package/dist/module/services/session-service/index.js +7 -3
- package/dist/module/services/session-service/index.js.map +1 -1
- package/dist/module/services/user-service/index.js +2 -2
- package/dist/module/services/user-service/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAiB,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAiB,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;IAiCvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAmBvD;;OAEG;IACH,mBAAmB,IAAI,MAAM;IAa7B;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAkDvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
|
|
@@ -32,7 +32,11 @@ class SessionService extends DataloomServiceBase_1.default {
|
|
|
32
32
|
}
|
|
33
33
|
const { returnUrl, newTab = false } = options !== null && options !== void 0 ? options : {};
|
|
34
34
|
const encodedRedirectUrl = encodeURIComponent(decodeURIComponent(returnUrl || window.location.href));
|
|
35
|
-
|
|
35
|
+
// 根据当前页面路径判断是否需要添加 /spark/faas 前缀
|
|
36
|
+
const isSparkFaasPath = window.location.pathname.startsWith('/spark/faas');
|
|
37
|
+
const baseLoginUrl = isSparkFaasPath
|
|
38
|
+
? `/spark/faas/${this.appId}/runtime/page/login`
|
|
39
|
+
: `/faas/${this.appId}/runtime/page/login`;
|
|
36
40
|
const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
|
|
37
41
|
if (newTab) {
|
|
38
42
|
window.open(loginPageUrl, '_blank');
|
|
@@ -56,7 +60,7 @@ class SessionService extends DataloomServiceBase_1.default {
|
|
|
56
60
|
return browserEnvError;
|
|
57
61
|
}
|
|
58
62
|
const location = this.getUrlWithBizSource();
|
|
59
|
-
return this.fetchData('/
|
|
63
|
+
return this.fetchData('/runtime/api/v1/account/logout', {
|
|
60
64
|
method: 'POST',
|
|
61
65
|
body: {
|
|
62
66
|
redirectURI: location,
|
|
@@ -84,7 +88,7 @@ class SessionService extends DataloomServiceBase_1.default {
|
|
|
84
88
|
console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
|
|
85
89
|
return Promise.resolve(browserEnvError);
|
|
86
90
|
}
|
|
87
|
-
const url = `/
|
|
91
|
+
const url = `/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
|
|
88
92
|
// Get tenantDomainName from current URL hostname
|
|
89
93
|
const urlObj = new URL(globalThis.location.href);
|
|
90
94
|
const pathSegments = urlObj.hostname.split('.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAAgD;AAIhD,iDAAgD;AAEhD,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE;QACL,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,qDAAqD;QAC3D,OAAO,EAAE,yDAAyD;KACnE;IACD,MAAM,EAAE,GAAG;IACX,UAAU,EAAE,aAAa;CAC1B,CAAC;AAEF,MAAqB,cAAe,SAAQ,6BAAmB;IAA/D;;QACW,gBAAW,GAAG,mBAAW,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ class UserService extends DataloomServiceBase_1.default {
|
|
|
14
14
|
async search(params) {
|
|
15
15
|
var _a, _b, _c;
|
|
16
16
|
const { name, pageSize } = params;
|
|
17
|
-
const res = await this.fetchData(`/
|
|
17
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/search_user`, {
|
|
18
18
|
method: 'POST',
|
|
19
19
|
body: {
|
|
20
20
|
query: name,
|
|
@@ -38,7 +38,7 @@ class UserService extends DataloomServiceBase_1.default {
|
|
|
38
38
|
} });
|
|
39
39
|
}
|
|
40
40
|
async getByIds(ids) {
|
|
41
|
-
const res = await this.fetchData(`/
|
|
41
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/list_users`, {
|
|
42
42
|
method: 'POST',
|
|
43
43
|
body: {
|
|
44
44
|
userIDList: ids,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAA8E;AAE9E,iDAA8E;AAE9E,MAAqB,WAAY,SAAQ,6BAAmB;IAA5D;;QACW,gBAAW,GAAG,mBAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAA8E;AAE9E,iDAA8E;AAE9E,MAAqB,WAAY,SAAQ,6BAAmB;IAA5D;;QACW,gBAAW,GAAG,mBAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,yCAAyC,EAC3D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,QAAQ;aACpB;SACF,EACD,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAClC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,QAAQ,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;oBAAC,OAAA,CAAC;wBACjC,MAAM,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;wBACzB,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,mCAAI,EAAE;wBACvB,IAAI,EAAE,MAAA,IAAA,8BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,EAAE;wBAC3C,MAAM,EAAE,IAAA,2BAAiB,EAAC,IAAI,CAAC,UAAU,CAAC;wBAC1C,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;qBAC3B,CAAC,CAAA;iBAAA,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAwB;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,wCAAwC,EAC1D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,UAAU,EAAE,GAAG;aAChB;SACF,EACD,EAAE,OAAO,EAAE,sBAAsB,EAAE,CACpC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;oBACxB,MAAM,IAAI,GAAG,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,WAAW,0CAAG,EAAE,CAAC,CAAC;oBACzC,OAAO;wBACL,MAAM,EAAE,MAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,0CAAE,KAAK,mCAAI,EAAE;wBACxC,KAAK,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,mCAAI,EAAE;wBACxB,IAAI,EAAE,MAAA,IAAA,8BAAoB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,mCAAI,EAAE;wBAC5C,MAAM,EAAE,IAAA,2BAAiB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC;wBAC3C,OAAO,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;qBACjD,CAAC;gBACJ,CAAC,CAAC;aACH,IACD;IACJ,CAAC;CACF;AArED,8BAqEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAiB,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAiB,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;IAiCvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAmBvD;;OAEG;IACH,mBAAmB,IAAI,MAAM;IAa7B;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAkDvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
|
|
@@ -27,7 +27,11 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
27
27
|
}
|
|
28
28
|
const { returnUrl, newTab = false } = options !== null && options !== void 0 ? options : {};
|
|
29
29
|
const encodedRedirectUrl = encodeURIComponent(decodeURIComponent(returnUrl || window.location.href));
|
|
30
|
-
|
|
30
|
+
// 根据当前页面路径判断是否需要添加 /spark/faas 前缀
|
|
31
|
+
const isSparkFaasPath = window.location.pathname.startsWith('/spark/faas');
|
|
32
|
+
const baseLoginUrl = isSparkFaasPath
|
|
33
|
+
? `/spark/faas/${this.appId}/runtime/page/login`
|
|
34
|
+
: `/faas/${this.appId}/runtime/page/login`;
|
|
31
35
|
const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
|
|
32
36
|
if (newTab) {
|
|
33
37
|
window.open(loginPageUrl, '_blank');
|
|
@@ -51,7 +55,7 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
51
55
|
return browserEnvError;
|
|
52
56
|
}
|
|
53
57
|
const location = this.getUrlWithBizSource();
|
|
54
|
-
return this.fetchData('/
|
|
58
|
+
return this.fetchData('/runtime/api/v1/account/logout', {
|
|
55
59
|
method: 'POST',
|
|
56
60
|
body: {
|
|
57
61
|
redirectURI: location,
|
|
@@ -79,7 +83,7 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
79
83
|
console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
|
|
80
84
|
return Promise.resolve(browserEnvError);
|
|
81
85
|
}
|
|
82
|
-
const url = `/
|
|
86
|
+
const url = `/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
|
|
83
87
|
// Get tenantDomainName from current URL hostname
|
|
84
88
|
const urlObj = new URL(globalThis.location.href);
|
|
85
89
|
const pathSegments = urlObj.hostname.split('.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE;QACL,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,qDAAqD;QAC3D,OAAO,EAAE,yDAAyD;KACnE;IACD,MAAM,EAAE,GAAG;IACX,UAAU,EAAE,aAAa;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IAA/D;;QACW,gBAAW,GAAG,WAAW,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export default class UserService extends DataloomServiceBase {
|
|
|
9
9
|
async search(params) {
|
|
10
10
|
var _a, _b, _c;
|
|
11
11
|
const { name, pageSize } = params;
|
|
12
|
-
const res = await this.fetchData(`/
|
|
12
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/search_user`, {
|
|
13
13
|
method: 'POST',
|
|
14
14
|
body: {
|
|
15
15
|
query: name,
|
|
@@ -33,7 +33,7 @@ export default class UserService extends DataloomServiceBase {
|
|
|
33
33
|
} });
|
|
34
34
|
}
|
|
35
35
|
async getByIds(ids) {
|
|
36
|
-
const res = await this.fetchData(`/
|
|
36
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/list_users`, {
|
|
37
37
|
method: 'POST',
|
|
38
38
|
body: {
|
|
39
39
|
userIDList: ids,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAgC,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IAA5D;;QACW,gBAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAgC,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IAA5D;;QACW,gBAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,yCAAyC,EAC3D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,QAAQ;aACpB;SACF,EACD,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAClC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,QAAQ,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;oBAAC,OAAA,CAAC;wBACjC,MAAM,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;wBACzB,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,mCAAI,EAAE;wBACvB,IAAI,EAAE,MAAA,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,EAAE;wBAC3C,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC;wBAC1C,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;qBAC3B,CAAC,CAAA;iBAAA,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAwB;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,wCAAwC,EAC1D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,UAAU,EAAE,GAAG;aAChB;SACF,EACD,EAAE,OAAO,EAAE,sBAAsB,EAAE,CACpC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;oBACxB,MAAM,IAAI,GAAG,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,WAAW,0CAAG,EAAE,CAAC,CAAC;oBACzC,OAAO;wBACL,MAAM,EAAE,MAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,0CAAE,KAAK,mCAAI,EAAE;wBACxC,KAAK,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,mCAAI,EAAE;wBACxB,IAAI,EAAE,MAAA,oBAAoB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,mCAAI,EAAE;wBAC5C,MAAM,EAAE,iBAAiB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC;wBAC3C,OAAO,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;qBACjD,CAAC;gBACJ,CAAC,CAAC;aACH,IACD;IACJ,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@data-loom/service-js",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.9-alpha.1",
|
|
4
4
|
"description": "Dataloom service",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"service",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"test:types:watch": "run-s build && tsd --files 'test/**/*.test-d.ts' --watch"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@data-loom/node-fetch": "0.4.
|
|
36
|
+
"@data-loom/node-fetch": "0.4.9-alpha.1"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/jest": "^29.5.14",
|