@osdk/maker 0.14.0-beta.4 → 0.14.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.14.0-beta.4" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs(hideBin(args)).version("0.14.0-beta.6" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",

package/build/cjs/index.cjs

@@ -1705,7 +1705,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.4").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.6").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -2375,9 +2375,16 @@ function isTargetParameter(parameterId) {
   return parameterId === MODIFY_OBJECT_PARAMETER || parameterId === CREATE_OR_MODIFY_OBJECT_PARAMETER || parameterId === CREATE_INTERFACE_OBJECT_PARAMETER || parameterId === MODIFY_INTERFACE_OBJECT_PARAMETER;
 }
 function addNamespaceToActionDefinition(def) {
-  def.parameterConfiguration = Object.fromEntries(Object.entries(def.parameterConfiguration ?? {}).map(([id, config]) => [isTargetParameter(id) ? id : addNamespaceIfNone(id), config]));
+  def.parameterConfiguration = Object.fromEntries(Object.entries(def.parameterConfiguration ?? {}).map(([id, config]) => [getInterfaceParameterName(def, id), config]));
   def.nonParameterMappings = Object.fromEntries(Object.entries(def.nonParameterMappings ?? {}).map(([id, value]) => [addNamespaceIfNone(id), value]));
-  def.excludedProperties = def.excludedProperties ?? [].map((id) => addNamespaceIfNone(id));
+  def.excludedProperties = (def.excludedProperties ?? []).map((id) => addNamespaceIfNone(id));
+  def.sections = def.sections?.map((section) => ({
+    ...section,
+    parameters: section.parameters.map((p) => getInterfaceParameterName(def, p))
+  }));
+}
+function getInterfaceParameterName(def, parameter) {
+  return isTargetParameter(parameter) || !Object.keys(def.interfaceType.propertiesV2).includes(addNamespaceIfNone(parameter)) ? parameter : addNamespaceIfNone(parameter);
 }
 function convertMappingValue(value) {
   switch (value.type) {
@@ -2410,7 +2417,7 @@ function defineCreateInterfaceObjectAction(def) {
   validateActionParameters(def, Object.keys(allProperties), def.interfaceType.apiName);
   const propertyParameters = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
   const parameterNames = new Set(propertyParameters);
-  Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(isTargetParameter(param) ? param : addNamespaceIfNone(param)));
+  Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(getInterfaceParameterName(def, param)));
   parameterNames.add(CREATE_INTERFACE_OBJECT_PARAMETER);
   const actionApiName = def.apiName ?? `create-${kebab(def.interfaceType.apiName.split(".").pop() ?? def.interfaceType.apiName)}${def.objectType === void 0 ? "" : `-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`}`;
   if (def.parameterOrdering) {
@@ -2447,9 +2454,26 @@ function defineCreateInterfaceObjectAction(def) {
       }
     }],
     parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Object.keys(allProperties), parameters, CREATE_INTERFACE_OBJECT_PARAMETER),
-    ...def.validation ? {
-      validation: convertValidationRule(def.validation)
-    } : {}
+    ...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]))
+    },
+    ...def.submissionMetadata && {
+      submissionMetadata: def.submissionMetadata
+    }
   });
 }
 
@@ -2500,8 +2524,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]))
@@ -2574,8 +2600,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]))
@@ -2848,7 +2876,7 @@ function defineModifyInterfaceObjectAction(def) {
   validateActionParameters(def, Object.keys(allProperties), def.interfaceType.apiName);
   const propertyParameters = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
   const parameterNames = new Set(propertyParameters);
-  Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(isTargetParameter(param) ? param : addNamespaceIfNone(param)));
+  Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(getInterfaceParameterName(def, param)));
   parameterNames.add(MODIFY_INTERFACE_OBJECT_PARAMETER);
   const actionApiName = def.apiName ?? `modify-${kebab(def.interfaceType.apiName.split(".").pop() ?? def.interfaceType.apiName)}${def.objectType === void 0 ? "" : `-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`}`;
   if (def.parameterOrdering) {
@@ -2884,9 +2912,26 @@ function defineModifyInterfaceObjectAction(def) {
       }
     }],
     parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Object.keys(allProperties), parameters, MODIFY_INTERFACE_OBJECT_PARAMETER),
-    ...def.validation ? {
-      validation: convertValidationRule(def.validation)
-    } : {}
+    ...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]))
+    },
+    ...def.submissionMetadata && {
+      submissionMetadata: def.submissionMetadata
+    }
   });
 }
 
@@ -2952,8 +2997,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]))