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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.97",
+  "version": "1.0.98",
   "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/compile/loadSchemas.js

@@ -28,6 +28,10 @@ const consoleLogger = {
 
 export { resolveExtendedObjectSchemas, resolveGraphServiceTags };
 
+export async function loadGenerateDirectives(project, options = {}) {
+  return loadLocalSchemaDirectory(project, 'GenerateDirectives', options);
+}
+
 export async function loadLocalSchemaDirectory(
   project,
   directoryName,
@@ -37,7 +41,10 @@ export async function loadLocalSchemaDirectory(
   const logger = options.logger || consoleLogger;
   let entries;
   try {
-    entries = await readdir(directoryPath, { withFileTypes: true });
+    entries = await readdir(directoryPath, {
+      recursive: true,
+      withFileTypes: true
+    });
   } catch (error) {
     if (error.code === 'ENOENT') {
       return [];
@@ -45,14 +52,30 @@ export async function loadLocalSchemaDirectory(
     throw error;
   }
 
-  const validEntries = entries.filter(
-    (entry) => entry.isFile() && entry.name.endsWith('.js')
-  );
-  validEntries.sort((a, b) => a.name.localeCompare(b.name));
+  const validEntries = entries.filter((entry) => {
+    if (!entry.isFile() || !entry.name.endsWith('.js')) {
+      return false;
+    }
+    if (directoryName === 'FlowSchemas') {
+      const parentDir = entry.parentPath || entry.path || '';
+      if (parentDir.includes('generateCode')) {
+        return false;
+      }
+    }
+    return true;
+  });
+  validEntries.sort((a, b) => {
+    const aParent = a.parentPath || a.path || directoryPath;
+    const bParent = b.parentPath || b.path || directoryPath;
+    const aPath = join(aParent, a.name);
+    const bPath = join(bParent, b.name);
+    return aPath.localeCompare(bPath);
+  });
 
   const schemas = [];
   for (const entry of validEntries) {
-    const filePath = join(directoryPath, entry.name);
+    const parentDir = entry.parentPath || entry.path || directoryPath;
+    const filePath = join(parentDir, entry.name);
     const details = await stat(filePath);
     const module = await import(
       `${pathToFileURL(filePath).href}?schemaVersion=${details.mtimeMs}-${details.size}`

package/src/emit/application/crud/templates/FlowEndpoint_HdrWbs.ejs

@@ -26,7 +26,7 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import {
   utils,
-  getObjectSchema
+  getFlowSchema
 } from '@izara_project/izara-core-library-service-schemas';
 const { createFlowTypeConcat } = utils;
 
@@ -70,7 +70,7 @@ export const main = middleware.wrap(async (event, context) => {
           let identifiers = '';
           //(</createIdentifiersFlow>)
 
-          let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+          let flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
             event._izContext,
             {
               flowTag: '<%- flowTag %>',

package/src/emit/application/crud/templates/FlowMain_Wbs.ejs

@@ -16,7 +16,7 @@ along with this program. If not, see
 <http: //www.gnu.org/licenses />.
 */
 
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { getFlowSchema } from '@izara_project/izara-core-library-service-schemas';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
@@ -53,7 +53,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       callingFlowConfig
     );
 
-    const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    const flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
       _izContext,
       {
         flowTag: '<%- flowTag %>',

package/src/emit/application/custom/templates/s3/CreateObject_Main.ejs

@@ -16,7 +16,10 @@ along with this program. If not, see
 <http: //www.gnu.org/licenses />.
 */
 
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import {
+  getObjectSchema,
+  getFlowSchema
+} from '@izara_project/izara-core-library-service-schemas';
 import { consts } from '@izara_project/izara-middleware';
 
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
@@ -65,7 +68,7 @@ export default async function createObject(
 
     let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID);
 
-    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    let flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
       _izContext,
       {
         flowTag: '<%- flowTag %>',

package/src/emit/application/custom/templates/triggerCache/CheckTriggerCache_Main.ejs

@@ -1,4 +1,4 @@
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { getFlowSchema } from '@izara_project/izara-core-library-service-schemas';
 import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
 
 //(<optionalRequire>)
@@ -19,7 +19,7 @@ export default async function <%- functionName %>(
     );
 
     const topicName = topicArn.split(':')[5].split('_');
-    const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    const flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
       _izContext,
       {
         flowTag: topicName[2],

package/src/emit/application/relationship/templates/ChangeRelationship_Main.ejs

@@ -29,14 +29,15 @@ import { sns } from '@izara_project/izara-core-library-external-request';
 
 import {
   getObjectSchema,
+  getRelSchema,
   utils,
   serviceConfig,
   consts,
   relSchemaLib
 } from '@izara_project/izara-core-library-service-schemas';
 
-const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } =
-  getObjectSchema;
+const { getRelationshipSchemaWithCache } = getRelSchema;
+const { getObjSchemaS3WithHierarchy } = getObjectSchema;
 
 const { createLinkTypeId } = utils;
 

package/src/emit/application/relationship/templates/CreateRelationship_Main.ejs

@@ -29,6 +29,7 @@ import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import { sns } from '@izara_project/izara-core-library-external-request';
 import {
   getObjectSchema,
+  getRelSchema,
   utils,
   serviceConfig,
   consts,
@@ -36,8 +37,8 @@ import {
   identifiersObject
 } from '@izara_project/izara-core-library-service-schemas';
 const { findLinksByObjTypes } = relSchemaLib;
-const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } =
-  getObjectSchema;
+const { getRelationshipSchemaWithCache } = getRelSchema;
+const { getObjSchemaS3WithHierarchy } = getObjectSchema;
 
 const { createLinkTypeId } = utils;
 

package/src/emit/application/relationship/templates/DeleteRelationship_Main.ejs

@@ -29,14 +29,15 @@ import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import { sns } from '@izara_project/izara-core-library-external-request';
 import {
   getObjectSchema,
+  getRelSchema,
   utils,
   serviceConfig,
   consts,
   identifiersObject
 } from '@izara_project/izara-core-library-service-schemas';
 
-const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } =
-  getObjectSchema;
+const { getRelationshipSchemaWithCache } = getRelSchema;
+const { getObjSchemaS3WithHierarchy } = getObjectSchema;
 
 const { createLinkTypeId } = utils;
 

package/src/emit/application/relationship/templates/GetRelationship_Main.ejs

@@ -27,6 +27,7 @@ import {
 } from '@izara_project/izara-core-library-external-request';
 import {
   getObjectSchema,
+  getRelSchema,
   utils,
   serviceConfig,
   consts,
@@ -36,8 +37,8 @@ import {
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 
 const { findLinksByObjTypes } = relSchemaLib;
-const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } =
-  getObjectSchema;
+const { getRelationshipSchemaWithCache } = getRelSchema;
+const { getObjSchemaS3WithHierarchy } = getObjectSchema;
 const { createLinkTypeId } = utils;
 const { getGraphServiceTagWithCache } = serviceConfig;
 const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;

package/src/emit/application/relationship/templates/MoveRelationship_Main.ejs

@@ -33,6 +33,7 @@ import {
 
 import {
   getObjectSchema,
+  getRelSchema,
   utils,
   serviceConfig,
   consts,
@@ -41,8 +42,8 @@ import {
 } from '@izara_project/izara-core-library-service-schemas';
 const { findLinksByObjTypes } = relSchemaLib;
 
-const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } =
-  getObjectSchema;
+const { getRelationshipSchemaWithCache } = getRelSchema;
+const { getObjSchemaS3WithHierarchy } = getObjectSchema;
 
 const { createLinkTypeId } = utils;
 

package/src/emit/application/relationship/templates/UpdateRelationship_Main.ejs

@@ -30,14 +30,15 @@ import { sns } from '@izara_project/izara-core-library-external-request';
 
 import {
   getObjectSchema,
+  getRelSchema,
   utils,
   serviceConfig,
   consts,
   identifiersObject
 } from '@izara_project/izara-core-library-service-schemas';
 
-const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } =
-  getObjectSchema;
+const { getRelationshipSchemaWithCache } = getRelSchema;
+const { getObjSchemaS3WithHierarchy } = getObjectSchema;
 
 const { createLinkTypeId } = utils;
 

package/src/emit/application/system/templates/RegisterComplete_Main.ejs

@@ -1,6 +1,10 @@
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-import { getObjectSchema, identifiersObject } from '@izara_project/izara-core-library-service-schemas';
+import {
+  getObjectSchema,
+  getFlowSchema,
+  identifiersObject
+} from '@izara_project/izara-core-library-service-schemas';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import { lambda, webSocket } from '@izara_project/izara-core-library-external-request';
@@ -29,7 +33,7 @@ export default async function registerCompleteMain(
     }
 
     let topicName = topicArn.split(':')[5].split('_');
-    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+    let flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: topicName[2],
       serviceTag: topicName[0]
     });

package/src/emit/application/system/templates/Register_Main.ejs

@@ -1,5 +1,9 @@
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-import { getObjectSchema, identifiersObject } from '@izara_project/izara-core-library-service-schemas';
+import {
+  getObjectSchema,
+  getFlowSchema,
+  identifiersObject
+} from '@izara_project/izara-core-library-service-schemas';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import { lambda, webSocket } from '@izara_project/izara-core-library-external-request';
@@ -20,7 +24,7 @@ export default async function registerMain(
 ) {
   try {
     let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID);
-    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+    let flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: requestParams.flowTag,
       serviceTag: process.env.iz_serviceTag
     });

package/src/emit/application/system/templates/WebSocketComplete_Main.ejs

@@ -1,7 +1,7 @@
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { consts } from '@izara_project/izara-middleware';
 import {
-  getObjectSchema,
+  getFlowSchema,
   utils
 } from '@izara_project/izara-core-library-service-schemas';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
@@ -30,7 +30,7 @@ export default async function WebSocketComplete(
       throw new NoRetryError('not have TopicArn for get FlowSchemas');
     const topicName = topicArn.split(':')[5].split('_');
     let flowTag = topicName[2];
-    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    let flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
       _izContext,
       { flowTag, serviceTag: topicName[0] }
     );
@@ -40,7 +40,7 @@ export default async function WebSocketComplete(
           'Could not find flowSchema from topicArn or requestParams.flowTag'
         );
       flowTag = requestParams.flowTag;
-      flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+      flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(_izContext, {
         flowTag,
         serviceTag: process.env.iz_serviceTag
       });

package/src/emit/infrastructure/resources/iamResourceArtifacts.js

@@ -369,7 +369,7 @@ export function roleDlqQueueNames(state, roleName) {
 export function roleTopicNames(state, roleName) {
   if (roleName === 'ProcFindDataRole') {
     return state.outTopics
-      .filter((topic) => topic === 'FindData')
+      .filter((topic) => topic === 'FindData' || topic === 'ProcessLogical')
       .map((t) => `${t}_Out`);
   }
   if (roleName === 'FlowObjectsRole') {

package/src/emit/schemas/attributeTree/emitAttributeTreeSchemas.js

@@ -1,6 +1,3 @@
-import { resolveTargetServicePath } from './resolveTargetServicePath.js';
-import { emitAttributeTreeTargetSchemas } from './emitAttributeTreeTargetSchemas.js';
-
 /**
  * Emits dynamic ObjectSchemas and RelationshipSchemas for attributeTree add-ons
  */
@@ -72,9 +69,9 @@ export function attributeTreeObjectSchemaManagedPaths(objects = []) {
   for (const { attributeTreeTag } of trees) {
     const tag = attributeTreeTag;
     paths.push(
-      `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Link.js`,
-      `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Value.js`,
-      `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Label.js`
+      `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/${tag}Link.js`,
+      `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/${tag}Value.js`,
+      `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/${tag}Label.js`
     );
   }
 
@@ -89,10 +86,10 @@ export function attributeTreeRelationshipSchemaManagedPaths(objects = []) {
     const tag = attributeTreeTag;
     const tagCap = _capitalize(tag);
     paths.push(
-      `app/src/schemas/RelationshipSchemas/generatedAttributeTree/has${tagCap}Link.js`,
-      `app/src/schemas/RelationshipSchemas/generatedAttributeTree/disabled${tagCap}Link.js`,
-      `app/src/schemas/RelationshipSchemas/generatedAttributeTree/is${tagCap}.js`,
-      `app/src/schemas/RelationshipSchemas/generatedAttributeTree/is${tagCap}Label.js`
+      `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/has${tagCap}Link.js`,
+      `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/disabled${tagCap}Link.js`,
+      `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/is${tagCap}.js`,
+      `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/is${tagCap}Label.js`
     );
   }
 
@@ -141,7 +138,7 @@ export function emitAttributeTreeObjectSchemas({ objects = [] } = {}) {
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Link.js`,
+      path: `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/${tag}Link.js`,
       content: _renderObjectSchema(linkSchema)
     });
 
@@ -173,7 +170,7 @@ export function emitAttributeTreeObjectSchemas({ objects = [] } = {}) {
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Value.js`,
+      path: `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/${tag}Value.js`,
       content: _renderObjectSchema(valueSchema)
     });
 
@@ -205,7 +202,7 @@ export function emitAttributeTreeObjectSchemas({ objects = [] } = {}) {
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/ObjectSchemas/generatedAttributeTree/${tag}Label.js`,
+      path: `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/${tag}Label.js`,
       content: _renderObjectSchema(labelSchema)
     });
   }
@@ -260,7 +257,7 @@ export function emitAttributeTreeRelationshipSchemas({
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/RelationshipSchemas/generatedAttributeTree/has${tagCap}Link.js`,
+      path: `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/has${tagCap}Link.js`,
       content: _renderRelationshipSchema(`has${tagCap}Link`, hasLinkRel)
     });
 
@@ -290,7 +287,7 @@ export function emitAttributeTreeRelationshipSchemas({
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/RelationshipSchemas/generatedAttributeTree/disabled${tagCap}Link.js`,
+      path: `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/disabled${tagCap}Link.js`,
       content: _renderRelationshipSchema(
         `disabled${tagCap}Link`,
         disabledLinkRel
@@ -324,7 +321,7 @@ export function emitAttributeTreeRelationshipSchemas({
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/RelationshipSchemas/generatedAttributeTree/is${tagCap}.js`,
+      path: `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/is${tagCap}.js`,
       content: _renderRelationshipSchema(`is${tagCap}`, isRel)
     });
 
@@ -355,15 +352,10 @@ export function emitAttributeTreeRelationshipSchemas({
       ]
     };
     artifacts.push({
-      path: `app/src/schemas/RelationshipSchemas/generatedAttributeTree/is${tagCap}Label.js`,
+      path: `app/src/schemas/RelationshipSchemas/generatedCode/attributeTree/is${tagCap}Label.js`,
       content: _renderRelationshipSchema(`is${tagCap}Label`, isLabelRel)
     });
   }
 
   return artifacts;
 }
-
-export {
-  resolveTargetServicePath,
-  emitAttributeTreeTargetSchemas
-};

package/src/emit/schemas/attributeTree/emitAttributeTreeTargetValueStandard.js

@@ -0,0 +1,132 @@
+/**
+ * Emits target ValueStandard ObjectSchema for attributeTreeTarget directives
+ */
+
+function _extractTargetDirectives(directives = []) {
+  if (!Array.isArray(directives)) {
+    return [];
+  }
+  const results = [];
+  const seenTags = new Set();
+
+  for (const directive of directives) {
+    if (
+      directive?.type === 'attributeTreeTarget' &&
+      directive?.attributeTreeTag
+    ) {
+      const tag = directive.attributeTreeTag;
+      if (seenTags.has(tag)) {
+        continue;
+      }
+      seenTags.add(tag);
+      results.push(directive);
+    }
+  }
+
+  return results;
+}
+
+function _extractStorageResources(directive) {
+  if (directive?.storageResources) {
+    return directive.storageResources;
+  }
+  return {
+    myGraph: {
+      storageType: 'graph',
+      graphServerTag: 'GraphHandler'
+    }
+  };
+}
+
+function _renderTargetValueStandardSchema(tag, storageResources) {
+  const storageResourceTags = Object.keys(storageResources);
+  if (storageResourceTags.length === 0) {
+    storageResourceTags.push('myGraph');
+  }
+
+  const storageJson = JSON.stringify(storageResources, null, 2)
+    .replace(/\n/g, '\n    ');
+  const tagsJson = JSON.stringify(storageResourceTags);
+
+  return `export default [
+  {
+    objectType: '${tag}ValueStandard',
+    canDelete: true,
+    generatedBy: 'user',
+    storageResources: ${storageJson},
+    addOnDataStructure: [
+      //(<addOnDataStructure${tag}ValueStandard>)
+      // {
+      //   type: 'propertyValue',
+      //   propertyValuePrefix: '${tag}ValueStandard'
+      // }
+      //(</addOnDataStructure${tag}ValueStandard>)
+    ],
+    fieldNames: {
+      ${tag}ValueStandardId: {
+        type: 'string',
+        randomOnCreate: true,
+        canUpdate: false,
+        storageResourceTags: ${tagsJson}
+      },
+      label: {
+        type: 'string',
+        canUpdate: true,
+        storageResourceTags: ${tagsJson}
+      },
+      value: {
+        type: 'string',
+        requiredOnCreate: true,
+        canUpdate: true,
+        storageResourceTags: ${tagsJson}
+      }
+    },
+    identifiers: [
+      {
+        type: 'identifier',
+        fieldName: '${tag}ValueStandardId'
+      }
+    ]
+  }
+];
+`;
+}
+
+export function attributeTreeTargetValueStandardManagedPaths(directives = []) {
+  const targets = _extractTargetDirectives(directives);
+  const paths = [];
+
+  for (const directive of targets) {
+    const tag = directive.attributeTreeTag;
+    paths.push(
+      `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/` +
+        `${tag}ValueStandard.js`
+    );
+  }
+
+  return paths;
+}
+
+export function emitAttributeTreeTargetValueStandard({
+  directives = []
+} = {}) {
+  const targets = _extractTargetDirectives(directives);
+  if (targets.length === 0) {
+    return [];
+  }
+
+  const artifacts = [];
+
+  for (const directive of targets) {
+    const tag = directive.attributeTreeTag;
+    const storageResources = _extractStorageResources(directive);
+    artifacts.push({
+      path:
+        `app/src/schemas/ObjectSchemas/generatedCode/attributeTree/` +
+        `${tag}ValueStandard.js`,
+      content: _renderTargetValueStandardSchema(tag, storageResources)
+    });
+  }
+
+  return artifacts;
+}