@izara_project/izara-core-generate-service-code 1.0.71 → 1.0.73

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

@@ -1,219 +1,219 @@
 Resources:
   WebSocketTaskTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}WebSocketTask
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: taskKey
-        AttributeType: S
-      - AttributeName: connectionId
-        AttributeType: S
+        - AttributeName: taskKey
+          AttributeType: S
+        - AttributeName: connectionId
+          AttributeType: S
       KeySchema:
-      - AttributeName: taskKey
-        KeyType: HASH
-      - AttributeName: connectionId
-        KeyType: RANGE
+        - AttributeName: taskKey
+          KeyType: HASH
+        - AttributeName: connectionId
+          KeyType: RANGE
       TimeToLiveSpecification:
         AttributeName: expirationTime
         Enabled: true
 
   UserUploadRecordsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}UserUploadRecords
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: connectionId
-        AttributeType: S
+        - AttributeName: connectionId
+          AttributeType: S
       KeySchema:
-      - AttributeName: connectionId
-        KeyType: HASH
+        - AttributeName: connectionId
+          KeyType: HASH
       TimeToLiveSpecification:
         AttributeName: expirationTime
         Enabled: true
 
   RegisterRecordsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}RegisterRecords
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: identifiersTask
-        AttributeType: S
-      - AttributeName: connectionId
-        AttributeType: S
+        - AttributeName: identifiersTask
+          AttributeType: S
+        - AttributeName: connectionId
+          AttributeType: S
       KeySchema:
-      - AttributeName: identifiersTask
-        KeyType: HASH
-      - AttributeName: connectionId
-        KeyType: RANGE
+        - AttributeName: identifiersTask
+          KeyType: HASH
+        - AttributeName: connectionId
+          KeyType: RANGE
 
   AwaitingMultipleStepsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}AwaitingMultipleSteps
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: awaitingStepId
-        AttributeType: S
-      - AttributeName: pendingStepId
-        AttributeType: S
+        - AttributeName: awaitingStepId
+          AttributeType: S
+        - AttributeName: pendingStepId
+          AttributeType: S
       KeySchema:
-      - AttributeName: awaitingStepId
-        KeyType: HASH
-      - AttributeName: pendingStepId
-        KeyType: RANGE
+        - AttributeName: awaitingStepId
+          KeyType: HASH
+        - AttributeName: pendingStepId
+          KeyType: RANGE
 
   AwaitingMultipleStepByPendingTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}AwaitingMultipleStepByPending
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: pendingStepId
-        AttributeType: S
-      - AttributeName: awaitingStepId
-        AttributeType: S
+        - AttributeName: pendingStepId
+          AttributeType: S
+        - AttributeName: awaitingStepId
+          AttributeType: S
       KeySchema:
-      - AttributeName: pendingStepId
-        KeyType: HASH
-      - AttributeName: awaitingStepId
-        KeyType: RANGE
+        - AttributeName: pendingStepId
+          KeyType: HASH
+        - AttributeName: awaitingStepId
+          KeyType: RANGE
 
   FindDataMainTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}FindDataMain
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: findDataId
-        AttributeType: S
+        - AttributeName: findDataId
+          AttributeType: S
       KeySchema:
-      - AttributeName: findDataId
-        KeyType: HASH
+        - AttributeName: findDataId
+          KeyType: HASH
 
   LogicalResultsMainTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}LogicalResultsMain
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: logicalResultId
-        AttributeType: S
+        - AttributeName: logicalResultId
+          AttributeType: S
       KeySchema:
-      - AttributeName: logicalResultId
-        KeyType: HASH
+        - AttributeName: logicalResultId
+          KeyType: HASH
 
   LogicalResultsDataTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}LogicalResultsData
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: logicalResultId
-        AttributeType: S
-      - AttributeName: identifiersId
-        AttributeType: S
+        - AttributeName: logicalResultId
+          AttributeType: S
+        - AttributeName: identifiersId
+          AttributeType: S
       KeySchema:
-      - AttributeName: logicalResultId
-        KeyType: HASH
-      - AttributeName: identifiersId
-        KeyType: RANGE
+        - AttributeName: logicalResultId
+          KeyType: HASH
+        - AttributeName: identifiersId
+          KeyType: RANGE
 
   AwaitingStepTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}AwaitingStep
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: awaitingStepId
-        AttributeType: S
-      - AttributeName: pendingStepId
-        AttributeType: S
+        - AttributeName: awaitingStepId
+          AttributeType: S
+        - AttributeName: pendingStepId
+          AttributeType: S
       KeySchema:
-      - AttributeName: awaitingStepId
-        KeyType: HASH
-      - AttributeName: pendingStepId
-        KeyType: RANGE
+        - AttributeName: awaitingStepId
+          KeyType: HASH
+        - AttributeName: pendingStepId
+          KeyType: RANGE
 
   TargetRolesTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}TargetRoles
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: targetId
-        AttributeType: S
-      - AttributeName: roleIdKey
-        AttributeType: S
+        - AttributeName: targetId
+          AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
       KeySchema:
-      - AttributeName: targetId
-        KeyType: HASH
-      - AttributeName: roleIdKey
-        KeyType: RANGE
+        - AttributeName: targetId
+          KeyType: HASH
+        - AttributeName: roleIdKey
+          KeyType: RANGE
 
   RolePermissionsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}RolePermissions
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: roleIdKey
-        AttributeType: S
-      - AttributeName: flowTypeConcat
-        AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
+        - AttributeName: flowTypeConcat
+          AttributeType: S
       KeySchema:
-      - AttributeName: roleIdKey
-        KeyType: HASH
-      - AttributeName: flowTypeConcat
-        KeyType: RANGE
+        - AttributeName: roleIdKey
+          KeyType: HASH
+        - AttributeName: flowTypeConcat
+          KeyType: RANGE
 
   RoleUsersTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}RoleUsers
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: roleIdKey
-        AttributeType: S
-      - AttributeName: userId
-        AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
+        - AttributeName: userId
+          AttributeType: S
       KeySchema:
-      - AttributeName: roleIdKey
-        KeyType: HASH
-      - AttributeName: userId
-        KeyType: RANGE
+        - AttributeName: roleIdKey
+          KeyType: HASH
+        - AttributeName: userId
+          KeyType: RANGE
 
   UserRolesTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}UserRoles
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: userId
-        AttributeType: S
-      - AttributeName: roleIdKey
-        AttributeType: S
+        - AttributeName: userId
+          AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
       KeySchema:
-      - AttributeName: userId
-        KeyType: HASH
-      - AttributeName: roleIdKey
-        KeyType: RANGE
-<% if (hasS3) { %>
+        - AttributeName: userId
+          KeyType: HASH
+        - AttributeName: roleIdKey
+          KeyType: RANGE
+  <% if (hasS3) { %>
   ReservedDataMainTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}ReservedDataMain
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: servicePendingId
-        AttributeType: S
-      - AttributeName: reservedDataId
-        AttributeType: S
+        - AttributeName: servicePendingId
+          AttributeType: S
+        - AttributeName: reservedDataId
+          AttributeType: S
       KeySchema:
-      - AttributeName: servicePendingId
-        KeyType: HASH
-      - AttributeName: reservedDataId
-        KeyType: RANGE
+        - AttributeName: servicePendingId
+          KeyType: HASH
+        - AttributeName: reservedDataId
+          KeyType: RANGE
 <% } %>

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

@@ -1,7 +1,7 @@
 ##===== WebSocket completion subscription
-  SubscriptionToOut<%= topicName %>WebSocketComplete:
-    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}WebSocketCompleteHdrSqs"
-      Protocol: "sqs"
+SubscriptionToOut<%= topicName %>WebSocketComplete:
+  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}WebSocketCompleteHdrSqs'
+    Protocol: 'sqs'

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

@@ -65,7 +65,7 @@ export const main = middleware.wrap(async (event, context) => {
 
     // loop each record and send to mainFunction
     await Promise.all(
-      event.Records.map(async record => {
+      event.Records.map(async (record) => {
         // promise.all for map() function
 
         let passOnProperties = [];

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

@@ -3,20 +3,22 @@ import {
   response
 } from '@izara_project/izara-middleware';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
-
 import <%= functionName %> from './<%= mainFileName %>.js';
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 const validatorSchema = {
-  //(<validatorSchema>)
-  <% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { -%>
+<%_ if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { _%>
   type: 'object',
   properties: {
-    <% startConfig.properties.forEach(prop => { -%>
-    <%- prop.propertyName %>: { type: '<%- prop.type || 'string' %>' }
-    <% }) -%>
+<%_ startConfig.properties.forEach((prop, index) => { _%>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>' }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+<%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]
-  <% } -%>
+<%_ } _%>
+  //(<validatorSchema>)
   //(</validatorSchema>)
 };
 

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

@@ -21,41 +21,48 @@ import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import <%= functionName %> from './<%= mainFileName %>.js';
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 // validate event properties in body.Message of sqs event
 let perRecordsValidatorSchema = {
-  //(<validatorSchema>)
-  <% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { -%>
+<%_ if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { _%>
   type: 'object',
   properties: {
-    <% startConfig.properties.forEach((prop, index) => { %> <%- prop.propertyName %>: {
+<%_ startConfig.properties.forEach((prop, index) => { _%>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
       type: '<%- prop.type || 'string' %>'
-    },
-    <% }) %>
+    }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+<%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]
-  <% } -%>
+<%_ } _%>
+  //(<validatorSchema>)
   //(</validatorSchema>)
 };
 
-<% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.messageAttributes && startConfig.messageAttributes.length > 0) { -%>
+<%_ if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.messageAttributes && startConfig.messageAttributes.length > 0) { _%>
 let messageAttributeValidatorSchema = {
   type: 'object',
   properties: {
-    <% startConfig.messageAttributes.forEach((prop, index) => { %> <%- prop.propertyName %>: {
+<%_ startConfig.messageAttributes.forEach((prop, index) => { _%>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
       type: 'object',
       properties: {
         Type: { type: 'string' },
         Value: { type: '<%- prop.type || 'string' %>' }
       },
       required: ['Type', 'Value']
-    },
-    <% }) %>
+    }<%- index < startConfig.messageAttributes.length - 1 ? ',' : '' %>
+<%_ }) _%>
   },
   required: [<%- startConfig.messageAttributes.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]
+  //(<messageAttributeValidatorSchema>)
+  //(</messageAttributeValidatorSchema>)
 };
-<% } else { -%>
+<%_ } else { _%>
 let messageAttributeValidatorSchema = null;
-<% } -%>
+<%_ } _%>
 
 middleware.setValidatorSchema(
   recordHandlerSharedLib.baseValidatorSchema({

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

@@ -1,19 +1,21 @@
 import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
-
 import <%= functionName %> from './<%= mainFileName %>.js';
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 const validatorSchema = {
-  //(<validatorSchema>)
-  <% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { -%>
+<%_ if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { _%>
   type: 'object',
   properties: {
-    <% startConfig.properties.forEach(prop => { -%>
-    <%- prop.propertyName %>: { type: '<%- prop.type || 'string' %>' }
-    <% }) -%>
+<%_ startConfig.properties.forEach((prop, index) => { _%>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: { type: '<%- prop.type || 'string' %>' }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+<%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]
-  <% } -%>
+<%_ } _%>
+  //(<validatorSchema>)
   //(</validatorSchema>)
 };
 

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

@@ -21,41 +21,48 @@ import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import <%= functionName %> from './<%= mainFileName %>.js';
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 // validate event properties in body.Message of sqs event
 let perRecordsValidatorSchema = {
-  //(<validatorSchema>)
-  <% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { -%>
+<%_ if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { _%>
   type: 'object',
   properties: {
-    <% startConfig.properties.forEach((prop, index) => { %> <%- prop.propertyName %>: {
+<%_ startConfig.properties.forEach((prop, index) => { _%>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
       type: '<%- prop.type || 'string' %>'
-    },
-    <% }) %>
+    }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
+<%_ }) _%>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]
-  <% } -%>
+<%_ } _%>
+  //(<validatorSchema>)
   //(</validatorSchema>)
 };
 
-<% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.messageAttributes && startConfig.messageAttributes.length > 0) { -%>
+<%_ if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.messageAttributes && startConfig.messageAttributes.length > 0) { _%>
 let messageAttributeValidatorSchema = {
   type: 'object',
   properties: {
-    <% startConfig.messageAttributes.forEach((prop, index) => { %> <%- prop.propertyName %>: {
+<%_ startConfig.messageAttributes.forEach((prop, index) => { _%>
+    <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
       type: 'object',
       properties: {
         Type: { type: 'string' },
         Value: { type: '<%- prop.type || 'string' %>' }
       },
       required: ['Type', 'Value']
-    },
-    <% }) %>
+    }<%- index < startConfig.messageAttributes.length - 1 ? ',' : '' %>
+<%_ }) _%>
   },
   required: [<%- startConfig.messageAttributes.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]
+  //(<messageAttributeValidatorSchema>)
+  //(</messageAttributeValidatorSchema>)
 };
-<% } else { -%>
+<%_ } else { _%>
 let messageAttributeValidatorSchema = null;
-<% } -%>
+<%_ } _%>
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 export const main = middleware.wrap(async (event, context) => {

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

@@ -93,7 +93,7 @@ export const main = middleware.wrap(async (event, context) => {
 
     // loop each record and send to mainFunction
     await Promise.all(
-      event.Records.map(async record => {
+      event.Records.map(async (record) => {
         // promise.all for map() function
 
         // --- reforming record.body for Dsq request

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

@@ -80,7 +80,7 @@ export const main = middleware.wrap(async (event, context) => {
 
     // loop each record and send to mainFunction
     await Promise.all(
-      event.Records.map(async record => {
+      event.Records.map(async (record) => {
         // promise.all for map() function
 
         let passOnProperties = [];

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

@@ -183,7 +183,7 @@ export default async function paginateProcessLogical(
         if (conditionalFieldValue.hasOwnProperty('includeValues')) {
           let includeValues = conditionalFieldValue.includeValues; // array
 
-          objInstanceBases = objInstanceBases.filter(objInstanceBase => {
+          objInstanceBases = objInstanceBases.filter((objInstanceBase) => {
             return includeValues.includes(
               objInstanceBase[conditionalFieldName]
             );
@@ -191,7 +191,7 @@ export default async function paginateProcessLogical(
         } else if (conditionalFieldValue.hasOwnProperty('excludeValues')) {
           let excludeValues = conditionalFieldValue.excludeValues; // array
 
-          objInstanceBases = objInstanceBases.filter(objInstanceBase => {
+          objInstanceBases = objInstanceBases.filter((objInstanceBase) => {
             return !excludeValues.includes(
               objInstanceBase[conditionalFieldName]
             );

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

@@ -62,7 +62,7 @@ export const main = middleware.wrap(async (event, context) => {
 
     // loop each record and send to mainFunction
     await Promise.all(
-      event.Records.map(async record => {
+      event.Records.map(async (record) => {
         // promise.all for map() function
 
         let passOnProperties = [];