@x12i/memorix-retrieval 1.22.0 → 1.23.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/README.md +31 -0
- package/catalox-seeds/inputs/entity-descriptors/assets.json +7 -7
- package/catalox-seeds/inputs/entity-descriptors/vulnerabilities.json +7 -7
- package/catalox-seeds/inputs/item-descriptors/asset-detail-item.json +2 -2
- package/catalox-seeds/inputs/item-descriptors/topology-subnet-detail-item.json +2 -2
- package/catalox-seeds/inputs/item-descriptors/vulnerability-detail-item.json +2 -2
- package/catalox-seeds/inputs/list-descriptors/critical-vulnerabilities-slice.json +1 -1
- package/catalox-seeds/inputs/manifest.json +1 -1
- package/catalox-seeds/inputs/memorix-catalog-ids.json +1 -1
- package/catalox-seeds/memorix-retrieval-descriptors.manifest.json +33 -33
- package/dist/client/catalox-mongo-bootstrap.d.ts +13 -0
- package/dist/client/catalox-mongo-bootstrap.d.ts.map +1 -0
- package/dist/client/catalox-mongo-bootstrap.js +22 -0
- package/dist/client/catalox-mongo-bootstrap.js.map +1 -0
- package/dist/client/create-stack-from-env.js +2 -2
- package/dist/client/create-stack-from-env.js.map +1 -1
- package/dist/client/types.d.ts +11 -8
- package/dist/client/types.d.ts.map +1 -1
- package/dist/data/record-display-name.d.ts.map +1 -1
- package/dist/data/record-display-name.js +4 -0
- package/dist/data/record-display-name.js.map +1 -1
- package/dist/data/record-display-name.test.js +23 -0
- package/dist/data/record-display-name.test.js.map +1 -1
- package/dist/data/record-identity.d.ts +2 -2
- package/dist/data/record-identity.d.ts.map +1 -1
- package/dist/data/record-identity.js +23 -20
- package/dist/data/record-identity.js.map +1 -1
- package/dist/data/record-info.d.ts +2 -0
- package/dist/data/record-info.d.ts.map +1 -1
- package/dist/data/record-info.js +10 -0
- package/dist/data/record-info.js.map +1 -1
- package/dist/data/record-info.test.js +1 -0
- package/dist/data/record-info.test.js.map +1 -1
- package/dist/descriptors/catalog-ids.d.ts +2 -1
- package/dist/descriptors/catalog-ids.d.ts.map +1 -1
- package/dist/descriptors/catalog-ids.js +2 -1
- package/dist/descriptors/catalog-ids.js.map +1 -1
- package/dist/descriptors/descriptor-types.d.ts +14 -2
- package/dist/descriptors/descriptor-types.d.ts.map +1 -1
- package/dist/descriptors/internal-object-types.d.ts +3 -0
- package/dist/descriptors/internal-object-types.d.ts.map +1 -0
- package/dist/descriptors/internal-object-types.js +7 -0
- package/dist/descriptors/internal-object-types.js.map +1 -0
- package/dist/descriptors/load-list-descriptor.d.ts.map +1 -1
- package/dist/descriptors/load-list-descriptor.js +2 -1
- package/dist/descriptors/load-list-descriptor.js.map +1 -1
- package/dist/descriptors/normalize-list-sort.d.ts +5 -0
- package/dist/descriptors/normalize-list-sort.d.ts.map +1 -0
- package/dist/descriptors/normalize-list-sort.js +20 -0
- package/dist/descriptors/normalize-list-sort.js.map +1 -0
- package/dist/descriptors/validate-descriptor.d.ts +1 -0
- package/dist/descriptors/validate-descriptor.d.ts.map +1 -1
- package/dist/descriptors/validate-descriptor.js +25 -1
- package/dist/descriptors/validate-descriptor.js.map +1 -1
- package/dist/explorer/collection-records.d.ts +3 -2
- package/dist/explorer/collection-records.d.ts.map +1 -1
- package/dist/explorer/collection-records.js +4 -3
- package/dist/explorer/collection-records.js.map +1 -1
- package/dist/explorer/entity-graph.d.ts +2 -0
- package/dist/explorer/entity-graph.d.ts.map +1 -1
- package/dist/explorer/entity-graph.js +7 -1
- package/dist/explorer/entity-graph.js.map +1 -1
- package/dist/explorer/health.d.ts.map +1 -1
- package/dist/explorer/health.js +65 -30
- package/dist/explorer/health.js.map +1 -1
- package/dist/explorer/slice-index.d.ts.map +1 -1
- package/dist/explorer/slice-index.js +19 -11
- package/dist/explorer/slice-index.js.map +1 -1
- package/dist/explorer/unified-inventory.d.ts +3 -1
- package/dist/explorer/unified-inventory.d.ts.map +1 -1
- package/dist/explorer/unified-inventory.js +9 -2
- package/dist/explorer/unified-inventory.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/mongo/env.d.ts +2 -0
- package/dist/mongo/env.d.ts.map +1 -1
- package/dist/mongo/env.js +4 -0
- package/dist/mongo/env.js.map +1 -1
- package/dist/retrieval/fetch-full-record.d.ts +22 -0
- package/dist/retrieval/fetch-full-record.d.ts.map +1 -0
- package/dist/retrieval/fetch-full-record.js +68 -0
- package/dist/retrieval/fetch-full-record.js.map +1 -0
- package/dist/retrieval/fetch-item.js +4 -0
- package/dist/retrieval/fetch-item.js.map +1 -1
- package/dist/retrieval/fetch-list.d.ts.map +1 -1
- package/dist/retrieval/fetch-list.js +16 -7
- package/dist/retrieval/fetch-list.js.map +1 -1
- package/dist/retrieval/fetch-workspace-list.d.ts.map +1 -1
- package/dist/retrieval/fetch-workspace-list.js +18 -7
- package/dist/retrieval/fetch-workspace-list.js.map +1 -1
- package/dist/retrieval/graph-run-buckets.js +1 -1
- package/dist/retrieval/graph-run-buckets.js.map +1 -1
- package/dist/retrieval/graph-run-buckets.test.js +1 -1
- package/dist/retrieval/graph-run-buckets.test.js.map +1 -1
- package/dist/retrieval/graph-run-filters.d.ts.map +1 -1
- package/dist/retrieval/graph-run-filters.js +1 -1
- package/dist/retrieval/graph-run-filters.js.map +1 -1
- package/dist/retrieval/graph-run-filters.test.js +11 -11
- package/dist/retrieval/graph-run-filters.test.js.map +1 -1
- package/dist/retrieval/processing-overview.test.js +2 -2
- package/dist/retrieval/processing-overview.test.js.map +1 -1
- package/dist/retrieval/resolve-filters.d.ts.map +1 -1
- package/dist/retrieval/resolve-filters.js +0 -4
- package/dist/retrieval/resolve-filters.js.map +1 -1
- package/dist/retrieval/resolve-list-analytics.d.ts +5 -0
- package/dist/retrieval/resolve-list-analytics.d.ts.map +1 -0
- package/dist/retrieval/resolve-list-analytics.js +63 -0
- package/dist/retrieval/resolve-list-analytics.js.map +1 -0
- package/dist/retrieval/resolve-pagination-driver.js +2 -2
- package/dist/retrieval/resolve-pagination-driver.js.map +1 -1
- package/dist/retrieval/resolve-sort.d.ts +8 -6
- package/dist/retrieval/resolve-sort.d.ts.map +1 -1
- package/dist/retrieval/resolve-sort.js +38 -15
- package/dist/retrieval/resolve-sort.js.map +1 -1
- package/dist/tests/collection-parser.test.js +14 -0
- package/dist/tests/collection-parser.test.js.map +1 -1
- package/dist/tests/create-stack-from-env.test.js +4 -3
- package/dist/tests/create-stack-from-env.test.js.map +1 -1
- package/dist/tests/entity-graph.test.js +45 -0
- package/dist/tests/entity-graph.test.js.map +1 -1
- package/dist/tests/env.test.js +9 -1
- package/dist/tests/env.test.js.map +1 -1
- package/dist/tests/fetch-item.test.js +32 -0
- package/dist/tests/fetch-item.test.js.map +1 -1
- package/dist/tests/fetch-list.test.js +3 -3
- package/dist/tests/fetch-list.test.js.map +1 -1
- package/dist/tests/fetch-record-info.test.js +1 -0
- package/dist/tests/fetch-record-info.test.js.map +1 -1
- package/dist/tests/fixtures.js +3 -3
- package/dist/tests/fixtures.js.map +1 -1
- package/dist/tests/internal-object-types.test.d.ts +2 -0
- package/dist/tests/internal-object-types.test.d.ts.map +1 -0
- package/dist/tests/internal-object-types.test.js +16 -0
- package/dist/tests/internal-object-types.test.js.map +1 -0
- package/dist/tests/raw-reads.test.d.ts +2 -0
- package/dist/tests/raw-reads.test.d.ts.map +1 -0
- package/dist/tests/raw-reads.test.js +122 -0
- package/dist/tests/raw-reads.test.js.map +1 -0
- package/dist/tests/unified-inventory.test.js +1 -1
- package/dist/tests/unified-inventory.test.js.map +1 -1
- package/docs/EXPLORER-HOST-APIS.md +1 -1
- package/docs/MEMORIX-CATALOX-CONTRACTS.md +1 -1
- package/docs/MEMORIX-DATABASE-CONVENTIONS.md +27 -39
- package/package.json +2 -2
|
@@ -33,8 +33,15 @@ function compareSortValues(a, b, direction) {
|
|
|
33
33
|
}
|
|
34
34
|
return String(a).localeCompare(String(b), undefined, { numeric: true }) * mul;
|
|
35
35
|
}
|
|
36
|
-
function sortWorkspaceRows(rows,
|
|
37
|
-
rows.sort((a, b) =>
|
|
36
|
+
function sortWorkspaceRows(rows, sortKeys) {
|
|
37
|
+
rows.sort((a, b) => {
|
|
38
|
+
for (const sort of sortKeys) {
|
|
39
|
+
const cmp = compareSortValues(a[sort.property], b[sort.property], sort.direction);
|
|
40
|
+
if (cmp !== 0)
|
|
41
|
+
return cmp;
|
|
42
|
+
}
|
|
43
|
+
return 0;
|
|
44
|
+
});
|
|
38
45
|
}
|
|
39
46
|
function stampWorkspaceRow(row, entityName) {
|
|
40
47
|
const stamped = { ...row, entityName };
|
|
@@ -49,7 +56,8 @@ export async function fetchMemorixWorkspaceList(client, request = {}) {
|
|
|
49
56
|
const workspace = await loadMemorixWorkspaceListDescriptor(client, workspaceListId);
|
|
50
57
|
const limit = resolvePageLimit(workspace, request, client);
|
|
51
58
|
const offset = request.page?.offset ?? 0;
|
|
52
|
-
const
|
|
59
|
+
const sortKeys = (request.sort?.length ? request.sort : undefined) ??
|
|
60
|
+
(workspace.defaultSort?.length ? workspace.defaultSort : undefined);
|
|
53
61
|
const entityName = request.entityName?.trim();
|
|
54
62
|
if (entityName) {
|
|
55
63
|
const entityResult = await fetchMemorixListForEntity(client, {
|
|
@@ -141,8 +149,8 @@ export async function fetchMemorixWorkspaceList(client, request = {}) {
|
|
|
141
149
|
}));
|
|
142
150
|
}
|
|
143
151
|
}
|
|
144
|
-
if (
|
|
145
|
-
sortWorkspaceRows(mergedRows,
|
|
152
|
+
if (sortKeys) {
|
|
153
|
+
sortWorkspaceRows(mergedRows, sortKeys);
|
|
146
154
|
}
|
|
147
155
|
const pageRows = mergedRows.slice(offset, offset + limit);
|
|
148
156
|
const hasMore = mergedRows.length > offset + limit ||
|
|
@@ -159,8 +167,11 @@ export async function fetchMemorixWorkspaceList(client, request = {}) {
|
|
|
159
167
|
includedEntities,
|
|
160
168
|
discovery: { source: "catalox" },
|
|
161
169
|
};
|
|
162
|
-
if (
|
|
163
|
-
response.sort =
|
|
170
|
+
if (sortKeys) {
|
|
171
|
+
response.sort = sortKeys.map((key) => ({
|
|
172
|
+
property: key.property,
|
|
173
|
+
direction: key.direction,
|
|
174
|
+
}));
|
|
164
175
|
}
|
|
165
176
|
if (issues.length)
|
|
166
177
|
response.issues = issues;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-workspace-list.js","sourceRoot":"","sources":["../../src/retrieval/fetch-workspace-list.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,WAAW,EAA8B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,CAAC,MAAM,yBAAyB,GAAG,gCAAgC,CAAC;AAQ1E,SAAS,gBAAgB,CACvB,SAAqE,EACrE,OAAyC,EACzC,MAA8B;IAE9B,OAAO,IAAI,CAAC,GAAG,CACb,OAAO,CAAC,IAAI,EAAE,KAAK,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,EACxD,SAAS,CAAC,UAAU,CAAC,QAAQ,EAC7B,MAAM,CAAC,QAAQ,CAAC,YAAY,CAC7B,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,SAA2C,EAC3C,iBAA4B;IAE5B,IAAI,CAAC,iBAAiB,EAAE,MAAM;QAAE,OAAO,SAAS,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC3C,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CACtD,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAuC,EACvC,sBAA+C;IAE/C,OAAO,CACL,sBAAsB,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5C,sBAAsB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,uBAAuB,CAChC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,CAAU,EACV,CAAU,EACV,SAAyB;IAEzB,MAAM,GAAG,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,CAAC,GAAG,GAAG,CAAC;IAC9B,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC;IAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;IACzE,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnD,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC;IAChE,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC;AAChF,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"fetch-workspace-list.js","sourceRoot":"","sources":["../../src/retrieval/fetch-workspace-list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-run-buckets.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-buckets.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"graph-run-buckets.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-buckets.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ describe("graph-run bucket queries", () => {
|
|
|
17
17
|
});
|
|
18
18
|
it("buildGraphRunStatusForGraphQuery targets nested status path", () => {
|
|
19
19
|
expect(buildGraphRunStatusForGraphQuery("g1", "done")).toEqual({
|
|
20
|
-
"_graphRuns.g1.status": "done",
|
|
20
|
+
"_system._graphRuns.g1.status": "done",
|
|
21
21
|
});
|
|
22
22
|
});
|
|
23
23
|
it("buildGraphRunPendingForGraphQuery handles absent graph key", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-run-buckets.test.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-buckets.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,8BAA8B,EAC9B,+BAA+B,EAC/B,iCAAiC,EACjC,iCAAiC,EACjC,gCAAgC,GACjC,MAAM,wBAAwB,CAAC;AAEhC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,CAAC,GAAG,iCAAiC,EAAE,CAAC;QAC9C,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,CAAC,GAAG,8BAA8B,EAAE,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,CAAC,GAAG,+BAA+B,EAAE,CAAC;QAC5C,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,gCAAgC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAC7D,
|
|
1
|
+
{"version":3,"file":"graph-run-buckets.test.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-buckets.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,8BAA8B,EAC9B,+BAA+B,EAC/B,iCAAiC,EACjC,iCAAiC,EACjC,gCAAgC,GACjC,MAAM,wBAAwB,CAAC;AAEhC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,CAAC,GAAG,iCAAiC,EAAE,CAAC;QAC9C,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,CAAC,GAAG,8BAA8B,EAAE,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,CAAC,GAAG,+BAA+B,EAAE,CAAC;QAC5C,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,gCAAgC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAC7D,8BAA8B,EAAE,MAAM;SACvC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,CAAC,GAAG,iCAAiC,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-run-filters.d.ts","sourceRoot":"","sources":["../../src/retrieval/graph-run-filters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"graph-run-filters.d.ts","sourceRoot":"","sources":["../../src/retrieval/graph-run-filters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAkBpC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,mBAAmB,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsCzB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,GACxC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAMrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-run-filters.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-filters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"graph-run-filters.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-filters.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,13 @@ describe("compileGraphRunFilter", () => {
|
|
|
4
4
|
it("compiles graphRunStatus", () => {
|
|
5
5
|
expect(compileGraphRunFilter({
|
|
6
6
|
graphRunStatus: { graphId: "graph-qcrbz6t", status: "in_progress" },
|
|
7
|
-
})).toEqual({ "_graphRuns.graph-qcrbz6t.status": "in_progress" });
|
|
7
|
+
})).toEqual({ "_system._graphRuns.graph-qcrbz6t.status": "in_progress" });
|
|
8
8
|
});
|
|
9
9
|
it("compiles graphRunNotDone with absent OR not done", () => {
|
|
10
10
|
expect(compileGraphRunFilter({ graphRunNotDone: { graphId: "graph-qcrbz6t" } })).toEqual({
|
|
11
11
|
$or: [
|
|
12
|
-
{ "_graphRuns.graph-qcrbz6t": { $exists: false } },
|
|
13
|
-
{ "_graphRuns.graph-qcrbz6t.status": { $ne: "done" } },
|
|
12
|
+
{ "_system._graphRuns.graph-qcrbz6t": { $exists: false } },
|
|
13
|
+
{ "_system._graphRuns.graph-qcrbz6t.status": { $ne: "done" } },
|
|
14
14
|
],
|
|
15
15
|
});
|
|
16
16
|
});
|
|
@@ -21,13 +21,13 @@ describe("compileGraphRunFilter", () => {
|
|
|
21
21
|
before: "2026-06-01T00:00:00.000Z",
|
|
22
22
|
},
|
|
23
23
|
})).toEqual({
|
|
24
|
-
"_graphRuns.graph-qcrbz6t.completedAt": {
|
|
24
|
+
"_system._graphRuns.graph-qcrbz6t.completedAt": {
|
|
25
25
|
$lt: "2026-06-01T00:00:00.000Z",
|
|
26
26
|
},
|
|
27
27
|
});
|
|
28
28
|
});
|
|
29
29
|
it("compiles graphRunFailed", () => {
|
|
30
|
-
expect(compileGraphRunFilter({ graphRunFailed: { graphId: "graph-qcrbz6t" } })).toEqual({ "_graphRuns.graph-qcrbz6t.status": "failed" });
|
|
30
|
+
expect(compileGraphRunFilter({ graphRunFailed: { graphId: "graph-qcrbz6t" } })).toEqual({ "_system._graphRuns.graph-qcrbz6t.status": "failed" });
|
|
31
31
|
});
|
|
32
32
|
it("compiles graphRunStaleVersion including absent paths", () => {
|
|
33
33
|
expect(compileGraphRunFilter({
|
|
@@ -37,9 +37,9 @@ describe("compileGraphRunFilter", () => {
|
|
|
37
37
|
},
|
|
38
38
|
})).toEqual({
|
|
39
39
|
$or: [
|
|
40
|
-
{ "_graphRuns.graph-qcrbz6t": { $exists: false } },
|
|
41
|
-
{ "_graphRuns.graph-qcrbz6t.graphVersion": { $exists: false } },
|
|
42
|
-
{ "_graphRuns.graph-qcrbz6t.graphVersion": { $lt: "v2" } },
|
|
40
|
+
{ "_system._graphRuns.graph-qcrbz6t": { $exists: false } },
|
|
41
|
+
{ "_system._graphRuns.graph-qcrbz6t.graphVersion": { $exists: false } },
|
|
42
|
+
{ "_system._graphRuns.graph-qcrbz6t.graphVersion": { $lt: "v2" } },
|
|
43
43
|
],
|
|
44
44
|
});
|
|
45
45
|
});
|
|
@@ -51,11 +51,11 @@ describe("compileGraphRunFilter", () => {
|
|
|
51
51
|
$and: [
|
|
52
52
|
{
|
|
53
53
|
$or: [
|
|
54
|
-
{ "_graphRuns.graph-a": { $exists: false } },
|
|
55
|
-
{ "_graphRuns.graph-a.status": { $ne: "done" } },
|
|
54
|
+
{ "_system._graphRuns.graph-a": { $exists: false } },
|
|
55
|
+
{ "_system._graphRuns.graph-a.status": { $ne: "done" } },
|
|
56
56
|
],
|
|
57
57
|
},
|
|
58
|
-
{ "_graphRuns.graph-b.status": "failed" },
|
|
58
|
+
{ "_system._graphRuns.graph-b.status": "failed" },
|
|
59
59
|
],
|
|
60
60
|
});
|
|
61
61
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-run-filters.test.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-filters.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAEhC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CACJ,qBAAqB,CAAC;YACpB,cAAc,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE;SACpE,CAAC,CACH,CAAC,OAAO,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"graph-run-filters.test.js","sourceRoot":"","sources":["../../src/retrieval/graph-run-filters.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAEhC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CACJ,qBAAqB,CAAC;YACpB,cAAc,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE;SACpE,CAAC,CACH,CAAC,OAAO,CAAC,EAAE,yCAAyC,EAAE,aAAa,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CACJ,qBAAqB,CAAC,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CACzE,CAAC,OAAO,CAAC;YACR,GAAG,EAAE;gBACH,EAAE,kCAAkC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAC1D,EAAE,yCAAyC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;aAC/D;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CACJ,qBAAqB,CAAC;YACpB,uBAAuB,EAAE;gBACvB,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,0BAA0B;aACnC;SACF,CAAC,CACH,CAAC,OAAO,CAAC;YACR,8CAA8C,EAAE;gBAC9C,GAAG,EAAE,0BAA0B;aAChC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CACJ,qBAAqB,CAAC,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CACxE,CAAC,OAAO,CAAC,EAAE,yCAAyC,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,CACJ,qBAAqB,CAAC;YACpB,oBAAoB,EAAE;gBACpB,OAAO,EAAE,eAAe;gBACxB,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CACH,CAAC,OAAO,CAAC;YACR,GAAG,EAAE;gBACH,EAAE,kCAAkC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAC1D,EAAE,+CAA+C,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBACvE,EAAE,+CAA+C,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;aACnE;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CACJ,sBAAsB,CAAC;YACrB,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;YAC3C,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;SAC3C,CAAC,CACH,CAAC,OAAO,CAAC;YACR,IAAI,EAAE;gBACJ;oBACE,GAAG,EAAE;wBACH,EAAE,4BAA4B,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;wBACpD,EAAE,mCAAmC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;qBACzD;iBACF;gBACD,EAAE,mCAAmC,EAAE,QAAQ,EAAE;aAClD;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -27,8 +27,8 @@ describe("getProcessingOverview", () => {
|
|
|
27
27
|
const countDocuments = vi.fn(async (params) => {
|
|
28
28
|
if (params.query && "$expr" in params.query)
|
|
29
29
|
return 10;
|
|
30
|
-
if (params.query && "_graphRuns.g1.status" in params.query) {
|
|
31
|
-
const status = params.query["_graphRuns.g1.status"];
|
|
30
|
+
if (params.query && "_system._graphRuns.g1.status" in params.query) {
|
|
31
|
+
const status = params.query["_system._graphRuns.g1.status"];
|
|
32
32
|
if (status === "done")
|
|
33
33
|
return 7;
|
|
34
34
|
if (status === "failed")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-overview.test.js","sourceRoot":"","sources":["../../src/retrieval/processing-overview.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,EAAE,CAAC,IAAI,CAAC,qCAAqC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,MAAM,cAAc,EAAwD,CAAC;IAC5F,OAAO;QACL,GAAG,MAAM;QACT,uBAAuB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAC1C,SAAS,EAAE;gBACT;oBACE,EAAE,EAAE,QAAQ;oBACZ,UAAU,EAAE,QAAQ;oBACpB,KAAK,EAAE,QAAQ;oBACf,uBAAuB,EAAE,kBAAkB;oBAC3C,uBAAuB,EAAE,mBAAmB;oBAC5C,MAAM,EAAE,QAAiB;iBAC1B;aACF;YACD,MAAM,EAAE,SAAkB;YAC1B,SAAS,EAAE,iCAAiC;SAC7C,CAAC,CAAC;QACH,iCAAiC,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,YAAY,CAAC;KACnE,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,cAAc,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAA2C,EAAE,EAAE;YACjF,IAAI,MAAM,CAAC,KAAK,IAAI,OAAO,IAAI,MAAM,CAAC,KAAK;gBAAE,OAAO,EAAE,CAAC;YACvD,IAAI,MAAM,CAAC,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"processing-overview.test.js","sourceRoot":"","sources":["../../src/retrieval/processing-overview.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-filters.d.ts","sourceRoot":"","sources":["../../src/retrieval/resolve-filters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,uBAAuB,EACvB,kBAAkB,EAElB,2BAA2B,EAC5B,MAAM,oCAAoC,CAAC;AA4C5C,2FAA2F;AAC3F,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,2BAA2B,EACjC,cAAc,EAAE,kBAAkB,EAAE,GAAG,SAAS,GAC/C,kBAAkB,EAAE,CAUtB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,2BAA2B,EACjC,OAAO,EAAE,kBAAkB,EAAE,GAAG,SAAS,EACzC,iBAAiB,EAAE,MAAM,GACxB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"resolve-filters.d.ts","sourceRoot":"","sources":["../../src/retrieval/resolve-filters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,uBAAuB,EACvB,kBAAkB,EAElB,2BAA2B,EAC5B,MAAM,oCAAoC,CAAC;AA4C5C,2FAA2F;AAC3F,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,2BAA2B,EACjC,cAAc,EAAE,kBAAkB,EAAE,GAAG,SAAS,GAC/C,kBAAkB,EAAE,CAUtB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,2BAA2B,EACjC,OAAO,EAAE,kBAAkB,EAAE,GAAG,SAAS,EACzC,iBAAiB,EAAE,MAAM,GACxB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoCzB"}
|
|
@@ -50,7 +50,6 @@ export function resolveMemorixFilters(entity, list, filters, driverContentType)
|
|
|
50
50
|
const effectiveFilters = mergeListDescriptorFilters(list, filters);
|
|
51
51
|
if (!effectiveFilters.length)
|
|
52
52
|
return {};
|
|
53
|
-
const allowed = new Set((list.filters ?? []).map((f) => f.property));
|
|
54
53
|
const clauses = [];
|
|
55
54
|
for (const filter of effectiveFilters) {
|
|
56
55
|
const prop = entity.properties[filter.property];
|
|
@@ -60,9 +59,6 @@ export function resolveMemorixFilters(entity, list, filters, driverContentType)
|
|
|
60
59
|
if (!prop.filterable) {
|
|
61
60
|
throwRetrievalError("FILTER_PROPERTY_NOT_ALLOWED", `Property "${filter.property}" is not filterable`);
|
|
62
61
|
}
|
|
63
|
-
if (list.filters?.length && !allowed.has(filter.property)) {
|
|
64
|
-
throwRetrievalError("FILTER_PROPERTY_NOT_ALLOWED", `Filter property "${filter.property}" is not allowed on this list`);
|
|
65
|
-
}
|
|
66
62
|
const source = resolveMemorixPropertySource(entity, filter.property);
|
|
67
63
|
if (source.contentType !== driverContentType) {
|
|
68
64
|
throwRetrievalError("FILTER_PROPERTY_NOT_ALLOWED", `Filter property "${filter.property}" belongs to content type "${source.contentType}", not driver "${driverContentType}"`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-filters.js","sourceRoot":"","sources":["../../src/retrieval/resolve-filters.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resolve-filters.js","sourceRoot":"","sources":["../../src/retrieval/resolve-filters.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { MemorixRetrievalClient } from "../client/types.js";
|
|
2
|
+
import type { MemorixEntityDescriptor, MemorixEntityListDescriptor, MemorixListAnalyticsField } from "../descriptors/descriptor-types.js";
|
|
3
|
+
export declare function resolveListAnalyticsForPage(client: MemorixRetrievalClient, entity: MemorixEntityDescriptor, list: MemorixEntityListDescriptor, idsByField: Map<"entityId" | "eventId" | "knowledgeId", string[]>): Promise<Map<string, Map<string, unknown>>>;
|
|
4
|
+
export declare function mergeAnalyticsIntoRow(row: Record<string, unknown>, idField: "entityId" | "eventId" | "knowledgeId", idValue: string, analyticsValues: Map<string, Map<string, unknown>>, fields: MemorixListAnalyticsField[]): void;
|
|
5
|
+
//# sourceMappingURL=resolve-list-analytics.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-list-analytics.d.ts","sourceRoot":"","sources":["../../src/retrieval/resolve-list-analytics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,KAAK,EACV,uBAAuB,EACvB,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,oCAAoC,CAAC;AAG5C,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,2BAA2B,EACjC,UAAU,EAAE,GAAG,CAAC,UAAU,GAAG,SAAS,GAAG,aAAa,EAAE,MAAM,EAAE,CAAC,GAChE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CA4C5C;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,OAAO,EAAE,UAAU,GAAG,SAAS,GAAG,aAAa,EAC/C,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAClD,MAAM,EAAE,yBAAyB,EAAE,GAClC,IAAI,CAiBN"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { groupMemorixRecords } from "../aggregation/index.js";
|
|
2
|
+
import { resolveMemorixTargetFromDescriptor } from "../mongo/target-config.js";
|
|
3
|
+
export async function resolveListAnalyticsForPage(client, entity, list, idsByField) {
|
|
4
|
+
const analytics = list.analytics ?? [];
|
|
5
|
+
if (!analytics.length)
|
|
6
|
+
return new Map();
|
|
7
|
+
const target = resolveMemorixTargetFromDescriptor(entity);
|
|
8
|
+
const rowValues = new Map();
|
|
9
|
+
for (const field of analytics) {
|
|
10
|
+
const joinField = field.joinBy;
|
|
11
|
+
const ids = idsByField.get(joinField) ?? [];
|
|
12
|
+
const uniqueIds = [...new Set(ids)];
|
|
13
|
+
if (!uniqueIds.length)
|
|
14
|
+
continue;
|
|
15
|
+
const match = {
|
|
16
|
+
...(field.filters ?? {}),
|
|
17
|
+
[joinField]: { $in: uniqueIds },
|
|
18
|
+
};
|
|
19
|
+
const rows = await groupMemorixRecords(client, {
|
|
20
|
+
target,
|
|
21
|
+
collection: field.collection,
|
|
22
|
+
groupBy: joinField,
|
|
23
|
+
metrics: { value: field.metric },
|
|
24
|
+
filters: match,
|
|
25
|
+
});
|
|
26
|
+
for (const row of rows) {
|
|
27
|
+
const idValue = typeof row._id === "string" ? row._id : String(row._id ?? "");
|
|
28
|
+
if (!idValue)
|
|
29
|
+
continue;
|
|
30
|
+
const bucket = rowValues.get(idValue) ?? new Map();
|
|
31
|
+
bucket.set(field.field, row.value ?? field.onMissing?.defaultValue);
|
|
32
|
+
rowValues.set(idValue, bucket);
|
|
33
|
+
}
|
|
34
|
+
for (const id of uniqueIds) {
|
|
35
|
+
if (!rowValues.get(id)?.has(field.field)) {
|
|
36
|
+
const bucket = rowValues.get(id) ?? new Map();
|
|
37
|
+
bucket.set(field.field, field.onMissing?.defaultValue);
|
|
38
|
+
rowValues.set(id, bucket);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return rowValues;
|
|
43
|
+
}
|
|
44
|
+
export function mergeAnalyticsIntoRow(row, idField, idValue, analyticsValues, fields) {
|
|
45
|
+
const bucket = analyticsValues.get(idValue);
|
|
46
|
+
if (!bucket) {
|
|
47
|
+
for (const field of fields) {
|
|
48
|
+
if (field.onMissing?.defaultValue !== undefined) {
|
|
49
|
+
row[field.field] = field.onMissing.defaultValue;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
for (const field of fields) {
|
|
55
|
+
if (bucket.has(field.field)) {
|
|
56
|
+
row[field.field] = bucket.get(field.field);
|
|
57
|
+
}
|
|
58
|
+
else if (field.onMissing?.defaultValue !== undefined) {
|
|
59
|
+
row[field.field] = field.onMissing.defaultValue;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=resolve-list-analytics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-list-analytics.js","sourceRoot":"","sources":["../../src/retrieval/resolve-list-analytics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAE/E,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAA8B,EAC9B,MAA+B,EAC/B,IAAiC,EACjC,UAAiE;IAEjE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;IACvC,IAAI,CAAC,SAAS,CAAC,MAAM;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IAExC,MAAM,MAAM,GAAG,kCAAkC,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,IAAI,GAAG,EAAgC,CAAC;IAE1D,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC;QAC/B,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,SAAS;QAEhC,MAAM,KAAK,GAA4B;YACrC,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;YACxB,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE;SAChC,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE;YAC7C,MAAM;YACN,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE;YAChC,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;YAC9E,IAAI,CAAC,OAAO;gBAAE,SAAS;YACvB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,EAAmB,CAAC;YACpE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACpE,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACjC,CAAC;QAED,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,GAAG,EAAmB,CAAC;gBAC/D,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACvD,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,GAA4B,EAC5B,OAA+C,EAC/C,OAAe,EACf,eAAkD,EAClD,MAAmC;IAEnC,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,SAAS,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;gBAChD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC;YAClD,CAAC;QACH,CAAC;QACD,OAAO;IACT,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;aAAM,IAAI,KAAK,CAAC,SAAS,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;YACvD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC;QAClD,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { throwRetrievalError } from "../errors/errors.js";
|
|
2
2
|
export function resolvePaginationDriver(list, sort) {
|
|
3
3
|
const leading = list.leadingContentType;
|
|
4
|
-
if (!sort || sort.contentType === leading) {
|
|
4
|
+
if (!sort || sort.primary.contentType === leading) {
|
|
5
5
|
return leading;
|
|
6
6
|
}
|
|
7
7
|
if (list.allowSortDrivenLeadingOverride) {
|
|
8
|
-
return sort.contentType;
|
|
8
|
+
return sort.primary.contentType;
|
|
9
9
|
}
|
|
10
10
|
return leading;
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-pagination-driver.js","sourceRoot":"","sources":["../../src/retrieval/resolve-pagination-driver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,MAAM,UAAU,uBAAuB,CACrC,IAAiC,EACjC,IAA8B;IAE9B,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC;IACxC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-pagination-driver.js","sourceRoot":"","sources":["../../src/retrieval/resolve-pagination-driver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,MAAM,UAAU,uBAAuB,CACrC,IAAiC,EACjC,IAA8B;IAE9B,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC;IACxC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;QAClD,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAClC,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,MAA+B,EAC/B,eAAwB;IAExB,OAAO,CACL,MAAM,CAAC,QAAQ,CAAC,oBAAoB;QACpC,eAAe;QACf,WAAW,CACZ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,MAA+B,EAC/B,WAAmB;IAEnB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;QACtC,mBAAmB,CACjB,sBAAsB,EACtB,yBAAyB,WAAW,gBAAgB,MAAM,CAAC,EAAE,GAAG,CACjE,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import type { MemorixRetrievalClient } from "../client/types.js";
|
|
2
|
-
import type { MemorixEntityDescriptor, MemorixEntityListDescriptor } from "../descriptors/descriptor-types.js";
|
|
3
|
-
export type
|
|
2
|
+
import type { MemorixEntityDescriptor, MemorixEntityListDescriptor, MemorixListSort } from "../descriptors/descriptor-types.js";
|
|
3
|
+
export type ResolvedSortEntry = {
|
|
4
4
|
property: string;
|
|
5
5
|
direction: "asc" | "desc";
|
|
6
6
|
contentType: string;
|
|
7
7
|
mongoPath: string;
|
|
8
|
+
};
|
|
9
|
+
export type ResolvedSort = {
|
|
10
|
+
keys: ResolvedSortEntry[];
|
|
8
11
|
mongoSort: Record<string, 1 | -1>;
|
|
12
|
+
/** Primary (first) sort key — drives pagination driver resolution. */
|
|
13
|
+
primary: ResolvedSortEntry;
|
|
9
14
|
};
|
|
10
|
-
export declare function resolveMemorixSort(entity: MemorixEntityDescriptor, list: MemorixEntityListDescriptor, sort:
|
|
11
|
-
property: string;
|
|
12
|
-
direction: "asc" | "desc";
|
|
13
|
-
} | undefined, _client: MemorixRetrievalClient): ResolvedSort;
|
|
15
|
+
export declare function resolveMemorixSort(entity: MemorixEntityDescriptor, list: MemorixEntityListDescriptor, sort: MemorixListSort[] | MemorixListSort | undefined, _client: MemorixRetrievalClient): ResolvedSort;
|
|
14
16
|
//# sourceMappingURL=resolve-sort.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-sort.d.ts","sourceRoot":"","sources":["../../src/retrieval/resolve-sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EACV,uBAAuB,EACvB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"resolve-sort.d.ts","sourceRoot":"","sources":["../../src/retrieval/resolve-sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EACV,uBAAuB,EACvB,2BAA2B,EAC3B,eAAe,EAChB,MAAM,oCAAoC,CAAC;AAI5C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAClC,sEAAsE;IACtE,OAAO,EAAE,iBAAiB,CAAC;CAC5B,CAAC;AA+CF,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,2BAA2B,EACjC,IAAI,EAAE,eAAe,EAAE,GAAG,eAAe,GAAG,SAAS,EACrD,OAAO,EAAE,sBAAsB,GAC9B,YAAY,CA2Bd"}
|
|
@@ -1,28 +1,51 @@
|
|
|
1
1
|
import { throwRetrievalError } from "../errors/errors.js";
|
|
2
2
|
import { resolveMemorixPropertySource } from "./resolve-property-source.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
if (list.
|
|
9
|
-
|
|
3
|
+
function normalizeSortInput(sort, list) {
|
|
4
|
+
if (Array.isArray(sort) && sort.length)
|
|
5
|
+
return sort;
|
|
6
|
+
if (sort && !Array.isArray(sort) && "property" in sort)
|
|
7
|
+
return [sort];
|
|
8
|
+
if (list.defaultSort?.length)
|
|
9
|
+
return list.defaultSort;
|
|
10
|
+
throwRetrievalError("SORT_REQUIRED", "No sort specified and list has no defaultSort");
|
|
11
|
+
}
|
|
12
|
+
function resolveSortKey(entity, list, key) {
|
|
13
|
+
if (list.allowedSorts?.length && !list.allowedSorts.includes(key.property)) {
|
|
14
|
+
throwRetrievalError("SORT_PROPERTY_NOT_ALLOWED", `Sort property "${key.property}" is not allowed`);
|
|
10
15
|
}
|
|
11
|
-
const prop = entity.properties[
|
|
16
|
+
const prop = entity.properties[key.property];
|
|
12
17
|
if (!prop) {
|
|
13
|
-
throwRetrievalError("SORT_PROPERTY_NOT_ALLOWED", `Unknown sort property: ${
|
|
18
|
+
throwRetrievalError("SORT_PROPERTY_NOT_ALLOWED", `Unknown sort property: ${key.property}`);
|
|
14
19
|
}
|
|
15
20
|
if (!prop.sortable) {
|
|
16
|
-
throwRetrievalError("SORT_PROPERTY_NOT_ALLOWED", `Property "${
|
|
21
|
+
throwRetrievalError("SORT_PROPERTY_NOT_ALLOWED", `Property "${key.property}" is not sortable`);
|
|
17
22
|
}
|
|
18
|
-
const source = resolveMemorixPropertySource(entity,
|
|
19
|
-
const dir = resolved.direction === "desc" ? -1 : 1;
|
|
23
|
+
const source = resolveMemorixPropertySource(entity, key.property);
|
|
20
24
|
return {
|
|
21
|
-
property:
|
|
22
|
-
direction:
|
|
25
|
+
property: key.property,
|
|
26
|
+
direction: key.direction,
|
|
23
27
|
contentType: source.contentType,
|
|
24
28
|
mongoPath: source.fullPath,
|
|
25
|
-
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
export function resolveMemorixSort(entity, list, sort, _client) {
|
|
32
|
+
const keys = normalizeSortInput(sort, list).map((key) => resolveSortKey(entity, list, key));
|
|
33
|
+
if (keys.length > 1) {
|
|
34
|
+
const primaryContentType = keys[0].contentType;
|
|
35
|
+
for (let i = 1; i < keys.length; i += 1) {
|
|
36
|
+
if (keys[i].contentType !== primaryContentType) {
|
|
37
|
+
throwRetrievalError("SORT_PROPERTY_NOT_ALLOWED", `Compound sort key "${keys[i].property}" belongs to content type "${keys[i].contentType}", not "${primaryContentType}"`);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
const mongoSort = {};
|
|
42
|
+
for (const key of keys) {
|
|
43
|
+
mongoSort[key.mongoPath] = key.direction === "desc" ? -1 : 1;
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
keys,
|
|
47
|
+
mongoSort,
|
|
48
|
+
primary: keys[0],
|
|
26
49
|
};
|
|
27
50
|
}
|
|
28
51
|
//# sourceMappingURL=resolve-sort.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-sort.js","sourceRoot":"","sources":["../../src/retrieval/resolve-sort.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-sort.js","sourceRoot":"","sources":["../../src/retrieval/resolve-sort.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,5 +85,19 @@ describe("resolveMemorixRecordIdentity", () => {
|
|
|
85
85
|
}).source).toBe("id");
|
|
86
86
|
expect(resolveMemorixRecordIdentity("entity", { _id: "507f1f77bcf86cd799439011" }).source).toBe("mongo-id");
|
|
87
87
|
});
|
|
88
|
+
it("prefers top-level recordId over _id (live record format)", () => {
|
|
89
|
+
expect(resolveMemorixRecordIdentity("entity", {
|
|
90
|
+
_id: "6914a132880706529ece3da1",
|
|
91
|
+
recordId: "69d216ed358778e93215787e",
|
|
92
|
+
concept: {
|
|
93
|
+
identifier: { kind: "cveId", cveId: "CVE-2020-14882" },
|
|
94
|
+
title: "Oracle WebLogic Server RCE (CVE-2020-14882)",
|
|
95
|
+
},
|
|
96
|
+
})).toMatchObject({
|
|
97
|
+
recordId: "69d216ed358778e93215787e",
|
|
98
|
+
identityField: "recordId",
|
|
99
|
+
source: "recordId",
|
|
100
|
+
});
|
|
101
|
+
});
|
|
88
102
|
});
|
|
89
103
|
//# sourceMappingURL=collection-parser.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-parser.test.js","sourceRoot":"","sources":["../../src/tests/collection-parser.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"collection-parser.test.js","sourceRoot":"","sources":["../../src/tests/collection-parser.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { describe, expect, it, vi } from "vitest";
|
|
2
2
|
import { createMemorixRetrievalStackFromEnv } from "../client/create-stack-from-env.js";
|
|
3
|
-
vi.mock("
|
|
4
|
-
|
|
3
|
+
vi.mock("../client/catalox-mongo-bootstrap.js", () => ({
|
|
4
|
+
createMemorixCataloxFromEnv: vi.fn(async () => ({
|
|
5
5
|
catalox: {
|
|
6
6
|
withContext: vi.fn((ctx) => ({ ctx, bound: true })),
|
|
7
7
|
},
|
|
8
|
+
mongoStore: {},
|
|
8
9
|
})),
|
|
9
10
|
}));
|
|
10
11
|
vi.mock("../client/catalox-adapter.js", () => ({
|
|
@@ -22,7 +23,7 @@ describe("createMemorixRetrievalStackFromEnv", () => {
|
|
|
22
23
|
it("exposes the client xronox adapter on the stack", async () => {
|
|
23
24
|
const stack = await createMemorixRetrievalStackFromEnv({
|
|
24
25
|
appId: "memorix",
|
|
25
|
-
processEnv: { MEMORIX_APP_ID: "memorix" },
|
|
26
|
+
processEnv: { MEMORIX_APP_ID: "memorix", MONGO_URI: "mongodb://localhost:27017" },
|
|
26
27
|
});
|
|
27
28
|
expect(stack.xronox).toBe(stack.client.xronox);
|
|
28
29
|
expect(stack.appId).toBe("memorix");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-stack-from-env.test.js","sourceRoot":"","sources":["../../src/tests/create-stack-from-env.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,kCAAkC,EAAE,MAAM,oCAAoC,CAAC;AAExF,EAAE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"create-stack-from-env.test.js","sourceRoot":"","sources":["../../src/tests/create-stack-from-env.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,kCAAkC,EAAE,MAAM,oCAAoC,CAAC;AAExF,EAAE,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,2BAA2B,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,EAAE;YACP,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SACpD;QACD,UAAU,EAAE,EAAE;KACf,CAAC,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7C,6BAA6B,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;CAC5E,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7C,6BAA6B,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAChD,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;QACtC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;QACvC,UAAU,EAAE,EAAE;KACf,CAAC,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAClD,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,KAAK,GAAG,MAAM,kCAAkC,CAAC;YACrD,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,2BAA2B,EAAE;SAClF,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|