@osdk/client 2.5.0 → 2.5.2
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/CHANGELOG.md +18 -0
- package/build/browser/Client.js +1 -1
- package/build/browser/Client.js.map +1 -1
- package/build/browser/queries/applyQuery.js +2 -0
- package/build/browser/queries/applyQuery.js.map +1 -1
- package/build/browser/util/UserAgent.js +2 -2
- package/build/browser/util/toDataValueQueries.js +2 -2
- package/build/browser/util/toDataValueQueries.js.map +1 -1
- package/build/cjs/{chunk-KODTFRP3.cjs → chunk-MEL46GIF.cjs} +2 -2
- package/build/cjs/{chunk-KODTFRP3.cjs.map → chunk-MEL46GIF.cjs.map} +1 -1
- package/build/cjs/{chunk-UMET26AF.cjs → chunk-SDFKR62Z.cjs} +55 -55
- package/build/cjs/chunk-SDFKR62Z.cjs.map +1 -0
- package/build/cjs/index.cjs +7 -7
- package/build/cjs/public/internal.cjs +8 -8
- package/build/cjs/public/unstable-do-not-use.cjs +31 -31
- package/build/esm/Client.js +1 -1
- package/build/esm/Client.js.map +1 -1
- package/build/esm/queries/applyQuery.js +2 -0
- package/build/esm/queries/applyQuery.js.map +1 -1
- package/build/esm/util/UserAgent.js +2 -2
- package/build/esm/util/toDataValueQueries.js +2 -2
- package/build/esm/util/toDataValueQueries.js.map +1 -1
- package/build/types/Client.d.ts +1 -1
- package/build/types/queries/applyQuery.d.ts.map +1 -1
- package/package.json +8 -8
- package/build/cjs/chunk-UMET26AF.cjs.map +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
4
|
-
var
|
|
3
|
+
var chunkSDFKR62Z_cjs = require('../chunk-SDFKR62Z.cjs');
|
|
4
|
+
var chunkMEL46GIF_cjs = require('../chunk-MEL46GIF.cjs');
|
|
5
5
|
require('../chunk-Q7SFCCGT.cjs');
|
|
6
6
|
var trie = require('@wry/trie');
|
|
7
7
|
var deepEqual5 = require('fast-deep-equal');
|
|
@@ -142,7 +142,7 @@ var WhereClauseCanonicalizer = class {
|
|
|
142
142
|
var whereCanonicalizer = new WhereClauseCanonicalizer();
|
|
143
143
|
var orderByCanonicalizer = new OrderByCanonicalizer();
|
|
144
144
|
function computeObjectSetCacheKey(objectSet, options) {
|
|
145
|
-
const keyParts = ["objectSet",
|
|
145
|
+
const keyParts = ["objectSet", chunkMEL46GIF_cjs.getWireObjectSet(objectSet)];
|
|
146
146
|
if (!options) {
|
|
147
147
|
return JSON.stringify(keyParts);
|
|
148
148
|
}
|
|
@@ -154,13 +154,13 @@ function computeObjectSetCacheKey(objectSet, options) {
|
|
|
154
154
|
keyParts.push("props", propKeys);
|
|
155
155
|
}
|
|
156
156
|
if (options.union && options.union.length > 0) {
|
|
157
|
-
keyParts.push("union", options.union.map((os) =>
|
|
157
|
+
keyParts.push("union", options.union.map((os) => chunkMEL46GIF_cjs.getWireObjectSet(os)));
|
|
158
158
|
}
|
|
159
159
|
if (options.intersect && options.intersect.length > 0) {
|
|
160
|
-
keyParts.push("intersect", options.intersect.map((os) =>
|
|
160
|
+
keyParts.push("intersect", options.intersect.map((os) => chunkMEL46GIF_cjs.getWireObjectSet(os)));
|
|
161
161
|
}
|
|
162
162
|
if (options.subtract && options.subtract.length > 0) {
|
|
163
|
-
keyParts.push("subtract", options.subtract.map((os) =>
|
|
163
|
+
keyParts.push("subtract", options.subtract.map((os) => chunkMEL46GIF_cjs.getWireObjectSet(os)));
|
|
164
164
|
}
|
|
165
165
|
if (options.pivotTo) {
|
|
166
166
|
keyParts.push("pivotTo", options.pivotTo);
|
|
@@ -319,7 +319,7 @@ var OptimisticJob = class {
|
|
|
319
319
|
return this;
|
|
320
320
|
},
|
|
321
321
|
createObject(type, pk, properties) {
|
|
322
|
-
const create = store.client[
|
|
322
|
+
const create = store.client[chunkMEL46GIF_cjs.additionalContext].objectFactory2(store.client[chunkMEL46GIF_cjs.additionalContext], [{
|
|
323
323
|
$primaryKey: pk,
|
|
324
324
|
$apiName: type.apiName,
|
|
325
325
|
$objectType: type.apiName,
|
|
@@ -1003,7 +1003,7 @@ var Query = class {
|
|
|
1003
1003
|
this.store = store;
|
|
1004
1004
|
this.cacheKeys = store.cacheKeys;
|
|
1005
1005
|
this.#subject = observable;
|
|
1006
|
-
this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[
|
|
1006
|
+
this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkMEL46GIF_cjs.additionalContext].logger : store.client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
|
|
1007
1007
|
msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
|
|
1008
1008
|
}));
|
|
1009
1009
|
}
|
|
@@ -1576,7 +1576,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
|
|
|
1576
1576
|
batch.changes.modified.add(this.cacheKey);
|
|
1577
1577
|
}
|
|
1578
1578
|
constructor(store, subject, cacheKey, opts) {
|
|
1579
|
-
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[
|
|
1579
|
+
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
|
|
1580
1580
|
msgPrefix: `SpecificLinkQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
|
|
1581
1581
|
}) : void 0);
|
|
1582
1582
|
[this.#sourceApiName, this.#sourcePk, this.#linkName, this.#whereClause, this.#orderBy] = cacheKey.otherKeys;
|
|
@@ -1593,7 +1593,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
|
|
|
1593
1593
|
type: "object",
|
|
1594
1594
|
apiName: this.#sourceApiName
|
|
1595
1595
|
};
|
|
1596
|
-
const sourceMetadata = await client[
|
|
1596
|
+
const sourceMetadata = await client[chunkMEL46GIF_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
|
|
1597
1597
|
const sourceQuery = client(sourceObjectDef).where({
|
|
1598
1598
|
[sourceMetadata.primaryKeyApiName]: this.#sourcePk
|
|
1599
1599
|
});
|
|
@@ -1657,7 +1657,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
|
|
|
1657
1657
|
return this.revalidate(true);
|
|
1658
1658
|
} else {
|
|
1659
1659
|
return (async () => {
|
|
1660
|
-
const sourceMetadata = await this.store.client[
|
|
1660
|
+
const sourceMetadata = await this.store.client[chunkMEL46GIF_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
|
|
1661
1661
|
const linkDef = sourceMetadata.links?.[this.#linkName];
|
|
1662
1662
|
if (!linkDef || linkDef.targetType !== objectType) return;
|
|
1663
1663
|
const promise = this.revalidate(true);
|
|
@@ -1788,7 +1788,7 @@ var ListQuery = class extends BaseListQuery {
|
|
|
1788
1788
|
batch.changes.registerList(this.cacheKey);
|
|
1789
1789
|
}
|
|
1790
1790
|
constructor(store, subject, apiName, whereClause, orderBy, cacheKey, opts) {
|
|
1791
|
-
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[
|
|
1791
|
+
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
|
|
1792
1792
|
msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
|
|
1793
1793
|
}) : void 0);
|
|
1794
1794
|
this.apiName = apiName;
|
|
@@ -2080,7 +2080,7 @@ var InterfaceListQuery = class extends ListQuery {
|
|
|
2080
2080
|
}
|
|
2081
2081
|
extractRelevantObjects(changes) {
|
|
2082
2082
|
const matchesApiName = ([, object]) => {
|
|
2083
|
-
return this.apiName in object[
|
|
2083
|
+
return this.apiName in object[chunkSDFKR62Z_cjs.ObjectDefRef].interfaceMap;
|
|
2084
2084
|
};
|
|
2085
2085
|
const added = Array.from(changes.addedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.apiName));
|
|
2086
2086
|
const modified = Array.from(changes.modifiedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.apiName));
|
|
@@ -2101,7 +2101,7 @@ var InterfaceListQuery = class extends ListQuery {
|
|
|
2101
2101
|
async function reloadDataAsFullObjects(client, data) {
|
|
2102
2102
|
const groups = groupBy__default.default(data, (x) => x.$objectType);
|
|
2103
2103
|
const objectTypeToPrimaryKeyToObject = Object.fromEntries(await Promise.all(Object.entries(groups).map(async ([apiName, objects]) => {
|
|
2104
|
-
const objectDef = objects[0][
|
|
2104
|
+
const objectDef = objects[0][chunkSDFKR62Z_cjs.UnderlyingOsdkObject][chunkSDFKR62Z_cjs.ObjectDefRef];
|
|
2105
2105
|
const where = {
|
|
2106
2106
|
[objectDef.primaryKeyApiName]: {
|
|
2107
2107
|
$in: objects.map((x) => x.$primaryKey)
|
|
@@ -2211,7 +2211,7 @@ var BulkObjectLoader = class {
|
|
|
2211
2211
|
#maxEntries;
|
|
2212
2212
|
constructor(client, maxWait = 25, maxEntries = 100) {
|
|
2213
2213
|
this.#client = client;
|
|
2214
|
-
this.#logger = client[
|
|
2214
|
+
this.#logger = client[chunkMEL46GIF_cjs.additionalContext].logger;
|
|
2215
2215
|
this.#maxWait = maxWait;
|
|
2216
2216
|
this.#maxEntries = maxEntries;
|
|
2217
2217
|
}
|
|
@@ -2274,7 +2274,7 @@ var ObjectQuery = class extends Query {
|
|
|
2274
2274
|
#apiName;
|
|
2275
2275
|
#pk;
|
|
2276
2276
|
constructor(store, subject, type, pk, cacheKey, opts) {
|
|
2277
|
-
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[
|
|
2277
|
+
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
|
|
2278
2278
|
msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
|
|
2279
2279
|
}) : void 0);
|
|
2280
2280
|
this.#apiName = type;
|
|
@@ -2410,7 +2410,7 @@ var ObjectSetQuery = class extends BaseListQuery {
|
|
|
2410
2410
|
#composedObjectSet;
|
|
2411
2411
|
#objectTypes;
|
|
2412
2412
|
constructor(store, subject, baseObjectSetWire, operations, cacheKey, opts) {
|
|
2413
|
-
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[
|
|
2413
|
+
super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
|
|
2414
2414
|
msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
|
|
2415
2415
|
}) : void 0);
|
|
2416
2416
|
this.#baseObjectSetWire = baseObjectSetWire;
|
|
@@ -2453,7 +2453,7 @@ var ObjectSetQuery = class extends BaseListQuery {
|
|
|
2453
2453
|
}
|
|
2454
2454
|
if (opts.union) {
|
|
2455
2455
|
for (const os of opts.union) {
|
|
2456
|
-
const wire =
|
|
2456
|
+
const wire = chunkMEL46GIF_cjs.getWireObjectSet(os);
|
|
2457
2457
|
if (wire.type) {
|
|
2458
2458
|
types.add(wire.type);
|
|
2459
2459
|
}
|
|
@@ -2461,7 +2461,7 @@ var ObjectSetQuery = class extends BaseListQuery {
|
|
|
2461
2461
|
}
|
|
2462
2462
|
if (opts.intersect) {
|
|
2463
2463
|
for (const os of opts.intersect) {
|
|
2464
|
-
const wire =
|
|
2464
|
+
const wire = chunkMEL46GIF_cjs.getWireObjectSet(os);
|
|
2465
2465
|
if (wire.type) {
|
|
2466
2466
|
types.add(wire.type);
|
|
2467
2467
|
}
|
|
@@ -2469,7 +2469,7 @@ var ObjectSetQuery = class extends BaseListQuery {
|
|
|
2469
2469
|
}
|
|
2470
2470
|
if (opts.subtract) {
|
|
2471
2471
|
for (const os of opts.subtract) {
|
|
2472
|
-
const wire =
|
|
2472
|
+
const wire = chunkMEL46GIF_cjs.getWireObjectSet(os);
|
|
2473
2473
|
if (wire.type) {
|
|
2474
2474
|
types.add(wire.type);
|
|
2475
2475
|
}
|
|
@@ -2543,7 +2543,7 @@ var ObjectSetHelper = class extends AbstractHelper {
|
|
|
2543
2543
|
const {
|
|
2544
2544
|
baseObjectSet
|
|
2545
2545
|
} = options;
|
|
2546
|
-
const baseObjectSetWire = JSON.stringify(
|
|
2546
|
+
const baseObjectSetWire = JSON.stringify(chunkMEL46GIF_cjs.getWireObjectSet(baseObjectSet));
|
|
2547
2547
|
const operations = this.buildCanonicalizedOperations(options);
|
|
2548
2548
|
const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
|
|
2549
2549
|
return this.store.queries.get(objectSetCacheKey, () => {
|
|
@@ -2559,13 +2559,13 @@ var ObjectSetHelper = class extends AbstractHelper {
|
|
|
2559
2559
|
operations.withProperties = Object.keys(options.withProperties).sort();
|
|
2560
2560
|
}
|
|
2561
2561
|
if (options.union && options.union.length > 0) {
|
|
2562
|
-
operations.union = options.union.map((os) => JSON.stringify(
|
|
2562
|
+
operations.union = options.union.map((os) => JSON.stringify(chunkMEL46GIF_cjs.getWireObjectSet(os)));
|
|
2563
2563
|
}
|
|
2564
2564
|
if (options.intersect && options.intersect.length > 0) {
|
|
2565
|
-
operations.intersect = options.intersect.map((os) => JSON.stringify(
|
|
2565
|
+
operations.intersect = options.intersect.map((os) => JSON.stringify(chunkMEL46GIF_cjs.getWireObjectSet(os)));
|
|
2566
2566
|
}
|
|
2567
2567
|
if (options.subtract && options.subtract.length > 0) {
|
|
2568
|
-
operations.subtract = options.subtract.map((os) => JSON.stringify(
|
|
2568
|
+
operations.subtract = options.subtract.map((os) => JSON.stringify(chunkMEL46GIF_cjs.getWireObjectSet(os)));
|
|
2569
2569
|
}
|
|
2570
2570
|
if (options.pivotTo) {
|
|
2571
2571
|
operations.pivotTo = options.pivotTo;
|
|
@@ -2618,7 +2618,7 @@ var Store = class {
|
|
|
2618
2618
|
subjects = this.layers.subjects;
|
|
2619
2619
|
// these are hopefully temporary
|
|
2620
2620
|
constructor(client) {
|
|
2621
|
-
this.logger = client[
|
|
2621
|
+
this.logger = client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
|
|
2622
2622
|
msgPrefix: "Store"
|
|
2623
2623
|
});
|
|
2624
2624
|
this.client = client;
|
|
@@ -2757,10 +2757,10 @@ var Store = class {
|
|
|
2757
2757
|
|
|
2758
2758
|
// src/observable/ObservableClient.ts
|
|
2759
2759
|
function createObservableClient(client) {
|
|
2760
|
-
const tweakedClient =
|
|
2761
|
-
...client[
|
|
2762
|
-
fetch: shared_net_fetch.createFetchHeaderMutator(client[
|
|
2763
|
-
headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"),
|
|
2760
|
+
const tweakedClient = chunkSDFKR62Z_cjs.createClientFromContext({
|
|
2761
|
+
...client[chunkMEL46GIF_cjs.additionalContext],
|
|
2762
|
+
fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkMEL46GIF_cjs.additionalContext].fetch, (headers) => {
|
|
2763
|
+
headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkSDFKR62Z_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
|
|
2764
2764
|
return headers;
|
|
2765
2765
|
})
|
|
2766
2766
|
});
|
|
@@ -2803,11 +2803,11 @@ function getOsdkConfig(ontologyRid) {
|
|
|
2803
2803
|
|
|
2804
2804
|
Object.defineProperty(exports, "createClientWithTransaction", {
|
|
2805
2805
|
enumerable: true,
|
|
2806
|
-
get: function () { return
|
|
2806
|
+
get: function () { return chunkSDFKR62Z_cjs.createClientWithTransaction; }
|
|
2807
2807
|
});
|
|
2808
2808
|
Object.defineProperty(exports, "augment", {
|
|
2809
2809
|
enumerable: true,
|
|
2810
|
-
get: function () { return
|
|
2810
|
+
get: function () { return chunkMEL46GIF_cjs.augment; }
|
|
2811
2811
|
});
|
|
2812
2812
|
exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
|
|
2813
2813
|
exports.createObservableClient = createObservableClient;
|
package/build/esm/Client.js
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
export const additionalContext = Symbol("additionalContext");
|
|
22
22
|
|
|
23
23
|
// BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.
|
|
24
|
-
const MaxOsdkVersion = "2.5.
|
|
24
|
+
const MaxOsdkVersion = "2.5.2";
|
|
25
25
|
// END: THIS IS GENERATED CODE. DO NOT EDIT.
|
|
26
26
|
|
|
27
27
|
const ErrorMessage = Symbol("ErrorMessage");
|
package/build/esm/Client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","names":["additionalContext","Symbol","MaxOsdkVersion","ErrorMessage"],"sources":["Client.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n ActionDefinition,\n ActionMetadata,\n CompileTimeMetadata,\n InterfaceDefinition,\n InterfaceMetadata,\n ObjectMetadata,\n ObjectSet,\n ObjectTypeDefinition,\n QueryDefinition,\n QueryMetadata,\n VersionBound,\n} from \"@osdk/api\";\nimport type {\n Experiment,\n ExperimentFns,\n MinimalObjectSet,\n} from \"@osdk/api/unstable\";\nimport type { SharedClient } from \"@osdk/shared.client2\";\nimport type { ActionSignatureFromDef } from \"./actions/applyAction.js\";\nimport type { MinimalClient } from \"./MinimalClientContext.js\";\nimport type { QuerySignatureFromDef } from \"./queries/types.js\";\nimport type { SatisfiesSemver } from \"./SatisfiesSemver.js\";\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\ntype OldSharedClient = import(\"@osdk/shared.client\").SharedClient;\n\nexport type CheckVersionBound<Q> = Q extends VersionBound<infer V> ? (\n SatisfiesSemver<V, MaxOsdkVersion> extends true ? Q\n : Q & {\n [ErrorMessage]:\n `Your SDK requires a semver compatible version with ${V}. You have ${MaxOsdkVersion}. Update your package.json`;\n }\n )\n : Q;\n\nexport interface Client extends SharedClient, OldSharedClient {\n <Q extends ObjectTypeDefinition>(\n o: Q,\n ): unknown extends CompileTimeMetadata<Q>[\"objectSet\"] ? ObjectSet<Q>\n : CompileTimeMetadata<Q>[\"objectSet\"];\n\n <Q extends (InterfaceDefinition)>(\n o: Q,\n ): unknown extends CompileTimeMetadata<Q>[\"objectSet\"] ? MinimalObjectSet<Q>\n : CompileTimeMetadata<Q>[\"objectSet\"];\n\n <Q extends ActionDefinition<any>>(\n o: Q,\n ): ActionSignatureFromDef<Q>;\n\n <Q extends QueryDefinition<any>>(\n o: Q,\n ): QuerySignatureFromDef<Q>;\n\n <Q extends Experiment<\"2.0.8\"> | Experiment<\"2.1.0\"> | Experiment<\"2.2.0\">>(\n experiment: Q,\n ): ExperimentFns<Q>;\n\n fetchMetadata<\n Q extends (\n | ObjectTypeDefinition\n | InterfaceDefinition\n | ActionDefinition<any>\n | QueryDefinition<any>\n ),\n >(o: Q): Promise<\n Q extends ObjectTypeDefinition ? ObjectMetadata\n : Q extends InterfaceDefinition ? InterfaceMetadata\n : Q extends ActionDefinition<any> ? ActionMetadata\n : Q extends QueryDefinition<any> ? QueryMetadata\n : never\n >;\n\n /** @internal */\n [additionalContext]: MinimalClient;\n}\n\n// DO NOT EXPORT FROM PACKAGE\n/** @internal */\nexport const additionalContext: unique symbol = Symbol(\"additionalContext\");\n\n// BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.\nconst MaxOsdkVersion = \"2.5.
|
|
1
|
+
{"version":3,"file":"Client.js","names":["additionalContext","Symbol","MaxOsdkVersion","ErrorMessage"],"sources":["Client.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n ActionDefinition,\n ActionMetadata,\n CompileTimeMetadata,\n InterfaceDefinition,\n InterfaceMetadata,\n ObjectMetadata,\n ObjectSet,\n ObjectTypeDefinition,\n QueryDefinition,\n QueryMetadata,\n VersionBound,\n} from \"@osdk/api\";\nimport type {\n Experiment,\n ExperimentFns,\n MinimalObjectSet,\n} from \"@osdk/api/unstable\";\nimport type { SharedClient } from \"@osdk/shared.client2\";\nimport type { ActionSignatureFromDef } from \"./actions/applyAction.js\";\nimport type { MinimalClient } from \"./MinimalClientContext.js\";\nimport type { QuerySignatureFromDef } from \"./queries/types.js\";\nimport type { SatisfiesSemver } from \"./SatisfiesSemver.js\";\n\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\ntype OldSharedClient = import(\"@osdk/shared.client\").SharedClient;\n\nexport type CheckVersionBound<Q> = Q extends VersionBound<infer V> ? (\n SatisfiesSemver<V, MaxOsdkVersion> extends true ? Q\n : Q & {\n [ErrorMessage]:\n `Your SDK requires a semver compatible version with ${V}. You have ${MaxOsdkVersion}. Update your package.json`;\n }\n )\n : Q;\n\nexport interface Client extends SharedClient, OldSharedClient {\n <Q extends ObjectTypeDefinition>(\n o: Q,\n ): unknown extends CompileTimeMetadata<Q>[\"objectSet\"] ? ObjectSet<Q>\n : CompileTimeMetadata<Q>[\"objectSet\"];\n\n <Q extends (InterfaceDefinition)>(\n o: Q,\n ): unknown extends CompileTimeMetadata<Q>[\"objectSet\"] ? MinimalObjectSet<Q>\n : CompileTimeMetadata<Q>[\"objectSet\"];\n\n <Q extends ActionDefinition<any>>(\n o: Q,\n ): ActionSignatureFromDef<Q>;\n\n <Q extends QueryDefinition<any>>(\n o: Q,\n ): QuerySignatureFromDef<Q>;\n\n <Q extends Experiment<\"2.0.8\"> | Experiment<\"2.1.0\"> | Experiment<\"2.2.0\">>(\n experiment: Q,\n ): ExperimentFns<Q>;\n\n fetchMetadata<\n Q extends (\n | ObjectTypeDefinition\n | InterfaceDefinition\n | ActionDefinition<any>\n | QueryDefinition<any>\n ),\n >(o: Q): Promise<\n Q extends ObjectTypeDefinition ? ObjectMetadata\n : Q extends InterfaceDefinition ? InterfaceMetadata\n : Q extends ActionDefinition<any> ? ActionMetadata\n : Q extends QueryDefinition<any> ? QueryMetadata\n : never\n >;\n\n /** @internal */\n [additionalContext]: MinimalClient;\n}\n\n// DO NOT EXPORT FROM PACKAGE\n/** @internal */\nexport const additionalContext: unique symbol = Symbol(\"additionalContext\");\n\n// BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.\nconst MaxOsdkVersion = \"2.5.2\";\n// END: THIS IS GENERATED CODE. DO NOT EDIT.\nexport type MaxOsdkVersion = typeof MaxOsdkVersion;\nconst ErrorMessage: unique symbol = Symbol(\"ErrorMessage\");\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AA0BA;;AAsDA;AACA;AACA,OAAO,MAAMA,iBAAgC,GAAGC,MAAM,CAAC,mBAAmB,CAAC;;AAE3E;AACA,MAAMC,cAAc,GAAG,OAAO;AAC9B;;AAEA,MAAMC,YAA2B,GAAGF,MAAM,CAAC,cAAc,CAAC","ignoreList":[]}
|
|
@@ -51,6 +51,8 @@ async function remapQueryResponse(client, responseDataType, responseValue, defin
|
|
|
51
51
|
throw new Error("Got null response when nullable was not allowed");
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
+
|
|
55
|
+
// TODO(bryantp) fix logic to not use multiplicity and unwrap inner type
|
|
54
56
|
if (responseDataType.multiplicity != null && responseDataType.multiplicity) {
|
|
55
57
|
const withoutMultiplicity = {
|
|
56
58
|
...responseDataType,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyQuery.js","names":["OntologiesV2","invariant","createObjectSet","hydrateAttachmentFromRidInternal","addUserAgentAndRequestContextHeaders","augmentRequestContext","createObjectSpecifierFromInterfaceSpecifier","createObjectSpecifierFromPrimaryKey","toDataValueQueries","applyQuery","client","query","params","qd","ontologyProvider","getQueryDefinition","apiName","isFixedVersion","version","undefined","response","Queries","execute","finalMethodCall","ontologyRid","parameters","remapQueryParams","objectOutputDefs","getRequiredDefinitions","output","remappedResponse","remapQueryResponse","value","paramTypes","parameterMap","key","Object","entries","responseDataType","responseValue","definitions","nullable","Error","multiplicity","withoutMultiplicity","i","length","type","set","def","get","object","createQueryObjectResponse","interface","createQueryInterfaceResponse","objectSet","objectSets","objectType","reference","subtype","struct","requiresConversion","map","Array","isArray","process","env","NODE_ENV","entry","keyType","getObjectSpecifier","valueType","result","groups","push","subResult","subKey","dataType","Map","objectDef","getObjectDefinition","interfaceDef","getInterfaceDefinition","types","allDefs","Promise","all","defs","structValues","values","some","primaryKey","objectTypeApiName","$apiName","$title","$objectType","$primaryKey","$objectSpecifier","interfaceSpecifier","primaryKeyValue"],"sources":["applyQuery.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n AllowedBucketKeyTypes,\n AllowedBucketTypes,\n CompileTimeMetadata,\n InterfaceDefinition,\n ObjectOrInterfaceDefinition,\n ObjectTypeDefinition,\n OsdkBase,\n PrimaryKeyType,\n QueryDataTypeDefinition,\n QueryDefinition,\n QueryParameterDefinition,\n} from \"@osdk/api\";\nimport type { DataValue } from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport invariant from \"tiny-invariant\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { createObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { hydrateAttachmentFromRidInternal } from \"../public-utils/hydrateAttachmentFromRid.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\nimport { augmentRequestContext } from \"../util/augmentRequestContext.js\";\nimport {\n createObjectSpecifierFromInterfaceSpecifier,\n createObjectSpecifierFromPrimaryKey,\n} from \"../util/objectSpecifierUtils.js\";\nimport { toDataValueQueries } from \"../util/toDataValueQueries.js\";\nimport type { QueryParameterType, QueryReturnType } from \"./types.js\";\n\nexport async function applyQuery<\n QD extends QueryDefinition<any>,\n P extends QueryParameterType<CompileTimeMetadata<QD>[\"parameters\"]>,\n>(\n client: MinimalClient,\n query: QD,\n params?: P,\n): Promise<\n QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>\n> {\n const qd = await client.ontologyProvider.getQueryDefinition(\n query.apiName,\n query.isFixedVersion ? query.version : undefined,\n );\n\n const response = await OntologiesV2.Queries.execute(\n addUserAgentAndRequestContextHeaders(\n augmentRequestContext(client, _ => ({ finalMethodCall: \"applyQuery\" })),\n query,\n ),\n await client.ontologyRid,\n query.apiName,\n {\n parameters: params\n ? await remapQueryParams(\n params as { [parameterId: string]: any },\n client,\n qd.parameters,\n )\n : {},\n },\n { version: query.isFixedVersion ? query.version : undefined },\n );\n const objectOutputDefs = await getRequiredDefinitions(qd.output, client);\n const remappedResponse = await remapQueryResponse(\n client,\n qd.output,\n response.value,\n objectOutputDefs,\n );\n return remappedResponse as QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>;\n}\n\nasync function remapQueryParams(\n params: { [parameterId: string]: any },\n client: MinimalClient,\n paramTypes: Record<string, QueryParameterDefinition<any>>,\n): Promise<{ [parameterId: string]: any }> {\n const parameterMap: { [parameterName: string]: unknown } = {};\n for (const [key, value] of Object.entries(params)) {\n parameterMap[key] = await toDataValueQueries(\n value,\n client,\n paramTypes[key],\n );\n }\n return parameterMap;\n}\n\nasync function remapQueryResponse<\n Q extends ObjectTypeDefinition,\n T extends QueryDataTypeDefinition<Q | never>,\n>(\n client: MinimalClient,\n responseDataType: T,\n responseValue: DataValue,\n definitions: Map<string, ObjectOrInterfaceDefinition>,\n): Promise<QueryReturnType<T>> {\n // handle null responses\n if (responseValue == null) {\n if (responseDataType.nullable) {\n return undefined as unknown as QueryReturnType<typeof responseDataType>;\n } else {\n throw new Error(\"Got null response when nullable was not allowed\");\n }\n }\n\n if (\n responseDataType.multiplicity != null\n && responseDataType.multiplicity\n ) {\n const withoutMultiplicity = { ...responseDataType, multiplicity: false };\n for (let i = 0; i < responseValue.length; i++) {\n responseValue[i] = await remapQueryResponse(\n client,\n withoutMultiplicity,\n responseValue[i],\n definitions,\n );\n }\n return responseValue as QueryReturnType<typeof responseDataType>;\n }\n\n switch (responseDataType.type) {\n case \"union\": {\n throw new Error(\"Union return types are not yet supported\");\n }\n\n case \"set\": {\n for (let i = 0; i < responseValue.length; i++) {\n responseValue[i] = await remapQueryResponse(\n client,\n responseDataType.set,\n responseValue[i],\n definitions,\n );\n }\n\n return responseValue as QueryReturnType<typeof responseDataType>;\n }\n\n case \"attachment\": {\n return hydrateAttachmentFromRidInternal(\n client,\n responseValue,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n case \"object\": {\n const def = definitions.get(responseDataType.object);\n if (!def || def.type !== \"object\") {\n throw new Error(\n `Missing definition for ${responseDataType.object}`,\n );\n }\n return createQueryObjectResponse(\n responseValue,\n def,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n\n case \"interface\": {\n const def = definitions.get(responseDataType.interface);\n if (!def || def.type !== \"interface\") {\n throw new Error(\n `Missing definition for ${responseDataType.interface}`,\n );\n }\n\n return createQueryInterfaceResponse(\n responseValue,\n def,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n\n case \"objectSet\": {\n const def = definitions.get(responseDataType.objectSet);\n if (!def) {\n throw new Error(\n `Missing definition for ${responseDataType.objectSet}`,\n );\n }\n if (typeof responseValue === \"string\") {\n return createObjectSet(def, client, {\n type: \"intersect\",\n objectSets: [\n { type: \"base\", objectType: responseDataType.objectSet },\n { type: \"reference\", reference: responseValue },\n ],\n }) as QueryReturnType<typeof responseDataType>;\n }\n\n return createObjectSet(\n def,\n client,\n responseValue,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n case \"struct\": {\n // figure out what keys need to be fixed up\n for (const [key, subtype] of Object.entries(responseDataType.struct)) {\n if (requiresConversion(subtype)) {\n responseValue[key] = await remapQueryResponse(\n client,\n subtype,\n responseValue[key],\n definitions,\n );\n }\n }\n\n return responseValue as QueryReturnType<typeof responseDataType>;\n }\n\n case \"map\": {\n const map = {} as any;\n\n invariant(Array.isArray(responseValue), \"Expected array entry\");\n for (const entry of responseValue) {\n invariant(entry.key != null, \"Expected key\");\n invariant(entry.value != null, \"Expected value\");\n const key = responseDataType.keyType.type === \"object\"\n ? getObjectSpecifier(\n entry.key,\n responseDataType.keyType.object,\n definitions,\n )\n : entry.key;\n const value = await remapQueryResponse(\n client,\n responseDataType.valueType,\n entry.value,\n definitions,\n );\n map[key] = value;\n }\n return map;\n }\n\n case \"twoDimensionalAggregation\": {\n const result: {\n key: AllowedBucketKeyTypes;\n value: AllowedBucketTypes;\n }[] = [];\n for (const { key, value } of responseValue.groups) {\n result.push({ key, value });\n }\n return result as QueryReturnType<typeof responseDataType>;\n }\n\n case \"threeDimensionalAggregation\": {\n const result: {\n key: AllowedBucketKeyTypes;\n groups: { key: AllowedBucketKeyTypes; value: AllowedBucketTypes }[];\n }[] = [];\n for (const { key, groups } of responseValue.groups) {\n const subResult: { key: any; value: any }[] = [];\n for (const { key: subKey, value } of groups) {\n subResult.push({ key: subKey, value });\n }\n result.push({ key, groups: subResult });\n }\n return result as QueryReturnType<typeof responseDataType>;\n }\n }\n\n return responseValue as QueryReturnType<typeof responseDataType>;\n}\n\nasync function getRequiredDefinitions(\n dataType: QueryDataTypeDefinition,\n client: MinimalClient,\n): Promise<Map<string, ObjectOrInterfaceDefinition>> {\n const result = new Map<string, ObjectOrInterfaceDefinition>();\n switch (dataType.type) {\n case \"objectSet\": {\n const objectDef = await client.ontologyProvider.getObjectDefinition(\n dataType.objectSet,\n );\n result.set(dataType.objectSet, objectDef);\n break;\n }\n case \"object\": {\n const objectDef = await client.ontologyProvider.getObjectDefinition(\n dataType.object,\n );\n result.set(dataType.object, objectDef);\n break;\n }\n\n case \"interface\": {\n const interfaceDef = await client.ontologyProvider.getInterfaceDefinition(\n dataType.interface,\n );\n result.set(dataType.interface, interfaceDef);\n break;\n }\n\n case \"set\": {\n return getRequiredDefinitions(dataType.set, client);\n }\n\n case \"map\": {\n const types = [dataType.keyType, dataType.valueType];\n\n const allDefs = await Promise.all(\n types.map(value => getRequiredDefinitions(value, client)),\n );\n\n for (const defs of allDefs) {\n for (const [type, objectDef] of defs) {\n result.set(type, objectDef);\n }\n }\n break;\n }\n\n case \"struct\": {\n const structValues = Object.values(dataType.struct);\n\n const allDefs = await Promise.all(\n structValues.map(value => getRequiredDefinitions(value, client)),\n );\n\n for (const defs of allDefs) {\n for (const [type, objectDef] of defs) {\n result.set(type, objectDef);\n }\n }\n break;\n }\n case \"attachment\":\n case \"boolean\":\n case \"date\":\n case \"double\":\n case \"float\":\n case \"integer\":\n case \"long\":\n case \"string\":\n case \"threeDimensionalAggregation\":\n case \"timestamp\":\n case \"twoDimensionalAggregation\":\n case \"union\":\n break;\n }\n\n return result;\n}\nfunction requiresConversion(dataType: QueryDataTypeDefinition) {\n switch (dataType.type) {\n case \"boolean\":\n case \"date\":\n case \"double\":\n case \"float\":\n case \"integer\":\n case \"long\":\n case \"string\":\n case \"timestamp\":\n return false;\n\n case \"union\":\n return true;\n\n case \"struct\":\n return Object.values(dataType.struct).some(requiresConversion);\n\n case \"set\":\n return requiresConversion(dataType.set);\n\n case \"attachment\":\n case \"objectSet\":\n case \"twoDimensionalAggregation\":\n case \"threeDimensionalAggregation\":\n case \"object\":\n return true;\n\n default:\n return false;\n }\n}\n\nfunction getObjectSpecifier(\n primaryKey: any,\n objectTypeApiName: string,\n definitions: Map<string, ObjectOrInterfaceDefinition>,\n): string {\n const def = definitions.get(objectTypeApiName);\n if (!def || def.type !== \"object\") {\n throw new Error(\n `Missing definition for ${objectTypeApiName}`,\n );\n }\n return createObjectSpecifierFromPrimaryKey(\n def,\n primaryKey,\n );\n}\n\nexport function createQueryObjectResponse<\n Q extends ObjectTypeDefinition,\n>(\n primaryKey: PrimaryKeyType<Q>,\n objectDef: Q,\n): OsdkBase<Q> {\n return {\n $apiName: objectDef.apiName,\n $title: undefined,\n $objectType: objectDef.apiName,\n $primaryKey: primaryKey,\n $objectSpecifier: createObjectSpecifierFromPrimaryKey(\n objectDef,\n primaryKey,\n ),\n };\n}\n\nexport function createQueryInterfaceResponse<\n Q extends InterfaceDefinition,\n>(\n interfaceSpecifier: {\n objectTypeApiName: string;\n primaryKeyValue: PrimaryKeyType<Q>;\n },\n interfaceDef: Q,\n): OsdkBase<Q> {\n return {\n $apiName: interfaceDef.apiName,\n $title: undefined,\n $objectType: interfaceSpecifier.objectTypeApiName,\n $primaryKey: interfaceSpecifier.primaryKeyValue,\n $objectSpecifier: createObjectSpecifierFromInterfaceSpecifier(\n interfaceDef,\n interfaceSpecifier,\n ),\n };\n}\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"applyQuery.js","names":["OntologiesV2","invariant","createObjectSet","hydrateAttachmentFromRidInternal","addUserAgentAndRequestContextHeaders","augmentRequestContext","createObjectSpecifierFromInterfaceSpecifier","createObjectSpecifierFromPrimaryKey","toDataValueQueries","applyQuery","client","query","params","qd","ontologyProvider","getQueryDefinition","apiName","isFixedVersion","version","undefined","response","Queries","execute","finalMethodCall","ontologyRid","parameters","remapQueryParams","objectOutputDefs","getRequiredDefinitions","output","remappedResponse","remapQueryResponse","value","paramTypes","parameterMap","key","Object","entries","responseDataType","responseValue","definitions","nullable","Error","multiplicity","withoutMultiplicity","i","length","type","set","def","get","object","createQueryObjectResponse","interface","createQueryInterfaceResponse","objectSet","objectSets","objectType","reference","subtype","struct","requiresConversion","map","Array","isArray","process","env","NODE_ENV","entry","keyType","getObjectSpecifier","valueType","result","groups","push","subResult","subKey","dataType","Map","objectDef","getObjectDefinition","interfaceDef","getInterfaceDefinition","types","allDefs","Promise","all","defs","structValues","values","some","primaryKey","objectTypeApiName","$apiName","$title","$objectType","$primaryKey","$objectSpecifier","interfaceSpecifier","primaryKeyValue"],"sources":["applyQuery.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n AllowedBucketKeyTypes,\n AllowedBucketTypes,\n CompileTimeMetadata,\n InterfaceDefinition,\n ObjectOrInterfaceDefinition,\n ObjectTypeDefinition,\n OsdkBase,\n PrimaryKeyType,\n QueryDataTypeDefinition,\n QueryDefinition,\n QueryParameterDefinition,\n} from \"@osdk/api\";\nimport type { DataValue } from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport invariant from \"tiny-invariant\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { createObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { hydrateAttachmentFromRidInternal } from \"../public-utils/hydrateAttachmentFromRid.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\nimport { augmentRequestContext } from \"../util/augmentRequestContext.js\";\nimport {\n createObjectSpecifierFromInterfaceSpecifier,\n createObjectSpecifierFromPrimaryKey,\n} from \"../util/objectSpecifierUtils.js\";\nimport { toDataValueQueries } from \"../util/toDataValueQueries.js\";\nimport type { QueryParameterType, QueryReturnType } from \"./types.js\";\n\nexport async function applyQuery<\n QD extends QueryDefinition<any>,\n P extends QueryParameterType<CompileTimeMetadata<QD>[\"parameters\"]>,\n>(\n client: MinimalClient,\n query: QD,\n params?: P,\n): Promise<\n QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>\n> {\n const qd = await client.ontologyProvider.getQueryDefinition(\n query.apiName,\n query.isFixedVersion ? query.version : undefined,\n );\n\n const response = await OntologiesV2.Queries.execute(\n addUserAgentAndRequestContextHeaders(\n augmentRequestContext(client, _ => ({ finalMethodCall: \"applyQuery\" })),\n query,\n ),\n await client.ontologyRid,\n query.apiName,\n {\n parameters: params\n ? await remapQueryParams(\n params as { [parameterId: string]: any },\n client,\n qd.parameters,\n )\n : {},\n },\n { version: query.isFixedVersion ? query.version : undefined },\n );\n const objectOutputDefs = await getRequiredDefinitions(qd.output, client);\n const remappedResponse = await remapQueryResponse(\n client,\n qd.output,\n response.value,\n objectOutputDefs,\n );\n return remappedResponse as QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>;\n}\n\nasync function remapQueryParams(\n params: { [parameterId: string]: any },\n client: MinimalClient,\n paramTypes: Record<string, QueryParameterDefinition<any>>,\n): Promise<{ [parameterId: string]: any }> {\n const parameterMap: { [parameterName: string]: unknown } = {};\n for (const [key, value] of Object.entries(params)) {\n parameterMap[key] = await toDataValueQueries(\n value,\n client,\n paramTypes[key],\n );\n }\n return parameterMap;\n}\n\nasync function remapQueryResponse<\n Q extends ObjectTypeDefinition,\n T extends QueryDataTypeDefinition<Q | never>,\n>(\n client: MinimalClient,\n responseDataType: T,\n responseValue: DataValue,\n definitions: Map<string, ObjectOrInterfaceDefinition>,\n): Promise<QueryReturnType<T>> {\n // handle null responses\n if (responseValue == null) {\n if (responseDataType.nullable) {\n return undefined as unknown as QueryReturnType<typeof responseDataType>;\n } else {\n throw new Error(\"Got null response when nullable was not allowed\");\n }\n }\n\n // TODO(bryantp) fix logic to not use multiplicity and unwrap inner type\n if (responseDataType.multiplicity != null && responseDataType.multiplicity) {\n const withoutMultiplicity = { ...responseDataType, multiplicity: false };\n for (let i = 0; i < responseValue.length; i++) {\n responseValue[i] = await remapQueryResponse(\n client,\n withoutMultiplicity,\n responseValue[i],\n definitions,\n );\n }\n return responseValue as QueryReturnType<typeof responseDataType>;\n }\n\n switch (responseDataType.type) {\n case \"union\": {\n throw new Error(\"Union return types are not yet supported\");\n }\n\n case \"set\": {\n for (let i = 0; i < responseValue.length; i++) {\n responseValue[i] = await remapQueryResponse(\n client,\n responseDataType.set,\n responseValue[i],\n definitions,\n );\n }\n\n return responseValue as QueryReturnType<typeof responseDataType>;\n }\n\n case \"attachment\": {\n return hydrateAttachmentFromRidInternal(\n client,\n responseValue,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n case \"object\": {\n const def = definitions.get(responseDataType.object);\n if (!def || def.type !== \"object\") {\n throw new Error(\n `Missing definition for ${responseDataType.object}`,\n );\n }\n return createQueryObjectResponse(\n responseValue,\n def,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n\n case \"interface\": {\n const def = definitions.get(responseDataType.interface);\n if (!def || def.type !== \"interface\") {\n throw new Error(\n `Missing definition for ${responseDataType.interface}`,\n );\n }\n\n return createQueryInterfaceResponse(\n responseValue,\n def,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n\n case \"objectSet\": {\n const def = definitions.get(responseDataType.objectSet);\n if (!def) {\n throw new Error(\n `Missing definition for ${responseDataType.objectSet}`,\n );\n }\n if (typeof responseValue === \"string\") {\n return createObjectSet(def, client, {\n type: \"intersect\",\n objectSets: [\n { type: \"base\", objectType: responseDataType.objectSet },\n { type: \"reference\", reference: responseValue },\n ],\n }) as QueryReturnType<typeof responseDataType>;\n }\n\n return createObjectSet(\n def,\n client,\n responseValue,\n ) as QueryReturnType<\n typeof responseDataType\n >;\n }\n case \"struct\": {\n // figure out what keys need to be fixed up\n for (const [key, subtype] of Object.entries(responseDataType.struct)) {\n if (requiresConversion(subtype)) {\n responseValue[key] = await remapQueryResponse(\n client,\n subtype,\n responseValue[key],\n definitions,\n );\n }\n }\n\n return responseValue as QueryReturnType<typeof responseDataType>;\n }\n\n case \"map\": {\n const map = {} as any;\n\n invariant(Array.isArray(responseValue), \"Expected array entry\");\n for (const entry of responseValue) {\n invariant(entry.key != null, \"Expected key\");\n invariant(entry.value != null, \"Expected value\");\n const key = responseDataType.keyType.type === \"object\"\n ? getObjectSpecifier(\n entry.key,\n responseDataType.keyType.object,\n definitions,\n )\n : entry.key;\n const value = await remapQueryResponse(\n client,\n responseDataType.valueType,\n entry.value,\n definitions,\n );\n map[key] = value;\n }\n return map;\n }\n\n case \"twoDimensionalAggregation\": {\n const result: {\n key: AllowedBucketKeyTypes;\n value: AllowedBucketTypes;\n }[] = [];\n for (const { key, value } of responseValue.groups) {\n result.push({ key, value });\n }\n return result as QueryReturnType<typeof responseDataType>;\n }\n\n case \"threeDimensionalAggregation\": {\n const result: {\n key: AllowedBucketKeyTypes;\n groups: { key: AllowedBucketKeyTypes; value: AllowedBucketTypes }[];\n }[] = [];\n for (const { key, groups } of responseValue.groups) {\n const subResult: { key: any; value: any }[] = [];\n for (const { key: subKey, value } of groups) {\n subResult.push({ key: subKey, value });\n }\n result.push({ key, groups: subResult });\n }\n return result as QueryReturnType<typeof responseDataType>;\n }\n }\n\n return responseValue as QueryReturnType<typeof responseDataType>;\n}\n\nasync function getRequiredDefinitions(\n dataType: QueryDataTypeDefinition,\n client: MinimalClient,\n): Promise<Map<string, ObjectOrInterfaceDefinition>> {\n const result = new Map<string, ObjectOrInterfaceDefinition>();\n switch (dataType.type) {\n case \"objectSet\": {\n const objectDef = await client.ontologyProvider.getObjectDefinition(\n dataType.objectSet,\n );\n result.set(dataType.objectSet, objectDef);\n break;\n }\n case \"object\": {\n const objectDef = await client.ontologyProvider.getObjectDefinition(\n dataType.object,\n );\n result.set(dataType.object, objectDef);\n break;\n }\n\n case \"interface\": {\n const interfaceDef = await client.ontologyProvider.getInterfaceDefinition(\n dataType.interface,\n );\n result.set(dataType.interface, interfaceDef);\n break;\n }\n\n case \"set\": {\n return getRequiredDefinitions(dataType.set, client);\n }\n\n case \"map\": {\n const types = [dataType.keyType, dataType.valueType];\n\n const allDefs = await Promise.all(\n types.map(value => getRequiredDefinitions(value, client)),\n );\n\n for (const defs of allDefs) {\n for (const [type, objectDef] of defs) {\n result.set(type, objectDef);\n }\n }\n break;\n }\n\n case \"struct\": {\n const structValues = Object.values(dataType.struct);\n\n const allDefs = await Promise.all(\n structValues.map(value => getRequiredDefinitions(value, client)),\n );\n\n for (const defs of allDefs) {\n for (const [type, objectDef] of defs) {\n result.set(type, objectDef);\n }\n }\n break;\n }\n case \"attachment\":\n case \"boolean\":\n case \"date\":\n case \"double\":\n case \"float\":\n case \"integer\":\n case \"long\":\n case \"string\":\n case \"threeDimensionalAggregation\":\n case \"timestamp\":\n case \"twoDimensionalAggregation\":\n case \"union\":\n break;\n }\n\n return result;\n}\nfunction requiresConversion(dataType: QueryDataTypeDefinition) {\n switch (dataType.type) {\n case \"boolean\":\n case \"date\":\n case \"double\":\n case \"float\":\n case \"integer\":\n case \"long\":\n case \"string\":\n case \"timestamp\":\n return false;\n\n case \"union\":\n return true;\n\n case \"struct\":\n return Object.values(dataType.struct).some(requiresConversion);\n\n case \"set\":\n return requiresConversion(dataType.set);\n\n case \"attachment\":\n case \"objectSet\":\n case \"twoDimensionalAggregation\":\n case \"threeDimensionalAggregation\":\n case \"object\":\n return true;\n\n default:\n return false;\n }\n}\n\nfunction getObjectSpecifier(\n primaryKey: any,\n objectTypeApiName: string,\n definitions: Map<string, ObjectOrInterfaceDefinition>,\n): string {\n const def = definitions.get(objectTypeApiName);\n if (!def || def.type !== \"object\") {\n throw new Error(\n `Missing definition for ${objectTypeApiName}`,\n );\n }\n return createObjectSpecifierFromPrimaryKey(\n def,\n primaryKey,\n );\n}\n\nexport function createQueryObjectResponse<\n Q extends ObjectTypeDefinition,\n>(\n primaryKey: PrimaryKeyType<Q>,\n objectDef: Q,\n): OsdkBase<Q> {\n return {\n $apiName: objectDef.apiName,\n $title: undefined,\n $objectType: objectDef.apiName,\n $primaryKey: primaryKey,\n $objectSpecifier: createObjectSpecifierFromPrimaryKey(\n objectDef,\n primaryKey,\n ),\n };\n}\n\nexport function createQueryInterfaceResponse<\n Q extends InterfaceDefinition,\n>(\n interfaceSpecifier: {\n objectTypeApiName: string;\n primaryKeyValue: PrimaryKeyType<Q>;\n },\n interfaceDef: Q,\n): OsdkBase<Q> {\n return {\n $apiName: interfaceDef.apiName,\n $title: undefined,\n $objectType: interfaceSpecifier.objectTypeApiName,\n $primaryKey: interfaceSpecifier.primaryKeyValue,\n $objectSpecifier: createObjectSpecifierFromInterfaceSpecifier(\n interfaceDef,\n interfaceSpecifier,\n ),\n };\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -14,6 +14,6 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
export const USER_AGENT = `osdk-client/${"2.5.
|
|
18
|
-
export const OBSERVABLE_USER_AGENT = `osdk-observable-client/${"2.5.
|
|
17
|
+
export const USER_AGENT = `osdk-client/${"2.5.2"}`;
|
|
18
|
+
export const OBSERVABLE_USER_AGENT = `osdk-observable-client/${"2.5.2"}`;
|
|
19
19
|
//# sourceMappingURL=UserAgent.js.map
|
|
@@ -32,7 +32,7 @@ export async function toDataValueQueries(value, client, desiredType) {
|
|
|
32
32
|
if (value == null) {
|
|
33
33
|
return value;
|
|
34
34
|
}
|
|
35
|
-
if (Array.isArray(value) && desiredType.
|
|
35
|
+
if (Array.isArray(value) && desiredType.type === "array") {
|
|
36
36
|
const values = Array.from(value);
|
|
37
37
|
if (values.some(dataValue => isAttachmentUpload(dataValue) || isAttachmentFile(dataValue))) {
|
|
38
38
|
const converted = [];
|
|
@@ -41,7 +41,7 @@ export async function toDataValueQueries(value, client, desiredType) {
|
|
|
41
41
|
}
|
|
42
42
|
return converted;
|
|
43
43
|
}
|
|
44
|
-
const promiseArray = Array.from(value, async innerValue => await toDataValueQueries(innerValue, client, desiredType));
|
|
44
|
+
const promiseArray = Array.from(value, async innerValue => await toDataValueQueries(innerValue, client, desiredType.array));
|
|
45
45
|
return Promise.all(promiseArray);
|
|
46
46
|
}
|
|
47
47
|
switch (desiredType.type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toDataValueQueries.js","names":["OntologiesV2","isAttachmentFile","isAttachmentUpload","getWireObjectSet","isObjectSet","isInterfaceQueryParam","isInterfaceSpecifier","isObjectSpecifiersObject","extractPrimaryKeyFromObjectSpecifier","isWireObjectSet","toDataValueQueries","value","client","desiredType","Array","isArray","
|
|
1
|
+
{"version":3,"file":"toDataValueQueries.js","names":["OntologiesV2","isAttachmentFile","isAttachmentUpload","getWireObjectSet","isObjectSet","isInterfaceQueryParam","isInterfaceSpecifier","isObjectSpecifiersObject","extractPrimaryKeyFromObjectSpecifier","isWireObjectSet","toDataValueQueries","value","client","desiredType","Array","isArray","type","values","from","some","dataValue","converted","push","promiseArray","innerValue","array","Promise","all","attachment","Attachments","upload","data","filename","name","rid","groups","Set","$primaryKey","objectTypeApiName","$objectType","primaryKeyValue","entrySet","key","mapValue","Object","entries","keyType","valueType","structMap","structValue"],"sources":["toDataValueQueries.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { QueryDataTypeDefinition } from \"@osdk/api\";\nimport { type DataValue } from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport {\n isAttachmentFile,\n isAttachmentUpload,\n} from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet, isObjectSet } from \"../objectSet/createObjectSet.js\";\nimport {\n isInterfaceQueryParam,\n isInterfaceSpecifier,\n} from \"./interfaceUtils.js\";\nimport { isObjectSpecifiersObject } from \"./isObjectSpecifiersObject.js\";\nimport { extractPrimaryKeyFromObjectSpecifier } from \"./objectSpecifierUtils.js\";\nimport { isWireObjectSet } from \"./WireObjectSet.js\";\n\n/**\n * Marshall user-facing data into the wire DataValue type\n *\n * @see DataValue for the expected payloads\n * @internal\n */\nexport async function toDataValueQueries(\n value: unknown,\n client: MinimalClient,\n desiredType: QueryDataTypeDefinition,\n): Promise<DataValue> {\n if (value == null) {\n return value;\n }\n\n if (Array.isArray(value) && desiredType.type === \"array\") {\n const values = Array.from(value);\n if (\n values.some((dataValue) =>\n isAttachmentUpload(dataValue) || isAttachmentFile(dataValue)\n )\n ) {\n const converted = [];\n for (const value of values) {\n converted.push(await toDataValueQueries(value, client, desiredType));\n }\n return converted;\n }\n const promiseArray = Array.from(\n value,\n async (innerValue) =>\n await toDataValueQueries(innerValue, client, desiredType.array),\n );\n return Promise.all(promiseArray);\n }\n\n switch (desiredType.type) {\n case \"attachment\": {\n if (isAttachmentUpload(value)) {\n const attachment = await OntologiesV2.Attachments.upload(\n client,\n value.data,\n {\n filename: value.name,\n },\n );\n return attachment.rid;\n }\n\n if (\n isAttachmentFile(value)\n ) {\n const attachment = await OntologiesV2.Attachments.upload(\n client,\n value,\n {\n filename: value.name as string,\n },\n );\n return attachment.rid;\n }\n\n // If it's not an upload, it's just an attachment rid string which we can pass through\n return value;\n }\n case \"twoDimensionalAggregation\": {\n return {\n groups: value,\n };\n }\n case \"threeDimensionalAggregation\": {\n return {\n groups: value,\n };\n }\n\n case \"set\": {\n if (value instanceof Set) {\n const promiseArray = Array.from(\n value,\n async (innerValue) =>\n await toDataValueQueries(innerValue, client, desiredType[\"set\"]),\n );\n return Promise.all(promiseArray);\n }\n break;\n }\n case \"object\": {\n if (isObjectSpecifiersObject(value)) {\n return value.$primaryKey;\n }\n break;\n }\n case \"interface\": {\n if (isInterfaceSpecifier(value) || isInterfaceQueryParam(value)) {\n return {\n objectTypeApiName: value.$objectType,\n primaryKeyValue: value.$primaryKey,\n };\n }\n }\n case \"objectSet\":\n case \"interfaceObjectSet\": {\n // object set (the rid as a string (passes through the last return), or the ObjectSet definition directly)\n if (isWireObjectSet(value)) {\n return value;\n }\n if (isObjectSet(value)) {\n return getWireObjectSet(value);\n }\n break;\n }\n\n case \"map\": {\n if (typeof value === \"object\") {\n const entrySet: Array<{ key: any; value: any }> = [];\n for (const [key, mapValue] of Object.entries(value)) {\n entrySet.push({\n key: desiredType.keyType.type === \"object\"\n ? extractPrimaryKeyFromObjectSpecifier(key as any)\n : await toDataValueQueries(\n key,\n client,\n desiredType.keyType,\n ),\n value: await toDataValueQueries(\n mapValue,\n client,\n desiredType.valueType,\n ),\n });\n }\n return entrySet;\n }\n break;\n }\n\n case \"struct\": {\n if (typeof value === \"object\") {\n const structMap: { [key: string]: unknown } = {};\n for (const [key, structValue] of Object.entries(value)) {\n structMap[key] = await toDataValueQueries(\n structValue,\n client,\n desiredType[\"struct\"][key],\n );\n }\n return structMap;\n }\n }\n\n case \"boolean\":\n case \"date\":\n case \"double\":\n case \"float\":\n case \"integer\":\n case \"long\":\n case \"string\":\n case \"timestamp\":\n return value;\n }\n return value;\n}\n"],"mappings":"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","ignoreList":[]}
|
package/build/types/Client.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export interface Client extends SharedClient, OldSharedClient {
|
|
|
16
16
|
<Q extends Experiment<"2.0.8"> | Experiment<"2.1.0"> | Experiment<"2.2.0">>(experiment: Q): ExperimentFns<Q>;
|
|
17
17
|
fetchMetadata<Q extends (ObjectTypeDefinition | InterfaceDefinition | ActionDefinition<any> | QueryDefinition<any>)>(o: Q): Promise<Q extends ObjectTypeDefinition ? ObjectMetadata : Q extends InterfaceDefinition ? InterfaceMetadata : Q extends ActionDefinition<any> ? ActionMetadata : Q extends QueryDefinition<any> ? QueryMetadata : never>;
|
|
18
18
|
}
|
|
19
|
-
declare const MaxOsdkVersion = "2.5.
|
|
19
|
+
declare const MaxOsdkVersion = "2.5.2";
|
|
20
20
|
export type MaxOsdkVersion = typeof MaxOsdkVersion;
|
|
21
21
|
declare const ErrorMessage: unique symbol;
|
|
22
22
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"AAgBA,cAGE,qBACA,qBAEA,sBACA,UACA,gBAEA,uBAEK,WAAY;AAInB,cAAc,qBAAqB,4BAA6B;AAUhE,cAAc,oBAAoB,uBAAuB,YAAa;AAEtE,OAAO,iBAAe;CACpB,WAAW;CACX,UAAU,mBAAmB,oBAAoB,IAAI;EAErDA,QAAQ,eACRC,OAAO,IACPC,SAAS,IACR,QACD,gBAAgB,oBAAoB,IAAI;
|
|
1
|
+
{"mappings":"AAgBA,cAGE,qBACA,qBAEA,sBACA,UACA,gBAEA,uBAEK,WAAY;AAInB,cAAc,qBAAqB,4BAA6B;AAUhE,cAAc,oBAAoB,uBAAuB,YAAa;AAEtE,OAAO,iBAAe;CACpB,WAAW;CACX,UAAU,mBAAmB,oBAAoB,IAAI;EAErDA,QAAQ,eACRC,OAAO,IACPC,SAAS,IACR,QACD,gBAAgB,oBAAoB,IAAI;AA6W1C,OAAO,iBAAS,0BACd,UAAU,sBAEVC,YAAY,eAAe,IAC3BC,WAAW,IACV,SAAS;AAaZ,OAAO,iBAAS,6BACd,UAAU,qBAEVC,oBAAoB;CAClB;CACA,iBAAiB,eAAe;AACjC,GACDC,cAAc,IACb,SAAS","names":["client: MinimalClient","query: QD","params?: P","primaryKey: PrimaryKeyType<Q>","objectDef: Q","interfaceSpecifier: {\n objectTypeApiName: string;\n primaryKeyValue: PrimaryKeyType<Q>;\n }","interfaceDef: Q"],"sources":["../../../src/queries/applyQuery.ts"],"version":3,"file":"applyQuery.d.ts"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osdk/client",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"access": "public",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -65,12 +65,12 @@
|
|
|
65
65
|
"tiny-invariant": "^1.3.3",
|
|
66
66
|
"type-fest": "^4.41.0",
|
|
67
67
|
"ws": "^8.18.3",
|
|
68
|
-
"@osdk/api": "~2.5.
|
|
69
|
-
"@osdk/
|
|
68
|
+
"@osdk/api": "~2.5.2",
|
|
69
|
+
"@osdk/generator-converters": "2.5.2",
|
|
70
70
|
"@osdk/shared.client.impl": "~1.5.0",
|
|
71
|
-
"@osdk/
|
|
71
|
+
"@osdk/shared.net.fetch": "~1.5.0",
|
|
72
72
|
"@osdk/shared.net.errors": "~2.5.0",
|
|
73
|
-
"@osdk/
|
|
73
|
+
"@osdk/client.unstable": "2.5.2"
|
|
74
74
|
},
|
|
75
75
|
"devDependencies": {
|
|
76
76
|
"@microsoft/api-documenter": "^7.26.32",
|
|
@@ -91,10 +91,10 @@
|
|
|
91
91
|
"ts-expect": "^1.3.0",
|
|
92
92
|
"typescript": "~5.5.4",
|
|
93
93
|
"zod": "^3.25.76",
|
|
94
|
-
"@osdk/client.test.ontology": "~2.5.
|
|
95
|
-
"@osdk/monorepo.
|
|
94
|
+
"@osdk/client.test.ontology": "~2.5.2",
|
|
95
|
+
"@osdk/monorepo.api-extractor": "~0.4.0",
|
|
96
96
|
"@osdk/shared.test": "~2.5.0",
|
|
97
|
-
"@osdk/monorepo.
|
|
97
|
+
"@osdk/monorepo.tsconfig": "~0.4.0"
|
|
98
98
|
},
|
|
99
99
|
"publishConfig": {
|
|
100
100
|
"access": "public"
|