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

package/test/{publicApi.test.js → integration/publicApi.test.js}

@@ -7,7 +7,7 @@ import test from 'node:test';
 
 process.env.NODE_ENV = 'test';
 
-import * as publicApi from '../index.js';
+import * as publicApi from '../../index.js';
 
 const { generate } = publicApi;
 
@@ -208,7 +208,7 @@ test('generate commits the system WebSocket completion path for own-topic flows'
   assert.match(webSocketComplete, /\(\<createIdentifiersFlow\>\)/);
   assert.match(webSocketComplete, /\(\<beforePostMessage\>\)/);
   assert.match(webSocketComplete, /postToConnection\(_izContext,/);
-  const webSocketHandler = await readFile(
+    const webSocketHandler = await readFile(
     join(
       rootPath,
       'app/src/generatedCode/SystemFlowSchemas/WebSocketMain/source/WebSocketComplete_HdrSqs.js'
@@ -217,6 +217,49 @@ test('generate commits the system WebSocket completion path for own-topic flows'
   );
   assert.match(webSocketHandler, /record\.body\.TopicArn/);
   assert.match(webSocketHandler, /addCallingFlowToPassOnProperties/);
+
+  const registerComplete = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/SystemFlowSchemas/Register/source/RegisterComplete_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(registerComplete, /getFlowSchema\.getFlowSchemaS3WithCache/);
+  assert.doesNotMatch(registerComplete, /getObjectSchema\.getFlowSchemaS3WithCache/);
+
+  const registerMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/SystemFlowSchemas/Register/source/Register_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(registerMain, /getFlowSchema\.getFlowSchemaS3WithCache/);
+  assert.doesNotMatch(registerMain, /getObjectSchema\.getFlowSchemaS3WithCache/);
+
+  assert.match(webSocketComplete, /getFlowSchema\.getFlowSchemaS3WithCache/);
+  assert.doesNotMatch(webSocketComplete, /getObjectSchema\.getFlowSchemaS3WithCache/);
+
+  const trackHdrWbs = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowSchemas/Track/source/Track_HdrWbs.js'
+    ),
+    'utf8'
+  );
+  assert.match(trackHdrWbs, /getFlowSchema\.getFlowSchemaS3WithCache/);
+  assert.doesNotMatch(trackHdrWbs, /getObjectSchema\.getFlowSchemaS3WithCache/);
+
+  const trackWbsMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowSchemas/Track/source/Track_WbsMain.js'
+    ),
+    'utf8'
+  );
+  assert.match(trackWbsMain, /getFlowSchema\.getFlowSchemaS3WithCache/);
+  assert.doesNotMatch(trackWbsMain, /getObjectSchema\.getFlowSchemaS3WithCache/);
 });
 
 test('generate commits the trigger-cache suite with its queues when triggerFlowTypes is set', async () => {
@@ -245,6 +288,16 @@ test('generate commits the trigger-cache suite with its queues when triggerFlowT
     ),
     /CartCheckTriggerFlowsHdrSqs/
   );
+
+  const cartCheckTrigger = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowSchemas/Cart/source/CartCheckTriggerFlows_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(cartCheckTrigger, /getFlowSchema\.getFlowSchemaS3WithCache/);
+  assert.doesNotMatch(cartCheckTrigger, /getObjectSchema\.getFlowSchemaS3WithCache/);
 });
 
 test('generate removes the system WebSocket path when the last own-topic flow is removed', async () => {

package/test/{createTargetRoleHandler.test.js → unit/application/createTargetRoleHandler.test.js}

@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import test, { after } from 'node:test';
 
-import { generateCreateTargetRoleHandler } from '../src/emit/rbac/generateCreateTargetRoleHandler.js';
+import { generateCreateTargetRoleHandler } from '../../../src/emit/application/rbac/generateCreateTargetRoleHandler.js';
 
 const roots = new Set();
 const OWN_TOPIC_FLOWS = [

package/test/{crudApplicationArtifacts.test.js → unit/application/crudApplicationArtifacts.test.js}

@@ -7,7 +7,7 @@ import test, { after } from 'node:test';
 
 process.env.NODE_ENV = 'test';
 
-import { generateCrudApplicationArtifacts } from '../src/emit/crud/generateCrudApplicationArtifacts.js';
+import { generateCrudApplicationArtifacts } from '../../../src/emit/application/crud/generateCrudApplicationArtifacts.js';
 
 const roots = new Set();
 after(() =>

package/test/{customFlowApplicationArtifacts.test.js → unit/application/customFlowApplicationArtifacts.test.js}

@@ -13,10 +13,10 @@ import { dirname, join, resolve } from 'node:path';
 import { promisify } from 'node:util';
 import test, { after } from 'node:test';
 
-import { generate } from '../src/generate.js';
-import { generateCustomFlowApplicationArtifacts } from '../src/emit/custom/generateCustomFlowApplicationArtifacts.js';
-import { generateResourceArtifacts } from '../src/emit/resource/generateResourceArtifacts.js';
-import { renderEventBridgeFunctionYaml } from '../src/emit/function/functionYamlArtifact.js';
+import { generate } from '../../../src/generate.js';
+import { generateCustomFlowApplicationArtifacts } from '../../../src/emit/application/custom/generateCustomFlowApplicationArtifacts.js';
+import { generateResourceArtifacts } from '../../../src/emit/infrastructure/resources/generateResourceArtifacts.js';
+import { renderEventBridgeFunctionYaml } from '../../../src/emit/infrastructure/functions/functionYamlArtifact.js';
 
 const roots = new Set();
 const execFileAsync = promisify(execFile);
@@ -232,6 +232,15 @@ test('emits handlers, function YAML, and IAM roles for supported custom flow eve
       join(rootPath, `app/src/generatedCode/FlowSchemas/Upload/source/${path}`)
     );
   }
+  const uploadCreateObject = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowSchemas/Upload/source/UploadCreateObject_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(uploadCreateObject, /getFlowSchema\.getFlowSchemaS3WithCache/);
+  assert.doesNotMatch(uploadCreateObject, /getObjectSchema\.getFlowSchemaS3WithCache/);
   for (const path of [
     'UploadReservedLimit_Main.js',
     'UploadCreatePreSignUrl_Main.js',
@@ -865,7 +874,7 @@ test(
 );
 
 test('renders nextSteps IAM permissions in InitialSetupConfig', async () => {
-  const { generate } = await import('../src/generate.js');
+  const { generate } = await import('../../../src/generate.js');
   const rootPath = await mkdtemp(
     join(tmpdir(), 'generate-service-code-v2-nextsteps-')
   );
@@ -935,7 +944,7 @@ test('renders nextSteps IAM permissions in InitialSetupConfig', async () => {
 });
 
 test('registers SQS queue, SNS subscription, and SNS out topic for custom flowSchema with outputTopic set to true', async () => {
-  const { generate } = await import('../src/generate.js');
+  const { generate } = await import('../../../src/generate.js');
   const rootPath = await mkdtemp(
     join(tmpdir(), 'generate-service-code-v2-outputtopic-')
   );
@@ -1030,7 +1039,7 @@ test('uses synchronous RBAC without obsolete callback SQS subscriptions in Initi
 });
 
 test('deduplicates duplicate nextSteps topics across flowSteps in InitialSetupConfig', async () => {
-  const { generate } = await import('../src/generate.js');
+  const { generate } = await import('../../../src/generate.js');
   const rootPath = await mkdtemp(
     join(tmpdir(), 'generate-service-code-v2-dedupe-nextsteps-')
   );
@@ -1466,7 +1475,7 @@ test('emits canonical checkStatusField and hooks in FlowEndpoint_Main for status
 });
 
 test('does not emit RbacCallback artifacts or duplicate artifact paths for custom flow with RBAC', async () => {
-  const { generate } = await import('../src/generate.js');
+  const { generate } = await import('../../../src/generate.js');
   const rootPath = await createProject();
   await writeFile(
     join(rootPath, 'app/src/schemas/ObjectSchemas/ComAcc.js'),
@@ -1539,7 +1548,7 @@ test('does not emit RbacCallback artifacts or duplicate artifact paths for custo
 });
 
 test('skips checkRbacPermission in FlowEndpoint_Main when initiateBy is systemNoUser', async () => {
-  const { generate } = await import('../src/generate.js');
+  const { generate } = await import('../../../src/generate.js');
   const rootPath = await createProject();
   await writeFile(
     join(rootPath, 'app/src/schemas/ObjectSchemas/ComAcc.js'),

package/test/{relationshipApplicationArtifacts.test.js → unit/application/relationshipApplicationArtifacts.test.js}

@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import test, { after } from 'node:test';
 
-import { generateRelationshipApplicationArtifacts } from '../src/emit/relationship/generateRelationshipApplicationArtifacts.js';
+import { generateRelationshipApplicationArtifacts } from '../../../src/emit/application/relationship/generateRelationshipApplicationArtifacts.js';
 
 const roots = new Set();
 after(() =>
@@ -154,6 +154,36 @@ test('emits valid hook tags without trailing periods and with correct callingFlo
   assert.doesNotMatch(changeMain, /\/\/\(<requestParamCreateRel>\)/);
 });
 
+test('imports getRelSchema and uses getRelationshipSchemaWithCache from getRelSchema in all relationship Main files', async () => {
+  const rootPath = await createProject(true);
+  await generateRelationshipApplicationArtifacts(rootPath, {
+    serviceTag: 'orders'
+  });
+
+  const actions = ['Create', 'Update', 'Delete', 'Get', 'Change', 'Move'];
+  for (const action of actions) {
+    const mainContent = await readFile(
+      join(
+        rootPath,
+        `app/src/generatedCode/FlowRelationships/${action}Relationship/source/${action}Relationship_Main.js`
+      ),
+      'utf8'
+    );
+    assert.match(
+      mainContent,
+      /import\s*\{[^}]*getRelSchema[^}]*\}\s*from\s*'@izara_project\/izara-core-library-service-schemas'/
+    );
+    assert.match(
+      mainContent,
+      /const\s*\{[^}]*getRelationshipSchemaWithCache[^}]*\}\s*=\s*getRelSchema/
+    );
+    assert.doesNotMatch(
+      mainContent,
+      /const\s*\{[^}]*getRelationshipSchemaWithCache[^}]*\}\s*=\s*getObjectSchema/
+    );
+  }
+});
+
 test('removes managed relationship artifacts after relationships are removed', async () => {
   const rootPath = await createProject(true);
   await generateRelationshipApplicationArtifacts(rootPath, {

package/test/{systemFindDataArtifacts.test.js → unit/application/systemFindDataArtifacts.test.js}

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { emitSystemFindDataArtifacts } from '../src/emit/system/emitSystemFindDataArtifacts.js';
+import { emitSystemFindDataArtifacts } from '../../../src/emit/application/system/emitSystemFindDataArtifacts.js';
 
 test('emitSystemFindDataArtifacts returns empty when no objects have storage resources', async () => {
   const result = await emitSystemFindDataArtifacts([

package/test/{functionYamlArtifact.test.js → unit/infrastructure/functionYamlArtifact.test.js}

@@ -7,7 +7,7 @@ import {
   renderInvFunctionYaml,
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
-} from '../src/emit/function/functionYamlArtifact.js';
+} from '../../../src/emit/infrastructure/functions/functionYamlArtifact.js';
 
 test('renders function-setting hooks for every function transport', () => {
   const functions = [

package/test/{resourceArtifacts.test.js → unit/infrastructure/resourceArtifacts.test.js}

@@ -6,7 +6,7 @@ import test, { after } from 'node:test';
 
 process.env.NODE_ENV = 'test';
 
-import { generateResourceArtifacts } from '../src/emit/resource/generateResourceArtifacts.js';
+import { generateResourceArtifacts } from '../../../src/emit/infrastructure/resources/generateResourceArtifacts.js';
 
 const roots = new Set();
 after(() =>
@@ -167,6 +167,7 @@ test('emits queues, topics, tables, and IAM roles from schema data', async () =>
   assert.match(procFindDataRole, /dynamodb:Query/);
   assert.match(procFindDataRole, /sns:Publish/);
   assert.match(procFindDataRole, /FindData_Out/);
+  assert.match(procFindDataRole, /ProcessLogical_Out/);
   assert.doesNotMatch(
     iam,
     /s3:GetObjectVersion|sqs:DeleteMessageBatch|sqs:GetQueueUrl/

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

@@ -0,0 +1,268 @@
+import assert from 'node:assert/strict';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+
+import { mergeHooks } from '../../../src/output/mergeHooks.js';
+
+async function writeTestFile(tmpDir, relativePath, content) {
+  const fullPath = path.join(tmpDir, relativePath);
+  await mkdir(path.dirname(fullPath), { recursive: true });
+  await writeFile(fullPath, content, 'utf8');
+}
+
+test('merges single hook in JS file when source content has custom code', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/sample.js';
+    await writeTestFile(
+      tmpDir,
+      filePath,
+      '//(<customHook>)\nconst custom = true;\n//(</customHook>)\n'
+    );
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: '//(<customHook>)\n//(</customHook>)\n'
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(
+      result[0].content,
+      '//(<customHook>)\nconst custom = true;\n//(</customHook>)\n'
+    );
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('merges multiple occurrences of the same hook tag without losing occurrences', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/Flow_Main.js';
+    const diskContent = [
+      'function test() {',
+      '  //(<identifiers>)',
+      '  firstIdentifier: true',
+      '  //(</identifiers>)',
+      '',
+      '  //(<identifiers>)',
+      '  secondIdentifier: "customValue"',
+      '  //(</identifiers>)',
+      '}'
+    ].join('\n');
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const templateContent = [
+      'function test() {',
+      '  //(<identifiers>)',
+      '  //(</identifiers>)',
+      '',
+      '  //(<identifiers>)',
+      '  //(</identifiers>)',
+      '}'
+    ].join('\n');
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: templateContent
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(result[0].content, diskContent);
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('preserves second hook when the first occurrence of a duplicate hook is empty on disk', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/Flow_Main.js';
+    const diskContent = [
+      'function test() {',
+      '  //(<identifiers>)',
+      '  //(</identifiers>)',
+      '',
+      '  //(<identifiers>)',
+      '  orderId: requestParams.orderId',
+      '  //(</identifiers>)',
+      '}'
+    ].join('\n');
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const templateContent = [
+      'function test() {',
+      '  //(<identifiers>)',
+      '  //(</identifiers>)',
+      '',
+      '  //(<identifiers>)',
+      '  //(</identifiers>)',
+      '}'
+    ].join('\n');
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: templateContent
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(result[0].content, diskContent);
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('merges hooks with relaxed whitespace around comment slashes and tags', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/sample.js';
+    await writeTestFile(
+      tmpDir,
+      filePath,
+      '// (<spacedHook>)\nconst spaced = 1;\n// (</spacedHook>)\n'
+    );
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: '//(<spacedHook>)\n//(</spacedHook>)\n'
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(
+      result[0].content,
+      '// (<spacedHook>)\nconst spaced = 1;\n// (</spacedHook>)\n'
+    );
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('merges hooks with hyphens and dots in tag names', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/sample.js';
+    await writeTestFile(
+      tmpDir,
+      filePath,
+      '//(<custom-hook.name>)\nconst customName = "valid";\n//(</custom-hook.name>)\n'
+    );
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: '//(<custom-hook.name>)\n//(</custom-hook.name>)\n'
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(
+      result[0].content,
+      '//(<custom-hook.name>)\nconst customName = "valid";\n//(</custom-hook.name>)\n'
+    );
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('merges hooks in YAML files with relaxed whitespace and hyphens', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/sls_yaml/test.yml';
+    const diskContent = [
+      '# <#custom-filter-patterns#>',
+      'filterPatterns:',
+      '  - body: custom',
+      '# <#/custom-filter-patterns#>'
+    ].join('\n');
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const templateContent = [
+      '#<#custom-filter-patterns#>',
+      '#<#/custom-filter-patterns#>'
+    ].join('\n');
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: templateContent
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(result[0].content, diskContent);
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('merges hooks in .mjs and .cjs files', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const mjsPath = 'app/src/sample.mjs';
+    const cjsPath = 'app/src/sample.cjs';
+    await writeTestFile(
+      tmpDir,
+      mjsPath,
+      '//(<mjsHook>)\nexport default 1;\n//(</mjsHook>)\n'
+    );
+    await writeTestFile(
+      tmpDir,
+      cjsPath,
+      '//(<cjsHook>)\nmodule.exports = 2;\n//(</cjsHook>)\n'
+    );
+
+    const artifacts = [
+      {
+        path: mjsPath,
+        content: '//(<mjsHook>)\n//(</mjsHook>)\n'
+      },
+      {
+        path: cjsPath,
+        content: '//(<cjsHook>)\n//(</cjsHook>)\n'
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(
+      result[0].content,
+      '//(<mjsHook>)\nexport default 1;\n//(</mjsHook>)\n'
+    );
+    assert.equal(
+      result[1].content,
+      '//(<cjsHook>)\nmodule.exports = 2;\n//(</cjsHook>)\n'
+    );
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+
+test('respects writeWhenFileExist false flag by returning disk content unchanged', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'app/src/immutable.js';
+    await writeTestFile(tmpDir, filePath, '// existing disk content\n');
+
+    const artifacts = [
+      {
+        path: filePath,
+        content: '// new template content\n',
+        writeWhenFileExist: false
+      }
+    ];
+
+    const result = await mergeHooks(tmpDir, artifacts);
+    assert.equal(result[0].content, '// existing disk content\n');
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});