@osdk/maker 0.12.0-beta.1 → 0.12.0-beta.10

package/CHANGELOG.md

@@ -1,5 +1,92 @@
 # @osdk/maker
 
+## 0.12.0-beta.10
+
+### Minor Changes
+
+- 4dffba1: Support extended string params in actions
+
+### Patch Changes
+
+- Updated dependencies [9f4fe9e]
+  - @osdk/api@2.4.0-beta.8
+
+## 0.12.0-beta.9
+
+### Minor Changes
+
+- ac0029e: Improve CRUD actions customization
+
+### Patch Changes
+
+- @osdk/api@2.4.0-beta.7
+
+## 0.12.0-beta.8
+
+### Minor Changes
+
+- 764e5f1: Add marking constraints
+
+### Patch Changes
+
+- @osdk/api@2.4.0-beta.6
+
+## 0.12.0-beta.7
+
+### Minor Changes
+
+- 75fbd09: Type classes and list validation for object actions
+
+### Patch Changes
+
+- @osdk/api@2.4.0-beta.5
+
+## 0.12.0-beta.6
+
+### Minor Changes
+
+- 3dcd9b1: Modify object actions cannot modify pk
+
+## 0.12.0-beta.5
+
+### Minor Changes
+
+- a01b8d4: Revert import block data changes
+
+### Patch Changes
+
+- @osdk/api@2.4.0-beta.4
+
+## 0.12.0-beta.4
+
+### Minor Changes
+
+- e647175: Skip struct props for object create + modify actions
+
+## 0.12.0-beta.3
+
+### Minor Changes
+
+- 988bf66: Use block data type for imports
+
+### Patch Changes
+
+- @osdk/api@2.4.0-beta.3
+
+## 0.12.0-beta.2
+
+### Minor Changes
+
+- 8bb08eb: Turn on module cache
+- 5994895: Interface struct properties are skipped in crud actions
+
+### Patch Changes
+
+- Updated dependencies [29d2ada]
+- Updated dependencies [8c95154]
+- Updated dependencies [c32dcf2]
+  - @osdk/api@2.4.0-beta.2
+
 ## 0.11.0-beta.14
 
 ### Minor Changes

package/README.md

@@ -567,72 +567,15 @@ const personToAddressLink = defineInterfaceLinkConstraint({
 
 Actions define operations that can be performed on objects and interfaces.
 
-### Custom Action
-
-```typescript
-import { defineAction } from "@osdk/maker";
-
-// Define a custom action
-const markAsInactiveAction = defineAction({
-  apiName: "mark-as-inactive",
-  displayName: "Mark as Inactive",
-  parameters: [
-    {
-      id: "reason",
-      displayName: "Reason",
-      type: "string",
-      validation: {
-        required: true,
-        allowedValues: { type: "text" },
-      },
-    },
-    {
-      id: "effectiveDate",
-      displayName: "Effective Date",
-      type: "date",
-      validation: {
-        required: true,
-        allowedValues: { type: "datetime" },
-      },
-    },
-  ],
-  status: "active",
-  rules: [
-    {
-      type: "addOrModifyObjectRuleV2",
-      addOrModifyObjectRuleV2: {
-        objectToModify: "objectToModifyParameter",
-        propertyValues: {
-          "isActive": {
-            type: "staticValue",
-            staticValue: {
-              type: "boolean",
-              boolean: false,
-            },
-          },
-          "inactiveReason": {
-            type: "parameterId",
-            parameterId: "reason",
-          },
-          "inactiveDate": {
-            type: "parameterId",
-            parameterId: "effectiveDate",
-          },
-        },
-        structFieldValues: {},
-      },
-    },
-  ],
-});
-```
-
 ### Create Object Action
 
 ```typescript
 import { defineCreateObjectAction } from "@osdk/maker";
 
 // Define an action to create an employee
-const createEmployeeAction = defineCreateObjectAction(employeeObject);
+const createEmployeeAction = defineCreateObjectAction({
+  objectType: employeeObject,
+});
 ```
 
 ### Modify Object Action
@@ -641,7 +584,9 @@ const createEmployeeAction = defineCreateObjectAction(employeeObject);
 import { defineModifyObjectAction } from "@osdk/maker";
 
 // Define an action to modify an employee
-const modifyEmployeeAction = defineModifyObjectAction(employeeObject);
+const modifyEmployeeAction = defineModifyObjectAction({
+  objectType: employeeObject,
+});
 ```
 
 ### Delete Object Action
@@ -650,7 +595,9 @@ const modifyEmployeeAction = defineModifyObjectAction(employeeObject);
 import { defineDeleteObjectAction } from "@osdk/maker";
 
 // Define an action to delete an employee
-const deleteEmployeeAction = defineDeleteObjectAction(employeeObject);
+const deleteEmployeeAction = defineDeleteObjectAction({
+  objectType: employeeObject,
+});
 ```
 
 ### Interface Actions
@@ -673,3 +620,82 @@ const createEmployeePersonAction = defineCreateInterfaceObjectAction(
 // Define an action to modify objects implementing an interface
 const modifyPersonAction = defineModifyInterfaceObjectAction(personInterface);
 ```
+
+### Custom Action
+
+More customization such as security/submission criteria, constraints on parameter values, parameter overrides, etc.
+can also be added.
+
+```typescript
+import {
+  ActionParameterConditionalOverride,
+  ConditionDefinition,
+  defineModifyObjectAction,
+  defineObject,
+} from "@osdk/maker";
+
+const employeeObject = defineObject({
+  apiName: "employee",
+  displayName: "Employee",
+  pluralDisplayName: "Employees",
+  titlePropertyApiName: "id",
+  primaryKeyPropertyApiName: "id",
+  properties: {
+    "id": { type: "string", displayName: "ID" },
+    "team": { type: "string" },
+    "numDeals": { type: "integer" },
+    "experience": { type: "integer" },
+  },
+});
+
+const mustBeManagerCondition: ConditionDefinition = {
+  type: "group",
+  name: "managerGroup", // Actual group assigned during installation
+};
+
+const mustBeInTeamCondition: ConditionDefinition = {
+  type: "group",
+  name: "teamGroup",
+};
+
+const teamEqualsSalesParameterCondition: ConditionDefinition = {
+  type: "parameter",
+  parameterId: "team",
+  matches: {
+    type: "staticValue",
+    staticValue: {
+      type: "string",
+      string: "sales",
+    },
+  },
+};
+
+const makeDealsVisible: ActionParameterConditionalOverride = {
+  type: "visibility",
+  condition: {
+    type: "and",
+    conditions: [
+      mustBeInTeamCondition,
+      teamEqualsSalesParameterCondition,
+    ],
+  },
+};
+
+const modifyObjectActionType = defineModifyObjectAction(
+  {
+    objectType: employeeObject,
+    actionLevelValidation: {
+      condition: mustBeManagerCondition,
+    },
+    parameterLevelValidations: {
+      "numDeals": {
+        defaultVisibility: "hidden",
+        conditionalOverrides: [
+          makeDealsVisible,
+        ],
+      },
+    },
+    excludedProperties: ["experience"],
+  },
+);
+```

package/build/browser/api/defineAction.js

@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
+import { consola } from "consola";
 import invariant from "tiny-invariant";
-import { getAllInterfaceProperties } from "./defineObject.js";
+import { convertToDisplayName, getAllInterfaceProperties } from "./defineObject.js";
 import { namespace, ontologyDefinition, updateOntology } from "./defineOntology.js";
 import { convertConditionDefinition } from "./ontologyUtils.js";
 import { OntologyEntityTypeEnum } from "./types.js";
 export function defineCreateInterfaceObjectAction(interfaceType, objectType, validation) {
+  const allProperties = Object.entries(getAllInterfaceProperties(interfaceType)).filter(([_, prop]) => !isStruct(prop.sharedPropertyType.type));
+  if (allProperties.length !== Object.entries(getAllInterfaceProperties(interfaceType)).length) {
+    consola.info(`Some properties on ${interfaceType.apiName} were skipped in the create action because they are structs`);
+  }
   return defineAction({
     apiName: `create-${kebab(interfaceType.apiName.split(".").pop() ?? interfaceType.apiName)}${objectType === undefined ? "" : `-${kebab(objectType.apiName.split(".").pop() ?? objectType.apiName)}`}`,
     displayName: `Create ${interfaceType.displayMetadata.displayName}`,
@@ -50,7 +55,7 @@ export function defineCreateInterfaceObjectAction(interfaceType, objectType, val
           }]
         }
       }
-    }, ...Object.entries(getAllInterfaceProperties(interfaceType)).map(([id, prop]) => ({
+    }, ...allProperties.map(([id, prop]) => ({
       id,
       displayName: prop.sharedPropertyType.displayName ?? prop.sharedPropertyType.nonNameSpacedApiName,
       type: extractActionParameterType(prop.sharedPropertyType),
@@ -74,7 +79,7 @@ export function defineCreateInterfaceObjectAction(interfaceType, objectType, val
       addInterfaceRule: {
         interfaceApiName: interfaceType.apiName,
         objectTypeParameter: "objectTypeParameter",
-        sharedPropertyValues: Object.fromEntries(Object.entries(getAllInterfaceProperties(interfaceType)).map(([id, prop]) => [id, {
+        sharedPropertyValues: Object.fromEntries(allProperties.map(([id, _prop]) => [id, {
           type: "parameterId",
           parameterId: id
         }]))
@@ -85,43 +90,63 @@ export function defineCreateInterfaceObjectAction(interfaceType, objectType, val
     } : {})
   });
 }
-export function defineCreateObjectAction(objectType, validation) {
+export function defineCreateObjectAction(def) {
+  Object.keys(def.parameterLevelValidations ?? {}).forEach(id => {
+    !(def.objectType.properties?.[id] !== undefined) ? process.env.NODE_ENV !== "production" ? invariant(false, `Property ${id} does not exist on ${def.objectType.apiName}`) : invariant(false) : void 0;
+  });
+  (def.excludedProperties ?? []).forEach(id => {
+    !(def.objectType.properties?.[id] !== undefined) ? process.env.NODE_ENV !== "production" ? invariant(false, `Property ${id} does not exist on ${def.objectType.apiName}`) : invariant(false) : void 0;
+  });
+  const parameterNames = Object.keys(def.objectType.properties ?? {}).filter(id => !def.excludedProperties?.includes(id) && !isStruct(def.objectType.properties?.[id].type));
+  const parameters = Array.from(parameterNames).map(id => ({
+    id,
+    displayName: def.objectType.properties?.[id].displayName ?? convertToDisplayName(id),
+    type: extractActionParameterType(def.objectType.properties?.[id]),
+    validation: def.parameterLevelValidations?.[id] !== undefined ? {
+      ...def.parameterLevelValidations?.[id],
+      allowedValues: def.parameterLevelValidations?.[id].allowedValues ?? extractAllowedValuesFromType(def.objectType.properties?.[id].type),
+      required: def.parameterLevelValidations?.[id].required ?? true
+    } : {
+      required: def.objectType.properties?.[id].array ?? false ? {
+        listLength: def.objectType.properties?.[id].nullability?.noEmptyCollections ? {
+          min: 1
+        } : {}
+      } : def.objectType.properties?.[id].nullability?.noNulls ?? true,
+      allowedValues: extractAllowedValuesFromType(def.objectType.properties?.[id].type)
+    }
+  }));
   return defineAction({
-    apiName: `create-object-${kebab(objectType.apiName.split(".").pop() ?? objectType.apiName)}`,
-    displayName: `Create ${objectType.displayName}`,
-    parameters: [...(objectType.properties?.map(prop => ({
-      id: prop.apiName,
-      displayName: prop.displayName,
-      type: extractActionParameterType(prop),
-      validation: {
-        required: true,
-        allowedValues: extractAllowedValuesFromType(prop.type)
-      }
-    })) ?? [])],
-    status: "active",
+    apiName: def.apiName ?? `create-object-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`,
+    displayName: def.displayName ?? `Create ${def.objectType.displayName}`,
+    parameters: parameters,
+    status: def.status ?? "active",
     entities: {
       affectedInterfaceTypes: [],
-      affectedObjectTypes: [objectType.apiName],
+      affectedObjectTypes: [def.objectType.apiName],
       affectedLinkTypes: [],
       typeGroups: []
     },
     rules: [{
       type: "addObjectRule",
       addObjectRule: {
-        objectTypeId: objectType.apiName,
-        propertyValues: objectType.properties ? Object.fromEntries(objectType.properties.map(p => [p.apiName, {
+        objectTypeId: def.objectType.apiName,
+        propertyValues: Object.fromEntries(parameters.map(p => [p.id, {
           type: "parameterId",
-          parameterId: p.apiName
-        }])) : {},
+          parameterId: p.id
+        }])),
         structFieldValues: {}
       }
     }],
-    ...(validation ? {
-      validation: [convertValidationRule(validation)]
+    ...(def.actionLevelValidation ? {
+      validation: [convertValidationRule(def.actionLevelValidation)]
     } : {})
   });
 }
 export function defineModifyInterfaceObjectAction(interfaceType, objectType, validation) {
+  const allProperties = Object.entries(getAllInterfaceProperties(interfaceType)).filter(([_, prop]) => !isStruct(prop.sharedPropertyType.type));
+  if (allProperties.length !== Object.entries(getAllInterfaceProperties(interfaceType)).length) {
+    consola.info(`Some properties on ${interfaceType.apiName} were skipped in the modify action because they are structs`);
+  }
   return defineAction({
     apiName: `modify-${kebab(interfaceType.apiName.split(".").pop() ?? interfaceType.apiName)}${objectType === undefined ? "" : `-${kebab(objectType.apiName.split(".").pop() ?? objectType.apiName)}`}`,
     displayName: `Modify ${interfaceType.displayMetadata.displayName}`,
@@ -151,7 +176,7 @@ export function defineModifyInterfaceObjectAction(interfaceType, objectType, val
           }]
         }
       }
-    }, ...Object.entries(getAllInterfaceProperties(interfaceType)).map(([id, prop]) => ({
+    }, ...allProperties.map(([id, prop]) => ({
       id,
       displayName: prop.sharedPropertyType.displayName ?? prop.sharedPropertyType.nonNameSpacedApiName,
       type: extractActionParameterType(prop.sharedPropertyType),
@@ -174,7 +199,7 @@ export function defineModifyInterfaceObjectAction(interfaceType, objectType, val
       type: "modifyInterfaceRule",
       modifyInterfaceRule: {
         interfaceObjectToModifyParameter: "interfaceObjectToModifyParameter",
-        sharedPropertyValues: Object.fromEntries(Object.entries(getAllInterfaceProperties(interfaceType)).map(([id, prop]) => [id, {
+        sharedPropertyValues: Object.fromEntries(allProperties.map(([id, _prop]) => [id, {
           type: "parameterId",
           parameterId: id
         }]))
@@ -185,17 +210,41 @@ export function defineModifyInterfaceObjectAction(interfaceType, objectType, val
     } : {})
   });
 }
-export function defineModifyObjectAction(objectType, validation) {
+export function defineModifyObjectAction(def) {
+  Object.keys(def.parameterLevelValidations ?? {}).forEach(id => {
+    !(def.objectType.properties?.[id] !== undefined) ? process.env.NODE_ENV !== "production" ? invariant(false, `Property ${id} does not exist on ${def.objectType.apiName}`) : invariant(false) : void 0;
+  });
+  (def.excludedProperties ?? []).forEach(id => {
+    !(def.objectType.properties?.[id] !== undefined) ? process.env.NODE_ENV !== "production" ? invariant(false, `Property ${id} does not exist on ${def.objectType.apiName}`) : invariant(false) : void 0;
+  });
+  const parameterNames = Object.keys(def.objectType.properties ?? {}).filter(id => !def.excludedProperties?.includes(id) && !isStruct(def.objectType.properties?.[id].type) && id !== def.objectType.primaryKeyPropertyApiName);
+  const parameters = Array.from(parameterNames).map(id => ({
+    id,
+    displayName: def.objectType.properties?.[id].displayName ?? convertToDisplayName(id),
+    type: extractActionParameterType(def.objectType.properties?.[id]),
+    validation: def.parameterLevelValidations?.[id] !== undefined ? {
+      ...def.parameterLevelValidations?.[id],
+      allowedValues: def.parameterLevelValidations?.[id].allowedValues ?? extractAllowedValuesFromType(def.objectType.properties?.[id].type),
+      required: def.parameterLevelValidations?.[id].required ?? false
+    } : {
+      required: def.objectType.properties?.[id].array ?? false ? {
+        listLength: def.objectType.properties?.[id].nullability?.noEmptyCollections ? {
+          min: 1
+        } : {}
+      } : def.objectType.properties?.[id].nullability?.noNulls ?? false,
+      allowedValues: extractAllowedValuesFromType(def.objectType.properties?.[id].type)
+    }
+  }));
   return defineAction({
-    apiName: `modify-object-${kebab(objectType.apiName.split(".").pop() ?? objectType.apiName)}`,
-    displayName: `Modify ${objectType.displayName}`,
+    apiName: def.apiName ?? `modify-object-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`,
+    displayName: def.displayName ?? `Modify ${def.objectType.displayName}`,
     parameters: [{
       id: "objectToModifyParameter",
       displayName: "Modify object",
       type: {
         type: "objectReference",
         objectReference: {
-          objectTypeId: objectType.apiName
+          objectTypeId: def.objectType.apiName
         }
       },
       validation: {
@@ -204,49 +253,41 @@ export function defineModifyObjectAction(objectType, validation) {
         },
         required: true
       }
-    }, ...(objectType.properties?.map(prop => ({
-      id: prop.apiName,
-      displayName: prop.displayName,
-      type: extractActionParameterType(prop),
-      validation: {
-        required: false,
-        allowedValues: extractAllowedValuesFromType(prop.type)
-      }
-    })) ?? [])],
-    status: "active",
-    entities: {
-      affectedInterfaceTypes: [],
-      affectedObjectTypes: [objectType.apiName],
-      affectedLinkTypes: [],
-      typeGroups: []
-    },
+    }, ...parameters],
+    status: def.status ?? "active",
     rules: [{
       type: "modifyObjectRule",
       modifyObjectRule: {
         objectToModify: "objectToModifyParameter",
-        propertyValues: objectType.properties ? Object.fromEntries(objectType.properties.map(p => [p.apiName, {
+        propertyValues: Object.fromEntries(parameters.map(p => [p.id, {
           type: "parameterId",
-          parameterId: p.apiName
-        }])) : {},
+          parameterId: p.id
+        }])),
         structFieldValues: {}
       }
     }],
-    ...(validation ? {
-      validation: [convertValidationRule(validation)]
+    entities: {
+      affectedInterfaceTypes: [],
+      affectedObjectTypes: [def.objectType.apiName],
+      affectedLinkTypes: [],
+      typeGroups: []
+    },
+    ...(def.actionLevelValidation ? {
+      validation: [convertValidationRule(def.actionLevelValidation)]
     } : {})
   });
 }
-export function defineDeleteObjectAction(objectType, validation) {
+export function defineDeleteObjectAction(def) {
   return defineAction({
-    apiName: `delete-object-${kebab(objectType.apiName.split(".").pop() ?? objectType.apiName)}`,
-    displayName: `Delete ${objectType.displayName}`,
+    apiName: def.apiName ?? `delete-object-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`,
+    displayName: def.displayName ?? `Delete ${def.objectType.displayName}`,
     parameters: [{
       id: "objectToDeleteParameter",
       displayName: "Delete object",
       type: {
         type: "objectReference",
         objectReference: {
-          objectTypeId: objectType.apiName
+          objectTypeId: def.objectType.apiName
         }
       },
       validation: {
@@ -256,21 +297,21 @@ export function defineDeleteObjectAction(objectType, validation) {
         }
       }
     }],
-    status: "active",
-    entities: {
-      affectedInterfaceTypes: [],
-      affectedObjectTypes: [objectType.apiName],
-      affectedLinkTypes: [],
-      typeGroups: []
-    },
+    status: def.status ?? "active",
     rules: [{
       type: "deleteObjectRule",
       deleteObjectRule: {
         objectToDelete: "objectToDeleteParameter"
       }
     }],
-    ...(validation ? {
-      validation: [convertValidationRule(validation)]
+    entities: {
+      affectedInterfaceTypes: [],
+      affectedObjectTypes: [def.objectType.apiName],
+      affectedLinkTypes: [],
+      typeGroups: []
+    },
+    ...(def.actionLevelValidation ? {
+      validation: [convertValidationRule(def.actionLevelValidation)]
     } : {})
   });
 }
@@ -458,6 +499,10 @@ function extractAllowedValuesFromType(type) {
           } : {
             type: "mandatoryMarking"
           };
+        case "string":
+          return {
+            type: "text"
+          };
         case "struct":
           throw new Error("Structs are not supported yet");
         default:
@@ -472,6 +517,8 @@ function extractActionParameterType(pt) {
     switch (typeType.type) {
       case "marking":
         return maybeAddList("marking", pt);
+      case "string":
+        return maybeAddList("string", pt);
       case "struct":
         throw new Error("Structs are not supported yet");
       default:
@@ -501,6 +548,9 @@ function maybeAddList(type, pt) {
 function isActionParameterTypePrimitive(type) {
   return ["boolean", "booleanList", "integer", "integerList", "long", "longList", "double", "doubleList", "string", "stringList", "decimal", "decimalList", "timestamp", "timestampList", "geohash", "geohashList", "geoshape", "geoshapeList", "timeSeriesReference", "date", "dateList", "objectTypeReference", "objectReference", "attachment", "attachmentList", "marking", "markingList", "mediaReference", "mediaReferenceList", "geotimeSeriesReference", "geotimeSeriesReferenceList"].includes(type);
 }
+function isStruct(type) {
+  return typeof type === "object" && type.type === "struct";
+}
 function kebab(s) {
   return s.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/([A-Z])([A-Z][a-z])/g, "$1-$2").replace(/\./g, "-").toLowerCase();
 }