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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/emit/coreFunction/templates/CoreResource_Yaml.ejs

@@ -42,6 +42,8 @@ Resources:
                 Resource:
                   - arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:${self:custom.iz_resourcePrefix}AddLinkCreateByRelHdrInv
                   - arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:${self:custom.iz_resourcePrefix}AddLinkBelongToHdrInv
+                  - arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:UserAccount${self:custom.iz_stage}AddLinkCreateByRelHdrInv
+                  - arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:UserAccount${self:custom.iz_stage}AddLinkBelongToHdrInv
                   - arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:GraphHandler${self:custom.iz_stage}CreateAllIndexSchemasHdrInv
                   - arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:TranslateIds${self:custom.iz_stage}CreatePermissionHdrInv
                   - arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:Translations${self:custom.iz_stage}AddLinkToTranslationLinksHdrInv

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import Logger from '@izara_project/izara-core-library-logger';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 
 const _izContext = { logger: Logger };
 

package/src/emit/crud/templates/FlowEndpointBeforeLogical_Main.ejs

@@ -33,7 +33,7 @@ import {
 
 const { createObjType, firstLetterUpperCase } = utils;
 
-import { <%- flowTag %>MainLogical } from './Process<%- upperCaseFlowTag %>_Main.js';
+import { <%- flowTag %>MainLogical } from './<%- upperCaseFlowTag %>_Main.js';
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -26,7 +26,7 @@ const CUSTOM_TEMPLATE_URL = new URL('./templates/', import.meta.url);
 
 export async function emitCustomFlowApplicationArtifacts(
   flows,
-  { systemFunctions = [], objects = [] } = {}
+  { objects = [] } = {}
 ) {
   const customFlows = supportedCustomFlows(flows);
   const generatedRoots = generatedOwnTopicFlows(flows);
@@ -36,8 +36,7 @@ export async function emitCustomFlowApplicationArtifacts(
     customFlows.length === 0 &&
     generatedRoots.length === 0 &&
     steps.length === 0 &&
-    dsqSteps.length === 0 &&
-    systemFunctions.length === 0
+    dsqSteps.length === 0
   )
     return [];
 
@@ -57,20 +56,18 @@ export async function emitCustomFlowApplicationArtifacts(
     {
       path: YAML_PATH,
       content: [
-        ...systemFunctions,
         ...emitted.flatMap((result) => result.functions),
         ...roots.flatMap((result) => result.functions),
         ...stepResults.flatMap((result) => result.functions),
         ...dsqStepResults.flatMap((result) => result.functions)
-      ].join('\n')
+      ]
+        .filter(Boolean)
+        .join('\n\n')
     }
   ];
 }
 
-export function customFlowApplicationManagedPaths(
-  flows,
-  { includeYaml = false } = {}
-) {
+export function customFlowApplicationManagedPaths(flows) {
   return [
     ...supportedCustomFlows(flows).flatMap((flow) => flowPaths(flow)),
     ...generatedOwnTopicFlows(flows).flatMap(ownTopicRootPaths),
@@ -97,8 +94,7 @@ export function customFlowApplicationManagedPaths(
     generatedOwnTopicFlows(flows).length > 0 ||
     generatedDsqFlows(flows).length > 0 ||
     flowExtTopicSteps(flows).length > 0 ||
-    flowDsqSteps(flows).length > 0 ||
-    includeYaml
+    flowDsqSteps(flows).length > 0
       ? [YAML_PATH]
       : [])
   ];

package/src/emit/custom/templates/FlowEndpoint_Main.ejs

@@ -40,6 +40,9 @@ import { utils } from '@izara_project/izara-core-library-service-schemas';
 const { createFlowTypeConcat } = utils;
 //(</optionalImport>)
 
+//(<helperFunction>)
+//(</helperFunction>)
+
 /**
  *
  *
@@ -70,7 +73,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       callingFlowConfig
     );
 
-    <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
+<% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { -%>
 
     //(<beforeCheckCache>)
     //(</beforeCheckCache>)
@@ -105,9 +108,9 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       //(<checkStoredCacheHook>)
       //(</checkStoredCacheHook>)
     }
-    <% } %>
+<% } -%>
+<% if (typeof flow !== 'undefined' && flow.isRbac) { -%>
 
-    <% if (typeof flow !== 'undefined' && flow.isRbac) { %>
     const { checkRbacPermission } =
       await import('@izara_project/izara-authorization');
 
@@ -139,11 +142,11 @@ export default async function <%- typeof functionName !== 'undefined' ? function
         )
       });
     }
-
-    <% } %>
+<% } -%>
 
     //(<endpointHook>)
     //(</endpointHook>)
+
   } catch (err) {
     _izContext.logger.error('error WebSocketInvoke: ', err);
     throw err;

package/src/emit/relationship/emitDynamicRelationshipFlowSchemas.js

@@ -13,8 +13,17 @@ export const dynamicRelationshipFlowSchemaPaths = ACTIONS.map(
     `app/src/schemas/FlowSchemas/generateCode/FlowRelationship/${action}.js`
 );
 
-export function emitDynamicRelationshipFlowSchemas() {
-  // Keep legacy compatibility: relationship flow endpoints exist even before a relationship is declared.
+export function dynamicRelationshipFlowSchemaManagedPaths(relationships = []) {
+  if (!Array.isArray(relationships) || relationships.length === 0) {
+    return [];
+  }
+  return dynamicRelationshipFlowSchemaPaths;
+}
+
+export function emitDynamicRelationshipFlowSchemas({ relationships = [] } = {}) {
+  if (!Array.isArray(relationships) || relationships.length === 0) {
+    return [];
+  }
   return ACTIONS.map((action, index) => ({
     path: dynamicRelationshipFlowSchemaPaths[index],
     content: _renderDynamicRelationshipFlowSchema(

package/src/emit/relationship/generateDynamicRelationshipFlowSchemas.js

@@ -3,7 +3,7 @@ import { commitArtifacts } from '../../output/commitArtifacts.js';
 import { compileProject } from '../../compile/compileProject.js';
 import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
 import {
-  dynamicRelationshipFlowSchemaPaths,
+  dynamicRelationshipFlowSchemaManagedPaths,
   emitDynamicRelationshipFlowSchemas
 } from './emitDynamicRelationshipFlowSchemas.js';
 
@@ -12,14 +12,15 @@ export async function generateDynamicRelationshipFlowSchemas(
   options = {}
 ) {
   const project = compileProject({ ...options, rootPath });
-  // The legacy generator creates these endpoints even with no relationships. Load now to
-  // validate the V2 source-module contract before later slices consume relationship data.
-  await loadLocalSchemaDirectory(project, 'RelationshipSchemas');
+  const relationships = await loadLocalSchemaDirectory(
+    project,
+    'RelationshipSchemas'
+  );
   const plan = buildGenerationPlan(
     project,
-    emitDynamicRelationshipFlowSchemas(),
+    emitDynamicRelationshipFlowSchemas({ relationships }),
     {
-      managedPaths: dynamicRelationshipFlowSchemaPaths,
+      managedPaths: dynamicRelationshipFlowSchemaManagedPaths(relationships),
       managedScope: 'relationship-flow-schemas'
     }
   );

package/src/emit/resource/emitResourceArtifacts.js

@@ -411,6 +411,9 @@ async function renderInSqs(state) {
       ? [
           render('ResourceSqsYaml.ejs', {
             queueName: 'WebSocketCompleteHdrSqs'
+          }),
+          render('ResourceSqsYaml.ejs', {
+            queueName: 'RegisterCompleteHdrSqs'
           })
         ]
       : [])
@@ -603,6 +606,12 @@ function roleQueueNames(state, roleName) {
     }
     return [];
   }
+  if (roleName === 'RegisterRole') {
+    if (state.websocket) {
+      return ['RegisterCompleteHdrSqs'];
+    }
+    return [];
+  }
   if (roleName === 'FlowObjectsRole') {
     return [
       ...CRUD_ACTIONS.map((action) => `${action}HdrSqs`),

package/src/emit/system/emitSystemFindDataArtifacts.js

@@ -40,7 +40,7 @@ function _hasStorageObjects(objects) {
 
 async function _emitSystemArtifacts(objects) {
   if (!_hasStorageObjects(objects)) {
-    return [];
+    return { artifacts: [], functions: [] };
   }
 
   const hasFindDataEntries = buildFindDataEntries(objects).length > 0;
@@ -80,17 +80,16 @@ async function _emitSystemArtifacts(objects) {
     {
       path: `${PROCESS_LOGICAL_SOURCE}/PaginateProcessLogical_HdrSqs.js`,
       content: await render('PaginateProcessLogical_HdrSqs.ejs', {})
-    },
-    {
-      path: YAML_PATH,
-      content: renderSystemYaml()
     }
   );
 
-  return artifacts;
+  return {
+    artifacts,
+    functions: renderSystemYamlFunctions()
+  };
 }
 
-function renderSystemYaml() {
+function renderSystemYamlFunctions() {
   const findDataYaml = renderFindDataYaml();
   const processLogicalYaml = renderProcessLogicalYaml();
   const processLogicalPaginateDsqYaml = renderProcessLogicalPaginateDsqYaml();
@@ -100,7 +99,7 @@ function renderSystemYaml() {
     processLogicalYaml,
     processLogicalPaginateDsqYaml,
     processLogicalPaginateSqsYaml
-  ].join('\n\n');
+  ];
 }
 
 function renderFindDataYaml() {

package/src/emit/system/emitSystemWebSocketArtifacts.js

@@ -38,11 +38,11 @@ export async function emitSystemWebSocketArtifacts(
   );
   const registerCompleteHdrSqsContent = await _renderSystemTemplate(
     'RegisterComplete_HdrSqs.ejs',
-    { queueName: 'RegisterComplete' }
+    { queueName: 'RegisterCompleteHdrSqs' }
   );
   const registerCompleteHdrDsqContent = await _renderSystemTemplate(
     'RegisterComplete_HdrSqs.ejs',
-    { queueName: 'RegisterCompleteDLQ' }
+    { queueName: 'RegisterCompleteHdrSqsDLQ' }
   );
 
   const webSocketConnectYaml = await _renderSystemTemplate(

package/src/emit/system/templates/RegisterComplete_Yaml.ejs

@@ -4,14 +4,14 @@ RegisterCompleteHdrSqs:
   role: RegisterRole
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}RegisterComplete
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}RegisterCompleteHdrSqs
         batchSize: 10
 
-RegisterCompleteDsq:
+RegisterCompleteHdrDsq:
   handler: src/generatedCode/SystemFlowSchemas/Register/source/RegisterComplete_HdrDsq.main
-  name: ${self:custom.iz_resourcePrefix}RegisterCompleteDsq
+  name: ${self:custom.iz_resourcePrefix}RegisterCompleteHdrDsq
   role: RegisterRole
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}RegisterCompleteDLQ
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}RegisterCompleteHdrSqsDLQ
         batchSize: 10

package/src/generate.js

@@ -22,7 +22,7 @@ import {
   rbacApplicationManagedPaths
 } from './emit/rbac/emitRbacApplicationArtifacts.js';
 import {
-  dynamicRelationshipFlowSchemaPaths,
+  dynamicRelationshipFlowSchemaManagedPaths,
   emitDynamicRelationshipFlowSchemas
 } from './emit/relationship/emitDynamicRelationshipFlowSchemas.js';
 import {
@@ -139,10 +139,23 @@ async function _emitGroups({ project, objects, relationships, flows, objectGraph
     emitCoreFunctionArtifacts({ project, objects, relationships, flows, objectGraphServiceTags, relationshipGraphServiceTags })
   ]);
   const custom = await emitCustomFlowApplicationArtifacts(flows, {
-    systemFunctions: system.functions,
     objects
   });
 
+  const systemFunctions = [
+    ...(system.functions ?? []),
+    ...(findData.functions ?? [])
+  ].filter(Boolean);
+
+  const findDataArtifacts = [...(findData.artifacts ?? [])];
+
+  if (systemFunctions.length > 0) {
+    findDataArtifacts.push({
+      path: 'app/sls_yaml/generatedCode/source/flow-system.yml',
+      content: systemFunctions.join('\n\n')
+    });
+  }
+
   let resolvedCoreFunctionManagedPaths = coreFunctionManagedPaths;
   if (typeof coreFunctionManagedPaths === 'function') {
     resolvedCoreFunctionManagedPaths = coreFunctionManagedPaths(
@@ -160,8 +173,8 @@ async function _emitGroups({ project, objects, relationships, flows, objectGraph
     },
     {
       scope: 'relationship-flow-schemas',
-      managedPaths: dynamicRelationshipFlowSchemaPaths,
-      artifacts: emitDynamicRelationshipFlowSchemas()
+      managedPaths: dynamicRelationshipFlowSchemaManagedPaths(relationships),
+      artifacts: emitDynamicRelationshipFlowSchemas({ relationships })
     },
     {
       scope: 'rbac-flow-schemas',
@@ -194,15 +207,11 @@ async function _emitGroups({ project, objects, relationships, flows, objectGraph
     {
       scope: 'system-find-data',
       managedPaths: findDataManagedPaths(),
-      artifacts: findData
+      artifacts: findDataArtifacts
     },
     {
       scope: 'custom-flow-application',
-      managedPaths: customFlowApplicationManagedPaths(flows, {
-        includeYaml: hasSystemWebSocket(flows, {
-          includeRelationshipOwnTopic: true
-        })
-      }),
+      managedPaths: customFlowApplicationManagedPaths(flows),
       artifacts: custom
     },
     {

package/test/dynamicRelationshipFlowSchemas.test.js

@@ -25,7 +25,18 @@ after(async () => {
   );
 });
 
-test('generates dynamic relationship schemas even without declared relationships for legacy compatibility', async () => {
+test('does not generate dynamic relationship schemas when no relationships exist', async () => {
+  const rootPath = await mkdtemp(
+    join(tmpdir(), 'generate-service-code-v2-relationship-empty-')
+  );
+  projectRoots.add(rootPath);
+
+  const result = await generateDynamicRelationshipFlowSchemas(rootPath);
+
+  assert.equal(result.files.length, 0);
+});
+
+test('generates dynamic relationship schemas when declared relationships exist', async () => {
   const rootPath = await createProject();
 
   const result = await generateDynamicRelationshipFlowSchemas(rootPath);

package/test/publicApi.test.js

@@ -23,7 +23,7 @@ test('generate commits schemas, application artifacts, and resources in one publ
   const rootPath = await createCrudProject();
   const result = await generate(rootPath);
 
-  assert.strictEqual(result.files.length, 63);
+  assert.strictEqual(result.files.length, 57);
   assert.equal(result.project.rootPath, rootPath);
   assert.match(
     await readFile(
@@ -129,14 +129,14 @@ test('generate commits the system WebSocket completion path for own-topic flows'
   );
   assert.match(
     await readFile(
-      join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'),
+      join(rootPath, 'app/sls_yaml/generatedCode/source/flow-system.yml'),
       'utf8'
     ),
     /WebSocketConnect:[\s\S]*route: \$connect[\s\S]*WebSocketCompleteHdrSqs:/
   );
   assert.match(
     await readFile(
-      join(rootPath, 'app/sls_yaml/generatedCode/source/flow-schema.yml'),
+      join(rootPath, 'app/sls_yaml/generatedCode/source/flow-system.yml'),
       'utf8'
     ),
     /filterPatterns:[\s\S]*WebSocketCompleteHdrSqs/
@@ -151,6 +151,16 @@ test('generate commits the system WebSocket completion path for own-topic flows'
     ),
     /WebSocketCompleteHdrSqs:[\s\S]*SubscriptionToOutTrackWebSocketComplete:/
   );
+  assert.match(
+    await readFile(
+      join(
+        rootPath,
+        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+      ),
+      'utf8'
+    ),
+    /RegisterCompleteHdrSqs:[\s\S]*RegisterCompleteHdrSqsDLQ:/
+  );
   assert.match(
     await readFile(
       join(
@@ -288,7 +298,7 @@ test('generate removes stale CRUD schemas and application artifacts', async () =
 
   const result = await generate(rootPath);
 
-  assert.equal(result.files.length, 34);
+  assert.equal(result.files.length, 28);
   await assert.rejects(
     readFile(
       join(
@@ -386,14 +396,21 @@ test(
     assert.match(uploadSchemaMain, /\/\/\(<ignoreExternalServices>\)/);
     assert.match(uploadSchemaMain, /\/\/\(<\/ignoreExternalServices>\)/);
 
-    const commandUploadSchema = await readFile(
+    const coreResource = await readFile(
       join(
         rootPath,
-        'app/initial_setup/generatedCode/source/commands/uploadSchema.js'
+        'app/sls_yaml/generatedCode/source/core-resource.yml'
       ),
       'utf8'
     );
-    assert.match(commandUploadSchema, /\/\/\(<ignoreExternalServices>\)/);
-    assert.match(commandUploadSchema, /\/\/\(<\/ignoreExternalServices>\)/);
+    assert.match(
+      coreResource,
+      /UserAccount\$\{self:custom\.iz_stage\}AddLinkCreateByRelHdrInv/
+    );
+    assert.match(
+      coreResource,
+      /UserAccount\$\{self:custom\.iz_stage\}AddLinkBelongToHdrInv/
+    );
   }
 );
+

package/test/resourceArtifacts.test.js

@@ -102,7 +102,8 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
     /Process(?:Create|Update|Delete|Get|Change|Move)Relationship/
   );
   assert.match(roleBlock(iam, 'RegisterRole'), /s3:GetObject/);
-  assert.doesNotMatch(roleBlock(iam, 'RegisterRole'), /dynamodb:|sqs:|sns:/);
+  assert.match(roleBlock(iam, 'RegisterRole'), /RegisterComplete/);
+  assert.doesNotMatch(roleBlock(iam, 'RegisterRole'), /dynamodb:|sns:/);
   assert.doesNotMatch(
     iam,
     /s3:GetObjectVersion|s3:ListBucket|sqs:DeleteMessageBatch|sqs:GetQueueUrl/