@osdk/foundry-sdk-generator 2.0.0-beta.6 → 2.0.0-beta.8

package/build/cjs/index.cjs

@@ -3,8 +3,7 @@
 var yargs = require('yargs');
 var helpers = require('yargs/helpers');
 var process$1 = require('process');
-var gateway = require('@osdk/gateway');
-var legacyClient = require('@osdk/legacy-client');
+var shared_net = require('@osdk/shared.net');
 var generator = require('@osdk/generator');
 var promises = require('fs/promises');
 var path = require('path');
@@ -44,237 +43,6 @@ var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
 // src/cli/foundrySdkGeneratorCli.ts
 
-// src/net/Constants.ts
-var API_BASE_URL = (host) => {
-  if (host.startsWith("http") || host.startsWith("https")) {
-    return `${host}`;
-  }
-  return `https://${host}`;
-};
-
-// src/net/fetch/authenticatedFetch.ts
-var AuthenticatedFetch = class {
-  constructor(fetchFunction, auth) {
-    this.fetchFunction = fetchFunction;
-    this.auth = auth;
-  }
-  getFetch() {
-    return (input, init) => {
-      return this.auth.executeWithToken((token) => {
-        return this.fetchFunction(input, {
-          ...init,
-          headers: {
-            // Don't override auth headers if they are already set
-            Authorization: `Bearer ${token.accessToken}`,
-            ...init?.headers
-          }
-        });
-      });
-    };
-  }
-};
-
-// src/net/fetch/retryingFetch.ts
-var RetryingFetch = class {
-  constructor(fetchFunction, initialDelay = 1e3, jitterFactor = 0.5, maxRetries = 3) {
-    this.fetchFunction = fetchFunction;
-    this.initialDelay = initialDelay;
-    this.jitterFactor = jitterFactor;
-    this.maxRetries = maxRetries;
-  }
-  SERVICE_UNAVAILABLE = 503;
-  TOO_MANY_REQUESTS = 429;
-  getFetch() {
-    return this.retryWithBackoff.bind(this, 0);
-  }
-  async retryWithBackoff(retries, url, init) {
-    let response;
-    let backoffDelay;
-    try {
-      response = await this.fetchFunction(url, init);
-      if (response.ok) {
-        return response;
-      }
-      backoffDelay = this.calculateBackoffDelay(retries, response.status);
-      if (!backoffDelay) {
-        return response;
-      }
-    } catch (error) {
-      backoffDelay = this.calculateBackoffDelay(retries);
-      if (!backoffDelay) {
-        throw error;
-      }
-    }
-    await new Promise((resolve) => setTimeout(resolve, backoffDelay));
-    return this.retryWithBackoff(retries + 1, url, init);
-  }
-  calculateBackoffDelay(retries, status) {
-    if (retries >= this.maxRetries) {
-      return;
-    }
-    if (status && status !== this.SERVICE_UNAVAILABLE && status !== this.TOO_MANY_REQUESTS) {
-      return;
-    }
-    const delay = this.initialDelay * 2 ** retries;
-    const jitter = delay * this.jitterFactor * (Math.random() * 2 - 1);
-    return delay + jitter;
-  }
-};
-
-// src/net/fetch/fetchFactory.ts
-var FetchFactory = class {
-  constructor(fetchFunction) {
-    this.fetchFunction = fetchFunction;
-  }
-  /**
-   * Creates a fetch instance with authentication, error handling, and retrying.
-   *
-   * @returns A fetch instance
-   */
-  getDefaultFetch(auth) {
-    const authenticatedFetch = new AuthenticatedFetch(this.baseFetch, auth);
-    const retryingFetch = new RetryingFetch(authenticatedFetch.getFetch());
-    return retryingFetch.getFetch();
-  }
-  baseFetch = (input, auth) => {
-    const fetchFunction = this.fetchFunction ?? globalThis.fetch;
-    return fetchFunction(input, auth);
-  };
-};
-
-// src/net/MediaType.ts
-var MediaType = /* @__PURE__ */ function(MediaType2) {
-  MediaType2["APPLICATION_JSON"] = "application/json";
-  MediaType2["APPLICATION_OCTET_STREAM"] = "application/octet-stream";
-  MediaType2["APPLICATION_X_WWW_FORM_URLENCODED"] = "application/x-www-form-urlencoded";
-  MediaType2["MULTIPART_FORM_DATA"] = "multipart/form-data";
-  MediaType2["TEXT_PLAIN"] = "text/plain";
-  return MediaType2;
-}({});
-
-// src/net/ResponseType.ts
-var ResponseType = /* @__PURE__ */ function(ResponseType2) {
-  ResponseType2[ResponseType2["JSON"] = 0] = "JSON";
-  ResponseType2[ResponseType2["BLOB"] = 1] = "BLOB";
-  ResponseType2[ResponseType2["TEXT"] = 2] = "TEXT";
-  ResponseType2[ResponseType2["STREAM"] = 3] = "STREAM";
-  return ResponseType2;
-}({});
-
-// src/net/FetchClient.ts
-function getApiRequestFunction(auth, url, userAgent, contextPath = "/api", fetchFunction) {
-  const fetchClient = new FetchClient(auth, url, userAgent, contextPath, fetchFunction);
-  return (method, endpointPath, data, queryArguments, headers, requestMediaType, responseMediaType) => fetchClient.request(method, endpointPath, data, queryArguments, headers, requestMediaType, responseMediaType);
-}
-var FetchClient = class {
-  constructor(auth, url, userAgent, contextPath = "/api", fetchFunction) {
-    this.userAgent = userAgent;
-    this.contextPath = contextPath;
-    const fetchFactory = new FetchFactory(fetchFunction);
-    this.fetchFunction = fetchFactory.getDefaultFetch(auth);
-    this.url = API_BASE_URL(url);
-  }
-  async request(method, endpointPath, data, queryArguments, headers, _requestMediaType = "application/json", responseMediaType = "application/json", responseAsStream) {
-    const url = new URL(`${this.contextPath}${endpointPath}`, `${this.url}`);
-    for (const [queryArgumentName, queryArgumentValue] of Object.entries(queryArguments || {})) {
-      if (queryArgumentValue) {
-        if (queryArgumentValue.constructor === Array) {
-          for (const value of queryArgumentValue) {
-            url.searchParams.append(queryArgumentName, value);
-          }
-          continue;
-        } else {
-          url.searchParams.append(queryArgumentName, queryArgumentValue);
-        }
-      }
-    }
-    const headersInit = {};
-    Object.entries(headers || {}).forEach(([key, value]) => {
-      if (value != null) {
-        headersInit[key] = value.toString();
-      }
-    });
-    const response = await this.fetchWithContentType(url, {
-      method,
-      body: data,
-      headers: headersInit
-    });
-    if (responseAsStream && response.body) {
-      return response.body;
-    }
-    if (responseMediaType === MediaType.APPLICATION_JSON) {
-      return response.json();
-    } else if (responseMediaType === "*/*") {
-      return response.blob();
-    }
-    return response.json();
-  }
-  async callAPI(url, method = "GET", body, responseType = ResponseType.JSON) {
-    const response = await this.fetchWithContentType(url, {
-      method,
-      body
-    });
-    const contentType = response.headers.get("Content-Type") != null ? response.headers.get("Content-Type") : "";
-    let bodyPromise;
-    if (responseType === ResponseType.BLOB) {
-      bodyPromise = response.blob();
-    } else if (contentType.includes(MediaType.APPLICATION_JSON)) {
-      bodyPromise = response.json();
-    } else if (contentType.includes(MediaType.APPLICATION_OCTET_STREAM)) {
-      bodyPromise = response.blob();
-    } else {
-      bodyPromise = response.text();
-    }
-    const responseBody = await bodyPromise;
-    return responseBody;
-  }
-  async fetchWithContentType(url, init) {
-    if (!init?.body) {
-      return this.fetchFunction(url.toString(), {
-        ...init,
-        headers: this.getHeaders(init?.headers)
-      });
-    }
-    const contentType = this.getContentTypeForBody(init.body);
-    return this.fetchFunction(url.toString(), {
-      ...init,
-      headers: this.getHeaders(init?.headers, contentType),
-      body: this.getBodyForContentType(init.body)
-    });
-  }
-  getContentTypeForBody(body) {
-    if (globalThis.Blob && body instanceof globalThis.Blob) {
-      return body.type;
-    }
-    if (typeof body === "string") {
-      return MediaType.TEXT_PLAIN;
-    }
-    if (globalThis.ArrayBuffer && (globalThis.ArrayBuffer.isView(body) || body instanceof globalThis.ArrayBuffer)) {
-      return MediaType.APPLICATION_OCTET_STREAM;
-    }
-    if (globalThis.Uint8Array && body instanceof globalThis.Uint8Array) {
-      return MediaType.APPLICATION_OCTET_STREAM;
-    }
-    return MediaType.APPLICATION_JSON;
-  }
-  getBodyForContentType(body) {
-    if (!body) {
-      return void 0;
-    }
-    if (globalThis.Blob && body instanceof globalThis.Blob) {
-      return body;
-    }
-    return JSON.stringify(body);
-  }
-  getHeaders(init, contentType = MediaType.APPLICATION_JSON) {
-    return {
-      "Content-Type": contentType,
-      "Fetch-User-Agent": this.userAgent,
-      ...init
-    };
-  }
-};
-
 // src/ontologyMetadata/Result.ts
 var Ok = class {
   constructor(value) {
@@ -353,10 +121,8 @@ var OntologyMetadataResolver = class {
     this.stackName = stackName;
     this.#authToken = authToken;
   }
-  getRequestFunction() {
-    return getApiRequestFunction(new legacyClient.UserTokenAuth({
-      userToken: this.#authToken
-    }), this.stackName, `foundry-typescript-osdk-generator/${process.env.npm_package_version}`, "/api");
+  getClientContext() {
+    return shared_net.createClientContext(this.stackName.match(/^https?:\/\//) ? this.stackName : `https://${this.stackName}`, () => this.#authToken, `foundry-typescript-osdk-generator/${process.env.npm_package_version}`);
   }
   filterMetadata(ontologyFullMetadata, expectedEntities) {
     const filteredObjectTypes = Object.fromEntries(Object.entries(ontologyFullMetadata.objectTypes).filter(([objectTypeApiName]) => expectedEntities.objectTypes.has(objectTypeApiName.toLowerCase())));
@@ -387,12 +153,18 @@ var OntologyMetadataResolver = class {
   }
   async getWireOntologyDefinition(ontologyRid, entities) {
     let ontology;
+    const {
+      Ontologies
+    } = await import('@osdk/internal.foundry.ontologies');
+    const {
+      OntologiesV2
+    } = await import('@osdk/internal.foundry.ontologiesv2');
     try {
-      ontology = await gateway.namespaces.getOntology(this.getRequestFunction(), ontologyRid);
+      ontology = await Ontologies.getOntology(this.getClientContext(), ontologyRid);
     } catch (e) {
       return Result.err([`Unable to load the specified Ontology with network error: ${JSON.stringify(e)}`]);
     }
-    const ontologyFullMetadata = await gateway.namespaces.getOntologyFullMetadata(this.getRequestFunction(), ontology.rid);
+    const ontologyFullMetadata = await OntologiesV2.getOntologyFullMetadata(this.getClientContext(), ontology.rid);
     if (ontologyFullMetadata.errorName != null) {
       return Result.err([`Unable to load the specified Ontology metadata.
 ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
@@ -584,7 +356,7 @@ function isValidSemver(semverString) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"2.0.0-beta.6"}`;
+var USER_AGENT = `typescript-sdk-generator/${"2.0.0-beta.8"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
   const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
   const {