@izara_project/izara-core-generate-service-code 1.0.78 → 1.0.79

package/src/emit/resource/emitResourceArtifacts.js

@@ -10,12 +10,16 @@ import {
   supportedCustomFlows
 } from '../custom/customFlows.js';
 import { hasSystemWebSocket } from '../system/emitSystemWebSocketArtifacts.js';
+import { rbacFlowTag } from '../rbac/rbacFlowTag.js';
+import {
+  CRUD_ACTIONS,
+  createCrudActionPlans
+} from '../crud/crudActionPlan.js';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const RESOURCE_ROOT = 'resource/sls_yaml/generatedCode/source';
 const APP_ROOT = 'app/sls_yaml/generatedCode/source';
 const INITIAL_SETUP_ROOT = 'app/initial_setup/generatedCode/source';
-const CRUD_ACTIONS = ['Create', 'Update', 'Delete', 'Get'];
 const RELATIONSHIP_ACTIONS = [
   'CreateRelationship',
   'UpdateRelationship',
@@ -33,7 +37,8 @@ const RBAC_ACTIONS = [
   'DeleteRolePermissions',
   'CreateUserRole',
   'ListUserInRoles',
-  'DeleteUserFromRole'
+  'DeleteUserFromRole',
+  'ValidatorRbac'
 ];
 const SYSTEM_TABLES = [
   'WebSocketTask',
@@ -44,17 +49,14 @@ const SYSTEM_TABLES = [
   'FindDataMain',
   'LogicalResultsMain',
   'LogicalResultsData',
-  'AwaitingStep',
-  'TargetRoles',
-  'RolePermissions',
-  'RoleUsers',
-  'UserRoles'
+  'AwaitingStep'
 ];
 const RBAC_TABLES = [
   'TargetRoles',
   'RolePermissions',
   'RoleUsers',
   'UserRoles',
+  'RbacPermissionCaches',
   'WebSocketTask'
 ];
 const LEGACY_PROCESS_QUEUES = [
@@ -149,7 +151,8 @@ export const resourceArtifactPaths = [
 function createResourceState({ objects, relationships, flows }) {
   const crud = objects.some(isCrudObject);
   const selfRbac = objects.some(hasSelfRbacAddOn);
-  const rbac = objects.some(hasRbacAddOn);
+  const rbac = objects.some(hasSelfRbacAddOn);
+  const crudActionPlans = createCrudActionPlans(objects);
   const ownTopics = new Set([
     'ProcessLogical',
     'FindData',
@@ -162,7 +165,10 @@ function createResourceState({ objects, relationships, flows }) {
     'PaginateProcessLogicalHdrSqs',
     ...flows
       .filter((flow) => includesEvent(flow, 'extTopic'))
-      .map((flow) => `Process${upperFirst(flow.flowTag)}HdrSqs`)
+      .map((flow) => `Process${upperFirst(flow.flowTag)}HdrSqs`),
+    ...flows
+      .filter((flow) => flow?.outputTopic && !flow?.generatedCodeConfig && upperFirst(flow.flowTag))
+      .map((flow) => `${upperFirst(flow.flowTag)}CompleteHdrSqs`)
   ]);
   for (const { flowTag, stepName } of flowExtTopicSteps(flows)) {
     sqsQueues.add(`${flowTag}${stepName}HdrSqs`);
@@ -186,7 +192,13 @@ function createResourceState({ objects, relationships, flows }) {
       ownTopics.add(action);
     }
     for (const action of ['Create', 'Update', 'Delete']) {
-      sqsQueues.add(`${action}CompleteHdrSqs`);
+      const plan = crudActionPlans[action];
+      if (plan.hasComplete) {
+        sqsQueues.add(`${action}CompleteHdrSqs`);
+      }
+      if (plan.hasRbacCallback) {
+        sqsQueues.add(`${action}RbacCallbackHdrSqs`);
+      }
     }
   }
   if (relationships.length > 0) {
@@ -203,24 +215,13 @@ function createResourceState({ objects, relationships, flows }) {
     }
   }
   if (rbac) {
-    for (const object of objects.filter(hasRbacAddOn)) {
-      const flowTag = upperFirst(object.objectType) + 'RbacFlow';
+    const flowTags = [
+      ...new Set(objects.filter(hasRbacAddOn).map(rbacFlowTag))
+    ];
+    for (const flowTag of flowTags) {
       ownTopics.add(flowTag);
     }
   }
-  const beforeLogicalByAction = new Map();
-  for (const flow of flows.filter(
-    (flow) => flow?.generatedCodeConfig?.codeHookTag === 'beforeLogical'
-  )) {
-    const action = upperFirst(flow.generatedCodeConfig.generatedCodeTag);
-    if (!action || !flow.flowTag) continue;
-    const flowTags = beforeLogicalByAction.get(action) ?? new Set();
-    flowTags.add(flow.flowTag);
-    beforeLogicalByAction.set(action, flowTags);
-  }
-  const beforeLogical = [...beforeLogicalByAction].map(
-    ([action, flowTags]) => ({ action, flowTags: [...flowTags].sort() })
-  );
   const customRoles = [
     ...new Set([
       ...supportedCustomFlows(flows).map((flow) =>
@@ -244,6 +245,7 @@ function createResourceState({ objects, relationships, flows }) {
   const webSocketRoles = new Set();
   if (websocket) {
     webSocketRoles.add('WebSocketMainRole');
+    webSocketRoles.add('RegisterRole');
   }
   if (crud) webSocketRoles.add('FlowObjectsRole');
   if (relationships.length > 0) webSocketRoles.add('FlowRelationshipRole');
@@ -259,7 +261,6 @@ function createResourceState({ objects, relationships, flows }) {
   }
   const outTopics = new Set([
     ...ownTopics,
-    ...beforeLogical.map(({ action }) => action),
     ...flows
       .filter((flow) => flow?.outputTopic && upperFirst(flow.flowTag))
       .map((flow) => upperFirst(flow.flowTag))
@@ -285,10 +286,11 @@ function createResourceState({ objects, relationships, flows }) {
     .filter((flow) => includesEvent(flow, 's3'))
     .map((flow) => {
       const tag = upperFirst(flow.flowTag);
-      const topicName = flow.outputTopic
-        ? flow.outputTopic.startsWith('Out')
-          ? flow.outputTopic
-          : `Out${upperFirst(flow.outputTopic)}`
+      const outputTopicStr = typeof flow.outputTopic === 'string' ? flow.outputTopic : null;
+      const topicName = outputTopicStr
+        ? (outputTopicStr.startsWith('Out')
+          ? outputTopicStr
+          : `Out${upperFirst(outputTopicStr)}`)
         : flow.s3Subscription?.topicName || 'OutCreate';
       const queueName =
         flow.s3Subscription?.queueName || `${tag}ReservedLimitHdrSqs`;
@@ -298,6 +300,9 @@ function createResourceState({ objects, relationships, flows }) {
       return { subscriptionName, topicName, queueName };
     });
   const systemTables = [...SYSTEM_TABLES];
+  if (rbac) {
+    systemTables.push('TargetRoles', 'RolePermissions', 'RoleUsers', 'UserRoles', 'RbacPermissionCaches');
+  }
   if (s3FlowTags.length > 0) {
     systemTables.push('ReservedDataMain');
   }
@@ -309,6 +314,7 @@ function createResourceState({ objects, relationships, flows }) {
   return {
     crud,
     rbac,
+    crudActionPlans,
     s3Subscriptions,
     s3FlowTags,
     hasHttpApi,
@@ -316,7 +322,6 @@ function createResourceState({ objects, relationships, flows }) {
     ownTopics: [...ownTopics].filter(Boolean).sort(),
     sqsQueues: [...sqsQueues].filter(Boolean).sort(),
     dsqQueues: [...dsqQueues].filter(Boolean).sort(),
-    beforeLogical,
     customRoles,
     websocket,
     webSocketRoles,
@@ -401,12 +406,6 @@ async function renderInSqs(state) {
     ...state.dsqQueues.map((queueName) =>
       render('ResourceSqsYaml.ejs', { queueName })
     ),
-    ...state.beforeLogical.map(({ action, flowTags }) =>
-      render('ResourceBeforeLogicalYaml.ejs', {
-        queueName: `${action}BeforeLogical`,
-        flowTags
-      })
-    ),
     ...(state.websocket
       ? [
           render('ResourceSqsYaml.ejs', {
@@ -455,7 +454,10 @@ async function renderOut(state) {
 
 async function renderDynamo(state) {
   const [system, ...tables] = await Promise.all([
-    render('SystemDynamoDB_Yaml.ejs', { hasS3: state.s3FlowTags.length > 0 }),
+    render('SystemDynamoDB_Yaml.ejs', {
+      hasS3: state.s3FlowTags.length > 0,
+      hasRbac: state.rbac
+    }),
     ...state.tables.map((table) => render('DynamoDBTable_Yaml.ejs', table))
   ]);
   const indentedTables = tables.map((t) => indentYaml(t, 2)).join('\n');
@@ -481,15 +483,29 @@ async function renderIam(state) {
   };
 }
 
+function getRbacValidatorServiceTags(state) {
+  const tags = new Set();
+  for (const obj of state.objects || []) {
+    if (obj.belongTo?.serviceTag && obj.belongTo.serviceTag !== 'Rbac') {
+      tags.add(obj.belongTo.serviceTag);
+    }
+  }
+  return Array.from(tags).sort();
+}
+
 async function renderLambdaRoleConfig(state) {
   const s3Flows = state.flows
     .filter((flow) => includesEvent(flow, 's3'))
     .map((flow) => ({
       roleName: upperFirst(flow.flowTag)
     }));
+  const rbacValidatorServiceTags = getRbacValidatorServiceTags(state);
   return render('GeneratedLambdaRoleServiceConfig.ejs', {
     crud: state.crud,
     relationships: state.relationships,
+    rbac: state.rbac,
+    rbacValidatorServiceTags,
+    objectGraphServiceTags: state.objectGraphServiceTags,
     s3Flows
   });
 }
@@ -544,7 +560,10 @@ function roleNeedsSchemaRead(state, roleName) {
 }
 
 function roleTableNames(state, roleName) {
-  if (roleName === 'RegisterRole') return [];
+  if (roleName === 'RegisterRole') {
+    if (state.websocket) return ['WebSocketTask', 'RegisterRecords'];
+    return [];
+  }
   if (roleName === 'WebSocketMainRole')
     return ['UserUploadRecords', 'WebSocketTask'];
   if (roleName === 'FlowObjectsRole')
@@ -588,7 +607,7 @@ function roleTableNames(state, roleName) {
 
 function dynamoActionsForRole(roleName) {
   if (roleName === 'ProcFindDataRole')
-    return ['dynamodb:GetItem', 'dynamodb:Query'];
+    return ['dynamodb:GetItem', 'dynamodb:Query', 'dynamodb:UpdateItem'];
   if (roleName === 'WebSocketMainRole')
     return ['dynamodb:DeleteItem', 'dynamodb:PutItem', 'dynamodb:Query'];
   if (roleName === 'FlowRbacRole')
@@ -613,15 +632,17 @@ function roleQueueNames(state, roleName) {
     return [];
   }
   if (roleName === 'FlowObjectsRole') {
-    return [
-      ...CRUD_ACTIONS.map((action) => `${action}HdrSqs`),
-      ...CRUD_ACTIONS.filter((action) => action !== 'Get').map(
-        (action) => `${action}CompleteHdrSqs`
-      ),
-      ...state.beforeLogical
-        .filter(({ action }) => CRUD_ACTIONS.includes(action))
-        .map(({ action }) => `${action}BeforeLogicalHdrSqs`)
-    ];
+    return CRUD_ACTIONS.flatMap((action) => {
+      const plan = state.crudActionPlans[action];
+      if (!plan.outputTopic) return [];
+      return [
+        `${action}HdrSqs`,
+        ...(plan.hasRbacCallback
+          ? [`${action}RbacCallbackHdrSqs`]
+          : []),
+        ...(plan.hasComplete ? [`${action}CompleteHdrSqs`] : [])
+      ];
+    });
   }
   if (roleName === 'FlowRelationshipRole') {
     return [
@@ -634,10 +655,7 @@ function roleQueueNames(state, roleName) {
   }
   if (roleName === 'FlowRbacRole') {
     return [
-      ...RBAC_ACTIONS.flatMap((action) => [
-        `${action}HdrSqs`,
-        `Process${action}HdrSqs`
-      ]),
+      ...RBAC_ACTIONS.map((action) => `${action}HdrSqs`),
       ...rbacFlowQueueNames(state)
     ];
   }
@@ -673,6 +691,9 @@ function roleQueueNames(state, roleName) {
       (queueName) => includesEvent(flow, 's3') && queueName.startsWith(tag)
     )
   );
+  if (flow.outputTopic) {
+    queueList.push(`${tag}CompleteHdrSqs`);
+  }
   return queueList;
 }
 
@@ -685,7 +706,8 @@ function roleDlqQueueNames(state, roleName) {
 }
 
 function roleTopicNames(state, roleName) {
-  if (roleName === 'ProcFindDataRole') return [];
+  if (roleName === 'ProcFindDataRole')
+    return state.outTopics.filter((topic) => topic === 'FindData');
   if (roleName === 'FlowObjectsRole')
     return state.outTopics.filter((topic) => CRUD_ACTIONS.includes(topic));
   if (roleName === 'FlowRelationshipRole')
@@ -836,11 +858,7 @@ function hasSelfRbacAddOn(object) {
 }
 
 function hasRbacAddOn(object) {
-  const selfHasRbac = hasSelfRbacAddOn(object);
-  const belongToHasRbac =
-    Array.isArray(object?.belongToSchema?.addOnDataStructure) &&
-    object.belongToSchema.addOnDataStructure.some((addOn) => addOn?.type === 'rbac');
-  return selfHasRbac || belongToHasRbac;
+  return hasSelfRbacAddOn(object);
 }
 
 /**
@@ -849,15 +867,12 @@ function hasRbacAddOn(object) {
  * UserRbacFlow SQS functions emitted in emitRbacApplicationArtifacts.
  */
 function rbacFlowQueueNames(state) {
-  return (state.objects ?? [])
-    .filter(hasRbacAddOn)
-    .map((object) => {
-      const objectType = object?.objectType;
-      if (typeof objectType !== 'string' || objectType.trim() === '') return null;
-      const flowTag = `${objectType[0].toUpperCase()}${objectType.slice(1)}RbacFlow`;
-      return `${flowTag}HdrSqs`;
-    })
-    .filter(Boolean);
+  const flowTags = [
+    ...new Set(
+      (state.objects ?? []).filter(hasRbacAddOn).map(rbacFlowTag)
+    )
+  ];
+  return flowTags.map((flowTag) => `${flowTag}HdrSqs`);
 }
 function includesEvent(flow, event) {
   return Array.isArray(flow?.event) && flow.event.includes(event);

package/src/emit/resource/templates/GeneratedLambdaRoleServiceConfig.ejs

@@ -29,6 +29,7 @@ export function generatedLambdaRole() {
     {
       roleName: 'FlowObjects',
       statement: [
+        <% if (objectGraphServiceTags && objectGraphServiceTags.length > 0) { -%>
         {
           Sid: 'FlowObjectsRoleTest0',
           Effect: 'Allow',
@@ -43,27 +44,51 @@ export function generatedLambdaRole() {
           Effect: 'Allow',
           Action: ['sns:Publish'],
           Resource: [
-            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'UpdateNode_In', 'GraphHandler')}`
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'UpdateNode_In', 'GraphHandler')}`,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'CreateNode_In', 'GraphHandler')}`
           ]
-        },
+        }<% if (rbac || (rbacValidatorServiceTags && rbacValidatorServiceTags.length > 0)) { %>,<% } -%>
+        <% } -%>
 
+        <% if (rbac || (rbacValidatorServiceTags && rbacValidatorServiceTags.length > 0)) { -%>
         {
-          Sid: 'FlowObjectsRoleTest2',
+          Sid: 'FlowObjectsPublishValidatorRbacTopics',
           Effect: 'Allow',
           Action: ['sns:Publish'],
           Resource: [
-            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'CreateNode_In', 'GraphHandler')}`
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', 'Rbac')}`<% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', '<%= tag %>')}`<% }); %>
           ]
-        }
+        }<% } %>
         //(<createFlowObjectsRole>)
         //(</createFlowObjectsRole>)
       ]
     },
     <% } -%>
 
+    <% if (rbac) { -%>
+    {
+      roleName: 'FlowRbac',
+      statement: [
+        {
+          Sid: 'FlowRbacPublishValidatorRbacTopics',
+          Effect: 'Allow',
+          Action: ['sns:Publish'],
+          Resource: [
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', 'Rbac')}`<% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', '<%= tag %>')}`<% }); %>
+          ]
+        }
+        //(<createFlowRbacRole>)
+        //(</createFlowRbacRole>)
+      ]
+    },
+    <% } -%>
+
     {
       roleName: 'ProcFindData',
       statement: [
+        <% if (objectGraphServiceTags && objectGraphServiceTags.length > 0) { -%>
         {
           Sid: 'ProcFindDataRoleTest0',
           Effect: 'Allow',
@@ -72,6 +97,7 @@ export function generatedLambdaRole() {
             `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetNodeHdrInv', 'GraphHandler')}`
           ]
         }
+        <% } -%>
         //(<createProcFindDataRole>)
         //(</createProcFindDataRole>)
       ]

package/src/emit/resource/templates/SystemDynamoDB_Yaml.ejs

@@ -137,6 +137,7 @@ Resources:
         - AttributeName: pendingStepId
           KeyType: RANGE
 
+  <% if (hasRbac) { %>
   TargetRolesTable:
     Type: 'AWS::DynamoDB::Table'
     Properties:
@@ -200,6 +201,26 @@ Resources:
           KeyType: HASH
         - AttributeName: roleIdKey
           KeyType: RANGE
+
+  RbacPermissionCachesTable:
+    Type: 'AWS::DynamoDB::Table'
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}RbacPermissionCaches
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+        - AttributeName: userId
+          AttributeType: S
+        - AttributeName: cacheKey
+          AttributeType: S
+      KeySchema:
+        - AttributeName: userId
+          KeyType: HASH
+        - AttributeName: cacheKey
+          KeyType: RANGE
+      TimeToLiveSpecification:
+        AttributeName: ttlTimestamp
+        Enabled: true
+  <% } %>
   <% if (hasS3) { %>
   ReservedDataMainTable:
     Type: 'AWS::DynamoDB::Table'

package/src/emit/resource/templates/WebSocketSubscription_Yaml.ejs

@@ -5,3 +5,10 @@ SubscriptionToOut<%= topicName %>WebSocketComplete:
     TopicArn: !Ref Out<%= topicName %>
     Endpoint: 'arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}WebSocketCompleteHdrSqs'
     Protocol: 'sqs'
+
+SubscriptionToOut<%= topicName %>RegisterComplete:
+  Type: AWS::SNS::Subscription
+  Properties:
+    TopicArn: !Ref Out<%= topicName %>
+    Endpoint: 'arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}RegisterCompleteHdrSqs'
+    Protocol: 'sqs'

package/src/emit/shared/templates/FlowHandler_HdrApi.ejs

@@ -13,7 +13,7 @@ const validatorSchema = {
   type: 'object',
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
-    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>, default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %> }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %><% if (typeof prop.default !== 'undefined') { %>, default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %> }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]

package/src/emit/shared/templates/FlowHandler_HdrDsq.ejs

@@ -31,7 +31,7 @@ let perRecordsValidatorSchema = {
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
     <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
-      type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>,
+      type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %><% if (typeof prop.default !== 'undefined') { %>,
       default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %>
     }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
@@ -51,7 +51,7 @@ let messageAttributeValidatorSchema = {
       type: 'object',
       properties: {
         Type: { type: 'string' },
-        Value: { type: '<%- prop.type || 'string' %>' }
+        Value: { type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %> }
       },
       required: ['Type', 'Value']
     }<%- index < startConfig.messageAttributes.length - 1 ? ',' : '' %>

package/src/emit/shared/templates/FlowHandler_HdrInv.ejs

@@ -10,7 +10,7 @@ const validatorSchema = {
   type: 'object',
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
-    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>, default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %> }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %><% if (typeof prop.default !== 'undefined') { %>, default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %> }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]

package/src/emit/shared/templates/FlowHandler_HdrSqs.ejs

@@ -31,7 +31,7 @@ let perRecordsValidatorSchema = {
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
     <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
-      type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>,
+      type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %><% if (typeof prop.default !== 'undefined') { %>,
       default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %>
     }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
@@ -51,7 +51,7 @@ let messageAttributeValidatorSchema = {
       type: 'object',
       properties: {
         Type: { type: 'string' },
-        Value: { type: '<%- prop.type || 'string' %>' }
+        Value: { type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %> }
       },
       required: ['Type', 'Value']
     }<%- index < startConfig.messageAttributes.length - 1 ? ',' : '' %>