@osdk/maker 0.16.0-beta.8 → 0.16.0-beta.9

package/build/esm/cli/main.js

@@ -14,33 +14,17 @@
  * limitations under the License.
  */
 
-import { OntologyIrToFullMetadataConverter } from "@osdk/generator-converters.ontologyir";
 import { consola } from "consola";
-import { execa } from "execa";
-import { createJiti } from "jiti";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import invariant from "tiny-invariant";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { defineOntology } from "../api/defineOntology.js";
-
-// Dynamic imports for optional function discovery dependencies
-let generateFunctionsIr;
-async function loadFunctionDiscoveryDeps() {
-  try {
-    const defineFunctionModule = await import("../api/defineFunction.js");
-    generateFunctionsIr = defineFunctionModule.generateFunctionsIr;
-    return true;
-  } catch (e) {
-    consola.warn("Failed to load function discovery dependencies:", e instanceof Error ? e.message : e);
-    return false;
-  }
-}
 const apiNamespaceRegex = /^[a-z0-9-]+(\.[a-z0-9-]+)*\.$/;
 const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 export default async function main(args = process.argv) {
-  const commandLineOpts = await yargs(hideBin(args)).version("0.16.0-beta.8" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs(hideBin(args)).version("0.16.0-beta.9" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -104,41 +88,6 @@ export default async function main(args = process.argv) {
       describe: "Value used to assure uniqueness of entities",
       type: "string",
       coerce: path.resolve
-    },
-    generateFunctionsOsdk: {
-      describe: "Output folder for generated OSDK for functions",
-      type: "string",
-      coerce: path.resolve
-    },
-    functionsRootDir: {
-      describe: "Root folder containing function definitions",
-      type: "string",
-      coerce: path.resolve
-    },
-    functionsOutput: {
-      describe: "Output folder for function IR",
-      type: "string",
-      coerce: path.resolve
-    },
-    configPath: {
-      describe: "Path to the TypeScript config file",
-      type: "string",
-      coerce: path.resolve
-    },
-    pythonFunctionsDir: {
-      describe: "Path to Python functions source directory (enables Python function discovery)",
-      type: "string",
-      coerce: path.resolve
-    },
-    pythonBinary: {
-      describe: "Path to Python binary (required when using --pythonFunctionsDir)",
-      type: "string",
-      coerce: path.resolve
-    },
-    pythonRootProjectDir: {
-      describe: "Root project directory for Python functions (defaults to parent of pythonFunctionsDir)",
-      type: "string",
-      coerce: path.resolve
     }
   }).parseAsync();
   let apiNamespace = "";
@@ -161,101 +110,9 @@ export default async function main(args = process.argv) {
   if (ontologyIr.valueTypes.valueTypes.length > 0 || ontologyIr.importedValueTypes.valueTypes.length > 0) {
     await fs.writeFile(commandLineOpts.valueTypesOutput, JSON.stringify(ontologyIr.valueTypes, null, 2));
   }
-  if (commandLineOpts.pythonFunctionsDir && !commandLineOpts.pythonBinary) {
-    consola.error("--pythonBinary is required when using --pythonFunctionsDir");
-    return;
-  }
-
-  // Function discovery feature (requires optional dependencies)
-  if (commandLineOpts.functionsOutput !== undefined && commandLineOpts.functionsRootDir !== undefined) {
-    const hasFunctionDeps = await loadFunctionDiscoveryDeps();
-    if (!hasFunctionDeps || !generateFunctionsIr) {
-      consola.error("Function discovery requires optional dependencies. Install @foundry/functions-typescript-* packages.");
-      return;
-    }
-    consola.info(`Loading function IR`);
-    const functionsIr = await generateFunctionsIr(commandLineOpts.functionsRootDir, commandLineOpts.configPath, createEntityMappings(ontologyIr));
-    await fs.writeFile(commandLineOpts.functionsOutput, JSON.stringify(functionsIr, null, 2));
-    return;
-  }
-  if (commandLineOpts.generateFunctionsOsdk !== undefined) {
-    // Generate full ontology metadata for functions OSDK
-    const fullMetadata = OntologyIrToFullMetadataConverter.getFullMetadataFromIr(ontologyIr.ontology);
-
-    // Discover Python functions and merge into ontology metadata
-    if (commandLineOpts.pythonFunctionsDir) {
-      const effectivePythonRootDir = commandLineOpts.pythonRootProjectDir ?? path.dirname(commandLineOpts.pythonFunctionsDir);
-      const queryTypes = await OntologyIrToFullMetadataConverter.getOsdkQueryTypes(commandLineOpts.pythonBinary, undefined, undefined, commandLineOpts.pythonFunctionsDir, effectivePythonRootDir);
-      const functionNames = Object.keys(queryTypes);
-      if (functionNames.length > 0) {
-        fullMetadata.queryTypes = queryTypes;
-        consola.info(`Discovered ${functionNames.length} Python function(s): ${functionNames.join(", ")}`);
-      } else {
-        consola.info("No Python functions discovered.");
-      }
-    }
-    consola.info(`Saving full ontology metadata to ${commandLineOpts.generateFunctionsOsdk}`);
-    await fs.writeFile(path.join(commandLineOpts.generateFunctionsOsdk, ".ontology.json"), JSON.stringify(fullMetadata, null, 2));
-    await fullMetadataToOsdk(commandLineOpts.generateFunctionsOsdk);
-  }
 }
 async function loadOntology(input, apiNamespace, outputDir, dependencyFile, generateCodeSnippets, snippetPackageName, codeSnippetDir, randomnessKey) {
-  const q = await defineOntology(apiNamespace, async () => {
-    const jiti = createJiti(import.meta.filename, {
-      moduleCache: true,
-      debug: false,
-      importMeta: import.meta
-    });
-    await jiti.import(input);
-  }, outputDir, dependencyFile, generateCodeSnippets, snippetPackageName, codeSnippetDir, randomnessKey);
+  const q = await defineOntology(apiNamespace, async () => await import(input), outputDir, dependencyFile, generateCodeSnippets, snippetPackageName, codeSnippetDir, randomnessKey);
   return q;
 }
-async function fullMetadataToOsdk(workDir) {
-  // First create a clean temporary directory to generate the SDK into
-  const functionOsdkDir = path.join(workDir, "generated");
-  await fs.rm(functionOsdkDir, {
-    recursive: true,
-    force: true
-  });
-  await fs.mkdir(functionOsdkDir, {
-    recursive: true
-  });
-  try {
-    // Generate the source code for the osdk
-    await execa("pnpm", ["exec", "osdk", "unstable", "typescript", "generate", "--outDir", functionOsdkDir, "--ontologyPath", path.join(workDir, ".ontology.json"), "--beta", "true", "--packageType", "module", "--version", "dev"]);
-  } catch (error) {
-    await fs.rm(functionOsdkDir, {
-      recursive: true,
-      force: true
-    });
-    throw error;
-  }
-}
-function createEntityMappings(ontologyIr) {
-  const entityMappings = {
-    ontologies: {}
-  };
-  const ontologyRid = "ontology";
-  entityMappings.ontologies[ontologyRid] = {
-    objectTypes: {},
-    interfaceTypes: {}
-  };
-  for (const [apiName, blockData] of Object.entries(ontologyIr.ontology.objectTypes)) {
-    const propertyTypesMap = {};
-    Object.keys(blockData.objectType.propertyTypes).forEach(propertyName => {
-      propertyTypesMap[propertyName] = {
-        propertyId: propertyName
-      };
-    });
-    entityMappings.ontologies[ontologyRid].objectTypes[apiName] = {
-      objectTypeId: apiName,
-      primaryKey: {
-        propertyId: blockData.objectType.primaryKeys[0]
-      },
-      propertyTypes: propertyTypesMap,
-      linkTypes: {}
-    };
-  }
-  return entityMappings;
-}
 //# sourceMappingURL=main.js.map

package/build/esm/cli/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","names":["OntologyIrToFullMetadataConverter","consola","execa","createJiti","fs","path","invariant","yargs","hideBin","defineOntology","generateFunctionsIr","loadFunctionDiscoveryDeps","defineFunctionModule","e","warn","Error","message","apiNamespaceRegex","uuidRegex","main","args","process","argv","commandLineOpts","version","wrap","Math","min","terminalWidth","strict","help","options","input","alias","describe","type","default","coerce","resolve","output","apiNamespace","snapshotDir","outputDir","valueTypesOutput","dependencies","generateCodeSnippets","codeSnippetPackageName","codeSnippetDir","randomnessKey","generateFunctionsOsdk","functionsRootDir","functionsOutput","configPath","pythonFunctionsDir","pythonBinary","pythonRootProjectDir","parseAsync","length","slice","env","NODE_ENV","test","info","undefined","ontologyIr","loadOntology","writeFile","JSON","stringify","valueTypes","importedValueTypes","error","hasFunctionDeps","functionsIr","createEntityMappings","fullMetadata","getFullMetadataFromIr","ontology","effectivePythonRootDir","dirname","queryTypes","getOsdkQueryTypes","functionNames","Object","keys","join","fullMetadataToOsdk","dependencyFile","snippetPackageName","q","jiti","import","meta","filename","moduleCache","debug","importMeta","workDir","functionOsdkDir","rm","recursive","force","mkdir","entityMappings","ontologies","ontologyRid","objectTypes","interfaceTypes","apiName","blockData","entries","propertyTypesMap","objectType","propertyTypes","forEach","propertyName","propertyId","objectTypeId","primaryKey","primaryKeys","linkTypes"],"sources":["main.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { OntologyIr } from \"@osdk/client.unstable\";\nimport { OntologyIrToFullMetadataConverter } from \"@osdk/generator-converters.ontologyir\";\nimport { consola } from \"consola\";\nimport { execa } from \"execa\";\nimport { createJiti } from \"jiti\";\nimport * as fs from \"node:fs/promises\";\nimport * as path from \"node:path\";\nimport invariant from \"tiny-invariant\";\nimport yargs from \"yargs\";\nimport { hideBin } from \"yargs/helpers\";\nimport type { IEntityMetadataMapping } from \"../api/defineFunction.js\";\nimport { defineOntology } from \"../api/defineOntology.js\";\n\n// Dynamic imports for optional function discovery dependencies\nlet generateFunctionsIr:\n  | ((\n    rootDir: string,\n    configPath: string | undefined,\n    entityMappings: IEntityMetadataMapping,\n  ) => Promise<unknown>)\n  | undefined;\n\nasync function loadFunctionDiscoveryDeps(): Promise<boolean> {\n  try {\n    const defineFunctionModule = await import(\"../api/defineFunction.js\");\n    generateFunctionsIr = defineFunctionModule.generateFunctionsIr;\n    return true;\n  } catch (e: unknown) {\n    consola.warn(\n      \"Failed to load function discovery dependencies:\",\n      e instanceof Error ? e.message : e,\n    );\n    return false;\n  }\n}\n\nconst apiNamespaceRegex = /^[a-z0-9-]+(\\.[a-z0-9-]+)*\\.$/;\nconst uuidRegex =\n  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;\n\nexport default async function main(\n  args: string[] = process.argv,\n): Promise<void> {\n  const commandLineOpts: {\n    input: string;\n    output: string;\n    apiNamespace: string;\n    snapshotDir: string;\n    valueTypesOutput: string;\n    outputDir?: string;\n    dependencies?: string;\n    generateCodeSnippets: boolean;\n    codeSnippetPackageName: string;\n    codeSnippetDir: string;\n    randomnessKey?: string;\n    generateFunctionsOsdk?: string;\n    functionsRootDir?: string;\n    functionsOutput?: string;\n    configPath?: string;\n    pythonFunctionsDir?: string;\n    pythonBinary?: string;\n    pythonRootProjectDir?: string;\n  } = await yargs(hideBin(args))\n    .version(process.env.PACKAGE_VERSION ?? \"\")\n    .wrap(Math.min(150, yargs().terminalWidth()))\n    .strict()\n    .help()\n    .options({\n      input: {\n        alias: \"i\",\n        describe: \"Input file\",\n        type: \"string\",\n        default: \".ontology/ontology.ts\",\n        coerce: path.resolve,\n      },\n      output: {\n        alias: \"o\",\n        describe: \"Output file\",\n        type: \"string\",\n        default: \"ontology.json\",\n        coerce: path.resolve,\n      },\n      apiNamespace: {\n        describe: \"Api name prefix for namespaced ontology types\",\n        type: \"string\",\n        default: \"\",\n      },\n      snapshotDir: {\n        alias: \"s\",\n        describe: \"Snapshot directory\",\n        type: \"string\",\n        default: \"snapshots\",\n        coerce: path.resolve,\n      },\n      outputDir: {\n        alias: \"d\",\n        describe: \"Directory for generated ontology entities\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      valueTypesOutput: {\n        describe: \"Value Type Output File\",\n        type: \"string\",\n        default: \"value-types.json\",\n        coerce: path.resolve,\n      },\n      dependencies: {\n        describe: \"File to write dependencies to\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      generateCodeSnippets: {\n        describe: \"Enable code snippet files creation\",\n        type: \"boolean\",\n        default: false,\n      },\n      codeSnippetPackageName: {\n        describe:\n          \"The package name that will be displayed in the code snippets\",\n        default: \"\",\n        type: \"string\",\n      },\n      codeSnippetDir: {\n        describe: \"Directory for generated code snippet files\",\n        type: \"string\",\n        default: \"./\",\n        coerce: path.resolve,\n      },\n      randomnessKey: {\n        describe: \"Value used to assure uniqueness of entities\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      generateFunctionsOsdk: {\n        describe: \"Output folder for generated OSDK for functions\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      functionsRootDir: {\n        describe: \"Root folder containing function definitions\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      functionsOutput: {\n        describe: \"Output folder for function IR\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      configPath: {\n        describe: \"Path to the TypeScript config file\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      pythonFunctionsDir: {\n        describe:\n          \"Path to Python functions source directory (enables Python function discovery)\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      pythonBinary: {\n        describe:\n          \"Path to Python binary (required when using --pythonFunctionsDir)\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      pythonRootProjectDir: {\n        describe:\n          \"Root project directory for Python functions (defaults to parent of pythonFunctionsDir)\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n    })\n    .parseAsync();\n  let apiNamespace = \"\";\n  if (commandLineOpts.apiNamespace.length !== 0) {\n    apiNamespace = (commandLineOpts.apiNamespace.slice(-1) !== \".\")\n      ? commandLineOpts.apiNamespace + \".\"\n      : commandLineOpts.apiNamespace;\n    invariant(apiNamespace.length < 1024, \"API namespace is too long.\");\n    invariant(\n      apiNamespaceRegex.test(apiNamespace),\n      \"API namespace is invalid! It is expected to conform to ^[a-z0-9-]+(\\.[a-z0-9-]+)*\\.$\",\n    );\n  }\n\n  consola.info(`Loading ontology from ${commandLineOpts.input}`);\n\n  if (\n    !commandLineOpts.generateCodeSnippets\n    && (commandLineOpts.codeSnippetPackageName !== \"\"\n      || commandLineOpts.codeSnippetDir !== path.resolve(\"./\"))\n  ) {\n    consola.info(\n      \"Package name and/or directory supplied for code snippets, but code snippet generation is false.\",\n    );\n  }\n\n  if (commandLineOpts.randomnessKey !== undefined) {\n    invariant(\n      uuidRegex.test(commandLineOpts.randomnessKey),\n      \"Supplied randomness key is not a uuid and shouldn't be used as a uniqueness guarantee\",\n    );\n  }\n\n  const ontologyIr = await loadOntology(\n    commandLineOpts.input,\n    apiNamespace,\n    commandLineOpts.outputDir,\n    commandLineOpts.dependencies,\n    commandLineOpts.generateCodeSnippets,\n    commandLineOpts.codeSnippetPackageName,\n    commandLineOpts.codeSnippetDir,\n    commandLineOpts.randomnessKey,\n  );\n  consola.info(`Saving ontology to ${commandLineOpts.output}`);\n  await fs.writeFile(\n    commandLineOpts.output,\n    JSON.stringify(\n      ontologyIr,\n      null,\n      2,\n    ),\n  );\n  // No point in generating block if there aren't any value types\n  if (\n    ontologyIr.valueTypes.valueTypes.length > 0\n    || ontologyIr.importedValueTypes.valueTypes.length > 0\n  ) {\n    await fs.writeFile(\n      commandLineOpts.valueTypesOutput,\n      JSON.stringify(\n        ontologyIr.valueTypes,\n        null,\n        2,\n      ),\n    );\n  }\n\n  if (commandLineOpts.pythonFunctionsDir && !commandLineOpts.pythonBinary) {\n    consola.error(\n      \"--pythonBinary is required when using --pythonFunctionsDir\",\n    );\n    return;\n  }\n\n  // Function discovery feature (requires optional dependencies)\n  if (\n    commandLineOpts.functionsOutput !== undefined\n    && commandLineOpts.functionsRootDir !== undefined\n  ) {\n    const hasFunctionDeps = await loadFunctionDiscoveryDeps();\n    if (!hasFunctionDeps || !generateFunctionsIr) {\n      consola.error(\n        \"Function discovery requires optional dependencies. Install @foundry/functions-typescript-* packages.\",\n      );\n      return;\n    }\n    consola.info(`Loading function IR`);\n    const functionsIr = await generateFunctionsIr(\n      commandLineOpts.functionsRootDir,\n      commandLineOpts.configPath,\n      createEntityMappings(ontologyIr),\n    );\n    await fs.writeFile(\n      commandLineOpts.functionsOutput,\n      JSON.stringify(functionsIr, null, 2),\n    );\n    return;\n  }\n\n  if (commandLineOpts.generateFunctionsOsdk !== undefined) {\n    // Generate full ontology metadata for functions OSDK\n    const fullMetadata = OntologyIrToFullMetadataConverter\n      .getFullMetadataFromIr(ontologyIr.ontology);\n\n    // Discover Python functions and merge into ontology metadata\n    if (commandLineOpts.pythonFunctionsDir) {\n      const effectivePythonRootDir = commandLineOpts.pythonRootProjectDir\n        ?? path.dirname(commandLineOpts.pythonFunctionsDir);\n\n      const queryTypes = await OntologyIrToFullMetadataConverter\n        .getOsdkQueryTypes(\n          commandLineOpts.pythonBinary,\n          undefined,\n          undefined,\n          commandLineOpts.pythonFunctionsDir,\n          effectivePythonRootDir,\n        );\n\n      const functionNames = Object.keys(queryTypes);\n      if (functionNames.length > 0) {\n        fullMetadata.queryTypes = queryTypes;\n        consola.info(\n          `Discovered ${functionNames.length} Python function(s): ${\n            functionNames.join(\", \")\n          }`,\n        );\n      } else {\n        consola.info(\"No Python functions discovered.\");\n      }\n    }\n\n    consola.info(\n      `Saving full ontology metadata to ${commandLineOpts.generateFunctionsOsdk}`,\n    );\n\n    await fs.writeFile(\n      path.join(commandLineOpts.generateFunctionsOsdk, \".ontology.json\"),\n      JSON.stringify(fullMetadata, null, 2),\n    );\n\n    await fullMetadataToOsdk(commandLineOpts.generateFunctionsOsdk);\n  }\n}\n\nasync function loadOntology(\n  input: string,\n  apiNamespace: string,\n  outputDir: string | undefined,\n  dependencyFile: string | undefined,\n  generateCodeSnippets: boolean,\n  snippetPackageName: string,\n  codeSnippetDir: string,\n  randomnessKey?: string,\n) {\n  const q = await defineOntology(\n    apiNamespace,\n    async () => {\n      const jiti = createJiti(import.meta.filename, {\n        moduleCache: true,\n        debug: false,\n        importMeta: import.meta,\n      });\n      await jiti.import(input);\n    },\n    outputDir,\n    dependencyFile,\n    generateCodeSnippets,\n    snippetPackageName,\n    codeSnippetDir,\n    randomnessKey,\n  );\n  return q;\n}\n\nasync function fullMetadataToOsdk(\n  workDir: string,\n): Promise<void> {\n  // First create a clean temporary directory to generate the SDK into\n  const functionOsdkDir = path.join(\n    workDir,\n    \"generated\",\n  );\n  await fs.rm(functionOsdkDir, { recursive: true, force: true });\n  await fs.mkdir(functionOsdkDir, { recursive: true });\n\n  try {\n    // Generate the source code for the osdk\n    await execa(\"pnpm\", [\n      \"exec\",\n      \"osdk\",\n      \"unstable\",\n      \"typescript\",\n      \"generate\",\n      \"--outDir\",\n      functionOsdkDir,\n      \"--ontologyPath\",\n      path.join(workDir, \".ontology.json\"),\n      \"--beta\",\n      \"true\",\n      \"--packageType\",\n      \"module\",\n      \"--version\",\n      \"dev\",\n    ]);\n  } catch (error) {\n    await fs.rm(functionOsdkDir, { recursive: true, force: true });\n    throw error;\n  }\n}\n\nfunction createEntityMappings(ontologyIr: OntologyIr): IEntityMetadataMapping {\n  const entityMappings: IEntityMetadataMapping = {\n    ontologies: {},\n  };\n\n  const ontologyRid = \"ontology\";\n  entityMappings.ontologies[ontologyRid] = {\n    objectTypes: {},\n    interfaceTypes: {},\n  };\n\n  for (\n    const [apiName, blockData] of Object.entries(\n      ontologyIr.ontology.objectTypes,\n    )\n  ) {\n    const propertyTypesMap: Record<string, { propertyId: string }> = {};\n\n    Object.keys(blockData.objectType.propertyTypes).forEach((propertyName) => {\n      propertyTypesMap[propertyName] = { propertyId: propertyName };\n    });\n\n    entityMappings.ontologies[ontologyRid].objectTypes[apiName] = {\n      objectTypeId: apiName,\n      primaryKey: {\n        propertyId: blockData.objectType.primaryKeys[0],\n      },\n      propertyTypes: propertyTypesMap,\n      linkTypes: {},\n    };\n  }\n\n  return entityMappings;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"main.js","names":["consola","fs","path","invariant","yargs","hideBin","defineOntology","apiNamespaceRegex","uuidRegex","main","args","process","argv","commandLineOpts","version","wrap","Math","min","terminalWidth","strict","help","options","input","alias","describe","type","default","coerce","resolve","output","apiNamespace","snapshotDir","outputDir","valueTypesOutput","dependencies","generateCodeSnippets","codeSnippetPackageName","codeSnippetDir","randomnessKey","parseAsync","length","slice","env","NODE_ENV","test","info","undefined","ontologyIr","loadOntology","writeFile","JSON","stringify","valueTypes","importedValueTypes","dependencyFile","snippetPackageName","q"],"sources":["main.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { consola } from \"consola\";\nimport * as fs from \"node:fs/promises\";\nimport * as path from \"node:path\";\nimport invariant from \"tiny-invariant\";\nimport yargs from \"yargs\";\nimport { hideBin } from \"yargs/helpers\";\nimport { defineOntology } from \"../api/defineOntology.js\";\n\nconst apiNamespaceRegex = /^[a-z0-9-]+(\\.[a-z0-9-]+)*\\.$/;\nconst uuidRegex =\n  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;\n\nexport default async function main(\n  args: string[] = process.argv,\n): Promise<void> {\n  const commandLineOpts: {\n    input: string;\n    output: string;\n    apiNamespace: string;\n    snapshotDir: string;\n    valueTypesOutput: string;\n    outputDir?: string;\n    dependencies?: string;\n    generateCodeSnippets: boolean;\n    codeSnippetPackageName: string;\n    codeSnippetDir: string;\n    randomnessKey?: string;\n  } = await yargs(hideBin(args))\n    .version(process.env.PACKAGE_VERSION ?? \"\")\n    .wrap(Math.min(150, yargs().terminalWidth()))\n    .strict()\n    .help()\n    .options({\n      input: {\n        alias: \"i\",\n        describe: \"Input file\",\n        type: \"string\",\n        default: \".ontology/ontology.ts\",\n        coerce: path.resolve,\n      },\n      output: {\n        alias: \"o\",\n        describe: \"Output file\",\n        type: \"string\",\n        default: \"ontology.json\",\n        coerce: path.resolve,\n      },\n      apiNamespace: {\n        describe: \"Api name prefix for namespaced ontology types\",\n        type: \"string\",\n        default: \"\",\n      },\n      snapshotDir: {\n        alias: \"s\",\n        describe: \"Snapshot directory\",\n        type: \"string\",\n        default: \"snapshots\",\n        coerce: path.resolve,\n      },\n      outputDir: {\n        alias: \"d\",\n        describe: \"Directory for generated ontology entities\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      valueTypesOutput: {\n        describe: \"Value Type Output File\",\n        type: \"string\",\n        default: \"value-types.json\",\n        coerce: path.resolve,\n      },\n      dependencies: {\n        describe: \"File to write dependencies to\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n      generateCodeSnippets: {\n        describe: \"Enable code snippet files creation\",\n        type: \"boolean\",\n        default: false,\n      },\n      codeSnippetPackageName: {\n        describe:\n          \"The package name that will be displayed in the code snippets\",\n        default: \"\",\n        type: \"string\",\n      },\n      codeSnippetDir: {\n        describe: \"Directory for generated code snippet files\",\n        type: \"string\",\n        default: \"./\",\n        coerce: path.resolve,\n      },\n      randomnessKey: {\n        describe: \"Value used to assure uniqueness of entities\",\n        type: \"string\",\n        coerce: path.resolve,\n      },\n    })\n    .parseAsync();\n  let apiNamespace = \"\";\n  if (commandLineOpts.apiNamespace.length !== 0) {\n    apiNamespace = (commandLineOpts.apiNamespace.slice(-1) !== \".\")\n      ? commandLineOpts.apiNamespace + \".\"\n      : commandLineOpts.apiNamespace;\n    invariant(apiNamespace.length < 1024, \"API namespace is too long.\");\n    invariant(\n      apiNamespaceRegex.test(apiNamespace),\n      \"API namespace is invalid! It is expected to conform to ^[a-z0-9-]+(\\.[a-z0-9-]+)*\\.$\",\n    );\n  }\n  consola.info(`Loading ontology from ${commandLineOpts.input}`);\n\n  if (\n    !commandLineOpts.generateCodeSnippets\n    && (commandLineOpts.codeSnippetPackageName !== \"\"\n      || commandLineOpts.codeSnippetDir !== path.resolve(\"./\"))\n  ) {\n    consola.info(\n      \"Package name and/or directory supplied for code snippets, but code snippet generation is false.\",\n    );\n  }\n\n  if (commandLineOpts.randomnessKey !== undefined) {\n    invariant(\n      uuidRegex.test(commandLineOpts.randomnessKey),\n      \"Supplied randomness key is not a uuid and shouldn't be used as a uniqueness guarantee\",\n    );\n  }\n\n  const ontologyIr = await loadOntology(\n    commandLineOpts.input,\n    apiNamespace,\n    commandLineOpts.outputDir,\n    commandLineOpts.dependencies,\n    commandLineOpts.generateCodeSnippets,\n    commandLineOpts.codeSnippetPackageName,\n    commandLineOpts.codeSnippetDir,\n    commandLineOpts.randomnessKey,\n  );\n\n  consola.info(`Saving ontology to ${commandLineOpts.output}`);\n  await fs.writeFile(\n    commandLineOpts.output,\n    JSON.stringify(\n      ontologyIr,\n      null,\n      2,\n    ),\n  );\n  // No point in generating block if there aren't any value types\n  if (\n    ontologyIr.valueTypes.valueTypes.length > 0\n    || ontologyIr.importedValueTypes.valueTypes.length > 0\n  ) {\n    await fs.writeFile(\n      commandLineOpts.valueTypesOutput,\n      JSON.stringify(\n        ontologyIr.valueTypes,\n        null,\n        2,\n      ),\n    );\n  }\n}\n\nasync function loadOntology(\n  input: string,\n  apiNamespace: string,\n  outputDir: string | undefined,\n  dependencyFile: string | undefined,\n  generateCodeSnippets: boolean,\n  snippetPackageName: string,\n  codeSnippetDir: string,\n  randomnessKey?: string,\n) {\n  const q = await defineOntology(\n    apiNamespace,\n    async () => await import(input),\n    outputDir,\n    dependencyFile,\n    generateCodeSnippets,\n    snippetPackageName,\n    codeSnippetDir,\n    randomnessKey,\n  );\n  return q;\n}\n"],"mappings":"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","ignoreList":[]}

package/build/types/cli/main.d.ts.map

@@ -1 +1 @@
-{"mappings":"eAwDe,SAAe,KAC5BA,kBACC","names":["args: string[]"],"sources":["../../../src/cli/main.ts"],"version":3,"file":"main.d.ts"}
+{"mappings":"eA4Be,SAAe,KAC5BA,kBACC","names":["args: string[]"],"sources":["../../../src/cli/main.ts"],"version":3,"file":"main.d.ts"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdk/maker",
-  "version": "0.16.0-beta.8",
+  "version": "0.16.0-beta.9",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -29,15 +29,14 @@
   "dependencies": {
     "@osdk/typescript-sdk-docs": "^0.2.0",
     "consola": "^3.4.2",
-    "execa": "^9.6.0",
     "jiti": "^2.5.1",
     "mustache": "^4.2.0",
     "semver-ts": "^1.0.3",
     "tiny-invariant": "^1.3.3",
     "ts-node": "^10.9.2",
     "yargs": "^17.7.2",
-    "@osdk/api": "~2.8.0-beta.14",
-    "@osdk/generator-converters.ontologyir": "~2.8.0-beta.14"
+    "@osdk/generator-converters.ontologyir": "~2.8.0-beta.15",
+    "@osdk/api": "~2.8.0-beta.15"
   },
   "devDependencies": {
     "@types/mustache": "^4.2.6",
@@ -46,8 +45,8 @@
     "typescript": "~5.5.4",
     "vitest": "^3.2.4",
     "@osdk/monorepo.api-extractor": "~0.7.0-beta.1",
-    "@osdk/monorepo.tsconfig": "~0.7.0-beta.1",
-    "@osdk/client.unstable": "~2.8.0-beta.14"
+    "@osdk/client.unstable": "~2.8.0-beta.15",
+    "@osdk/monorepo.tsconfig": "~0.7.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/build/cjs/defineFunction-7ORD7HD4.cjs

@@ -1,72 +0,0 @@
-'use strict';
-
-var generatorConverters_ontologyir = require('@osdk/generator-converters.ontologyir');
-var consola = require('consola');
-var path = require('path');
-
-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 path__namespace = /*#__PURE__*/_interopNamespace(path);
-
-// src/api/defineFunction.ts
-var cachedFunctionDiscoverer = null;
-async function loadFunctionDiscoverer() {
-  if (cachedFunctionDiscoverer != null) {
-    return cachedFunctionDiscoverer;
-  }
-  try {
-    const modulePath = "@foundry/functions-typescript-osdk-discovery";
-    const module = await import(
-      /* @vite-ignore */
-      modulePath
-    );
-    cachedFunctionDiscoverer = module.FunctionDiscoverer;
-    return cachedFunctionDiscoverer;
-  } catch (e) {
-    consola.consola.warn("Failed to load @foundry/functions-typescript-osdk-discovery:", e instanceof Error ? e.message : e);
-    return null;
-  }
-}
-function extractFunctionEntries(discoveredFunctions) {
-  return discoveredFunctions.map((fn) => {
-    if (fn.locator.type !== "typescriptOsdk") {
-      throw new Error(`OAC functions must be TypeScript, got type: ${fn.locator.type}`);
-    }
-    const locator = fn.locator;
-    return [locator.typescriptOsdk.functionName, fn];
-  });
-}
-async function generateFunctionsIr(rootDir, configPath, entityMappings) {
-  const functionsDiscoverer = await loadFunctionDiscoverer();
-  if (!functionsDiscoverer) {
-    throw new Error("Function discovery requires @foundry/functions-typescript-osdk-discovery to be installed");
-  }
-  const tsConfigPath = configPath ?? path__namespace.join(rootDir, "tsconfig.json");
-  const program = generatorConverters_ontologyir.OntologyIrToFullMetadataConverter.createProgram(tsConfigPath, rootDir);
-  const functionsDir = path__namespace.join(rootDir, "functions");
-  const fd = new functionsDiscoverer(program, rootDir, functionsDir, entityMappings);
-  const functions = fd.discover();
-  return {
-    functionsBlockDataV1: Object.fromEntries(extractFunctionEntries(functions.discoveredFunctions))
-  };
-}
-
-exports.generateFunctionsIr = generateFunctionsIr;
-//# sourceMappingURL=defineFunction-7ORD7HD4.cjs.map
-//# sourceMappingURL=defineFunction-7ORD7HD4.cjs.map

package/build/cjs/defineFunction-7ORD7HD4.cjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/api/defineFunction.ts"],"names":["consola","path","OntologyIrToFullMetadataConverter"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,IAAI,wBAA2B,GAAA,IAAA;AAC/B,eAAe,sBAAyB,GAAA;AACtC,EAAA,IAAI,4BAA4B,IAAM,EAAA;AACpC,IAAO,OAAA,wBAAA;AAAA;AAET,EAAI,IAAA;AACF,IAAA,MAAM,UAAa,GAAA,8CAAA;AACnB,IAAA,MAAM,SAAS,MAAM;AAAA;AAAA,MAAyB;AAAA,KAAA;AAC9C,IAAA,wBAAA,GAA2B,MAAO,CAAA,kBAAA;AAClC,IAAO,OAAA,wBAAA;AAAA,WACA,CAAG,EAAA;AACV,IAAAA,eAAA,CAAQ,KAAK,8DAAgE,EAAA,CAAA,YAAa,KAAQ,GAAA,CAAA,CAAE,UAAU,CAAC,CAAA;AAC/G,IAAO,OAAA,IAAA;AAAA;AAEX;AACA,SAAS,uBAAuB,mBAAqB,EAAA;AACnD,EAAO,OAAA,mBAAA,CAAoB,IAAI,CAAM,EAAA,KAAA;AACnC,IAAI,IAAA,EAAA,CAAG,OAAQ,CAAA,IAAA,KAAS,gBAAkB,EAAA;AACxC,MAAA,MAAM,IAAI,KAAM,CAAA,CAAA,4CAAA,EAA+C,EAAG,CAAA,OAAA,CAAQ,IAAI,CAAE,CAAA,CAAA;AAAA;AAElF,IAAA,MAAM,UAAU,EAAG,CAAA,OAAA;AACnB,IAAA,OAAO,CAAC,OAAA,CAAQ,cAAe,CAAA,YAAA,EAAc,EAAE,CAAA;AAAA,GAChD,CAAA;AACH;AACA,eAAsB,mBAAA,CAAoB,OAAS,EAAA,UAAA,EAAY,cAAgB,EAAA;AAC7E,EAAM,MAAA,mBAAA,GAAsB,MAAM,sBAAuB,EAAA;AACzD,EAAA,IAAI,CAAC,mBAAqB,EAAA;AACxB,IAAM,MAAA,IAAI,MAAM,0FAA0F,CAAA;AAAA;AAE5G,EAAA,MAAM,YAAe,GAAA,UAAA,IAAmBC,eAAK,CAAA,IAAA,CAAA,OAAA,EAAS,eAAe,CAAA;AACrE,EAAA,MAAM,OAAU,GAAAC,gEAAA,CAAkC,aAAc,CAAA,YAAA,EAAc,OAAO,CAAA;AACrF,EAAM,MAAA,YAAA,GAAoBD,eAAK,CAAA,IAAA,CAAA,OAAA,EAAS,WAAW,CAAA;AACnD,EAAA,MAAM,KAAK,IAAI,mBAAA,CAAoB,OAAS,EAAA,OAAA,EAAS,cAAc,cAAc,CAAA;AACjF,EAAM,MAAA,SAAA,GAAY,GAAG,QAAS,EAAA;AAC9B,EAAO,OAAA;AAAA,IACL,sBAAsB,MAAO,CAAA,WAAA,CAAY,sBAAuB,CAAA,SAAA,CAAU,mBAAmB,CAAC;AAAA,GAChG;AACF","file":"defineFunction-7ORD7HD4.cjs","sourcesContent":["/*\n * Copyright 2025 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 { OntologyIrToFullMetadataConverter } from \"@osdk/generator-converters.ontologyir\";\nimport { consola } from \"consola\";\nimport * as path from \"node:path\";\n\n// Type definitions for optional function discovery dependencies\n\n// Lazy-loaded function discovery module\nlet cachedFunctionDiscoverer = null;\nasync function loadFunctionDiscoverer() {\n  if (cachedFunctionDiscoverer != null) {\n    return cachedFunctionDiscoverer;\n  }\n  try {\n    const modulePath = \"@foundry/functions-typescript-osdk-discovery\";\n    const module = await import(/* @vite-ignore */modulePath);\n    cachedFunctionDiscoverer = module.FunctionDiscoverer;\n    return cachedFunctionDiscoverer;\n  } catch (e) {\n    consola.warn(\"Failed to load @foundry/functions-typescript-osdk-discovery:\", e instanceof Error ? e.message : e);\n    return null;\n  }\n}\nfunction extractFunctionEntries(discoveredFunctions) {\n  return discoveredFunctions.map(fn => {\n    if (fn.locator.type !== \"typescriptOsdk\") {\n      throw new Error(`OAC functions must be TypeScript, got type: ${fn.locator.type}`);\n    }\n    const locator = fn.locator;\n    return [locator.typescriptOsdk.functionName, fn];\n  });\n}\nexport async function generateFunctionsIr(rootDir, configPath, entityMappings) {\n  const functionsDiscoverer = await loadFunctionDiscoverer();\n  if (!functionsDiscoverer) {\n    throw new Error(\"Function discovery requires @foundry/functions-typescript-osdk-discovery to be installed\");\n  }\n  const tsConfigPath = configPath ?? path.join(rootDir, \"tsconfig.json\");\n  const program = OntologyIrToFullMetadataConverter.createProgram(tsConfigPath, rootDir);\n  const functionsDir = path.join(rootDir, \"functions\");\n  const fd = new functionsDiscoverer(program, rootDir, functionsDir, entityMappings);\n  const functions = fd.discover();\n  return {\n    functionsBlockDataV1: Object.fromEntries(extractFunctionEntries(functions.discoveredFunctions))\n  };\n}"]}