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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.94",
+  "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/coreFunction/emitCoreFunctionArtifacts.js

@@ -1,7 +1,7 @@
 import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
-import { customFlowNextSteps, flowHasRbac, upperFirst } from '../custom/customFlows.js';
+import { customFlowNextSteps } from '../custom/customFlows.js';
 import { createCrudActionPlans } from '../crud/crudActionPlan.js';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
@@ -217,29 +217,6 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     (objects || []).filter(o => o.belongTo?.serviceTag && o.belongTo.serviceTag !== 'Rbac').map(o => o.belongTo.serviceTag)
   )).sort();
 
-  const customRbacFlows = (flows || []).filter((f) => flowHasRbac(f, objects));
-  const customRbacFlowTags = customRbacFlows.map((f) => f.flowTag);
-  const customRbacFlowsWithTags = customRbacFlows.map((f) => {
-    const roleName = upperFirst(f.flowTag);
-    const matched = objects.find((o) => o.objectType === f.objType?.objectType);
-    const targetServiceTags = [];
-    const belongTo = matched?.belongTo;
-    if (belongTo) {
-      if (Array.isArray(belongTo)) {
-        for (const b of belongTo) {
-          if (b?.serviceTag) targetServiceTags.push(b.serviceTag);
-        }
-      } else if (belongTo.serviceTag) {
-        targetServiceTags.push(belongTo.serviceTag);
-      }
-    }
-    return {
-      roleName,
-      flowTag: f.flowTag,
-      targetServiceTags: Array.from(new Set(targetServiceTags))
-    };
-  });
-
   const crudPlans = createCrudActionPlans(objects);
   const hasQuotaReservation = crudPlans?.Create?.hasQuotaReservation ?? false;
 
@@ -250,8 +227,6 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     relationships,
     flows,
     customFlowNextSteps: customFlowNextSteps(flows),
-    customRbacFlowTags,
-    customRbacFlowsWithTags,
     objectGraphServiceTags,
     relationshipGraphServiceTags,
     crud,

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -178,23 +178,6 @@ const tableConfigs = {
       }
     });
   });
-
-  const currentServiceTag = (typeof serviceTag !== 'undefined' && serviceTag) ? serviceTag : ((typeof project !== 'undefined' && project?.serviceTag) ? project.serviceTag : '');
-  const rbacSubs = [];
-
-  if (typeof customRbacFlowTags !== 'undefined' && customRbacFlowTags && customRbacFlowTags.length > 0) {
-    const allRbacTags = Array.from(new Set([
-      'Rbac',
-      currentServiceTag,
-      ...(typeof rbacValidatorServiceTags !== 'undefined' ? rbacValidatorServiceTags : [])
-    ])).filter(Boolean);
-    customRbacFlowTags.forEach(function(flowTag) {
-      const tagUpper = flowTag[0].toUpperCase() + flowTag.slice(1);
-      allRbacTags.forEach(function(tag) {
-        rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: `${tagUpper}RbacCallbackHdrSqs` });
-      });
-    });
-  }
 -%>
 const snsTopicSubscriptions = [
 <% if (relSubs.length > 0) { -%>
@@ -247,19 +230,6 @@ const snsTopicSubscriptions = [
     sqsEndpoint: '<%= sub.sqsEndpoint %>'
   },
 <% }); -%>
-<% } -%>
-<% if (rbacSubs.length > 0) { -%>
-
-  // ------------------------------------------------------------
-  // RBAC Validator Subscriptions
-  // ------------------------------------------------------------
-<% rbacSubs.forEach(function(sub, idx) { -%>
-  {
-    serviceTag: '<%= sub.serviceTag %>',
-    topicName: '<%= sub.topicName %>',
-    sqsEndpoint: '<%= sub.sqsEndpoint %>'
-  },
-<% }); -%>
 <% } -%>
 
   //(<additionalSubscription>)

package/src/emit/custom/customFlowPaths.js

@@ -4,8 +4,7 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows,
-  upperFirst,
-  flowHasRbac
+  upperFirst
 } from './customFlows.js';
 
 export const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-schema.yml';
@@ -35,12 +34,6 @@ export function ownTopicRootPaths(flow, objects = []) {
     `${source}/${tag}_WbsMain.js`,
     `${source}/${tag}_HdrWbs.js`
   ];
-  if (flowHasRbac(flow, objects)) {
-    paths.push(
-      `${source}/${tag}RbacCallback_Main.js`,
-      `${source}/${tag}RbacCallback_HdrSqs.js`
-    );
-  }
   return paths;
 }
 
@@ -52,12 +45,6 @@ export function flowPaths(flow, objects = []) {
   if (needsProcessMain(flow)) {
     paths.push(`${source}/${process}_Main.js`);
   }
-  if (flowHasRbac(flow, objects)) {
-    paths.push(
-      `${source}/${tag}RbacCallback_Main.js`,
-      `${source}/${tag}RbacCallback_HdrSqs.js`
-    );
-  }
   if (flow.event.includes('extTopic') && !flow.event.includes('ownTopic')) {
     paths.push(`${source}/${process}_HdrSqs.js`);
   }
@@ -116,7 +103,7 @@ export function customFlowApplicationManagedPaths(
   const extSteps = flowExtTopicSteps(flows);
   const dsqSteps = flowDsqSteps(flows);
 
-  return [
+  return Array.from(new Set([
     ...customFlowList.flatMap((flow) => flowPaths(flow, objects)),
     ...generatedRoots.flatMap((flow) => ownTopicRootPaths(flow, objects)),
     ...extSteps.flatMap(({ flowTag, stepName }) => {
@@ -145,5 +132,5 @@ export function customFlowApplicationManagedPaths(
     dsqSteps.length > 0
       ? [YAML_PATH]
       : [])
-  ];
+  ]));
 }