@osdk/client 0.15.0 → 0.15.1-main-20240411211601

package/{CHANGELOG_OLD.md → CHANGELOG.md}

@@ -1,5 +1,16 @@
 # @osdk/client
 
+## 0.15.1-main-20240411211601
+
+### Patch Changes
+
+- 9906a41e: Omniapi support
+- 9906a41e: Compatible version checks now use versions that are both embedded in the code and updated automatically as part of the release process.
+- Updated dependencies [9906a41e]
+  - @osdk/shared.net@1.9.1-main-20240411211601
+  - @osdk/api@1.6.1-main-20240411211601
+  - @osdk/generator-converters@0.4.1-main-20240411211601
+
 ## 0.5.0
 
 ### Minor Changes

package/build/js/index.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 var shared_net = require('@osdk/shared.net');
-var requests = require('@osdk/gateway/requests');
 var invariant2 = require('tiny-invariant');
 var WebSocket = require('isomorphic-ws');
 var conjureLite = require('conjure-lite');
@@ -23,6 +22,22 @@ var ActionValidationError = class extends Error {
     this.validation = validation;
   }
 };
+var _applyActionV2 = [1, "/v2/ontologies/{0}/actions/{1}/apply", 3];
+function applyActionV2($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _applyActionV2, ...args);
+}
+function addUserAgent(client, withMetadata) {
+  if (withMetadata.osdkMetadata) {
+    return {
+      ...client,
+      fetch: shared_net.createFetchHeaderMutator(client.fetch, (headers) => {
+        headers.set("Fetch-User-Agent", withMetadata.osdkMetadata.extraUserAgent);
+        return headers;
+      })
+    };
+  }
+  return client;
+}
 
 // src/object/Attachment.ts
 var Attachment = class {
@@ -355,6 +370,28 @@ function createAsyncCache(fn, createCacheLocal = createCache) {
   };
   return ret;
 }
+var _loadObjectSetV2 = [1, "/v2/ontologies/{0}/objectSets/loadObjects", 3];
+function loadObjectSetV2($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _loadObjectSetV2, ...args);
+}
+var _aggregateObjectSetV2 = [1, "/v2/ontologies/{0}/objectSets/aggregate", 3];
+function aggregateObjectSetV2($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _aggregateObjectSetV2, ...args);
+}
+var _listInterfaceTypes = [0, "/v2/ontologies/{0}/interfaceTypes", 2];
+function listInterfaceTypes($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _listInterfaceTypes, ...args);
+}
+var _getInterfaceType = [0, "/v2/ontologies/{0}/interfaceTypes/{1}", 2];
+function getInterfaceType($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _getInterfaceType, ...args);
+}
+var _searchObjectsForInterface = [1, "/v2/ontologies/{0}/interfaces/{1}/search", 3];
+function searchObjectsForInterface($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _searchObjectsForInterface, ...args);
+}
+
+// src/object/fetchPage.ts
 function augment(type, ...properties) {
   return {
     [type.apiName]: properties
@@ -376,7 +413,7 @@ function objectSetToSearchJsonV2(objectSet, expectedApiName, existingWhere = voi
   throw new Error(`Unsupported objectSet type: ${objectSet.type}`);
 }
 async function fetchInterfacePage(client, interfaceType, args, objectSet) {
-  const result = await requests.searchObjectsForInterface(shared_net.createOpenApiRequest(client.stack, client.fetch), client.ontology.metadata.ontologyApiName, interfaceType.apiName, applyFetchArgs(args, {
+  const result = await searchObjectsForInterface(addUserAgent(client, interfaceType), client.ontologyRid, interfaceType.apiName, applyFetchArgs(args, {
     augmentedProperties: args.augment ?? {},
     augmentedSharedPropertyTypes: {},
     otherInterfaceTypes: [],
@@ -443,7 +480,7 @@ function applyFetchArgs(args, body) {
   return body;
 }
 async function fetchObjectPage(client, objectType, args, objectSet) {
-  const r = await requests.loadObjectSetV2(shared_net.createOpenApiRequest(client.stack, client.fetch), client.ontology.metadata.ontologyApiName, applyFetchArgs(args, {
+  const r = await loadObjectSetV2(addUserAgent(client, objectType), client.ontologyRid, applyFetchArgs(args, {
     objectSet,
     // We have to do the following case because LoadObjectSetRequestV2 isnt readonly
     select: args?.select ?? [],
@@ -632,9 +669,9 @@ async function convertWireToOsdkObjects(client, objects, interfaceApiName, force
   }
 }
 function createLocalObjectCacheAndInitiatePreseed(objects, client) {
-  const localInterfaceCache = createAsyncCache((client2, apiName) => client2.ontology.provider.getInterfaceDefinition(apiName));
+  const localInterfaceCache = createAsyncCache((client2, apiName) => client2.ontologyProvider.getInterfaceDefinition(apiName));
   const localObjectCache = createAsyncCache(async (client2, apiName) => {
-    const objectDef = await client2.ontology.provider.getObjectDefinition(apiName);
+    const objectDef = await client2.ontologyProvider.getObjectDefinition(apiName);
     const interfaceDefs = Object.fromEntries((await Promise.all(objectDef.implements?.map((i) => localInterfaceCache.get(client2, i)) ?? [])).map((i) => [i.apiName, i]));
     if (objectDef[InterfaceDefinitions] == null) {
       Object.defineProperty(objectDef, InterfaceDefinitions, {
@@ -708,7 +745,7 @@ async function aggregate(clientCtx, objectType, objectSet = {
   if (req.where) {
     body.where = modernToLegacyWhereClause(req.where);
   }
-  const result = await requests.aggregateObjectSetV2(shared_net.createOpenApiRequest(clientCtx.stack, clientCtx.fetch), clientCtx.ontology.metadata.ontologyApiName, {
+  const result = await aggregateObjectSetV2(addUserAgent(clientCtx, objectType), clientCtx.ontologyRid, {
     objectSet,
     groupBy: body.groupBy,
     aggregation: body.aggregation
@@ -744,6 +781,14 @@ var WIRE_OBJECT_SET_TYPES = /* @__PURE__ */ new Set(["base", "filter", "intersec
 function isWireObjectSet(o) {
   return o != null && typeof o === "object" && WIRE_OBJECT_SET_TYPES.has(o.type);
 }
+var _getObjectTypeV2 = [0, "/v2/ontologies/{0}/objectTypes/{1}"];
+function getObjectTypeV2($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _getObjectTypeV2, ...args);
+}
+var _listOutgoingLinkTypesV2 = [0, "/v2/ontologies/{0}/objectTypes/{1}/outgoingLinkTypes", 2];
+function listOutgoingLinkTypesV2($ctx, ...args) {
+  return shared_net.omniFetch($ctx, _listOutgoingLinkTypesV2, ...args);
+}
 async function createTemporaryObjectSet(ctx, request) {
   return conjureLite.conjureFetch(ctx, `/objectSets/temporary`, "POST", request);
 }
@@ -1009,7 +1054,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         this.#ensureWebsocket(),
         // look up the object type's rid and ensure that we have enabled object set watcher for that rid
         // TODO ???
-        getObjectSetBaseType(objectSet).then((baseType) => requests.getObjectTypeV2(shared_net.createOpenApiRequest(this.#client.stack, this.#client.fetch), this.#client.ontology.metadata.ontologyApiName, baseType)).then((objectType) => this.#enableObjectSetsWatcher([objectType.rid]))
+        getObjectSetBaseType(objectSet).then((baseType) => getObjectTypeV2(this.#client, this.#client.ontologyRid, baseType)).then((objectType) => this.#enableObjectSetsWatcher([objectType.rid]))
       ]);
       if (!this.#listeners.has(requestId)) {
         return;
@@ -1219,7 +1264,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
 };
 async function convertFoundryToOsdkObjects(client, ctx, objects) {
   const osdkObjects = await Promise.all(objects.map(async (object) => {
-    const propertyMapping = await getOntologyPropertyMappingForRid(ctx, client.ontology.metadata.ontologyRid, object.type);
+    const propertyMapping = await getOntologyPropertyMappingForRid(ctx, client.ontologyRid, object.type);
     const convertedObject = Object.fromEntries([...Object.entries(object.properties).map(([key, value]) => {
       return [propertyMapping?.propertyIdToApiNameMapping[key], value];
     }), [propertyMapping?.propertyIdToApiNameMapping[Object.entries(object.key)[0][0]], Object.entries(object.key)[0][1]], ["__apiName", propertyMapping?.apiName], ["$apiName", propertyMapping?.apiName]]);
@@ -1233,8 +1278,8 @@ async function getOntologyPropertyMappingForApiName(client, ctx, objectApiName)
   if (objectApiNameToRid.has(objectApiName)) {
     return objectTypeMapping.get(ctx)?.get(objectApiNameToRid.get(objectApiName));
   }
-  const wireObjectType = await requests.getObjectTypeV2(shared_net.createOpenApiRequest(client.stack, client.fetch), client.ontology.metadata.ontologyApiName, objectApiName);
-  return getOntologyPropertyMappingForRid(ctx, client.ontology.metadata.ontologyRid, wireObjectType.rid);
+  const wireObjectType = await getObjectTypeV2(client, client.ontologyRid, objectApiName);
+  return getOntologyPropertyMappingForRid(ctx, client.ontologyRid, wireObjectType.rid);
 }
 var cachedAllOntologies;
 async function getOntologyVersionForRid(ctx, ontologyRid) {
@@ -1402,7 +1447,7 @@ function toDataValue(value) {
 
 // src/actions/applyAction.ts
 async function applyAction(client, action, parameters, options = {}) {
-  const response = await requests.applyActionV2(shared_net.createOpenApiRequest(client.stack, client.fetch), client.ontology.metadata.ontologyApiName, action.apiName, {
+  const response = await applyActionV2(addUserAgent(client, action), client.ontologyRid, action.apiName, {
     parameters: remapActionParams(parameters),
     options: {
       mode: options?.validateOnly ? "VALIDATE_ONLY" : "VALIDATE_AND_EXECUTE",
@@ -1435,34 +1480,11 @@ function createActionInvoker(client, action) {
     return applyAction(client, action, ...args);
   };
 }
-function createOldActionInvoker(client, ontology) {
-  const proxy = new Proxy({}, {
-    get: (_target, p, _receiver) => {
-      if (typeof p === "string") {
-        return createActionInvoker(client, ontology.actions[p]);
-      }
-      return void 0;
-    },
-    ownKeys(_target) {
-      return Object.keys(ontology.actions);
-    },
-    getOwnPropertyDescriptor(_target, p) {
-      if (typeof p === "string") {
-        return {
-          enumerable: ontology.actions[p] != null,
-          configurable: true,
-          value: proxy[p]
-        };
-      }
-    }
-  });
-  return proxy;
-}
 async function loadAllOutgoingLinkTypes(client, objtype) {
   const linkTypes = [];
   let pageToken;
   do {
-    const result = await requests.listOutgoingLinkTypesV2(shared_net.createOpenApiRequest(client.stack, client.fetch), client.ontology.metadata.ontologyApiName, objtype, {
+    const result = await listOutgoingLinkTypesV2(client, client.ontologyRid, objtype, {
       pageToken
     });
     pageToken = result.nextPageToken;
@@ -1479,15 +1501,12 @@ function makeConjureContext(client, servicePath) {
   };
 }
 async function loadFullObjectMetadata(client, objtype) {
-  const {
-    ontologyApiName
-  } = client.ontology.metadata;
   const conjureCtx = makeConjureContext(client, "/ontology-metadata/api");
-  const [objectType, linkTypes, interfaceTypes, metadata] = await Promise.all([requests.getObjectTypeV2(shared_net.createOpenApiRequest(client.stack, client.fetch), ontologyApiName, objtype), loadAllOutgoingLinkTypes(client, objtype), requests.listInterfaceTypes(shared_net.createOpenApiRequest(client.stack, client.fetch), ontologyApiName, {
+  const [objectType, linkTypes, interfaceTypes, metadata] = await Promise.all([getObjectTypeV2(client, client.ontologyRid, objtype), loadAllOutgoingLinkTypes(client, objtype), listInterfaceTypes(client, client.ontologyRid, {
     pageSize: 200,
     preview: true
   }), await loadAllOntologies(conjureCtx, {})]);
-  const sharedPropertyTypeMapping = await loadSptMap(conjureCtx, metadata, client.ontology.metadata.ontologyRid, objectType.rid);
+  const sharedPropertyTypeMapping = await loadSptMap(conjureCtx, metadata, client.ontologyRid, objectType.rid);
   const full = {
     implementsInterfaces: interfaceTypes.data.map((i) => i.apiName),
     linkTypes,
@@ -1518,10 +1537,7 @@ async function loadSptMap(ctx, ontologyMetadata, ontologyRid, objectRid) {
   return sptMap;
 }
 async function loadInterfaceDefinition(client, objtype) {
-  const {
-    ontologyApiName
-  } = client.ontology.metadata;
-  const r = await requests.getInterfaceType(shared_net.createOpenApiRequest(client.stack, client.fetch), ontologyApiName, objtype, {
+  const r = await getInterfaceType(client, client.ontologyRid, objtype, {
     preview: true
   });
   return generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(r, true);
@@ -1567,103 +1583,69 @@ var createStandardOntologyProviderFactory = (client) => {
 };
 
 // src/util/UserAgent.ts
-var USER_AGENT = `osdk-client/${"0.15.0"}`;
+var USER_AGENT = `osdk-client/${"0.15.1-main-20240411211601"}`;
 
 // src/createMinimalClient.ts
 function createMinimalClient(metadata, stack, tokenProvider, ontologyCachingOptions = {}, fetchFn = global.fetch) {
-  const clientCtx = shared_net.createClientContext({
-    metadata,
-    provider: void 0
-  }, stack, tokenProvider, USER_AGENT, fetchFn);
-  clientCtx.ontology.provider = createStandardOntologyProviderFactory(ontologyCachingOptions)(clientCtx);
-  return clientCtx;
-}
-
-// src/ObjectSetCreator.ts
-function createObjectSetCreator(client, ontology) {
-  return new Proxy({}, {
-    get: (target, p, receiver) => {
-      if (typeof p === "string") {
-        return client(ontology.objects[p] ?? ontology.interfaces?.[p]);
-      }
-      return void 0;
-    },
-    ownKeys(target) {
-      return Object.keys(ontology.objects);
-    },
-    getOwnPropertyDescriptor(target, p) {
-      if (typeof p === "string") {
-        return {
-          enumerable: ontology.objects[p] != null,
-          configurable: true,
-          get: () => client(ontology.objects[p] ?? ontology.interfaces?.[p])
-        };
-      }
+  if (process?.env?.NODE_ENV !== "production") {
+    try {
+      new URL(stack);
+    } catch (e) {
+      const hint = !stack.startsWith("http://") || !stack.startsWith("https://") ? ". Did you forget to add 'http://' or 'https://'?" : "";
+      throw new Error(`Invalid stack URL: ${stack}${hint}`);
     }
-  });
+  }
+  const clientCtx = {
+    ...shared_net.createClientContext({
+      metadata
+    }, stack, tokenProvider, USER_AGENT, fetchFn),
+    ontologyRid: metadata.ontologyRid,
+    ontologyProvider: void 0
+  };
+  clientCtx.ontologyProvider = createStandardOntologyProviderFactory(ontologyCachingOptions)(clientCtx);
+  return clientCtx;
 }
 
 // src/createClient.ts
-function createFutureClientPlus(metadata, stack, tokenProvider, ontologyCachingOptions = {}, fetchFn = fetch) {
-  const clientCtx = createMinimalClient(metadata, stack, tokenProvider, ontologyCachingOptions, fetchFn);
+function createClient(stack, ontologyRid, tokenProvider, HOLD = void 0, fetchFn = fetch) {
+  const clientCtx = createMinimalClient({
+    ontologyRid,
+    userAgent: ""
+    // ontology specific user agent injected elsewhere
+  }, stack, tokenProvider, {}, fetchFn);
   function clientFn(o) {
     if (o.type === "object" || o.type === "interface") {
-      clientCtx.ontology.provider.maybeSeed(o);
+      clientCtx.ontologyProvider.maybeSeed(o);
       return createObjectSet(o, clientCtx);
     } else if (o.type === "action") {
-      clientCtx.ontology.provider.maybeSeed(o);
+      clientCtx.ontologyProvider.maybeSeed(o);
       return createActionInvoker(clientCtx, o);
     } else {
-      throw new Error("Unknown definition: " + JSON.stringify(o));
+      throw new Error("not implemented");
     }
   }
-  return [clientCtx, clientFn];
-}
-function createFutureClient(metadata, stack, tokenProvider, ontologyCachingOptions = {}, fetchFn = fetch) {
-  return createFutureClientPlus(metadata, stack, tokenProvider, ontologyCachingOptions, fetchFn)[1];
-}
-function isOntologyMetadata(ontology) {
-  return "ontologyRid" in ontology || "ontologyApiName" in ontology;
-}
-function createClient(ontology, stack, tokenProvider, ontologyCachingOptions = {}, fetchFn = fetch) {
-  if (isOntologyMetadata(ontology)) {
-    return createFutureClient(ontology, stack, tokenProvider, ontologyCachingOptions, fetchFn);
-  }
-  const [clientCtx, clientFn] = createFutureClientPlus(ontology.metadata, stack, tokenProvider, ontologyCachingOptions, fetchFn);
-  const objectSetFactory = (type) => createObjectSet(ontology["objects"][type] ?? ontology["interfaces"]?.[type], clientCtx);
-  const oldActionInvoker = createOldActionInvoker(clientCtx, ontology);
   const client = Object.defineProperties(clientFn, {
-    objectSet: {
-      get: () => objectSetFactory
-    },
-    objects: {
-      get: () => createObjectSetCreator(client, ontology)
-    },
-    actions: {
-      get: () => oldActionInvoker
-    },
     __UNSTABLE_preexistingObjectSet: {
-      get: () => (objectType, rid) => {
-        return createObjectSet(ontology["interfaces"]?.[objectType] ?? ontology["objects"][objectType], clientCtx, {
+      get: () => (definition, rid) => {
+        return createObjectSet(definition, clientCtx, {
           type: "intersect",
           objectSets: [{
             type: "base",
-            objectType
+            objectType: definition.apiName
           }, {
             type: "reference",
             reference: rid
           }]
         });
       }
+    },
+    ctx: {
+      value: clientCtx
     }
   });
   return client;
 }
 
-Object.defineProperty(exports, 'createClientContext', {
-  enumerable: true,
-  get: function () { return shared_net.createClientContext; }
-});
 Object.defineProperty(exports, 'isOk', {
   enumerable: true,
   get: function () { return shared_net.isOk; }
@@ -1671,6 +1653,5 @@ Object.defineProperty(exports, 'isOk', {
 exports.ActionValidationError = ActionValidationError;
 exports.augment = augment;
 exports.createClient = createClient;
-exports.createMinimalClient = createMinimalClient;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.cjs.map