@osdk/maker 0.14.0-beta.5 → 0.14.0-beta.7

package/build/cjs/index.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var consola = require('consola');
 var fs2 = require('fs/promises');
 var path2 = require('path');
-var invariant6 = require('tiny-invariant');
+var invariant7 = require('tiny-invariant');
 var yargs = require('yargs');
 var helpers = require('yargs/helpers');
 var fs = require('fs');
@@ -33,7 +33,7 @@ function _interopNamespace(e) {
 
 var fs2__namespace = /*#__PURE__*/_interopNamespace(fs2);
 var path2__namespace = /*#__PURE__*/_interopNamespace(path2);
-var invariant6__default = /*#__PURE__*/_interopDefault(invariant6);
+var invariant7__default = /*#__PURE__*/_interopDefault(invariant7);
 var yargs__default = /*#__PURE__*/_interopDefault(yargs);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
@@ -66,6 +66,193 @@ var OntologyEntityTypeEnum = /* @__PURE__ */ (function(OntologyEntityTypeEnum2)
   return OntologyEntityTypeEnum2;
 })({});
 
+// src/conversion/toMarketplace/convertCardinality.ts
+function convertCardinality(cardinality) {
+  if (cardinality === "OneToMany" || cardinality === void 0) {
+    return "ONE_TO_MANY";
+  }
+  return "ONE_TO_ONE";
+}
+
+// src/conversion/toMarketplace/convertLink.ts
+function convertLink(linkType) {
+  validateLink(linkType);
+  let definition;
+  let datasource = void 0;
+  if ("one" in linkType) {
+    const {
+      apiName: oneObjectApiName,
+      object: oneObject
+    } = getObject(linkType.one.object);
+    const {
+      apiName: toManyObjectApiName} = getObject(linkType.toMany.object);
+    definition = {
+      type: "oneToMany",
+      oneToMany: {
+        cardinalityHint: convertCardinality(linkType.cardinality),
+        manyToOneLinkMetadata: linkType.toMany.metadata,
+        objectTypeRidManySide: toManyObjectApiName,
+        objectTypeRidOneSide: oneObjectApiName,
+        oneToManyLinkMetadata: linkType.one.metadata,
+        oneSidePrimaryKeyToManySidePropertyMapping: [{
+          from: {
+            apiName: oneObject.primaryKeyPropertyApiName,
+            object: oneObjectApiName
+          },
+          to: {
+            apiName: linkType.manyForeignKeyProperty,
+            object: toManyObjectApiName
+          }
+        }]
+      }
+    };
+  } else if ("intermediaryObjectType" in linkType) {
+    const {
+      apiName: manyObjectApiName} = getObject(linkType.many.object);
+    const {
+      apiName: toManyObjectApiName} = getObject(linkType.toMany.object);
+    definition = {
+      type: "intermediary",
+      intermediary: {
+        objectTypeAToBLinkMetadata: linkType.many.metadata,
+        objectTypeBToALinkMetadata: linkType.toMany.metadata,
+        objectTypeRidA: manyObjectApiName,
+        objectTypeRidB: toManyObjectApiName,
+        intermediaryObjectTypeRid: linkType.intermediaryObjectType.apiName,
+        aToIntermediaryLinkTypeRid: cleanAndValidateLinkTypeId(linkType.many.linkToIntermediary.apiName),
+        intermediaryToBLinkTypeRid: cleanAndValidateLinkTypeId(linkType.toMany.linkToIntermediary.apiName)
+      }
+    };
+  } else {
+    const {
+      apiName: manyObjectApiName,
+      object: manyObject
+    } = getObject(linkType.many.object);
+    const {
+      apiName: toManyObjectApiName,
+      object: toManyObject
+    } = getObject(linkType.toMany.object);
+    definition = {
+      type: "manyToMany",
+      manyToMany: {
+        objectTypeAToBLinkMetadata: linkType.many.metadata,
+        objectTypeBToALinkMetadata: linkType.toMany.metadata,
+        objectTypeRidA: manyObjectApiName,
+        objectTypeRidB: toManyObjectApiName,
+        peeringMetadata: void 0,
+        objectTypeAPrimaryKeyPropertyMapping: [{
+          from: {
+            apiName: manyObject.primaryKeyPropertyApiName,
+            object: manyObjectApiName
+          },
+          to: {
+            apiName: manyObject.primaryKeyPropertyApiName,
+            object: manyObjectApiName
+          }
+        }],
+        objectTypeBPrimaryKeyPropertyMapping: [{
+          from: {
+            apiName: toManyObject.primaryKeyPropertyApiName,
+            object: toManyObjectApiName
+          },
+          to: {
+            apiName: toManyObject.primaryKeyPropertyApiName,
+            object: toManyObjectApiName
+          }
+        }]
+      }
+    };
+    datasource = {
+      datasourceName: linkType.apiName,
+      datasource: {
+        type: "dataset",
+        dataset: {
+          datasetRid: "link-".concat(linkType.apiName),
+          writebackDatasetRid: void 0,
+          objectTypeAPrimaryKeyMapping: [{
+            property: {
+              apiName: manyObject.primaryKeyPropertyApiName,
+              object: manyObjectApiName
+            },
+            column: manyObject.primaryKeyPropertyApiName
+          }],
+          objectTypeBPrimaryKeyMapping: [{
+            property: {
+              apiName: toManyObject.primaryKeyPropertyApiName,
+              object: toManyObjectApiName
+            },
+            column: toManyObject.primaryKeyPropertyApiName
+          }]
+        }
+      },
+      editsConfiguration: {
+        onlyAllowPrivilegedEdits: false
+      },
+      redacted: linkType.redacted
+    };
+  }
+  return {
+    linkType: {
+      definition,
+      id: cleanAndValidateLinkTypeId(linkType.apiName),
+      status: linkType.status ?? {
+        type: "active",
+        active: {}
+      },
+      redacted: linkType.redacted ?? false
+    },
+    datasources: datasource !== void 0 ? [datasource] : [],
+    entityMetadata: {
+      arePatchesEnabled: linkType.editsEnabled ?? false
+    }
+  };
+}
+function validateLink(linkDefinition) {
+  if ("one" in linkDefinition) {
+    const {
+      object: oneObject
+    } = getObject(linkDefinition.one.object);
+    const {
+      apiName: toManyObjectApiName,
+      object: toManyObject
+    } = getObject(linkDefinition.toMany.object);
+    const foreignKey = toManyObject.properties?.find((p) => p.apiName === linkDefinition.manyForeignKeyProperty);
+    !(foreignKey !== void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Foreign key ${linkDefinition.manyForeignKeyProperty} on link ${linkDefinition.apiName} does not exist on object ${toManyObjectApiName}`) : invariant7__default.default(false) : void 0;
+    !/([a-z][a-z0-9\\-]*)/.test(linkDefinition.apiName) ? process.env.NODE_ENV !== "production" ? invariant7__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`) : invariant7__default.default(false) : void 0;
+    const typesMatch = foreignKey.type === oneObject.properties?.find((p) => p.apiName === oneObject.primaryKeyPropertyApiName)?.type;
+    !typesMatch ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Link ${linkDefinition.apiName} has type mismatch between the one side's primary key and the foreign key on the many side`) : invariant7__default.default(false) : void 0;
+  }
+  if ("intermediaryObjectType" in linkDefinition) {
+    const {
+      apiName: intermediaryObjectTypeApiName} = getObject(linkDefinition.intermediaryObjectType);
+    const {
+      apiName: manyObjectApiName,
+      object: manyObject
+    } = getObject(linkDefinition.many.object);
+    const {
+      apiName: toManyObjectApiName} = getObject(linkDefinition.toMany.object);
+    const {
+      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" ? invariant7__default.default(false, `LinkTypeA ${linkDefinition.many.linkToIntermediary.apiName} must be a many to one link from intermediary object ${intermediaryObjectTypeApiName} to objectA ${manyObjectApiName}`) : invariant7__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" ? invariant7__default.default(false, `LinkTypeB ${linkDefinition.toMany.linkToIntermediary.apiName} must be a many to one link from intermediary object ${intermediaryObjectTypeApiName} to objectB ${toManyObjectApiName}`) : invariant7__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" ? invariant7__default.default(false, `Object ${objectApiName} is not defined`) : invariant7__default.default(false) : void 0;
+  return {
+    apiName: objectApiName,
+    object: fullObject
+  };
+}
+
 // src/api/interface/getFlattenedInterfaceProperties.ts
 function getFlattenedInterfaceProperties(interfaceType) {
   let properties = interfaceType.propertiesV2;
@@ -107,12 +294,20 @@ function defineObject(objectDef) {
   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" ? invariant6__default.default(false, `Invalid API name ${objectDef.apiName}. API names must match the regex ${API_NAME_PATTERN}.`) : invariant6__default.default(false) : void 0;
-  !propertyApiNames.includes(objectDef.titlePropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Title property ${objectDef.titlePropertyApiName} is not defined on object ${objectDef.apiName}`) : invariant6__default.default(false) : void 0;
-  !propertyApiNames.includes(objectDef.primaryKeyPropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} does not exist on object ${objectDef.apiName}`) : invariant6__default.default(false) : void 0;
-  !!objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.editOnly ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} on object ${objectDef.apiName} cannot be edit-only`) : invariant6__default.default(false) : void 0;
-  const retentionPeriod = objectDef.datasource?.retentionPeriod;
-  !(retentionPeriod === void 0 || ISO_8601_DURATION.test(retentionPeriod)) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Retention period "${retentionPeriod}" on object "${objectDef.apiName}" is not a valid ISO 8601 duration string`) : invariant6__default.default(false) : void 0;
+  !API_NAME_PATTERN.test(objectDef.apiName) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Invalid API name ${objectDef.apiName}. API names must match the regex ${API_NAME_PATTERN}.`) : invariant7__default.default(false) : void 0;
+  !propertyApiNames.includes(objectDef.titlePropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Title property ${objectDef.titlePropertyApiName} is not defined on object ${objectDef.apiName}`) : invariant7__default.default(false) : void 0;
+  !propertyApiNames.includes(objectDef.primaryKeyPropertyApiName) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} does not exist on object ${objectDef.apiName}`) : invariant7__default.default(false) : void 0;
+  !!objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.editOnly ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} on object ${objectDef.apiName} cannot be edit-only`) : invariant7__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" ? invariant7__default.default(false, `Retention period "${retentionPeriod}" on object "${objectDef.apiName}" is not a valid ISO 8601 duration string`) : invariant7__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" ? invariant7__default.default(false, `Object ${objectDef.apiName} has more than one base datasource (got: [${baseDatasources.map((ds) => ds.type).join(", ")}])`) : invariant7__default.default(false) : void 0;
+  const derivedDatasources = (objectDef.datasources ?? []).filter((ds) => ds.type === "derived");
+  if (derivedDatasources.length > 0) {
+    derivedDatasources.forEach((ds) => validateDerivedDatasource(objectDef, ds));
+  }
   if (objectDef.status === "experimental") {
     const activeProperties = [];
     Object.entries(objectDef.properties ?? {}).forEach(([apiName2, property]) => {
@@ -120,14 +315,14 @@ function defineObject(objectDef) {
         activeProperties.push(apiName2);
       }
     });
-    !(activeProperties.length === 0) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `When object "${objectDef.apiName}" has experimental status, no properties can have "active" status, but found active properties: ${activeProperties.join(", ")}`) : invariant6__default.default(false) : void 0;
+    !(activeProperties.length === 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `When object "${objectDef.apiName}" has experimental status, no properties can have "active" status, but found active properties: ${activeProperties.join(", ")}`) : invariant7__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" ? invariant6__default.default(false, `Deprecated status deadline "${deadline}" on object "${objectDef.apiName}" is not a valid ISO 8601 datetime string`) : invariant6__default.default(false) : void 0;
+    !(deadline !== void 0 && ISO_8601_DATETIME.test(deadline)) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Deprecated status deadline "${deadline}" on object "${objectDef.apiName}" is not a valid ISO 8601 datetime string`) : invariant7__default.default(false) : void 0;
   }
-  !!isExotic(objectDef.properties?.[objectDef.titlePropertyApiName]?.type) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Title property ${objectDef.titlePropertyApiName} must be a primitive type`) : invariant6__default.default(false) : void 0;
-  !!isExotic(objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.type) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} can only be primitive types`) : invariant6__default.default(false) : void 0;
+  !!isExotic(objectDef.properties?.[objectDef.titlePropertyApiName]?.type) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Title property ${objectDef.titlePropertyApiName} must be a primitive type`) : invariant7__default.default(false) : void 0;
+  !!isExotic(objectDef.properties?.[objectDef.primaryKeyPropertyApiName]?.type) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Primary key property ${objectDef.primaryKeyPropertyApiName} can only be primitive types`) : invariant7__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).map((interfaceProp) => ({
@@ -146,7 +341,7 @@ function defineObject(objectDef) {
     };
     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" ? invariant6__default.default(false, "\n" + allFailedValidations.map(formatValidationErrors).join("\n")) : invariant6__default.default(false) : void 0;
+    !(allFailedValidations.length === 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "\n" + allFailedValidations.map(formatValidationErrors).join("\n")) : invariant7__default.default(false) : void 0;
   });
   const flattenedProperties = Object.entries(objectDef.properties ?? {}).map(([apiName2, property]) => convertUserObjectPropertyType(property.apiName ?? apiName2, property));
   const finalObject = {
@@ -197,6 +392,72 @@ function convertUserObjectPropertyType(apiName, property) {
     type: property.type
   };
 }
+function validateDerivedDatasource(objectDef, datasource) {
+  !(datasource.linkDefinition.length > 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Derived datasource for object '${objectDef.apiName}' must have at least one link.`) : invariant7__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" ? invariant7__default.default(false, `Link type '${linkApiName}' used in derived datasource for object '${objectDef.apiName}' is not defined.`) : invariant7__default.default(false) : void 0;
+  });
+  Object.keys(datasource.propertyMapping).forEach((prop) => {
+    !(objectDef.properties?.[prop] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${prop}' used in derived datasource for object '${objectDef.apiName}' is not defined.`) : invariant7__default.default(false) : void 0;
+  });
+  const isLinkedProperties = typeof Object.values(datasource.propertyMapping)[0] === "string";
+  if (isLinkedProperties) {
+    validateLinkedProperties(datasource);
+  } else {
+    validateAggregations(datasource, objectDef);
+  }
+}
+function validateLinkedProperties(datasource, objectDef) {
+  const foreignProperties = Object.values(datasource.propertyMapping);
+  const finalObject = getObject(datasource.linkDefinition.at(-1).linkType.toMany.object).object;
+  foreignProperties.forEach((prop) => {
+    !(finalObject.properties?.find((p) => p.apiName === prop) !== void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${prop}' on object '${finalObject.apiName}' is not defined`) : invariant7__default.default(false) : void 0;
+  });
+}
+function validateAggregations(datasource, objectDef) {
+  const props = datasource.propertyMapping;
+  Object.entries(props).forEach(([propName, agg]) => {
+    const property = objectDef.properties[propName];
+    switch (agg.type) {
+      case "collectList":
+      case "collectSet":
+        !isCollectible(property) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not collectible`) : invariant7__default.default(false) : void 0;
+        !(agg.limit <= 100) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `[Error] Limit for collection '${propName}' on object '${objectDef.apiName}' is greater than 100`) : invariant7__default.default(false) : void 0;
+        break;
+      case "avg":
+      case "sum":
+        !isNumeric(property.type) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not numeric`) : invariant7__default.default(false) : void 0;
+        break;
+      case "min":
+      case "max":
+      case "approximateCardinality":
+      case "exactCardinality":
+        !isPrimitive(property.type) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${propName}' on object '${objectDef.apiName}' is not primitive`) : invariant7__default.default(false) : void 0;
+        break;
+    }
+    if (agg.type !== "count") {
+      const foreignProperty = agg.property;
+      const finalObject = getObject(datasource.linkDefinition.at(-1).linkType.toMany.object).object;
+      !(finalObject.properties?.find((p) => p.apiName === foreignProperty) !== void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${foreignProperty}' on object '${finalObject.apiName}' is not defined`) : invariant7__default.default(false) : void 0;
+    }
+  });
+}
+function isCollectible(property) {
+  if (!(property.array ?? false)) {
+    return false;
+  }
+  const typeType = typeof property.type === "string" ? property.type : property.type.type;
+  return ["boolean", "byte", "date", "double", "float", "geohash", "geoshape", "integer", "long", "mediareference", "short", "string", "struct", "timestamp"].includes(typeType);
+}
+function isNumeric(type) {
+  const typeType = typeof type === "string" ? type : type.type;
+  return ["byte", "double", "float", "integer", "long", "short"].includes(typeType);
+}
+function isPrimitive(type) {
+  const typeType = typeof type === "string" ? type : type.type;
+  return ["boolean", "byte", "date", "double", "float", "integer", "long", "short", "string", "timestamp"].includes(typeType);
+}
 
 // src/conversion/toMarketplace/convertActionSections.ts
 function convertActionSections(action) {
@@ -278,7 +539,7 @@ function convertConditionDefinition(condition, actionParameters) {
         }
       };
     case "parameter":
-      !actionParameters?.some((param) => param.id === condition.parameterId) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Action parameter condition references unknown parameter ${condition.parameterId}`) : invariant6__default.default(false) : void 0;
+      !actionParameters?.some((param) => param.id === condition.parameterId) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Action parameter condition references unknown parameter ${condition.parameterId}`) : invariant7__default.default(false) : void 0;
       return {
         type: "comparison",
         comparison: {
@@ -496,7 +757,7 @@ function convertNullabilityToDataConstraint(prop) {
         }
       };
     }
-    !prop.nullability?.noNulls ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, "Marking property type has noNulls set to false, marking properties must not be nullable") : invariant6__default.default(false) : void 0;
+    !prop.nullability?.noNulls ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "Marking property type has noNulls set to false, marking properties must not be nullable") : invariant7__default.default(false) : void 0;
     return {
       propertyTypeConstraints: [],
       nullability: void 0,
@@ -700,134 +961,12 @@ function convertInterface(interfaceType) {
   };
 }
 
-// src/conversion/toMarketplace/convertCardinality.ts
-function convertCardinality(cardinality) {
-  if (cardinality === "OneToMany" || cardinality === void 0) {
-    return "ONE_TO_MANY";
-  }
-  return "ONE_TO_ONE";
-}
-
-// src/conversion/toMarketplace/convertLink.ts
-function convertLink(linkType) {
-  let definition;
-  let datasource = void 0;
-  if ("one" in linkType) {
-    definition = {
-      type: "oneToMany",
-      oneToMany: {
-        cardinalityHint: convertCardinality(linkType.cardinality),
-        manyToOneLinkMetadata: linkType.toMany.metadata,
-        objectTypeRidManySide: linkType.toMany.object.apiName,
-        objectTypeRidOneSide: linkType.one.object.apiName,
-        oneToManyLinkMetadata: linkType.one.metadata,
-        oneSidePrimaryKeyToManySidePropertyMapping: [{
-          from: {
-            apiName: linkType.one.object.primaryKeyPropertyApiName,
-            object: linkType.one.object.apiName
-          },
-          to: {
-            apiName: linkType.manyForeignKeyProperty,
-            object: linkType.toMany.object.apiName
-          }
-        }]
-      }
-    };
-  } else if ("intermediaryObjectType" in linkType) {
-    definition = {
-      type: "intermediary",
-      intermediary: {
-        objectTypeAToBLinkMetadata: linkType.many.metadata,
-        objectTypeBToALinkMetadata: linkType.toMany.metadata,
-        objectTypeRidA: linkType.many.object.apiName,
-        objectTypeRidB: linkType.toMany.object.apiName,
-        intermediaryObjectTypeRid: linkType.intermediaryObjectType.apiName,
-        aToIntermediaryLinkTypeRid: cleanAndValidateLinkTypeId(linkType.many.linkToIntermediary.apiName),
-        intermediaryToBLinkTypeRid: cleanAndValidateLinkTypeId(linkType.toMany.linkToIntermediary.apiName)
-      }
-    };
-  } else {
-    definition = {
-      type: "manyToMany",
-      manyToMany: {
-        objectTypeAToBLinkMetadata: linkType.many.metadata,
-        objectTypeBToALinkMetadata: linkType.toMany.metadata,
-        objectTypeRidA: linkType.many.object.apiName,
-        objectTypeRidB: linkType.toMany.object.apiName,
-        peeringMetadata: void 0,
-        objectTypeAPrimaryKeyPropertyMapping: [{
-          from: {
-            apiName: linkType.many.object.primaryKeyPropertyApiName,
-            object: linkType.many.object.apiName
-          },
-          to: {
-            apiName: linkType.many.object.primaryKeyPropertyApiName,
-            object: linkType.many.object.apiName
-          }
-        }],
-        objectTypeBPrimaryKeyPropertyMapping: [{
-          from: {
-            apiName: linkType.toMany.object.primaryKeyPropertyApiName,
-            object: linkType.toMany.object.apiName
-          },
-          to: {
-            apiName: linkType.toMany.object.primaryKeyPropertyApiName,
-            object: linkType.toMany.object.apiName
-          }
-        }]
-      }
-    };
-    datasource = {
-      datasourceName: linkType.apiName,
-      datasource: {
-        type: "dataset",
-        dataset: {
-          datasetRid: "link-".concat(linkType.apiName),
-          writebackDatasetRid: void 0,
-          objectTypeAPrimaryKeyMapping: [{
-            property: {
-              apiName: linkType.many.object.primaryKeyPropertyApiName,
-              object: linkType.many.object.apiName
-            },
-            column: linkType.many.object.primaryKeyPropertyApiName
-          }],
-          objectTypeBPrimaryKeyMapping: [{
-            property: {
-              apiName: linkType.toMany.object.primaryKeyPropertyApiName,
-              object: linkType.toMany.object.apiName
-            },
-            column: linkType.toMany.object.primaryKeyPropertyApiName
-          }]
-        }
-      },
-      editsConfiguration: {
-        onlyAllowPrivilegedEdits: false
-      },
-      redacted: linkType.redacted
-    };
-  }
-  return {
-    linkType: {
-      definition,
-      id: cleanAndValidateLinkTypeId(linkType.apiName),
-      status: linkType.status ?? {
-        type: "active",
-        active: {}
-      },
-      redacted: linkType.redacted ?? false
-    },
-    datasources: datasource !== void 0 ? [datasource] : [],
-    entityMetadata: {
-      arePatchesEnabled: linkType.editsEnabled ?? false
-    }
-  };
-}
-
 // src/conversion/toMarketplace/convertDatasourceDefinition.ts
 function convertDatasourceDefinition(objectType, properties) {
-  switch (objectType.datasource?.type) {
+  const baseDatasource = objectType.datasources?.find((ds) => ["dataset", "stream", "restrictedView"].includes(ds.type));
+  switch (baseDatasource?.type) {
     case "stream":
-      const window = objectType.datasource.retentionPeriod;
+      const window = baseDatasource.retentionPeriod;
       const retentionPolicy = window ? {
         type: "time",
         time: {
@@ -1016,7 +1155,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" ? invariant6__default.default(false, `Property type ${apiName} of type '${getPropertyTypeName(property.type)}' should not have render hints`) : invariant6__default.default(false) : void 0;
+  !(!shouldNotHaveRenderHints(property.type) || !hasRenderHints(property.typeClasses)) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property type ${apiName} of type '${getPropertyTypeName(property.type)}' should not have render hints`) : invariant7__default.default(false) : void 0;
   const output = {
     apiName: property.apiName,
     sharedPropertyTypeApiName: property.sharedPropertyType?.apiName,
@@ -1046,12 +1185,16 @@ function convertObjectPropertyType(property) {
 
 // src/conversion/toMarketplace/convertObject.ts
 function convertObject(objectType) {
-  const propertyDatasources = (objectType.properties ?? []).flatMap((prop) => extractPropertyDatasource(prop, objectType.apiName));
+  const {
+    derivedDatasources,
+    derivedPropertyNames
+  } = extractDerivedDatasources(objectType);
+  const propertyDatasources = (objectType.properties ?? []).filter((prop) => !derivedPropertyNames.includes(prop.apiName)).flatMap((prop) => extractPropertyDatasource(prop, objectType.apiName));
   const classificationGroupMarkingNames = extractMarkingGroups(objectType.properties ?? [], "CBAC");
   const mandatoryMarkingNames = extractMarkingGroups(objectType.properties ?? [], "MANDATORY");
   const classificationInputGroup = classificationGroupMarkingNames.length > 0 ? classificationGroupMarkingNames.reduce((l, r) => l + "/" + r) : void 0;
   const mandatoryInputGroup = mandatoryMarkingNames.length > 0 ? mandatoryMarkingNames.reduce((l, r) => l + "/" + r) : void 0;
-  const objectDatasource = buildDatasource(objectType.apiName, convertDatasourceDefinition(objectType, objectType.properties ?? []), classificationInputGroup, mandatoryInputGroup);
+  const objectDatasource = buildDatasource(objectType.apiName, convertDatasourceDefinition(objectType, (objectType.properties ?? []).filter((prop) => !derivedPropertyNames.includes(prop.apiName))), classificationInputGroup, mandatoryInputGroup);
   const implementations = objectType.implementsInterfaces ?? [];
   return {
     objectType: {
@@ -1085,7 +1228,7 @@ function convertObject(objectType) {
       })),
       allImplementsInterfaces: {}
     },
-    datasources: [...propertyDatasources, objectDatasource],
+    datasources: [...propertyDatasources, ...derivedDatasources, objectDatasource],
     entityMetadata: {
       arePatchesEnabled: objectType.editsEnabled ?? false
     }
@@ -1128,6 +1271,80 @@ function extractPropertyDatasource(property, objectTypeApiName) {
       return [];
   }
 }
+function extractDerivedDatasources(objectType) {
+  const inputDerivedDatasources = (objectType.datasources ?? []).filter((ds) => ds.type === "derived");
+  const derivedDatasources = inputDerivedDatasources.map((ds, i) => buildDerivedDatasource(ds, i, objectType.apiName));
+  const derivedPropertyNames = inputDerivedDatasources.flatMap((ds) => Object.keys(ds.propertyMapping));
+  return {
+    derivedDatasources,
+    derivedPropertyNames
+  };
+}
+function buildDerivedDatasource(datasource, index, objectTypeApiName) {
+  const linkDefinition = {
+    type: "multiHopLink",
+    multiHopLink: {
+      steps: datasource.linkDefinition.map((step) => ({
+        type: "searchAround",
+        searchAround: {
+          linkTypeIdentifier: {
+            type: "linkType",
+            linkType: cleanAndValidateLinkTypeId(step.linkType.apiName)
+          },
+          linkTypeSide: step.side ?? "SOURCE"
+        }
+      }))
+    }
+  };
+  const isLinkedProperties = typeof Object.values(datasource.propertyMapping)[0] === "string";
+  const derivedDefinition = isLinkedProperties ? {
+    type: "linkedProperties",
+    linkedProperties: {
+      linkDefinition,
+      propertyTypeMapping: Object.fromEntries(Object.entries(datasource.propertyMapping).map(([sourceProp, targetProp]) => [sourceProp, {
+        type: "propertyType",
+        propertyType: targetProp
+      }]))
+    }
+  } : {
+    type: "aggregatedProperties",
+    aggregatedProperties: {
+      linkDefinition,
+      propertyTypeMapping: Object.fromEntries(Object.entries(datasource.propertyMapping).map(([sourceProp, agg]) => [sourceProp, buildAggregation(agg)]))
+    }
+  };
+  const fullDefinition = {
+    type: "derived",
+    derived: {
+      definition: derivedDefinition
+    }
+  };
+  return buildDatasource(objectTypeApiName + ".derived." + index.toString(), fullDefinition);
+}
+function buildAggregation(agg) {
+  const type = agg.type;
+  const limit = "limit" in agg ? agg.limit : void 0;
+  const foreignProperty = "property" in agg ? agg.property : void 0;
+  const innerDef = {};
+  if (type !== "count") {
+    if (["collectList", "collectSet"].includes(type)) {
+      innerDef["linkedProperty"] = {
+        type: "propertyType",
+        propertyType: foreignProperty
+      };
+      innerDef["limit"] = limit;
+    } else {
+      innerDef["property"] = {
+        type: "propertyType",
+        propertyType: foreignProperty
+      };
+    }
+  }
+  return {
+    type,
+    [type]: innerDef
+  };
+}
 
 // src/conversion/toMarketplace/convertOntologyDefinitionToWireBlockData.ts
 function convertOntologyDefinitionToWireBlockData(ontology) {
@@ -1705,7 +1922,7 @@ function addNamespaceIfNone(apiName) {
 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.14.0-beta.5").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs__default.default(helpers.hideBin(args)).version("0.14.0-beta.7").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -1758,12 +1975,12 @@ async function main(args = process.argv) {
   let apiNamespace = "";
   if (commandLineOpts.apiNamespace.length !== 0) {
     apiNamespace = commandLineOpts.apiNamespace.slice(-1) !== "." ? commandLineOpts.apiNamespace + "." : commandLineOpts.apiNamespace;
-    !(apiNamespace.length < 1024) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, "API namespace is too long.") : invariant6__default.default(false) : void 0;
-    !apiNamespaceRegex.test(apiNamespace) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, "API namespace is invalid! It is expected to conform to ^[a-z0-9-]+(.[a-z0-9-]+)*.$") : invariant6__default.default(false) : void 0;
+    !(apiNamespace.length < 1024) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "API namespace is too long.") : invariant7__default.default(false) : void 0;
+    !apiNamespaceRegex.test(apiNamespace) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "API namespace is invalid! It is expected to conform to ^[a-z0-9-]+(.[a-z0-9-]+)*.$") : invariant7__default.default(false) : void 0;
   }
   consola.consola.info(`Loading ontology from ${commandLineOpts.input}`);
   if (commandLineOpts.randomnessKey !== void 0) {
-    !uuidRegex.test(commandLineOpts.randomnessKey) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, "Supplied randomness key is not a uuid and shouldn't be used as a uniqueness guarantee") : invariant6__default.default(false) : void 0;
+    !uuidRegex.test(commandLineOpts.randomnessKey) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "Supplied randomness key is not a uuid and shouldn't be used as a uniqueness guarantee") : invariant7__default.default(false) : void 0;
   }
   const ontologyIr = await loadOntology(commandLineOpts.input, apiNamespace, commandLineOpts.outputDir, commandLineOpts.dependencies, commandLineOpts.randomnessKey);
   consola.consola.info(`Saving ontology to ${commandLineOpts.output}`);
@@ -1813,37 +2030,37 @@ function defineAction(actionDef) {
   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" ? invariant6__default.default(false, `Action type apiName "${actionDef.apiName}" must be alphanumeric, lowercase, and kebab-case`) : invariant6__default.default(false) : void 0;
+  !/^[a-z0-9]+(-[a-z0-9]+)*$/.test(actionDef.apiName) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Action type apiName "${actionDef.apiName}" must be alphanumeric, lowercase, and kebab-case`) : invariant7__default.default(false) : void 0;
   const parameterIdsSet = new Set(parameterIds);
-  !(parameterIdsSet.size === parameterIds.length) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Parameter ids must be unique`) : invariant6__default.default(false) : void 0;
+  !(parameterIdsSet.size === parameterIds.length) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Parameter ids must be unique`) : invariant7__default.default(false) : void 0;
   const parameterIdsNotFound = Array.from(referencedParameterIds(actionDef)).filter((p) => !parameterIdsSet.has(p));
-  !(parameterIdsNotFound.length === 0) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Parameters ${JSON.stringify(parameterIdsNotFound)} were referenced but not defined`) : invariant6__default.default(false) : void 0;
+  !(parameterIdsNotFound.length === 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Parameters ${JSON.stringify(parameterIdsNotFound)} were referenced but not defined`) : invariant7__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" ? invariant6__default.default(false, `Sections [${undefinedSectionsInOrdering}] were referenced in content ordering but not defined`) : invariant6__default.default(false) : void 0;
-  !(actionDef.rules.length > 0) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Action type ${actionDef.apiName} must have at least one logic rule`) : invariant6__default.default(false) : void 0;
+  !(undefinedSectionsInOrdering.length === 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Sections [${undefinedSectionsInOrdering}] were referenced in content ordering but not defined`) : invariant7__default.default(false) : void 0;
+  !(actionDef.rules.length > 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Action type ${actionDef.apiName} must have at least one logic rule`) : invariant7__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" ? invariant6__default.default(false, `Object to modify parameter must be defined in parameters`) : invariant6__default.default(false) : void 0;
+      !parameterIds.some((id) => id === rule.modifyObjectRule.objectToModify) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Object to modify parameter must be defined in parameters`) : invariant7__default.default(false) : void 0;
     }
     if (rule.type === "deleteObjectRule") {
-      !parameterIds.some((id) => id === rule.deleteObjectRule.objectToDelete) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Object to delete parameter must be defined in parameters`) : invariant6__default.default(false) : void 0;
+      !parameterIds.some((id) => id === rule.deleteObjectRule.objectToDelete) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Object to delete parameter must be defined in parameters`) : invariant7__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" ? invariant6__default.default(false, `Interface object to modify parameter must be an interface reference`) : invariant6__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" ? invariant7__default.default(false, `Interface object to modify parameter must be an interface reference`) : invariant7__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" ? invariant6__default.default(false, `Interface type ${interfaceReference} does not exist`) : invariant6__default.default(false) : void 0;
+      !(ontologyDefinition.INTERFACE_TYPE[interfaceReference] !== void 0 || importedTypes.INTERFACE_TYPE[interfaceReference] !== void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Interface type ${interfaceReference} does not exist`) : invariant7__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" ? invariant6__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceReference}`) : invariant6__default.default(false) : void 0;
+        !Object.keys(getFlattenedInterfaceProperties(interfaceType)).includes(spt) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceReference}`) : invariant7__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" ? invariant6__default.default(false, `Interface type ${rule.addInterfaceRule.interfaceApiName} does not exist`) : invariant6__default.default(false) : void 0;
+      !(interfaceType !== void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Interface type ${rule.addInterfaceRule.interfaceApiName} does not exist`) : invariant7__default.default(false) : void 0;
       Object.keys(rule.addInterfaceRule.sharedPropertyValues).forEach((spt) => {
-        !Object.keys(getFlattenedInterfaceProperties(interfaceType)).includes(spt) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceType.apiName}`) : invariant6__default.default(false) : void 0;
+        !Object.keys(getFlattenedInterfaceProperties(interfaceType)).includes(spt) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Shared property type ${spt} does not exist in interface type ${interfaceType.apiName}`) : invariant7__default.default(false) : void 0;
       });
     }
   });
@@ -2307,9 +2524,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" ? invariant6__default.default(false, `Parameter condition on ${currentParameterId} is referencing unknown parameter ${overrideParamId}`) : invariant6__default.default(false) : void 0;
-      !(overrideParamId !== currentParameterId) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Parameter condition on ${currentParameterId} is referencing itself`) : invariant6__default.default(false) : void 0;
-      !seenParameterIds.has(overrideParamId) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Parameter condition on ${currentParameterId} is referencing later parameter ${overrideParamId}`) : invariant6__default.default(false) : void 0;
+      !parameters?.some((p) => p.id === overrideParamId) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Parameter condition on ${currentParameterId} is referencing unknown parameter ${overrideParamId}`) : invariant7__default.default(false) : void 0;
+      !(overrideParamId !== currentParameterId) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Parameter condition on ${currentParameterId} is referencing itself`) : invariant7__default.default(false) : void 0;
+      !seenParameterIds.has(overrideParamId) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Parameter condition on ${currentParameterId} is referencing later parameter ${overrideParamId}`) : invariant7__default.default(false) : void 0;
       break;
     case "and":
       if ("conditions" in condition) {
@@ -2337,11 +2554,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" ? invariant6__default.default(false, `Default value for parameter ${currentParameterId} is referencing unknown parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant6__default.default(false) : void 0;
-      !seenParameterIds.has(defaultValue.objectParameterPropertyValue.parameterId) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Default value for parameter ${currentParameterId} is referencing later parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant6__default.default(false) : void 0;
+      !parameters?.some((p) => p.id === defaultValue.objectParameterPropertyValue.parameterId) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Default value for parameter ${currentParameterId} is referencing unknown parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant7__default.default(false) : void 0;
+      !seenParameterIds.has(defaultValue.objectParameterPropertyValue.parameterId) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Default value for parameter ${currentParameterId} is referencing later parameter ${defaultValue.objectParameterPropertyValue.parameterId}`) : invariant7__default.default(false) : void 0;
       break;
     case "staticValue":
-      !(defaultValue.staticValue.type === parameters?.find((p) => p.id === currentParameterId)?.type) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Default static value for parameter ${currentParameterId} does not match type`) : invariant6__default.default(false) : void 0;
+      !(defaultValue.staticValue.type === parameters?.find((p) => p.id === currentParameterId)?.type) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Default static value for parameter ${currentParameterId} does not match type`) : invariant7__default.default(false) : void 0;
       break;
     case "staticObject":
     case "interfaceParameterPropertyValue":
@@ -2356,10 +2573,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" ? invariant6__default.default(false, `Parameter ${id} does not exist as a property on ${name} and its type is not explicitly defined`) : invariant6__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" ? invariant7__default.default(false, `Parameter ${id} does not exist as a property on ${name} and its type is not explicitly defined`) : invariant7__default.default(false) : void 0;
   });
   [...Object.keys(def.nonParameterMappings ?? {}), ...def.excludedProperties ?? []].forEach((id) => {
-    !(properties.includes(id) || properties.includes(addNamespaceIfNone(id))) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Property ${id} does not exist as a property on ${name}`) : invariant6__default.default(false) : void 0;
+    !(properties.includes(id) || properties.includes(addNamespaceIfNone(id))) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property ${id} does not exist as a property on ${name}`) : invariant7__default.default(false) : void 0;
   });
 }
 function createDefaultParameterOrdering(def, properties, parameters, priorityId) {
@@ -2369,7 +2586,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" ? invariant6__default.default(false, `Action parameter ordering for ${actionApiName} does not match expected parameters. Extraneous parameters in ordering: {${extraneousParameters}}, Missing parameters in ordering: {${missingParameters}}`) : invariant6__default.default(false) : void 0;
+  !(extraneousParameters.length === 0 && missingParameters.length === 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Action parameter ordering for ${actionApiName} does not match expected parameters. Extraneous parameters in ordering: {${extraneousParameters}}, Missing parameters in ordering: {${missingParameters}}`) : invariant7__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;
@@ -2455,11 +2672,19 @@ function defineCreateInterfaceObjectAction(def) {
     }],
     parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Object.keys(allProperties), parameters, CREATE_INTERFACE_OBJECT_PARAMETER),
     ...def.actionLevelValidation ? {
-      actionLevelValidation: convertValidationRule(def.actionLevelValidation, parameters)
+      validation: convertValidationRule(def.actionLevelValidation, parameters)
     } : {},
+    ...def.defaultFormat && {
+      defaultFormat: def.defaultFormat
+    },
     ...def.enableLayoutSwitch && {
       enableLayoutSwitch: def.enableLayoutSwitch
     },
+    ...def.tableConfiguration && {
+      displayAndFormat: {
+        table: def.tableConfiguration
+      }
+    },
     ...def.sections && {
       sections: Object.fromEntries(def.sections.map((section) => [section.id, section]))
     },
@@ -2472,7 +2697,8 @@ function defineCreateInterfaceObjectAction(def) {
 // src/api/defineCreateObjectAction.ts
 function defineCreateObjectAction(def) {
   validateActionParameters(def, Object.keys(def.objectType.properties ?? {}), def.objectType.apiName);
-  const propertyParameters = Object.keys(def.objectType.properties ?? {}).filter((id) => isPropertyParameter(def, id, def.objectType.properties?.[id].type));
+  const propertiesWithDerivedDatasources = (def.objectType.datasources ?? []).filter((ds) => ds.type === "derived").flatMap((ds) => Object.keys(ds.propertyMapping));
+  const propertyParameters = Object.keys(def.objectType.properties ?? {}).filter((id) => isPropertyParameter(def, id, def.objectType.properties?.[id].type) && !isStruct(def.objectType.properties?.[id].type) && !propertiesWithDerivedDatasources.includes(id));
   const parameterNames = new Set(propertyParameters);
   Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(param));
   const actionApiName = def.apiName ?? `create-object-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`;
@@ -2516,8 +2742,10 @@ function defineCreateObjectAction(def) {
     ...def.enableLayoutSwitch && {
       enableLayoutSwitch: def.enableLayoutSwitch
     },
-    ...def.displayAndFormat && {
-      displayAndFormat: def.displayAndFormat
+    ...def.tableConfiguration && {
+      displayAndFormat: {
+        table: def.tableConfiguration
+      }
     },
     ...def.sections && {
       sections: Object.fromEntries(def.sections.map((section) => [section.id, section]))
@@ -2531,7 +2759,8 @@ function defineCreateObjectAction(def) {
 // src/api/defineCreateOrModifyObjectAction.ts
 function defineCreateOrModifyObjectAction(def) {
   validateActionParameters(def, Object.keys(def.objectType.properties ?? {}), def.objectType.apiName);
-  const propertyParameters = Object.keys(def.objectType.properties ?? {}).filter((id) => !Object.keys(def.nonParameterMappings ?? {}).includes(id) && !def.excludedProperties?.includes(id) && !isStruct(def.objectType.properties?.[id].type) && id !== def.objectType.primaryKeyPropertyApiName);
+  const propertiesWithDerivedDatasources = (def.objectType.datasources ?? []).filter((ds) => ds.type === "derived").flatMap((ds) => Object.keys(ds.propertyMapping));
+  const propertyParameters = Object.keys(def.objectType.properties ?? {}).filter((id) => !Object.keys(def.nonParameterMappings ?? {}).includes(id) && !def.excludedProperties?.includes(id) && !isStruct(def.objectType.properties?.[id].type) && id !== def.objectType.primaryKeyPropertyApiName && !propertiesWithDerivedDatasources.includes(id));
   const parameterNames = new Set(propertyParameters);
   Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(param));
   parameterNames.add(CREATE_OR_MODIFY_OBJECT_PARAMETER);
@@ -2590,8 +2819,10 @@ function defineCreateOrModifyObjectAction(def) {
     ...def.enableLayoutSwitch && {
       enableLayoutSwitch: def.enableLayoutSwitch
     },
-    ...def.displayAndFormat && {
-      displayAndFormat: def.displayAndFormat
+    ...def.tableConfiguration && {
+      displayAndFormat: {
+        table: def.tableConfiguration
+      }
     },
     ...def.sections && {
       sections: Object.fromEntries(def.sections.map((section) => [section.id, section]))
@@ -2602,6 +2833,43 @@ function defineCreateOrModifyObjectAction(def) {
   });
 }
 
+// src/api/defineDeleteInterfaceObjectAction.ts
+function defineDeleteInterfaceObjectAction(def) {
+  return defineAction({
+    apiName: def.apiName ?? `delete-interface-object-${kebab(def.interfaceType.apiName.split(".").pop() ?? def.interfaceType.apiName)}`,
+    displayName: def.displayName ?? `Delete ${def.interfaceType.displayMetadata.displayName}`,
+    parameters: [{
+      id: "objectToDeleteParameter",
+      displayName: "Delete object",
+      type: {
+        type: "interfaceReference",
+        interfaceReference: {
+          interfaceTypeRid: def.interfaceType.apiName
+        }
+      },
+      validation: {
+        required: true,
+        allowedValues: {
+          type: "interfaceObjectQuery"
+        }
+      }
+    }],
+    status: def.status ?? "active",
+    rules: [{
+      type: "deleteObjectRule",
+      deleteObjectRule: {
+        objectToDelete: "objectToDeleteParameter"
+      }
+    }],
+    entities: {
+      affectedInterfaceTypes: [],
+      affectedObjectTypes: [def.interfaceType.apiName],
+      affectedLinkTypes: [],
+      typeGroups: []
+    }
+  });
+}
+
 // src/api/defineDeleteObjectAction.ts
 function defineDeleteObjectAction(def) {
   return defineAction({
@@ -2643,8 +2911,8 @@ function defineDeleteObjectAction(def) {
 }
 function defineSharedPropertyType(sptDef) {
   const apiName = namespace + sptDef.apiName;
-  !(ontologyDefinition[OntologyEntityTypeEnum.SHARED_PROPERTY_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Shared property type ${apiName} already exists`) : invariant6__default.default(false) : void 0;
-  !(!shouldNotHaveRenderHints(sptDef.type) || !hasRenderHints(sptDef.typeClasses)) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Shared property type ${apiName} of type '${getPropertyTypeName(sptDef.type)}' should not have render hints`) : invariant6__default.default(false) : void 0;
+  !(ontologyDefinition[OntologyEntityTypeEnum.SHARED_PROPERTY_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Shared property type ${apiName} already exists`) : invariant7__default.default(false) : void 0;
+  !(!shouldNotHaveRenderHints(sptDef.type) || !hasRenderHints(sptDef.typeClasses)) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Shared property type ${apiName} of type '${getPropertyTypeName(sptDef.type)}' should not have render hints`) : invariant7__default.default(false) : void 0;
   const fullSpt = {
     ...sptDef,
     apiName,
@@ -2693,7 +2961,7 @@ function combineApiNamespaceIfMissing(namespace2, apiName) {
 // src/api/defineInterface.ts
 function defineInterface(interfaceDef) {
   const apiName = namespace + interfaceDef.apiName;
-  !(ontologyDefinition[OntologyEntityTypeEnum.INTERFACE_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Interface ${apiName} already exists`) : invariant6__default.default(false) : void 0;
+  !(ontologyDefinition[OntologyEntityTypeEnum.INTERFACE_TYPE][apiName] === void 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Interface ${apiName} already exists`) : invariant7__default.default(false) : void 0;
   const properties = Object.fromEntries(Object.entries(interfaceDef.properties ?? {}).map(([unNamespacedPropApiName, type]) => {
     if (typeof type === "object" && "propertyDefinition" in type) {
       const apiName3 = combineApiNamespaceIfMissing(namespace, typeof type.propertyDefinition === "object" && "apiName" in type.propertyDefinition ? type.propertyDefinition.apiName : unNamespacedPropApiName);
@@ -2712,7 +2980,7 @@ function defineInterface(interfaceDef) {
   const status = mapSimplifiedStatusToInterfaceTypeStatus(interfaceDef.status ?? {
     type: "active"
   });
-  !(status.type !== "deprecated" || status.deprecated.message && status.deprecated.deadline) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Deprecated status must include message and deadline properties.`) : invariant6__default.default(false) : void 0;
+  !(status.type !== "deprecated" || status.deprecated.message && status.deprecated.deadline) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Deprecated status must include message and deadline properties.`) : invariant7__default.default(false) : void 0;
   const fullInterface = {
     apiName,
     displayMetadata: {
@@ -2738,7 +3006,7 @@ function defineInterface(interfaceDef) {
 }
 function unifyBasePropertyDefinition(namespace2, apiName, type) {
   if (typeof type === "string" || typeof type === "object" && !("apiName" in type)) {
-    !isPropertyTypeType(type) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Invalid data type ${JSON.stringify(type)} for property ${apiName} on InterfaceType ${apiName}`) : invariant6__default.default(false) : void 0;
+    !isPropertyTypeType(type) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Invalid data type ${JSON.stringify(type)} for property ${apiName} on InterfaceType ${apiName}`) : invariant7__default.default(false) : void 0;
     const spt = defineSharedPropertyType({
       apiName,
       displayName: apiName,
@@ -2748,16 +3016,16 @@ function unifyBasePropertyDefinition(namespace2, apiName, type) {
     return spt;
   } else {
     const unNamespacedTypeApiName = withoutNamespace(type.apiName);
-    !(namespace2 + apiName === type.apiName || apiName === unNamespacedTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `property key and it's apiName must be identical. ${JSON.stringify({
+    !(namespace2 + apiName === type.apiName || apiName === unNamespacedTypeApiName) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `property key and it's apiName must be identical. ${JSON.stringify({
       key: apiName,
       apiName: type.apiName
-    })}`) : invariant6__default.default(false) : void 0;
+    })}`) : invariant7__default.default(false) : void 0;
     return type;
   }
 }
 function defineInterfaceLinkConstraint(linkDef) {
   const fromLinkMeta = getLinkMeta(linkDef);
-  !(linkDef.from.links.find((a) => a.metadata.apiName === fromLinkMeta.apiName) == null) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Link with apiName ${fromLinkMeta.apiName} already exists on ${linkDef.apiName}`) : invariant6__default.default(false) : void 0;
+  !(linkDef.from.links.find((a) => a.metadata.apiName === fromLinkMeta.apiName) == null) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Link with apiName ${fromLinkMeta.apiName} already exists on ${linkDef.apiName}`) : invariant7__default.default(false) : void 0;
   linkDef.from.links.push({
     cardinality: linkDef.toMany ? "MANY" : "SINGLE",
     linkedEntityTypeId: getLinkedType(linkDef.toMany ?? linkDef.toOne),
@@ -2785,19 +3053,9 @@ function getLinkMeta(meta) {
     description: description ?? displayName ?? apiNameWithoutNamespace
   };
 }
-var typeIdPattern = /([a-z][a-z0-9\\-]*)/;
+
+// src/api/defineLink.ts
 function defineLink(linkDefinition) {
-  if ("one" in linkDefinition) {
-    const foreignKey = linkDefinition.toMany.object.properties?.[linkDefinition.manyForeignKeyProperty];
-    !(foreignKey !== void 0) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Foreign key ${linkDefinition.manyForeignKeyProperty} on link ${linkDefinition.apiName} does not exist on object ${linkDefinition.toMany.object.apiName}}`) : invariant6__default.default(false) : void 0;
-    !typeIdPattern.test(linkDefinition.apiName) ? process.env.NODE_ENV !== "production" ? invariant6__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`) : invariant6__default.default(false) : void 0;
-    const typesMatch = foreignKey.type === linkDefinition.one.object.properties?.[linkDefinition.one.object.primaryKeyPropertyApiName].type;
-    !typesMatch ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `Link ${linkDefinition.apiName} has type mismatch between the one side's primary key and the foreign key on the many side`) : invariant6__default.default(false) : void 0;
-  }
-  if ("intermediaryObjectType" in linkDefinition) {
-    !("one" in linkDefinition.many.linkToIntermediary && linkDefinition.many.linkToIntermediary.one.object.apiName === linkDefinition.many.object.apiName && linkDefinition.many.linkToIntermediary.toMany.object.apiName === linkDefinition.intermediaryObjectType.apiName) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `LinkTypeA ${linkDefinition.many.linkToIntermediary.apiName} must be a many to one link from intermediary object ${linkDefinition.intermediaryObjectType.apiName} to objectA ${linkDefinition.many.object.apiName}`) : invariant6__default.default(false) : void 0;
-    !("one" in linkDefinition.toMany.linkToIntermediary && linkDefinition.toMany.linkToIntermediary.one.object.apiName === linkDefinition.toMany.object.apiName && linkDefinition.toMany.linkToIntermediary.toMany.object.apiName === linkDefinition.intermediaryObjectType.apiName) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, `LinkTypeB ${linkDefinition.toMany.linkToIntermediary.apiName} must be a many to one link from intermediary object ${linkDefinition.intermediaryObjectType.apiName} to objectB ${linkDefinition.toMany.object.apiName}`) : invariant6__default.default(false) : void 0;
-  }
   let fullLinkDefinition;
   if ("one" in linkDefinition) {
     fullLinkDefinition = {
@@ -2821,6 +3079,7 @@ function defineLink(linkDefinition) {
   const linkType = {
     cardinality: "one" in linkDefinition ? linkDefinition.cardinality : void 0,
     ...fullLinkDefinition,
+    apiName: linkDefinition.apiName,
     __type: OntologyEntityTypeEnum.LINK_TYPE
   };
   updateOntology(linkType);
@@ -2903,9 +3162,17 @@ function defineModifyInterfaceObjectAction(def) {
     ...def.actionLevelValidation ? {
       validation: convertValidationRule(def.actionLevelValidation, parameters)
     } : {},
+    ...def.defaultFormat && {
+      defaultFormat: def.defaultFormat
+    },
     ...def.enableLayoutSwitch && {
       enableLayoutSwitch: def.enableLayoutSwitch
     },
+    ...def.tableConfiguration && {
+      displayAndFormat: {
+        table: def.tableConfiguration
+      }
+    },
     ...def.sections && {
       sections: Object.fromEntries(def.sections.map((section) => [section.id, section]))
     },
@@ -2977,8 +3244,10 @@ function defineModifyObjectAction(def) {
     ...def.enableLayoutSwitch && {
       enableLayoutSwitch: def.enableLayoutSwitch
     },
-    ...def.displayAndFormat && {
-      displayAndFormat: def.displayAndFormat
+    ...def.tableConfiguration && {
+      displayAndFormat: {
+        table: def.tableConfiguration
+      }
     },
     ...def.sections && {
       sections: Object.fromEntries(def.sections.map((section) => [section.id, section]))
@@ -3040,7 +3309,7 @@ function defineValueType(valueTypeDef) {
     version
   } = valueTypeDef;
   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" ? invariant6__default.default(false, "Version is not a valid semver") : invariant6__default.default(false) : void 0;
+  !semverValidation.test(version) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "Version is not a valid semver") : invariant7__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 = {
@@ -3096,8 +3365,8 @@ function importSharedPropertyType(opts) {
   } = opts;
   const fullApiName = packageName === void 0 ? apiName : `${packageName}.${apiName}`;
   if (packageName !== void 0) {
-    !!packageName.endsWith(".") ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, "Package name format invalid ends with period") : invariant6__default.default(false) : void 0;
-    !(packageName.match("[A-Z]") == null) ? process.env.NODE_ENV !== "production" ? invariant6__default.default(false, "Package name includes upper case characters") : invariant6__default.default(false) : void 0;
+    !!packageName.endsWith(".") ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "Package name format invalid ends with period") : invariant7__default.default(false) : void 0;
+    !(packageName.match("[A-Z]") == null) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "Package name includes upper case characters") : invariant7__default.default(false) : void 0;
   }
   const spt = {
     apiName: fullApiName,
@@ -3135,6 +3404,7 @@ exports.defineAction = defineAction;
 exports.defineCreateInterfaceObjectAction = defineCreateInterfaceObjectAction;
 exports.defineCreateObjectAction = defineCreateObjectAction;
 exports.defineCreateOrModifyObjectAction = defineCreateOrModifyObjectAction;
+exports.defineDeleteInterfaceObjectAction = defineDeleteInterfaceObjectAction;
 exports.defineDeleteObjectAction = defineDeleteObjectAction;
 exports.defineInterface = defineInterface;
 exports.defineInterfaceLinkConstraint = defineInterfaceLinkConstraint;