@izara_project/izara-core-generate-service-code 1.0.63 → 1.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "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/codeGenerators/app/sls_yaml/FunctionYamlGenerator.js

@@ -118,6 +118,16 @@ export async function generateFunctionYaml(allSchemas, options) {
     const handlerBaseName = splitFileName[0]; // e.g. ProcessCreate or CreateComplete
     const handlerSuffix = splitFileName[1]; // e.g. HdrSqs, HdrApi, HdrInv
 
+    // Skip custom handlers that self-register their own YAML to prevent duplicates
+    if (
+      handlerBaseName.startsWith('ProcessTriggerCache') ||
+      handlerBaseName.startsWith('CheckTriggerCache') ||
+      handlerBaseName.startsWith('TriggerCache') ||
+      handlerBaseName.startsWith('CompleteStatusField')
+    ) {
+      continue;
+    }
+
     const isCrud = isCrudFlow(flowTag);
     const isRel = isRelationshipFlow(flowTag);
     const isRbac =

package/src/codeGenerators/app/sls_yaml/SharedResourceYamlGenerator.js

@@ -459,10 +459,9 @@ export async function generateSharedResourceYaml(allSchemas, options) {
   );
 
   for (const roleName of allowedRoles) {
-    policyRegistry.addMany(
-      roleName,
-      buildRoleStatements(roleName, resources, scopedResources)
-    );
+    for (const statement of buildRoleStatements(roleName, resources, scopedResources)) {
+      policyRegistry.add(roleName, statement.action, statement.resource);
+    }
   }
 
   const groupedStatements = policyRegistry.toGroupedByRole();

package/src/codeGenerators/app/sls_yaml/_policy/PolicyRegistry.js

@@ -1,9 +1,6 @@
 // src/codeGenerators/app/sls_yaml/_policy/PolicyRegistry.js
 //
-// In-memory IAM permission registry. Decoupled generators register
-// (roleName, action, resource) tuples at any point during generation.
-// PolicyEmitter reads the registry after all generators have run and
-// emits one AWS::IAM::ManagedPolicy per role with deduplicated statements.
+// In-memory IAM permission registry for the shared-resource generator.
 //
 // Internal shape:
 //   Map<roleName, Map<action, Set<resource>>>
@@ -15,48 +12,18 @@ export class PolicyRegistry {
   constructor() {
     /** @type {Map<string, Map<string, Set<string>>>} */
     this._roles = new Map();
-    /** @type {Set<string>} Roles whose entries have been fully replaced via .set() */
-    this._replaced = new Set();
   }
 
   add(roleName, action, resource) {
-    if (this._replaced.has(roleName)) {
-      throw new Error(
-        `PolicyRegistry.add("${roleName}", ...): role was previously replaced via .set(); ` +
-        `use .set() again or call .resetRole() first.`
-      );
-    }
     if (!this._roles.has(roleName)) this._roles.set(roleName, new Map());
     const actions = this._roles.get(roleName);
     if (!actions.has(action)) actions.set(action, new Set());
     actions.get(action).add(resource);
   }
 
-  addMany(roleName, perms) {
-    for (const p of perms) this.add(roleName, p.action, p.resource);
-  }
-
-  /** Fully replace a role's permission set (discards anything previously added). */
-  set(roleName, perms) {
-    this._roles.set(roleName, new Map());
-    this._replaced.add(roleName);
-    for (const p of perms) {
-      const actions = this._roles.get(roleName);
-      if (!actions.has(p.action)) actions.set(p.action, new Set());
-      actions.get(p.action).add(p.resource);
-    }
-  }
-
-  /** Forget all registrations for a role (allows re-add). */
-  resetRole(roleName) {
-    this._roles.delete(roleName);
-    this._replaced.delete(roleName);
-  }
-
   /** Forget every role. Used between test cases or if a caller wants a clean slate. */
   clear() {
     this._roles.clear();
-    this._replaced.clear();
   }
 
   /**
@@ -79,11 +46,6 @@ export class PolicyRegistry {
     }
     return out;
   }
-
-  /** List of role names currently registered (useful for the emitter to iterate). */
-  registeredRoles() {
-    return [...this._roles.keys()];
-  }
 }
 
 /**

package/src/codeGenerators/app/sls_yaml/_policy/__tests__/PolicyRegistry.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach } from '@jest/globals';
-import { policyRegistry, PolicyRegistry } from '../PolicyRegistry.js';
+import { PolicyRegistry } from '../PolicyRegistry.js';
 
 describe('PolicyRegistry', () => {
   let reg;
@@ -19,21 +19,6 @@ describe('PolicyRegistry', () => {
     expect(stmt.resource).toEqual(['arn:aws:s3:::a/*', 'arn:aws:s3:::b/*']);
   });
 
-  it('addMany() inserts batch in one call', () => {
-    reg.addMany('Role1', [
-      { action: 's3:GetObject', resource: 'arn:aws:s3:::a/*' },
-      { action: 's3:ListBucket', resource: 'arn:aws:s3:::a' }
-    ]);
-    expect(reg.toGroupedByRole().Role1.statements).toHaveLength(2);
-  });
-
-  it('set() replaces baseline for a role (full override)', () => {
-    reg.add('Role1', 's3:GetObject', 'arn:aws:s3:::a/*');  // baseline
-    reg.set('Role1', [{ action: 'dynamodb:GetItem', resource: 'arn:aws:dynamodb:*:*:table/x' }]);
-    expect(reg.toGroupedByRole().Role1.statements).toHaveLength(1);
-    expect(reg.toGroupedByRole().Role1.statements[0].action).toEqual(['dynamodb:GetItem']);
-  });
-
   it('toGroupedByRole() returns empty object when nothing registered', () => {
     expect(reg.toGroupedByRole()).toEqual({});
   });

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/BaseDsqHandler.js

@@ -1,17 +1,25 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicFunctionName, processFunctionName } from '../shared/flowNaming.js';
 import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export async function generateDsqHandler(flow, stepName, suffix, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
     const flowTag = flow.flowTag;
 
+    const isOwnTopic = !stepName && !isCrudFlow(flowTag) && !isRbacFlow(flowTag) && !isRelationshipFlow(flowTag) && flow.event && flow.event.includes('ownTopic');
+
     // For entry point stepName is empty
-    const handlerFileName = stepName ? `${flowTag}${stepName}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`;
+    const handlerFileName = stepName
+        ? `${flowTag}${stepName}_${suffix}`
+        : (isOwnTopic ? `${upperCase(flowTag)}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`);
 
     // Function name: matches default export in the referenced _Main.js
-    const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
+    const functionName = stepName
+        ? `${flowTag}${stepName}`
+        : (isOwnTopic ? ownTopicFunctionName(flowTag) : processFunctionName(flowTag));
 
     // Queue name: keep the full handler suffix so handler code matches
     const queueNameSuffix = suffix;

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/__tests__/BaseDsqHandler.test.js

@@ -41,12 +41,13 @@ describe('generateDsqHandler', () => {
     const generatedContent = await fs.readFile(generatedFilePath, 'utf-8');
 
     // Verify it contains setValidatorSchema on line 39 (approx or exactly depending on formatting, let's verify substring)
-    expect(generatedContent).toContain('middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(');
-    expect(generatedContent).toContain('type: "object"');
+    expect(generatedContent).toContain('middleware.setValidatorSchema(');
+    expect(generatedContent).toContain('recordHandlerSharedLib.baseValidatorSchema({');
+    expect(generatedContent).toContain('type: \'object\'');
     expect(generatedContent).toContain('required: [\'body\', \'messageAttributes\']');
 
     // Verify it contains reformatDsqMessage
-    expect(generatedContent).toContain('record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);');
+    expect(generatedContent).toContain('record = recordHandlerSharedLib.reformatDsqMessage(');
     expect(generatedContent).toContain('record._izContext.logger.debug(\'record ReceiveMsgOutHdrSqs\', record);');
   });
 
@@ -88,6 +89,6 @@ describe('generateDsqHandler', () => {
     // Verify template rendering and function names
     expect(generatedContent).toContain('import createOrderStepOne from \'./CreateOrderStepOne_Main.js\';');
     expect(generatedContent).toContain('createOrderStepOne');
-    expect(generatedContent).toContain('"createOrderStepOneHdrDsq"');
+    expect(generatedContent).toContain('\'createOrderStepOneHdrDsq\'');
   });
 });

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/eventBridge.js

@@ -1,17 +1,25 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicFunctionName, processFunctionName } from '../shared/flowNaming.js';
 
 export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
     const flowTag = flow.flowTag;
 
-
+    const isOwnTopic = !stepName && !isCrudFlow(flowTag) && !isRbacFlow(flowTag) && !isRelationshipFlow(flowTag) && flow.event && flow.event.includes('ownTopic');
 
     const suffix = 'HdrInv';
-    const handlerFileName = stepName ? `${flowTag}${stepName}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`;
-    const queueName = stepName ? `${upperCase(flowTag)}${upperCase(stepName)}${upperCase(suffix)}` : `Process${upperCase(flowTag)}${upperCase(suffix)}`;
-    const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
+    const handlerFileName = stepName
+        ? `${flowTag}${stepName}_${suffix}`
+        : (isOwnTopic ? `${upperCase(flowTag)}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`);
+    const queueName = stepName
+        ? `${upperCase(flowTag)}${upperCase(stepName)}${upperCase(suffix)}`
+        : (isOwnTopic ? `${upperCase(flowTag)}${upperCase(suffix)}` : `Process${upperCase(flowTag)}${upperCase(suffix)}`);
+    const functionName = stepName
+        ? `${flowTag}${stepName}`
+        : (isOwnTopic ? ownTopicFunctionName(flowTag) : processFunctionName(flowTag));
 
     const handlerContent = ejs.render(templates.inv, {
         flowTag: flowTag,

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/lambdaSyncApi.js

@@ -1,18 +1,26 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicFunctionName, processFunctionName } from '../shared/flowNaming.js';
 import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
     const flowTag = flow.flowTag;
 
+    const isOwnTopic = !stepName && !isCrudFlow(flowTag) && !isRbacFlow(flowTag) && !isRelationshipFlow(flowTag) && flow.event && flow.event.includes('ownTopic');
+
     const suffix = 'HdrApi';
-    const handlerFileName = stepName ? `${flowTag}${stepName}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`;
+    const handlerFileName = stepName
+        ? `${flowTag}${stepName}_${suffix}`
+        : (isOwnTopic ? `${upperCase(flowTag)}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`);
     // Queue name: ${flowTag}${flowStepName}${HandlerType}
     const queueName = stepName ? `${flowTag}${stepName}${suffix}` : `${flowTag}${suffix}`;
     // Function name matches default export of the referenced _Main.js
-    const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
+    const functionName = stepName
+        ? `${flowTag}${stepName}`
+        : (isOwnTopic ? ownTopicFunctionName(flowTag) : processFunctionName(flowTag));
 
     let startConfig = null;
     if (!stepName && flow.flowSteps) {

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/lambdaSyncInv.js

@@ -1,18 +1,26 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicFunctionName, processFunctionName } from '../shared/flowNaming.js';
 import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
     const flowTag = flow.flowTag;
 
+    const isOwnTopic = !stepName && !isCrudFlow(flowTag) && !isRbacFlow(flowTag) && !isRelationshipFlow(flowTag) && flow.event && flow.event.includes('ownTopic');
+
     const suffix = 'HdrInv';
-    const handlerFileName = stepName ? `${flowTag}${stepName}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`;
+    const handlerFileName = stepName
+        ? `${flowTag}${stepName}_${suffix}`
+        : (isOwnTopic ? `${upperCase(flowTag)}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`);
     // Queue name: ${flowTag}${flowStepName}${HandlerType}
     const queueName = stepName ? `${flowTag}${stepName}${suffix}` : `${flowTag}${suffix}`;
     // Function name matches default export of the referenced _Main.js
-    const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
+    const functionName = stepName
+        ? `${flowTag}${stepName}`
+        : (isOwnTopic ? ownTopicFunctionName(flowTag) : processFunctionName(flowTag));
 
     let startConfig = null;
     if (!stepName && flow.flowSteps) {

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowValidator.js

@@ -1,3 +1,5 @@
+import { TYPE_MAP } from './propertyNormalizer.js';
+
 const ALLOWED_EVENTS = ['ownTopic', 'extTopic', 'lambdaSyncInv', 'lambdaSyncApi', 'eventBridge', 's3', 'dsq'];
 const MAIN_ASYNC_EVENTS = ['ownTopic', 'extTopic', 's3'];
 const RESERVED_SYSTEM_FLOW_TAGS = new Set([
@@ -48,6 +50,116 @@ function validateNamedRefs(flowTag, stepName, refs, defs, label, errors) {
   }
 }
 
+function validateStepPropertyTypes(flowTag, propDefs, label, errors) {
+  if (!propDefs || typeof propDefs !== 'object') return;
+  const ALLOWED_TYPES = Object.keys(TYPE_MAP);
+  for (const [key, def] of Object.entries(propDefs)) {
+    if (!def || typeof def !== 'object') continue;
+    if (!def.type) {
+      errors.push(`Flow '${flowTag}' ${label} '${key}' is missing required field 'type'.`);
+      continue;
+    }
+    if (!ALLOWED_TYPES.includes(def.type)) {
+      errors.push(
+        `Flow '${flowTag}' ${label} '${key}' has unsupported type '${def.type}'. Allowed types are: ${ALLOWED_TYPES.join(', ')}.`
+      );
+      continue;
+    }
+    // enum: must supply enumValues array
+    if (def.type === 'enum') {
+      if (!Array.isArray(def.enumValues) || def.enumValues.length === 0) {
+        errors.push(
+          `Flow '${flowTag}' ${label} '${key}' has type 'enum' but is missing a non-empty 'enumValues' array.`
+        );
+      }
+    }
+    // default: must match resolved primitive type
+    // 'mixed' type accepts any value, so skip the type check
+    if (def.default !== undefined && def.type !== 'mixed') {
+      const resolvedPrimitive = TYPE_MAP[def.type];
+      const actualType = Array.isArray(def.default) ? 'array' : typeof def.default;
+      const expectedType = resolvedPrimitive === 'array' ? 'array' : resolvedPrimitive;
+      if (expectedType && actualType !== expectedType) {
+        errors.push(
+          `Flow '${flowTag}' ${label} '${key}' has a 'default' value of type '${actualType}' but expected '${expectedType}' (from schema type '${def.type}').`
+        );
+      }
+    }
+  }
+}
+
+/**
+ * Warn about stepProperties / stepMessageAttributes keys that are declared
+ * but never referenced in any step's properties or messageAttributes arrays.
+ */
+function validateUnusedStepProperties(flowTag, flow, errors) {
+  const stepProps = flow.stepProperties;
+  const stepMsgAttrs = flow.stepMessageAttributes;
+  if (!stepProps && !stepMsgAttrs) return;
+
+  const usedProps = new Set();
+  const usedAttrs = new Set();
+
+  const flowSteps = Array.isArray(flow.flowSteps) ? flow.flowSteps : [];
+  for (const step of flowSteps) {
+    for (const ref of Array.isArray(step.properties) ? step.properties : []) {
+      if (typeof ref === 'string') usedProps.add(ref);
+    }
+    for (const ref of Array.isArray(step.messageAttributes) ? step.messageAttributes : []) {
+      if (typeof ref === 'string') usedAttrs.add(ref);
+    }
+  }
+
+  const firstStep = flowSteps[0];
+  if (flow.outputTopic === true && firstStep && firstStep.returnValues) {
+    for (const ref of Array.isArray(firstStep.returnValues.properties) ? firstStep.returnValues.properties : []) {
+      if (typeof ref === 'string') usedProps.add(ref);
+    }
+    for (const ref of Array.isArray(firstStep.returnValues.messageAttributes) ? firstStep.returnValues.messageAttributes : []) {
+      if (typeof ref === 'string') usedAttrs.add(ref);
+    }
+  }
+
+  if (stepProps && typeof stepProps === 'object') {
+    for (const key of Object.keys(stepProps)) {
+      if (!usedProps.has(key)) {
+        errors.push(
+          `Flow '${flowTag}' stepProperties key '${key}' is declared but never referenced in any step's 'properties'.`
+        );
+      }
+    }
+  }
+
+  if (stepMsgAttrs && typeof stepMsgAttrs === 'object') {
+    for (const key of Object.keys(stepMsgAttrs)) {
+      if (!usedAttrs.has(key)) {
+        errors.push(
+          `Flow '${flowTag}' stepMessageAttributes key '${key}' is declared but never referenced in any step's 'messageAttributes'.`
+        );
+      }
+    }
+  }
+}
+
+/**
+ * Detect keys that appear in both stepProperties and stepMessageAttributes
+ * to prevent ambiguous naming.
+ */
+function validateDuplicateStepPropertyKeys(flowTag, flow, errors) {
+  const stepProps = flow.stepProperties;
+  const stepMsgAttrs = flow.stepMessageAttributes;
+  if (!stepProps || !stepMsgAttrs) return;
+
+  const propKeys = new Set(Object.keys(stepProps));
+  for (const key of Object.keys(stepMsgAttrs)) {
+    if (propKeys.has(key)) {
+      errors.push(
+        `Flow '${flowTag}' key '${key}' is declared in both 'stepProperties' and 'stepMessageAttributes'. Keys must be unique across both groups.`
+      );
+    }
+  }
+}
+
 export function validateFlowsForGeneration(flows) {
   const errors = [];
   const seenCustomFlowTags = new Set();
@@ -86,7 +198,8 @@ export function validateFlowsForGeneration(flows) {
     const seenStepNames = new Set();
     let anyStepHasPlugInHooks = false;
 
-    for (const step of flowSteps) {
+    for (let i = 0; i < flowSteps.length; i++) {
+      const step = flowSteps[i];
       const stepName = step?.stepName;
       if (!stepName) {
         errors.push(`Flow '${flowTag}' has a step without stepName.`);
@@ -110,6 +223,30 @@ export function validateFlowsForGeneration(flows) {
 
       validateNamedRefs(flowTag, stepName, step.properties, flow.stepProperties, 'properties', errors);
       validateNamedRefs(flowTag, stepName, step.messageAttributes, flow.stepMessageAttributes, 'messageAttributes', errors);
+      if (step.returnValues) {
+        if (i === 0) {
+          if (flow.outputTopic === true) {
+            validateNamedRefs(flowTag, stepName, step.returnValues.properties, flow.stepProperties, 'returnValues.properties', errors);
+            validateNamedRefs(flowTag, stepName, step.returnValues.messageAttributes, flow.stepMessageAttributes, 'returnValues.messageAttributes', errors);
+          }
+        } else {
+          errors.push(`Flow '${flowTag}' step '${stepName}' must not have 'returnValues'. It is only allowed on the first step (index 0).`);
+        }
+      }
+    }
+
+    validateStepPropertyTypes(flowTag, flow.stepProperties, 'stepProperties', errors);
+    validateStepPropertyTypes(flowTag, flow.stepMessageAttributes, 'stepMessageAttributes', errors);
+    validateDuplicateStepPropertyKeys(flowTag, flow, errors);
+    validateUnusedStepProperties(flowTag, flow, errors);
+
+    if (flow.outputTopic === true) {
+      const firstStep = flowSteps[0];
+      const hasReturnProps = firstStep?.returnValues?.properties && Array.isArray(firstStep.returnValues.properties) && firstStep.returnValues.properties.length > 0;
+      const hasReturnMsgAttrs = firstStep?.returnValues?.messageAttributes && Array.isArray(firstStep.returnValues.messageAttributes) && firstStep.returnValues.messageAttributes.length > 0;
+      if (!hasReturnProps && !hasReturnMsgAttrs) {
+        errors.push(`Flow '${flowTag}' has 'outputTopic: true' but its first step '${firstStep?.stepName || 'Start'}' does not define any non-empty 'returnValues' (properties or messageAttributes).`);
+      }
     }
 
     // ponytail: relaxed anyStepHasPlugInHooks requirement 

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/propertyNormalizer.js

@@ -1,20 +1,18 @@
-const TYPE_MAP = {
-    string: 'string', number: 'number', integer: 'number',
-    currency: 'string', currencyValue: 'number', numeric: 'number',
-    float: 'number', special: 'string', object: 'object',
-    boolean: 'boolean', array: 'array', arrayMixed: 'array',
-    arrayObject: 'array', arrayNumeric: 'array', arrayString: 'array',
-    timestamp: 'number'
-};
+import { consts } from '@izara_project/izara-core-library-service-schemas';
+
+export const TYPE_MAP = consts.FIELDNAME_TYPE_MAPPING;
 
 export function normalizePropertyType(p, lookupSource) {
-    let prop = typeof p === 'string'
-        ? ((lookupSource && lookupSource[p]) ? lookupSource[p] : { propertyName: p, type: 'string' })
-        : p;
-    
-    if (prop && prop.type) {
-        prop = { ...prop, type: TYPE_MAP[prop.type] || prop.type };
-    }
-    
-    return prop;
+  let prop =
+    typeof p === 'string'
+      ? lookupSource && lookupSource[p]
+        ? { propertyName: p, ...lookupSource[p] }
+        : { propertyName: p, type: 'string' }
+      : p;
+
+  if (prop && prop.type) {
+    prop = { ...prop, type: TYPE_MAP[prop.type] || prop.type };
+  }
+
+  return prop;
 }

package/src/generateCode.js

@@ -31,7 +31,6 @@ import { generateProcessLogicalYaml } from './codeGenerators/app/sls_yaml/Proces
 import { generateSharedResourceYaml } from './codeGenerators/app/sls_yaml/SharedResourceYamlGenerator.js';
 import { generateFindDataYaml } from './codeGenerators/app/sls_yaml/FindDataYamlGenerator.js';
 import { policyRegistry } from './codeGenerators/app/sls_yaml/_policy/PolicyRegistry.js';
-import { emitManagedPolicies } from './codeGenerators/app/sls_yaml/_policy/PolicyEmitter.js';
 
 function createGeneratorOptions(rootPath, options = {}) {
   return {

package/src/schemaGenerators/app/src/schemas/RelationshipSchemas/AttributeTreeRelationshipSchemaGenerator.js

@@ -3,6 +3,7 @@ import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
 import { attributeTreeLib } from '@izara_project/izara-attribute-tree';
+import { createBasicRelationshipsProperties } from './relationshipSchemaHelpers.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -12,47 +13,6 @@ function upperCase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
 
-function createBasicRelationshipsProperties(from, to, storageResources, baseDirection) {
-  const otherDirection = baseDirection === 'to' ? 'from' : 'to';
-  return {
-    fieldNames: {
-      originTimeStamp: {
-        type: 'number',
-        requiredOnCreate: true,
-        canUpdate: false,
-        validation: {
-          minimum: 1111111111111,
-          maximum: 9999999999999
-        }
-      }
-    },
-    storageResources: storageResources,
-    links: [
-      {
-        storageResourceTags: Object.keys(storageResources),
-        from: {
-          objType: {
-            objectType: from.objectType,
-            serviceTag: from.serviceTag
-          },
-          linkType: from.linkType,
-          direction: baseDirection,
-          requiredOnCreate: from.requiredOnCreate
-        },
-        to: {
-          objType: {
-            objectType: to.objectType,
-            serviceTag: to.serviceTag
-          },
-          linkType: to.linkType,
-          direction: otherDirection,
-          requiredOnCreate: to.requiredOnCreate
-        }
-      }
-    ]
-  };
-}
-
 export async function generateAttributeTreeRelationshipSchemas(hydratedObjectData, options) {
   console.log('  [AttributeTreeRelSchemaGenerator] Generating dynamic AttributeTree RelationshipSchemas...');
   const schemasOutputDir = path.join(

package/src/schemaGenerators/app/src/schemas/RelationshipSchemas/PropertyValueRelationshipSchemaGenerator.js

@@ -3,6 +3,7 @@ import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
 import propertyNode from '@izara_project/izara-property-nodes';
+import { createBasicRelationshipsProperties } from './relationshipSchemaHelpers.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -12,47 +13,6 @@ function upperCase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
 
-function createBasicRelationshipsProperties(from, to, storageResources, baseDirection) {
-  const otherDirection = baseDirection === 'to' ? 'from' : 'to';
-  return {
-    fieldNames: {
-      originTimeStamp: {
-        type: 'number',
-        requiredOnCreate: true,
-        canUpdate: false,
-        validation: {
-          minimum: 1111111111111,
-          maximum: 9999999999999
-        }
-      }
-    },
-    storageResources: storageResources,
-    links: [
-      {
-        storageResourceTags: Object.keys(storageResources),
-        from: {
-          objType: {
-            objectType: from.objectType,
-            serviceTag: from.serviceTag
-          },
-          linkType: from.linkType,
-          direction: baseDirection,
-          requiredOnCreate: from.requiredOnCreate
-        },
-        to: {
-          objType: {
-            objectType: to.objectType,
-            serviceTag: to.serviceTag
-          },
-          linkType: to.linkType,
-          direction: otherDirection,
-          requiredOnCreate: to.requiredOnCreate
-        }
-      }
-    ]
-  };
-}
-
 export async function generatePropertyValueRelationshipSchemas(hydratedObjectData, options) {
   console.log('  [PropertyValueRelSchemaGenerator] Generating dynamic PropertyValue RelationshipSchemas...');
   const schemasOutputDir = path.join(

package/src/schemaGenerators/app/src/schemas/RelationshipSchemas/__tests__/relationshipSchemaHelpers.test.js

@@ -0,0 +1,38 @@
+import { describe, expect, it } from '@jest/globals';
+import { createBasicRelationshipsProperties } from '../relationshipSchemaHelpers.js';
+
+describe('createBasicRelationshipsProperties', () => {
+  it('preserves the relationship schema shape and opposite direction', () => {
+    expect(createBasicRelationshipsProperties(
+      { serviceTag: 'Svc', objectType: 'Source', linkType: 'one', requiredOnCreate: false },
+      { serviceTag: 'Svc', objectType: 'Target', linkType: 'many', requiredOnCreate: true },
+      { graph: { storageType: 'graph' } },
+      'from'
+    )).toEqual({
+      fieldNames: {
+        originTimeStamp: {
+          type: 'number',
+          requiredOnCreate: true,
+          canUpdate: false,
+          validation: { minimum: 1111111111111, maximum: 9999999999999 }
+        }
+      },
+      storageResources: { graph: { storageType: 'graph' } },
+      links: [{
+        storageResourceTags: ['graph'],
+        from: {
+          objType: { serviceTag: 'Svc', objectType: 'Source' },
+          linkType: 'one',
+          direction: 'from',
+          requiredOnCreate: false
+        },
+        to: {
+          objType: { serviceTag: 'Svc', objectType: 'Target' },
+          linkType: 'many',
+          direction: 'to',
+          requiredOnCreate: true
+        }
+      }]
+    });
+  });
+});

package/src/schemaGenerators/app/src/schemas/RelationshipSchemas/relationshipSchemaHelpers.js

@@ -0,0 +1,40 @@
+export function createBasicRelationshipsProperties(from, to, storageResources, baseDirection) {
+  const otherDirection = baseDirection === 'to' ? 'from' : 'to';
+  return {
+    fieldNames: {
+      originTimeStamp: {
+        type: 'number',
+        requiredOnCreate: true,
+        canUpdate: false,
+        validation: {
+          minimum: 1111111111111,
+          maximum: 9999999999999
+        }
+      }
+    },
+    storageResources,
+    links: [
+      {
+        storageResourceTags: Object.keys(storageResources),
+        from: {
+          objType: {
+            objectType: from.objectType,
+            serviceTag: from.serviceTag
+          },
+          linkType: from.linkType,
+          direction: baseDirection,
+          requiredOnCreate: from.requiredOnCreate
+        },
+        to: {
+          objType: {
+            objectType: to.objectType,
+            serviceTag: to.serviceTag
+          },
+          linkType: to.linkType,
+          direction: otherDirection,
+          requiredOnCreate: to.requiredOnCreate
+        }
+      }
+    ]
+  };
+}

package/src/codeGenerators/app/sls_yaml/_policy/PolicyEmitter.js

@@ -1,46 +0,0 @@
-// src/codeGenerators/app/sls_yaml/_policy/PolicyEmitter.js
-//
-// Reads the PolicyRegistry at the end of the generation run and emits one
-// per-role .yml file containing a single AWS::IAM::ManagedPolicy. Each
-// managed policy attaches to its base role via `Roles: [ !Ref <RoleName> ]`.
-//
-// IMPORTANT: This emitter runs AFTER SharedResourceYamlGenerator so the
-// managed policies can reference the roles that generator just emitted.
-// See generateCode.js for the ordering.
-
-import fs from 'fs/promises';
-import path from 'path';
-import ejs from 'ejs';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-/**
- * @param {import('./PolicyRegistry.js').PolicyRegistry} registry
- * @param {{ outputPath: string }} options
- */
-export async function emitManagedPolicies(registry, options) {
-  const outDir = path.join(
-    options.outputPath,
-    'app',
-    'sls_yaml',
-    'generatedCode',
-    'source',
-    'iam-managed-policies'
-  );
-  await fs.mkdir(outDir, { recursive: true });
-
-  const grouped = registry.toGroupedByRole();
-  const templatePath = path.join(__dirname, 'templates', 'ManagedPolicy_Yaml.ejs');
-  const tpl = await fs.readFile(templatePath, 'utf8');
-
-  for (const [roleName, { statements }] of Object.entries(grouped)) {
-    const policyName = roleName.replace(/role$/i, '');
-    const content = ejs.render(tpl, { roleName, policyName, statements });
-    const outFile = path.join(outDir, `${policyName}Policy.yml`);
-    await fs.writeFile(outFile, content, 'utf8');
-  }
-
-  console.log(`  [PolicyEmitter] Wrote ${Object.keys(grouped).length} managed-policy file(s) to ${outDir}`);
-}

package/src/codeGenerators/app/sls_yaml/_policy/__tests__/PolicyEmitter.test.js

@@ -1,55 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach } from '@jest/globals';
-import fs from 'fs/promises';
-import path from 'path';
-import os from 'os';
-import { PolicyRegistry } from '../PolicyRegistry.js';
-import { emitManagedPolicies } from '../PolicyEmitter.js';
-
-describe('emitManagedPolicies', () => {
-  let tmpDir, reg;
-  beforeEach(async () => {
-    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'iz-policy-emitter-'));
-    reg = new PolicyRegistry();
-  });
-  afterEach(async () => { await fs.rm(tmpDir, { recursive: true, force: true }); });
-
-  it('emits one .yml file per registered role', async () => {
-    reg.add('FindDataRole', 's3:GetObject', 'arn:aws:s3:::a/*');
-    reg.add('RegisterRole', 'dynamodb:GetItem', 'arn:aws:dynamodb:*:*:table/x');
-    await emitManagedPolicies(reg, { outputPath: tmpDir });
-    const files = await fs.readdir(path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies'));
-    expect(files.sort()).toEqual(['FindDataPolicy.yml', 'RegisterPolicy.yml']);
-  });
-
-  it('emits empty dir + no files when registry is empty', async () => {
-    await emitManagedPolicies(reg, { outputPath: tmpDir });
-    const outDir = path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies');
-    const stat = await fs.stat(outDir);
-    expect(stat.isDirectory()).toBe(true);
-    const files = await fs.readdir(outDir);
-    expect(files).toEqual([]);
-  });
-
-  it('writes YAML that references the role via !Ref', async () => {
-    reg.add('FindDataRole', 's3:GetObject', 'arn:aws:s3:::a/*');
-    await emitManagedPolicies(reg, { outputPath: tmpDir });
-    const content = await fs.readFile(
-      path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies', 'FindDataPolicy.yml'),
-      'utf8'
-    );
-    expect(content).toContain('Type: AWS::IAM::ManagedPolicy');
-    expect(content).toContain('Roles:');
-    expect(content).toContain('!Ref FindDataRole');
-    expect(content).toContain('s3:GetObject');
-  });
-
-  it('does NOT crash on roles with statements containing Serverless CFN variables', async () => {
-    reg.add('FindDataRole', 's3:GetObject', 'arn:aws:s3:::${self:custom.iz_serviceSchemaBucketName}/*');
-    await emitManagedPolicies(reg, { outputPath: tmpDir });
-    const content = await fs.readFile(
-      path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies', 'FindDataPolicy.yml'),
-      'utf8'
-    );
-    expect(content).toContain('${self:custom.iz_serviceSchemaBucketName}');
-  });
-});

package/src/codeGenerators/app/sls_yaml/_policy/templates/ManagedPolicy_Yaml.ejs

@@ -1,22 +0,0 @@
-Resources:
-  <%- policyName %>Policy:
-    Type: AWS::IAM::ManagedPolicy
-    Properties:
-      ManagedPolicyName: ${self:custom.iz_resourcePrefix}<%- policyName %>Policy
-      Description: "Managed policy for <%- roleName %> (auto-generated by PolicyEmitter)"
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-<% statements.forEach((stmt) => { -%>
-          - Effect: Allow
-            Action:
-<% stmt.action.forEach((a) => { -%>
-              - <%- a %>
-<% }) -%>
-            Resource:
-<% stmt.resource.forEach((r) => { -%>
-              - "<%- r %>"
-<% }) -%>
-<% }) -%>
-      Roles:
-        - !Ref <%- roleName %>

package/test_schema.js

@@ -1,2 +0,0 @@
-import { basicValidatorSchema } from '@izara_project/izara-shared-service-schemas';
-console.log(JSON.stringify(basicValidatorSchema.basicFlowSchema?.properties?.flowSteps, null, 2));