@osdk/cli 0.5.0 → 0.7.0

package/build/js/{chunk-2DZBTS5E.cjs → chunk-TZGNA5WR.cjs}

@@ -23,7 +23,7 @@ function isTokenErrorResponse(response) {
 // src/commands/auth/login/loginFlow.ts
 var BROWSER_PROMPT_TIME_MS = 60 * 1e3;
 async function invokeLoginFlow(args) {
-  consola__default.default.start(`Authenticating using application id: ${args.applicationId}`);
+  consola__default.default.start(`Authenticating using application id: ${args.clientId}`);
   const redirectUrl = "http://localhost:8080/auth/callback";
   const port = url.parse(redirectUrl).port;
   let resolve;
@@ -43,11 +43,11 @@ async function invokeLoginFlow(args) {
     }
   });
   server.listen(port);
-  const clientId = args.applicationId;
+  const clientId = args.clientId;
   const state = generateRandomString();
   const codeVerifier = generateRandomString();
   const codeChallenge = await generateCodeChallenge(codeVerifier);
-  const authorizeUrl = generateAuthorizeUrl(args.baseUrl, clientId, state, redirectUrl, codeChallenge);
+  const authorizeUrl = generateAuthorizeUrl(args.foundryUrl, clientId, state, redirectUrl, codeChallenge);
   try {
     await open__default.default(authorizeUrl);
   } catch {
@@ -59,7 +59,7 @@ async function invokeLoginFlow(args) {
   const code = await authCode;
   server.close();
   clearTimeout(browserPrompt);
-  const token = await getTokenWithCodeVerifier(clientId, redirectUrl, code, args.baseUrl, codeVerifier);
+  const token = await getTokenWithCodeVerifier(clientId, redirectUrl, code, args.foundryUrl, codeVerifier);
   if (isTokenErrorResponse(token)) {
     consola__default.default.error("Unable to authenticate", token.error, token.error_description);
     process.exit(1);
@@ -126,4 +126,4 @@ async function getTokenWithCodeVerifier(clientId, redirectUrl, code, baseUrl, co
 
 exports.invokeLoginFlow = invokeLoginFlow;
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=chunk-2DZBTS5E.cjs.map
+//# sourceMappingURL=chunk-TZGNA5WR.cjs.map

package/build/js/chunk-TZGNA5WR.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/commands/auth/login/loginFlow.ts","../../src/commands/auth/login/token.ts"],"names":[],"mappings":"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","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\n// eslint-disable-next-line import/no-named-as-default\nimport consola from \"consola\";\nimport { getRandomValues, subtle } from \"crypto\";\nimport { createServer } from \"http\";\nimport open from \"open\";\nimport { join } from \"path/posix\";\nimport { exit } from \"process\";\nimport { parse } from \"url\";\nimport { isTokenErrorResponse } from \"./token.js\";\nconst BROWSER_PROMPT_TIME_MS = 60 * 1000;\nexport default async function invokeLoginFlow(args) {\n  consola.start(`Authenticating using application id: ${args.clientId}`);\n  const redirectUrl = \"http://localhost:8080/auth/callback\";\n  const port = parse(redirectUrl).port;\n  let resolve;\n  const authCode = new Promise(_res => {\n    resolve = _res;\n  });\n  const server = createServer((req, res) => {\n    const query = parse(req.url, true).query;\n    res.end(\"Authenticated\");\n    resolve(query[\"code\"]);\n  });\n  server.on(\"error\", e => {\n    if (e.code === \"EADDRINUSE\") {\n      consola.error(`Port ${port} is already in use, unable to perform authentication flow.`);\n      server.close();\n      exit(1);\n    }\n  });\n  server.listen(port);\n  const clientId = args.clientId;\n  const state = generateRandomString();\n  const codeVerifier = generateRandomString();\n  const codeChallenge = await generateCodeChallenge(codeVerifier);\n  const authorizeUrl = generateAuthorizeUrl(args.foundryUrl, clientId, state, redirectUrl, codeChallenge);\n  try {\n    await open(authorizeUrl);\n  } catch {\n    consola.warn(`Unable to open browser, please open this url in your browser to to authenticate: ${authorizeUrl}`);\n  }\n\n  // nag the user if we didn't get an auth token for a relatively long time\n  const browserPrompt = setTimeout(() => {\n    consola.warn(`Still waiting for the authentication to complete. Please open a browser to ${authorizeUrl}`);\n  }, BROWSER_PROMPT_TIME_MS);\n  const code = await authCode;\n  server.close();\n  clearTimeout(browserPrompt);\n  const token = await getTokenWithCodeVerifier(clientId, redirectUrl, code, args.foundryUrl, codeVerifier);\n  if (isTokenErrorResponse(token)) {\n    consola.error(\"Unable to authenticate\", token.error, token.error_description);\n    exit(1);\n  }\n  consola.success(`Successfully authenticated!`);\n  return token;\n}\nfunction generateRandomString(length = 128) {\n  const characters = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~\";\n  let output = [];\n  let array = new Uint8Array(1);\n  const maxIndex = 256 - 256 % characters.length;\n  while (output.length < length) {\n    getRandomValues(array);\n    if (array[0] < maxIndex) {\n      output.push(characters[array[0] % characters.length]);\n    }\n  }\n  return output.join(\"\");\n}\nasync function generateCodeChallenge(codeVerifier) {\n  const data = new TextEncoder().encode(codeVerifier);\n  const digest = await subtle.digest(\"SHA-256\", data);\n  const codeChallengeMethod = \"S256\";\n  const codeChallenge = btoa(String.fromCharCode(...new Uint8Array(digest))).replace(/\\//g, \"_\").replace(/\\+/g, \"-\").replace(/=/g, \"\");\n  return {\n    codeChallenge,\n    codeChallengeMethod\n  };\n}\nfunction generateAuthorizeUrl(baseUrl, clientId, state, redirectUrl, codeChallenge) {\n  const queryParams = new URLSearchParams();\n  queryParams.append(\"client_id\", clientId);\n  queryParams.append(\"response_type\", \"code\");\n  queryParams.append(\"state\", state);\n  queryParams.append(\"redirect_uri\", redirectUrl);\n  queryParams.append(\"code_challenge\", codeChallenge.codeChallenge);\n  queryParams.append(\"code_challenge_method\", codeChallenge.codeChallengeMethod);\n  queryParams.append(\"scope\", [\"offline_access\", \"api:read-data\"].join(\" \"));\n  return join(baseUrl, \"multipass\", \"api\", \"oauth2\", \"authorize\") + `?` + queryParams.toString();\n}\nasync function getTokenWithCodeVerifier(clientId, redirectUrl, code, baseUrl, codeVerifier) {\n  const body = new URLSearchParams();\n  body.append(\"client_id\", clientId);\n  body.append(\"grant_type\", \"authorization_code\");\n  body.append(\"code\", code);\n  body.append(\"redirect_uri\", redirectUrl);\n  body.append(\"code_verifier\", codeVerifier);\n  const tokenUrl = join(baseUrl, \"multipass\", \"api\", \"oauth2\", \"token\") + `?state=${codeVerifier}`;\n  try {\n    const response = await fetch(tokenUrl, {\n      body: body.toString(),\n      headers: {\n        \"Content-Type\": \"application/x-www-form-urlencoded\"\n      },\n      method: \"POST\"\n    });\n    const responseText = await response.json();\n    return responseText;\n  } catch (e) {\n    throw new Error(`Failed to get token: ${e?.cause?.toString() ?? e?.toString() ?? \"Unknown error\"}`);\n  }\n}","/*\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\nexport function isTokenErrorResponse(response) {\n  return response.error != null;\n}"]}

package/build/js/chunk-UE2TMWJL.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+var semver = require('semver');
+
+// src/util/isValidSemver.ts
+function isValidSemver(semverString) {
+  return semver.valid(semverString) != null;
+}
+
+exports.isValidSemver = isValidSemver;
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=chunk-UE2TMWJL.cjs.map

package/build/js/{chunk-X2S4O5ZR.cjs.map → chunk-UE2TMWJL.cjs.map}

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/isValidSemver.ts"],"names":[],"mappings":";AAiBA,IAAM,SAAS;AACR,SAAS,cAAc,cAAc;AAC1C,SAAO,OAAO,KAAK,YAAY;AACjC","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\n// https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string\nconst semver = /^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$/;\nexport function isValidSemver(semverString) {\n  return semver.test(semverString);\n}"]}
+{"version":3,"sources":["../../src/util/isValidSemver.ts"],"names":[],"mappings":";AAgBA,SAAS,aAAa;AACf,SAAS,cAAc,cAAc;AAC1C,SAAO,MAAM,YAAY,KAAK;AAChC","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 { valid } from \"semver\";\nexport function isValidSemver(semverString) {\n  return valid(semverString) != null;\n}"]}

package/build/js/{handleGenerate-Q6EQWXFG.cjs → handleGenerate-GBN42PDO.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunk2DZBTS5E_cjs = require('./chunk-2DZBTS5E.cjs');
+var chunkTZGNA5WR_cjs = require('./chunk-TZGNA5WR.cjs');
 require('./chunk-HQDDGVB7.cjs');
 var requests = require('@osdk/gateway/requests');
 var generator = require('@osdk/generator');
@@ -28,12 +28,12 @@ function _interopNamespace(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
-var USER_AGENT = `osdk-cli/${"0.5.0"}`;
+var USER_AGENT = `osdk-cli/${"0.7.0"}`;
 async function handleGenerate(args) {
   let success = false;
   if (args.ontologyPath) {
     success = await generateFromLocalFile(args);
-  } else if (args.stack && args.clientId) {
+  } else if (args.foundryUrl && args.clientId) {
     success = await generateFromStack(args);
   } else {
     throw new Error("Must have specified ontologyPath or stack and clientId");
@@ -52,13 +52,13 @@ async function generateFromLocalFile(args) {
 }
 async function generateFromStack(args) {
   const {
-    stack,
+    foundryUrl,
     clientId,
     ontologyWritePath
   } = args;
-  const token = await chunk2DZBTS5E_cjs.invokeLoginFlow({
-    applicationId: clientId,
-    baseUrl: stack,
+  const token = await chunkTZGNA5WR_cjs.invokeLoginFlow({
+    clientId,
+    foundryUrl,
     verbose: 0
   });
   const {
@@ -67,14 +67,14 @@ async function generateFromStack(args) {
     metadata: {
       userAgent: USER_AGENT
     }
-  }, args.stack, () => token.access_token, USER_AGENT);
+  }, args.foundryUrl, () => token.access_token, USER_AGENT);
   try {
-    const ontologies = await requests.listOntologiesV2(shared_net.createOpenApiRequest(stack, fetch));
+    const ontologies = await requests.listOntologiesV2(shared_net.createOpenApiRequest(foundryUrl, fetch));
     if (ontologies.data.length !== 1) {
       consola.consola.error(`Could not look up ontology with these credentials. Found ${ontologies.data.length} ontologies.`);
       return false;
     }
-    const ontology = await requests.getOntologyFullMetadata(shared_net.createOpenApiRequest(stack, fetch), ontologies.data[0].apiName);
+    const ontology = await requests.getOntologyFullMetadata(shared_net.createOpenApiRequest(foundryUrl, fetch), ontologies.data[0].apiName);
     if (ontologyWritePath) {
       fs__namespace.writeFileSync(ontologyWritePath, JSON.stringify(ontology, null, 2));
     }
@@ -116,4 +116,4 @@ function getUserAgent(version) {
 
 module.exports = handleGenerate;
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=handleGenerate-Q6EQWXFG.cjs.map
+//# sourceMappingURL=handleGenerate-GBN42PDO.cjs.map

package/build/js/handleGenerate-GBN42PDO.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/commands/typescript/generate/handleGenerate.mts"],"names":[],"mappings":";;;;;;AAgBA,SAAS,yBAAyB,wBAAwB;AAC1D,SAAS,mCAAmC,4CAA4C;AACxF,SAAS,qBAAqB,4BAA4B;AAC1D,SAAS,eAAe;AACxB,YAAY,QAAQ;AAEpB,IAAM,aAAa,YAAY,OAA2B;AAC1D,eAAO,eAAsC,MAAM;AACjD,MAAI,UAAU;AACd,MAAI,KAAK,cAAc;AACrB,cAAU,MAAM,sBAAsB,IAAI;AAAA,EAC5C,WAAW,KAAK,cAAc,KAAK,UAAU;AAC3C,cAAU,MAAM,kBAAkB,IAAI;AAAA,EACxC,OAAO;AACL,UAAM,IAAI,MAAM,wDAAwD;AAAA,EAC1E;AACA,MAAI,SAAS;AACX,YAAQ,KAAK,iBAAiB;AAAA,EAChC;AACF;AACA,eAAe,sBAAsB,MAAM;AACzC,MAAI,CAAI,cAAW,KAAK,YAAY,GAAG;AACrC,YAAQ,MAAM,iCAAiC,KAAK,YAAY,EAAE;AAClE,WAAO;AAAA,EACT;AACA,QAAM,WAAW,KAAK,MAAM,MAAS,YAAS,SAAS,KAAK,cAAc,OAAO,CAAC;AAClF,SAAO,MAAM,kBAAkB,UAAU,IAAI;AAC/C;AACA,eAAe,kBAAkB,MAAM;AACrC,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AACJ,QAAM,QAAQ,MAAM,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,IACA,SAAS;AAAA,EACX,CAAC;AACD,QAAM;AAAA,IACJ;AAAA,EACF,IAAI,oBAAoB;AAAA,IACtB,UAAU;AAAA,MACR,WAAW;AAAA,IACb;AAAA,EACF,GAAG,KAAK,YAAY,MAAM,MAAM,cAAc,UAAU;AACxD,MAAI;AACF,UAAM,aAAa,MAAM,iBAAiB,qBAAqB,YAAY,KAAK,CAAC;AACjF,QAAI,WAAW,KAAK,WAAW,GAAG;AAChC,cAAQ,MAAM,4DAA4D,WAAW,KAAK,MAAM,cAAc;AAC9G,aAAO;AAAA,IACT;AACA,UAAM,WAAW,MAAM,wBAAwB,qBAAqB,YAAY,KAAK,GAAG,WAAW,KAAK,CAAC,EAAE,OAAO;AAClH,QAAI,mBAAmB;AACrB,MAAG,iBAAc,mBAAmB,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAAA,IACvE;AACA,WAAO,MAAM,kBAAkB,UAAU,IAAI;AAAA,EAC/C,SAAS,GAAG;AACV,YAAQ,MAAM,mCAAmC,CAAC;AAClD,WAAO;AAAA,EACT;AACF;AACA,eAAe,kBAAkB,UAAU,MAAM;AAC/C,QAAM,YAAY;AAAA,IAChB,WAAW,CAAC,MAAM,aAAa;AAC7B,aAAU,YAAS,UAAU,MAAM,UAAU,OAAO;AAAA,IACtD;AAAA,IACA,OAAO,OAAO,MAAM,YAAY;AAC9B,YAAS,YAAS,MAAM,MAAM,OAAO;AAAA,IACvC;AAAA,IACA,SAAS,OAAM,SAAW,YAAS,QAAQ,IAAI;AAAA,EACjD;AACA,MAAI;AACF,QAAI,KAAK,MAAM;AACb,YAAM,qCAAqC,UAAU,aAAa,KAAK,OAAO,GAAG,WAAW,KAAK,QAAQ,KAAK,WAAW;AAAA,IAC3H,OAAO;AACL,YAAM,kCAAkC,UAAU,aAAa,KAAK,OAAO,GAAG,WAAW,KAAK,QAAQ,KAAK,WAAW;AAAA,IACxH;AAAA,EACF,SAAS,GAAG;AACV,YAAQ,MAAM,0BAA0B,EAAE,OAAO;AACjD,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAIA,SAAS,aAAa,SAAS;AAC7B,MAAI,YAAY,OAAO;AACrB,WAAO;AAAA,EACT,OAAO;AACL,WAAO,kBAAkB,OAAO,IAAI,UAAU;AAAA,EAChD;AACF","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 { getOntologyFullMetadata, listOntologiesV2 } from \"@osdk/gateway/requests\";\nimport { generateClientSdkVersionOneDotOne, generateClientSdkVersionTwoPointZero } from \"@osdk/generator\";\nimport { createClientContext, createOpenApiRequest } from \"@osdk/shared.net\";\nimport { consola } from \"consola\";\nimport * as fs from \"node:fs\";\nimport invokeLoginFlow from \"../../auth/login/loginFlow.js\";\nconst USER_AGENT = `osdk-cli/${process.env.PACKAGE_VERSION}`;\nexport default async function handleGenerate(args) {\n  let success = false;\n  if (args.ontologyPath) {\n    success = await generateFromLocalFile(args);\n  } else if (args.foundryUrl && args.clientId) {\n    success = await generateFromStack(args);\n  } else {\n    throw new Error(\"Must have specified ontologyPath or stack and clientId\");\n  }\n  if (success) {\n    consola.info(\"OSDK Generated!\");\n  }\n}\nasync function generateFromLocalFile(args) {\n  if (!fs.existsSync(args.ontologyPath)) {\n    consola.error(`Ontology file does not exist: ${args.ontologyPath}`);\n    return false;\n  }\n  const ontology = JSON.parse(await fs.promises.readFile(args.ontologyPath, \"utf-8\"));\n  return await generateClientSdk(ontology, args);\n}\nasync function generateFromStack(args) {\n  const {\n    foundryUrl,\n    clientId,\n    ontologyWritePath\n  } = args;\n  const token = await invokeLoginFlow({\n    clientId,\n    foundryUrl,\n    verbose: 0\n  });\n  const {\n    fetch\n  } = createClientContext({\n    metadata: {\n      userAgent: USER_AGENT\n    }\n  }, args.foundryUrl, () => token.access_token, USER_AGENT);\n  try {\n    const ontologies = await listOntologiesV2(createOpenApiRequest(foundryUrl, fetch));\n    if (ontologies.data.length !== 1) {\n      consola.error(`Could not look up ontology with these credentials. Found ${ontologies.data.length} ontologies.`);\n      return false;\n    }\n    const ontology = await getOntologyFullMetadata(createOpenApiRequest(foundryUrl, fetch), ontologies.data[0].apiName);\n    if (ontologyWritePath) {\n      fs.writeFileSync(ontologyWritePath, JSON.stringify(ontology, null, 2));\n    }\n    return await generateClientSdk(ontology, args);\n  } catch (e) {\n    consola.error(\"Failed to generate the ontology\", e);\n    return false;\n  }\n}\nasync function generateClientSdk(ontology, args) {\n  const minimalFs = {\n    writeFile: (path, contents) => {\n      return fs.promises.writeFile(path, contents, \"utf-8\");\n    },\n    mkdir: async (path, options) => {\n      await fs.promises.mkdir(path, options);\n    },\n    readdir: async path => fs.promises.readdir(path)\n  };\n  try {\n    if (args.beta) {\n      await generateClientSdkVersionTwoPointZero(ontology, getUserAgent(args.version), minimalFs, args.outDir, args.packageType);\n    } else {\n      await generateClientSdkVersionOneDotOne(ontology, getUserAgent(args.version), minimalFs, args.outDir, args.packageType);\n    }\n  } catch (e) {\n    consola.error(\"OSDK generation failed\", e.message);\n    return false;\n  }\n  return true;\n}\n\n// If the user passed us `dev` as our version, we use that for both our generated package version AND the cli version.\n// This makes it so that releases don't force us to have to regenerate the code when the version strings change.\nfunction getUserAgent(version) {\n  if (version === \"dev\") {\n    return \"typescript-sdk/dev osdk-cli/dev\";\n  } else {\n    return `typescript-sdk/${version} ${USER_AGENT}`;\n  }\n}"]}

package/build/js/{handleGenerate-ZUZV3IBI.mjs → handleGenerate-NQPMMKLX.mjs}

@@ -1,4 +1,4 @@
-import { invokeLoginFlow } from './chunk-JFDXL5SV.mjs';
+import { invokeLoginFlow } from './chunk-HD6SVFKA.mjs';
 import './chunk-E2SEJZTC.mjs';
 import { listOntologiesV2, getOntologyFullMetadata } from '@osdk/gateway/requests';
 import { generateClientSdkVersionTwoPointZero, generateClientSdkVersionOneDotOne } from '@osdk/generator';
@@ -6,12 +6,12 @@ import { createClientContext, createOpenApiRequest } from '@osdk/shared.net';
 import { consola } from 'consola';
 import * as fs from 'fs';
 
-var USER_AGENT = `osdk-cli/${"0.5.0"}`;
+var USER_AGENT = `osdk-cli/${"0.7.0"}`;
 async function handleGenerate(args) {
   let success = false;
   if (args.ontologyPath) {
     success = await generateFromLocalFile(args);
-  } else if (args.stack && args.clientId) {
+  } else if (args.foundryUrl && args.clientId) {
     success = await generateFromStack(args);
   } else {
     throw new Error("Must have specified ontologyPath or stack and clientId");
@@ -30,13 +30,13 @@ async function generateFromLocalFile(args) {
 }
 async function generateFromStack(args) {
   const {
-    stack,
+    foundryUrl,
     clientId,
     ontologyWritePath
   } = args;
   const token = await invokeLoginFlow({
-    applicationId: clientId,
-    baseUrl: stack,
+    clientId,
+    foundryUrl,
     verbose: 0
   });
   const {
@@ -45,14 +45,14 @@ async function generateFromStack(args) {
     metadata: {
       userAgent: USER_AGENT
     }
-  }, args.stack, () => token.access_token, USER_AGENT);
+  }, args.foundryUrl, () => token.access_token, USER_AGENT);
   try {
-    const ontologies = await listOntologiesV2(createOpenApiRequest(stack, fetch));
+    const ontologies = await listOntologiesV2(createOpenApiRequest(foundryUrl, fetch));
     if (ontologies.data.length !== 1) {
       consola.error(`Could not look up ontology with these credentials. Found ${ontologies.data.length} ontologies.`);
       return false;
     }
-    const ontology = await getOntologyFullMetadata(createOpenApiRequest(stack, fetch), ontologies.data[0].apiName);
+    const ontology = await getOntologyFullMetadata(createOpenApiRequest(foundryUrl, fetch), ontologies.data[0].apiName);
     if (ontologyWritePath) {
       fs.writeFileSync(ontologyWritePath, JSON.stringify(ontology, null, 2));
     }
@@ -94,4 +94,4 @@ function getUserAgent(version) {
 
 export { handleGenerate as default };
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=handleGenerate-ZUZV3IBI.mjs.map
+//# sourceMappingURL=handleGenerate-NQPMMKLX.mjs.map

package/build/js/handleGenerate-NQPMMKLX.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/commands/typescript/generate/handleGenerate.mts"],"names":[],"mappings":";;;;;;AAgBA,SAAS,yBAAyB,wBAAwB;AAC1D,SAAS,mCAAmC,4CAA4C;AACxF,SAAS,qBAAqB,4BAA4B;AAC1D,SAAS,eAAe;AACxB,YAAY,QAAQ;AAEpB,IAAM,aAAa,YAAY,OAA2B;AAC1D,eAAO,eAAsC,MAAM;AACjD,MAAI,UAAU;AACd,MAAI,KAAK,cAAc;AACrB,cAAU,MAAM,sBAAsB,IAAI;AAAA,EAC5C,WAAW,KAAK,cAAc,KAAK,UAAU;AAC3C,cAAU,MAAM,kBAAkB,IAAI;AAAA,EACxC,OAAO;AACL,UAAM,IAAI,MAAM,wDAAwD;AAAA,EAC1E;AACA,MAAI,SAAS;AACX,YAAQ,KAAK,iBAAiB;AAAA,EAChC;AACF;AACA,eAAe,sBAAsB,MAAM;AACzC,MAAI,CAAI,cAAW,KAAK,YAAY,GAAG;AACrC,YAAQ,MAAM,iCAAiC,KAAK,YAAY,EAAE;AAClE,WAAO;AAAA,EACT;AACA,QAAM,WAAW,KAAK,MAAM,MAAS,YAAS,SAAS,KAAK,cAAc,OAAO,CAAC;AAClF,SAAO,MAAM,kBAAkB,UAAU,IAAI;AAC/C;AACA,eAAe,kBAAkB,MAAM;AACrC,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AACJ,QAAM,QAAQ,MAAM,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,IACA,SAAS;AAAA,EACX,CAAC;AACD,QAAM;AAAA,IACJ;AAAA,EACF,IAAI,oBAAoB;AAAA,IACtB,UAAU;AAAA,MACR,WAAW;AAAA,IACb;AAAA,EACF,GAAG,KAAK,YAAY,MAAM,MAAM,cAAc,UAAU;AACxD,MAAI;AACF,UAAM,aAAa,MAAM,iBAAiB,qBAAqB,YAAY,KAAK,CAAC;AACjF,QAAI,WAAW,KAAK,WAAW,GAAG;AAChC,cAAQ,MAAM,4DAA4D,WAAW,KAAK,MAAM,cAAc;AAC9G,aAAO;AAAA,IACT;AACA,UAAM,WAAW,MAAM,wBAAwB,qBAAqB,YAAY,KAAK,GAAG,WAAW,KAAK,CAAC,EAAE,OAAO;AAClH,QAAI,mBAAmB;AACrB,MAAG,iBAAc,mBAAmB,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAAA,IACvE;AACA,WAAO,MAAM,kBAAkB,UAAU,IAAI;AAAA,EAC/C,SAAS,GAAG;AACV,YAAQ,MAAM,mCAAmC,CAAC;AAClD,WAAO;AAAA,EACT;AACF;AACA,eAAe,kBAAkB,UAAU,MAAM;AAC/C,QAAM,YAAY;AAAA,IAChB,WAAW,CAAC,MAAM,aAAa;AAC7B,aAAU,YAAS,UAAU,MAAM,UAAU,OAAO;AAAA,IACtD;AAAA,IACA,OAAO,OAAO,MAAM,YAAY;AAC9B,YAAS,YAAS,MAAM,MAAM,OAAO;AAAA,IACvC;AAAA,IACA,SAAS,OAAM,SAAW,YAAS,QAAQ,IAAI;AAAA,EACjD;AACA,MAAI;AACF,QAAI,KAAK,MAAM;AACb,YAAM,qCAAqC,UAAU,aAAa,KAAK,OAAO,GAAG,WAAW,KAAK,QAAQ,KAAK,WAAW;AAAA,IAC3H,OAAO;AACL,YAAM,kCAAkC,UAAU,aAAa,KAAK,OAAO,GAAG,WAAW,KAAK,QAAQ,KAAK,WAAW;AAAA,IACxH;AAAA,EACF,SAAS,GAAG;AACV,YAAQ,MAAM,0BAA0B,EAAE,OAAO;AACjD,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAIA,SAAS,aAAa,SAAS;AAC7B,MAAI,YAAY,OAAO;AACrB,WAAO;AAAA,EACT,OAAO;AACL,WAAO,kBAAkB,OAAO,IAAI,UAAU;AAAA,EAChD;AACF","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 { getOntologyFullMetadata, listOntologiesV2 } from \"@osdk/gateway/requests\";\nimport { generateClientSdkVersionOneDotOne, generateClientSdkVersionTwoPointZero } from \"@osdk/generator\";\nimport { createClientContext, createOpenApiRequest } from \"@osdk/shared.net\";\nimport { consola } from \"consola\";\nimport * as fs from \"node:fs\";\nimport invokeLoginFlow from \"../../auth/login/loginFlow.js\";\nconst USER_AGENT = `osdk-cli/${process.env.PACKAGE_VERSION}`;\nexport default async function handleGenerate(args) {\n  let success = false;\n  if (args.ontologyPath) {\n    success = await generateFromLocalFile(args);\n  } else if (args.foundryUrl && args.clientId) {\n    success = await generateFromStack(args);\n  } else {\n    throw new Error(\"Must have specified ontologyPath or stack and clientId\");\n  }\n  if (success) {\n    consola.info(\"OSDK Generated!\");\n  }\n}\nasync function generateFromLocalFile(args) {\n  if (!fs.existsSync(args.ontologyPath)) {\n    consola.error(`Ontology file does not exist: ${args.ontologyPath}`);\n    return false;\n  }\n  const ontology = JSON.parse(await fs.promises.readFile(args.ontologyPath, \"utf-8\"));\n  return await generateClientSdk(ontology, args);\n}\nasync function generateFromStack(args) {\n  const {\n    foundryUrl,\n    clientId,\n    ontologyWritePath\n  } = args;\n  const token = await invokeLoginFlow({\n    clientId,\n    foundryUrl,\n    verbose: 0\n  });\n  const {\n    fetch\n  } = createClientContext({\n    metadata: {\n      userAgent: USER_AGENT\n    }\n  }, args.foundryUrl, () => token.access_token, USER_AGENT);\n  try {\n    const ontologies = await listOntologiesV2(createOpenApiRequest(foundryUrl, fetch));\n    if (ontologies.data.length !== 1) {\n      consola.error(`Could not look up ontology with these credentials. Found ${ontologies.data.length} ontologies.`);\n      return false;\n    }\n    const ontology = await getOntologyFullMetadata(createOpenApiRequest(foundryUrl, fetch), ontologies.data[0].apiName);\n    if (ontologyWritePath) {\n      fs.writeFileSync(ontologyWritePath, JSON.stringify(ontology, null, 2));\n    }\n    return await generateClientSdk(ontology, args);\n  } catch (e) {\n    consola.error(\"Failed to generate the ontology\", e);\n    return false;\n  }\n}\nasync function generateClientSdk(ontology, args) {\n  const minimalFs = {\n    writeFile: (path, contents) => {\n      return fs.promises.writeFile(path, contents, \"utf-8\");\n    },\n    mkdir: async (path, options) => {\n      await fs.promises.mkdir(path, options);\n    },\n    readdir: async path => fs.promises.readdir(path)\n  };\n  try {\n    if (args.beta) {\n      await generateClientSdkVersionTwoPointZero(ontology, getUserAgent(args.version), minimalFs, args.outDir, args.packageType);\n    } else {\n      await generateClientSdkVersionOneDotOne(ontology, getUserAgent(args.version), minimalFs, args.outDir, args.packageType);\n    }\n  } catch (e) {\n    consola.error(\"OSDK generation failed\", e.message);\n    return false;\n  }\n  return true;\n}\n\n// If the user passed us `dev` as our version, we use that for both our generated package version AND the cli version.\n// This makes it so that releases don't force us to have to regenerate the code when the version strings change.\nfunction getUserAgent(version) {\n  if (version === \"dev\") {\n    return \"typescript-sdk/dev osdk-cli/dev\";\n  } else {\n    return `typescript-sdk/${version} ${USER_AGENT}`;\n  }\n}"]}

package/build/js/index.cjs

@@ -1,12 +1,14 @@
 'use strict';
 
-var chunkX2S4O5ZR_cjs = require('./chunk-X2S4O5ZR.cjs');
-var chunkHYF3CTKZ_cjs = require('./chunk-HYF3CTKZ.cjs');
+var chunkUE2TMWJL_cjs = require('./chunk-UE2TMWJL.cjs');
+var chunkHZ3XILMW_cjs = require('./chunk-HZ3XILMW.cjs');
 require('./chunk-HQDDGVB7.cjs');
 var consola = require('consola');
+var utils = require('consola/utils');
 var yargs = require('yargs');
 var helpers = require('yargs/helpers');
 var fs = require('fs');
+var path = require('path');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -17,13 +19,15 @@ var command = {
   command: "login",
   describe: "Authenticate with an application ID",
   builder: (argv) => {
-    return argv.option("applicationId", {
+    return argv.option("clientId", {
+      alias: "applicationId",
+      // for backwards compatibility
       type: "string",
       demandOption: true
     });
   },
   handler: async (args) => {
-    const command11 = await import('./loginFlow-BZDDHHT5.cjs');
+    const command11 = await import('./loginFlow-5ZAMXQKE.cjs');
     await command11.default(args);
   }
 };
@@ -35,9 +39,11 @@ var site = {
   describe: "Manage your session",
   builder: (argv) => {
     return argv.options({
-      baseUrl: {
+      foundryUrl: {
         type: "string",
-        demandOption: true
+        demandOption: true,
+        alias: "baseUrl"
+        // for backwards compatibility
       }
     }).command(login_default).demandCommand();
   },
@@ -100,12 +106,12 @@ async function loadFoundryConfig() {
     let foundryConfig;
     try {
       const fileContent = await fs.promises.readFile(configFilePath, "utf-8");
-      foundryConfig = JSON.parse(fileContent);
-    } catch {
-      throw new chunkHYF3CTKZ_cjs.ExitProcessError(2, `Couldn't read or parse config file ${configFilePath}`);
+      foundryConfig = parseConfigFile(fileContent, configFilePath);
+    } catch (error) {
+      throw new chunkHZ3XILMW_cjs.ExitProcessError(2, `Couldn't read or parse config file ${configFilePath}. Error: ${error}`);
     }
     if (!validate(foundryConfig)) {
-      throw new chunkHYF3CTKZ_cjs.ExitProcessError(2, `The configuration file does not match the expected schema: ${ajv.errorsText(validate.errors)}`);
+      throw new chunkHZ3XILMW_cjs.ExitProcessError(2, `The configuration file does not match the expected schema: ${ajv.errorsText(validate.errors)}`);
     }
     return {
       foundryConfig,
@@ -114,6 +120,15 @@ async function loadFoundryConfig() {
   }
   return void 0;
 }
+function parseConfigFile(fileContent, configFilePath) {
+  const extension = path.extname(configFilePath);
+  switch (extension) {
+    case ".json":
+      return JSON.parse(fileContent);
+    default:
+      throw new chunkHZ3XILMW_cjs.ExitProcessError(2, `Unsupported file extension: ${extension} for config file.`);
+  }
+}
 
 // src/util/configLoader.ts
 var configPromise = void 0;
@@ -146,7 +161,7 @@ async function logDeployCommandConfigFileOverride(args, config) {
 // src/commands/site/deploy/index.ts
 var command2 = {
   command: "deploy",
-  describe: "Deploy an uploaded version",
+  describe: "Deploy a new site version",
   builder: async (argv) => {
     const config = await configLoader_default();
     const siteConfig = config?.foundryConfig.site;
@@ -156,7 +171,7 @@ var command2 = {
     return argv.options({
       directory: {
         type: "string",
-        description: "Directory to deploy",
+        description: "Directory containing site files",
         ...directory ? {
           default: directory
         } : {
@@ -165,19 +180,21 @@ var command2 = {
       },
       uploadOnly: {
         type: "boolean",
-        description: "Upload the directory but do not deploy it",
+        description: "Upload new site version only without setting as live",
         default: false
       },
       version: {
         type: "string",
-        description: "Version to deploy",
+        description: "New version of site to deploy",
         ...autoVersion == null ? {
           conflicts: "autoVersion"
         } : {}
       },
       autoVersion: {
+        coerce: (autoVersion2) => autoVersion2,
         type: "string",
-        description: "Enables autoversioning. Can be set to 'git-describe' to use git describe to determine the version.",
+        choices: ["git-describe"],
+        description: "Enable auto versioning",
         ...autoVersion != null ? {
           default: autoVersion.type
         } : {
@@ -186,12 +203,12 @@ var command2 = {
       },
       gitTagPrefix: {
         type: "string",
-        description: "Prefix to match git tags against when --autoVersion=git-describe is used. If not provided, a default prefix 'v' is used.",
+        description: "Prefix to match git tags on when 'git-describe' auto versioning is used. If not provided, all tags are matched and the prefix 'v' is stripped if present.",
         ...gitTagPrefix ? {
           default: gitTagPrefix
         } : {}
       }
-    }).group(["autoVersion", "gitTagPrefix"], "Autoversion Arguments").group(["version", "directory", "uploadOnly"], "Common Arguments").check((args) => {
+    }).group(["directory", "version", "uploadOnly"], "Deploy Options").group(["autoVersion", "gitTagPrefix"], "Auto Version Options").check((args) => {
       if (autoVersion == null && args.autoVersion == null && args.version == null) {
         throw new YargsCheckError("One of --version or --autoVersion must be specified");
       }
@@ -207,8 +224,21 @@ var command2 = {
     }).middleware((args) => logDeployCommandConfigFileOverride(args, siteConfig));
   },
   handler: async (args) => {
-    const command11 = await import('./siteDeployCommand-KUNL3GIW.cjs');
-    await command11.default(args);
+    const command11 = await import('./siteDeployCommand-HOXKQM56.cjs');
+    const {
+      version,
+      autoVersion,
+      gitTagPrefix,
+      ...restArgs
+    } = args;
+    const selectedVersion = args.version != null ? args.version : {
+      type: args.autoVersion,
+      tagPrefix: args.gitTagPrefix
+    };
+    await command11.default({
+      ...restArgs,
+      selectedVersion
+    });
   }
 };
 var deploy_default = command2;
@@ -224,16 +254,20 @@ async function logSiteCommandConfigFileOverride(args, config) {
 // src/commands/site/version/delete/index.ts
 var command3 = {
   command: "delete <version>",
-  describe: "Delete the specified site version.",
+  describe: "Delete site version",
   builder: (argv) => {
     return argv.positional("version", {
       type: "string",
       demandOption: true,
       description: "Version to set as live"
-    });
+    }).option("yes", {
+      alias: "y",
+      type: "boolean",
+      description: "Automatically confirm destructive changes"
+    }).group(["yes"], "Delete Options");
   },
   handler: async (args) => {
-    const command11 = await import('./versionDeleteCommand-RLU7UUYD.cjs');
+    const command11 = await import('./versionDeleteCommand-GDQEZLYA.cjs');
     await command11.default(args);
   }
 };
@@ -242,12 +276,12 @@ var delete_default = command3;
 // src/commands/site/version/get/index.ts
 var command4 = {
   command: "get",
-  describe: "Get the currently set live site version",
+  describe: "Get live site version",
   builder: (argv) => {
     return argv;
   },
   handler: async (args) => {
-    const command11 = await import('./versionGetCommand-Y2VR2WKH.cjs');
+    const command11 = await import('./versionGetCommand-RU5LS3IG.cjs');
     await command11.default(args);
   }
 };
@@ -256,12 +290,12 @@ var get_default = command4;
 // src/commands/site/version/list/index.ts
 var command5 = {
   command: "list",
-  describe: "List application versions",
+  describe: "List site versions",
   builder: (argv) => {
     return argv;
   },
   handler: async (args) => {
-    const command11 = await import('./versionListCommand-5KM5PFYL.cjs');
+    const command11 = await import('./versionListCommand-QYCTS6KU.cjs');
     await command11.default(args);
   }
 };
@@ -270,7 +304,7 @@ var list_default = command5;
 // src/commands/site/version/set/index.ts
 var command6 = {
   command: "set <version>",
-  describe: "Set the live site version",
+  describe: "Set live site version",
   builder: (argv) => {
     return argv.positional("version", {
       type: "string",
@@ -279,7 +313,7 @@ var command6 = {
     });
   },
   handler: async (args) => {
-    const command11 = await import('./versionSetCommand-VD3L5DOV.cjs');
+    const command11 = await import('./versionSetCommand-K4SDBPLB.cjs');
     await command11.default(args);
   }
 };
@@ -288,12 +322,16 @@ var set_default = command6;
 // src/commands/site/version/unset/index.ts
 var command7 = {
   command: "unset",
-  describe: "Clear the currently set live site version.",
+  describe: "Clear live site version",
   builder: (argv) => {
-    return argv;
+    return argv.option("yes", {
+      alias: "y",
+      type: "boolean",
+      description: "Automatically confirm destructive changes"
+    }).group(["yes"], "Unset Options");
   },
   handler: async (args) => {
-    const command11 = await import('./versionUnsetCommand-XYBUQ6XB.cjs');
+    const command11 = await import('./versionUnsetCommand-INDJ26MO.cjs');
     await command11.default(args);
   }
 };
@@ -302,9 +340,9 @@ var unset_default = command7;
 // src/commands/site/version/index.ts
 var command8 = {
   command: "version",
-  describe: "Manage application version",
+  describe: "Manage site versions",
   builder: (argv) => {
-    return argv.command(list_default).command(set_default).command(unset_default).command(delete_default).command(get_default).demandCommand();
+    return argv.command(list_default).command(get_default).command(set_default).command(unset_default).command(delete_default).demandCommand();
   },
   handler: async (args) => {
   }
@@ -328,7 +366,7 @@ var command9 = {
         } : {
           demandOption: true
         },
-        description: "Application RID"
+        description: "Application resource identifier (rid)"
       },
       foundryUrl: {
         coerce: (foundryUrl2) => foundryUrl2.replace(/\/$/, ""),
@@ -338,19 +376,19 @@ var command9 = {
         } : {
           demandOption: true
         },
-        description: "Foundry Stack URL with Protocol (e.g. https://example.palantirfoundry.com)"
+        description: "Foundry URL including protocol"
       },
       token: {
         type: "string",
         conflicts: "tokenFile",
-        description: "Foundry API Token"
+        description: "Foundry API token"
       },
       tokenFile: {
         type: "string",
         conflicts: "token",
-        description: "Path to a file containing your Foundry API Token"
+        description: "Path to file containing Foundry API token"
       }
-    }).group(["application", "foundryUrl", "token", "tokenFile"], "Common Arguments").command(version_default).command(deploy_default).check((args) => {
+    }).group(["application", "foundryUrl", "token", "tokenFile"], "Common Options").command(version_default).command(deploy_default).check((args) => {
       if (!args.foundryUrl.startsWith("https://")) {
         throw new YargsCheckError("foundryUrl must start with https://");
       }
@@ -365,7 +403,7 @@ var site_default = command9;
 // src/commands/typescript/generate/generate.ts
 var command10 = {
   command: "generate",
-  describe: "Generate typescript from ontology",
+  describe: "Generate TypeScript SDK from ontology",
   builder: (argv) => {
     return argv.options({
       "outDir": {
@@ -374,27 +412,29 @@ var command10 = {
         demandOption: true
       },
       ontologyPath: {
-        description: "path to the ontology wire json",
+        description: "Path to the ontology wire json",
         type: "string",
         demandOption: false,
-        conflicts: ["stack", "clientId"]
+        conflicts: ["foundryUrl", "clientId"]
       },
-      stack: {
-        description: "the URL to the stack that contains the ontology",
+      foundryUrl: {
+        description: "The URL to the foundry stack that contains the ontology",
         type: "string",
         demandOption: false,
         conflicts: "ontologyPath",
-        implies: "clientId"
+        implies: "clientId",
+        alias: "stack"
+        // for backwards compatibility
       },
       clientId: {
-        description: "the application's client id",
+        description: "The application's client id",
         type: "string",
         demandOption: false,
         conflicts: "ontologyPath",
-        implies: "stack"
+        implies: "foundryUrl"
       },
       ontologyWritePath: {
-        description: "path to write the ontology wire json",
+        description: "Path to write the ontology wire json",
         type: "string",
         demandOption: false,
         conflicts: ["ontologyPath"]
@@ -413,18 +453,18 @@ var command10 = {
         description: "Version of the generated code, or 'dev'",
         demandOption: true
       }
-    }).group(["ontologyPath", "outDir", "version"], "Generate from a local file").group(["stack", "clientId", "outDir", "ontologyWritePath", "version"], "OR Generate from a stack").check((args) => {
-      if (!args.ontologyPath && !args.stack) {
-        throw new Error("Error: Must specify either ontologyPath or stack and clientId");
+    }).group(["ontologyPath", "outDir", "version"], "Generate from a local file").group(["foundryUrl", "clientId", "outDir", "ontologyWritePath", "version"], "OR Generate from Foundry").check((args) => {
+      if (!args.ontologyPath && !args.foundryUrl) {
+        throw new Error("Error: Must specify either ontologyPath or foundryUrl and clientId");
       }
-      if (args.version !== "dev" && !chunkX2S4O5ZR_cjs.isValidSemver(args.version)) {
+      if (args.version !== "dev" && !chunkUE2TMWJL_cjs.isValidSemver(args.version)) {
         throw new Error("Error: Version must be 'dev' or a valid semver version");
       }
       return true;
     });
   },
   handler: async (args) => {
-    const command11 = await import('./handleGenerate-Q6EQWXFG.cjs');
+    const command11 = await import('./handleGenerate-GBN42PDO.cjs');
     await command11.default(args);
   }
 };
@@ -456,7 +496,7 @@ var firstTime2 = true;
 async function logVersionMiddleware(args) {
   if (firstTime2) {
     firstTime2 = false;
-    consola.consola.info(`Palantir OSDK CLI ${"0.5.0"}`);
+    consola.consola.info(`Palantir OSDK CLI ${"0.7.0"}`);
     consola.consola.level = 3 + args.verbose;
     if (consola.consola.level > 3) {
       consola.consola.debug(`Verbose logging enabled (${consola.consola.level === 4 ? "debug" : "trace"})`);
@@ -482,8 +522,12 @@ async function cli(args = process.argv) {
     handler: (_args) => {
     }
   }).fail(async (msg, err, argv) => {
-    if (err instanceof chunkHYF3CTKZ_cjs.ExitProcessError) {
+    if (err instanceof chunkHZ3XILMW_cjs.ExitProcessError) {
       consola.consola.error(err.message);
+      if (err.tip != null) {
+        consola.consola.log(utils.colorize("bold", `\u{1F4A1} Tip: ${err.tip}`));
+        consola.consola.log("");
+      }
       consola.consola.debug(err.stack);
     } else {
       if (err && err instanceof YargsCheckError === false) {
@@ -499,7 +543,7 @@ async function cli(args = process.argv) {
   try {
     return await base.parseAsync();
   } catch (err) {
-    if (err instanceof chunkHYF3CTKZ_cjs.ExitProcessError) {
+    if (err instanceof chunkHZ3XILMW_cjs.ExitProcessError) {
       consola.consola.error(err);
     }
   }