@izara_project/izara-core-generate-service-code 1.0.82 → 1.0.84

package/test/crudApplicationArtifacts.test.js

@@ -184,7 +184,7 @@ test('preserves function-setting hooks across CRUD regeneration', async () => {
   assert.equal(await readFile(yamlPath, 'utf8'), yaml);
 });
 
-test('does not add RBAC handlers to Create', async () => {
+test('emits a single Complete RBAC handler for Create without Graph', async () => {
   const rootPath = await createRbacProject();
   const result = await generateCrudApplicationArtifacts(rootPath, {
     serviceTag: 'orders'
@@ -196,13 +196,13 @@ test('does not add RBAC handlers to Create', async () => {
   assert.ok(createPaths.includes(
     'app/src/generatedCode/FlowObjects/Create/source/Create_Main.js'
   ));
-  assert.ok(!createPaths.includes(
+  assert.ok(createPaths.includes(
     'app/src/generatedCode/FlowObjects/Create/source/CreateComplete_Main.js'
   ));
   assert.ok(
     !createPaths.some((path) => path.includes('CreateRbacCallback'))
   );
-  assert.doesNotMatch(
+  assert.match(
     await readFile(
       join(
         rootPath,
@@ -280,7 +280,7 @@ test('emits GetRangeHdrApi when an object defines a sortKey identifier', async (
   const rootPath = await createProject(true);
   await writeFile(
     join(rootPath, 'app/src/schemas/ObjectSchemas/Order.js'),
-    "export default { objectType: 'order', generatedBy: 'userGenerated', identifiers: [{ type: 'identifier', fieldName: 'orderId' }, { type: 'sortKey', fieldName: 'createdAt' }], storageResources: { graph: { storageType: 'graph' } } };\n"
+    "export default { objectType: 'order', generatedBy: 'user', identifiers: [{ type: 'identifier', fieldName: 'orderId' }, { type: 'sortKey', fieldName: 'createdAt' }], storageResources: { graph: { storageType: 'graph' } } };\n"
   );
   const result = await generateCrudApplicationArtifacts(rootPath, {
     serviceTag: 'orders'
@@ -341,6 +341,23 @@ test('removes managed CRUD artifacts when no applicable object remains', async (
   );
 });
 
+test('logs warning when ObjectSchema has invalid or non-CRUD generatedBy in crudApplicationArtifacts', async () => {
+  const rootPath = await createProject(false);
+  const warnings = [];
+  const logger = {
+    warn: (msg) => warnings.push(msg)
+  };
+
+  const result = await generateCrudApplicationArtifacts(rootPath, { logger });
+  assert.deepEqual(result.files, []);
+  assert.equal(warnings.length, 1);
+  assert.match(
+    warnings[0],
+    /\[WARN\] \[CRUD Application\] Skipped FlowObjects application artifacts generation/
+  );
+});
+
+
 async function createProject(withCrudObject) {
   const rootPath = await mkdtemp(
     join(tmpdir(), 'generate-service-code-v2-crud-application-')
@@ -352,7 +369,7 @@ async function createProject(withCrudObject) {
   await writeFile(
     join(schemaRoot, 'ObjectSchemas/Order.js'),
     withCrudObject
-      ? "export default { objectType: 'order', generatedBy: 'userGenerated', storageResources: { graph: { storageType: 'graph' } } };\n"
+      ? "export default { objectType: 'order', generatedBy: 'user', storageResources: { graph: { storageType: 'graph' } } };\n"
       : "export default { objectType: 'order' };\n"
   );
   return rootPath;
@@ -368,7 +385,7 @@ async function createRbacProject(withHook = false, withGraph = false) {
   await mkdir(join(schemaRoot, 'FlowSchemas'), { recursive: true });
   await writeFile(
     join(schemaRoot, 'ObjectSchemas/Order.js'),
-    `export default { objectType: 'order', generatedBy: 'userGenerated', belongTo: { serviceTag: 'UserAccount', objectType: 'user' }${withGraph ? ", storageResources: { graph: { storageType: 'graph' } }" : ''} };\n`
+    `export default { objectType: 'order', generatedBy: 'user', belongTo: { serviceTag: 'UserAccount', objectType: 'user' }${withGraph ? ", storageResources: { graph: { storageType: 'graph' } }" : ''} };\n`
   );
   if (withHook) {
     await writeFile(

package/test/customFlowApplicationArtifacts.test.js

@@ -340,7 +340,7 @@ test('emits and removes ext-topic handlers declared by custom flow steps', async
     await readFile(
       join(
         rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+        'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
       ),
       'utf8'
     ),
@@ -350,7 +350,7 @@ test('emits and removes ext-topic handlers declared by custom flow steps', async
     await readFile(
       join(
         rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+        'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
       ),
       'utf8'
     ),
@@ -398,7 +398,7 @@ test('emits and removes ext-topic handlers declared by custom flow steps', async
     await readFile(
       join(
         rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+        'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
       ),
       'utf8'
     ),
@@ -437,7 +437,7 @@ test('emits and removes the trigger-cache artifact suite when triggerFlowTypes i
   const resources = await readFile(
     join(
       rootPath,
-      'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
     ),
     'utf8'
   );
@@ -864,7 +864,7 @@ test('registers SQS queue, SNS subscription, and SNS out topic for custom flowSc
   const snsInSqs = await readFile(
     join(
       rootPath,
-      'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
     ),
     'utf8'
   );

package/test/dynamicCrudFlowSchemas.test.js

@@ -6,10 +6,11 @@ import test from 'node:test';
 import { pathToFileURL } from 'node:url';
 
 import { generateDynamicCrudFlowSchemas } from '../src/emit/crud/generateDynamicCrudFlowSchemas.js';
+import { createCrudActionPlans } from '../src/emit/crud/crudActionPlan.js';
 
 test('generates dynamic CRUD schemas from local schema modules', async () => {
   const rootPath = await createProject({
-    generatedBy: 'userGenerated'
+    generatedBy: 'user'
   });
 
   const result = await generateDynamicCrudFlowSchemas(rootPath);
@@ -41,7 +42,7 @@ test('generates dynamic CRUD schemas from local schema modules', async () => {
 
 test('accepts singleton object exports used by existing schema files', async () => {
   const rootPath = await createProject({
-    generatedBy: 'userGenerated',
+    generatedBy: 'user',
     singletonExports: true
   });
 
@@ -57,7 +58,7 @@ test('accepts singleton object exports used by existing schema files', async ()
 });
 
 test('does not generate CRUD schemas without an applicable object', async () => {
-  const rootPath = await createProject({ generatedBy: 'userGenerated' });
+  const rootPath = await createProject({ generatedBy: 'user' });
   await generateDynamicCrudFlowSchemas(rootPath);
   await writeFile(
     join(rootPath, 'app/src/schemas/ObjectSchemas/Order.js'),
@@ -71,7 +72,7 @@ test('does not generate CRUD schemas without an applicable object', async () =>
 });
 
 test('does not allow options to override the rootPath argument', async () => {
-  const rootPath = await createProject({ generatedBy: 'userGenerated' });
+  const rootPath = await createProject({ generatedBy: 'user' });
   const ignoredRootPath = await createProject({ generatedBy: 'external' });
 
   const result = await generateDynamicCrudFlowSchemas(rootPath, {
@@ -101,7 +102,7 @@ test('rejects source modules that do not default-export schema objects or arrays
 
 test('rejects deprecated FlowHook schemas before generating CRUD schemas', async () => {
   const rootPath = await createProject({
-    generatedBy: 'systemGenerated',
+    generatedBy: 'systemWithNoUser',
     flow: createHookFlow(['ownTopic'])
   });
 
@@ -121,7 +122,7 @@ test('generates a direct Complete step for RBAC-only Update flows', async () =>
     join(objectDirectory, 'Order.js'),
     `export default [{
       objectType: 'order',
-      generatedBy: 'userGenerated',
+      generatedBy: 'user',
       belongTo: { serviceTag: 'UserAccount', objectType: 'user' }
     }];\n`
   );
@@ -141,15 +142,15 @@ test('generates a direct Complete step for RBAC-only Update flows', async () =>
   assert.equal(update.flowSteps[1].properties.length, 0);
 });
 
-test('ignores RBAC for Create even when Graph storage is present', async () => {
+test('generates RbacCallback and Complete for Create when RBAC and Graph are present', async () => {
   const rootPath = await createProject({
-    generatedBy: 'userGenerated',
+    generatedBy: 'user',
   });
   await writeFile(
     join(rootPath, 'app/src/schemas/ObjectSchemas/Order.js'),
     `export default [{
       objectType: 'order',
-      generatedBy: 'userGenerated',
+      generatedBy: 'user',
       belongTo: { serviceTag: 'UserAccount', objectType: 'user' }
       , storageResources: { graph: { storageType: 'graph' } }
     }];\n`
@@ -159,6 +160,7 @@ test('ignores RBAC for Create even when Graph storage is present', async () => {
   const create = await readGeneratedFlow(rootPath, 'Create');
   assert.deepEqual(create.flowSteps.map((step) => step.stepName), [
     'Start',
+    'RbacCallback',
     'Complete'
   ]);
 });
@@ -173,7 +175,7 @@ test('uses the renamed RBAC callback step when Graph storage is present', async
     join(objectDirectory, 'Order.js'),
     `export default [{
       objectType: 'order',
-      generatedBy: 'userGenerated',
+      generatedBy: 'user',
       belongTo: { serviceTag: 'UserAccount', objectType: 'user' },
       storageResources: { graph: { storageType: 'graph' } }
     }];\n`
@@ -183,9 +185,10 @@ test('uses the renamed RBAC callback step when Graph storage is present', async
   const create = await readGeneratedFlow(rootPath, 'Create');
   assert.deepEqual(create.flowSteps.map((step) => step.stepName), [
     'Start',
+    'RbacCallback',
     'Complete'
   ]);
-  assert.deepEqual(create.flowSteps[1].properties, [
+  assert.deepEqual(create.flowSteps[2].properties, [
     'returnValue',
     'parentFlowId',
     'status',
@@ -204,7 +207,7 @@ test('chains RbacCallback and Complete for Update with RBAC and Graph', async ()
     join(objectDirectory, 'Order.js'),
     `export default [{
       objectType: 'order',
-      generatedBy: 'userGenerated',
+      generatedBy: 'user',
       belongTo: { serviceTag: 'UserAccount', objectType: 'user' },
       storageResources: { graph: { storageType: 'graph' } }
     }];\n`
@@ -242,7 +245,7 @@ test('omits Complete step when no graph storage resources exist', async () => {
     join(objectDirectory, 'Order.js'),
     `export default [{
       objectType: 'order',
-      generatedBy: 'userGenerated',
+      generatedBy: 'user',
       storageResources: {
         myTable: { storageType: 'dynamoDB', tableName: 'OrderTable' }
       }
@@ -258,6 +261,57 @@ test('omits Complete step when no graph storage resources exist', async () => {
   assert.equal(create.flowSteps[0].nextSteps, undefined);
 });
 
+test('evaluates hasQuotaReservation based on billable flag in belongTo and addOnDataStructure', () => {
+  const billableObj = {
+    objectType: 'unitType',
+    generatedBy: 'user',
+    addOnDataStructure: [{ type: 'rbac', billable: true }]
+  };
+  const plans1 = createCrudActionPlans([billableObj]);
+  assert.equal(plans1.Create.hasQuotaReservation, true);
+
+  const nonBillableObj1 = {
+    objectType: 'internalTag',
+    generatedBy: 'user',
+    addOnDataStructure: [{ type: 'rbac', billable: false }]
+  };
+  const plans2 = createCrudActionPlans([nonBillableObj1]);
+  assert.equal(plans2.Create.hasQuotaReservation, false);
+
+  const nonBillableObj2 = {
+    objectType: 'deliveryMethod',
+    generatedBy: 'user',
+    belongTo: {
+      objectType: 'supplyNetwork',
+      serviceTag: 'SupplyNetwork',
+      billable: false
+    },
+    belongToSchema: {
+      objectType: 'supplyNetwork',
+      addOnDataStructure: [{ type: 'rbac' }]
+    }
+  };
+  const plans3 = createCrudActionPlans([nonBillableObj2]);
+  assert.equal(plans3.Create.hasQuotaReservation, false);
+  assert.equal(plans3.Update.hasRbac, true);
+
+  const billableObj2 = {
+    objectType: 'unitType',
+    generatedBy: 'user',
+    belongTo: {
+      objectType: 'supplyNetwork',
+      serviceTag: 'SupplyNetwork',
+      billable: true
+    },
+    belongToSchema: {
+      objectType: 'supplyNetwork',
+      addOnDataStructure: [{ type: 'rbac' }]
+    }
+  };
+  const plans4 = createCrudActionPlans([billableObj2]);
+  assert.equal(plans4.Create.hasQuotaReservation, true);
+});
+
 async function createProject({ generatedBy, flow, singletonExports = false }) {
   const rootPath = await mkdtemp(
     join(tmpdir(), 'generate-service-code-v2-crud-')
@@ -318,3 +372,46 @@ function readGeneratedFile(rootPath, action) {
     'utf8'
   );
 }
+
+test('supports standard generatedBy values (user, systemWithUser, systemNoUser)', async () => {
+  for (const generatedBy of ['user', 'systemWithUser', 'systemNoUser']) {
+    const rootPath = await createProject({ generatedBy });
+    await generateDynamicCrudFlowSchemas(rootPath);
+    const create = await readGeneratedFlow(rootPath, 'Create');
+    assert.ok(create, `Create flow should be generated for generatedBy: ${generatedBy}`);
+    assert.deepEqual(create.flowSteps.map((s) => s.stepName), ['Start', 'Complete']);
+  }
+});
+
+test('logs warning when ObjectSchema has invalid or non-CRUD generatedBy', async () => {
+  const rootPath = await createProject({ generatedBy: 'user' });
+  await writeFile(
+    join(rootPath, 'app/src/schemas/ObjectSchemas/Order.js'),
+    "export default [{ objectType: 'order', generatedBy: 'invalidGeneratedBy' }];\n"
+  );
+
+  const warnings = [];
+  const logger = {
+    warn: (msg) => warnings.push(msg)
+  };
+
+  const result = await generateDynamicCrudFlowSchemas(rootPath, { logger });
+  assert.deepEqual(result.files, []);
+  assert.equal(warnings.length, 1);
+  assert.match(warnings[0], /\[WARN\] \[CRUD FlowSchemas\] Skipped FlowObjects FlowSchemas generation/);
+  assert.match(warnings[0], /invalidGeneratedBy/);
+});
+
+test('throws error when ObjectSchema validation fails with validateSchemas: true', async () => {
+  const rootPath = await createProject({ generatedBy: 'user' });
+  await writeFile(
+    join(rootPath, 'app/src/schemas/ObjectSchemas/Order.js'),
+    "export default [{ objectType: 'order', fieldNames: {}, identifiers: [] }];\n"
+  );
+
+  await assert.rejects(
+    generateDynamicCrudFlowSchemas(rootPath, { validateSchemas: true }),
+    /\[SCHEMA_VALIDATION_ERROR\] Schema validation failed for ObjectSchemas\/Order\.js/
+  );
+});
+

package/test/dynamicRbacFlowSchemas.test.js

@@ -8,7 +8,7 @@ import { pathToFileURL } from 'node:url';
 import { generateDynamicRbacFlowSchemas } from '../src/emit/rbac/generateDynamicRbacFlowSchemas.js';
 
 const projectRoots = new Set();
-const STATIC_ACTIONS = [
+const STATIC_RBAC_ACTIONS = [
   'CreateTargetRole',
   'ListTargetRole',
   'DeleteTargetRole',
@@ -20,6 +20,15 @@ const STATIC_ACTIONS = [
   'DeleteUserFromRole'
 ];
 
+const STATIC_LIMIT_ACTIONS = [
+  'CreateRoleLimit',
+  'ListRoleLimits',
+  'DeleteRoleLimit',
+  'ReservedDynamicUsage',
+  'ConfirmUsage',
+  'CancelUsage'
+];
+
 after(async () => {
   await Promise.all(
     [...projectRoots].map((rootPath) =>
@@ -38,10 +47,14 @@ test('generates shared and object-specific RBAC flow schemas', async () => {
   assert.deepEqual(
     result.files.map((file) => file.path),
     [
-      ...STATIC_ACTIONS.map(
+      ...STATIC_RBAC_ACTIONS.map(
         (action) =>
           `app/src/schemas/FlowSchemas/generateCode/FlowRbac/${action}.js`
       ),
+      ...STATIC_LIMIT_ACTIONS.map(
+        (action) =>
+          `app/src/schemas/FlowSchemas/generateCode/FlowLimit/${action}.js`
+      ),
       'app/src/schemas/FlowSchemas/generateCode/FlowRbac/ValidatorRbac.js'
     ]
   );

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, 65);
+  assert.strictEqual(result.files.length, 74);
   assert.equal(result.project.rootPath, rootPath);
   assert.match(
     await readFile(
@@ -155,7 +155,7 @@ test('generate commits the system WebSocket completion path for own-topic flows'
     await readFile(
       join(
         rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+        'resource/sls_yaml/generatedCode/source/generated-sns-sqs-system.yml'
       ),
       'utf8'
     ),
@@ -165,7 +165,7 @@ test('generate commits the system WebSocket completion path for own-topic flows'
     await readFile(
       join(
         rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+        'resource/sls_yaml/generatedCode/source/generated-sns-sqs-system.yml'
       ),
       'utf8'
     ),
@@ -235,7 +235,7 @@ test('generate commits the trigger-cache suite with its queues when triggerFlowT
     await readFile(
       join(
         rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+        'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
       ),
       'utf8'
     ),
@@ -273,7 +273,7 @@ test('generate removes the system WebSocket path when the last own-topic flow is
     await readFile(
       join(
         rootPath,
-        'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+        'resource/sls_yaml/generatedCode/source/generated-sns-sqs-system.yml'
       ),
       'utf8'
     ),
@@ -309,7 +309,7 @@ test('generate removes stale CRUD schemas and application artifacts', async () =
 
   const result = await generate(rootPath);
 
-  assert.equal(result.files.length, 29);
+  assert.equal(result.files.length, 38);
   await assert.rejects(
     readFile(
       join(
@@ -346,7 +346,7 @@ async function createCrudProject() {
   await mkdir(objectDirectory, { recursive: true });
   await writeFile(
     join(objectDirectory, 'Order.js'),
-    "export default { objectType: 'order', generatedBy: 'userGenerated', storageResources: { graph: { storageType: 'graph' } } };\n"
+    "export default { objectType: 'order', generatedBy: 'user', storageResources: { graph: { storageType: 'graph' } } };\n"
   );
   return rootPath;
 }

package/test/resourceArtifacts.test.js

@@ -19,28 +19,52 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
   const rootPath = await createProject();
   const result = await generateResourceArtifacts(rootPath);
 
-  assert.equal(result.files.length, 6);
-  const resources = await readFile(
+  assert.equal(result.files.length, 10);
+  const crudResources = await readFile(
     join(
       rootPath,
-      'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-crud.yml'
     ),
     'utf8'
   );
-  assert.match(resources, /SubscriptionOutCreateToUploadReservedLimitHdrSqs:/);
-  assert.match(resources, /TopicArn: !Ref OutCreate/);
+  assert.match(crudResources, /InCreate:/);
+  assert.match(crudResources, /^  CreateCompleteHdrSqs:/m);
+  assert.match(crudResources, /^  UpdateCompleteHdrSqs:/m);
+  assert.match(crudResources, /^  DeleteCompleteHdrSqs:/m);
+  assert.doesNotMatch(crudResources, /RbacCallbackHdrSqs/);
+  assert.doesNotMatch(crudResources, /FlowHook|beforeLogical/);
+
+  const customResources = await readFile(
+    join(
+      rootPath,
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml'
+    ),
+    'utf8'
+  );
+  assert.match(
+    customResources,
+    /SubscriptionOutCreateToUploadReservedLimitHdrSqs:/
+  );
+  assert.match(customResources, /TopicArn: !Ref OutCreate/);
   assert.match(
-    resources,
+    customResources,
     /Endpoint: 'arn:aws:sqs:\${self:custom\.iz_region}:\${self:custom\.iz_accountId}:\${self:custom\.iz_resourcePrefix}UploadReservedLimitHdrSqs'/
   );
-  assert.match(resources, /InCreate:/);
+
+  const systemResources = await readFile(
+    join(
+      rootPath,
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-system.yml'
+    ),
+    'utf8'
+  );
   for (const queueName of [
     'FindDataHdrSqs',
     'ProcessLogicalHdrSqs',
     'PaginateProcessLogicalHdrDsq',
     'PaginateProcessLogicalHdrSqs'
   ]) {
-    assert.match(resources, new RegExp(`^  ${queueName}:`, 'm'));
+    assert.match(systemResources, new RegExp(`^  ${queueName}:`, 'm'));
   }
   const dynamoYaml = await readFile(
     join(
@@ -52,6 +76,10 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
   assert.match(dynamoYaml, /OrdersTable:/);
   assert.match(dynamoYaml, /#<#OrdersTableSetting#>/);
   assert.match(dynamoYaml, /#<#\/OrdersTableSetting#>/);
+  assert.match(dynamoYaml, /TargetRolesTable:\s+Type: 'AWS::DynamoDB::Table'[\s\S]+AttributeName: identifiersConcat/);
+  assert.match(dynamoYaml, /RoleLimitTable:\s+Type: 'AWS::DynamoDB::Table'[\s\S]+TableName: \${self:custom\.iz_resourcePrefix}RoleLimit/);
+  assert.match(dynamoYaml, /RunningTotalUsageTable:\s+Type: 'AWS::DynamoDB::Table'[\s\S]+TableName: \${self:custom\.iz_resourcePrefix}RunningTotalUsage/);
+  assert.match(dynamoYaml, /RunningTotalReservedUsageTable:\s+Type: 'AWS::DynamoDB::Table'[\s\S]+TableName: \${self:custom\.iz_resourcePrefix}RunningTotalReservedUsage/);
   const iam = await readFile(
     join(
       rootPath,
@@ -80,22 +108,28 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
     roleBlock(iam, 'FlowRbacRole'),
     /RolePermissions|ProcessCreateTargetRoleHdrSqs/
   );
+  assert.match(roleBlock(iam, 'FlowRbacRole'), /RoleLimit/);
+  assert.match(roleBlock(iam, 'FlowRbacRole'), /RunningTotalUsage/);
+  assert.match(roleBlock(iam, 'FlowObjectsRole'), /RoleLimit/);
   // Per-object RBAC flow queue (e.g. ValidatorRbacHdrSqs from Order with rbac add-on)
   assert.match(roleBlock(iam, 'FlowRbacRole'), /ValidatorRbacHdrSqs/);
-  assert.match(resources, /^  CreateRelationshipHdrSqs:/m);
-  assert.doesNotMatch(resources, /^  CreateCompleteHdrSqs:/m);
-  assert.match(resources, /^  UpdateCompleteHdrSqs:/m);
-  assert.match(resources, /^  DeleteCompleteHdrSqs:/m);
-  assert.doesNotMatch(resources, /RbacCallbackHdrSqs/);
-  assert.doesNotMatch(resources, /FlowHook|beforeLogical/);
+
+  const relResources = await readFile(
+    join(
+      rootPath,
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-relationship.yml'
+    ),
+    'utf8'
+  );
+  assert.match(relResources, /^  CreateRelationshipHdrSqs:/m);
   assert.equal(
-    (resources.match(/^  CreateRelationshipHdrSqs:/gm) ?? []).length,
+    (relResources.match(/^  CreateRelationshipHdrSqs:/gm) ?? []).length,
     1
   );
-  assert.match(resources, /^  CreateRelationshipCompleteHdrSqs:/m);
-  assert.match(resources, /^  GetRelationshipHdrDsq:/m);
+  assert.match(relResources, /^  CreateRelationshipCompleteHdrSqs:/m);
+  assert.match(relResources, /^  GetRelationshipHdrDsq:/m);
   assert.doesNotMatch(
-    resources,
+    relResources,
     /Process(?:Create|Update|Delete|Get|Change|Move)Relationship/
   );
   const relationshipRole = roleBlock(iam, 'FlowRelationshipRole');
@@ -107,9 +141,12 @@ 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.match(roleBlock(iam, 'RegisterRole'), /s3:ListBucket/);
   assert.match(roleBlock(iam, 'RegisterRole'), /RegisterComplete/);
   assert.match(roleBlock(iam, 'RegisterRole'), /dynamodb:/);
   assert.match(roleBlock(iam, 'RegisterRole'), /execute-api:ManageConnections/);
+  assert.match(roleBlock(iam, 'FlowObjectsRole'), /s3:GetObject/);
+  assert.match(roleBlock(iam, 'FlowObjectsRole'), /s3:ListBucket/);
   const procFindDataRole = roleBlock(iam, 'ProcFindDataRole');
   assert.match(procFindDataRole, /dynamodb:UpdateItem/);
   assert.match(procFindDataRole, /dynamodb:GetItem/);
@@ -118,12 +155,16 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
   assert.match(procFindDataRole, /FindData_Out/);
   assert.doesNotMatch(
     iam,
-    /s3:GetObjectVersion|s3:ListBucket|sqs:DeleteMessageBatch|sqs:GetQueueUrl/
+    /s3:GetObjectVersion|sqs:DeleteMessageBatch|sqs:GetQueueUrl/
   );
   assert.match(iam, /#<#\/\w+StatementHookCode#>\n\n  \w+Role:/);
 
   for (const filePath of [
-    'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml',
+    'resource/sls_yaml/generatedCode/source/generated-sns-sqs-crud.yml',
+    'resource/sls_yaml/generatedCode/source/generated-sns-sqs-relationship.yml',
+    'resource/sls_yaml/generatedCode/source/generated-sns-sqs-rbac.yml',
+    'resource/sls_yaml/generatedCode/source/generated-sns-sqs-custom-flows.yml',
+    'resource/sls_yaml/generatedCode/source/generated-sns-sqs-system.yml',
     'resource/sls_yaml/generatedCode/source/generated-sns-out.yml',
     'resource/sls_yaml/generatedCode/source/generated-dynamoDB-table.yml',
     'app/sls_yaml/generatedCode/source/generate-shared-resource.yml'
@@ -153,16 +194,16 @@ test('emits the shared WebSocket completion queue and output-topic subscriptions
   const rootPath = await createProject();
   await generateResourceArtifacts(rootPath);
 
-  const resources = await readFile(
+  const systemResources = await readFile(
     join(
       rootPath,
-      'resource/sls_yaml/generatedCode/source/generated-sns-in-sqs.yml'
+      'resource/sls_yaml/generatedCode/source/generated-sns-sqs-system.yml'
     ),
     'utf8'
   );
-  assert.match(resources, /^  WebSocketCompleteHdrSqs:/m);
-  assert.match(resources, /SubscriptionToOutCustomWebSocketComplete:/);
-  assert.match(resources, /SubscriptionToOutCustomRegisterComplete:/);
+  assert.match(systemResources, /^  WebSocketCompleteHdrSqs:/m);
+  assert.match(systemResources, /SubscriptionToOutCustomWebSocketComplete:/);
+  assert.match(systemResources, /SubscriptionToOutCustomRegisterComplete:/);
   const iam = await readFile(
     join(
       rootPath,
@@ -186,11 +227,11 @@ test('emits the shared WebSocket completion queue and output-topic subscriptions
     );
   }
   assert.match(
-    resources,
+    systemResources,
     /SubscriptionToOutCreateRelationshipWebSocketComplete:/
   );
   assert.match(
-    resources,
+    systemResources,
     /SubscriptionToOutCreateRelationshipRegisterComplete:/
   );
 });
@@ -250,7 +291,7 @@ test('emits DynamoDB table with number sortKey attribute type when field type is
     join(rootPath, 'app/src/schemas/ObjectSchemas/CartOrder.js'),
     "export default { " +
       "objectType: 'cartOrder', " +
-      "generatedBy: 'userGenerated', " +
+      "generatedBy: 'user', " +
       "fieldNames: { " +
       "  cartId: { type: 'string' }, " +
       "  sortId: { type: 'number' } " +
@@ -329,7 +370,7 @@ async function createProject() {
   );
   await writeFile(
     join(schemas, 'ObjectSchemas/Order.js'),
-    "export default { objectType: 'order', generatedBy: 'userGenerated', addOnDataStructure: [{ type: 'rbac' }], identifiers: [{ type: 'partitionKey', fieldName: 'orderId' }], storageResources: { main: { storageType: 'dynamoDB', tableName: 'Orders' } } };\n"
+    "export default { objectType: 'order', generatedBy: 'user', addOnDataStructure: [{ type: 'rbac' }], identifiers: [{ type: 'partitionKey', fieldName: 'orderId' }], storageResources: { main: { storageType: 'dynamoDB', tableName: 'Orders' } } };\n"
   );
   await writeFile(
     join(schemas, 'RelationshipSchemas/OrderCustomer.js'),

package/test/systemTextSchemas.test.js

@@ -123,7 +123,7 @@ test('generate preserves user hooks inside SystemTextSchemas.js across regenerat
   );
   await writeFile(
     join(rootPath, 'app/src/schemas/ObjectSchemas/Item.js'),
-    "export default { objectType: 'item', fieldNames: { itemId: { type: 'string' } }, generatedBy: 'userGenerated' };\n"
+    "export default { objectType: 'item', fieldNames: { itemId: { type: 'string' } }, generatedBy: 'user' };\n"
   );
 
   // First generate