@izara_project/izara-core-generate-service-code 1.0.66 → 1.0.67

package/src/generate.js

@@ -46,7 +46,7 @@ async function emitGroups({ project, objects, relationships, flows }) {
     emitCrudApplicationArtifacts({ objects, flows, serviceTag: project.serviceTag }),
     emitRelationshipApplicationArtifacts({ relationships, flows, serviceTag: project.serviceTag }),
     emitRbacApplicationArtifacts(objects),
-    emitSystemWebSocketArtifacts(flows, { includeRelationshipOwnTopic: relationships.length > 0 }),
+    emitSystemWebSocketArtifacts(flows, { includeRelationshipOwnTopic: true }),
     emitResourceArtifacts({ objects, relationships, flows })
   ]);
   const custom = await emitCustomFlowApplicationArtifacts(flows, { systemFunctions: system.functions, objects });
@@ -58,7 +58,7 @@ async function emitGroups({ project, objects, relationships, flows }) {
     { scope: 'relationship-application', managedPaths: relationshipApplicationManagedPaths(), artifacts: relationship },
     { scope: 'rbac-application', managedPaths: rbacApplicationManagedPaths(objects), artifacts: rbac },
     { scope: 'system-websocket', managedPaths: systemWebSocketManagedPaths(), artifacts: system.artifacts },
-    { scope: 'custom-flow-application', managedPaths: customFlowApplicationManagedPaths(flows, { includeYaml: hasSystemWebSocket(flows, { includeRelationshipOwnTopic: relationships.length > 0 }) }), artifacts: custom },
+    { scope: 'custom-flow-application', managedPaths: customFlowApplicationManagedPaths(flows, { includeYaml: hasSystemWebSocket(flows, { includeRelationshipOwnTopic: true }) }), artifacts: custom },
     { scope: 'shared-resources', managedPaths: resourceArtifactPaths, artifacts: resource }
   ];
 }

package/test/crudApplicationArtifacts.test.js

@@ -14,7 +14,7 @@ test('emits CRUD handlers and function YAML from schema data without reading gen
   const rootPath = await createProject(true);
   const result = await generateCrudApplicationArtifacts(rootPath, { serviceTag: 'orders' });
 
-  assert.equal(result.files.length, 24);
+  assert.equal(result.files.length, 26);
   assert.ok(result.files.every(file => !file.path.includes('/Process')));
   assert.match(
     await readFile(join(rootPath, 'app/src/generatedCode/FlowObjects/Get/source/Get_Main.js'), 'utf8'),

package/test/customFlowApplicationArtifacts.test.js

@@ -25,13 +25,13 @@ test('emits handlers, function YAML, and IAM roles for supported custom flow eve
   const result = await generateCustomFlowApplicationArtifacts(rootPath);
   await generateResourceArtifacts(rootPath);
 
-  assert.equal(result.files.length, 40);
-  assert.match(await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Ext/source/ProcessExt_HdrSqs.js'), 'utf8'), /dummyId/);
-  assert.match(await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Api/source/ProcessApi_HdrApi.js'), 'utf8'), /ProcessApi/);
+  assert.equal(result.files.length, 38);
+  assert.match(await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Ext/source/Ext_HdrSqs.js'), 'utf8'), /dummyId/);
+  assert.match(await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Api/source/Api_HdrApi.js'), 'utf8'), /Api/);
   const yaml = await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'), 'utf8');
-  assert.match(yaml, /ProcessEventHdrInv:/);
+  assert.match(yaml, /EventHdrInv:/);
   assert.match(yaml, /rate\(1 minute\)/);
-  assert.match(yaml, /ProcessExtHdrSqs:/);
+  assert.match(yaml, /ExtHdrSqs:/);
   const iam = await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/generate-shared-resource.yml'), 'utf8');
   assert.match(iam, /EventRole:/);
   assert.match(iam, /ExtRole:/);
@@ -50,13 +50,11 @@ test('emits handlers, function YAML, and IAM roles for supported custom flow eve
     /"CurrentOrderTable"/
   );
   await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Own/source/ProcessOwn_Main.js')));
-  assert.match(await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Mixed/source/Mixed_HdrSqs.js'), 'utf8'), /Mixed_Main/);
-  assert.match(await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Mixed/source/ProcessMixed_HdrSqs.js'), 'utf8'), /ProcessMixed/);
+  assert.match(await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Mixed/source/Mixed_HdrSqs.js'), 'utf8'), /Mixed/);
   assert.match(yaml, /OwnHdrWbs:/);
   assert.match(yaml, /OwnHdrSqs:/);
   assert.ok(yaml.indexOf('OwnHdrWbs:') < yaml.indexOf('OwnHdrSqs:'));
   assert.match(yaml, /MixedHdrSqs:/);
-  assert.match(yaml, /ProcessMixedHdrSqs:/);
   assert.match(yaml, /UploadProcessAfterUploadHdrS3:/);
   assert.match(
     await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Upload/source/UploadProcessAfterUpload_Main.js'), 'utf8'),
@@ -111,10 +109,10 @@ test('emits handlers, function YAML, and IAM roles for supported custom flow eve
 test('removes only V2-owned custom-flow application artifacts when supported events are removed', async () => {
   const rootPath = await createProject();
   await generateCustomFlowApplicationArtifacts(rootPath);
-  await writeFile(join(rootPath, 'app/src/schemas/FlowSchemas/Flows.js'), "export default [{ flowTag: 'later', event: ['dsq'] }];\n");
+  await writeFile(join(rootPath, 'app/src/schemas/FlowSchemas/Flows.js'), "export default [{ flowTag: 'later', event: ['unsupported'] }];\n");
 
   assert.deepEqual((await generateCustomFlowApplicationArtifacts(rootPath)).files, []);
-  await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Ext/source/ProcessExt_HdrSqs.js')));
+  await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Ext/source/Ext_HdrSqs.js')));
   await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Own/source/Own_HdrWbs.js')));
   await assert.rejects(readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml')));
 });
@@ -126,6 +124,7 @@ test('emits and removes ext-topic handlers declared by custom flow steps', async
 
   assert.ok(result.files.some(file => file.path === 'app/src/generatedCode/FlowSchemas/Stepped/source/SteppedComplete_HdrSqs.js'));
   assert.ok(result.files.some(file => file.path === 'app/src/generatedCode/FlowSchemas/Generated/source/GeneratedComplete_HdrSqs.js'));
+  assert.ok(result.files.some(file => file.path === 'app/src/generatedCode/FlowSchemas/DsqStep/source/DsqStepRetryDsq_HdrDsq.js'));
   assert.match(
     await readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Stepped/source/SteppedComplete_Main.js'), 'utf8'),
     /identifierUuid/
@@ -134,10 +133,18 @@ test('emits and removes ext-topic handlers declared by custom flow steps', async
     await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'), 'utf8'),
     /SteppedCompleteHdrSqs:\n  handler: src\/generatedCode\/FlowSchemas\/Stepped\/source\/SteppedComplete_HdrSqs.main/
   );
+  assert.match(
+    await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'), 'utf8'),
+    /DsqStepRetryDsqHdrDsq:\n  handler: src\/generatedCode\/FlowSchemas\/DsqStep\/source\/DsqStepRetryDsq_HdrDsq.main/
+  );
   assert.match(
     await readFile(join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'), 'utf8'),
     /^  SteppedCompleteHdrSqs:/m
   );
+  assert.match(
+    await readFile(join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'), 'utf8'),
+    /^  DsqStepRetryDsqHdrDsq:/m
+  );
   assert.match(
     await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/generate-shared-resource.yml'), 'utf8'),
     /GeneratedRole:/
@@ -163,13 +170,10 @@ test('emits and removes the legacy trigger-cache artifact suite', async () => {
 
   const source = 'app/src/generatedCode/FlowSchemas/Cart/source';
   for (const fileName of [
-    'ProcessTriggerCacheCart_Main.js',
-    'ProcessTriggerCacheCart_HdrDsq.js',
-    'CheckTriggerCacheCartComplete_Main.js',
-    'CheckTriggerCacheCartComplete_HdrSqs.js',
-    'TriggerCacheCartComplete_Main.js',
-    'TriggerCacheCartComplete_HdrSqs.js',
-    'TriggerCacheCartComplete_HdrDsq.js'
+    'CartCheckTriggerCacheCartComplete_Main.js',
+    'CartCheckTriggerCacheCartComplete_HdrSqs.js',
+    'CartTriggerCacheCartComplete_Main.js',
+    'CartTriggerCacheCartComplete_HdrSqs.js'
   ]) {
     const path = join(rootPath, source, fileName);
     await access(path);
@@ -178,38 +182,33 @@ test('emits and removes the legacy trigger-cache artifact suite', async () => {
 
   const flowYaml = await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'), 'utf8');
   for (const functionName of [
-    'ProcessTriggerCacheCartHdrDsq',
-    'CheckTriggerCacheCartCompleteHdrSqs',
-    'TriggerCacheCartCompleteHdrSqs',
-    'TriggerCacheCartCompleteHdrDsq'
+    'CartCheckTriggerCacheCartCompleteHdrSqs',
+    'CartTriggerCacheCartCompleteHdrSqs'
   ]) {
     assert.match(flowYaml, new RegExp(`^${functionName}:`, 'm'));
   }
   assert.match(
-    await readFile(join(rootPath, `${source}/CheckTriggerCacheCartComplete_HdrSqs.js`), 'utf8'),
+    await readFile(join(rootPath, `${source}/CartCheckTriggerCacheCartComplete_HdrSqs.js`), 'utf8'),
     /record\.body\.Message\.identifiers/
   );
 
   const resources = await readFile(join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'), 'utf8');
-  assert.match(resources, /^  OrderCartMain:/m);
+  assert.match(resources, /^  CartHdrSqs:/m);
   for (const queueName of [
-    'OrderCart_Main',
-    'CheckTriggerCacheCartCompleteHdrSqs',
-    'TriggerCacheCartCompleteHdrSqs',
-    'TriggerCacheCartCompleteHdrDsq'
+    'CartHdrSqs',
+    'CartCheckTriggerCacheCartCompleteHdrSqs',
+    'CartTriggerCacheCartCompleteHdrSqs',
+    'CartTriggerCacheCartCompleteHdrDsq'
   ]) assert.match(resources, new RegExp('QueueName: \\$\\{self:custom\\.iz_resourcePrefix\\}' + queueName));
   const iam = await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/generate-shared-resource.yml'), 'utf8');
-  for (const queueName of ['OrderCart_Main', 'CheckTriggerCacheCartCompleteHdrSqs', 'TriggerCacheCartCompleteHdrSqs', 'TriggerCacheCartCompleteHdrDsq']) {
-    assert.match(iam, new RegExp(`CartRole:[\\s\\S]*${queueName}`));
-  }
 
   await writeFile(join(rootPath, 'app/src/schemas/FlowSchemas/Cart.js'), "export default { flowTag: 'cart', event: ['ownTopic'], statusType: 'none' };\n");
   await generateCustomFlowApplicationArtifacts(rootPath);
   await generateResourceArtifacts(rootPath);
 
-  await assert.rejects(readFile(join(rootPath, `${source}/ProcessTriggerCacheCart_Main.js`)));
-  assert.doesNotMatch(await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'), 'utf8'), /ProcessTriggerCacheCartHdrDsq/);
-  assert.doesNotMatch(await readFile(join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'), 'utf8'), /OrderCart_Main/);
+  await assert.rejects(readFile(join(rootPath, `${source}/CartCheckTriggerCacheCartComplete_Main.js`)));
+  assert.doesNotMatch(await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'), 'utf8'), /CartCheckTriggerCacheCartCompleteHdrSqs/);
+  assert.doesNotMatch(await readFile(join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'), 'utf8'), /CartTriggerCacheCartCompleteHdrDsq/);
 });
 
 test('rejects an EventBridge schedule without a deployable name and rate', () => {
@@ -278,6 +277,10 @@ async function createStepProject() {
     join(schemaRoot, 'Generated.js'),
     "export default { flowTag: 'generated', event: ['ownTopic'], generatedCodeConfig: { generatedCodeTag: 'create' }, flowSteps: [{ stepName: 'start' }, { stepName: 'Complete', event: ['extTopic'] }] };\n"
   );
+  await writeFile(
+    join(schemaRoot, 'DsqStep.js'),
+    "export default { flowTag: 'dsqStep', event: ['extTopic'], flowSteps: [{ stepName: 'start' }, { stepName: 'RetryDsq', event: ['dsq'] }] };\n"
+  );
   return rootPath;
 }
 
@@ -288,7 +291,7 @@ async function createTriggerCacheProject() {
   await mkdir(schemaRoot, { recursive: true });
   await writeFile(
     join(schemaRoot, 'Cart.js'),
-    "export default { flowTag: 'cart', event: ['ownTopic'], statusType: 'triggerCache', objType: { serviceTag: 'Order' } };\n"
+    "export default { flowTag: 'cart', event: ['ownTopic'], statusType: 'triggerCache', objType: { serviceTag: 'Order' }, flowSteps: [{ stepName: 'start' }, { stepName: 'CheckTriggerCacheCartComplete', checkTriggerType: 'flowType', event: ['extTopic'] }, { stepName: 'TriggerCacheCartComplete', checkTriggerType: 'complete', event: ['extTopic', 'dsq'] }] };\n"
   );
   return rootPath;
 }

package/test/publicApi.test.js

@@ -21,7 +21,7 @@ test('generate commits schemas, application artifacts, and resources in one publ
   const rootPath = await createCrudProject();
   const result = await generate(rootPath);
 
-  assert.equal(result.files.length, 36);
+  assert.strictEqual(result.files.length, 38);
   assert.equal(result.project.rootPath, rootPath);
   assert.match(
     await readFile(join(rootPath, 'app/src/generatedCode/FlowObjects/Create/source/Create_Main.js'), 'utf8'),
@@ -104,17 +104,18 @@ test('generate commits the legacy trigger-cache suite with its queues', async ()
   const result = await generate(rootPath);
 
   for (const path of [
-    'app/src/generatedCode/FlowSchemas/Cart/source/ProcessTriggerCacheCart_Main.js',
-    'app/src/generatedCode/FlowSchemas/Cart/source/CheckTriggerCacheCartComplete_HdrSqs.js',
-    'app/src/generatedCode/FlowSchemas/Cart/source/TriggerCacheCartComplete_HdrDsq.js'
+    'app/src/generatedCode/FlowSchemas/Cart/source/CartCheckTriggerCacheCartComplete_HdrSqs.js',
+    'app/src/generatedCode/FlowSchemas/Cart/source/CartCheckTriggerCacheCartComplete_Main.js',
+    'app/src/generatedCode/FlowSchemas/Cart/source/CartTriggerCacheCartComplete_HdrSqs.js',
+    'app/src/generatedCode/FlowSchemas/Cart/source/CartTriggerCacheCartComplete_Main.js'
   ]) assert.ok(result.files.some(file => file.path === path));
   assert.match(
     await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'), 'utf8'),
-    /ProcessTriggerCacheCartHdrDsq:[\s\S]*TriggerCacheCartCompleteHdrDsq:/
+    /CartCheckTriggerCacheCartCompleteHdrSqs:[\s\S]*CartTriggerCacheCartCompleteHdrSqs:/
   );
   assert.match(
     await readFile(join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'), 'utf8'),
-    /OrderCartMain:[\s\S]*TriggerCacheCartCompleteHdrDsq/
+    /CartCheckTriggerCacheCartCompleteHdrSqs:[\s\S]*CartTriggerCacheCartCompleteHdrSqs/
   );
 });
 
@@ -127,7 +128,6 @@ test('generate removes the system WebSocket path when the last own-topic flow is
 
   await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/SystemFlowSchemas/WebSocketMain/source/WebSocketComplete_HdrSqs.js')));
   await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/FlowSchemas/Track/source/Track_HdrWbs.js')));
-  await assert.rejects(readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml')));
   assert.doesNotMatch(
     await readFile(join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'), 'utf8'),
     /WebSocketCompleteHdrSqs/
@@ -192,7 +192,7 @@ async function createOwnTopicProject() {
   await mkdir(flowDirectory, { recursive: true });
   await writeFile(
     join(flowDirectory, 'Track.js'),
-    "export default { flowTag: 'track', event: ['ownTopic'], outputTopic: true, statusType: 'none', generatedCodeConfig: { generatedCodeTag: 'create', codeHookTag: 'beforeLogical', invocationType: 'ownTopic' } };\n"
+    "export default { flowTag: 'track', event: ['ownTopic'], initiateBy: 'user', outputTopic: true, statusType: 'none', generatedCodeConfig: { generatedCodeTag: 'create', codeHookTag: 'beforeLogical', invocationType: 'ownTopic' } };\n"
   );
   return rootPath;
 }
@@ -203,7 +203,7 @@ async function createTriggerCacheProject() {
   await mkdir(flowDirectory, { recursive: true });
   await writeFile(
     join(flowDirectory, 'Cart.js'),
-    "export default { flowTag: 'cart', event: ['ownTopic'], statusType: 'triggerCache', objType: { serviceTag: 'Order' } };\n"
+    "export default { flowTag: 'cart', event: ['ownTopic'], statusType: 'triggerCache', objType: { serviceTag: 'Order' }, flowSteps: [{ stepName: 'CheckTriggerCacheCartComplete', event: ['extTopic'], checkTriggerType: 'flowType' }, { stepName: 'TriggerCacheCartComplete', event: ['extTopic'], checkTriggerType: 'complete' }] };\n"
   );
   return rootPath;
 }

package/test/resourceArtifacts.test.js

@@ -84,7 +84,7 @@ test('emits the shared WebSocket completion queue and output-topic subscriptions
   for (const roleName of ['WebSocketMainRole', 'FlowObjectsRole', 'FlowRelationshipRole', 'FlowRbacRole', 'CustomRole', 'UploadRole']) {
     const role = roleBlock(iam, roleName);
     assert.match(role, /execute-api:ManageConnections/);
-    assert.match(role, /arn:aws:execute-api:\$\{self:custom\.iz_region\}:\$\{self:custom\.iz_accountId\}:\$\{self:custom\.iz_webSocketHostId\}\/\*/);
+    assert.match(role, /arn:aws:execute-api:\$\{self:custom\.iz_region\}:\$\{self:custom\.iz_accountId\}:\*\/\*/);
   }
   assert.match(resources, /SubscriptionToOutCreateRelationshipWebSocketComplete:/);
 });