@izara_project/izara-core-generate-service-code 1.0.95 → 1.0.97

package/test/helpers/testProject.js

@@ -0,0 +1,127 @@
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+
+const trackedRoots = new Set();
+
+/**
+ * Creates a temporary project directory with standard Izara service structure.
+ *
+ * @param {Object} [options]
+ * @param {string} [options.rootPath] - Existing root path to re-use
+ * @param {string} [options.prefix] - Temp folder prefix (default: 'izara-test-')
+ * @param {string} [options.serviceName] - Service name in config
+ * @param {string} [options.serviceTag] - Custom serviceTag in config
+ * @param {string} [options.serverlessConfig] - Custom serverless.config.yml content
+ * @param {Object} [options.schemas] - Schemas map e.g. { ObjectSchemas: { 'Order.js': '...' } }
+ * @returns {Promise<string>} The project root path
+ */
+export async function createTestProject({
+  rootPath: existingRoot,
+  prefix = 'izara-test-',
+  serviceName = 'TestService',
+  serviceTag = 'TestService',
+  serverlessConfig,
+  schemas = {}
+} = {}) {
+  let rootPath = existingRoot;
+  if (!rootPath) {
+    rootPath = await mkdtemp(join(tmpdir(), prefix));
+  }
+  trackedRoots.add(rootPath);
+
+  const schemaRoot = join(rootPath, 'app/src/schemas');
+  await mkdir(join(schemaRoot, 'ObjectSchemas'), { recursive: true });
+  await mkdir(join(schemaRoot, 'RelationshipSchemas'), { recursive: true });
+  await mkdir(join(schemaRoot, 'FlowSchemas'), { recursive: true });
+  await mkdir(join(schemaRoot, 'ErrorSchemas'), { recursive: true });
+  await mkdir(join(rootPath, 'config'), { recursive: true });
+
+  let configContent = serverlessConfig;
+  if (!configContent) {
+    configContent =
+      `service: ${serviceName}\n` +
+      `custom:\n` +
+      `  serviceTag: ${serviceTag}\n`;
+  }
+  await writeFile(
+    join(rootPath, 'config/serverless.config.yml'),
+    configContent,
+    'utf8'
+  );
+
+  const schemaCategories = [
+    'ObjectSchemas',
+    'RelationshipSchemas',
+    'FlowSchemas',
+    'ErrorSchemas'
+  ];
+
+  for (const category of schemaCategories) {
+    const files = schemas[category];
+    if (files && typeof files === 'object') {
+      for (const [filename, content] of Object.entries(files)) {
+        await writeProjectFile(
+          rootPath,
+          join('app/src/schemas', category, filename),
+          content
+        );
+      }
+    }
+  }
+
+  for (const [key, content] of Object.entries(schemas)) {
+    if (!schemaCategories.includes(key) && typeof content === 'string') {
+      await writeProjectFile(
+        rootPath,
+        join('app/src/schemas', key),
+        content
+      );
+    }
+  }
+
+  return rootPath;
+}
+
+/**
+ * Tracks an external directory path for cleanupTestProjects.
+ *
+ * @param {string} rootPath - Directory path to track
+ * @returns {string} The tracked path
+ */
+export function trackTestProject(rootPath) {
+  trackedRoots.add(rootPath);
+  return rootPath;
+}
+
+/**
+ * Writes a file relative to the project root.
+ */
+export async function writeProjectFile(rootPath, relativePath, content) {
+  const targetPath = join(rootPath, relativePath);
+  await mkdir(dirname(targetPath), { recursive: true });
+  await writeFile(targetPath, content, 'utf8');
+  return targetPath;
+}
+
+/**
+ * Reads a file relative to the project root.
+ */
+export async function readProjectFile(rootPath, relativePath) {
+  return await readFile(join(rootPath, relativePath), 'utf8');
+}
+
+/**
+ * Cleans up all tracked temporary project directories.
+ */
+export async function cleanupTestProjects() {
+  const roots = Array.from(trackedRoots);
+  trackedRoots.clear();
+  for (const root of roots) {
+    try {
+      await rm(root, { recursive: true, force: true });
+    } catch (err) {
+      // Ignore cleanup errors
+    }
+  }
+}

package/test/helpers/testProject.test.js

@@ -0,0 +1,57 @@
+import assert from 'node:assert/strict';
+import { stat } from 'node:fs/promises';
+import test, { after } from 'node:test';
+
+import {
+  createTestProject,
+  writeProjectFile,
+  readProjectFile,
+  cleanupTestProjects
+} from './testProject.js';
+
+after(async () => {
+  await cleanupTestProjects();
+});
+
+test('createTestProject creates directories and serverless config', async () => {
+  const rootPath = await createTestProject({
+    serviceName: 'DemoService',
+    serviceTag: 'DemoTag'
+  });
+
+  const config = await readProjectFile(
+    rootPath,
+    'config/serverless.config.yml'
+  );
+  assert.match(config, /service: DemoService/);
+  assert.match(config, /serviceTag: DemoTag/);
+
+  const customFile = 'app/src/schemas/ObjectSchemas/Demo.js';
+  await writeProjectFile(
+    rootPath,
+    customFile,
+    'export default [{ objectType: "demo" }];'
+  );
+
+  const readBack = await readProjectFile(rootPath, customFile);
+  assert.match(readBack, /objectType: "demo"/);
+
+  const stats = await stat(rootPath);
+  assert.equal(stats.isDirectory(), true);
+});
+
+test('createTestProject populates initial schemas map', async () => {
+  const rootPath = await createTestProject({
+    schemas: {
+      ObjectSchemas: {
+        'Item.js': 'export default [{ objectType: "item" }];'
+      }
+    }
+  });
+
+  const content = await readProjectFile(
+    rootPath,
+    'app/src/schemas/ObjectSchemas/Item.js'
+  );
+  assert.match(content, /objectType: "item"/);
+});

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

@@ -11,9 +11,9 @@ import { tmpdir } from 'node:os';
 import { dirname, join } from 'node:path';
 import test from 'node:test';
 
-import { buildGenerationPlan } from '../src/plan/buildGenerationPlan.js';
-import { commitArtifacts } from '../src/output/commitArtifacts.js';
-import { compileProject } from '../src/compile/compileProject.js';
+import { buildGenerationPlan } from '../../src/plan/buildGenerationPlan.js';
+import { commitArtifacts } from '../../src/output/commitArtifacts.js';
+import { compileProject } from '../../src/compile/compileProject.js';
 
 test('compiles a request and commits only declared relative artifacts', async () => {
   const outputPath = await mkdtemp(join(tmpdir(), 'generate-service-code-v2-'));

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

@@ -1,6 +1,6 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import { validateFlowSchema } from '../src/compile/flowValidator.js';
+import { validateFlowSchema } from '../../src/compile/flowValidator.js';
 
 test('validateFlowSchema passes for valid Graph-Driven FlowSchema', () => {
   const validSchema = {

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

@@ -4,7 +4,7 @@ import os from 'node:os';
 import path from 'node:path';
 import test from 'node:test';
 
-import { generateIntTest, generateResourceIntTest } from '../index.js';
+import { generateIntTest, generateResourceIntTest } from '../../index.js';
 
 test('exports IntTest generators and requires a service tag', async () => {
   const rootPath = await mkdtemp(

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;
 

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);
@@ -865,7 +865,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 +935,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 +1030,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-')
   );
@@ -1421,8 +1421,52 @@ test('emits early return cacheMain on cache hit in FlowEndpoint_Main for storedC
   await parseAsEsm(mainPath);
 });
 
+test('emits canonical checkStatusField and hooks in FlowEndpoint_Main for statusField', async () => {
+  const rootPath = await createProject();
+  await writeFile(
+    join(rootPath, 'app/src/schemas/FlowSchemas/StatusFieldFlow.js'),
+    `export default {
+  flowTag: 'statusFieldOrder',
+  event: ['ownTopic'],
+  statusType: 'statusField',
+  objType: { objectType: 'order', serviceTag: 'Current' },
+  flowSteps: [{ stepName: 'Start' }]
+};\n`
+  );
+
+  await generateCustomFlowApplicationArtifacts(rootPath);
+
+  const mainPath = join(
+    rootPath,
+    'app/src/generatedCode/FlowSchemas/StatusFieldOrder/source/StatusFieldOrder_Main.js'
+  );
+  const mainContent = await readFile(mainPath, 'utf8');
+  assert.match(
+    mainContent,
+    /import statusFieldSharedLib from '@izara_project\/izara-core-library-status-field';/
+  );
+  assert.match(mainContent, /statusFieldSharedLib\.checkStatusField/);
+  assert.match(mainContent, /\/\/\(<beforeCheckedStatusField>\)/);
+  assert.match(mainContent, /\/\/\(<identifiers>\)/);
+  assert.match(mainContent, /\/\/\(<overwriteUniqueRequestId>\)/);
+  assert.match(mainContent, /\/\/\(<afterCheckStatusField>\)/);
+  assert.match(mainContent, /\/\/\(<afterValidateStatusField>\)/);
+  assert.match(mainContent, /\/\/\(<checkStatusFieldHook>\)/);
+  assert.match(mainContent, /\/\/\(<endpointHook>\)/);
+  assert.match(mainContent, /\/\/\(<beforeCompleteStatusField>\)/);
+  assert.match(mainContent, /statusFieldSharedLib\.completeStatusField/);
+  assert.match(mainContent, /\/\/\(<statusField>\)/);
+  assert.match(mainContent, /\/\/\(<errorFounds>\)/);
+  assert.match(mainContent, /\/\/\(<afterCompleteStatusField>\)/);
+  assert.match(
+    mainContent,
+    /_izContext\.logger\.debug\('\[StatusFieldOrder_Main\] started', \{\s*requestParams,\s*callingFlowConfig\s*\}\);/
+  );
+  await parseAsEsm(mainPath);
+});
+
 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'),
@@ -1495,7 +1539,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'),
@@ -1538,4 +1582,90 @@ test('skips checkRbacPermission in FlowEndpoint_Main when initiateBy is systemNo
   await parseAsEsm(mainPath);
 });
 
+test('emits completeStatusField only in the final flowStep for statusType statusField', async () => {
+  const rootPath = await createProject();
+  await writeFile(
+    join(rootPath, 'app/src/schemas/FlowSchemas/MultiStepStatus.js'),
+    `export default {
+  flowTag: 'multiStepStatus',
+  event: ['ownTopic'],
+  statusType: 'statusField',
+  objType: { objectType: 'order', serviceTag: 'Current' },
+  flowSteps: [
+    {
+      stepName: 'Start',
+      nextSteps: [
+        {
+          targetType: 'extTopic',
+          serviceTag: 'PaymentService',
+          topicName: 'Process_In',
+          toStepNames: ['Process']
+        }
+      ]
+    },
+    {
+      stepName: 'Process',
+      event: ['extTopic'],
+      previousSteps: [{ sourceType: 'ownTopic', stepName: 'Start' }],
+      nextSteps: [
+        {
+          targetType: 'extTopic',
+          serviceTag: 'PaymentService',
+          topicName: 'Finalize_In',
+          toStepNames: ['Finalize']
+        }
+      ]
+    },
+    {
+      stepName: 'Finalize',
+      event: ['extTopic'],
+      previousSteps: [{ sourceType: 'extTopic', serviceTag: 'PaymentService', topicName: 'Process_Out', fromStepNames: ['Process'] }]
+    }
+  ]
+};\n`
+  );
+
+  await generateCustomFlowApplicationArtifacts(rootPath);
+
+  // 1. Start step (FlowEndpoint_Main) has checkStatusField, NOT completeStatusField
+  const startPath = join(
+    rootPath,
+    'app/src/generatedCode/FlowSchemas/MultiStepStatus/source/MultiStepStatus_Main.js'
+  );
+  const startContent = await readFile(startPath, 'utf8');
+  assert.match(startContent, /statusFieldSharedLib\.checkStatusField/);
+  assert.doesNotMatch(startContent, /completeStatusField/);
+  await parseAsEsm(startPath);
+
+  // 2. Middle step (Process) is not the last step, so NO completeStatusField
+  const processPath = join(
+    rootPath,
+    'app/src/generatedCode/FlowSchemas/MultiStepStatus/source/MultiStepStatusProcess_Main.js'
+  );
+  const processContent = await readFile(processPath, 'utf8');
+  assert.doesNotMatch(processContent, /statusFieldSharedLib/);
+  assert.doesNotMatch(processContent, /completeStatusField/);
+  await parseAsEsm(processPath);
+
+  // 3. Final step (Finalize) IS the last step, so it has completeStatusField and canonical hooks
+  const finalizePath = join(
+    rootPath,
+    'app/src/generatedCode/FlowSchemas/MultiStepStatus/source/MultiStepStatusFinalize_Main.js'
+  );
+  const finalizeContent = await readFile(finalizePath, 'utf8');
+  assert.match(
+    finalizeContent,
+    /import statusFieldSharedLib from '@izara_project\/izara-core-library-status-field';/
+  );
+  assert.match(finalizeContent, /\/\/\(<beforeCompleteStatusField>\)/);
+  assert.match(finalizeContent, /statusFieldSharedLib\.completeStatusField/);
+  assert.match(finalizeContent, /flowTag:\s*'multiStepStatus'/);
+  assert.match(finalizeContent, /\/\/\(<identifiers>\)/);
+  assert.match(finalizeContent, /\/\/\(<statusField>\)/);
+  assert.match(finalizeContent, /\/\/\(<errorFounds>\)/);
+  assert.match(finalizeContent, /\/\/\(<afterCompleteStatusField>\)/);
+  await parseAsEsm(finalizePath);
+});
+
+
 

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(() =>

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(() =>