@izara_project/izara-core-generate-service-code 1.0.98 → 1.0.99

package/task.md

@@ -1,132 +1,76 @@
-# Task Checklist: Attribute Tree Per-Repo Code Generation Refactoring
+# Task Checklist: Attribute Tree Single-Service Code Generation Consolidation
 
 > **Canonical Architecture Plan**: [[10.Systems/GenerateServiceCode/30-Generation/Task Roadmap - Attribute Tree Per-Repo Generation Refactoring|Task Roadmap in Obsidian]]  
-> **Selected Design**: **Option C (`GenerateDirectives/`)** + **Style 1 (`generatedCode/<domain>/`)**  
+> **Selected Design**: **Single Main Service (Self-Repo Consolidation)** + **Style 1 (`generatedCode/<domain>/`)**  
 > **Repository**: `IzaraCore-SupportServices-GenerateServiceCode-Seagame`
 
 ---
 
-## 🎯 Target Architecture: Style 1 (`generatedCode/<domain>/`)
+## 🎯 Target Architecture: Single Unified Service (Self-Repo)
+
+All schemas for an `attributeTree` (Tree nodes, Standard Value Handler node, and cascading PropertyValue nodes) are emitted directly inside the **Main Service** workspace:
 
-### Target Service (e.g. `SellOfferTermValueStandard`)
 ```text
 app/src/schemas/
-├── GenerateDirectives/
-│   └── sellOfferTermValueStandard.js                       <-- [Directive] Developer creates this
-│
 ├── ObjectSchemas/
+│   ├── sellOffer.js                                        <-- Source ObjectSchema
 │   └── generatedCode/
 │       ├── attributeTree/
-│       │   └── sellOfferTermValueStandard.js               <-- [Emitted by TASK-02]
-│       └── propertyValue/
-│           ├── sellOfferTermValueStandardPropertyLabel.js   <-- [Emitted by PropertyValue addOn]
-│           └── sellOfferTermValueStandardPropertyValue.js   <-- [Emitted by PropertyValue addOn]
+│       │   ├── sellOfferTermLink.js                        <-- Link Node
+│       │   ├── sellOfferTermValue.js                       <-- Value Node
+│       │   ├── sellOfferTermLabel.js                       <-- Label Node
+│       │   └── sellOfferTermValueStandard.js               <-- Handler Node (Self-Repo)
+│       │
+│       └── propertyValue/                                  <-- Cascading from ValueStandard
+│           ├── sellOfferTermValueStandardPropertyLabel.js
+│           └── sellOfferTermValueStandardPropertyValue.js
 │
 └── RelationshipSchemas/
     └── generatedCode/
+        ├── attributeTree/
+        │   ├── hasSellOfferTermLink.js
+        │   ├── disabledSellOfferTermLink.js
+        │   ├── isSellOfferTerm.js
+        │   └── isSellOfferTermLabel.js
+        │
         └── propertyValue/
             ├── hasSellOfferTermValueStandardPropertyValue.js
             ├── disabledSellOfferTermValueStandardPropertyValue.js
             └── isSellOfferTermValueStandardPropertyLabel.js
 ```
 
-### Source Service (Self-Repo)
-```text
-app/src/schemas/
-├── ObjectSchemas/
-│   ├── sellOffer.js                                        <-- Source ObjectSchema
-│   └── generatedCode/
-│       └── attributeTree/
-│           ├── sellOfferTermLink.js
-│           ├── sellOfferTermValue.js
-│           └── sellOfferTermLabel.js
-│
-└── RelationshipSchemas/
-    └── generatedCode/
-        └── attributeTree/
-            ├── hasSellOfferTermLink.js
-            ├── disabledSellOfferTermLink.js
-            ├── isSellOfferTerm.js
-            └── isSellOfferTermLabel.js
-```
-
 ---
 
 ## 📋 Implementation Checklist
 
 - [x] **TASK-01: Recursive Schema Loading & Directives Loader**
   - **File**: `src/compile/loadSchemas.js`
-  - **Action**:
-    1. Update `loadLocalSchemaDirectory(project, directoryName, options)` to recursively find all `.js` files within subdirectories (supporting `ObjectSchemas/generatedCode/**` and `RelationshipSchemas/generatedCode/**`).
-    2. Export `loadGenerateDirectives(project, options)` calling `loadLocalSchemaDirectory(project, 'GenerateDirectives', options)`.
-  - **Acceptance Criteria**: `loadLocalSchemaDirectory(project, 'ObjectSchemas')` discovers and validates schemas nested inside `generatedCode/attributeTree/` and `generatedCode/propertyValue/`. Returns `[]` when `GenerateDirectives` folder is missing.
+  - **Acceptance Criteria**: `loadLocalSchemaDirectory(project, 'ObjectSchemas')` discovers and validates schemas nested inside `generatedCode/**`.
 
-- [x] **TASK-02: Target ValueStandard Schema Emitter**
-  - **File**: `src/emit/schemas/attributeTree/emitAttributeTreeTargetValueStandard.js` (NEW)
-  - **Action**:
-    1. Filter `directives` for `directive.type === 'attributeTreeTarget'`.
-    2. Emit `{tag}ValueStandard.js` to `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/${tag}ValueStandard.js`.
-    3. Include preservation hook `//(<addOnDataStructure${tag}ValueStandard>)` with commented `propertyValue` addOn template.
-    4. Export `attributeTreeTargetValueStandardManagedPaths(directives)`.
-  - **Acceptance Criteria**: Emitted file adheres strictly to Izara backend syntax rules and matches Style 1 output path.
-
-- [x] **TASK-03: Align AttributeTree Self-Repo Emitter to Style 1**
+- [x] **TASK-02: Consolidate ValueStandard into `emitAttributeTreeSchemas.js`**
   - **File**: `src/emit/schemas/attributeTree/emitAttributeTreeSchemas.js`
   - **Action**:
-    1. Update ObjectSchema emission paths from `generatedAttributeTree/` to `generatedCode/attributeTree/`.
-    2. Update RelationshipSchema emission paths from `generatedAttributeTree/` to `generatedCode/attributeTree/`.
-    3. Update `attributeTreeObjectSchemaManagedPaths` and `attributeTreeRelationshipSchemaManagedPaths`.
-  - **Acceptance Criteria**: Self-repo attributeTree schemas output cleanly into `generatedCode/attributeTree/`.
-
-- [x] **TASK-04: Align PropertyValue Emitter to Style 1**
-  - **File**: `src/emit/schemas/propertyValue/emitPropertyValueSchemas.js`
-  - **Action**:
-    1. Update ObjectSchema emission paths from `generatedPropertyValue/` to `generatedCode/propertyValue/`.
-    2. Update RelationshipSchema emission paths from `generatedPropertyValue/` to `generatedCode/propertyValue/`.
-    3. Update `propertyValueObjectSchemaManagedPaths` and `propertyValueRelationshipSchemaManagedPaths`.
-  - **Acceptance Criteria**: PropertyValue schemas output cleanly into `generatedCode/propertyValue/`.
-
-- [x] **TASK-05: Register Managed Scopes in Domain Registry**
-  - **File**: `src/plan/domainRegistry.js`
-  - **Action**:
-    1. Import `emitAttributeTreeTargetValueStandard` and `attributeTreeTargetValueStandardManagedPaths`.
-    2. Register new scope `attribute-tree-target-value-standard`.
-    3. Pass `directives` into `resolveEmissionGroups(context)`.
-  - **Acceptance Criteria**: All 5 dynamic schema scopes registered and tracked in `.generate-service-code-v2-managed.json`.
-
-- [x] **TASK-06: Decouple Generation Pipeline in `src/generate.js`**
-  - **File**: `src/generate.js`
-  - **Action**:
-    1. Load directives: `const directives = await loadGenerateDirectives(project, schemaLoadOptions);`.
-    2. Pass `directives` to `resolveEmissionGroups`.
-    3. Delete lines 104-111 (`targetFiles = await _emitTargetServiceAttributeTreeSchemas(...)`).
-    4. Delete lines 129-186 (`_emitTargetServiceAttributeTreeSchemas` function definition).
-  - **Acceptance Criteria**: Zero cross-repo filesystem writes. Generator operates strictly within `workspaceOutputRoot`.
-
-- [x] **TASK-07: Delete Legacy Cross-Repo Files**
-  - **Files to Delete**:
-    - `src/emit/schemas/attributeTree/resolveTargetServicePath.js`
-    - `src/emit/schemas/attributeTree/emitAttributeTreeTargetSchemas.js`
-  - **Action**: Remove dead files and any unused imports.
-  - **Acceptance Criteria**: `git status` shows clean file deletions.
+    1. Emit `${tag}ValueStandard.js` directly within `emitAttributeTreeObjectSchemas`.
+    2. Add `${tag}ValueStandard.js` to `attributeTreeObjectSchemaManagedPaths`.
+    3. Include preservation hook `//(<addOnDataStructure${tag}ValueStandard>)` with commented `propertyValue` addOn template.
+  - **Acceptance Criteria**: Single-service attributeTree generates all 4 ObjectSchemas (`Link`, `Value`, `Label`, `ValueStandard`).
 
-- [x] **TASK-08: Unit & Integration Test Verification**
+- [x] **TASK-03: Remove Target Directive Scope & Dead Code**
   - **Files**:
-    - `test/unit/schemas/attributeTreeDirectives.test.js` (NEW)
-    - `test/unit/schemas/attributeTreeSchemas.test.js` (Update paths)
-    - `test/unit/schemas/propertyValueSchemas.test.js` (Update paths)
-  - **Verification Command**: `npm test`
-  - **Acceptance Criteria**: All 198+ tests pass with zero regression.
-
-- [x] **TASK-09: End-to-End Cascading Verification**
-  - **Action**: Verify two-phase generation locally:
-    1. Target service with directive -> generates `sellOfferTermValueStandard.js`.
-    2. Target service uncomments `propertyValue` -> generates PropertyLabel, PropertyValue, and 3 Relationship schemas.
-  - **Acceptance Criteria**: Zero cross-repo dependency required.
-
-- [x] **TASK-10: Synchronize Vault & Taiga Documentation**
+    - `src/plan/domainRegistry.js` (Removed `attribute-tree-target-value-standard` scope & unused `directives` param)
+    - `src/emit/schemas/attributeTree/emitAttributeTreeTargetValueStandard.js` (Deleted dead file)
+    - `src/compile/loadSchemas.js` (Removed obsolete `loadGenerateDirectives`)
+    - `src/generate.js` (Removed `loadGenerateDirectives` call & `directives` passing)
+    - `test/unit/schemas/attributeTreeSingleService.test.js` (Removed obsolete directive loader tests)
+  - **Acceptance Criteria**: Clean scope tracking under `attribute-tree-object-schemas` with zero dead directive loading.
+
+- [x] **TASK-04: Single-Service & Cascading Integration Verification**
+  - **File**: `test/unit/schemas/attributeTreeSingleService.test.js`
+  - **Action**: Verifies single-service generation and cascading generation to `propertyValue` within the same repository.
+  - **Acceptance Criteria**: 100% passing tests with zero cross-repo write or external directive needed.
+
+- [x] **TASK-05: Synchronize Vault & Documentation**
   - **Vault Files**:
     - `10.Systems/GenerateServiceCode/20-Schema/Dynamic Schema.md`
     - `40.Vault/Operations/timeline-log.md`
     - `40.Vault/Memory/active-context.md`
-  - **Taiga Wiki**: Update `generatecode` wiki page.

package/test/integration/graphDrivenFlowSchema.test.js

@@ -544,6 +544,64 @@ test('validateFlowSchema passes for s3 event with valid bucketName', () => {
   );
 });
 
+test('validateFlowSchema passes for s3 event with explicit S3 flowSteps', () => {
+  assert.equal(
+    validateFlowSchema({
+      flowTag: 'uploadFlow',
+      event: ['s3'],
+      bucketName: 'MyUploadBucket',
+      flowSteps: [
+        { stepName: 'CreateObject', event: ['wbs'] },
+        { stepName: 'ReservedLimit', event: ['sqs'] },
+        { stepName: 'CreatePreSignUrl', event: ['sqs'] },
+        { stepName: 'ProcessAfterUpload', event: ['s3'] },
+        { stepName: 'ConfirmAfterUpload', event: ['sqs'] }
+      ]
+    }),
+    true
+  );
+});
+
+test('validateFlowSchema passes for s3 event without flowSteps', () => {
+  assert.equal(
+    validateFlowSchema({
+      flowTag: 'uploadFlow',
+      event: ['s3'],
+      bucketName: 'MyUploadBucket'
+    }),
+    true
+  );
+});
+
+test('validateFlowSchema rejects s3 event with invalid entry stepName', () => {
+  assert.throws(
+    () =>
+      validateFlowSchema({
+        flowTag: 'uploadFlow',
+        event: ['s3'],
+        bucketName: 'MyUploadBucket',
+        flowSteps: [{ stepName: 'InvalidEntry' }]
+      }),
+    /Entry step flowSteps\[0\] for s3 flow must have stepName 'CreateObject' or 'Start'/
+  );
+});
+
+test('validateFlowSchema rejects s3 event with invalid non-entry stepName', () => {
+  assert.throws(
+    () =>
+      validateFlowSchema({
+        flowTag: 'uploadFlow',
+        event: ['s3'],
+        bucketName: 'MyUploadBucket',
+        flowSteps: [
+          { stepName: 'CreateObject' },
+          { stepName: 'InvalidStep' }
+        ]
+      }),
+    /is invalid for s3 flow/
+  );
+});
+
 test('validateFlowSchema rejects event with storedCache or triggerCache as invalid event', () => {
   assert.throws(
     () =>

package/test/unit/application/createTargetRoleHandler.test.js

@@ -36,7 +36,7 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
   const rootPath = await createProject(true);
   const result = await generateCreateTargetRoleHandler(rootPath);
 
-  assert.equal(result.files.length, 60);
+  assert.equal(result.files.length, 67);
   assert.match(
     await readFile(join(rootPath, result.files[0].path), 'utf8'),
     /CreateTargetRole/
@@ -211,6 +211,16 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
     );
     assert.match(yaml, new RegExp(`${flowTag}HdrWbs:\\n[\\s\\S]*websocket:`));
   }
+
+  const ttlExpiredFile = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowLimit/ReservedUsageTtlExpired/source/ReservedUsageTtlExpired_HdrDss.js'
+    ),
+    'utf8'
+  );
+  assert.match(ttlExpiredFile, /Auto-refunded expired reservation/);
+  assert.match(ttlExpiredFile, /RunningTotalUsage/);
 });
 
 test('removes CreateTargetRole handler when RBAC is removed', async () => {
@@ -244,6 +254,65 @@ test('removes CreateTargetRole handler when RBAC is removed', async () => {
   );
 });
 
+test('generates synchronous HdrInv and HdrApi handlers for FlowLimit flows', async () => {
+  const rootPath = await createProject(true);
+  await generateCreateTargetRoleHandler(rootPath);
+
+  const limitYaml = await readFile(
+    join(rootPath, 'app/sls_yaml/generatedCode/source/flow-limits.yml'),
+    'utf8'
+  );
+
+  for (const flowTag of ['ReservedDynamicUsage', 'ConfirmUsage', 'CancelUsage']) {
+    assert.match(
+      limitYaml,
+      new RegExp(
+        `${flowTag}HdrInv:\\n\\s+handler: src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrInv\\.main`
+      )
+    );
+    assert.match(
+      limitYaml,
+      new RegExp(
+        `${flowTag}HdrApi:\\n\\s+handler: src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrApi\\.main`
+      )
+    );
+
+    const invFile = await readFile(
+      join(
+        rootPath,
+        `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrInv.js`
+      ),
+      'utf8'
+    );
+    assert.match(invFile, /export const main = middleware\.wrap/);
+    assert.match(
+      invFile,
+      new RegExp(`import ${flowTag} from '\\./${flowTag}_Main\\.js'`)
+    );
+
+    const apiFile = await readFile(
+      join(
+        rootPath,
+        `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrApi.js`
+      ),
+      'utf8'
+    );
+    assert.match(apiFile, /export const main = middleware\.wrap/);
+    assert.match(
+      apiFile,
+      new RegExp(`import ${flowTag} from '\\./${flowTag}_Main\\.js'`)
+    );
+  }
+
+  assert.match(
+    limitYaml,
+    /ReservedUsageTtlExpiredHdrDss:\n\s+handler: src\/generatedCode\/FlowLimit\/ReservedUsageTtlExpired\/source\/ReservedUsageTtlExpired_HdrDss\.main/
+  );
+  assert.match(limitYaml, /type: dynamodb/);
+  assert.match(limitYaml, /RunningTotalReservedUsageTable/);
+  assert.match(limitYaml, /eventName: \["REMOVE"\]/);
+});
+
 async function createProject(hasRbac) {
   const rootPath = await mkdtemp(
     join(tmpdir(), 'generate-service-code-v2-rbac-handler-')

package/test/unit/application/crudApplicationArtifacts.test.js

@@ -1119,6 +1119,10 @@ test('emits synchronous ConfirmUsage and CancelUsage invocation in CreateLogical
   assert.match(createLogicalLib, /CancelUsageHdrInv/);
   assert.match(createLogicalLib, /lambda\.invokeSync\(/);
   assert.match(createLogicalLib, /publishCompletionMessage\(/);
+  assert.match(createLogicalLib, /OBJECT_QUOTA_SERVICE_TAGS/);
+  assert.match(createLogicalLib, /"order":"UserAccount"/);
+  assert.match(createLogicalLib, /targetFunction,\s*quotaServiceTag/);
+  assert.doesNotMatch(createLogicalLib, /targetFunction,\s*['"]Rbac['"]/);
 });
 
 test('emits synchronous AfterHook invocation in Update and Delete handlers', async () => {

package/test/unit/infrastructure/resourceArtifacts.test.js

@@ -816,6 +816,58 @@ test('emits lambda:InvokeFunction in FlowObjectsRole when flow has event generat
   assert.match(role, /GenSyncHook/);
 });
 
+test('emits DynamoDB stream permissions in FlowRbacRole and multi-tenant quota topics in FlowObjectsRole', async () => {
+  const rootPath = await createProject();
+  const schemas = join(rootPath, 'app/src/schemas');
+  await writeFile(
+    join(schemas, 'ObjectSchemas/Order.js'),
+    "export default { objectType: 'order', generatedBy: 'user', belongTo: { serviceTag: 'SupplyNetwork', objectType: 'tenant' }, addOnDataStructure: [{ type: 'rbac' }], identifiers: [{ type: 'partitionKey', fieldName: 'orderId' }], storageResources: { main: { storageType: 'dynamoDB', tableName: 'Orders' } } };\n"
+  );
+  await generateResourceArtifacts(rootPath);
+
+  const iam = await readFile(
+    join(
+      rootPath,
+      'app/sls_yaml/generatedCode/source/generate-shared-resource.yml'
+    ),
+    'utf8'
+  );
+  const rbacRole = roleBlock(iam, 'FlowRbacRole');
+  assert.match(rbacRole, /dynamodb:DescribeStream/);
+  assert.match(rbacRole, /RunningTotalReservedUsage\/stream\/\*/);
+
+  const flowObjectsRole = roleBlock(iam, 'FlowObjectsRole');
+  assert.match(flowObjectsRole, /SupplyNetwork_\${self:custom\.iz_stage}_ConfirmUsage_In/);
+  assert.match(flowObjectsRole, /SupplyNetwork_\${self:custom\.iz_stage}_CancelUsage_In/);
+  assert.match(flowObjectsRole, /SupplyNetwork\${self:custom\.iz_stage}ConfirmUsageHdrInv/);
+  assert.match(flowObjectsRole, /SupplyNetwork\${self:custom\.iz_stage}CancelUsageHdrInv/);
+
+  const { createResourceState } = await import(
+    '../../../src/emit/infrastructure/resources/resourceState.js'
+  );
+  const { renderLambdaRoleConfig } = await import(
+    '../../../src/emit/infrastructure/resources/iamResourceArtifacts.js'
+  );
+  const state = createResourceState({
+    objects: [
+      {
+        objectType: 'order',
+        generatedBy: 'user',
+        belongTo: { serviceTag: 'SupplyNetwork', objectType: 'tenant' },
+        addOnDataStructure: [{ type: 'rbac' }]
+      }
+    ],
+    relationships: [],
+    flows: [
+      { flowTag: 'upload', event: ['s3'], quotaServiceTag: 'SupplyNetwork' }
+    ]
+  });
+  const lambdaRoleConfig = await renderLambdaRoleConfig(state);
+  assert.match(lambdaRoleConfig, /ConfirmUsage_In', 'SupplyNetwork'/);
+  assert.match(lambdaRoleConfig, /CancelUsage_In', 'SupplyNetwork'/);
+  assert.match(lambdaRoleConfig, /ReservedDynamicUsage_In', 'SupplyNetwork'/);
+  assert.doesNotMatch(lambdaRoleConfig, /'AccountLimits'/);
+});
 
 function roleBlock(iam, roleName) {
   const match = iam.match(

package/test/unit/output/mergeHooks.test.js

@@ -266,3 +266,140 @@ test('respects writeWhenFileExist false flag by returning disk content unchanged
     await rm(tmpDir, { recursive: true, force: true });
   }
 });
+
+test('merges hook when disk content has legacy tag without closing angle bracket', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/Flow_Main.js';
+    const diskContent = [
+      '//(<rbacPublish_CreatePlugInConn)',
+      'let plugInTag = requestParams.plugInTag;',
+      '//(</rbacPublish_CreatePlugInConn)'
+    ].join('\n') + '\n';
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: [
+          '//(<rbacPublish_CreatePlugInConn>)',
+          '//(</rbacPublish_CreatePlugInConn>)'
+        ].join('\n') + '\n'
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(
+      result[0].content,
+      [
+        '//(<rbacPublish_CreatePlugInConn>)',
+        'let plugInTag = requestParams.plugInTag;',
+        '//(</rbacPublish_CreatePlugInConn>)'
+      ].join('\n') + '\n'
+    );
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('merges hook when both template and disk content omit closing angle bracket', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/Legacy_Main.js';
+    const diskContent = [
+      '//(<legacyHook)',
+      'const legacyValue = 42;',
+      '//(</legacyHook)'
+    ].join('\n') + '\n';
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: [
+          '//(<legacyHook)',
+          '//(</legacyHook)'
+        ].join('\n') + '\n'
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(
+      result[0].content,
+      [
+        '//(<legacyHook>)',
+        'const legacyValue = 42;',
+        '//(</legacyHook>)'
+      ].join('\n') + '\n'
+    );
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('throws error when source content has malformed hook tags (unclosed open tag)', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/Broken_Main.js';
+    const diskContent = [
+      '//(<openHook>)',
+      'const value = 1;',
+      '// without closing tag'
+    ].join('\n') + '\n';
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: '//(<openHook>)\n//(</openHook>)\n'
+      }
+    ];
+
+    await assert.rejects(
+      async () => {
+        await mergeHooks(tmpDir, artifacts);
+      },
+      /\[mergeHooks\] Malformed hook tags in 'app\/src\/Broken_Main\.js'/
+    );
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('warns when source content contains custom code in hook missing from template', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  const originalWarn = console.warn;
+  const warnings = [];
+  console.warn = (...args) => warnings.push(args.join(' '));
+
+  try {
+    const filePath = 'app/src/Orphaned_Main.js';
+    const diskContent = [
+      '//(<removedHook>)',
+      'const importantCustomCode = true;',
+      '//(</removedHook>)'
+    ].join('\n') + '\n';
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: '//(<newHook>)\n//(</newHook>)\n'
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(result[0].content, '//(<newHook>)\n//(</newHook>)\n');
+    assert.ok(
+      warnings.some((w) =>
+        w.includes("Hook 'removedHook' in 'app/src/Orphaned_Main.js' contains custom code")
+      ),
+      'Should log warning for orphaned hook with custom code'
+    );
+  } finally {
+    console.warn = originalWarn;
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+

package/test/unit/schemas/attributeTreeSchemas.test.js

@@ -23,7 +23,7 @@ after(async () => {
   await cleanupTestProjects();
 });
 
-test('emitAttributeTreeObjectSchemas returns 3 object schemas per attributeTree tag', () => {
+test('emitAttributeTreeObjectSchemas returns 4 object schemas per attributeTree tag', () => {
   const objects = [
     {
       objectType: 'sellOffer',
@@ -48,13 +48,14 @@ test('emitAttributeTreeObjectSchemas returns 3 object schemas per attributeTree
   ];
 
   const artifacts = emitAttributeTreeObjectSchemas({ objects });
-  assert.equal(artifacts.length, 3);
+  assert.equal(artifacts.length, 4);
 
   const paths = artifacts.map((a) => a.path);
   assert.deepEqual(paths, [
     'app/src/schemas/ObjectSchemas/generatedCode/attributeTree/sellOfferTermLink.js',
     'app/src/schemas/ObjectSchemas/generatedCode/attributeTree/sellOfferTermValue.js',
-    'app/src/schemas/ObjectSchemas/generatedCode/attributeTree/sellOfferTermLabel.js'
+    'app/src/schemas/ObjectSchemas/generatedCode/attributeTree/sellOfferTermLabel.js',
+    'app/src/schemas/ObjectSchemas/generatedCode/attributeTree/sellOfferTermValueStandard.js'
   ]);
 
   const valueArtifact = artifacts.find((a) =>
@@ -63,6 +64,26 @@ test('emitAttributeTreeObjectSchemas returns 3 object schemas per attributeTree
   assert.match(valueArtifact.content, /"objectType": "sellOfferTermValue"/);
   assert.match(valueArtifact.content, /"sellOfferTermValueId"/);
 
+  const valueStandardArtifact = artifacts.find((a) =>
+    a.path.endsWith('sellOfferTermValueStandard.js')
+  );
+  assert.match(
+    valueStandardArtifact.content,
+    /objectType:\s*['"]sellOfferTermValueStandard['"]/
+  );
+  assert.match(
+    valueStandardArtifact.content,
+    /sellOfferTermValueStandardId/
+  );
+  assert.match(
+    valueStandardArtifact.content,
+    /\/\/\(<addOnDataStructuresellOfferTermValueStandard>\)/
+  );
+
+  const managedPaths = attributeTreeObjectSchemaManagedPaths(objects);
+  assert.equal(managedPaths.length, 4);
+  assert.deepEqual(managedPaths, paths);
+
   for (const artifact of artifacts) {
     assert.doesNotMatch(artifact.content, /dynamoDB/);
     assert.match(artifact.content, /GraphHandler/);
@@ -152,6 +173,8 @@ test('generate commits and cleans up attributeTree dynamic schemas', async () =>
 
   const objectRelPath =
     'app/src/schemas/ObjectSchemas/generatedCode/attributeTree/sellOfferTermLink.js';
+  const valueStandardRelPath =
+    'app/src/schemas/ObjectSchemas/generatedCode/attributeTree/sellOfferTermValueStandard.js';
   const relRelPath =
     'app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/hasSellOfferTermLink.js';
 
@@ -160,6 +183,9 @@ test('generate commits and cleans up attributeTree dynamic schemas', async () =>
   assert.match(objectContent, /GraphHandler/);
   assert.doesNotMatch(objectContent, /dynamoDB/);
 
+  const valueStandardContent = await readProjectFile(rootPath, valueStandardRelPath);
+  assert.match(valueStandardContent, /sellOfferTermValueStandard/);
+
   const relContent = await readProjectFile(rootPath, relRelPath);
   assert.match(relContent, /hasSellOfferTermLink/);
   assert.match(relContent, /sellOfferTermLink/);
@@ -171,6 +197,9 @@ test('generate commits and cleans up attributeTree dynamic schemas', async () =>
   await assert.rejects(readProjectFile(rootPath, objectRelPath), {
     code: 'ENOENT'
   });
+  await assert.rejects(readProjectFile(rootPath, valueStandardRelPath), {
+    code: 'ENOENT'
+  });
   await assert.rejects(readProjectFile(rootPath, relRelPath), {
     code: 'ENOENT'
   });