npm - @osdk/cli - Versions diffs - 0.2.0 → 0.4.0 - Mend

@osdk/cli 0.2.0 → 0.4.0

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.

Files changed (119) hide show

package/build/js/handleGenerate-A7X2XAGW.mjs.map ADDED Viewed

@@ -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,SAAS,KAAK,UAAU;AACtC,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,eAAe;AAAA,IACf,SAAS;AAAA,IACT,SAAS;AAAA,EACX,CAAC;AACD,QAAM;AAAA,IACJ;AAAA,EACF,IAAI,oBAAoB;AAAA,IACtB,UAAU;AAAA,MACR,WAAW;AAAA,IACb;AAAA,EACF,GAAG,KAAK,OAAO,MAAM,MAAM,cAAc,UAAU;AACnD,MAAI;AACF,UAAM,aAAa,MAAM,iBAAiB,qBAAqB,OAAO,KAAK,CAAC;AAC5E,QAAI,WAAW,KAAK,WAAW,GAAG;AAChC,cAAQ,MAAM,4DAA4D,WAAW,KAAK,MAAM,cAAc;AAC9G,aAAO;AAAA,IACT;AACA,UAAM,WAAW,MAAM,wBAAwB,qBAAqB,OAAO,KAAK,GAAG,WAAW,KAAK,CAAC,EAAE,OAAO;AAC7G,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.stack && 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 stack,\n clientId,\n ontologyWritePath\n } = args;\n const token = await invokeLoginFlow({\n applicationId: clientId,\n baseUrl: stack,\n verbose: 0\n });\n const {\n fetch\n } = createClientContext({\n metadata: {\n userAgent: USER_AGENT\n }\n }, args.stack, () => token.access_token, USER_AGENT);\n try {\n const ontologies = await listOntologiesV2(createOpenApiRequest(stack, 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(stack, 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-UTCLNZQO.cjs → handleGenerate-WOW33WYG.cjs} RENAMED Viewed

@@ -28,6 +28,7 @@ function _interopNamespace(e) {
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
+var USER_AGENT = `osdk-cli/${"0.4.0"}`;
 async function handleGenerate(args) {
   let success = false;
   if (args.ontologyPath) {
@@ -64,9 +65,9 @@ async function generateFromStack(args) {
     fetch
   } = shared_net.createClientContext({
     metadata: {
-      userAgent: "@osdk/cli/0.0.0 ()"
+      userAgent: USER_AGENT
     }
-  }, args.stack, () => token.access_token);
+  }, args.stack, () => token.access_token, USER_AGENT);
   try {
     const ontologies = await requests.listOntologiesV2(shared_net.createOpenApiRequest(stack, fetch));
     if (ontologies.data.length !== 1) {
@@ -95,9 +96,9 @@ async function generateClientSdk(ontology, args) {
   };
   try {
     if (args.beta) {
-      await generator.generateClientSdkVersionTwoPointZero(ontology, minimalFs, args.outDir, args.packageType);
+      await generator.generateClientSdkVersionTwoPointZero(ontology, getUserAgent(args.version), minimalFs, args.outDir, args.packageType);
     } else {
-      await generator.generateClientSdkVersionOneDotOne(ontology, minimalFs, args.outDir, args.packageType);
+      await generator.generateClientSdkVersionOneDotOne(ontology, getUserAgent(args.version), minimalFs, args.outDir, args.packageType);
     }
   } catch (e) {
     consola.consola.error("OSDK generation failed", e.message);
@@ -105,7 +106,14 @@ async function generateClientSdk(ontology, args) {
   }
   return true;
 }
+function getUserAgent(version) {
+  if (version === "dev") {
+    return "typescript-sdk/dev osdk-cli/dev";
+  } else {
+    return `typescript-sdk/${version} ${USER_AGENT}`;
+  }
+}
 module.exports = handleGenerate;
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=handleGenerate-UTCLNZQO.cjs.map
+//# sourceMappingURL=handleGenerate-WOW33WYG.cjs.map

package/build/js/handleGenerate-WOW33WYG.cjs.map ADDED Viewed

@@ -0,0 +1 @@

package/build/js/index.cjs CHANGED Viewed

@@ -1,36 +1,15 @@
 'use strict';
+var chunkX2S4O5ZR_cjs = require('./chunk-X2S4O5ZR.cjs');
 var chunkHYF3CTKZ_cjs = require('./chunk-HYF3CTKZ.cjs');
 require('./chunk-HQDDGVB7.cjs');
 var yargs = require('yargs');
 var helpers = require('yargs/helpers');
 var fs = require('fs');
-var path = require('path');
-var url = require('url');
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
 var yargs__default = /*#__PURE__*/_interopDefault(yargs);
-var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 // src/commands/auth/login/index.ts
 var command = {
@@ -43,8 +22,8 @@ var command = {
     });
   },
   handler: async (args) => {
-    const command7 = await import('./loginFlow-BZDDHHT5.cjs');
-    await command7.default(args);
+    const command11 = await import('./loginFlow-BZDDHHT5.cjs');
+    await command11.default(args);
   }
 };
 var login_default = command;
@@ -65,112 +44,335 @@ var site = {
   }
 };
 var auth_default = site;
-// src/commands/site/delete/index.ts
-var command2 = {
-  command: "delete",
-  describe: "Delete an uploaded version",
-  builder: (argv) => {
-    return argv.option("siteVersion", {
-      type: "string",
-      demandOption: true
-    }).option("dir", {
+var CONFIG_FILE_NAMES = ["foundry.config.json"];
+var CONFIG_FILE_SCHEMA = {
+  type: "object",
+  properties: {
+    foundryUrl: {
       type: "string"
-    });
+    },
+    site: {
+      type: "object",
+      properties: {
+        application: {
+          type: "string"
+        },
+        directory: {
+          type: "string"
+        },
+        autoVersion: {
+          type: "object",
+          nullable: true,
+          oneOf: [{
+            properties: {
+              "type": {
+                const: "git-describe",
+                type: "string"
+              },
+              "tagPrefix": {
+                type: "string",
+                nullable: true
+              }
+            }
+          }],
+          required: ["type"]
+        }
+      },
+      required: ["application", "directory"]
+    }
   },
-  handler: async (args) => {
-    const command7 = await import('./siteDeleteCommand-3Z6TWSAT.cjs');
-    await command7.default(args);
+  required: ["foundryUrl", "site"],
+  additionalProperties: false
+};
+async function loadFoundryConfig() {
+  const ajvModule = await import('ajv');
+  const Ajv = ajvModule.default.default;
+  const ajv = new Ajv({
+    allErrors: true
+  });
+  const validate = ajv.compile(CONFIG_FILE_SCHEMA);
+  const Consola = await import('consola');
+  Consola.consola;
+  const {
+    findUp
+  } = await import('find-up');
+  const configFilePath = await findUp(CONFIG_FILE_NAMES);
+  if (configFilePath) {
+    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}`);
+    }
+    if (!validate(foundryConfig)) {
+      throw new chunkHYF3CTKZ_cjs.ExitProcessError(2, `The configuration file does not match the expected schema: ${ajv.errorsText(validate.errors)}`);
+    }
+    return {
+      foundryConfig,
+      configFilePath
+    };
+  }
+  return void 0;
+}
+// src/util/configLoader.ts
+var configPromise = void 0;
+function getConfig() {
+  if (configPromise == null) {
+    configPromise = loadFoundryConfig();
+  }
+  return configPromise;
+}
+var configLoader_default = getConfig;
+// src/YargsCheckError.ts
+var YargsCheckError = class extends Error {
+  constructor(msg) {
+    super(msg);
   }
 };
-var delete_default = command2;
+// src/commands/site/deploy/logDeployCommandConfigFileOverride.ts
+async function logDeployCommandConfigFileOverride(argv, config) {
+  const Consola = await import('consola');
+  const consola = Consola.consola;
+  if (config?.autoVersion != null && argv.autoVersion !== config?.autoVersion.type) {
+    consola.debug(`Overriding "autoVersion" from config file with ${argv.autoVersion}`);
+  }
+  if (config?.directory != null && argv.directory !== config?.directory) {
+    consola.debug(`Overriding "directory" from config file with ${argv.directory}`);
+  }
+  if (config?.autoVersion?.tagPrefix != null && argv.gitTagPrefix != null && argv.gitTagPrefix !== config?.autoVersion.tagPrefix) {
+    consola.debug(`Overriding "gitTagPrefix" from config file with ${argv.gitTagPrefix}`);
+  }
+}
 // src/commands/site/deploy/index.ts
-var command3 = {
+var command2 = {
   command: "deploy",
   describe: "Deploy an uploaded version",
-  builder: (argv) => {
+  builder: async (argv) => {
+    const config = await configLoader_default();
+    const siteConfig = config?.foundryConfig.site;
+    const directory = siteConfig?.directory;
+    const autoVersion = siteConfig?.autoVersion;
+    const gitTagPrefix = autoVersion?.tagPrefix;
     return argv.options({
-      "siteVersion": {
+      directory: {
         type: "string",
-        conflicts: "clearVersion"
-        // group: "Deploy Version",
-        // implies: { "clearVersion": "false" },
+        description: "Directory to deploy",
+        ...directory ? {
+          default: directory
+        } : {
+          demandOption: true
+        }
       },
-      undeploy: {
-        alias: "clearVersion",
-        description: "Causes the site to no longer be deployed",
+      uploadOnly: {
         type: "boolean",
-        conflicts: "siteVersion"
-        // group: "Deploy Version",
-        // implies: { "siteVersion": "" },
+        description: "Upload the directory but do not deploy it",
+        default: false
+      },
+      version: {
+        type: "string",
+        description: "Version to deploy",
+        ...autoVersion == null ? {
+          conflicts: "autoVersion"
+        } : {}
+      },
+      autoVersion: {
+        type: "string",
+        description: "Enables autoversioning. Can be set to 'git-describe' to use git describe to determine the version.",
+        ...autoVersion != null ? {
+          default: autoVersion.type
+        } : {
+          conflicts: "version"
+        }
+      },
+      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.",
+        ...gitTagPrefix ? {
+          default: gitTagPrefix
+        } : {}
+      }
+    }).group(["autoVersion", "gitTagPrefix"], "Autoversion Arguments").group(["version", "directory", "uploadOnly"], "Common Arguments").check((argv2) => {
+      if (autoVersion == null && argv2.autoVersion == null && argv2.version == null) {
+        throw new YargsCheckError("One of --version or --autoVersion must be specified");
+      }
+      const autoVersionType = argv2.autoVersion ?? autoVersion;
+      if (autoVersionType !== "git-describe") {
+        throw new YargsCheckError(`Only 'git-describe' is supported for autoVersion`);
+      }
+      const gitTagPrefixValue = argv2.gitTagPrefix ?? gitTagPrefix;
+      if (gitTagPrefixValue != null && autoVersionType !== "git-describe") {
+        throw new YargsCheckError(`--gitTagPrefix is only supported when --autoVersion=git-describe`);
       }
-    }).group(["siteVersion", "clearVersion"], "Version To Deploy (requires one of)");
+      return true;
+    }).middleware((argv2) => logDeployCommandConfigFileOverride(argv2, siteConfig));
   },
   handler: async (args) => {
-    const command7 = await import('./handleSiteDeploy-7RXIGPRZ.cjs');
-    await command7.default(args);
+    const command11 = await import('./siteDeployCommand-MXKGJFFB.cjs');
+    await command11.default(args);
   }
 };
-var deploy_default = command3;
+var deploy_default = command2;
-// src/commands/site/upload/index.ts
-var command4 = {
-  command: "upload",
-  describe: "Upload an application version",
+// src/commands/site/logSiteCommandConfigFileOverride.ts
+async function logSiteCommandConfigFileOverride(argv, config) {
+  const Consola = await import('consola');
+  const consola = Consola.consola;
+  if (config?.site.application != null && argv.application !== config.site.application) {
+    consola.debug(`Overriding "application" from config file with ${argv.application}`);
+  }
+  if (config?.foundryUrl != null && argv.foundryUrl !== config.foundryUrl) {
+    consola.debug(`Overriding "foundryUrl" from config file with ${argv.foundryUrl}`);
+  }
+}
+// src/commands/site/version/delete/index.ts
+var command3 = {
+  command: "delete <version>",
+  describe: "Delete the specified site version.",
   builder: (argv) => {
-    return argv.option("siteVersion", {
+    return argv.positional("version", {
       type: "string",
-      demandOption: true
-    }).option("dir", {
-      type: "string"
+      demandOption: true,
+      description: "Version to set as live"
     });
   },
   handler: async (args) => {
-    const command7 = await import('./siteUploadCommand-EEFMEFF7.cjs');
-    await command7.default(args);
+    const command11 = await import('./versionDeleteCommand-RLU7UUYD.cjs');
+    await command11.default(args);
   }
 };
-var upload_default = command4;
+var delete_default = command3;
-// src/commands/site/versions/index.ts
+// src/commands/site/version/get/index.ts
+var command4 = {
+  command: "get",
+  describe: "Get the currently set live site version",
+  builder: (argv) => {
+    return argv;
+  },
+  handler: async (args) => {
+    const command11 = await import('./versionGetCommand-Y2VR2WKH.cjs');
+    await command11.default(args);
+  }
+};
+var get_default = command4;
+// src/commands/site/version/list/index.ts
 var command5 = {
-  command: "versions",
+  command: "list",
   describe: "List application versions",
   builder: (argv) => {
     return argv;
   },
   handler: async (args) => {
-    const command7 = await import('./siteVersionsCommand-W72FXGBR.cjs');
-    await command7.default(args);
+    const command11 = await import('./versionListCommand-5KM5PFYL.cjs');
+    await command11.default(args);
+  }
+};
+var list_default = command5;
+// src/commands/site/version/set/index.ts
+var command6 = {
+  command: "set <version>",
+  describe: "Set the live site version",
+  builder: (argv) => {
+    return argv.positional("version", {
+      type: "string",
+      demandOption: true,
+      description: "Version to set as live"
+    });
+  },
+  handler: async (args) => {
+    const command11 = await import('./versionSetCommand-VD3L5DOV.cjs');
+    await command11.default(args);
+  }
+};
+var set_default = command6;
+// src/commands/site/version/unset/index.ts
+var command7 = {
+  command: "unset",
+  describe: "Clear the currently set live site version.",
+  builder: (argv) => {
+    return argv;
+  },
+  handler: async (args) => {
+    const command11 = await import('./versionUnsetCommand-XYBUQ6XB.cjs');
+    await command11.default(args);
+  }
+};
+var unset_default = command7;
+// src/commands/site/version/index.ts
+var command8 = {
+  command: "version",
+  describe: "Manage application version",
+  builder: (argv) => {
+    return argv.command(list_default).command(set_default).command(unset_default).command(delete_default).command(get_default).demandCommand();
+  },
+  handler: async (args) => {
   }
 };
-var versions_default = command5;
+var version_default = command8;
 // src/commands/site/index.ts
-var site2 = {
+var command9 = {
   command: "site",
   describe: "Manage your site",
-  builder: (argv) => {
+  builder: async (argv) => {
+    const config = await configLoader_default();
+    const application = config?.foundryConfig.site.application;
+    const foundryUrl = config?.foundryConfig.foundryUrl;
     return argv.options({
-      appRid: {
+      application: {
         type: "string",
-        demandOption: true,
-        coerce: (a) => a
+        coerce: (application2) => application2,
+        ...application ? {
+          default: application
+        } : {
+          demandOption: true
+        },
+        description: "Application RID"
       },
-      baseUrl: {
+      foundryUrl: {
+        coerce: (foundryUrl2) => foundryUrl2.replace(/\/$/, ""),
         type: "string",
-        demandOption: true
+        ...foundryUrl ? {
+          default: foundryUrl
+        } : {
+          demandOption: true
+        },
+        description: "Foundry Stack URL with Protocol (e.g. https://example.palantirfoundry.com)"
+      },
+      token: {
+        type: "string",
+        conflicts: "tokenFile",
+        description: "Foundry API Token"
+      },
+      tokenFile: {
+        type: "string",
+        conflicts: "token",
+        description: "Path to a file containing your Foundry API Token"
+      }
+    }).group(["application", "foundryUrl", "token", "tokenFile"], "Common Arguments").command(version_default).command(deploy_default).check((argv2) => {
+      if (!argv2.foundryUrl.startsWith("https://")) {
+        throw new YargsCheckError("foundryUrl must start with https://");
       }
-    }).group(["appRid", "baseUrl"], "Common Arguments").command(versions_default).command(upload_default).command(delete_default).command(deploy_default).demandCommand();
+      return true;
+    }).middleware((argv2) => logSiteCommandConfigFileOverride(argv2, config?.foundryConfig)).demandCommand();
   },
   handler: async (args) => {
   }
 };
-var site_default = site2;
+var site_default = command9;
 // src/commands/typescript/generate/generate.ts
-var command6 = {
+var command10 = {
   command: "generate",
   describe: "Generate typescript from ontology",
   builder: (argv) => {
@@ -214,24 +416,31 @@ var command6 = {
       packageType: {
         default: "commonjs",
         choices: ["commonjs", "module"]
+      },
+      version: {
+        type: "string",
+        description: "Version of the generated code, or 'dev'",
+        demandOption: true
       }
-    }).group(["ontologyPath", "outDir"], "Generate from a local file").group(["stack", "clientId", "outDir", "ontologyWritePath"], "OR Generate from a stack").check((argv2) => {
-      if (argv2.ontologyPath || argv2.stack) {
-        return true;
-      } else {
+    }).group(["ontologyPath", "outDir", "version"], "Generate from a local file").group(["stack", "clientId", "outDir", "ontologyWritePath", "version"], "OR Generate from a stack").check((argv2) => {
+      if (!argv2.ontologyPath && !argv2.stack) {
         throw new Error("Error: Must specify either ontologyPath or stack and clientId");
       }
+      if (argv2.version !== "dev" && !chunkX2S4O5ZR_cjs.isValidSemver(argv2.version)) {
+        throw new Error("Error: Version must be 'dev' or a valid semver version");
+      }
+      return true;
     });
   },
   handler: async (args) => {
-    const command7 = await import('./handleGenerate-UTCLNZQO.cjs');
-    await command7.default(args);
+    const command11 = await import('./handleGenerate-WOW33WYG.cjs');
+    await command11.default(args);
   }
 };
-var generate_default = command6;
+var generate_default = command10;
 // src/commands/typescript/index.ts
-var site3 = {
+var site2 = {
   command: "typescript",
   describe: "Manage code",
   builder: (argv) => {
@@ -240,39 +449,36 @@ var site3 = {
   handler: async (args) => {
   }
 };
-var typescript_default = site3;
-async function readCliVersionFromPackageJson() {
-  const {
-    findUp
-  } = await import('find-up');
-  const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('out.js', document.baseURI).href))));
-  const result = await findUp("package.json", {
-    cwd: __dirname
-  });
-  if (!result) {
-    return "(unknown version. No package.json found)";
-  }
-  const packageJson = JSON.parse(await fs__namespace.promises.readFile(result, "utf-8"));
-  if (packageJson.version) {
-    return `v${packageJson.version}`;
-  } else {
-    return "(unknown version. No version in package.json found)";
+var typescript_default = site2;
+// src/yargs/logConfigFileMiddleware.ts
+var firstTime = true;
+async function logConfigFileMiddleware() {
+  if (firstTime) {
+    firstTime = false;
+    const config = configLoader_default();
+    const configFilePath = (await config)?.configFilePath;
+    if (configFilePath) {
+      const Consola = await import('consola');
+      const consola = Consola.consola;
+      consola.debug(`Using configuration from file: "${configFilePath}"`);
+    }
   }
 }
 // src/yargs/logVersionMiddleware.ts
-var firstTime = true;
+var firstTime2 = true;
 async function logVersionMiddleware(args) {
-  if (firstTime) {
+  if (firstTime2) {
+    firstTime2 = false;
     const Consola = await import('consola');
     const consola = Consola.consola;
-    consola.info(`Palantir OSDK CLI ${await readCliVersionFromPackageJson()}`);
+    consola.info(`Palantir OSDK CLI ${"0.4.0"}`);
     consola.level = 3 + args.verbose;
     if (consola.level > 3) {
       consola.debug(`Verbose logging enabled (${consola.level === 4 ? "debug" : "trace"})`);
     }
-    console.log();
-    firstTime = false;
+    consola.log("");
   }
 }
@@ -283,7 +489,7 @@ async function cli(args = process.argv) {
     type: "boolean",
     description: "Enable verbose logging",
     count: true
-  }).demandCommand().middleware(logVersionMiddleware, true).strict().command({
+  }).demandCommand().middleware(logVersionMiddleware, true).middleware(logConfigFileMiddleware).strict().command({
     command: "unstable",
     aliases: ["experimental"],
     builder: async (argv) => {
@@ -291,13 +497,32 @@ async function cli(args = process.argv) {
     },
     handler: (_args) => {
     }
+  }).fail(async (msg, err, yargsContext) => {
+    const Consola = await import('consola');
+    const isVerbose = args.some((arg) => ["-v", "--v", "--verbose"].includes(arg));
+    if (err instanceof chunkHYF3CTKZ_cjs.ExitProcessError) {
+      if (isVerbose) {
+        Consola.consola.error(err);
+      } else {
+        Consola.consola.error(err.message);
+      }
+    } else {
+      if (err && err instanceof YargsCheckError === false) {
+        throw err;
+      } else {
+        yargsContext.showHelp();
+        Consola.consola.log("");
+        console.error(msg);
+      }
+    }
+    process.exit(1);
   });
   try {
-    return base.parseAsync();
-  } catch (e) {
-    if (e instanceof chunkHYF3CTKZ_cjs.ExitProcessError) {
+    return await base.parseAsync();
+  } catch (err) {
+    if (err instanceof chunkHYF3CTKZ_cjs.ExitProcessError) {
       const Consola = await import('consola');
-      Consola.consola.error(e.message);
+      Consola.consola.error(err);
     }
   }
 }