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

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @osdk/maker
 
+## 0.16.0-beta.6
+
+### Minor Changes
+
+- 963626f: Add function discovery support (TypeScript and Python) and generate intermediate OSDK from CLI for use by function definitions
+- 972bda6: Support assumed markings for oac PSGs
+
+### Patch Changes
+
+- @osdk/api@2.8.0-beta.10
+- @osdk/generator-converters.ontologyir@2.8.0-beta.10
+
+## 0.16.0-beta.5
+
+### Minor Changes
+
+- 034081a: oac direct datasources
+
+### Patch Changes
+
+- @osdk/api@2.8.0-beta.7
+
 ## 0.16.0-beta.4
 
 ### Minor Changes

package/README.md

@@ -521,9 +521,12 @@ const object = defineObject({
             },
           ],
         },
-        additionalMandatoryMarkings: {
+        appliedMarkings: {
           "myCbacMarking": "CBAC",
         },
+        assumedMarkings: {
+          "myMandatoryMarking": "MANDATORY",
+        },
       },
     ],
   }],

package/build/browser/api/defineFunction.js

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { OntologyIrToFullMetadataConverter } from "@osdk/generator-converters.ontologyir";
+import { consola } from "consola";
+import * as path from "node:path";
+
+// Type definitions for optional function discovery dependencies
+
+// Lazy-loaded function discovery module
+let cachedFunctionDiscoverer = null;
+async function loadFunctionDiscoverer() {
+  if (cachedFunctionDiscoverer != null) {
+    return cachedFunctionDiscoverer;
+  }
+  try {
+    const module = await import(/* @vite-ignore */"@foundry/functions-typescript-osdk-discovery");
+    cachedFunctionDiscoverer = module.FunctionDiscoverer;
+    return cachedFunctionDiscoverer;
+  } catch (e) {
+    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];
+  });
+}
+export 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.join(rootDir, "tsconfig.json");
+  const program = OntologyIrToFullMetadataConverter.createProgram(tsConfigPath, rootDir);
+  const functionsDir = path.join(rootDir, "functions");
+  const fd = new functionsDiscoverer(program, rootDir, functionsDir, entityMappings);
+  const functions = fd.discover();
+  return {
+    functionsBlockDataV1: Object.fromEntries(extractFunctionEntries(functions.discoveredFunctions))
+  };
+}
+//# sourceMappingURL=defineFunction.js.map

package/build/browser/api/defineFunction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineFunction.js","names":["OntologyIrToFullMetadataConverter","consola","path","cachedFunctionDiscoverer","loadFunctionDiscoverer","module","FunctionDiscoverer","e","warn","Error","message","extractFunctionEntries","discoveredFunctions","map","fn","locator","type","typescriptOsdk","functionName","generateFunctionsIr","rootDir","configPath","entityMappings","functionsDiscoverer","tsConfigPath","join","program","createProgram","functionsDir","fd","functions","discover","functionsBlockDataV1","Object","fromEntries"],"sources":["defineFunction.ts"],"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\";\nimport type * as ts from \"typescript\";\n\nexport interface FunctionIrBlockData {\n  functionsBlockDataV1: Record<string, unknown>;\n}\n\n// Type definitions for optional function discovery dependencies\ntype IFunctionDiscoverer = new(\n  program: ts.Program,\n  entryPointPath: string,\n  fullFilePath: string,\n  entityMappings?: IEntityMetadataMapping,\n) => {\n  discover(): {\n    discoveredFunctions: IDiscoveredFunction[];\n    diagnostics?: unknown;\n  };\n};\n\ninterface IDiscoveredFunction {\n  locator:\n    | { type: \"typescriptOsdk\"; typescriptOsdk: { functionName: string } }\n    | { type: string };\n  [key: string]: unknown;\n}\n\nexport interface IEntityMetadataMapping {\n  ontologies: Record<\n    string,\n    {\n      objectTypes: Record<\n        string,\n        {\n          objectTypeId: string;\n          primaryKey: { propertyId: string };\n          propertyTypes: Record<string, { propertyId: string }>;\n          linkTypes: Record<string, unknown>;\n        }\n      >;\n      interfaceTypes: Record<string, unknown>;\n    }\n  >;\n}\n\n// Lazy-loaded function discovery module\nlet cachedFunctionDiscoverer: IFunctionDiscoverer | null = null;\n\nasync function loadFunctionDiscoverer(): Promise<IFunctionDiscoverer | null> {\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: unknown) {\n    consola.warn(\n      \"Failed to load @foundry/functions-typescript-osdk-discovery:\",\n      e instanceof Error ? e.message : e,\n    );\n    return null;\n  }\n}\n\nfunction extractFunctionEntries(\n  discoveredFunctions: IDiscoveredFunction[],\n): Array<[string, IDiscoveredFunction]> {\n  return discoveredFunctions.map((fn: IDiscoveredFunction) => {\n    if (fn.locator.type !== \"typescriptOsdk\") {\n      throw new Error(\n        `OAC functions must be TypeScript, got type: ${fn.locator.type}`,\n      );\n    }\n    const locator = fn.locator as {\n      typescriptOsdk: { functionName: string };\n    };\n    return [locator.typescriptOsdk.functionName, fn];\n  });\n}\n\nexport async function generateFunctionsIr(\n  rootDir: string,\n  configPath?: string,\n  entityMappings?: IEntityMetadataMapping,\n): Promise<FunctionIrBlockData> {\n  const functionsDiscoverer = await loadFunctionDiscoverer();\n  if (!functionsDiscoverer) {\n    throw new Error(\n      \"Function discovery requires @foundry/functions-typescript-osdk-discovery to be installed\",\n    );\n  }\n\n  const tsConfigPath = configPath ?? path.join(rootDir, \"tsconfig.json\");\n  const program = OntologyIrToFullMetadataConverter.createProgram(\n    tsConfigPath,\n    rootDir,\n  );\n  const functionsDir = path.join(rootDir, \"functions\");\n  const fd = new functionsDiscoverer(\n    program,\n    rootDir,\n    functionsDir,\n    entityMappings,\n  );\n  const functions = fd.discover();\n\n  return {\n    functionsBlockDataV1: Object.fromEntries(\n      extractFunctionEntries(functions.discoveredFunctions),\n    ),\n  };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,iCAAiC,QAAQ,uCAAuC;AACzF,SAASC,OAAO,QAAQ,SAAS;AACjC,OAAO,KAAKC,IAAI,MAAM,WAAW;;AAOjC;;AAsCA;AACA,IAAIC,wBAAoD,GAAG,IAAI;AAE/D,eAAeC,sBAAsBA,CAAA,EAAwC;EAC3E,IAAID,wBAAwB,IAAI,IAAI,EAAE;IACpC,OAAOA,wBAAwB;EACjC;EACA,IAAI;IAEF,MAAME,MAAM,GAAG,MAAM,MAAM,CAAC,kBADT,8CACsC,CAAC;IAC1DF,wBAAwB,GAAGE,MAAM,CAACC,kBAAkB;IACpD,OAAOH,wBAAwB;EACjC,CAAC,CAAC,OAAOI,CAAU,EAAE;IACnBN,OAAO,CAACO,IAAI,CACV,8DAA8D,EAC9DD,CAAC,YAAYE,KAAK,GAAGF,CAAC,CAACG,OAAO,GAAGH,CACnC,CAAC;IACD,OAAO,IAAI;EACb;AACF;AAEA,SAASI,sBAAsBA,CAC7BC,mBAA0C,EACJ;EACtC,OAAOA,mBAAmB,CAACC,GAAG,CAAEC,EAAuB,IAAK;IAC1D,IAAIA,EAAE,CAACC,OAAO,CAACC,IAAI,KAAK,gBAAgB,EAAE;MACxC,MAAM,IAAIP,KAAK,CACb,+CAA+CK,EAAE,CAACC,OAAO,CAACC,IAAI,EAChE,CAAC;IACH;IACA,MAAMD,OAAO,GAAGD,EAAE,CAACC,OAElB;IACD,OAAO,CAACA,OAAO,CAACE,cAAc,CAACC,YAAY,EAAEJ,EAAE,CAAC;EAClD,CAAC,CAAC;AACJ;AAEA,OAAO,eAAeK,mBAAmBA,CACvCC,OAAe,EACfC,UAAmB,EACnBC,cAAuC,EACT;EAC9B,MAAMC,mBAAmB,GAAG,MAAMnB,sBAAsB,CAAC,CAAC;EAC1D,IAAI,CAACmB,mBAAmB,EAAE;IACxB,MAAM,IAAId,KAAK,CACb,0FACF,CAAC;EACH;EAEA,MAAMe,YAAY,GAAGH,UAAU,IAAInB,IAAI,CAACuB,IAAI,CAACL,OAAO,EAAE,eAAe,CAAC;EACtE,MAAMM,OAAO,GAAG1B,iCAAiC,CAAC2B,aAAa,CAC7DH,YAAY,EACZJ,OACF,CAAC;EACD,MAAMQ,YAAY,GAAG1B,IAAI,CAACuB,IAAI,CAACL,OAAO,EAAE,WAAW,CAAC;EACpD,MAAMS,EAAE,GAAG,IAAIN,mBAAmB,CAChCG,OAAO,EACPN,OAAO,EACPQ,YAAY,EACZN,cACF,CAAC;EACD,MAAMQ,SAAS,GAAGD,EAAE,CAACE,QAAQ,CAAC,CAAC;EAE/B,OAAO;IACLC,oBAAoB,EAAEC,MAAM,CAACC,WAAW,CACtCvB,sBAAsB,CAACmB,SAAS,CAAClB,mBAAmB,CACtD;EACF,CAAC;AACH","ignoreList":[]}

package/build/browser/api/object/ObjectTypeDatasourceDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectTypeDatasourceDefinition.js","names":[],"sources":["ObjectTypeDatasourceDefinition.ts"],"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 type {\n  DerivedPropertyLinkTypeSide,\n  MarkingType,\n  ObjectTypeFieldApiName,\n} from \"@osdk/client.unstable\";\nimport type { LinkType } from \"../links/LinkType.js\";\nimport type { SecurityConditionDefinition } from \"./SecurityCondition.js\";\n\nexport type ObjectTypeDatasourceDefinition =\n  | ObjectTypeDatasourceDefinition_stream\n  | ObjectTypeDatasourceDefinition_dataset\n  | ObjectTypeDatasourceDefinition_restrictedView\n  | ObjectTypeDatasourceDefinition_derived;\n\nexport interface ObjectTypeDatasourceDefinition_dataset {\n  type: \"dataset\";\n  objectSecurityPolicy?: ObjectSecurityPolicy;\n  propertySecurityGroups?: Array<PropertySecurityGroup>;\n}\n\nexport interface ObjectSecurityPolicy {\n  name: string;\n  granularPolicy?: SecurityConditionDefinition;\n  additionalMandatoryMarkings?: Record<string, MarkingType>;\n}\n\nexport interface PropertySecurityGroup {\n  name: string;\n  properties: Array<string>;\n  granularPolicy?: SecurityConditionDefinition;\n  additionalMandatoryMarkings?: Record<string, MarkingType>;\n}\n\nexport interface ObjectTypeDatasourceDefinition_stream {\n  type: \"stream\";\n  // Retention period must be in ISO 8601 duration format\n  retentionPeriod?: string;\n}\n\nexport interface ObjectTypeDatasourceDefinition_restrictedView {\n  type: \"restrictedView\";\n}\n\nexport interface ObjectTypeDatasourceDefinition_derived {\n  type: \"derived\";\n  linkDefinition: Array<DerivedPropertiesLinkDefinition>;\n  // property->property is linkedProperties, property->aggregation is aggregatedProperties\n  propertyMapping:\n    | Record<ObjectTypeFieldApiName, ObjectTypeFieldApiName>\n    | Record<ObjectTypeFieldApiName, DerivedPropertyAggregation>;\n}\nexport interface DerivedPropertiesLinkDefinition {\n  linkType: LinkType;\n  side?: DerivedPropertyLinkTypeSide;\n}\n\n// if the property is null on the object, it is ignored in aggregations\nexport type DerivedPropertyAggregation =\n  | { type: \"count\" } // total count of objects\n  | { type: \"avg\"; property: ObjectTypeFieldApiName }\n  | { type: \"sum\"; property: ObjectTypeFieldApiName }\n  | { type: \"min\"; property: ObjectTypeFieldApiName }\n  | { type: \"max\"; property: ObjectTypeFieldApiName }\n  | { type: \"approximateCardinality\"; property: ObjectTypeFieldApiName }\n  | { type: \"exactCardinality\"; property: ObjectTypeFieldApiName }\n  | { type: \"collectList\"; property: ObjectTypeFieldApiName; limit: number } // max limit is 100\n  | { type: \"collectSet\"; property: ObjectTypeFieldApiName; limit: number }; // max limit is 100\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"ObjectTypeDatasourceDefinition.js","names":[],"sources":["ObjectTypeDatasourceDefinition.ts"],"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 type {\n  DerivedPropertyLinkTypeSide,\n  MarkingType,\n  ObjectTypeFieldApiName,\n} from \"@osdk/client.unstable\";\nimport type { LinkType } from \"../links/LinkType.js\";\nimport type { SecurityConditionDefinition } from \"./SecurityCondition.js\";\n\nexport type ObjectTypeDatasourceDefinition =\n  | ObjectTypeDatasourceDefinition_stream\n  | ObjectTypeDatasourceDefinition_dataset\n  | ObjectTypeDatasourceDefinition_restrictedView\n  | ObjectTypeDatasourceDefinition_derived\n  | ObjectTypeDatasourceDefinition_direct;\n\nexport interface ObjectTypeDatasourceDefinition_dataset {\n  type: \"dataset\";\n  objectSecurityPolicy?: ObjectSecurityPolicy;\n  propertySecurityGroups?: Array<PropertySecurityGroup>;\n}\n\nexport interface ObjectSecurityPolicy {\n  name: string;\n  granularPolicy?: SecurityConditionDefinition;\n  appliedMarkings?: Record<string, MarkingType>;\n  assumedMarkings?: Record<string, MarkingType>;\n}\n\nexport interface PropertySecurityGroup {\n  name: string;\n  properties: Array<string>;\n  granularPolicy?: SecurityConditionDefinition;\n  appliedMarkings?: Record<string, MarkingType>;\n  assumedMarkings?: Record<string, MarkingType>;\n}\n\nexport interface ObjectTypeDatasourceDefinition_stream {\n  type: \"stream\";\n  // Retention period must be in ISO 8601 duration format\n  retentionPeriod?: string;\n}\n\nexport interface ObjectTypeDatasourceDefinition_restrictedView {\n  type: \"restrictedView\";\n}\n\nexport interface ObjectTypeDatasourceDefinition_derived {\n  type: \"derived\";\n  linkDefinition: Array<DerivedPropertiesLinkDefinition>;\n  // property->property is linkedProperties, property->aggregation is aggregatedProperties\n  propertyMapping:\n    | Record<ObjectTypeFieldApiName, ObjectTypeFieldApiName>\n    | Record<ObjectTypeFieldApiName, DerivedPropertyAggregation>;\n}\nexport interface DerivedPropertiesLinkDefinition {\n  linkType: LinkType;\n  side?: DerivedPropertyLinkTypeSide;\n}\n\n// if the property is null on the object, it is ignored in aggregations\nexport type DerivedPropertyAggregation =\n  | { type: \"count\" } // total count of objects\n  | { type: \"avg\"; property: ObjectTypeFieldApiName }\n  | { type: \"sum\"; property: ObjectTypeFieldApiName }\n  | { type: \"min\"; property: ObjectTypeFieldApiName }\n  | { type: \"max\"; property: ObjectTypeFieldApiName }\n  | { type: \"approximateCardinality\"; property: ObjectTypeFieldApiName }\n  | { type: \"exactCardinality\"; property: ObjectTypeFieldApiName }\n  | { type: \"collectList\"; property: ObjectTypeFieldApiName; limit: number } // max limit is 100\n  | { type: \"collectSet\"; property: ObjectTypeFieldApiName; limit: number }; // max limit is 100\n\nexport interface ObjectTypeDatasourceDefinition_direct {\n  type: \"direct\";\n  objectSecurityPolicy?: ObjectSecurityPolicy;\n  propertySecurityGroups?: Array<PropertySecurityGroup>;\n}\n"],"mappings":"","ignoreList":[]}

package/build/browser/api/test/objects.test.js

@@ -3180,6 +3180,7 @@ describe("Object Types", () => {
                                 "viewPolicy": {
                                   "additionalMandatory": {
                                     "assumedMarkings": [],
+                                    "assumedMarkingsV2": {},
                                     "markings": {},
                                   },
                                   "granularPolicyCondition": {
@@ -3207,6 +3208,7 @@ describe("Object Types", () => {
                                 "viewPolicy": {
                                   "additionalMandatory": {
                                     "assumedMarkings": [],
+                                    "assumedMarkingsV2": {},
                                     "markings": {},
                                   },
                                   "granularPolicyCondition": {
@@ -3445,7 +3447,7 @@ describe("Object Types", () => {
             type: "group",
             name: "objectLevelGroup"
           },
-          additionalMandatoryMarkings: {
+          appliedMarkings: {
             "objectLevelMarking": "CBAC"
           }
         },
@@ -3462,8 +3464,11 @@ describe("Object Types", () => {
               property: "mandatory"
             }]
           },
-          additionalMandatoryMarkings: {
+          appliedMarkings: {
             "propertyLevelMarking": "MANDATORY"
+          },
+          assumedMarkings: {
+            "propertyLevelAssumedMarking": "MANDATORY"
           }
         }]
       }]
@@ -3540,6 +3545,7 @@ describe("Object Types", () => {
                                 "viewPolicy": {
                                   "additionalMandatory": {
                                     "assumedMarkings": [],
+                                    "assumedMarkingsV2": {},
                                     "markings": {
                                       "objectLevelMarking": "CBAC",
                                     },
@@ -3585,6 +3591,9 @@ describe("Object Types", () => {
                                 "viewPolicy": {
                                   "additionalMandatory": {
                                     "assumedMarkings": [],
+                                    "assumedMarkingsV2": {
+                                      "propertyLevelAssumedMarking": "MANDATORY",
+                                    },
                                     "markings": {
                                       "propertyLevelMarking": "MANDATORY",
                                     },