@osdk/maker 0.14.0-beta.13 → 0.14.0-beta.14

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.13" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs(hideBin(args)).version("0.14.0-beta.14" ?? "").wrap(Math.min(150, yargs().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",

package/build/cjs/index.cjs

@@ -2041,7 +2041,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.13").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.14").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -2739,8 +2739,14 @@ function addNamespaceToActionDefinition(def) {
   }));
 }
 function getInterfaceParameterName(def, parameter) {
+  if (def.useNonNamespacedParameters) {
+    return getNonNamespacedParameterName(def, parameter);
+  }
   return isTargetParameter(parameter) || !Object.keys(def.interfaceType.propertiesV2).includes(addNamespaceIfNone(parameter)) ? parameter : addNamespaceIfNone(parameter);
 }
+function getNonNamespacedParameterName(def, parameter) {
+  return def.conflictingParameterOverrides?.[parameter] ?? (parameter.split(".").pop() || parameter);
+}
 function convertMappingValue(value) {
   switch (value.type) {
     case "uuid":
@@ -2770,8 +2776,9 @@ function defineCreateInterfaceObjectAction(def) {
   addNamespaceToActionDefinition(def);
   const allProperties = getFlattenedInterfaceProperties(def.interfaceType);
   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);
+  const sptNames = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
+  const parameterNames = new Set(sptNames.map((apiName) => getInterfaceParameterName(def, apiName)));
+  const propertyMap = Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [getInterfaceParameterName(def, id), prop.sharedPropertyType]));
   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)}`}`;
@@ -2781,7 +2788,7 @@ function defineCreateInterfaceObjectAction(def) {
     }
     validateParameterOrdering(def.parameterOrdering, parameterNames, actionApiName);
   }
-  const parameters = createParameters(def, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.sharedPropertyType])), parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
+  const parameters = createParameters(def, propertyMap, parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
   const mappings = Object.fromEntries(Object.entries(def.nonParameterMappings ?? {}).map(([id, value]) => [id, convertMappingValue(value)]));
   return defineAction({
     apiName: actionApiName,
@@ -2800,15 +2807,15 @@ function defineCreateInterfaceObjectAction(def) {
         interfaceApiName: def.interfaceType.apiName,
         objectTypeParameter: CREATE_INTERFACE_OBJECT_PARAMETER,
         sharedPropertyValues: {
-          ...Object.fromEntries(propertyParameters.map((id) => [id, {
+          ...Object.fromEntries(sptNames.map((id) => [id, {
             type: "parameterId",
-            parameterId: id
+            parameterId: def.useNonNamespacedParameters ? getNonNamespacedParameterName(def, id) : id
           }])),
           ...mappings
         }
       }
     }],
-    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Object.keys(allProperties), parameters, CREATE_INTERFACE_OBJECT_PARAMETER),
+    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Array.from(parameterNames), parameters, CREATE_INTERFACE_OBJECT_PARAMETER),
     ...def.actionLevelValidation ? {
       validation: convertValidationRule(def.actionLevelValidation, parameters)
     } : {},
@@ -3259,8 +3266,9 @@ function defineModifyInterfaceObjectAction(def) {
   addNamespaceToActionDefinition(def);
   const allProperties = getFlattenedInterfaceProperties(def.interfaceType);
   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);
+  const sptNames = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
+  const parameterNames = new Set(sptNames.map((apiName) => getInterfaceParameterName(def, apiName)));
+  const propertyMap = Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [getInterfaceParameterName(def, id), prop.sharedPropertyType]));
   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)}`}`;
@@ -3270,7 +3278,7 @@ function defineModifyInterfaceObjectAction(def) {
     }
     validateParameterOrdering(def.parameterOrdering, parameterNames, actionApiName);
   }
-  const parameters = createParameters(def, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.sharedPropertyType])), parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
+  const parameters = createParameters(def, propertyMap, parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
   const mappings = Object.fromEntries(Object.entries(def.nonParameterMappings ?? {}).map(([id, value]) => [id, convertMappingValue(value)]));
   return defineAction({
     apiName: actionApiName,
@@ -3288,15 +3296,15 @@ function defineModifyInterfaceObjectAction(def) {
       modifyInterfaceRule: {
         interfaceObjectToModifyParameter: "interfaceObjectToModifyParameter",
         sharedPropertyValues: {
-          ...Object.fromEntries(propertyParameters.map((id) => [id, {
+          ...Object.fromEntries(sptNames.map((id) => [id, {
             type: "parameterId",
-            parameterId: id
+            parameterId: def.useNonNamespacedParameters ? getNonNamespacedParameterName(def, id) : id
           }])),
           ...mappings
         }
       }
     }],
-    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Object.keys(allProperties), parameters, MODIFY_INTERFACE_OBJECT_PARAMETER),
+    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Array.from(parameterNames), parameters, MODIFY_INTERFACE_OBJECT_PARAMETER),
     ...def.actionLevelValidation ? {
       validation: convertValidationRule(def.actionLevelValidation, parameters)
     } : {},