@izara_project/izara-core-generate-service-code 1.0.72 → 1.0.74

package/test/customFlowApplicationArtifacts.test.js

@@ -602,3 +602,209 @@ async function createTriggerCacheProject(triggerFlowTypes) {
   );
   return rootPath;
 }
+
+test('supports step-level required overrides in flowSteps properties and messageAttributes', async () => {
+  const rootPath = await mkdtemp(
+    join(tmpdir(), 'generate-service-code-v2-step-required-')
+  );
+  roots.add(rootPath);
+  const schemaRoot = join(rootPath, 'app/src/schemas/FlowSchemas');
+  await mkdir(schemaRoot, { recursive: true });
+
+  await writeFile(
+    join(schemaRoot, 'Reservations.js'),
+    `export default {
+      flowTag: 'Reservations',
+      event: ['ownTopic'],
+      stepProperties: {
+        reservationItems: { propertyName: 'reservationItems', type: 'array' }
+      },
+      stepMessageAttributes: {
+        userId: { propertyName: 'x-correlation-base-user-id', type: 'string' }
+      },
+      flowSteps: [
+        {
+          stepName: 'Start',
+          properties: [{ key: 'reservationItems', required: true }],
+          messageAttributes: [{ key: 'userId', required: true }]
+        },
+        {
+          stepName: 'Complete',
+          event: ['extTopic'],
+          properties: ['reservationItems'],
+          messageAttributes: ['userId']
+        }
+      ]
+    };\n`
+  );
+
+  const result = await generateCustomFlowApplicationArtifacts(rootPath);
+  assert.ok(result);
+
+  const startHdrContent = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowSchemas/Reservations/source/Reservations_HdrSqs.js'
+    ),
+    'utf8'
+  );
+  assert.match(
+    startHdrContent,
+    /perRecordsValidatorSchema = {[\s\S]*required: \['reservationItems'\]/
+  );
+  assert.match(
+    startHdrContent,
+    /messageAttributeValidatorSchema = {[\s\S]*required: \['x-correlation-base-user-id'\]/
+  );
+
+  const completeHdrContent = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowSchemas/Reservations/source/ReservationsComplete_HdrSqs.js'
+    ),
+    'utf8'
+  );
+  assert.match(
+    completeHdrContent,
+    /perRecordsValidatorSchema = {[\s\S]*required: \[\]/
+  );
+  assert.match(
+    completeHdrContent,
+    /messageAttributeValidatorSchema = {[\s\S]*required: \[\]/
+  );
+});
+
+test(
+  'picks properties from inProcess flowStep and renders default keys ' +
+    'in handler validator schema',
+  async () => {
+    const rootPath = await mkdtemp(
+      join(tmpdir(), 'generate-service-code-v2-inprocess-')
+    );
+    roots.add(rootPath);
+    const schemaRoot = join(rootPath, 'app/src/schemas/FlowSchemas');
+    await mkdir(schemaRoot, { recursive: true });
+
+    await writeFile(
+      join(schemaRoot, 'InProcessFlow.js'),
+      `export default {
+      flowTag: 'InProcessFlow',
+      event: ['extTopic', 'lambdaSyncApi'],
+      stepProperties: {
+        status: { propertyName: 'status', type: 'string', default: 'ACTIVE' },
+        retryCount: { propertyName: 'retryCount', type: 'number', default: 0 }
+      },
+      flowSteps: [
+        {
+          stepName: 'inProcess',
+          properties: ['status', { key: 'retryCount', default: 3 }]
+        }
+      ]
+    };\n`
+    );
+
+    const result = await generateCustomFlowApplicationArtifacts(rootPath);
+    assert.ok(result);
+
+    const sqsHdrContent = await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowSchemas/InProcessFlow/source/' +
+          'InProcessFlow_HdrSqs.js'
+      ),
+      'utf8'
+    );
+    assert.match(
+      sqsHdrContent,
+      /status: {[\s\S]*type: 'string',[\s\S]*default: 'ACTIVE'/
+    );
+    assert.match(
+      sqsHdrContent,
+      /retryCount: {[\s\S]*type: 'number',[\s\S]*default: 3/
+    );
+
+    const apiHdrContent = await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowSchemas/InProcessFlow/source/' +
+          'InProcessFlow_HdrApi.js'
+      ),
+      'utf8'
+    );
+    assert.match(
+      apiHdrContent,
+      /status: { type: 'string', default: 'ACTIVE' }/
+    );
+    assert.match(apiHdrContent, /retryCount: { type: 'number', default: 3 }/);
+  }
+);
+
+test('renders nextSteps IAM permissions in InitialSetupConfig', async () => {
+  const { generate } = await import('../src/generate.js');
+  const rootPath = await mkdtemp(
+    join(tmpdir(), 'generate-service-code-v2-nextsteps-')
+  );
+  roots.add(rootPath);
+  const schemaRoot = join(rootPath, 'app/src/schemas/FlowSchemas');
+  await mkdir(schemaRoot, { recursive: true });
+
+  await writeFile(
+    join(schemaRoot, 'Reservations.js'),
+    `export default {
+      flowTag: 'Reservations',
+      event: ['ownTopic'],
+      flowSteps: [
+        {
+          stepName: 'Start',
+          nextSteps: [
+            {
+              targetType: 'extTopic',
+              serviceTag: 'GraphHandler',
+              topic: 'GetDeepPathSearch_In'
+            }
+          ]
+        },
+        {
+          stepName: 'GetDeepPathSearch',
+          event: ['extTopic'],
+          nextSteps: [
+            {
+              targetType: 'ownTopic',
+              topic: 'Create_In'
+            }
+          ]
+        },
+        {
+          stepName: 'Complete',
+          event: ['extTopic']
+        }
+      ]
+    };\n`
+  );
+
+  const result = await generate(rootPath, {
+    serviceTag: 'ReservationsService'
+  });
+  assert.ok(result);
+
+  const initialSetupConfigContent = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+    ),
+    'utf8'
+  );
+  assert.match(initialSetupConfigContent, /roleName: 'ReservationsRole'/);
+  assert.match(
+    initialSetupConfigContent,
+    /ReservationsRolePublishNextStepsTopics/
+  );
+  assert.match(
+    initialSetupConfigContent,
+    /snsTopicNameByFlowSchema\(_izContext, 'GetDeepPathSearch_In', 'GraphHandler'\)/
+  );
+  assert.match(
+    initialSetupConfigContent,
+    /snsTopicNameByFlowSchema\(\s*_izContext,\s*'Create_In'\)/
+  );
+});

package/test/functionYamlArtifact.test.js

@@ -80,12 +80,15 @@ test('filters all SQS functions by their calling flow', () => {
 
   assert.match(
     completion,
-    /filterPatterns:[\s\S]*\$\{self:custom\.iz_resourcePrefix\}CreateCompleteHdrSqs/
+    /#<#CreateCompleteHdrSqsFilterPatterns#>[\s\S]*filterPatterns:[\s\S]*\$\{self:custom\.iz_resourcePrefix\}CreateCompleteHdrSqs/
   );
+  assert.match(completion, /#<#\/CreateCompleteHdrSqsFilterPatterns#>/);
   assert.match(completion, /exists: false/);
   assert.match(
     ordinary,
-    /filterPatterns:[\s\S]*\$\{self:custom\.iz_resourcePrefix\}CreateHdrSqs/
+    /#<#CreateHdrSqsFilterPatterns#>[\s\S]*filterPatterns:[\s\S]*\$\{self:custom\.iz_resourcePrefix\}CreateHdrSqs/
   );
+  assert.match(ordinary, /#<#\/CreateHdrSqsFilterPatterns#>/);
   assert.match(ordinary, /exists: false/);
 });
+

package/test/publicApi.test.js

@@ -347,3 +347,32 @@ async function createTriggerCacheProject() {
   );
   return rootPath;
 }
+
+test(
+  'emits ignoreExternalServices hooks in UploadSchema_Main.js and ' +
+    'commands/uploadSchema.js',
+  async () => {
+    const rootPath = await createCrudProject();
+    await generate(rootPath);
+
+    const uploadSchemaMain = await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/CoreFunctions/UploadSchema_Main.js'
+      ),
+      'utf8'
+    );
+    assert.match(uploadSchemaMain, /\/\/\(<ignoreExternalServices>\)/);
+    assert.match(uploadSchemaMain, /\/\/\(<\/ignoreExternalServices>\)/);
+
+    const commandUploadSchema = await readFile(
+      join(
+        rootPath,
+        'app/initial_setup/generatedCode/source/commands/uploadSchema.js'
+      ),
+      'utf8'
+    );
+    assert.match(commandUploadSchema, /\/\/\(<ignoreExternalServices>\)/);
+    assert.match(commandUploadSchema, /\/\/\(<\/ignoreExternalServices>\)/);
+  }
+);

package/test/relationshipApplicationArtifacts.test.js

@@ -74,20 +74,54 @@ test('emits relationship action and complete handlers with data-first function Y
     readFile(
       join(
         rootPath,
-        'app/src/generatedCode/FlowRelationships/CreateRelationship/source/ProcessCreateRelationship_Main.js'
+        'app/src/generatedCode/FlowRelationships/CreateRelationship/' +
+          'source/ProcessCreateRelationship_Main.js'
       )
     )
   );
-  assert.match(
-    await readFile(
-      join(
-        rootPath,
-        'app/src/generatedCode/FlowRelationships/CreateRelationship/source/CreateRelationship_Main.js'
-      ),
-      'utf8'
+  const createMainContent = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowRelationships/CreateRelationship/' +
+        'source/CreateRelationship_Main.js'
     ),
+    'utf8'
+  );
+  assert.match(
+    createMainContent,
     /export default async function createRelationship/
   );
+  assert.match(
+    createMainContent,
+    /awaitingStepIds\.push\(\{[\s\S]*awaitingStepId:/
+  );
+  assert.match(
+    createMainContent,
+    /createAwaitingMultipleSteps\(\s*_izContext,\s*asyncFlowSharedLib\.createPendingStepId/
+  );
+  assert.doesNotMatch(createMainContent, /const linkTypeId = createLinkTypeId/);
+
+  const createCompleteContent = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowRelationships/CreateRelationship/' +
+        'source/CreateRelationshipComplete_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(
+    createCompleteContent,
+    /export default async function createRelationshipComplete\(\s*_izContext,\s*requestParams,/
+  );
+  assert.match(
+    createCompleteContent,
+    /const {\s*returnValue,\s*status,\s*errorsFound,\s*graphServiceTag\s*} = requestParams;/
+  );
+  assert.doesNotMatch(
+    createCompleteContent,
+    /const linkTypeId = createLinkTypeId/
+  );
+
   assert.match(yaml, /CreateRelationshipCompleteHdrSqs:/);
 });
 

package/test/resourceArtifacts.test.js

@@ -27,10 +27,7 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
     ),
     'utf8'
   );
-  assert.match(
-    resources,
-    /SubscriptionOutCreateToUploadReservedLimitHdrSqs:/
-  );
+  assert.match(resources, /SubscriptionOutCreateToUploadReservedLimitHdrSqs:/);
   assert.match(resources, /TopicArn: !Ref OutCreate/);
   assert.match(
     resources,
@@ -45,16 +42,16 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
   ]) {
     assert.match(resources, new RegExp(`^  ${queueName}:`, 'm'));
   }
-  assert.match(
-    await readFile(
-      join(
-        rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-dynamoDB-table.yml'
-      ),
-      'utf8'
+  const dynamoYaml = await readFile(
+    join(
+      rootPath,
+      'resource/sls_yaml/generatedCode/source/generated-dynamoDB-table.yml'
     ),
-    /OrdersTable:/
+    'utf8'
   );
+  assert.match(dynamoYaml, /OrdersTable:/);
+  assert.match(dynamoYaml, /#<#OrdersTableSetting#>/);
+  assert.match(dynamoYaml, /#<#\/OrdersTableSetting#>/);
   const iam = await readFile(
     join(
       rootPath,
@@ -84,10 +81,7 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
     /RolePermissions|ProcessCreateTargetRoleHdrSqs/
   );
   // Per-object RBAC flow queue (e.g. OrderRbacFlowHdrSqs from Order with rbac add-on)
-  assert.match(
-    roleBlock(iam, 'FlowRbacRole'),
-    /OrderRbacFlowHdrSqs/
-  );
+  assert.match(roleBlock(iam, 'FlowRbacRole'), /OrderRbacFlowHdrSqs/);
   assert.match(resources, /^  CreateRelationshipHdrSqs:/m);
   assert.equal(
     (resources.match(/^  CreateRelationshipHdrSqs:/gm) ?? []).length,
@@ -219,6 +213,30 @@ test('scopes stored-cache permissions to the flow object table', async () => {
   assert.doesNotMatch(role, /Orders|WebSocketTask/);
 });
 
+test('emits DynamoDB tables and hooks defined in flowSchemas storageResources', async () => {
+  const rootPath = await createProject();
+  await writeFile(
+    join(rootPath, 'app/src/schemas/FlowSchemas/FlowWithTable.js'),
+    "export default { flowTag: 'tableFlow', event: ['ownTopic'], " +
+      "storageResources: { main: { storageType: 'dynamoDB', " +
+      "tableName: 'FlowCustomTable' } }, identifiers: " +
+      "[{ type: 'partitionKey', fieldName: 'flowKey' }] };\n"
+  );
+
+  await generateResourceArtifacts(rootPath);
+
+  const dynamoYaml = await readFile(
+    join(
+      rootPath,
+      'resource/sls_yaml/generatedCode/source/generated-dynamoDB-table.yml'
+    ),
+    'utf8'
+  );
+  assert.match(dynamoYaml, /FlowCustomTableTable:/);
+  assert.match(dynamoYaml, /#<#FlowCustomTableTableSetting#>/);
+  assert.match(dynamoYaml, /#<#\/FlowCustomTableTableSetting#>/);
+});
+
 function roleBlock(iam, roleName) {
   const match = iam.match(
     new RegExp(