@magda/typescript-common 2.3.3 → 3.0.0-alpha.0
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/AspectBuilder.d.ts +1 -1
- package/dist/AspectBuilder.js +1 -2
- package/dist/AspectCreationFailure.js +3 -4
- package/dist/AspectCreationFailure.js.map +1 -1
- package/dist/AsyncPage.js +59 -79
- package/dist/AsyncPage.js.map +1 -1
- package/dist/BaseApiClient.d.ts +3 -3
- package/dist/BaseApiClient.js +20 -13
- package/dist/BaseApiClient.js.map +1 -1
- package/dist/ConnectionResult.d.ts +2 -2
- package/dist/ConnectionResult.js +17 -22
- package/dist/ConnectionResult.js.map +1 -1
- package/dist/ConnectorRecordId.d.ts +1 -1
- package/dist/ConnectorRecordId.js +9 -13
- package/dist/ConnectorRecordId.js.map +1 -1
- package/dist/IndexerApiClient.d.ts +1 -1
- package/dist/IndexerApiClient.js +13 -32
- package/dist/IndexerApiClient.js.map +1 -1
- package/dist/JsonConnector.d.ts +9 -9
- package/dist/JsonConnector.js +163 -206
- package/dist/JsonConnector.js.map +1 -1
- package/dist/JsonTransformer.d.ts +3 -3
- package/dist/JsonTransformer.js +71 -75
- package/dist/JsonTransformer.js.map +1 -1
- package/dist/OpaCompileResponseParser.d.ts +4 -4
- package/dist/OpaCompileResponseParser.js +278 -211
- package/dist/OpaCompileResponseParser.js.map +1 -1
- package/dist/RecordCreationFailure.d.ts +1 -1
- package/dist/RecordCreationFailure.js +4 -4
- package/dist/RecordCreationFailure.js.map +1 -1
- package/dist/SQLUtils.d.ts +3 -3
- package/dist/SQLUtils.js +139 -195
- package/dist/SQLUtils.js.map +1 -1
- package/dist/ServerError.js +2 -4
- package/dist/ServerError.js.map +1 -1
- package/dist/Try.js +20 -35
- package/dist/Try.js.map +1 -1
- package/dist/addTrailingSlash.js +1 -4
- package/dist/addTrailingSlash.js.map +1 -1
- package/dist/appendUrlSegments.js +3 -8
- package/dist/appendUrlSegments.js.map +1 -1
- package/dist/authorization-api/AccessControlError.d.ts +1 -1
- package/dist/authorization-api/AccessControlError.js +2 -8
- package/dist/authorization-api/AccessControlError.js.map +1 -1
- package/dist/authorization-api/ApiClient.d.ts +3 -3
- package/dist/authorization-api/ApiClient.js +211 -272
- package/dist/authorization-api/ApiClient.js.map +1 -1
- package/dist/authorization-api/AuthError.d.ts +1 -1
- package/dist/authorization-api/AuthError.js +2 -8
- package/dist/authorization-api/AuthError.js.map +1 -1
- package/dist/authorization-api/GenericError.js +2 -4
- package/dist/authorization-api/GenericError.js.map +1 -1
- package/dist/authorization-api/authMiddleware.d.ts +3 -3
- package/dist/authorization-api/authMiddleware.js +19 -40
- package/dist/authorization-api/authMiddleware.js.map +1 -1
- package/dist/authorization-api/constants.js +9 -12
- package/dist/authorization-api/constants.js.map +1 -1
- package/dist/authorization-api/model.d.ts +8 -8
- package/dist/authorization-api/model.js +1 -2
- package/dist/coerceJson.js +1 -3
- package/dist/coerceJson.js.map +1 -1
- package/dist/createNoCacheFetchOptions.d.ts +1 -1
- package/dist/createNoCacheFetchOptions.js +4 -7
- package/dist/createNoCacheFetchOptions.js.map +1 -1
- package/dist/createServiceError.d.ts +1 -1
- package/dist/createServiceError.js +4 -9
- package/dist/createServiceError.js.map +1 -1
- package/dist/delay.js +1 -3
- package/dist/delay.js.map +1 -1
- package/dist/express/getNoCacheHeaders.js +1 -3
- package/dist/express/getNoCacheHeaders.js.map +1 -1
- package/dist/express/setResponseNoCache.d.ts +1 -1
- package/dist/express/setResponseNoCache.js +3 -8
- package/dist/express/setResponseNoCache.js.map +1 -1
- package/dist/express/status.d.ts +14 -15
- package/dist/express/status.js +135 -126
- package/dist/express/status.js.map +1 -1
- package/dist/fetchRequest.d.ts +6 -6
- package/dist/fetchRequest.js +36 -51
- package/dist/fetchRequest.js.map +1 -1
- package/dist/formatServiceError.js +1 -4
- package/dist/formatServiceError.js.map +1 -1
- package/dist/generated/registry/api.d.ts +4 -4
- package/dist/generated/registry/api.js +197 -102
- package/dist/generated/registry/api.js.map +1 -1
- package/dist/getAbsoluteUrl.js +8 -11
- package/dist/getAbsoluteUrl.js.map +1 -1
- package/dist/getBasePathFromUrl.js +3 -9
- package/dist/getBasePathFromUrl.js.map +1 -1
- package/dist/getBoolValWithDefault.js +1 -3
- package/dist/getBoolValWithDefault.js.map +1 -1
- package/dist/getRequest.js +9 -26
- package/dist/getRequest.js.map +1 -1
- package/dist/getRequestNoCache.js +4 -21
- package/dist/getRequestNoCache.js.map +1 -1
- package/dist/getStorageUrl.js +13 -23
- package/dist/getStorageUrl.js.map +1 -1
- package/dist/handleServerError.js +3 -9
- package/dist/handleServerError.js.map +1 -1
- package/dist/markdownToHtml.js +5 -11
- package/dist/markdownToHtml.js.map +1 -1
- package/dist/opa/AspectQuery.js +55 -79
- package/dist/opa/AspectQuery.js.map +1 -1
- package/dist/opa/AuthDecision.d.ts +2 -2
- package/dist/opa/AuthDecision.js +52 -69
- package/dist/opa/AuthDecision.js.map +1 -1
- package/dist/opa/AuthDecisionQueryClient.d.ts +2 -2
- package/dist/opa/AuthDecisionQueryClient.js +72 -102
- package/dist/opa/AuthDecisionQueryClient.js.map +1 -1
- package/dist/pgTypes.js +4 -9
- package/dist/pgTypes.js.map +1 -1
- package/dist/registry/AuthorizedRegistryClient.d.ts +4 -4
- package/dist/registry/AuthorizedRegistryClient.js +52 -92
- package/dist/registry/AuthorizedRegistryClient.js.map +1 -1
- package/dist/registry/RegistryClient.d.ts +2 -2
- package/dist/registry/RegistryClient.js +60 -76
- package/dist/registry/RegistryClient.js.map +1 -1
- package/dist/registry/TenantConsts.js +3 -6
- package/dist/registry/TenantConsts.js.map +1 -1
- package/dist/registry/model.js +1 -2
- package/dist/registry-manual/api.d.ts +1 -1
- package/dist/registry-manual/api.js +18 -7
- package/dist/registry-manual/api.js.map +1 -1
- package/dist/request.d.ts +2 -2
- package/dist/request.js +4 -9
- package/dist/request.js.map +1 -1
- package/dist/retry.d.ts +1 -1
- package/dist/retry.js +3 -9
- package/dist/retry.js.map +1 -1
- package/dist/retryBackoff.js +3 -9
- package/dist/retryBackoff.js.map +1 -1
- package/dist/runLater.js +1 -4
- package/dist/runLater.js.map +1 -1
- package/dist/session/GetUserId.d.ts +2 -2
- package/dist/session/GetUserId.js +10 -16
- package/dist/session/GetUserId.js.map +1 -1
- package/dist/session/GetUserSession.d.ts +1 -1
- package/dist/session/GetUserSession.js +6 -10
- package/dist/session/GetUserSession.js.map +1 -1
- package/dist/session/addJwtSecretFromEnvVar.js +1 -4
- package/dist/session/addJwtSecretFromEnvVar.js.map +1 -1
- package/dist/session/buildJwt.d.ts +1 -1
- package/dist/session/buildJwt.js +2 -5
- package/dist/session/buildJwt.js.map +1 -1
- package/dist/session/buildJwtFromReq.d.ts +1 -1
- package/dist/session/buildJwtFromReq.js +3 -8
- package/dist/session/buildJwtFromReq.js.map +1 -1
- package/dist/session/cookieUtils.d.ts +2 -13
- package/dist/session/cookieUtils.js +8 -9
- package/dist/session/cookieUtils.js.map +1 -1
- package/dist/session/destroySession.js +18 -33
- package/dist/session/destroySession.js.map +1 -1
- package/dist/session/getSessionId.js +5 -11
- package/dist/session/getSessionId.js.map +1 -1
- package/dist/tenant-api/AuthorizedTenantClient.d.ts +1 -1
- package/dist/tenant-api/AuthorizedTenantClient.js +22 -36
- package/dist/tenant-api/AuthorizedTenantClient.js.map +1 -1
- package/dist/tenant-api/Tenant.js +13 -5
- package/dist/tenant-api/Tenant.js.map +1 -1
- package/dist/test/JsonConnector.spec.js +56 -61
- package/dist/test/JsonConnector.spec.js.map +1 -1
- package/dist/test/JsonTransformer.spec.js +15 -19
- package/dist/test/JsonTransformer.spec.js.map +1 -1
- package/dist/test/arbitraries.d.ts +21 -21
- package/dist/test/arbitraries.js +85 -99
- package/dist/test/arbitraries.js.map +1 -1
- package/dist/test/aspect-templates/organization-details.d.ts +1 -4
- package/dist/test/aspect-templates/organization-details.js +1 -1
- package/dist/test/aspect-templates/organization-details.js.map +1 -1
- package/dist/test/buildApiClient.spec.js +81 -107
- package/dist/test/buildApiClient.spec.js.map +1 -1
- package/dist/test/buildAuthorizedTenantClient.spec.js +25 -40
- package/dist/test/buildAuthorizedTenantClient.spec.js.map +1 -1
- package/dist/test/connectors/MockExpressServer.js +9 -23
- package/dist/test/connectors/MockExpressServer.js.map +1 -1
- package/dist/test/connectors/MockRegistry.d.ts +1 -1
- package/dist/test/connectors/MockRegistry.js +11 -18
- package/dist/test/connectors/MockRegistry.js.map +1 -1
- package/dist/test/connectors/runConnectorTest.js +33 -55
- package/dist/test/connectors/runConnectorTest.js.map +1 -1
- package/dist/test/createMockAuthDecisionQueryClient.d.ts +4 -4
- package/dist/test/createMockAuthDecisionQueryClient.js +4 -9
- package/dist/test/createMockAuthDecisionQueryClient.js.map +1 -1
- package/dist/test/db/getTestDBConfig.js +1 -3
- package/dist/test/db/getTestDBConfig.js.map +1 -1
- package/dist/test/db/runMigrationSql.js +37 -58
- package/dist/test/db/runMigrationSql.js.map +1 -1
- package/dist/test/express/status.spec.js +81 -72
- package/dist/test/express/status.spec.js.map +1 -1
- package/dist/test/fakeArgv.js +6 -5
- package/dist/test/fakeArgv.js.map +1 -1
- package/dist/test/getBasePathFromUrl.spec.js +5 -10
- package/dist/test/getBasePathFromUrl.spec.js.map +1 -1
- package/dist/test/getStorageUrl.spec.js +22 -46
- package/dist/test/getStorageUrl.spec.js.map +1 -1
- package/dist/test/mockAuthApiHost.js +26 -28
- package/dist/test/mockAuthApiHost.js.map +1 -1
- package/dist/test/mockAuthorization.js +4 -10
- package/dist/test/mockAuthorization.js.map +1 -1
- package/dist/test/mockTenantDataStore.d.ts +1 -1
- package/dist/test/mockTenantDataStore.js +3 -5
- package/dist/test/mockTenantDataStore.js.map +1 -1
- package/dist/test/mockUserDataStore.d.ts +1 -1
- package/dist/test/mockUserDataStore.js +4 -6
- package/dist/test/mockUserDataStore.js.map +1 -1
- package/dist/test/registry/buildAuthorizedClient.spec.js +65 -87
- package/dist/test/registry/buildAuthorizedClient.spec.js.map +1 -1
- package/dist/test/session/buildJwt.spec.js +15 -19
- package/dist/test/session/buildJwt.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js.map +1 -1
- package/dist/test/testAsyncPage.spec.js +84 -105
- package/dist/test/testAsyncPage.spec.js.map +1 -1
- package/dist/test/testOpaCompileResponseParser.spec.js +192 -196
- package/dist/test/testOpaCompileResponseParser.spec.js.map +1 -1
- package/dist/test/util.js +1 -5
- package/dist/test/util.js.map +1 -1
- package/dist/unknown2Error.d.ts +2 -0
- package/dist/unknown2Error.js +3 -0
- package/dist/unknown2Error.js.map +1 -0
- package/dist/util/arrayToMaybe.d.ts +1 -1
- package/dist/util/arrayToMaybe.js +3 -6
- package/dist/util/arrayToMaybe.js.map +1 -1
- package/dist/util/cleanOrgTitle.js +1 -4
- package/dist/util/cleanOrgTitle.js.map +1 -1
- package/dist/util/escapeRegExp.js +1 -3
- package/dist/util/escapeRegExp.js.map +1 -1
- package/dist/util/getMinikubeIP.js +3 -9
- package/dist/util/getMinikubeIP.js.map +1 -1
- package/dist/util/isArray.js +1 -3
- package/dist/util/isArray.js.map +1 -1
- package/dist/util/isUuid.js +1 -3
- package/dist/util/isUuid.js.map +1 -1
- package/dist/util/unionToThrowable.d.ts +1 -1
- package/dist/util/unionToThrowable.js +3 -9
- package/dist/util/unionToThrowable.js.map +1 -1
- package/dist/utilityTypes.d.ts +1 -1
- package/dist/utilityTypes.js +1 -2
- package/package.json +44 -26
- package/dist/test/jsverify.d.ts +0 -2
- package/dist/test/jsverify.js +0 -8
- package/dist/test/jsverify.js.map +0 -1
package/dist/AspectBuilder.d.ts
CHANGED
package/dist/AspectBuilder.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
export default class AspectCreationFailure {
|
|
2
|
+
id;
|
|
3
|
+
error;
|
|
4
4
|
constructor(id, error) {
|
|
5
5
|
this.id = id;
|
|
6
6
|
this.error = error;
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
|
-
exports.default = AspectCreationFailure;
|
|
10
9
|
//# sourceMappingURL=AspectCreationFailure.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AspectCreationFailure.js","sourceRoot":"","sources":["../src/AspectCreationFailure.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AspectCreationFailure.js","sourceRoot":"","sources":["../src/AspectCreationFailure.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACjB;IAAqB;IAA1C,YAAqB,EAAU,EAAW,KAAY;QAAjC,OAAE,GAAF,EAAE,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;CAC7D"}
|
package/dist/AsyncPage.js
CHANGED
|
@@ -1,21 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.asyncPageToArray = exports.forEachAsync = void 0;
|
|
13
|
-
class AsyncPage {
|
|
14
|
-
constructor(data, hasData, requestNextPage) {
|
|
15
|
-
this.data = data;
|
|
16
|
-
this.hasData = hasData;
|
|
17
|
-
this.requestNextPage = requestNextPage;
|
|
18
|
-
}
|
|
1
|
+
export default class AsyncPage {
|
|
2
|
+
requestNextPage;
|
|
3
|
+
data;
|
|
4
|
+
hasData;
|
|
19
5
|
static create(next) {
|
|
20
6
|
const nextPage = (lastPage) => {
|
|
21
7
|
const nextPromise = next(lastPage);
|
|
@@ -38,34 +24,35 @@ class AsyncPage {
|
|
|
38
24
|
static none() {
|
|
39
25
|
return new AsyncPage(undefined, false, undefined);
|
|
40
26
|
}
|
|
27
|
+
constructor(data, hasData, requestNextPage) {
|
|
28
|
+
this.data = data;
|
|
29
|
+
this.hasData = hasData;
|
|
30
|
+
this.requestNextPage = requestNextPage;
|
|
31
|
+
}
|
|
41
32
|
map(selector) {
|
|
42
|
-
function loadNextPage(pager) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return new AsyncPage(data, nextPage.hasData, loadNextPageFunction);
|
|
50
|
-
});
|
|
33
|
+
async function loadNextPage(pager) {
|
|
34
|
+
const nextPage = await pager.requestNextPage();
|
|
35
|
+
const data = nextPage.hasData ? selector(nextPage.data) : undefined;
|
|
36
|
+
const loadNextPageFunction = nextPage.requestNextPage
|
|
37
|
+
? () => loadNextPage(nextPage)
|
|
38
|
+
: undefined;
|
|
39
|
+
return new AsyncPage(data, nextPage.hasData, loadNextPageFunction);
|
|
51
40
|
}
|
|
52
41
|
return new AsyncPage(this.hasData ? selector(this.data) : undefined, this.hasData, this.requestNextPage ? () => loadNextPage(this) : undefined);
|
|
53
42
|
}
|
|
54
|
-
forEach(callback) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
current = undefined;
|
|
66
|
-
}
|
|
43
|
+
async forEach(callback) {
|
|
44
|
+
let current = this;
|
|
45
|
+
while (current) {
|
|
46
|
+
if (current.hasData) {
|
|
47
|
+
callback(current.data);
|
|
48
|
+
}
|
|
49
|
+
if (current.requestNextPage) {
|
|
50
|
+
current = await current.requestNextPage();
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
current = undefined;
|
|
67
54
|
}
|
|
68
|
-
}
|
|
55
|
+
}
|
|
69
56
|
}
|
|
70
57
|
take(n) {
|
|
71
58
|
if (n === 0) {
|
|
@@ -77,47 +64,42 @@ class AsyncPage {
|
|
|
77
64
|
: undefined);
|
|
78
65
|
}
|
|
79
66
|
}
|
|
80
|
-
|
|
81
|
-
function forEachAsync(page, maxConcurrency, callbackFn) {
|
|
67
|
+
export function forEachAsync(page, maxConcurrency, callbackFn) {
|
|
82
68
|
let currentPromise = undefined;
|
|
83
69
|
let currentPage = page;
|
|
84
70
|
let currentIndex = 0;
|
|
85
71
|
let resultIndex = 0;
|
|
86
|
-
function getNext() {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
currentPage = yield currentPromise;
|
|
101
|
-
}
|
|
102
|
-
if (!currentPage.hasData || currentIndex >= currentPage.data.length) {
|
|
103
|
-
return undefined;
|
|
72
|
+
async function getNext() {
|
|
73
|
+
while (currentPage.requestNextPage &&
|
|
74
|
+
(!currentPage.hasData || currentIndex >= currentPage.data.length)) {
|
|
75
|
+
if (!currentPromise) {
|
|
76
|
+
currentPromise = currentPage
|
|
77
|
+
.requestNextPage()
|
|
78
|
+
.then((nextPage) => {
|
|
79
|
+
currentIndex = 0;
|
|
80
|
+
currentPromise = undefined;
|
|
81
|
+
currentPage = nextPage;
|
|
82
|
+
return nextPage;
|
|
83
|
+
});
|
|
104
84
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}
|
|
85
|
+
currentPage = await currentPromise;
|
|
86
|
+
}
|
|
87
|
+
if (!currentPage.hasData || currentIndex >= currentPage.data.length) {
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
return {
|
|
91
|
+
value: currentPage.data[currentIndex++],
|
|
92
|
+
index: resultIndex++
|
|
93
|
+
};
|
|
110
94
|
}
|
|
111
|
-
function callNext() {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
return callNext();
|
|
120
|
-
});
|
|
95
|
+
async function callNext() {
|
|
96
|
+
const next = await getNext();
|
|
97
|
+
if (!next) {
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
await callbackFn(next.value);
|
|
101
|
+
// Start the next value.
|
|
102
|
+
return callNext();
|
|
121
103
|
}
|
|
122
104
|
const promises = [];
|
|
123
105
|
for (var i = 0; i < maxConcurrency; ++i) {
|
|
@@ -127,8 +109,7 @@ function forEachAsync(page, maxConcurrency, callbackFn) {
|
|
|
127
109
|
return;
|
|
128
110
|
});
|
|
129
111
|
}
|
|
130
|
-
|
|
131
|
-
function asyncPageToArray(page) {
|
|
112
|
+
export function asyncPageToArray(page) {
|
|
132
113
|
const result = new Array();
|
|
133
114
|
return page
|
|
134
115
|
.forEach((value) => {
|
|
@@ -136,5 +117,4 @@ function asyncPageToArray(page) {
|
|
|
136
117
|
})
|
|
137
118
|
.then(() => result);
|
|
138
119
|
}
|
|
139
|
-
exports.asyncPageToArray = asyncPageToArray;
|
|
140
120
|
//# sourceMappingURL=AsyncPage.js.map
|
package/dist/AsyncPage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AsyncPage.js","sourceRoot":"","sources":["../src/AsyncPage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AsyncPage.js","sourceRoot":"","sources":["../src/AsyncPage.ts"],"names":[],"mappings":"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"}
|
package/dist/BaseApiClient.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ interface ApiKeyBasedConfigOptions extends ApiClientBaseConfig {
|
|
|
10
10
|
apiKeyId?: string;
|
|
11
11
|
apiKey?: string;
|
|
12
12
|
}
|
|
13
|
-
export
|
|
13
|
+
export type BaseApiClientConfig = JWTBasedConfigOptions & ApiKeyBasedConfigOptions;
|
|
14
14
|
export default abstract class BaseApiClient {
|
|
15
15
|
readonly authMode: "jwtToken" | "apiKey" | "noAuth";
|
|
16
16
|
protected baseApiUrl: string;
|
|
@@ -21,7 +21,7 @@ export default abstract class BaseApiClient {
|
|
|
21
21
|
readonly userId: string;
|
|
22
22
|
constructor(options: BaseApiClientConfig);
|
|
23
23
|
protected getBaseApiUri(): urijs;
|
|
24
|
-
protected setHeader(headers: HeadersInit | undefined | null, headerName: string, headerValue: string): string
|
|
24
|
+
protected setHeader(headers: HeadersInit | undefined | null, headerName: string, headerValue: string): Record<string, string> | Headers | [string, string][];
|
|
25
25
|
protected addAuthHeader(config?: RequestInit): {
|
|
26
26
|
body?: BodyInit;
|
|
27
27
|
cache?: RequestCache;
|
|
@@ -35,7 +35,7 @@ export default abstract class BaseApiClient {
|
|
|
35
35
|
referrer?: string;
|
|
36
36
|
referrerPolicy?: ReferrerPolicy;
|
|
37
37
|
signal?: AbortSignal;
|
|
38
|
-
window?:
|
|
38
|
+
window?: null;
|
|
39
39
|
};
|
|
40
40
|
}
|
|
41
41
|
export {};
|
package/dist/BaseApiClient.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
import urijs from "urijs";
|
|
2
|
+
import buildJwt from "./session/buildJwt.js";
|
|
3
|
+
export default class BaseApiClient {
|
|
4
|
+
authMode;
|
|
5
|
+
baseApiUrl;
|
|
6
|
+
baseApiUri;
|
|
7
|
+
jwtSecret;
|
|
8
|
+
apiKeyId;
|
|
9
|
+
apiKey;
|
|
10
|
+
userId;
|
|
9
11
|
constructor(options) {
|
|
10
12
|
this.baseApiUrl = options.baseApiUrl
|
|
11
13
|
? options.baseApiUrl
|
|
@@ -13,7 +15,7 @@ class BaseApiClient {
|
|
|
13
15
|
if (!this.baseApiUrl) {
|
|
14
16
|
throw new Error("IndexerApiClient: baseApiUrl cannot be empty!");
|
|
15
17
|
}
|
|
16
|
-
this.baseApiUri =
|
|
18
|
+
this.baseApiUri = urijs(this.baseApiUrl);
|
|
17
19
|
this.apiKey = options.apiKey;
|
|
18
20
|
this.apiKeyId = options.apiKeyId;
|
|
19
21
|
this.jwtSecret = options.jwtSecret;
|
|
@@ -51,13 +53,18 @@ class BaseApiClient {
|
|
|
51
53
|
let headers = config.headers;
|
|
52
54
|
headers = this.setHeader(headers, "X-Magda-API-Key-Id", this.apiKeyId);
|
|
53
55
|
headers = this.setHeader(headers, "X-Magda-API-Key", this.apiKey);
|
|
54
|
-
return
|
|
56
|
+
return {
|
|
57
|
+
...config,
|
|
58
|
+
headers
|
|
59
|
+
};
|
|
55
60
|
case "jwtToken":
|
|
56
|
-
return
|
|
61
|
+
return {
|
|
62
|
+
...config,
|
|
63
|
+
headers: this.setHeader(config.headers, "X-Magda-Session", buildJwt(this.jwtSecret, this.userId))
|
|
64
|
+
};
|
|
57
65
|
case "noAuth":
|
|
58
|
-
return
|
|
66
|
+
return { ...config };
|
|
59
67
|
}
|
|
60
68
|
}
|
|
61
69
|
}
|
|
62
|
-
exports.default = BaseApiClient;
|
|
63
70
|
//# sourceMappingURL=BaseApiClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseApiClient.js","sourceRoot":"","sources":["../src/BaseApiClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseApiClient.js","sourceRoot":"","sources":["../src/BaseApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAmB7C,MAAM,CAAC,OAAO,OAAgB,aAAa;IACvB,QAAQ,CAAmC;IAEjD,UAAU,CAAS;IACZ,UAAU,CAAQ;IACzB,SAAS,CAAS;IACZ,QAAQ,CAAS;IACvB,MAAM,CAAS;IACT,MAAM,CAAS;IAE/B,YAAY,OAA4B;QACpC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU;YAChC,CAAC,CAAC,OAAO,CAAC,UAAU;YACpB,CAAC,CAAC,0BAA0B,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;SACpE;QACD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC5B;aAAM,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE;YACtC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC;SAC9B;aAAM;YACH,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC5B;IACL,CAAC;IAES,aAAa;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;IAES,SAAS,CACf,OAAuC,EACvC,UAAkB,EAClB,WAAmB;QAEnB,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,GAAG,EAAE,CAAC;SAChB;QACD,IAAI,OAAO,YAAY,OAAO,EAAE;YAC5B,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YACrC,OAAO,OAAO,CAAC;SAClB;aAAM;YACF,OAAe,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;YAC3C,OAAO,OAAO,CAAC;SAClB;IACL,CAAC;IAES,aAAa,CAAC,MAAoB;QACxC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9B,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACnB,KAAK,QAAQ;gBACT,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;gBAC7B,OAAO,GAAG,IAAI,CAAC,SAAS,CACpB,OAAO,EACP,oBAAoB,EACpB,IAAI,CAAC,QAAQ,CAChB,CAAC;gBACF,OAAO,GAAG,IAAI,CAAC,SAAS,CACpB,OAAO,EACP,iBAAiB,EACjB,IAAI,CAAC,MAAM,CACd,CAAC;gBACF,OAAO;oBACH,GAAG,MAAM;oBACT,OAAO;iBACV,CAAC;YACN,KAAK,UAAU;gBACX,OAAO;oBACH,GAAG,MAAM;oBACT,OAAO,EAAE,IAAI,CAAC,SAAS,CACnB,MAAM,CAAC,OAAO,EACd,iBAAiB,EACjB,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CACxC;iBACJ,CAAC;YACN,KAAK,QAAQ;gBACT,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC;SAC5B;IACL,CAAC;CACJ"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import AspectCreationFailure from "./AspectCreationFailure";
|
|
2
|
-
import RecordCreationFailure from "./RecordCreationFailure";
|
|
1
|
+
import AspectCreationFailure from "./AspectCreationFailure.js";
|
|
2
|
+
import RecordCreationFailure from "./RecordCreationFailure.js";
|
|
3
3
|
export default class ConnectionResult {
|
|
4
4
|
aspectDefinitionsConnected: number;
|
|
5
5
|
organizationsConnected: number;
|
package/dist/ConnectionResult.js
CHANGED
|
@@ -1,24 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
this.organizationFailures = Array();
|
|
19
|
-
this.datasetFailures = Array();
|
|
20
|
-
this.distributionFailures = Array();
|
|
21
|
-
}
|
|
1
|
+
export default class ConnectionResult {
|
|
2
|
+
aspectDefinitionsConnected = 0;
|
|
3
|
+
organizationsConnected = 0;
|
|
4
|
+
datasetsConnected = 0;
|
|
5
|
+
distributionsConnected = 0;
|
|
6
|
+
recordsTrimmed = 0;
|
|
7
|
+
trimStillProcessing = false;
|
|
8
|
+
// skipped organizations due to user supplied record filter function
|
|
9
|
+
organizationsSkiped = 0;
|
|
10
|
+
// skipped dataset records due to user supplied record filter function
|
|
11
|
+
datasetsSkiped = 0;
|
|
12
|
+
// skipped distribution records due to user supplied record filter function
|
|
13
|
+
distributionsSkiped = 0;
|
|
14
|
+
aspectDefinitionFailures = Array();
|
|
15
|
+
organizationFailures = Array();
|
|
16
|
+
datasetFailures = Array();
|
|
17
|
+
distributionFailures = Array();
|
|
22
18
|
summarize() {
|
|
23
19
|
let result = "";
|
|
24
20
|
result +=
|
|
@@ -85,5 +81,4 @@ class ConnectionResult {
|
|
|
85
81
|
return total;
|
|
86
82
|
}
|
|
87
83
|
}
|
|
88
|
-
exports.default = ConnectionResult;
|
|
89
84
|
//# sourceMappingURL=ConnectionResult.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionResult.js","sourceRoot":"","sources":["../src/ConnectionResult.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConnectionResult.js","sourceRoot":"","sources":["../src/ConnectionResult.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export declare const RecordTypeMapping: {
|
|
|
4
4
|
Distribution: string;
|
|
5
5
|
Group: string;
|
|
6
6
|
};
|
|
7
|
-
export
|
|
7
|
+
export type RecordType = "Organization" | "Dataset" | "Distribution" | "Group";
|
|
8
8
|
export default class ConnectorRecordId {
|
|
9
9
|
readonly id: string;
|
|
10
10
|
readonly type: RecordType;
|
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.RecordTypeMapping = void 0;
|
|
7
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
8
|
-
exports.RecordTypeMapping = {
|
|
1
|
+
import * as crypto from "crypto";
|
|
2
|
+
export const RecordTypeMapping = {
|
|
9
3
|
Organization: "org",
|
|
10
4
|
Dataset: "ds",
|
|
11
5
|
Distribution: "dist",
|
|
12
6
|
Group: "gp"
|
|
13
7
|
};
|
|
14
|
-
class ConnectorRecordId {
|
|
8
|
+
export default class ConnectorRecordId {
|
|
9
|
+
id;
|
|
10
|
+
type;
|
|
11
|
+
sourceId;
|
|
15
12
|
constructor(id, type, sourceId) {
|
|
16
13
|
this.id = id;
|
|
17
14
|
this.type = type;
|
|
@@ -21,7 +18,7 @@ class ConnectorRecordId {
|
|
|
21
18
|
const id = [this.typeId, this.sourceId, this.id].join("-");
|
|
22
19
|
if (id.length > 100) {
|
|
23
20
|
// ID is too long, so hash the source record ID.
|
|
24
|
-
const hashedId =
|
|
21
|
+
const hashedId = crypto
|
|
25
22
|
.createHash("sha256")
|
|
26
23
|
.update(this.id, "utf8")
|
|
27
24
|
.digest("hex");
|
|
@@ -29,7 +26,7 @@ class ConnectorRecordId {
|
|
|
29
26
|
if (hashedFullId.length > 100) {
|
|
30
27
|
// It's _still_ too long, probably because the sourceId is excessively long.
|
|
31
28
|
// So hash the full ID, including the sourceId and typeId.
|
|
32
|
-
return
|
|
29
|
+
return crypto
|
|
33
30
|
.createHash("sha256")
|
|
34
31
|
.update(id, "utf8")
|
|
35
32
|
.digest("hex");
|
|
@@ -39,8 +36,7 @@ class ConnectorRecordId {
|
|
|
39
36
|
return id;
|
|
40
37
|
}
|
|
41
38
|
get typeId() {
|
|
42
|
-
return
|
|
39
|
+
return RecordTypeMapping[this.type];
|
|
43
40
|
}
|
|
44
41
|
}
|
|
45
|
-
exports.default = ConnectorRecordId;
|
|
46
42
|
//# sourceMappingURL=ConnectorRecordId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorRecordId.js","sourceRoot":"","sources":["../src/ConnectorRecordId.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConnectorRecordId.js","sourceRoot":"","sources":["../src/ConnectorRecordId.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,IAAI;IACb,YAAY,EAAE,MAAM;IACpB,KAAK,EAAE,IAAI;CACd,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAErB;IACA;IACA;IAHb,YACa,EAAU,EACV,IAAgB,EAChB,QAAgB;QAFhB,OAAE,GAAF,EAAE,CAAQ;QACV,SAAI,GAAJ,IAAI,CAAY;QAChB,aAAQ,GAAR,QAAQ,CAAQ;IAC1B,CAAC;IAEJ,QAAQ;QACJ,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;YACjB,gDAAgD;YAChD,MAAM,QAAQ,GAAG,MAAM;iBAClB,UAAU,CAAC,QAAQ,CAAC;iBACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC;iBACvB,MAAM,CAAC,KAAK,CAAC,CAAC;YACnB,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAC5D,GAAG,CACN,CAAC;YACF,IAAI,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE;gBAC3B,4EAA4E;gBAC5E,0DAA0D;gBAC1D,OAAO,MAAM;qBACR,UAAU,CAAC,QAAQ,CAAC;qBACpB,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC;qBAClB,MAAM,CAAC,KAAK,CAAC,CAAC;aACtB;YACD,OAAO,YAAY,CAAC;SACvB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAY,MAAM;QACd,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACJ"}
|
package/dist/IndexerApiClient.js
CHANGED
|
@@ -1,39 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const fetchRequest_1 = __importDefault(require("./fetchRequest"));
|
|
16
|
-
const BaseApiClient_1 = __importDefault(require("./BaseApiClient"));
|
|
17
|
-
class IndexerApiClient extends BaseApiClient_1.default {
|
|
1
|
+
import fetchRequest from "./fetchRequest.js";
|
|
2
|
+
import BaseApiClient from "./BaseApiClient.js";
|
|
3
|
+
export default class IndexerApiClient extends BaseApiClient {
|
|
18
4
|
constructor(options) {
|
|
19
5
|
super(options);
|
|
20
6
|
}
|
|
21
|
-
indexDataset(datasetId) {
|
|
22
|
-
return
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
.toString(), undefined, undefined, false, this.addAuthHeader());
|
|
27
|
-
});
|
|
7
|
+
async indexDataset(datasetId) {
|
|
8
|
+
return await fetchRequest("put", this.getBaseApiUri()
|
|
9
|
+
.segmentCoded("dataset")
|
|
10
|
+
.segmentCoded(datasetId)
|
|
11
|
+
.toString(), undefined, undefined, false, this.addAuthHeader());
|
|
28
12
|
}
|
|
29
|
-
deleteDataset(datasetId) {
|
|
30
|
-
return
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
.toString(), undefined, undefined, false, this.addAuthHeader());
|
|
35
|
-
});
|
|
13
|
+
async deleteDataset(datasetId) {
|
|
14
|
+
return await fetchRequest("delete", this.getBaseApiUri()
|
|
15
|
+
.segmentCoded("dataset")
|
|
16
|
+
.segmentCoded(datasetId)
|
|
17
|
+
.toString(), undefined, undefined, false, this.addAuthHeader());
|
|
36
18
|
}
|
|
37
19
|
}
|
|
38
|
-
exports.default = IndexerApiClient;
|
|
39
20
|
//# sourceMappingURL=IndexerApiClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IndexerApiClient.js","sourceRoot":"","sources":["../src/IndexerApiClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"IndexerApiClient.js","sourceRoot":"","sources":["../src/IndexerApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAC7C,OAAO,aAAsC,MAAM,oBAAoB,CAAC;AAcxE,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa;IACvD,YAAY,OAA4B;QACpC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,SAAiB;QAChC,OAAO,MAAM,YAAY,CACrB,KAAK,EACL,IAAI,CAAC,aAAa,EAAE;aACf,YAAY,CAAC,SAAS,CAAC;aACvB,YAAY,CAAC,SAAS,CAAC;aACvB,QAAQ,EAAE,EACf,SAAS,EACT,SAAS,EACT,KAAK,EACL,IAAI,CAAC,aAAa,EAAE,CACvB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,OAAO,MAAM,YAAY,CACrB,QAAQ,EACR,IAAI,CAAC,aAAa,EAAE;aACf,YAAY,CAAC,SAAS,CAAC;aACvB,YAAY,CAAC,SAAS,CAAC;aACvB,QAAQ,EAAE,EACf,SAAS,EACT,SAAS,EACT,KAAK,EACL,IAAI,CAAC,aAAa,EAAE,CACvB,CAAC;IACN,CAAC;CACJ"}
|
package/dist/JsonConnector.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Record } from "./generated/registry/api";
|
|
2
|
-
import AsyncPage from "./AsyncPage";
|
|
3
|
-
import { RecordType } from "./ConnectorRecordId";
|
|
4
|
-
import ConnectionResult from "./ConnectionResult";
|
|
5
|
-
import JsonTransformer from "./JsonTransformer";
|
|
6
|
-
import Registry from "./registry/AuthorizedRegistryClient";
|
|
7
|
-
export
|
|
1
|
+
import { Record } from "./generated/registry/api.js";
|
|
2
|
+
import AsyncPage from "./AsyncPage.js";
|
|
3
|
+
import { RecordType } from "./ConnectorRecordId.js";
|
|
4
|
+
import ConnectionResult from "./ConnectionResult.js";
|
|
5
|
+
import JsonTransformer from "./JsonTransformer.js";
|
|
6
|
+
import Registry from "./registry/AuthorizedRegistryClient.js";
|
|
7
|
+
export type RecordFilterFunctionType = (jsonData: any, type: "Dataset" | "Distribution" | "Organization") => boolean;
|
|
8
8
|
/**
|
|
9
9
|
* A base class for connectors for most any JSON-based catalog source.
|
|
10
10
|
*/
|
|
@@ -160,7 +160,7 @@ export interface JsonConnectorRunInteractiveOptions {
|
|
|
160
160
|
* Connector extra metadata
|
|
161
161
|
* Will be copied to records' source aspect automatically
|
|
162
162
|
*/
|
|
163
|
-
export
|
|
163
|
+
export type JsonConnectorConfigExtraMetaData = {
|
|
164
164
|
[k: string]: any;
|
|
165
165
|
};
|
|
166
166
|
/**
|
|
@@ -183,7 +183,7 @@ export declare type JsonConnectorConfigExtraMetaData = {
|
|
|
183
183
|
*
|
|
184
184
|
* data: Object; aspect data
|
|
185
185
|
*/
|
|
186
|
-
export
|
|
186
|
+
export type JsonConnectorConfigPresetAspect = {
|
|
187
187
|
id: string;
|
|
188
188
|
recordType?: RecordType;
|
|
189
189
|
opType?: "MERGE_LEFT" | "REPLACE" | "FILL" | "MERGE_RIGHT";
|