@party-stack/foundry-ontology 0.14.1 → 0.14.3
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/lib/adapter/convertLoadSubsetOptions.d.ts.map +1 -1
- package/lib/adapter/convertLoadSubsetOptions.js +15 -14
- package/lib/adapter/convertLoadSubsetOptions.js.map +1 -1
- package/lib/adapter/convertLoadSubsetOptions.test.js +14 -2
- package/lib/adapter/convertLoadSubsetOptions.test.js.map +1 -1
- package/lib/users/userCollectionOptions.d.ts +12 -0
- package/lib/users/userCollectionOptions.d.ts.map +1 -1
- package/lib/users/userCollectionOptions.js +14 -7
- package/lib/users/userCollectionOptions.js.map +1 -1
- package/lib/users/userCollectionOptions.test.d.ts +2 -0
- package/lib/users/userCollectionOptions.test.d.ts.map +1 -0
- package/lib/users/userCollectionOptions.test.js +18 -0
- package/lib/users/userCollectionOptions.test.js.map +1 -0
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertLoadSubsetOptions.d.ts","sourceRoot":"","sources":["../../src/adapter/convertLoadSubsetOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iBAAiB,EACjB,eAAe,EAElB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAa,iBAAiB,EAAgD,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"convertLoadSubsetOptions.d.ts","sourceRoot":"","sources":["../../src/adapter/convertLoadSubsetOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iBAAiB,EACjB,eAAe,EAElB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAa,iBAAiB,EAAgD,MAAM,cAAc,CAAC;AAiI1G,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,GAAG,OAAO,CAElF;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,SAAS,CAiGzG;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,GAAG,eAAe,GAAG,SAAS,CAS3G"}
|
|
@@ -120,17 +120,19 @@ export function convertLoadSubsetFilter(filter) {
|
|
|
120
120
|
not: (filter) => filter.safeToNegate
|
|
121
121
|
? pushdown({ type: "not", value: filter.query })
|
|
122
122
|
: pushdown(ALWAYS_TRUE_FILTER, false),
|
|
123
|
-
eq: (field, value) => pushdown(value
|
|
124
|
-
?
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
123
|
+
eq: (field, value) => pushdown(value === null
|
|
124
|
+
? ALWAYS_FALSE_FILTER
|
|
125
|
+
: value === undefined
|
|
126
|
+
? {
|
|
127
|
+
type: "isNull",
|
|
128
|
+
propertyIdentifier: fieldPathToPropertyIdentifier(field),
|
|
129
|
+
value: true,
|
|
130
|
+
}
|
|
131
|
+
: {
|
|
132
|
+
type: "eq",
|
|
133
|
+
propertyIdentifier: fieldPathToPropertyIdentifier(field),
|
|
134
|
+
value: convertQueryValue(value),
|
|
135
|
+
}),
|
|
134
136
|
gt: (field, value) => pushdown(value == null
|
|
135
137
|
? ALWAYS_FALSE_FILTER
|
|
136
138
|
: {
|
|
@@ -159,7 +161,7 @@ export function convertLoadSubsetFilter(filter) {
|
|
|
159
161
|
propertyIdentifier: fieldPathToPropertyIdentifier(field),
|
|
160
162
|
value: convertQueryValue(value),
|
|
161
163
|
}),
|
|
162
|
-
|
|
164
|
+
isUndefined: (field) => ({
|
|
163
165
|
query: {
|
|
164
166
|
type: "isNull",
|
|
165
167
|
propertyIdentifier: fieldPathToPropertyIdentifier(field),
|
|
@@ -171,8 +173,7 @@ export function convertLoadSubsetFilter(filter) {
|
|
|
171
173
|
type: "in",
|
|
172
174
|
propertyIdentifier: fieldPathToPropertyIdentifier(field),
|
|
173
175
|
value: value
|
|
174
|
-
.filter((entry) => entry !== null &&
|
|
175
|
-
entry !== undefined)
|
|
176
|
+
.filter((entry) => entry !== null && entry !== undefined)
|
|
176
177
|
.map(convertQueryValue),
|
|
177
178
|
}),
|
|
178
179
|
ilike: convertLikeFilter,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertLoadSubsetOptions.js","sourceRoot":"","sources":["../../src/adapter/convertLoadSubsetOptions.ts"],"names":[],"mappings":"AAOA,OAAO,EAAgC,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC1G,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,mBAAmB,GAAsB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AACzE,MAAM,kBAAkB,GAAsB,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"convertLoadSubsetOptions.js","sourceRoot":"","sources":["../../src/adapter/convertLoadSubsetOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { compileSingleRowExpression, eq, gt, ilike, IR, like, lt, not } from "@tanstack/db";
|
|
1
|
+
import { compileSingleRowExpression, eq, gt, ilike, IR, isUndefined, like, lt, not, } from "@tanstack/db";
|
|
2
2
|
import { Temporal } from "temporal-polyfill";
|
|
3
3
|
import { describe, expect, it } from "vitest";
|
|
4
4
|
import { convertLoadSubsetFilter, isAlwaysFalseFilter } from "./convertLoadSubsetOptions.js";
|
|
@@ -42,8 +42,20 @@ function evaluateFoundryTextPushdown(filter, row) {
|
|
|
42
42
|
throw new Error(`Unsupported Foundry test filter: ${filter.type}`);
|
|
43
43
|
}
|
|
44
44
|
describe("convertLoadSubsetFilter", () => {
|
|
45
|
-
it("
|
|
45
|
+
it("treats null equality as an empty result", () => {
|
|
46
46
|
const filter = convertLoadSubsetFilter(eq(new IR.PropRef(["completedAt"]), null));
|
|
47
|
+
expect(isAlwaysFalseFilter(filter)).toBe(true);
|
|
48
|
+
});
|
|
49
|
+
it("converts undefined equality to a Foundry isNull filter", () => {
|
|
50
|
+
const filter = convertLoadSubsetFilter(eq(new IR.PropRef(["completedAt"]), undefined));
|
|
51
|
+
expect(filter).toEqual({
|
|
52
|
+
type: "isNull",
|
|
53
|
+
propertyIdentifier: { type: "property", apiName: "completedAt" },
|
|
54
|
+
value: true,
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
it("converts isUndefined to a Foundry isNull filter", () => {
|
|
58
|
+
const filter = convertLoadSubsetFilter(isUndefined(new IR.PropRef(["completedAt"])));
|
|
47
59
|
expect(filter).toEqual({
|
|
48
60
|
type: "isNull",
|
|
49
61
|
propertyIdentifier: { type: "property", apiName: "completedAt" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertLoadSubsetOptions.test.js","sourceRoot":"","sources":["../../src/adapter/convertLoadSubsetOptions.test.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"convertLoadSubsetOptions.test.js","sourceRoot":"","sources":["../../src/adapter/convertLoadSubsetOptions.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
import { type Lens } from "@party-stack/ontology";
|
|
2
|
+
import { LoadSubsetOptions } from "@tanstack/db";
|
|
2
3
|
import type { Client } from "@party-stack/foundry-client";
|
|
4
|
+
type UsersQuery = {
|
|
5
|
+
type: "getBatch";
|
|
6
|
+
ids: string[];
|
|
7
|
+
} | {
|
|
8
|
+
type: "search";
|
|
9
|
+
query: string;
|
|
10
|
+
} | {
|
|
11
|
+
type: "list";
|
|
12
|
+
};
|
|
3
13
|
export interface UserCollectionOpts {
|
|
4
14
|
client: Client;
|
|
5
15
|
lens: Lens;
|
|
@@ -8,4 +18,6 @@ export declare function userCollectionOptions({ client, lens }: UserCollectionOp
|
|
|
8
18
|
schema?: never;
|
|
9
19
|
utils: import("@tanstack/query-db-collection").QueryCollectionUtils<Record<string, unknown>, string | number, Record<string, unknown>, unknown>;
|
|
10
20
|
};
|
|
21
|
+
export declare function convertQuery(options: LoadSubsetOptions | undefined, lens: Lens): UsersQuery;
|
|
22
|
+
export {};
|
|
11
23
|
//# sourceMappingURL=userCollectionOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userCollectionOptions.d.ts","sourceRoot":"","sources":["../../src/users/userCollectionOptions.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"userCollectionOptions.d.ts","sourceRoot":"","sources":["../../src/users/userCollectionOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAoD,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAa,iBAAiB,EAAgD,MAAM,cAAc,CAAC;AAG1G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAK1D,KAAK,UAAU,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAM7G,MAAM,WAAW,kBAAkB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;CACd;AAED,wBAAgB,qBAAqB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,kBAAkB;;;EAgEzE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,EAAE,IAAI,EAAE,IAAI,GAAG,UAAU,CA0D3F"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Users } from "@osdk/foundry.admin";
|
|
2
|
-
import { applyLensToObject, mapTargetPathToSourceWithLens
|
|
3
|
-
import { parseOrderByExpression, parseWhereExpression
|
|
2
|
+
import { applyLensToObject, mapTargetPathToSourceWithLens } from "@party-stack/ontology";
|
|
3
|
+
import { parseOrderByExpression, parseWhereExpression } from "@tanstack/db";
|
|
4
4
|
import { QueryClient } from "@tanstack/query-core";
|
|
5
5
|
import { queryCollectionOptions } from "@tanstack/query-db-collection";
|
|
6
6
|
import * as AsyncIterable from "../utils/AsyncIterable.js";
|
|
@@ -26,9 +26,7 @@ export function userCollectionOptions({ client, lens }) {
|
|
|
26
26
|
// The max batch size here is 500 (https://www.palantir.com/docs/foundry/api/v2/admin-v2-resources/users/get-users-batch)
|
|
27
27
|
const chunks = chunk(query.ids, 500);
|
|
28
28
|
const results = await Promise.all(chunks.map((chunk) => Users.getBatch(client, chunk.map((userId) => ({ userId })))));
|
|
29
|
-
return results
|
|
30
|
-
.flatMap((result) => Object.values(result.data))
|
|
31
|
-
.map(project);
|
|
29
|
+
return results.flatMap((result) => Object.values(result.data)).map(project);
|
|
32
30
|
}
|
|
33
31
|
const queryString = query.type === "search" ? query.query : "";
|
|
34
32
|
let limit;
|
|
@@ -50,7 +48,7 @@ export function userCollectionOptions({ client, lens }) {
|
|
|
50
48
|
},
|
|
51
49
|
});
|
|
52
50
|
}
|
|
53
|
-
function convertQuery(options, lens) {
|
|
51
|
+
export function convertQuery(options, lens) {
|
|
54
52
|
if (!options) {
|
|
55
53
|
return { type: "list" };
|
|
56
54
|
}
|
|
@@ -79,10 +77,19 @@ function convertQuery(options, lens) {
|
|
|
79
77
|
}
|
|
80
78
|
const maybeSearchQuery = parseWhereExpression(options.where, {
|
|
81
79
|
handlers: {
|
|
80
|
+
or: (...queries) => {
|
|
81
|
+
if (queries.length > 0 &&
|
|
82
|
+
queries.every((query) => query?.type === "search") &&
|
|
83
|
+
queries.every((query) => query.query === queries[0].query)) {
|
|
84
|
+
// Foundry's user search applies one query across the supported name fields,
|
|
85
|
+
// so ORs over those fields can share one server-side search when their terms match.
|
|
86
|
+
return queries[0];
|
|
87
|
+
}
|
|
88
|
+
},
|
|
82
89
|
like: (field, value) => getLikeQuery(rewriteFieldPath(field, lens), value),
|
|
83
90
|
ilike: (field, value) => getLikeQuery(rewriteFieldPath(field, lens), value),
|
|
84
|
-
onUnknownOperator: () => undefined,
|
|
85
91
|
},
|
|
92
|
+
onUnknownOperator: () => undefined,
|
|
86
93
|
}) ?? undefined;
|
|
87
94
|
if (maybeSearchQuery) {
|
|
88
95
|
return maybeSearchQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userCollectionOptions.js","sourceRoot":"","sources":["../../src/users/userCollectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"userCollectionOptions.js","sourceRoot":"","sources":["../../src/users/userCollectionOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userCollectionOptions.test.d.ts","sourceRoot":"","sources":["../../src/users/userCollectionOptions.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { ilike, IR, or } from "@tanstack/db";
|
|
2
|
+
import { describe, expect, it } from "vitest";
|
|
3
|
+
import { convertQuery } from "./userCollectionOptions.js";
|
|
4
|
+
const identityLens = { operations: [] };
|
|
5
|
+
describe("convertQuery", () => {
|
|
6
|
+
it("converts OR-wrapped ilike predicates with the same term to a user search", () => {
|
|
7
|
+
const where = or(ilike(new IR.PropRef(["username"]), "alex%"), ilike(new IR.PropRef(["givenName"]), "alex%"), ilike(new IR.PropRef(["familyName"]), "alex%"));
|
|
8
|
+
expect(convertQuery({ where }, identityLens)).toEqual({
|
|
9
|
+
type: "search",
|
|
10
|
+
query: "alex",
|
|
11
|
+
});
|
|
12
|
+
});
|
|
13
|
+
it("falls back to listing when OR search terms differ", () => {
|
|
14
|
+
const where = or(ilike(new IR.PropRef(["givenName"]), "alex%"), ilike(new IR.PropRef(["familyName"]), "robin%"));
|
|
15
|
+
expect(convertQuery({ where }, identityLens)).toEqual({ type: "list" });
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
//# sourceMappingURL=userCollectionOptions.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userCollectionOptions.test.js","sourceRoot":"","sources":["../../src/users/userCollectionOptions.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,YAAY,GAAG,EAAE,UAAU,EAAE,EAAE,EAAiB,CAAC;AAEvD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAChF,MAAM,KAAK,GAAG,EAAE,CACZ,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAS,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,EACpD,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAS,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,EACrD,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAS,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,CACzD,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;YAClD,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,MAAM;SAChB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,MAAM,KAAK,GAAG,EAAE,CACZ,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAS,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,EACrD,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAS,CAAC,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAC1D,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@party-stack/foundry-ontology",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -40,9 +40,9 @@
|
|
|
40
40
|
"@party-stack/connections": "0.2.2",
|
|
41
41
|
"@party-stack/errors": "0.2.0",
|
|
42
42
|
"@party-stack/foundry-client": "0.3.0",
|
|
43
|
+
"@party-stack/foundry-object-set-watcher": "0.5.1",
|
|
43
44
|
"@party-stack/oauth": "0.2.2",
|
|
44
|
-
"@party-stack/
|
|
45
|
-
"@party-stack/ontology": "0.15.0",
|
|
45
|
+
"@party-stack/ontology": "0.16.1",
|
|
46
46
|
"@party-stack/runtime": "0.3.2"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|