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

package/build/browser/cli/main.js

@@ -24,7 +24,7 @@ import { defineOntology } from "../api/defineOntology.js";
 const apiNamespaceRegex = /^[a-z0-9-]+(\.[a-z0-9-]+)*\.$/;
 const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 export default async function main(args = process.argv) {
-  const commandLineOpts = await yargs(hideBin(args)).version("0.15.0-beta.4" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs(hideBin(args)).version("0.15.0-beta.6" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",

package/build/cjs/index.cjs

@@ -405,16 +405,38 @@ function validateDerivedDatasource(objectDef, datasource) {
   });
   const isLinkedProperties = typeof Object.values(datasource.propertyMapping)[0] === "string";
   if (isLinkedProperties) {
-    validateLinkedProperties(datasource);
+    validateLinkedProperties(datasource, objectDef);
   } else {
     validateAggregations(datasource, objectDef);
   }
 }
+function getPropertiesForValidation(linkObject, objectDef) {
+  const targetApiName = typeof linkObject === "string" ? linkObject : linkObject.apiName;
+  const selfApiName = namespace + objectDef.apiName;
+  if (targetApiName === selfApiName) {
+    return {
+      apiName: selfApiName,
+      hasProperty: (propName) => objectDef.properties?.[propName] !== void 0
+    };
+  }
+  const {
+    apiName,
+    object
+  } = getObject(linkObject);
+  return {
+    apiName,
+    hasProperty: (propName) => object.properties?.find((p) => p.apiName === propName) !== void 0
+  };
+}
 function validateLinkedProperties(datasource, objectDef) {
   const foreignProperties = Object.values(datasource.propertyMapping);
-  const finalObject = getObject(datasource.linkDefinition.at(-1).linkType.toMany.object).object;
+  const targetObject = datasource.linkDefinition.at(-1).linkType.toMany.object;
+  const {
+    apiName,
+    hasProperty
+  } = getPropertiesForValidation(targetObject, objectDef);
   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;
+    !hasProperty(prop) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${prop}' on object '${apiName}' is not defined`) : invariant7__default.default(false) : void 0;
   });
 }
 function validateAggregations(datasource, objectDef) {
@@ -440,8 +462,12 @@ function validateAggregations(datasource, objectDef) {
     }
     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;
+      const targetObject = datasource.linkDefinition.at(-1).linkType.toMany.object;
+      const {
+        apiName,
+        hasProperty
+      } = getPropertiesForValidation(targetObject, objectDef);
+      !hasProperty(foreignProperty) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, `Property '${foreignProperty}' on object '${apiName}' is not defined`) : invariant7__default.default(false) : void 0;
     }
   });
 }
@@ -2081,7 +2107,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.15.0-beta.4").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs__default.default(helpers.hideBin(args)).version("0.15.0-beta.6").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -3045,7 +3071,7 @@ function defineCreateOrModifyObjectAction(def) {
   }
   const parameters = createParameters(def, def.objectType.properties ?? {}, parameterNames);
   parameters.forEach((p) => {
-    if (p.id !== CREATE_OR_MODIFY_OBJECT_PARAMETER && p.defaultValue === void 0) {
+    if (def.objectType.properties?.[p.id] && p.defaultValue === void 0) {
       p.defaultValue = {
         type: "objectParameterPropertyValue",
         objectParameterPropertyValue: {
@@ -3468,7 +3494,7 @@ function defineModifyObjectAction(def) {
   }
   const parameters = createParameters(def, def.objectType.properties ?? {}, parameterNames);
   parameters.forEach((p) => {
-    if (p.id !== MODIFY_OBJECT_PARAMETER && p.defaultValue === void 0) {
+    if (def.objectType.properties?.[p.id] && p.defaultValue === void 0) {
       p.defaultValue = {
         type: "objectParameterPropertyValue",
         objectParameterPropertyValue: {