@osdk/maker 0.16.0-beta.8 → 0.16.0

package/build/cjs/index.cjs

@@ -2,13 +2,11 @@
 
 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');
+var url = require('url');
+var invariant2 = require('tiny-invariant');
 var yargs = require('yargs');
 var helpers = require('yargs/helpers');
 var fs2 = require('fs');
@@ -16,7 +14,6 @@ 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) {
@@ -39,7 +36,7 @@ function _interopNamespace(e) {
 
 var fs3__namespace = /*#__PURE__*/_interopNamespace(fs3);
 var path3__namespace = /*#__PURE__*/_interopNamespace(path3);
-var invariant9__default = /*#__PURE__*/_interopDefault(invariant9);
+var invariant2__default = /*#__PURE__*/_interopDefault(invariant2);
 var yargs__default = /*#__PURE__*/_interopDefault(yargs);
 var fs2__namespace = /*#__PURE__*/_interopNamespace(fs2);
 var Mustache__default = /*#__PURE__*/_interopDefault(Mustache);
@@ -139,6 +136,11 @@ function convertLink(linkType) {
       apiName: toManyObjectApiName,
       object: toManyObject
     } = getObject(linkType.toMany.object);
+    const columnA = manyObject.primaryKeyPropertyApiName;
+    const columnB = toManyObject.primaryKeyPropertyApiName;
+    const hasCollision = columnA === columnB;
+    const resolvedColumnA = hasCollision ? `${columnA}_from` : columnA;
+    const resolvedColumnB = hasCollision ? `${columnB}_to` : columnB;
     definition = {
       type: "manyToMany",
       manyToMany: {
@@ -181,14 +183,14 @@ function convertLink(linkType) {
               apiName: manyObject.primaryKeyPropertyApiName,
               object: manyObjectApiName
             },
-            column: manyObject.primaryKeyPropertyApiName
+            column: resolvedColumnA
           }],
           objectTypeBPrimaryKeyMapping: [{
             property: {
               apiName: toManyObject.primaryKeyPropertyApiName,
               object: toManyObjectApiName
             },
-            column: toManyObject.primaryKeyPropertyApiName
+            column: resolvedColumnB
           }]
         }
       },
@@ -221,10 +223,10 @@ function validateLink(linkDefinition) {
       object: toManyObject
     } = getObject(linkDefinition.toMany.object);
     const foreignKey = toManyObject.properties?.find((p) => p.apiName === linkDefinition.manyForeignKeyProperty);
-    !(foreignKey !== void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Foreign key ${linkDefinition.manyForeignKeyProperty} on link ${linkDefinition.apiName} does not exist on object ${toManyObjectApiName}`) : invariant9__default.default(false) : void 0;
-    !/([a-z][a-z0-9\\-]*)/.test(linkDefinition.apiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Top level link api names are expected to match the regex pattern ([a-z][a-z0-9\\-]*) ${linkDefinition.apiName} does not match`) : invariant9__default.default(false) : void 0;
+    !(foreignKey !== void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Foreign key ${linkDefinition.manyForeignKeyProperty} on link ${linkDefinition.apiName} does not exist on object ${toManyObjectApiName}`) : invariant2__default.default(false) : void 0;
+    !/([a-z][a-z0-9\\-]*)/.test(linkDefinition.apiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Top level link api names are expected to match the regex pattern ([a-z][a-z0-9\\-]*) ${linkDefinition.apiName} does not match`) : invariant2__default.default(false) : void 0;
     const typesMatch = foreignKey.type === oneObject.properties?.find((p) => p.apiName === oneObject.primaryKeyPropertyApiName)?.type;
-    !typesMatch ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Link ${linkDefinition.apiName} has type mismatch between the one side's primary key and the foreign key on the many side`) : invariant9__default.default(false) : void 0;
+    !typesMatch ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Link ${linkDefinition.apiName} has type mismatch between the one side's primary key and the foreign key on the many side`) : invariant2__default.default(false) : void 0;
   }
   if ("intermediaryObjectType" in linkDefinition) {
     const {
@@ -239,18 +241,18 @@ function validateLink(linkDefinition) {
       apiName: manyIntermediaryOneObjectApiName} = getObject(linkDefinition.many.linkToIntermediary.one.object);
     const {
       apiName: manyIntermediaryToManyObjectApiName} = getObject(linkDefinition.many.linkToIntermediary.toMany.object);
-    !("one" in linkDefinition.many.linkToIntermediary && manyIntermediaryOneObjectApiName === manyObject.apiName && manyIntermediaryToManyObjectApiName === intermediaryObjectTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `LinkTypeA ${linkDefinition.many.linkToIntermediary.apiName} must be a many to one link from intermediary object ${intermediaryObjectTypeApiName} to objectA ${manyObjectApiName}`) : invariant9__default.default(false) : void 0;
+    !("one" in linkDefinition.many.linkToIntermediary && manyIntermediaryOneObjectApiName === manyObject.apiName && manyIntermediaryToManyObjectApiName === intermediaryObjectTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `LinkTypeA ${linkDefinition.many.linkToIntermediary.apiName} must be a many to one link from intermediary object ${intermediaryObjectTypeApiName} to objectA ${manyObjectApiName}`) : invariant2__default.default(false) : void 0;
     const {
       apiName: toManyIntermediaryOneObjectApiName} = getObject(linkDefinition.toMany.linkToIntermediary.one.object);
     const {
       apiName: toManyIntermediaryToManyObjectApiName} = getObject(linkDefinition.toMany.linkToIntermediary.toMany.object);
-    !("one" in linkDefinition.toMany.linkToIntermediary && toManyIntermediaryOneObjectApiName === toManyObjectApiName && toManyIntermediaryToManyObjectApiName === intermediaryObjectTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `LinkTypeB ${linkDefinition.toMany.linkToIntermediary.apiName} must be a many to one link from intermediary object ${intermediaryObjectTypeApiName} to objectB ${toManyObjectApiName}`) : invariant9__default.default(false) : void 0;
+    !("one" in linkDefinition.toMany.linkToIntermediary && toManyIntermediaryOneObjectApiName === toManyObjectApiName && toManyIntermediaryToManyObjectApiName === intermediaryObjectTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `LinkTypeB ${linkDefinition.toMany.linkToIntermediary.apiName} must be a many to one link from intermediary object ${intermediaryObjectTypeApiName} to objectB ${toManyObjectApiName}`) : invariant2__default.default(false) : void 0;
   }
 }
 function getObject(object) {
   const objectApiName = typeof object === "string" ? object : object.apiName;
-  const fullObject = ontologyDefinition[OntologyEntityTypeEnum.OBJECT_TYPE][objectApiName];
-  !(fullObject !== void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Object ${objectApiName} is not defined`) : invariant9__default.default(false) : void 0;
+  const fullObject = ontologyDefinition[OntologyEntityTypeEnum.OBJECT_TYPE][objectApiName] ?? importedTypes[OntologyEntityTypeEnum.OBJECT_TYPE][objectApiName];
+  !(fullObject !== void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Object ${objectApiName} is not defined`) : invariant2__default.default(false) : void 0;
   return {
     apiName: objectApiName,
     object: fullObject
@@ -286,6 +288,17 @@ function convertLinkStatus(status) {
   }
 }
 
+// src/util/ApiNameValidator.ts
+var RESERVED_KEYWORDS = /* @__PURE__ */ new Set(["ontology", "object", "property", "link", "relation", "rid", "primarykey", "typeid", "ontologyobject"]);
+var OBJECT_API_NAME_PATTERN = /^[a-zA-Z][a-zA-Z0-9]{0,99}$/;
+var API_NAME_PATTERN = /^[a-zA-Z][a-zA-Z0-9_]{0,99}$/;
+function isValidApiName(apiName) {
+  return API_NAME_PATTERN.test(apiName) && !RESERVED_KEYWORDS.has(apiName.toLowerCase());
+}
+function isValidObjectApiName(apiName) {
+  return OBJECT_API_NAME_PATTERN.test(apiName) && !RESERVED_KEYWORDS.has(apiName.toLowerCase());
+}
+
 // src/api/cloneDefinition.ts
 function cloneDefinition(input) {
   const clone = {
@@ -346,7 +359,6 @@ function isStruct(type) {
 // src/api/defineObject.ts
 var ISO_8601_DURATION = /^P(?!$)(?:(?:((?:\d+Y)|(?:\d+(?:\.|,)\d+Y$))?((?:\d+M)|(?:\d+(?:\.|,)\d+M$))?((?:\d+D)|(?:\d+(?:\.|,)\d+D$))?(T((?:\d+H)|(?:\d+(?:\.|,)\d+H$))?((?:\d+M)|(?:\d+(?:\.|,)\d+M$))?((?:\d+S)|(?:\d+(?:\.|,)\d+S$))?)?)|(?:\d+(?:(?:\.|,)\d+)?W))$/;
 var ISO_8601_DATETIME = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})?)?$/;
-var API_NAME_PATTERN = /^([a-zA-Z][a-zA-Z0-9\\-]*)$/;
 function defineObject(objectDefInput) {
   const objectDef = cloneDefinition(objectDefInput);
   const apiName = namespace + objectDef.apiName;
@@ -354,16 +366,23 @@ function defineObject(objectDefInput) {
   if (ontologyDefinition[OntologyEntityTypeEnum.OBJECT_TYPE][apiName] !== void 0) {
     throw new Error(`Object type with apiName ${objectDef.apiName} is already defined`);
   }
-  !API_NAME_PATTERN.test(objectDef.apiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Invalid API name ${objectDef.apiName}. API names must match the regex ${API_NAME_PATTERN}.`) : invariant9__default.default(false) : void 0;
-  !propertyApiNames.includes(objectDef.titlePropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Title property ${objectDef.titlePropertyApiName} is not defined on object ${objectDef.apiName}`) : invariant9__default.default(false) : void 0;
-  !propertyApiNames.includes(objectDef.primaryKeyPropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} does not exist on object ${objectDef.apiName}`) : invariant9__default.default(false) : void 0;
-  !!objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.editOnly ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} on object ${objectDef.apiName} cannot be edit-only`) : invariant9__default.default(false) : void 0;
+  !isValidObjectApiName(objectDef.apiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Invalid API name ${objectDef.apiName}. API names must match the regex ${OBJECT_API_NAME_PATTERN}.`) : invariant2__default.default(false) : void 0;
+  propertyApiNames.forEach((apiName2) => {
+    !isValidApiName(apiName2) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Invalid API name ${apiName2} for property on object ${objectDef.apiName}. API names must match the regex ${API_NAME_PATTERN}.`) : invariant2__default.default(false) : void 0;
+  });
+  !propertyApiNames.includes(objectDef.titlePropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Title property ${objectDef.titlePropertyApiName} is not defined on object ${objectDef.apiName}`) : invariant2__default.default(false) : void 0;
+  !propertyApiNames.includes(objectDef.primaryKeyPropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} does not exist on object ${objectDef.apiName}`) : invariant2__default.default(false) : void 0;
+  !!objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.editOnly ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} on object ${objectDef.apiName} cannot be edit-only`) : invariant2__default.default(false) : void 0;
+  if (objectDef.includeEmptyBackingDatasource && objectDef.datasources) {
+    const nonDatasetDatasources = objectDef.datasources.filter((ds) => ds.type !== "dataset");
+    !(nonDatasetDatasources.length === 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Object type "${objectDef.apiName}" has non-dataset datasources (${nonDatasetDatasources.map((ds) => ds.type).join(", ")}) and cannot use includeEmptyBackingDatasource. Empty backing datasources are only supported for object types with dataset datasources.`) : invariant2__default.default(false) : void 0;
+  }
   const retentionPeriods = (objectDef.datasources ?? []).filter((ds) => ds.type === "stream").map((ds) => ds.retentionPeriod);
   retentionPeriods.forEach((retentionPeriod) => {
-    !(retentionPeriod === void 0 || ISO_8601_DURATION.test(retentionPeriod)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Retention period "${retentionPeriod}" on object "${objectDef.apiName}" is not a valid ISO 8601 duration string`) : invariant9__default.default(false) : void 0;
+    !(retentionPeriod === void 0 || ISO_8601_DURATION.test(retentionPeriod)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Retention period "${retentionPeriod}" on object "${objectDef.apiName}" is not a valid ISO 8601 duration string`) : invariant2__default.default(false) : void 0;
   });
   const baseDatasources = (objectDef.datasources ?? []).filter((ds) => ["dataset", "stream", "restrictedView"].includes(ds.type));
-  !(baseDatasources.length <= 1) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Object ${objectDef.apiName} has more than one base datasource (got: [${baseDatasources.map((ds) => ds.type).join(", ")}])`) : invariant9__default.default(false) : void 0;
+  !(baseDatasources.length <= 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Object ${objectDef.apiName} has more than one base datasource (got: [${baseDatasources.map((ds) => ds.type).join(", ")}])`) : invariant2__default.default(false) : void 0;
   const derivedDatasources = (objectDef.datasources ?? []).filter((ds) => ds.type === "derived");
   if (derivedDatasources.length > 0) {
     derivedDatasources.forEach((ds) => validateDerivedDatasource(objectDef, ds));
@@ -379,15 +398,15 @@ function defineObject(objectDefInput) {
         }
       }
     });
-    !(mismatchedProperties.length === 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Object "${objectDef.apiName}" has "${objectStatusType}" status, but the following properties have a different status: ${mismatchedProperties.join(", ")}`) : invariant9__default.default(false) : void 0;
+    !(mismatchedProperties.length === 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Object "${objectDef.apiName}" has "${objectStatusType}" status, but the following properties have a different status: ${mismatchedProperties.join(", ")}`) : invariant2__default.default(false) : void 0;
   }
   if (objectDef.status && typeof objectDef.status === "object" && objectDef.status.type === "deprecated") {
     const deadline = objectDef.status.deadline;
-    !(deadline !== void 0 && ISO_8601_DATETIME.test(deadline)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Deprecated status deadline "${deadline}" on object "${objectDef.apiName}" is not a valid ISO 8601 datetime string`) : invariant9__default.default(false) : void 0;
+    !(deadline !== void 0 && ISO_8601_DATETIME.test(deadline)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Deprecated status deadline "${deadline}" on object "${objectDef.apiName}" is not a valid ISO 8601 datetime string`) : invariant2__default.default(false) : void 0;
   }
   const titleProp = objectDef.properties?.[objectDef.titlePropertyApiName]?.type;
-  !(!isExotic(titleProp) || isStruct(titleProp) && titleProp.mainValue && !isExotic(titleProp.mainValue.type)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Title property ${objectDef.titlePropertyApiName} must be a primitive type`) : invariant9__default.default(false) : void 0;
-  !!isExotic(objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.type) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} can only be primitive types`) : invariant9__default.default(false) : void 0;
+  !(!isExotic(titleProp) || isStruct(titleProp) && titleProp.mainValue && !isExotic(titleProp.mainValue.type)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Title property ${objectDef.titlePropertyApiName} must be a primitive type`) : invariant2__default.default(false) : void 0;
+  !!isExotic(objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.type) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} can only be primitive types`) : invariant2__default.default(false) : void 0;
   objectDef.implementsInterfaces?.forEach((interfaceImpl) => {
     const allInterfaceProperties = getFlattenedInterfaceProperties(interfaceImpl.implements);
     const nonExistentInterfaceProperties = interfaceImpl.propertyMapping.map((val) => val.interfaceProperty).filter((interfaceProperty) => allInterfaceProperties[addNamespaceIfNone(interfaceProperty)] === void 0 && allInterfaceProperties[withoutNamespace(interfaceProperty)] === void 0).map((interfaceProp) => ({
@@ -407,7 +426,7 @@ function defineObject(objectDefInput) {
     };
     const validations = Object.entries(getFlattenedInterfaceProperties(interfaceImpl.implements)).map(validateProperty);
     const allFailedValidations = validations.concat(nonExistentInterfaceProperties).filter((val) => val.type === "invalid");
-    !(allFailedValidations.length === 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "\n" + allFailedValidations.map(formatValidationErrors).join("\n")) : invariant9__default.default(false) : void 0;
+    !(allFailedValidations.length === 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "\n" + allFailedValidations.map(formatValidationErrors).join("\n")) : invariant2__default.default(false) : void 0;
   });
   const flattenedProperties = Object.entries(objectDef.properties ?? {}).map(([apiName2, property]) => convertUserObjectPropertyType(apiName2, property));
   const finalObject = {
@@ -459,13 +478,13 @@ function convertUserObjectPropertyType(apiName, property) {
   };
 }
 function validateDerivedDatasource(objectDef, datasource) {
-  !(datasource.linkDefinition.length > 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Derived datasource for object '${objectDef.apiName}' must have at least one link.`) : invariant9__default.default(false) : void 0;
+  !(datasource.linkDefinition.length > 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Derived datasource for object '${objectDef.apiName}' must have at least one link.`) : invariant2__default.default(false) : void 0;
   datasource.linkDefinition.forEach((link) => {
     const linkApiName = link.linkType.apiName;
-    !(ontologyDefinition[OntologyEntityTypeEnum.LINK_TYPE][linkApiName] !== void 0 || importedTypes[OntologyEntityTypeEnum.LINK_TYPE][linkApiName] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Link type '${linkApiName}' used in derived datasource for object '${objectDef.apiName}' is not defined.`) : invariant9__default.default(false) : void 0;
+    !(ontologyDefinition[OntologyEntityTypeEnum.LINK_TYPE][linkApiName] !== void 0 || importedTypes[OntologyEntityTypeEnum.LINK_TYPE][linkApiName] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Link type '${linkApiName}' used in derived datasource for object '${objectDef.apiName}' is not defined.`) : invariant2__default.default(false) : void 0;
   });
   Object.keys(datasource.propertyMapping).forEach((prop) => {
-    !(objectDef.properties?.[prop] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property '${prop}' used in derived datasource for object '${objectDef.apiName}' is not defined.`) : invariant9__default.default(false) : void 0;
+    !(objectDef.properties?.[prop] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property '${prop}' used in derived datasource for object '${objectDef.apiName}' is not defined.`) : invariant2__default.default(false) : void 0;
   });
   const isLinkedProperties = typeof Object.values(datasource.propertyMapping)[0] === "string";
   if (isLinkedProperties) {
@@ -500,7 +519,7 @@ function validateLinkedProperties(datasource, objectDef) {
     hasProperty
   } = getPropertiesForValidation(targetObject, objectDef);
   foreignProperties.forEach((prop) => {
-    !hasProperty(prop) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property '${prop}' on object '${apiName}' is not defined`) : invariant9__default.default(false) : void 0;
+    !hasProperty(prop) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property '${prop}' on object '${apiName}' is not defined`) : invariant2__default.default(false) : void 0;
   });
 }
 function validateAggregations(datasource, objectDef) {
@@ -510,18 +529,18 @@ function validateAggregations(datasource, objectDef) {
     switch (agg.type) {
       case "collectList":
       case "collectSet":
-        !isCollectible(property) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not collectible`) : invariant9__default.default(false) : void 0;
-        !(agg.limit <= 100) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `[Error] Limit for collection '${propName}' on object '${objectDef.apiName}' is greater than 100`) : invariant9__default.default(false) : void 0;
+        !isCollectible(property) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not collectible`) : invariant2__default.default(false) : void 0;
+        !(agg.limit <= 100) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `[Error] Limit for collection '${propName}' on object '${objectDef.apiName}' is greater than 100`) : invariant2__default.default(false) : void 0;
         break;
       case "avg":
       case "sum":
-        !isNumeric(property.type) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not numeric`) : invariant9__default.default(false) : void 0;
+        !isNumeric(property.type) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not numeric`) : invariant2__default.default(false) : void 0;
         break;
       case "min":
       case "max":
       case "approximateCardinality":
       case "exactCardinality":
-        !isPrimitive(property.type) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not primitive`) : invariant9__default.default(false) : void 0;
+        !isPrimitive(property.type) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not primitive`) : invariant2__default.default(false) : void 0;
         break;
     }
     if (agg.type !== "count") {
@@ -531,7 +550,7 @@ function validateAggregations(datasource, objectDef) {
         apiName,
         hasProperty
       } = getPropertiesForValidation(targetObject, objectDef);
-      !hasProperty(foreignProperty) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property '${foreignProperty}' on object '${apiName}' is not defined`) : invariant9__default.default(false) : void 0;
+      !hasProperty(foreignProperty) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property '${foreignProperty}' on object '${apiName}' is not defined`) : invariant2__default.default(false) : void 0;
     }
   });
 }
@@ -640,7 +659,7 @@ function convertConditionDefinition(condition, actionParameters) {
         }
       };
     case "parameter":
-      !actionParameters?.some((param) => param.id === condition.parameterId) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Action parameter condition references unknown parameter ${condition.parameterId}`) : invariant9__default.default(false) : void 0;
+      !actionParameters?.some((param) => param.id === condition.parameterId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Action parameter condition references unknown parameter ${condition.parameterId}`) : invariant2__default.default(false) : void 0;
       return {
         type: "comparison",
         comparison: {
@@ -865,7 +884,7 @@ function convertNullabilityToDataConstraint(prop) {
         }
       };
     }
-    !prop.nullability?.noNulls ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "Marking property type has noNulls set to false, marking properties must not be nullable") : invariant9__default.default(false) : void 0;
+    !prop.nullability?.noNulls ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "Marking property type has noNulls set to false, marking properties must not be nullable") : invariant2__default.default(false) : void 0;
     return {
       propertyTypeConstraints: [],
       nullability: void 0,
@@ -881,7 +900,7 @@ function convertNullabilityToDataConstraint(prop) {
 function convertReducers(type, apiName, reducers, sharedPropertyType) {
   reducers?.forEach((reducer) => {
     if (reducer.structField) {
-      !(isStruct(type) && Object.keys(type.structDefinition).includes(reducer.structField)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Reducer structField ${reducer.structField} does not exist in struct definition`) : invariant9__default.default(false) : void 0;
+      !(isStruct(type) && Object.keys(type.structDefinition).includes(reducer.structField)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Reducer structField ${reducer.structField} does not exist in struct definition`) : invariant2__default.default(false) : void 0;
     }
   });
   if (sharedPropertyType) {
@@ -1314,7 +1333,8 @@ function convertInterface(interfaceType) {
     extendsInterfaces: interfaceType.extendsInterfaces.map((i) => i.apiName),
     // these are omitted from our internal types but we need to re-add them for the final json
     properties: [],
-    propertiesV3: Object.fromEntries(Object.entries(interfaceType.propertiesV3).map(([apiName, prop]) => convertInterfaceProperty(prop, apiName)))
+    propertiesV3: Object.fromEntries(Object.entries(interfaceType.propertiesV3).map(([apiName, prop]) => convertInterfaceProperty(prop, apiName))),
+    extendsInterfacesMetadata: interfaceType.extendsInterfaces.map((i) => convertInterface(i))
   };
 }
 function convertDatasourceDefinition(objectType, properties) {
@@ -1423,9 +1443,9 @@ function convertPropertySecurityGroups(ds, properties, primaryKeyPropertyApiName
   const usedProperties = /* @__PURE__ */ new Set();
   ds.propertySecurityGroups?.forEach((psg) => {
     psg.properties.forEach((propertyName) => {
-      !validPropertyNames.has(propertyName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property "${propertyName}" in property security group ${psg.name} does not exist in the properties list`) : invariant9__default.default(false) : void 0;
-      !!usedProperties.has(propertyName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property "${propertyName}" is used in multiple property security groups`) : invariant9__default.default(false) : void 0;
-      !(propertyName !== primaryKeyPropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property "${propertyName}" in property security group ${psg.name} cannot be the primary key`) : invariant9__default.default(false) : void 0;
+      !validPropertyNames.has(propertyName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property "${propertyName}" in property security group ${psg.name} does not exist in the properties list`) : invariant2__default.default(false) : void 0;
+      !!usedProperties.has(propertyName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property "${propertyName}" is used in multiple property security groups`) : invariant2__default.default(false) : void 0;
+      !(propertyName !== primaryKeyPropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property "${propertyName}" in property security group ${psg.name} cannot be the primary key`) : invariant2__default.default(false) : void 0;
       usedProperties.add(propertyName);
     });
   });
@@ -1703,7 +1723,7 @@ function convertValueTypeDataConstraints(dataConstraints) {
 // src/conversion/toMarketplace/convertObjectPropertyType.ts
 function convertObjectPropertyType(property) {
   const apiName = namespace + property.apiName;
-  !(!shouldNotHaveRenderHints(property.type) || !hasRenderHints(property.typeClasses)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property type ${apiName} of type '${getPropertyTypeName(property.type)}' should not have render hints`) : invariant9__default.default(false) : void 0;
+  !(!shouldNotHaveRenderHints(property.type) || !hasRenderHints(property.typeClasses)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property type ${apiName} of type '${getPropertyTypeName(property.type)}' should not have render hints`) : invariant2__default.default(false) : void 0;
   const output = {
     apiName: property.apiName,
     sharedPropertyTypeApiName: property.sharedPropertyType?.apiName,
@@ -2657,21 +2677,10 @@ function getNamespace() {
 }
 
 // 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.8").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs__default.default(helpers.hideBin(args)).version("0.16.0").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -2733,57 +2742,21 @@ async function main(args = process.argv) {
     },
     randomnessKey: {
       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
+      type: "string"
     }
   }).parseAsync();
   let apiNamespace = "";
   if (commandLineOpts.apiNamespace.length !== 0) {
     apiNamespace = commandLineOpts.apiNamespace.slice(-1) !== "." ? commandLineOpts.apiNamespace + "." : commandLineOpts.apiNamespace;
-    !(apiNamespace.length < 1024) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "API namespace is too long.") : invariant9__default.default(false) : void 0;
-    !apiNamespaceRegex.test(apiNamespace) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "API namespace is invalid! It is expected to conform to ^[a-z0-9-]+(.[a-z0-9-]+)*.$") : invariant9__default.default(false) : void 0;
+    !(apiNamespace.length < 1024) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "API namespace is too long.") : invariant2__default.default(false) : void 0;
+    !apiNamespaceRegex.test(apiNamespace) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "API namespace is invalid! It is expected to conform to ^[a-z0-9-]+(.[a-z0-9-]+)*.$") : invariant2__default.default(false) : void 0;
   }
   consola.consola.info(`Loading ontology from ${commandLineOpts.input}`);
   if (!commandLineOpts.generateCodeSnippets && (commandLineOpts.codeSnippetPackageName !== "" || commandLineOpts.codeSnippetDir !== path3__namespace.resolve("./"))) {
     consola.consola.info("Package name and/or directory supplied for code snippets, but code snippet generation is false.");
   }
   if (commandLineOpts.randomnessKey !== void 0) {
-    !uuidRegex.test(commandLineOpts.randomnessKey) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "Supplied randomness key is not a uuid and shouldn't be used as a uniqueness guarantee") : invariant9__default.default(false) : void 0;
+    !uuidRegex.test(commandLineOpts.randomnessKey) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "Supplied randomness key is not a uuid and shouldn't be used as a uniqueness guarantee") : invariant2__default.default(false) : void 0;
   }
   const ontologyIr = await loadOntology(commandLineOpts.input, apiNamespace, commandLineOpts.outputDir, commandLineOpts.dependencies, commandLineOpts.generateCodeSnippets, commandLineOpts.codeSnippetPackageName, commandLineOpts.codeSnippetDir, commandLineOpts.randomnessKey);
   consola.consola.info(`Saving ontology to ${commandLineOpts.output}`);
@@ -2791,96 +2764,11 @@ 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 () => {
-    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);
+  const q = await defineOntology(apiNamespace, async () => await import(url.pathToFileURL(input).href), 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);
@@ -2920,37 +2808,37 @@ function defineAction(actionDefInput) {
   if (ontologyDefinition[OntologyEntityTypeEnum.ACTION_TYPE][apiName] !== void 0) {
     throw new Error(`Action type with apiName ${actionDef.apiName} is already defined`);
   }
-  !/^[a-z0-9]+(-[a-z0-9]+)*$/.test(actionDef.apiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Action type apiName "${actionDef.apiName}" must be alphanumeric, lowercase, and kebab-case`) : invariant9__default.default(false) : void 0;
+  !/^[a-z0-9]+(-[a-z0-9]+)*$/.test(actionDef.apiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Action type apiName "${actionDef.apiName}" must be alphanumeric, lowercase, and kebab-case`) : invariant2__default.default(false) : void 0;
   const parameterIdsSet = new Set(parameterIds);
-  !(parameterIdsSet.size === parameterIds.length) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Parameter ids must be unique`) : invariant9__default.default(false) : void 0;
+  !(parameterIdsSet.size === parameterIds.length) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Parameter ids must be unique`) : invariant2__default.default(false) : void 0;
   const parameterIdsNotFound = Array.from(referencedParameterIds(actionDef)).filter((p) => !parameterIdsSet.has(p));
-  !(parameterIdsNotFound.length === 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Parameters ${JSON.stringify(parameterIdsNotFound)} were referenced but not defined`) : invariant9__default.default(false) : void 0;
+  !(parameterIdsNotFound.length === 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Parameters ${JSON.stringify(parameterIdsNotFound)} were referenced but not defined`) : invariant2__default.default(false) : void 0;
   const definedSectionIds = new Set(Object.keys(actionDef.sections ?? []));
   const undefinedSectionsInOrdering = (actionDef.formContentOrdering ?? []).flatMap((s) => s.type === "parameterId" ? [] : [s.sectionId]).filter((sId) => !definedSectionIds.has(sId));
-  !(undefinedSectionsInOrdering.length === 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Sections [${undefinedSectionsInOrdering}] were referenced in content ordering but not defined`) : invariant9__default.default(false) : void 0;
-  !(actionDef.rules.length > 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Action type ${actionDef.apiName} must have at least one logic rule`) : invariant9__default.default(false) : void 0;
+  !(undefinedSectionsInOrdering.length === 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Sections [${undefinedSectionsInOrdering}] were referenced in content ordering but not defined`) : invariant2__default.default(false) : void 0;
+  !(actionDef.rules.length > 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Action type ${actionDef.apiName} must have at least one logic rule`) : invariant2__default.default(false) : void 0;
   actionDef.rules.forEach((rule) => {
     if (rule.type === "modifyObjectRule") {
-      !parameterIds.some((id) => id === rule.modifyObjectRule.objectToModify) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Object to modify parameter must be defined in parameters`) : invariant9__default.default(false) : void 0;
+      !parameterIds.some((id) => id === rule.modifyObjectRule.objectToModify) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Object to modify parameter must be defined in parameters`) : invariant2__default.default(false) : void 0;
     }
     if (rule.type === "deleteObjectRule") {
-      !parameterIds.some((id) => id === rule.deleteObjectRule.objectToDelete) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Object to delete parameter must be defined in parameters`) : invariant9__default.default(false) : void 0;
+      !parameterIds.some((id) => id === rule.deleteObjectRule.objectToDelete) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Object to delete parameter must be defined in parameters`) : invariant2__default.default(false) : void 0;
     }
     if (rule.type === "modifyInterfaceRule") {
       const interfaceParam = actionDef.parameters.find((p) => p.id === rule.modifyInterfaceRule.interfaceObjectToModifyParameter);
-      !(interfaceParam !== void 0 && typeof interfaceParam.type === "object" && (interfaceParam.type.type === "interfaceReference" || interfaceParam.type.type === "interfaceReferenceList")) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Interface object to modify parameter must be an interface reference`) : invariant9__default.default(false) : void 0;
+      !(interfaceParam !== void 0 && typeof interfaceParam.type === "object" && (interfaceParam.type.type === "interfaceReference" || interfaceParam.type.type === "interfaceReferenceList")) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Interface object to modify parameter must be an interface reference`) : invariant2__default.default(false) : void 0;
       const interfaceReference = interfaceParam.type.type === "interfaceReference" ? interfaceParam.type.interfaceReference.interfaceTypeRid : interfaceParam.type.interfaceReferenceList.interfaceTypeRid;
-      !(ontologyDefinition.INTERFACE_TYPE[interfaceReference] !== void 0 || importedTypes.INTERFACE_TYPE[interfaceReference] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Interface type ${interfaceReference} does not exist`) : invariant9__default.default(false) : void 0;
+      !(ontologyDefinition.INTERFACE_TYPE[interfaceReference] !== void 0 || importedTypes.INTERFACE_TYPE[interfaceReference] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Interface type ${interfaceReference} does not exist`) : invariant2__default.default(false) : void 0;
       const interfaceType = ontologyDefinition.INTERFACE_TYPE[interfaceReference];
       Object.keys(rule.modifyInterfaceRule.sharedPropertyValues).forEach((spt) => {
-        !Object.keys(getFlattenedInterfaceProperties(interfaceType)).includes(spt) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceReference}`) : invariant9__default.default(false) : void 0;
+        !Object.keys(getFlattenedInterfaceProperties(interfaceType)).includes(spt) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceReference}`) : invariant2__default.default(false) : void 0;
       });
     }
     if (rule.type === "addInterfaceRule") {
       const interfaceType = ontologyDefinition.INTERFACE_TYPE[rule.addInterfaceRule.interfaceApiName] ?? importedTypes.INTERFACE_TYPE[rule.addInterfaceRule.interfaceApiName];
-      !(interfaceType !== void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Interface type ${rule.addInterfaceRule.interfaceApiName} does not exist`) : invariant9__default.default(false) : void 0;
+      !(interfaceType !== void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Interface type ${rule.addInterfaceRule.interfaceApiName} does not exist`) : invariant2__default.default(false) : void 0;
       Object.keys(rule.addInterfaceRule.sharedPropertyValues).forEach((spt) => {
-        !Object.keys(getFlattenedInterfaceProperties(interfaceType)).includes(spt) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceType.apiName}`) : invariant9__default.default(false) : void 0;
+        !Object.keys(getFlattenedInterfaceProperties(interfaceType)).includes(spt) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceType.apiName}`) : invariant2__default.default(false) : void 0;
       });
     }
   });
@@ -3514,9 +3402,9 @@ function validateParameterCondition(condition, currentParameterId, seenParameter
   switch (condition.type) {
     case "parameter":
       const overrideParamId = condition.parameterId;
-      !parameters?.some((p) => p.id === overrideParamId) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Parameter condition on ${currentParameterId} is referencing unknown parameter ${overrideParamId}`) : invariant9__default.default(false) : void 0;
-      !(overrideParamId !== currentParameterId) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Parameter condition on ${currentParameterId} is referencing itself`) : invariant9__default.default(false) : void 0;
-      !seenParameterIds.has(overrideParamId) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Parameter condition on ${currentParameterId} is referencing later parameter ${overrideParamId}`) : invariant9__default.default(false) : void 0;
+      !parameters?.some((p) => p.id === overrideParamId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Parameter condition on ${currentParameterId} is referencing unknown parameter ${overrideParamId}`) : invariant2__default.default(false) : void 0;
+      !(overrideParamId !== currentParameterId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Parameter condition on ${currentParameterId} is referencing itself`) : invariant2__default.default(false) : void 0;
+      !seenParameterIds.has(overrideParamId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Parameter condition on ${currentParameterId} is referencing later parameter ${overrideParamId}`) : invariant2__default.default(false) : void 0;
       break;
     case "and":
       if ("conditions" in condition) {
@@ -3544,11 +3432,11 @@ function validateParameterPrefill(currentParameterId, seenParameterIds, paramete
   if (!defaultValue) return;
   switch (defaultValue.type) {
     case "objectParameterPropertyValue":
-      !parameters?.some((p) => p.id === defaultValue.objectParameterPropertyValue.parameterId) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Default value for parameter ${currentParameterId} is referencing unknown parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant9__default.default(false) : void 0;
-      !seenParameterIds.has(defaultValue.objectParameterPropertyValue.parameterId) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Default value for parameter ${currentParameterId} is referencing later parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant9__default.default(false) : void 0;
+      !parameters?.some((p) => p.id === defaultValue.objectParameterPropertyValue.parameterId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Default value for parameter ${currentParameterId} is referencing unknown parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant2__default.default(false) : void 0;
+      !seenParameterIds.has(defaultValue.objectParameterPropertyValue.parameterId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Default value for parameter ${currentParameterId} is referencing later parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant2__default.default(false) : void 0;
       break;
     case "staticValue":
-      !(defaultValue.staticValue.type === parameters?.find((p) => p.id === currentParameterId)?.type) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Default static value for parameter ${currentParameterId} does not match type`) : invariant9__default.default(false) : void 0;
+      !(defaultValue.staticValue.type === parameters?.find((p) => p.id === currentParameterId)?.type) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Default static value for parameter ${currentParameterId} does not match type`) : invariant2__default.default(false) : void 0;
       break;
     case "staticObject":
     case "interfaceParameterPropertyValue":
@@ -3563,10 +3451,10 @@ function validateParameterPrefill(currentParameterId, seenParameterIds, paramete
 }
 function validateActionParameters(def, properties, name) {
   [...Object.keys(def.parameterConfiguration ?? {})].forEach((id) => {
-    !(properties.includes(id) || properties.includes(addNamespaceIfNone(id)) || def.parameterConfiguration?.[id].customParameterType !== void 0 || isTargetParameter(id)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Parameter ${id} does not exist as a property on ${name} and its type is not explicitly defined`) : invariant9__default.default(false) : void 0;
+    !(properties.includes(id) || properties.includes(addNamespaceIfNone(id)) || def.parameterConfiguration?.[id].customParameterType !== void 0 || isTargetParameter(id)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Parameter ${id} does not exist as a property on ${name} and its type is not explicitly defined`) : invariant2__default.default(false) : void 0;
   });
   [...Object.keys(def.nonParameterMappings ?? {}), ...def.excludedProperties ?? []].forEach((id) => {
-    !(properties.includes(id) || properties.includes(addNamespaceIfNone(id)) || properties.includes(withoutNamespace(id))) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Property ${id} does not exist as a property on ${name}`) : invariant9__default.default(false) : void 0;
+    !(properties.includes(id) || properties.includes(addNamespaceIfNone(id)) || properties.includes(withoutNamespace(id))) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Property ${id} does not exist as a property on ${name}`) : invariant2__default.default(false) : void 0;
   });
 }
 function createDefaultParameterOrdering(def, properties, parameters, priorityId) {
@@ -3576,7 +3464,7 @@ function validateParameterOrdering(parameterOrdering, parameterSet, actionApiNam
   const orderingSet = new Set(parameterOrdering);
   const missingParameters = [...parameterSet].filter((param) => !orderingSet.has(param));
   const extraneousParameters = parameterOrdering.filter((param) => !parameterSet.has(param));
-  !(extraneousParameters.length === 0 && missingParameters.length === 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Action parameter ordering for ${actionApiName} does not match expected parameters. Extraneous parameters in ordering: {${extraneousParameters}}, Missing parameters in ordering: {${missingParameters}}`) : invariant9__default.default(false) : void 0;
+  !(extraneousParameters.length === 0 && missingParameters.length === 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Action parameter ordering for ${actionApiName} does not match expected parameters. Extraneous parameters in ordering: {${extraneousParameters}}, Missing parameters in ordering: {${missingParameters}}`) : invariant2__default.default(false) : void 0;
 }
 function isTargetParameter(parameterId) {
   return parameterId === MODIFY_OBJECT_PARAMETER || parameterId === CREATE_OR_MODIFY_OBJECT_PARAMETER || parameterId === CREATE_INTERFACE_OBJECT_PARAMETER || parameterId === MODIFY_INTERFACE_OBJECT_PARAMETER;
@@ -3998,7 +3886,8 @@ function combineApiNamespaceIfMissing(namespace2, apiName) {
 function defineInterface(interfaceDefInput) {
   const interfaceDef = cloneDefinition(interfaceDefInput);
   const apiName = namespace + interfaceDef.apiName;
-  !(ontologyDefinition[OntologyEntityTypeEnum.INTERFACE_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Interface ${apiName} already exists`) : invariant9__default.default(false) : void 0;
+  !(ontologyDefinition[OntologyEntityTypeEnum.INTERFACE_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Interface ${apiName} already exists`) : invariant2__default.default(false) : void 0;
+  !isValidApiName(interfaceDef.apiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Invalid API name ${interfaceDef.apiName}. API names must match the regex ${API_NAME_PATTERN}.`) : invariant2__default.default(false) : void 0;
   const spts = Object.fromEntries(Object.entries(interfaceDef.properties ?? {}).filter(([_name, prop]) => {
     return isInterfaceSharedPropertyType(prop) || "apiName" in prop;
   }).map(([s, spt]) => {
@@ -4016,6 +3905,7 @@ function defineInterface(interfaceDefInput) {
     }];
   }));
   const propertiesV3 = Object.fromEntries(Object.entries(interfaceDef.properties ?? {}).map(([apiName2, prop]) => {
+    !isValidApiName(apiName2) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Invalid API name ${apiName2} for property on interface ${interfaceDef.apiName}. API names must match the regex ${API_NAME_PATTERN}.`) : invariant2__default.default(false) : void 0;
     const required = typeof prop === "object" && isInterfaceSharedPropertyType(prop) ? prop.required : true;
     const propertyBase = typeof prop === "object" && isInterfaceSharedPropertyType(prop) ? prop.sharedPropertyType : prop;
     if (typeof propertyBase === "object" && "nonNameSpacedApiName" in propertyBase) {
@@ -4031,7 +3921,7 @@ function defineInterface(interfaceDefInput) {
   const status = mapSimplifiedStatusToInterfaceTypeStatus(interfaceDef.status ?? {
     type: "active"
   });
-  !(status.type !== "deprecated" || status.deprecated.message && status.deprecated.deadline) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Deprecated status must include message and deadline properties.`) : invariant9__default.default(false) : void 0;
+  !(status.type !== "deprecated" || status.deprecated.message && status.deprecated.deadline) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Deprecated status must include message and deadline properties.`) : invariant2__default.default(false) : void 0;
   const fullInterface = {
     apiName,
     displayMetadata: {
@@ -4058,18 +3948,18 @@ function defineInterface(interfaceDefInput) {
 }
 function verifyBasePropertyDefinition(namespace2, apiName, type) {
   const unNamespacedTypeApiName = withoutNamespace(type.apiName);
-  !(isPropertyTypeType(type.type) || isExotic(type.type)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Invalid data type ${JSON.stringify(type)} for property ${apiName} on InterfaceType ${apiName}`) : invariant9__default.default(false) : void 0;
-  !(namespace2 + apiName === type.apiName || apiName === unNamespacedTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `property key and it's apiName must be identical. ${JSON.stringify({
+  !(isPropertyTypeType(type.type) || isExotic(type.type)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Invalid data type ${JSON.stringify(type)} for property ${apiName} on InterfaceType ${apiName}`) : invariant2__default.default(false) : void 0;
+  !(namespace2 + apiName === type.apiName || apiName === unNamespacedTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `property key and it's apiName must be identical. ${JSON.stringify({
     key: apiName,
     apiName: type.apiName
-  })}`) : invariant9__default.default(false) : void 0;
+  })}`) : invariant2__default.default(false) : void 0;
   return type;
 }
 function defineInterfaceLinkConstraint(linkDefInput) {
   const linkDef = cloneDefinition(linkDefInput);
-  !(importedTypes[OntologyEntityTypeEnum.INTERFACE_TYPE][linkDef.from.apiName] == null) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Cannot define a link constraint from imported interface ${linkDef.from.apiName}. The "from" side must be a locally defined interface.`) : invariant9__default.default(false) : void 0;
+  !(importedTypes[OntologyEntityTypeEnum.INTERFACE_TYPE][linkDef.from.apiName] == null) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Cannot define a link constraint from imported interface ${linkDef.from.apiName}. The "from" side must be a locally defined interface.`) : invariant2__default.default(false) : void 0;
   const fromLinkMeta = getLinkMeta(linkDef);
-  !(linkDef.from.links.find((a) => a.metadata.apiName === fromLinkMeta.apiName) == null) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Link with apiName ${fromLinkMeta.apiName} already exists on ${linkDef.apiName}`) : invariant9__default.default(false) : void 0;
+  !(linkDef.from.links.find((a) => a.metadata.apiName === fromLinkMeta.apiName) == null) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Link with apiName ${fromLinkMeta.apiName} already exists on ${linkDef.apiName}`) : invariant2__default.default(false) : void 0;
   linkDef.from.links.push({
     cardinality: linkDef.toMany ? "MANY" : "SINGLE",
     linkedEntityTypeId: getLinkedType(linkDef.toMany ?? linkDef.toOne),
@@ -4097,8 +3987,6 @@ function getLinkMeta(meta) {
     description: description ?? displayName ?? apiNameWithoutNamespace
   };
 }
-
-// src/api/defineLink.ts
 function defineLink(linkDefinitionInput) {
   const linkDefinition = cloneDefinition(linkDefinitionInput);
   let fullLinkDefinition;
@@ -4149,6 +4037,7 @@ function convertUserIntermediaryLinkDefinition(intermediary) {
   };
 }
 function convertLinkTypeMetadata(metadata) {
+  !isValidApiName(metadata.apiName) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Invalid API name for link: ${metadata.apiName}`) : invariant2__default.default(false) : void 0;
   return {
     apiName: metadata.apiName,
     displayMetadata: {
@@ -4336,8 +4225,8 @@ function defineModifyObjectAction(defInput) {
 function defineSharedPropertyType(sptDefInput) {
   const sptDef = cloneDefinition(sptDefInput);
   const apiName = namespace + sptDef.apiName;
-  !(ontologyDefinition[OntologyEntityTypeEnum.SHARED_PROPERTY_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Shared property type ${apiName} already exists`) : invariant9__default.default(false) : void 0;
-  !(!shouldNotHaveRenderHints(sptDef.type) || !hasRenderHints(sptDef.typeClasses)) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Shared property type ${apiName} of type '${getPropertyTypeName(sptDef.type)}' should not have render hints`) : invariant9__default.default(false) : void 0;
+  !(ontologyDefinition[OntologyEntityTypeEnum.SHARED_PROPERTY_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Shared property type ${apiName} already exists`) : invariant2__default.default(false) : void 0;
+  !(!shouldNotHaveRenderHints(sptDef.type) || !hasRenderHints(sptDef.typeClasses)) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Shared property type ${apiName} of type '${getPropertyTypeName(sptDef.type)}' should not have render hints`) : invariant2__default.default(false) : void 0;
   const fullSpt = {
     ...sptDef,
     apiName,
@@ -4405,10 +4294,10 @@ function defineValueType(valueTypeDefInput) {
   } = valueTypeDef;
   const apiName = namespacePrefix ? namespace + inputApiName : inputApiName;
   const semverValidation = /^((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$/;
-  !semverValidation.test(version) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "Version is not a valid semver") : invariant9__default.default(false) : void 0;
+  !semverValidation.test(version) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "Version is not a valid semver") : invariant2__default.default(false) : void 0;
   const existingVersions = ontologyDefinition[OntologyEntityTypeEnum.VALUE_TYPE][apiName] ?? [];
   const duplicateVersion = existingVersions.find((vt2) => vt2.version === version);
-  !(duplicateVersion === void 0) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, `Value type with apiName ${apiName} and version ${version} is already defined`) : invariant9__default.default(false) : void 0;
+  !(duplicateVersion === void 0) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Value type with apiName ${apiName} and version ${version} is already defined`) : invariant2__default.default(false) : void 0;
   const typeName = typeof type.type === "string" ? type.type : type.type.type === "struct" ? "structV2" : type.type.type;
   const constraints = type.constraints ? type.constraints.map((constraint) => {
     const output = {
@@ -4477,8 +4366,8 @@ function importSharedPropertyType(opts) {
   } = opts;
   const fullApiName = packageName === void 0 ? apiName : `${packageName}.${apiName}`;
   if (packageName !== void 0) {
-    !!packageName.endsWith(".") ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "Package name format invalid ends with period") : invariant9__default.default(false) : void 0;
-    !(packageName.match("[A-Z]") == null) ? process.env.NODE_ENV !== "production" ? invariant9__default.default(false, "Package name includes upper case characters") : invariant9__default.default(false) : void 0;
+    !!packageName.endsWith(".") ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "Package name format invalid ends with period") : invariant2__default.default(false) : void 0;
+    !(packageName.match("[A-Z]") == null) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "Package name includes upper case characters") : invariant2__default.default(false) : void 0;
   }
   const spt = {
     apiName: fullApiName,