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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "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/emit/attributeTree/emitAttributeTreeSchemas.js

@@ -1,3 +1,6 @@
+import { resolveTargetServicePath } from './resolveTargetServicePath.js';
+import { emitAttributeTreeTargetSchemas } from './emitAttributeTreeTargetSchemas.js';
+
 /**
  * Emits dynamic ObjectSchemas and RelationshipSchemas for attributeTree add-ons
  */
@@ -68,12 +71,10 @@ export function attributeTreeObjectSchemaManagedPaths(objects = []) {
 
   for (const { attributeTreeTag } of trees) {
     const tag = attributeTreeTag;
-    const tagCap = _capitalize(tag);
     paths.push(
       `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Link.js`,
-      `app/src/schemas/ObjectSchemas/generatedAttributeTree/attribute${tagCap}Value.js`,
-      `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Label.js`,
-      `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}ValueStandard.js`
+      `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Value.js`,
+      `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Label.js`
     );
   }
 
@@ -144,14 +145,14 @@ export function emitAttributeTreeObjectSchemas({ objects = [] } = {}) {
       content: _renderObjectSchema(linkSchema)
     });
 
-    // 2. attribute{Tag}Value.js
+    // 2. {tag}Value.js
     const valueSchema = {
-      objectType: `attribute${tagCap}Value`,
+      objectType: `${tag}Value`,
       canDelete: true,
       generatedBy: 'user',
       storageResources: graphStorageResources,
       fieldNames: {
-        [`attribute${tagCap}ValueId`]: {
+        [`${tag}ValueId`]: {
           type: 'string',
           randomOnCreate: true,
           canUpdate: false,
@@ -167,12 +168,12 @@ export function emitAttributeTreeObjectSchemas({ objects = [] } = {}) {
       identifiers: [
         {
           type: 'identifier',
-          fieldName: `attribute${tagCap}ValueId`
+          fieldName: `${tag}ValueId`
         }
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/ObjectSchemas/generatedAttributeTree/attribute${tagCap}Value.js`,
+      path: `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Value.js`,
       content: _renderObjectSchema(valueSchema)
     });
 
@@ -207,38 +208,6 @@ export function emitAttributeTreeObjectSchemas({ objects = [] } = {}) {
       path: `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Label.js`,
       content: _renderObjectSchema(labelSchema)
     });
-
-    // 4. {tag}ValueStandard.js
-    const standardValueSchema = {
-      objectType: `${tag}ValueStandard`,
-      canDelete: true,
-      generatedBy: 'user',
-      storageResources: graphStorageResources,
-      fieldNames: {
-        [`${tag}ValueStandardId`]: {
-          type: 'string',
-          randomOnCreate: true,
-          canUpdate: false,
-          storageResourceTags
-        },
-        value: {
-          type: 'string',
-          requiredOnCreate: true,
-          canUpdate: true,
-          storageResourceTags
-        }
-      },
-      identifiers: [
-        {
-          type: 'identifier',
-          fieldName: `${tag}ValueStandardId`
-        }
-      ]
-    };
-    artifacts.push({
-      path: `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}ValueStandard.js`,
-      content: _renderObjectSchema(standardValueSchema)
-    });
   }
 
   return artifacts;
@@ -268,6 +237,7 @@ export function emitAttributeTreeRelationshipSchemas({
     const hasLinkRel = {
       fieldNames: {},
       storageResources: graphStorageResources,
+      generatedBy: 'user',
       links: [
         {
           storageResourceTags,
@@ -283,7 +253,8 @@ export function emitAttributeTreeRelationshipSchemas({
               serviceTag: effectiveServiceTag,
               objectType: `${tag}Link`
             },
-            linkType: 'many'
+            linkType: 'many',
+            requiredOnCreate: true
           }
         }
       ]
@@ -297,6 +268,7 @@ export function emitAttributeTreeRelationshipSchemas({
     const disabledLinkRel = {
       fieldNames: {},
       storageResources: graphStorageResources,
+      generatedBy: 'user',
       links: [
         {
           storageResourceTags,
@@ -329,6 +301,7 @@ export function emitAttributeTreeRelationshipSchemas({
     const isRel = {
       fieldNames: {},
       storageResources: graphStorageResources,
+      generatedBy: 'systemNoUser',
       links: [
         {
           storageResourceTags,
@@ -337,14 +310,15 @@ export function emitAttributeTreeRelationshipSchemas({
               serviceTag: effectiveServiceTag,
               objectType: `${tag}Link`
             },
-            linkType: 'one'
+            linkType: 'many',
+            requiredOnCreate: true
           },
           to: {
             objType: {
               serviceTag: effectiveServiceTag,
-              objectType: `attribute${tagCap}Value`
+              objectType: `${tag}Value`
             },
-            linkType: 'many'
+            linkType: 'one'
           }
         }
       ]
@@ -358,22 +332,24 @@ export function emitAttributeTreeRelationshipSchemas({
     const isLabelRel = {
       fieldNames: {},
       storageResources: graphStorageResources,
+      generatedBy: 'systemNoUser',
       links: [
         {
           storageResourceTags,
           from: {
             objType: {
               serviceTag: effectiveServiceTag,
-              objectType: `${tag}Link`
+              objectType: `${tag}Value`
             },
-            linkType: 'one'
+            linkType: 'many',
+            requiredOnCreate: true
           },
           to: {
             objType: {
               serviceTag: effectiveServiceTag,
               objectType: `${tag}Label`
             },
-            linkType: 'many'
+            linkType: 'one'
           }
         }
       ]
@@ -386,3 +362,8 @@ export function emitAttributeTreeRelationshipSchemas({
 
   return artifacts;
 }
+
+export {
+  resolveTargetServicePath,
+  emitAttributeTreeTargetSchemas
+};

package/src/emit/attributeTree/emitAttributeTreeTargetSchemas.js

@@ -0,0 +1,153 @@
+import path from 'node:path';
+
+function _renderObjectSchema(schema) {
+  return `export default [\n  ${JSON.stringify(schema, null, 2).replace(/\n/g, '\n  ')}\n];\n`;
+}
+
+/**
+ * Emits standard schemas into target service folder for attributeTree.
+ *
+ * @param {Object} params
+ * @param {string} params.attributeTag - e.g. 'sellOfferTerm'
+ * @param {string} params.targetServiceRoot - Target service root directory
+ * @param {Object} [params.graphStorageResources] - Graph storage resources
+ * @returns {Array<{ path: string, content: string }>} Emitted target artifacts
+ */
+export function emitAttributeTreeTargetSchemas({
+  attributeTag,
+  targetServiceRoot,
+  graphStorageResources = {
+    myGraph: {
+      storageType: 'graph',
+      graphServerTag: 'GraphHandler'
+    }
+  }
+} = {}) {
+  if (!attributeTag || !targetServiceRoot) {
+    return [];
+  }
+
+  const tag = attributeTag;
+  const storageResourceTags = Object.keys(graphStorageResources);
+
+  // 1. {tag}ValueStandardPropertyLabel.js
+  const labelSchema = {
+    objectType: `${tag}ValueStandardPropertyLabel`,
+    canDelete: true,
+    generatedBy: 'user',
+    storageResources: graphStorageResources,
+    fieldNames: {
+      [`${tag}ValueStandardPropertyLabelId`]: {
+        type: 'string',
+        randomOnCreate: true,
+        canUpdate: false,
+        storageResourceTags
+      },
+      label: {
+        type: 'string',
+        requiredOnCreate: true,
+        canUpdate: true,
+        storageResourceTags
+      }
+    },
+    identifiers: [
+      {
+        type: 'identifier',
+        fieldName: `${tag}ValueStandardPropertyLabelId`
+      }
+    ]
+  };
+
+  // 2. {tag}ValueStandardPropertyValue.js
+  const valueSchema = {
+    objectType: `${tag}ValueStandardPropertyValue`,
+    canDelete: true,
+    generatedBy: 'user',
+    storageResources: graphStorageResources,
+    fieldNames: {
+      [`${tag}ValueStandardPropertyValueId`]: {
+        type: 'string',
+        randomOnCreate: true,
+        canUpdate: false,
+        storageResourceTags
+      },
+      value: {
+        type: 'string',
+        requiredOnCreate: true,
+        canUpdate: true,
+        storageResourceTags
+      }
+    },
+    identifiers: [
+      {
+        type: 'identifier',
+        fieldName: `${tag}ValueStandardPropertyValueId`
+      }
+    ]
+  };
+
+  // 3. {tag}ValueStandard.js
+  const standardValueSchema = {
+    objectType: `${tag}ValueStandard`,
+    canDelete: true,
+    generatedBy: 'user',
+    storageResources: graphStorageResources,
+    fieldNames: {
+      [`${tag}ValueStandardId`]: {
+        type: 'string',
+        randomOnCreate: true,
+        canUpdate: false,
+        storageResourceTags
+      },
+      value: {
+        type: 'string',
+        requiredOnCreate: true,
+        canUpdate: true,
+        storageResourceTags
+      }
+    },
+    identifiers: [
+      {
+        type: 'identifier',
+        fieldName: `${tag}ValueStandardId`
+      }
+    ]
+  };
+
+  const relDir = path.join(
+    'app',
+    'src',
+    'schemas',
+    'ObjectSchemas',
+    'generatedCode',
+    'attributeTree',
+    'propertyValue'
+  );
+
+  return [
+    {
+      path: path.join(
+        targetServiceRoot,
+        relDir,
+        `${tag}ValueStandardPropertyLabel.js`
+      ),
+      content: _renderObjectSchema(labelSchema)
+    },
+    {
+      path: path.join(
+        targetServiceRoot,
+        relDir,
+        `${tag}ValueStandardPropertyValue.js`
+      ),
+      content: _renderObjectSchema(valueSchema)
+    },
+    {
+      path: path.join(
+        targetServiceRoot,
+        relDir,
+        `${tag}ValueStandard.js`
+      ),
+      content: _renderObjectSchema(standardValueSchema)
+    }
+  ];
+}

package/src/emit/attributeTree/resolveTargetServicePath.js

@@ -0,0 +1,111 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+/**
+ * Resolves target service root path based on attributeTag and developer suffix.
+ *
+ * @param {Object} params
+ * @param {string} params.currentServiceRoot - Root path of the current service
+ * @param {string} params.attributeTag - The attribute tag, e.g. 'sellOfferTerm'
+ * @param {string} [params.customOverridePath] - Optional custom path override
+ * @returns {string|null} Resolved absolute path or null if not found
+ */
+export function resolveTargetServicePath({
+  currentServiceRoot,
+  attributeTag,
+  customOverridePath
+} = {}) {
+  if (!currentServiceRoot || !attributeTag) {
+    return null;
+  }
+
+  if (customOverridePath) {
+    const resolvedCustom = path.resolve(
+      currentServiceRoot,
+      customOverridePath
+    );
+    if (fs.existsSync(resolvedCustom)) {
+      return resolvedCustom;
+    }
+  }
+
+  const currentFolderName = path.basename(currentServiceRoot);
+  const parentDir = path.resolve(currentServiceRoot, '..');
+
+  if (!fs.existsSync(parentDir)) {
+    return null;
+  }
+
+  let entries = [];
+  try {
+    entries = fs.readdirSync(parentDir, { withFileTypes: true });
+  } catch (err) {
+    return null;
+  }
+
+  const suffixMatch = currentFolderName.match(/-([a-zA-Z0-9]+)$/);
+  let devSuffix = '';
+  if (suffixMatch && suffixMatch[1]) {
+    devSuffix = suffixMatch[1].toLowerCase();
+  }
+
+  const normalizedTag = attributeTag.toLowerCase();
+  const kebabTag = attributeTag
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+    .toLowerCase();
+
+  const priority1Matches = [];
+  const priority2Matches = [];
+  const priority3Matches = [];
+
+  for (const entry of entries) {
+    if (!entry.isDirectory()) {
+      continue;
+    }
+
+    if (entry.name === currentFolderName) {
+      continue;
+    }
+
+    const folderNameLower = entry.name.toLowerCase();
+    const hasTagMatch =
+      folderNameLower.includes(normalizedTag) ||
+      folderNameLower.includes(kebabTag);
+
+    if (!hasTagMatch) {
+      continue;
+    }
+
+    const fullPath = path.join(parentDir, entry.name);
+    const hasStructure =
+      fs.existsSync(path.join(fullPath, 'app', 'src')) ||
+      fs.existsSync(path.join(fullPath, 'package.json'));
+
+    if (!hasStructure) {
+      continue;
+    }
+
+    if (devSuffix !== '' && folderNameLower.endsWith('-' + devSuffix)) {
+      priority1Matches.push(fullPath);
+    } else if (
+      folderNameLower.endsWith(normalizedTag) ||
+      folderNameLower.endsWith(kebabTag)
+    ) {
+      priority2Matches.push(fullPath);
+    } else {
+      priority3Matches.push(fullPath);
+    }
+  }
+
+  if (priority1Matches.length > 0) {
+    return priority1Matches[0];
+  }
+  if (priority2Matches.length > 0) {
+    return priority2Matches[0];
+  }
+  if (priority3Matches.length > 0) {
+    return priority3Matches[0];
+  }
+
+  return null;
+}

package/src/emit/custom/customFlowSteps.js

@@ -53,10 +53,19 @@ export async function emitExtTopicStep({ flow, step, flowTag, stepName }) {
     };
   }
 
+  const flowSteps = flow?.flowSteps ?? [];
+  const isLastStep =
+    flowSteps.length > 1 &&
+    flowSteps[flowSteps.length - 1]?.stepName === step?.stepName;
+
   const artifacts = [
     {
       path: `${source}/${mainFileName}.js`,
-      content: await renderStepMain(functionName, _startConfig(flow))
+      content: await renderStepMain(functionName, _startConfig(flow), {
+        flow,
+        flowTag: flow.flowTag,
+        isLastStep
+      })
     }
   ];
   const functions = [];
@@ -107,10 +116,19 @@ export async function emitDsqStep({ flow, step, flowTag, stepName }) {
     stepEvents = step.event;
   }
   const artifacts = [];
+  const flowSteps = flow?.flowSteps ?? [];
+  const isLastStep =
+    flowSteps.length > 1 &&
+    flowSteps[flowSteps.length - 1]?.stepName === step?.stepName;
+
   if (!stepEvents.includes('extTopic')) {
     artifacts.push({
       path: `${source}/${mainFileName}.js`,
-      content: await renderStepMain(functionName, startConfig)
+      content: await renderStepMain(functionName, startConfig, {
+        flow,
+        flowTag: flow.flowTag,
+        isLastStep
+      })
     });
   }
   const functions = [];
@@ -343,8 +361,19 @@ export function storedCacheTableName(flow, objects) {
   );
 }
 
-export async function renderStepMain(functionName, startConfig = null) {
-  return renderCustom('FlowStep_Main.ejs', { functionName, startConfig });
+export async function renderStepMain(
+  functionName,
+  startConfig = null,
+  options = {}
+) {
+  const { flow, flowTag, isLastStep } = options;
+  return renderCustom('FlowStep_Main.ejs', {
+    functionName,
+    startConfig,
+    flow,
+    flowTag: flowTag || flow?.flowTag,
+    isLastStep: Boolean(isLastStep)
+  });
 }
 
 export function renderMain(functionName) {

package/src/emit/custom/templates/FlowEndpoint_Main.ejs

@@ -26,6 +26,9 @@ import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
 import storedCacheSharedLib from '@izara_project/izara-core-library-stored-cache';
 <% } %>
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField') { %>
+import statusFieldSharedLib from '@izara_project/izara-core-library-status-field';
+<% } %>
 <% if (typeof flow !== 'undefined' && flow.statusType === 'triggerCache') { %>
 import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
 <% } %>
@@ -69,13 +72,48 @@ export default async function <%- typeof functionName !== 'undefined' ? function
   //(</additionalParams>)
 ) {
   try {
-    _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] _izContext:`, _izContext);
-    _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] requestParams:`, requestParams);
-    _izContext.logger.debug(
-      `[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] callingFlowConfig:`,
+    _izContext.logger.debug('[<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] started', {
+      requestParams,
       callingFlowConfig
+    });
+
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField') { -%>
+
+    //(<beforeCheckedStatusField>)
+    //(</beforeCheckedStatusField>)
+
+    let [status, flowStatusFieldRecord] = await statusFieldSharedLib.checkStatusField(
+      _izContext,
+      {
+        flowTag: '<%= flowTag %>',
+        serviceTag: process.env.iz_serviceTag
+      },
+      {
+        //(<identifiers>)
+        //(</identifiers>)
+      },
+      //(<overwriteUniqueRequestId>)
+      //(</overwriteUniqueRequestId>)
+    );
+
+    _izContext.logger.debug(
+      `[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>] checkStatusField result:`,
+      { status, flowStatusFieldRecord }
     );
 
+    //(<afterCheckStatusField>)
+    //(</afterCheckStatusField>)
+
+    if (status !== 'process') {
+      if (status === 'error' || status === 'complete') {
+        //(<afterValidateStatusField>)
+        //(</afterValidateStatusField>)
+      }
+
+      //(<checkStatusFieldHook>)
+      //(</checkStatusFieldHook>)
+    }
+<% } -%>
 <% if (typeof flow !== 'undefined' && flow.statusType === 'triggerCache') { -%>
 
     //(<beforeCheckTriggeredCache>)
@@ -217,6 +255,30 @@ export default async function <%- typeof functionName !== 'undefined' ? function
 
     //(<endpointHook>)
     //(</endpointHook>)
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField' && (!flow.flowSteps || flow.flowSteps.length <= 1)) { -%>
+
+    //(<beforeCompleteStatusField>)
+    //(</beforeCompleteStatusField>)
+
+    await statusFieldSharedLib.completeStatusField(
+      _izContext,
+      {
+        flowTag: '<%= flowTag %>',
+        serviceTag: process.env.iz_serviceTag
+      },
+      {
+        //(<identifiers>)
+        //(</identifiers>)
+      },
+      //(<statusField>)
+      //(</statusField>)
+      //(<errorFounds>)
+      //(</errorFounds>)
+    );
+
+    //(<afterCompleteStatusField>)
+    //(</afterCompleteStatusField>)
+<% } -%>
 <% } -%>
 
   } catch (err) {

package/src/emit/custom/templates/FlowStep_Main.ejs

@@ -16,6 +16,9 @@ along with this program. If not, see
 <http: //www.gnu.org/licenses />.
 */
 import { identifierUuid } from '@izara_project/izara-shared-core';
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField' && typeof isLastStep !== 'undefined' && isLastStep) { %>
+import statusFieldSharedLib from '@izara_project/izara-core-library-status-field';
+<% } %>
 
 //(<optionalRequire>)
 //(</optionalRequire>)
@@ -51,6 +54,30 @@ export default async function <%= functionName %>(
 
     //(<hookCode>)
     //(</hookCode>)
+<% if (typeof flow !== 'undefined' && flow.statusType === 'statusField' && typeof isLastStep !== 'undefined' && isLastStep) { -%>
+
+    //(<beforeCompleteStatusField>)
+    //(</beforeCompleteStatusField>)
+
+    await statusFieldSharedLib.completeStatusField(
+      _izContext,
+      {
+        flowTag: '<%= flowTag %>',
+        serviceTag: process.env.iz_serviceTag
+      },
+      {
+        //(<identifiers>)
+        //(</identifiers>)
+      },
+      //(<statusField>)
+      //(</statusField>)
+      //(<errorFounds>)
+      //(</errorFounds>)
+    );
+
+    //(<afterCompleteStatusField>)
+    //(</afterCompleteStatusField>)
+<% } -%>
   } catch (err) {
     _izContext.logger.error(`[${process.env.iz_serviceTag}:<%= functionName %>] error:`, err);
     throw err;

package/src/generate.js

@@ -1,3 +1,5 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import { buildGenerationPlan } from './plan/buildGenerationPlan.js';
 import { commitArtifacts } from './output/commitArtifacts.js';
 import { compileProject } from './compile/compileProject.js';
@@ -59,7 +61,9 @@ import {
   emitAttributeTreeObjectSchemas,
   emitAttributeTreeRelationshipSchemas,
   attributeTreeObjectSchemaManagedPaths,
-  attributeTreeRelationshipSchemaManagedPaths
+  attributeTreeRelationshipSchemaManagedPaths,
+  resolveTargetServicePath,
+  emitAttributeTreeTargetSchemas
 } from './emit/attributeTree/emitAttributeTreeSchemas.js';
 import {
   emitErrorSchemas,
@@ -147,6 +151,11 @@ export async function generate(rootPath, options = {}) {
         )
       );
     }
+    await _emitTargetServiceAttributeTreeSchemas({
+      project,
+      objects,
+      logger: options.logger
+    });
     const durationMs = Date.now() - startedAt;
     console.log(
       `[INFO] [Generate] STATUS=FINISHED | ` +
@@ -343,3 +352,50 @@ async function _emitGroups({
     }
   ];
 }
+
+async function _emitTargetServiceAttributeTreeSchemas({
+  project,
+  objects,
+  logger
+}) {
+  if (!Array.isArray(objects)) {
+    return;
+  }
+  for (const object of objects) {
+    if (!Array.isArray(object?.addOnDataStructure)) {
+      continue;
+    }
+    for (const addOn of object.addOnDataStructure) {
+      if (addOn?.type === 'attributeTree' && addOn?.attributeTreeTag) {
+        const attributeTag = addOn.attributeTreeTag;
+        const targetServiceRoot = resolveTargetServicePath({
+          currentServiceRoot: project.rootPath,
+          attributeTag
+        });
+        if (targetServiceRoot) {
+          const artifacts = emitAttributeTreeTargetSchemas({
+            attributeTag,
+            targetServiceRoot
+          });
+          for (const artifact of artifacts) {
+            await fs.promises.mkdir(path.dirname(artifact.path), {
+              recursive: true
+            });
+            await fs.promises.writeFile(
+              artifact.path,
+              artifact.content,
+              'utf8'
+            );
+          }
+          if (logger && typeof logger.info === 'function') {
+            logger.info(
+              `[INFO] [AttributeTree] Target schemas emitted for ` +
+                `tag=${attributeTag} to ${targetServiceRoot}`
+            );
+          }
+        }
+      }
+    }
+  }
+}
+

package/test/attributeTreeSchemas.test.js

@@ -8,7 +8,9 @@ import {
   emitAttributeTreeObjectSchemas,
   emitAttributeTreeRelationshipSchemas,
   attributeTreeObjectSchemaManagedPaths,
-  attributeTreeRelationshipSchemaManagedPaths
+  attributeTreeRelationshipSchemaManagedPaths,
+  resolveTargetServicePath,
+  emitAttributeTreeTargetSchemas
 } from '../src/emit/attributeTree/emitAttributeTreeSchemas.js';
 import { generate } from '../src/generate.js';
 
@@ -22,7 +24,7 @@ after(async () => {
   );
 });
 
-test('emitAttributeTreeObjectSchemas returns 4 object schemas per attributeTree tag', () => {
+test('emitAttributeTreeObjectSchemas returns 3 object schemas per attributeTree tag', () => {
   const objects = [
     {
       objectType: 'sellOffer',
@@ -47,16 +49,21 @@ test('emitAttributeTreeObjectSchemas returns 4 object schemas per attributeTree
   ];
 
   const artifacts = emitAttributeTreeObjectSchemas({ objects });
-  assert.equal(artifacts.length, 4);
+  assert.equal(artifacts.length, 3);
 
   const paths = artifacts.map((a) => a.path);
   assert.deepEqual(paths, [
     'app/src/schemas/ObjectSchemas/generatedAttributeTree/sellOfferTermLink.js',
-    'app/src/schemas/ObjectSchemas/generatedAttributeTree/attributeSellOfferTermValue.js',
-    'app/src/schemas/ObjectSchemas/generatedAttributeTree/sellOfferTermLabel.js',
-    'app/src/schemas/ObjectSchemas/generatedAttributeTree/sellOfferTermValueStandard.js'
+    'app/src/schemas/ObjectSchemas/generatedAttributeTree/sellOfferTermValue.js',
+    'app/src/schemas/ObjectSchemas/generatedAttributeTree/sellOfferTermLabel.js'
   ]);
 
+  const valueArtifact = artifacts.find((a) =>
+    a.path.endsWith('sellOfferTermValue.js')
+  );
+  assert.match(valueArtifact.content, /"objectType": "sellOfferTermValue"/);
+  assert.match(valueArtifact.content, /"sellOfferTermValueId"/);
+
   for (const artifact of artifacts) {
     assert.doesNotMatch(artifact.content, /dynamoDB/);
     assert.match(artifact.content, /GraphHandler/);
@@ -101,6 +108,31 @@ test('emitAttributeTreeRelationshipSchemas returns 4 relationship schemas per at
     'app/src/schemas/RelationshipSchemas/generatedAttributeTree/isSellOfferTermLabel.js'
   ]);
 
+  const hasRel = artifacts.find((a) => a.path.endsWith('hasSellOfferTermLink.js'));
+  assert.match(hasRel.content, /"generatedBy": "user"/);
+  assert.match(hasRel.content, /"requiredOnCreate": true/);
+
+  const disabledRel = artifacts.find((a) =>
+    a.path.endsWith('disabledSellOfferTermLink.js')
+  );
+  assert.match(disabledRel.content, /"generatedBy": "user"/);
+
+  const isRel = artifacts.find((a) => a.path.endsWith('isSellOfferTerm.js'));
+  assert.match(isRel.content, /"generatedBy": "systemNoUser"/);
+  assert.match(isRel.content, /"objectType": "sellOfferTermValue"/);
+  assert.match(isRel.content, /"requiredOnCreate": true/);
+
+  const isLabelRel = artifacts.find((a) =>
+    a.path.endsWith('isSellOfferTermLabel.js')
+  );
+  assert.match(isLabelRel.content, /"generatedBy": "systemNoUser"/);
+  assert.match(isLabelRel.content, /"requiredOnCreate": true/);
+  // from objType should be sellOfferTermValue
+  assert.match(
+    isLabelRel.content,
+    /"from":\s*\{\s*"objType":\s*\{[^}]*"objectType": "sellOfferTermValue"/
+  );
+
   for (const artifact of artifacts) {
     assert.doesNotMatch(artifact.content, /dynamoDB/);
     assert.match(artifact.content, /GraphHandler/);
@@ -217,3 +249,53 @@ async function createProjectWithAttributeTree({
 
   return rootPath;
 }
+
+test('resolveTargetServicePath prioritizes dev suffix and matches attributeTag', async () => {
+  const tmpRoot = await mkdtemp(join(tmpdir(), 'izara-services-test-'));
+  projectRoots.add(tmpRoot);
+
+  const currentServiceDir = join(
+    tmpRoot,
+    'izara-market-products-sell-offer-manager-pong'
+  );
+  const targetWithSuffix = join(
+    tmpRoot,
+    'izara-market-products-sell-offer-term-pong'
+  );
+  const targetOtherDev = join(
+    tmpRoot,
+    'izara-market-products-sell-offer-term-alice'
+  );
+  const unrelatedService = join(
+    tmpRoot,
+    'izara-market-products-cart-pong'
+  );
+
+  await mkdir(join(currentServiceDir, 'app/src'), { recursive: true });
+  await mkdir(join(targetWithSuffix, 'app/src'), { recursive: true });
+  await mkdir(join(targetOtherDev, 'app/src'), { recursive: true });
+  await mkdir(join(unrelatedService, 'app/src'), { recursive: true });
+
+  const resolved = resolveTargetServicePath({
+    currentServiceRoot: currentServiceDir,
+    attributeTag: 'sellOfferTerm'
+  });
+
+  assert.equal(resolved, targetWithSuffix);
+});
+
+test('emitAttributeTreeTargetSchemas produces expected standard schemas', () => {
+  const targetDir = '/dummy/path/izara-market-products-sellOfferTerm';
+  const artifacts = emitAttributeTreeTargetSchemas({
+    attributeTag: 'sellOfferTerm',
+    targetServiceRoot: targetDir
+  });
+
+  assert.equal(artifacts.length, 3);
+  const paths = artifacts.map((a) => a.path);
+
+  assert.ok(paths.some((p) => p.endsWith('sellOfferTermValueStandardPropertyLabel.js')));
+  assert.ok(paths.some((p) => p.endsWith('sellOfferTermValueStandardPropertyValue.js')));
+  assert.ok(paths.some((p) => p.endsWith('sellOfferTermValueStandard.js')));
+});
+

package/test/customFlowApplicationArtifacts.test.js

@@ -1421,6 +1421,50 @@ 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 rootPath = await createProject();
@@ -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);
+});
+
+