@osdk/maker 0.16.0-beta.4 → 0.16.0-beta.6

package/build/cjs/index.cjs

@@ -2,7 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var generatorConverters_ontologyir = require('@osdk/generator-converters.ontologyir');
 var consola = require('consola');
+var execa = require('execa');
+var jiti = require('jiti');
 var fs3 = require('fs/promises');
 var path3 = require('path');
 var invariant9 = require('tiny-invariant');
@@ -13,6 +16,7 @@ var typescriptSdkDocs = require('@osdk/typescript-sdk-docs');
 var Mustache = require('mustache');
 var crypto = require('crypto');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 function _interopNamespace(e) {
@@ -1314,7 +1318,7 @@ function convertInterface(interfaceType) {
   };
 }
 function convertDatasourceDefinition(objectType, properties) {
-  const baseDatasource = objectType.datasources?.find((ds) => ["dataset", "stream", "restrictedView"].includes(ds.type));
+  const baseDatasource = objectType.datasources?.find((ds) => ["dataset", "stream", "restrictedView", "direct"].includes(ds.type));
   switch (baseDatasource?.type) {
     case "stream":
       const window = baseDatasource.retentionPeriod;
@@ -1353,6 +1357,15 @@ function convertDatasourceDefinition(objectType, properties) {
           propertyMapping: buildPropertyMapping(properties)
         }
       };
+    case "direct":
+      return {
+        type: "direct",
+        direct: {
+          directSourceRid: objectType.apiName,
+          propertyMapping: buildPropertyMapping(properties),
+          propertySecurityGroups: convertPropertySecurityGroups(baseDatasource, properties, objectType.primaryKeyPropertyApiName)
+        }
+      };
     case "dataset":
     default:
       if (objectType.properties?.some((prop) => typeof prop.type === "object" && prop.type.type === "marking") || baseDatasource?.objectSecurityPolicy || baseDatasource?.propertySecurityGroups) {
@@ -1393,6 +1406,7 @@ function convertPropertySecurityGroups(ds, properties, primaryKeyPropertyApiName
               },
               additionalMandatory: {
                 markings: {},
+                assumedMarkingsV2: {},
                 assumedMarkings: []
               }
             }
@@ -1419,7 +1433,7 @@ function convertPropertySecurityGroups(ds, properties, primaryKeyPropertyApiName
     rid: ds.objectSecurityPolicy?.name || "defaultObjectSecurityPolicy",
     security: {
       type: "granular",
-      granular: convertGranularPolicy(ds.objectSecurityPolicy?.granularPolicy, ds.objectSecurityPolicy?.additionalMandatoryMarkings)
+      granular: convertGranularPolicy(ds.objectSecurityPolicy?.granularPolicy, ds.objectSecurityPolicy?.appliedMarkings, ds.objectSecurityPolicy?.assumedMarkings)
     },
     type: {
       type: "primaryKey",
@@ -1432,7 +1446,7 @@ function convertPropertySecurityGroups(ds, properties, primaryKeyPropertyApiName
       rid: psg.name,
       security: {
         type: "granular",
-        granular: convertGranularPolicy(psg.granularPolicy, psg.additionalMandatoryMarkings)
+        granular: convertGranularPolicy(psg.granularPolicy, psg.appliedMarkings, psg.assumedMarkings)
       },
       type: {
         type: "property",
@@ -1444,7 +1458,7 @@ function convertPropertySecurityGroups(ds, properties, primaryKeyPropertyApiName
     })) ?? []]
   };
 }
-function convertGranularPolicy(granularPolicy, additionalMandatoryMarkings) {
+function convertGranularPolicy(granularPolicy, appliedMarkings, assumedMarkings) {
   return {
     viewPolicy: {
       granularPolicyCondition: granularPolicy ? convertSecurityCondition(granularPolicy) : {
@@ -1454,8 +1468,9 @@ function convertGranularPolicy(granularPolicy, additionalMandatoryMarkings) {
         }
       },
       additionalMandatory: {
-        markings: additionalMandatoryMarkings ?? {},
-        assumedMarkings: []
+        markings: appliedMarkings ?? {},
+        assumedMarkings: [],
+        assumedMarkingsV2: assumedMarkings ?? {}
       }
     }
   };
@@ -2610,10 +2625,21 @@ function addNamespaceIfNone(apiName) {
 }
 
 // src/cli/main.ts
+var generateFunctionsIr;
+async function loadFunctionDiscoveryDeps() {
+  try {
+    const defineFunctionModule = await import('./defineFunction-7ORD7HD4.cjs');
+    generateFunctionsIr = defineFunctionModule.generateFunctionsIr;
+    return true;
+  } catch (e) {
+    consola.consola.warn("Failed to load function discovery dependencies:", e instanceof Error ? e.message : e);
+    return false;
+  }
+}
 var apiNamespaceRegex = /^[a-z0-9-]+(\.[a-z0-9-]+)*\.$/;
 var uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 async function main(args = process.argv) {
-  const commandLineOpts = await yargs__default.default(helpers.hideBin(args)).version("0.16.0-beta.4").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs__default.default(helpers.hideBin(args)).version("0.16.0-beta.6").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -2677,6 +2703,41 @@ async function main(args = process.argv) {
       describe: "Value used to assure uniqueness of entities",
       type: "string",
       coerce: path3__namespace.resolve
+    },
+    generateFunctionsOsdk: {
+      describe: "Output folder for generated OSDK for functions",
+      type: "string",
+      coerce: path3__namespace.resolve
+    },
+    functionsRootDir: {
+      describe: "Root folder containing function definitions",
+      type: "string",
+      coerce: path3__namespace.resolve
+    },
+    functionsOutput: {
+      describe: "Output folder for function IR",
+      type: "string",
+      coerce: path3__namespace.resolve
+    },
+    configPath: {
+      describe: "Path to the TypeScript config file",
+      type: "string",
+      coerce: path3__namespace.resolve
+    },
+    pythonFunctionsDir: {
+      describe: "Path to Python functions source directory (enables Python function discovery)",
+      type: "string",
+      coerce: path3__namespace.resolve
+    },
+    pythonBinary: {
+      describe: "Path to Python binary (required when using --pythonFunctionsDir)",
+      type: "string",
+      coerce: path3__namespace.resolve
+    },
+    pythonRootProjectDir: {
+      describe: "Root project directory for Python functions (defaults to parent of pythonFunctionsDir)",
+      type: "string",
+      coerce: path3__namespace.resolve
     }
   }).parseAsync();
   let apiNamespace = "";
@@ -2698,11 +2759,96 @@ async function main(args = process.argv) {
   if (ontologyIr.valueTypes.valueTypes.length > 0 || ontologyIr.importedValueTypes.valueTypes.length > 0) {
     await fs3__namespace.writeFile(commandLineOpts.valueTypesOutput, JSON.stringify(ontologyIr.valueTypes, null, 2));
   }
+  if (commandLineOpts.pythonFunctionsDir && !commandLineOpts.pythonBinary) {
+    consola.consola.error("--pythonBinary is required when using --pythonFunctionsDir");
+    return;
+  }
+  if (commandLineOpts.functionsOutput !== void 0 && commandLineOpts.functionsRootDir !== void 0) {
+    const hasFunctionDeps = await loadFunctionDiscoveryDeps();
+    if (!hasFunctionDeps || !generateFunctionsIr) {
+      consola.consola.error("Function discovery requires optional dependencies. Install @foundry/functions-typescript-* packages.");
+      return;
+    }
+    consola.consola.info(`Loading function IR`);
+    const functionsIr = await generateFunctionsIr(commandLineOpts.functionsRootDir, commandLineOpts.configPath, createEntityMappings(ontologyIr));
+    await fs3__namespace.writeFile(commandLineOpts.functionsOutput, JSON.stringify(functionsIr, null, 2));
+    return;
+  }
+  if (commandLineOpts.generateFunctionsOsdk !== void 0) {
+    const fullMetadata = generatorConverters_ontologyir.OntologyIrToFullMetadataConverter.getFullMetadataFromIr(ontologyIr.ontology);
+    if (commandLineOpts.pythonFunctionsDir) {
+      const effectivePythonRootDir = commandLineOpts.pythonRootProjectDir ?? path3__namespace.dirname(commandLineOpts.pythonFunctionsDir);
+      const queryTypes = await generatorConverters_ontologyir.OntologyIrToFullMetadataConverter.getOsdkQueryTypes(commandLineOpts.pythonBinary, void 0, void 0, commandLineOpts.pythonFunctionsDir, effectivePythonRootDir);
+      const functionNames = Object.keys(queryTypes);
+      if (functionNames.length > 0) {
+        fullMetadata.queryTypes = queryTypes;
+        consola.consola.info(`Discovered ${functionNames.length} Python function(s): ${functionNames.join(", ")}`);
+      } else {
+        consola.consola.info("No Python functions discovered.");
+      }
+    }
+    consola.consola.info(`Saving full ontology metadata to ${commandLineOpts.generateFunctionsOsdk}`);
+    await fs3__namespace.writeFile(path3__namespace.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 () => await import(input), outputDir, dependencyFile, generateCodeSnippets, snippetPackageName, codeSnippetDir, randomnessKey);
+  const q = await defineOntology(apiNamespace, async () => {
+    const jiti$1 = jiti.createJiti(undefined, {
+      moduleCache: true,
+      debug: false,
+      importMeta: ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)) })
+    });
+    await jiti$1.import(input);
+  }, outputDir, dependencyFile, generateCodeSnippets, snippetPackageName, codeSnippetDir, randomnessKey);
   return q;
 }
+async function fullMetadataToOsdk(workDir) {
+  const functionOsdkDir = path3__namespace.join(workDir, "generated");
+  await fs3__namespace.rm(functionOsdkDir, {
+    recursive: true,
+    force: true
+  });
+  await fs3__namespace.mkdir(functionOsdkDir, {
+    recursive: true
+  });
+  try {
+    await execa.execa("pnpm", ["exec", "osdk", "unstable", "typescript", "generate", "--outDir", functionOsdkDir, "--ontologyPath", path3__namespace.join(workDir, ".ontology.json"), "--beta", "true", "--packageType", "module", "--version", "dev"]);
+  } catch (error) {
+    await fs3__namespace.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;
+}
 var MAX_SEARCH_DEPTH = 5;
 function addDependency(namespaceNoDot, fileInPackage) {
   let dir = path3__namespace.dirname(fileInPackage);