@izara_project/izara-core-generate-service-code 1.0.68 → 1.0.69

package/src/emit/resource/emitResourceArtifacts.js

@@ -1,4 +1,4 @@
-import ejs from 'ejs';
+import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
 import {
@@ -92,7 +92,7 @@ export async function emitResourceArtifacts({
     renderLambdaRoleConfig(state),
     renderS3(state)
   ]);
-  return [
+  const artifacts = [
     {
       path: `${RESOURCE_ROOT}/generated-sns-in-sqs.yml`,
       content: normalizeYaml(inSqs)
@@ -105,10 +105,6 @@ export async function emitResourceArtifacts({
       path: `${RESOURCE_ROOT}/generated-dynamoDB-table.yml`,
       content: normalizeYaml(dynamo)
     },
-    {
-      path: `${RESOURCE_ROOT}/generated-s3.yml`,
-      content: normalizeYaml(s3)
-    },
     {
       path: `${APP_ROOT}/generate-shared-resource.yml`,
       content: normalizeYaml(iam)
@@ -118,6 +114,13 @@ export async function emitResourceArtifacts({
       content: lambdaRoleConfig
     }
   ];
+  if (state.s3Buckets.length > 0) {
+    artifacts.push({
+      path: `${RESOURCE_ROOT}/generated-s3.yml`,
+      content: normalizeYaml(s3)
+    });
+  }
+  return artifacts;
 }
 
 export const resourceArtifactPaths = [
@@ -134,62 +137,60 @@ function createResourceState({ objects, relationships, flows }) {
   const rbac = objects.some(hasRbacAddOn);
   const ownTopics = new Set(
     flows
-      .filter(flow => includesEvent(flow, 'ownTopic'))
-      .map(flow => upperFirst(flow.flowTag))
+      .filter((flow) => includesEvent(flow, 'ownTopic'))
+      .map((flow) => upperFirst(flow.flowTag))
   );
   const sqsQueues = new Set([
     ...LEGACY_PROCESS_QUEUES,
     ...flows
-      .filter(flow => includesEvent(flow, 'extTopic'))
-      .map(flow => `Process${upperFirst(flow.flowTag)}HdrSqs`)
+      .filter((flow) => includesEvent(flow, 'extTopic'))
+      .map((flow) => `Process${upperFirst(flow.flowTag)}HdrSqs`)
   ]);
-  flowExtTopicSteps(flows).forEach(({ flowTag, stepName }) =>
-    sqsQueues.add(`${flowTag}${stepName}HdrSqs`)
-  );
-  flows
-    .filter(flow => includesEvent(flow, 's3'))
-    .forEach(flow => {
-      const tag = upperFirst(flow.flowTag);
-      sqsQueues.add(`${tag}CreatePreSignUrlHdrSqs`);
-      sqsQueues.add(`${tag}ReservedLimitHdrSqs`);
-      sqsQueues.add(`${tag}ConfirmAfterUploadHdrSqs`);
-    });
+  for (const { flowTag, stepName } of flowExtTopicSteps(flows)) {
+    sqsQueues.add(`${flowTag}${stepName}HdrSqs`);
+  }
+  for (const flow of flows.filter((flow) => includesEvent(flow, 's3'))) {
+    const tag = upperFirst(flow.flowTag);
+    sqsQueues.add(`${tag}CreatePreSignUrlHdrSqs`);
+    sqsQueues.add(`${tag}ReservedLimitHdrSqs`);
+    sqsQueues.add(`${tag}ConfirmAfterUploadHdrSqs`);
+  }
   const dsqQueues = new Set(
     flows
-      .filter(flow => includesEvent(flow, 'dsq'))
-      .map(flow => `${upperFirst(flow.flowTag)}HdrDsq`)
-  );
-  flowDsqSteps(flows).forEach(({ flowTag, stepName }) =>
-    dsqQueues.add(`${flowTag}${stepName}HdrDsq`)
+      .filter((flow) => includesEvent(flow, 'dsq'))
+      .map((flow) => `${upperFirst(flow.flowTag)}HdrDsq`)
   );
+  for (const { flowTag, stepName } of flowDsqSteps(flows)) {
+    dsqQueues.add(`${flowTag}${stepName}HdrDsq`);
+  }
   if (crud) {
-    CRUD_ACTIONS.forEach(action => ownTopics.add(action));
-    ['Create', 'Update', 'Delete'].forEach(action =>
-      sqsQueues.add(`${action}CompleteHdrSqs`)
-    );
+    for (const action of CRUD_ACTIONS) {
+      ownTopics.add(action);
+    }
+    for (const action of ['Create', 'Update', 'Delete']) {
+      sqsQueues.add(`${action}CompleteHdrSqs`);
+    }
   }
   if (relationships.length > 0) {
-    RELATIONSHIP_ACTIONS.forEach(action => {
+    for (const action of RELATIONSHIP_ACTIONS) {
       ownTopics.add(action);
       sqsQueues.add(`${action}CompleteHdrSqs`);
-    });
+    }
     dsqQueues.add('GetRelationshipHdrDsq');
   }
   if (rbac) {
-    RBAC_ACTIONS.forEach(action => {
+    for (const action of RBAC_ACTIONS) {
       ownTopics.add(action);
       sqsQueues.add(`Process${action}HdrSqs`);
-    });
-    objects
-      .filter(hasRbacAddOn)
-      .forEach(object => {
-        const flowTag = upperFirst(object.objectType) + 'RbacFlow';
-        ownTopics.add(flowTag);
-      });
+    }
+    for (const object of objects.filter(hasRbacAddOn)) {
+      const flowTag = upperFirst(object.objectType) + 'RbacFlow';
+      ownTopics.add(flowTag);
+    }
   }
   const beforeLogicalByAction = new Map();
   for (const flow of flows.filter(
-    flow => flow?.generatedCodeConfig?.codeHookTag === 'beforeLogical'
+    (flow) => flow?.generatedCodeConfig?.codeHookTag === 'beforeLogical'
   )) {
     const action = upperFirst(flow.generatedCodeConfig.generatedCodeTag);
     if (!action || !flow.flowTag) continue;
@@ -202,10 +203,10 @@ function createResourceState({ objects, relationships, flows }) {
   );
   const customRoles = [
     ...new Set([
-      ...supportedCustomFlows(flows).map(flow =>
+      ...supportedCustomFlows(flows).map((flow) =>
         customFlowRoleName(flow.flowTag)
       ),
-      ...generatedOwnTopicFlows(flows).map(flow =>
+      ...generatedOwnTopicFlows(flows).map((flow) =>
         customFlowRoleName(flow.flowTag)
       ),
       ...flowExtTopicSteps(flows).map(({ flow }) =>
@@ -217,21 +218,28 @@ function createResourceState({ objects, relationships, flows }) {
   const websocket = hasSystemWebSocket(flows, {
     includeRelationshipOwnTopic: true
   });
-  const webSocketRoles = new Set(websocket ? ['WebSocketMainRole'] : []);
+  const webSocketRoles = new Set();
+  if (websocket) {
+    webSocketRoles.add('WebSocketMainRole');
+  }
   if (crud) webSocketRoles.add('FlowObjectsRole');
   if (relationships.length > 0) webSocketRoles.add('FlowRelationshipRole');
   if (rbac) webSocketRoles.add('FlowRbacRole');
-  [...supportedCustomFlows(flows), ...generatedOwnTopicFlows(flows)]
-    .filter(
-      flow => includesEvent(flow, 'ownTopic') || includesEvent(flow, 's3')
-    )
-    .forEach(flow => webSocketRoles.add(customFlowRoleName(flow.flowTag)));
+  const filteredWsFlows = [
+    ...supportedCustomFlows(flows),
+    ...generatedOwnTopicFlows(flows)
+  ].filter(
+    (flow) => includesEvent(flow, 'ownTopic') || includesEvent(flow, 's3')
+  );
+  for (const flow of filteredWsFlows) {
+    webSocketRoles.add(customFlowRoleName(flow.flowTag));
+  }
   const outTopics = new Set([
     ...ownTopics,
     ...beforeLogical.map(({ action }) => action),
     ...flows
-      .filter(flow => flow?.outputTopic && upperFirst(flow.flowTag))
-      .map(flow => upperFirst(flow.flowTag))
+      .filter((flow) => flow?.outputTopic && upperFirst(flow.flowTag))
+      .map((flow) => upperFirst(flow.flowTag))
   ]);
   const objectTableNames = [...collectTables(objects).keys()];
   const relationshipTableNames = [...collectTables(relationships).keys()];
@@ -240,15 +248,36 @@ function createResourceState({ objects, relationships, flows }) {
     ...collectTables(relationships)
   ]);
   const externalDynamoTables = objects.flatMap(
-    object => object.externalDynamoResources ?? []
+    (object) => object.externalDynamoResources ?? []
   );
   const s3Buckets = flows
-    .filter(flow => includesEvent(flow, 's3') && flow.createBucket === true)
-    .map(flow => flow.bucketName)
+    .filter((flow) => includesEvent(flow, 's3') && flow.createBucket === true)
+    .map((flow) => flow.bucketName)
     .filter(Boolean);
+  const s3FlowTags = flows
+    .filter((flow) => includesEvent(flow, 's3'))
+    .map((flow) => upperFirst(flow.flowTag));
+  const s3Subscriptions = 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)}`
+        : flow.s3Subscription?.topicName || 'OutCreate';
+      const queueName =
+        flow.s3Subscription?.queueName || `${tag}ReservedLimitHdrSqs`;
+      const subscriptionName =
+        flow.s3Subscription?.subscriptionName ||
+        `Subscription${topicName}To${queueName}`;
+      return { subscriptionName, topicName, queueName };
+    });
   return {
     crud,
     rbac,
+    s3Subscriptions,
+    s3FlowTags,
     relationships: relationships.length > 0,
     ownTopics: [...ownTopics].filter(Boolean).sort(),
     sqsQueues: [...sqsQueues].filter(Boolean).sort(),
@@ -260,9 +289,9 @@ function createResourceState({ objects, relationships, flows }) {
     webSocketSubscriptions: websocket
       ? [...outTopics]
           .filter(
-            topic =>
+            (topic) =>
               flows.some(
-                flow =>
+                (flow) =>
                   (flow?.outputTopic ||
                     (includesEvent(flow, 'ownTopic') &&
                       flow.initiateBy === 'user')) &&
@@ -285,10 +314,10 @@ function createResourceState({ objects, relationships, flows }) {
     externalDynamoTables,
     objectTablesByType: new Map(
       objects
-        .map(object => [
+        .map((object) => [
           object.objectType,
           Object.values(object.storageResources ?? {}).find(
-            resource => resource?.storageType === 'dynamoDB'
+            (resource) => resource?.storageType === 'dynamoDB'
           )?.tableName
         ])
         .filter(([, tableName]) => tableName)
@@ -300,22 +329,25 @@ function createResourceState({ objects, relationships, flows }) {
 
 async function renderS3(state) {
   if (state.s3Buckets.length === 0) return 'Resources:';
-  const template = await readFile(new URL('S3Bucket_Yaml.ejs', TEMPLATE_URL), 'utf8');
+  const template = await readFile(
+    new URL('S3Bucket_Yaml.ejs', TEMPLATE_URL),
+    'utf8'
+  );
   const chunks = await Promise.all(
-    state.s3Buckets.map(bucketName => ejs.render(template, { bucketName }))
+    state.s3Buckets.map((bucketName) => ejsLib.render(template, { bucketName }))
   );
   return `Resources:\n${chunks.join('\n')}`;
 }
 
 async function renderInSqs(state) {
   const chunks = await Promise.all([
-    ...state.ownTopics.map(queueName =>
+    ...state.ownTopics.map((queueName) =>
       render('ResourceYaml.ejs', { queueName })
     ),
-    ...state.sqsQueues.map(queueName =>
+    ...state.sqsQueues.map((queueName) =>
       render('ResourceSqsYaml.ejs', { queueName })
     ),
-    ...state.dsqQueues.map(queueName =>
+    ...state.dsqQueues.map((queueName) =>
       render('ResourceSqsYaml.ejs', { queueName })
     ),
     ...state.beforeLogical.map(({ action, flowTags }) =>
@@ -332,17 +364,39 @@ async function renderInSqs(state) {
         ]
       : [])
   ]);
-  return `Resources:\n${chunks.join('\n')}\n${state.webSocketSubscriptions.map(renderWebSocketSubscription).join('\n')}`;
+  const webSocketSubscriptions = await Promise.all(
+    state.webSocketSubscriptions.map((topicName) =>
+      renderWebSocketSubscription(topicName)
+    )
+  );
+  const s3Subscriptions = await Promise.all(
+    (state.s3Subscriptions ?? []).map(
+      ({ subscriptionName, topicName, queueName }) =>
+        render('S3Subscription_Yaml.ejs', {
+          subscriptionName,
+          topicName,
+          queueName
+        })
+    )
+  );
+  const parts = [chunks.join('\n')];
+  if (webSocketSubscriptions.length > 0) {
+    parts.push(webSocketSubscriptions.join('\n'));
+  }
+  if (s3Subscriptions.length > 0) {
+    parts.push(s3Subscriptions.join('\n'));
+  }
+  return `Resources:\n${parts.join('\n')}`;
 }
 
 async function renderOut(state) {
-  return `Resources:\n${(await Promise.all(state.outTopics.map(topicName => render('FlowOut_Yaml.ejs', { topicName })))).join('\n')}`;
+  return `Resources:\n${(await Promise.all(state.outTopics.map((topicName) => render('FlowOut_Yaml.ejs', { topicName })))).join('\n')}`;
 }
 
 async function renderDynamo(state) {
   const [system, ...tables] = await Promise.all([
     render('SystemDynamoDB_Yaml.ejs', {}),
-    ...state.tables.map(table => render('DynamoDBTable_Yaml.ejs', table))
+    ...state.tables.map((table) => render('DynamoDBTable_Yaml.ejs', table))
   ]);
   return `${system}\n${tables.join('\n')}`;
 }
@@ -355,7 +409,7 @@ async function renderIam(state) {
   if (state.websocket) roles.push('WebSocketMainRole');
   roles.push(...state.customRoles);
   return render('SharedResource_Yaml.ejs', {
-    roles: roles.sort().map(roleName => ({
+    roles: roles.sort().map((roleName) => ({
       roleName,
       statements: roleStatements(state, roleName)
     }))
@@ -364,8 +418,8 @@ async function renderIam(state) {
 
 async function renderLambdaRoleConfig(state) {
   const s3Flows = state.flows
-    .filter(flow => includesEvent(flow, 's3'))
-    .map(flow => ({
+    .filter((flow) => includesEvent(flow, 's3'))
+    .map((flow) => ({
       roleName: upperFirst(flow.flowTag)
     }));
   return render('GeneratedLambdaRoleServiceConfig.ejs', {
@@ -385,14 +439,10 @@ function roleStatements(state, roleName) {
       ]
     });
   }
-  addStatement(
-    statements,
-    dynamoActionsForRole(roleName),
-    [
-      ...dynamoArns(roleTableNames(state, roleName)),
-      ...externalDynamoArns(roleExternalDynamoTables(state, roleName))
-    ]
-  );
+  addStatement(statements, dynamoActionsForRole(roleName), [
+    ...dynamoArns(roleTableNames(state, roleName)),
+    ...externalDynamoArns(roleExternalDynamoTables(state, roleName))
+  ]);
   addStatement(
     statements,
     SQS_CONSUMER_ACTIONS,
@@ -452,7 +502,7 @@ function roleTableNames(state, roleName) {
       'LogicalResultsData'
     ];
   const flow = state.flows.find(
-    candidate => customFlowRoleName(candidate?.flowTag ?? '') === roleName
+    (candidate) => customFlowRoleName(candidate?.flowTag ?? '') === roleName
   );
   if (!flow) return [];
   const tables = [];
@@ -477,68 +527,91 @@ function dynamoActionsForRole(roleName) {
 }
 
 function roleQueueNames(state, roleName) {
-  if (roleName === 'ProcFindDataRole') return LEGACY_PROCESS_QUEUES;
-  if (roleName === 'WebSocketMainRole')
-    return state.websocket ? ['WebSocketCompleteHdrSqs'] : [];
-  if (roleName === 'FlowObjectsRole')
+  if (roleName === 'ProcFindDataRole') {
+    return LEGACY_PROCESS_QUEUES;
+  }
+  if (roleName === 'WebSocketMainRole') {
+    if (state.websocket) {
+      return ['WebSocketCompleteHdrSqs'];
+    }
+    return [];
+  }
+  if (roleName === 'FlowObjectsRole') {
     return [
-      ...CRUD_ACTIONS.map(action => `${action}HdrSqs`),
-      ...CRUD_ACTIONS.filter(action => action !== 'Get').map(
-        action => `${action}CompleteHdrSqs`
+      ...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`)
     ];
-  if (roleName === 'FlowRelationshipRole')
+  }
+  if (roleName === 'FlowRelationshipRole') {
     return [
-      ...RELATIONSHIP_ACTIONS.flatMap(action => [
+      ...RELATIONSHIP_ACTIONS.flatMap((action) => [
         `${action}HdrSqs`,
         `${action}CompleteHdrSqs`
       ]),
       'GetRelationshipHdrDsq'
     ];
-  if (roleName === 'FlowRbacRole')
-    return RBAC_ACTIONS.flatMap(action => [
+  }
+  if (roleName === 'FlowRbacRole') {
+    return RBAC_ACTIONS.flatMap((action) => [
       `${action}HdrSqs`,
       `Process${action}HdrSqs`
     ]);
+  }
   const flow = state.flows.find(
-    candidate => customFlowRoleName(candidate?.flowTag ?? '') === roleName
+    (candidate) => customFlowRoleName(candidate?.flowTag ?? '') === roleName
   );
-  if (!flow) return [];
+  if (!flow) {
+    return [];
+  }
   const tag = upperFirst(flow.flowTag);
-  return [
-    ...(includesEvent(flow, 'extTopic') ? [`${tag}HdrSqs`] : []),
-    ...(includesEvent(flow, 'ownTopic') ? [`${tag}HdrSqs`] : []),
-    ...(includesEvent(flow, 'dsq') ? [`${tag}HdrDsq`] : []),
+  const queueList = [];
+  if (includesEvent(flow, 'extTopic')) {
+    queueList.push(`${tag}HdrSqs`);
+  }
+  if (includesEvent(flow, 'ownTopic')) {
+    queueList.push(`${tag}HdrSqs`);
+  }
+  if (includesEvent(flow, 'dsq')) {
+    queueList.push(`${tag}HdrDsq`);
+  }
+  queueList.push(
     ...flowExtTopicSteps([flow]).map(
       ({ flowTag, stepName }) => `${flowTag}${stepName}HdrSqs`
-    ),
+    )
+  );
+  queueList.push(
     ...flowDsqSteps([flow]).map(
       ({ flowTag, stepName }) => `${flowTag}${stepName}HdrDsq`
-    ),
+    )
+  );
+  queueList.push(
     ...state.sqsQueues.filter(
-      queueName => includesEvent(flow, 's3') && queueName.startsWith(tag)
+      (queueName) => includesEvent(flow, 's3') && queueName.startsWith(tag)
     )
-  ];
+  );
+  return queueList;
 }
 
 function roleTopicNames(state, roleName) {
   if (roleName === 'ProcFindDataRole') return [];
   if (roleName === 'FlowObjectsRole')
-    return state.outTopics.filter(topic => CRUD_ACTIONS.includes(topic));
+    return state.outTopics.filter((topic) => CRUD_ACTIONS.includes(topic));
   if (roleName === 'FlowRelationshipRole')
-    return state.outTopics.filter(topic =>
+    return state.outTopics.filter((topic) =>
       RELATIONSHIP_ACTIONS.includes(topic)
     );
   if (roleName === 'FlowRbacRole')
-    return state.outTopics.filter(topic => RBAC_ACTIONS.includes(topic));
+    return state.outTopics.filter((topic) => RBAC_ACTIONS.includes(topic));
   const flow = state.flows.find(
-    candidate => customFlowRoleName(candidate?.flowTag ?? '') === roleName
+    (candidate) => customFlowRoleName(candidate?.flowTag ?? '') === roleName
   );
   return flow
-    ? state.outTopics.filter(topic => topic === upperFirst(flow.flowTag))
+    ? state.outTopics.filter((topic) => topic === upperFirst(flow.flowTag))
     : [];
 }
 
@@ -546,7 +619,7 @@ function dynamoArns(tableNames) {
   return [...new Set(tableNames)]
     .sort()
     .map(
-      tableName =>
+      (tableName) =>
         `arn:aws:dynamodb:${'${self:custom.iz_region}'}:${'${self:custom.iz_accountId}'}:table/${'${self:custom.iz_resourcePrefix}'}${tableName}`
     );
 }
@@ -601,7 +674,7 @@ function queueArns(queueNames) {
   return [...new Set(queueNames)]
     .sort()
     .map(
-      queueName =>
+      (queueName) =>
         `arn:aws:sqs:${'${self:custom.iz_region}'}:${'${self:custom.iz_accountId}'}:${'${self:custom.iz_resourcePrefix}'}${queueName}`
     );
 }
@@ -610,13 +683,13 @@ function topicArns(topicNames) {
   return [...new Set(topicNames)]
     .sort()
     .map(
-      topic =>
+      (topic) =>
         `arn:aws:sns:${'${self:custom.iz_region}'}:${'${self:custom.iz_accountId}'}:${'${self:custom.iz_serviceTag}'}_${'${self:custom.iz_stage}'}_${topic}_Out`
     );
 }
 
 function renderWebSocketSubscription(topicName) {
-  return `##===== WebSocket completion subscription\n  SubscriptionToOut${topicName}WebSocketComplete:\n    Type: AWS::SNS::Subscription\n    Properties:\n      TopicArn: !Ref Out${topicName}\n      Endpoint: "arn:aws:sqs:${'${self:custom.iz_region}'}:${'${self:custom.iz_accountId}'}:${'${self:custom.iz_resourcePrefix}'}WebSocketCompleteHdrSqs"\n      Protocol: "sqs"`;
+  return render('WebSocketSubscription_Yaml.ejs', { topicName });
 }
 
 function collectTables(schemas) {
@@ -629,13 +702,13 @@ function collectTables(schemas) {
     const pk =
       keyName(
         identifiers.find(
-          identifier =>
+          (identifier) =>
             identifier.type === 'partitionKey' ||
             identifier.type === 'identifier'
         )
       ) ?? 'PK';
     const sk = keyName(
-      identifiers.find(identifier => identifier.type === 'sortKey')
+      identifiers.find((identifier) => identifier.type === 'sortKey')
     );
     for (const resource of Object.values(schema.storageResources)) {
       if (
@@ -650,13 +723,13 @@ function collectTables(schemas) {
 }
 
 function keyName(identifier) {
-  if (!identifier) return undefined;
+  if (!identifier) return null;
   return (
     identifier.name ??
     identifier.fieldName ??
     (Array.isArray(identifier.fieldNames)
       ? identifier.fieldNames.join(identifier.deliminator ?? '_')
-      : undefined)
+      : null)
   );
 }
 
@@ -669,7 +742,7 @@ function isCrudObject(object) {
 function hasRbacAddOn(object) {
   return (
     Array.isArray(object?.addOnDataStructure) &&
-    object.addOnDataStructure.some(addOn => addOn?.type === 'rbac')
+    object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
   );
 }
 function includesEvent(flow, event) {
@@ -684,7 +757,7 @@ function normalizeYaml(content) {
   return `${content.trimEnd()}\n`;
 }
 async function render(templateName, data) {
-  return ejs.render(
+  return ejsLib.render(
     await readFile(new URL(templateName, TEMPLATE_URL), 'utf8'),
     { resourceQueueName: data.queueName, ...data }
   );

package/src/emit/resource/generateResourceArtifacts.js

@@ -2,7 +2,10 @@ import { buildGenerationPlan } from '../../plan/buildGenerationPlan.js';
 import { commitArtifacts } from '../../output/commitArtifacts.js';
 import { compileProject } from '../../compile/compileProject.js';
 import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
-import { emitResourceArtifacts, resourceArtifactPaths } from './emitResourceArtifacts.js';
+import {
+  emitResourceArtifacts,
+  resourceArtifactPaths
+} from './emitResourceArtifacts.js';
 
 export async function generateResourceArtifacts(rootPath, options = {}) {
   const project = compileProject({ ...options, rootPath });
@@ -11,10 +14,16 @@ export async function generateResourceArtifacts(rootPath, options = {}) {
     loadLocalSchemaDirectory(project, 'RelationshipSchemas'),
     loadLocalSchemaDirectory(project, 'FlowSchemas')
   ]);
-  const artifacts = await emitResourceArtifacts({ objects, relationships, flows });
-  const files = await commitArtifacts(buildGenerationPlan(project, artifacts, {
-    managedPaths: resourceArtifactPaths,
-    managedScope: 'shared-resources'
-  }));
+  const artifacts = await emitResourceArtifacts({
+    objects,
+    relationships,
+    flows
+  });
+  const files = await commitArtifacts(
+    buildGenerationPlan(project, artifacts, {
+      managedPaths: resourceArtifactPaths,
+      managedScope: 'shared-resources'
+    })
+  );
   return { project, files };
 }

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

@@ -1,20 +1,20 @@
 ##===== [DynamoDB Table: <%- tableName %>]
-<%- tableName %>Table:
-  Type: AWS::DynamoDB::Table
-  Properties:
-    TableName: ${self:custom.iz_resourcePrefix}<%- tableName %>
-    BillingMode: PAY_PER_REQUEST
-    AttributeDefinitions:
-      - AttributeName: '<%- pk %>'
-        AttributeType: 'S'
-      <% if (sk) { %>
-      - AttributeName: '<%- sk %>'
-        AttributeType: 'S'
-    <% } %>
-    KeySchema:
-      - AttributeName: '<%- pk %>'
-        KeyType: 'HASH'
-      <% if (sk) { %>
-      - AttributeName: '<%- sk %>'
-        KeyType: 'RANGE'
+  <%- tableName %>Table:
+    Type: AWS::DynamoDB::Table
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}<%- tableName %>
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+        - AttributeName: "<%- pk %>"
+          AttributeType: "S"
+<% if (sk) { %>
+        - AttributeName: "<%- sk %>"
+          AttributeType: "S"
+<% } %>
+      KeySchema:
+        - AttributeName: "<%- pk %>"
+          KeyType: "HASH"
+<% if (sk) { %>
+        - AttributeName: "<%- sk %>"
+          KeyType: "RANGE"
 <% } %>

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

@@ -1,6 +1,6 @@
 ##===== [Topic Out]
-Out<%- topicName %>:
-  Type: AWS::SNS::Topic
-  Properties:
-    DisplayName: 'SNS Message out'
-    TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- topicName %>_Out
+  Out<%- topicName %>:
+    Type: AWS::SNS::Topic
+    Properties:
+      DisplayName: "SNS Message out"
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- topicName %>_Out