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

package/src/compile/schemaValidatorSetup.js

@@ -0,0 +1,143 @@
+import { basicValidatorSchema } from '@izara_project/izara-shared-service-schemas';
+
+export const VALID_INITIATE_BY_ENUM = ['user', 'systemWithUser', 'systemNoUser'];
+export const VALID_EVENT_ENUM = [
+  'ownTopic',
+  'extTopic',
+  's3',
+  'eventBridge',
+  'lambdaSyncInv',
+  'lambdaSyncApi',
+  'dsq',
+  'generateCode'
+];
+export const VALID_CODE_HOOK_TAG_ENUM = ['before', 'after'];
+export const VALID_GENERATE_CODE_TAG_ENUM = ['create', 'update', 'delete'];
+export const VALID_INVOCATION_TYPE_ENUM = ['ownTopic', 'lambdaSyncInv'];
+export const VALID_GENERATED_BY_ENUM = [
+  'user',
+  'systemWithUser',
+  'systemNoUser',
+  'searchResultGenerated'
+];
+
+let isConfigured = false;
+
+export function setupBasicValidatorSchema(targetSchema = basicValidatorSchema) {
+  if (!targetSchema) {
+    return targetSchema;
+  }
+
+  if (targetSchema.basicFlowSchema?.properties?.initiateBy) {
+    targetSchema.basicFlowSchema.properties.initiateBy.enum =
+      VALID_INITIATE_BY_ENUM;
+  }
+
+  if (targetSchema.basicFlowSchema?.properties?.event?.items) {
+    targetSchema.basicFlowSchema.properties.event.items.enum =
+      VALID_EVENT_ENUM;
+  }
+
+  if (
+    targetSchema.basicFlowSchema?.properties?.generatedCodeConfig
+      ?.properties?.codeHookTag
+  ) {
+    targetSchema.basicFlowSchema.properties.generatedCodeConfig.properties.codeHookTag.enum =
+      VALID_CODE_HOOK_TAG_ENUM;
+  }
+
+  if (
+    targetSchema.basicFlowSchema?.properties?.generatedCodeConfig
+      ?.properties?.invocationType
+  ) {
+    targetSchema.basicFlowSchema.properties.generatedCodeConfig.properties.invocationType.enum =
+      VALID_INVOCATION_TYPE_ENUM;
+  }
+
+  if (
+    targetSchema.basicFlowSchema?.properties?.generatedCodeConfig
+      ?.properties?.generateCodeTag
+  ) {
+    targetSchema.basicFlowSchema.properties.generatedCodeConfig.properties.generateCodeTag =
+      {
+        anyOf: [
+          {
+            type: 'array',
+            items: {
+              type: 'string',
+              enum: VALID_GENERATE_CODE_TAG_ENUM
+            }
+          },
+          {
+            type: 'string',
+            enum: VALID_GENERATE_CODE_TAG_ENUM
+          }
+        ]
+      };
+  }
+
+  if (
+    targetSchema.basicFlowSchema?.properties?.generatedCodeConfig
+      ?.properties
+  ) {
+    targetSchema.basicFlowSchema.properties.generatedCodeConfig.properties.objType =
+      {
+        anyOf: [
+          { type: 'string' },
+          {
+            type: 'array',
+            items: { type: 'string' }
+          },
+          {
+            type: 'object',
+            properties: {
+              objectType: { type: 'string' },
+              serviceTag: { type: 'string' }
+            },
+            required: ['objectType']
+          }
+        ]
+      };
+  }
+
+  if (targetSchema.basicObjectSchema?.properties?.generatedBy) {
+    targetSchema.basicObjectSchema.properties.generatedBy.enum =
+      VALID_GENERATED_BY_ENUM;
+  }
+
+  if (targetSchema.basicExtendObjectSchema?.properties?.generatedBy) {
+    targetSchema.basicExtendObjectSchema.properties.generatedBy.enum =
+      VALID_GENERATED_BY_ENUM;
+  }
+
+  const objectSchemasToPatch = [
+    targetSchema.basicObjectSchema,
+    targetSchema.basicExtendObjectSchema
+  ];
+
+  for (const objSchema of objectSchemasToPatch) {
+    const addOnItems = objSchema?.properties?.addOnDataStructure?.items?.anyOf;
+    if (Array.isArray(addOnItems)) {
+      for (const item of addOnItems) {
+        if (item?.properties?.type?.enum?.includes('rbac')) {
+          if (item.properties.billalble) {
+            delete item.properties.billalble;
+          }
+          item.properties.billable = { type: 'boolean' };
+          if (Array.isArray(item.required)) {
+            item.required = item.required.filter((r) => r !== 'billalble');
+          }
+        }
+      }
+    }
+  }
+
+  isConfigured = true;
+  return targetSchema;
+}
+
+export function ensureBasicValidatorConfigured() {
+  if (!isConfigured) {
+    setupBasicValidatorSchema(basicValidatorSchema);
+  }
+}

package/src/emit/{crud → application/crud}/emitCrudApplicationArtifacts.js

@@ -6,7 +6,7 @@ import {
   renderInvFunctionYaml,
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
-} from '../function/functionYamlArtifact.js';
+} from '../../infrastructure/functions/functionYamlArtifact.js';
 
 import {
   CRUD_ACTIONS,
@@ -18,7 +18,7 @@ import {
 const ACTIONS = CRUD_ACTIONS;
 const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-objects.yml';
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
-const SHARED_TEMPLATE_URL = new URL('../shared/templates/', import.meta.url);
+const SHARED_TEMPLATE_URL = new URL('../../shared/templates/', import.meta.url);
 
 export async function emitCrudApplicationArtifacts({
   objects,

package/src/emit/{crud → application/crud}/generateCrudApplicationArtifacts.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaArrays } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaArrays } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   crudApplicationManagedPaths,
   emitCrudApplicationArtifacts

package/src/emit/{crud → application/crud}/generateDynamicCrudFlowSchemas.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaArrays } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaArrays } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   dynamicCrudFlowSchemaPaths,
   emitDynamicCrudFlowSchemas

package/src/emit/{crud → 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/{crud → 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/{custom → application/custom}/customFlowS3.js

@@ -5,7 +5,7 @@ import {
   renderS3FunctionYaml,
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
-} from '../function/functionYamlArtifact.js';
+} from '../../infrastructure/functions/functionYamlArtifact.js';
 
 export async function emitS3Flow(flow, source, handlerRoot) {
   const tag = upperFirst(flow.flowTag);

package/src/emit/{custom → application/custom}/customFlowSteps.js

@@ -8,7 +8,7 @@ import { customFlowRoleName, upperFirst, flowHasRbac } from './customFlows.js';
 import {
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
-} from '../function/functionYamlArtifact.js';
+} from '../../infrastructure/functions/functionYamlArtifact.js';
 
 export async function emitExtTopicStep({ flow, step, flowTag, stepName }) {
   const source = `app/src/generatedCode/FlowSchemas/${flowTag}/source`;

package/src/emit/{custom → application/custom}/customFlowTemplates.js

@@ -1,7 +1,7 @@
 import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
-const SHARED_TEMPLATE_URL = new URL('../shared/templates/', import.meta.url);
+const SHARED_TEMPLATE_URL = new URL('../../shared/templates/', import.meta.url);
 const CRUD_TEMPLATE_URL = new URL('../crud/templates/', import.meta.url);
 const CUSTOM_TEMPLATE_URL = new URL('./templates/', import.meta.url);
 

package/src/emit/{custom → application/custom}/emitCustomFlowApplicationArtifacts.js

@@ -29,7 +29,7 @@ import {
   renderEventBridgeFunctionYaml,
   renderInvFunctionYaml,
   renderSqsFunctionYaml
-} from '../function/functionYamlArtifact.js';
+} from '../../infrastructure/functions/functionYamlArtifact.js';
 
 export { customFlowApplicationManagedPaths };
 

package/src/emit/{custom → application/custom}/generateCustomFlowApplicationArtifacts.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaDirectory } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   customFlowApplicationManagedPaths,
   emitCustomFlowApplicationArtifacts

package/src/emit/{custom → 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/{custom → 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/{rbac → application/rbac}/emitRbacApplicationArtifacts.js

@@ -6,14 +6,14 @@ import {
   renderInvFunctionYaml,
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
-} from '../function/functionYamlArtifact.js';
+} from '../../infrastructure/functions/functionYamlArtifact.js';
 import { rbacFlowTag } from './rbacFlowTag.js';
 
 const FLOW_RBAC_YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-rbac.yml';
 const FLOW_LIMITS_YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-limits.yml';
 const CRUD_TEMPLATE_URL = new URL('../crud/templates/', import.meta.url);
 const RBAC_TEMPLATE_URL = new URL('./templates/', import.meta.url);
-const SHARED_TEMPLATE_URL = new URL('../shared/templates/', import.meta.url);
+const SHARED_TEMPLATE_URL = new URL('../../shared/templates/', import.meta.url);
 
 export async function emitRbacApplicationArtifacts(objects) {
   if (!Array.isArray(objects)) {

package/src/emit/{rbac → application/rbac}/generateCreateTargetRoleHandler.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaDirectory } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   emitRbacApplicationArtifacts,
   rbacApplicationManagedPaths

package/src/emit/{rbac → application/rbac}/generateDynamicRbacFlowSchemas.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaDirectory } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   emitDynamicRbacFlowSchemas,
   rbacFlowSchemaManagedPaths

package/src/emit/{relationship → application/relationship}/emitRelationshipApplicationArtifacts.js

@@ -6,7 +6,7 @@ import {
   renderInvFunctionYaml,
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
-} from '../function/functionYamlArtifact.js';
+} from '../../infrastructure/functions/functionYamlArtifact.js';
 
 const ACTIONS = [
   'CreateRelationship',
@@ -18,7 +18,7 @@ const ACTIONS = [
 ];
 const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-relationships.yml';
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
-const SHARED_TEMPLATE_URL = new URL('../shared/templates/', import.meta.url);
+const SHARED_TEMPLATE_URL = new URL('../../shared/templates/', import.meta.url);
 const CRUD_TEMPLATE_URL = new URL('../crud/templates/', import.meta.url);
 
 export async function emitRelationshipApplicationArtifacts({
@@ -278,7 +278,7 @@ async function render(templateName, data) {
 
 async function renderShared(templateName, data) {
   const template = await readFile(
-    new URL(`../shared/templates/${templateName}`, import.meta.url),
+    new URL(`../../shared/templates/${templateName}`, import.meta.url),
     'utf8'
   );
   return ejsLib.render(template, data);

package/src/emit/{relationship → application/relationship}/generateDynamicRelationshipFlowSchemas.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaDirectory } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   dynamicRelationshipFlowSchemaManagedPaths,
   emitDynamicRelationshipFlowSchemas

package/src/emit/{relationship → application/relationship}/generateRelationshipApplicationArtifacts.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaDirectory } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   emitRelationshipApplicationArtifacts,
   relationshipApplicationManagedPaths

package/src/emit/{relationship → 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/{relationship → 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/{relationship → 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/{relationship → 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/{relationship → 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/{relationship → 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/{system → application/system}/emitSystemFindDataArtifacts.js

@@ -1,7 +1,7 @@
 import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
-const SHARED_TEMPLATE_URL = new URL('../shared/templates/', import.meta.url);
+const SHARED_TEMPLATE_URL = new URL('../../shared/templates/', import.meta.url);
 const FIND_DATA_SOURCE = 'app/src/generatedCode/FindData/source';
 const FIND_DATA_HANDLER_ROOT = 'src/generatedCode/FindData/source';
 const PROCESS_LOGICAL_SOURCE = 'app/src/generatedCode/ProcessLogical/source';

package/src/emit/{system → 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/{system → 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/{system → 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/{resource → infrastructure/resources}/generateResourceArtifacts.js

@@ -1,5 +1,5 @@
-import { loadLocalSchemaDirectory } from '../../compile/loadSchemas.js';
-import { runSubsystemGeneration } from '../shared/runSubsystemGeneration.js';
+import { loadLocalSchemaDirectory } from '../../../compile/loadSchemas.js';
+import { runSubsystemGeneration } from '../../shared/runSubsystemGeneration.js';
 import {
   emitResourceArtifacts,
   resourceArtifactPaths

package/src/emit/{resource → infrastructure/resources}/iamResourceArtifacts.js

@@ -1,10 +1,10 @@
 import { renderResourceTemplate } from './resourceTemplate.js';
-import { CRUD_ACTIONS } from '../crud/crudActionPlan.js';
+import { CRUD_ACTIONS } from '../../application/crud/crudActionPlan.js';
 import {
   customFlowRoleName,
   flowDsqSteps,
   flowExtTopicSteps
-} from '../custom/customFlows.js';
+} from '../../application/custom/customFlows.js';
 import {
   RELATIONSHIP_ACTIONS,
   RBAC_ACTIONS,
@@ -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/{resource → infrastructure/resources}/resourceState.js

@@ -5,10 +5,10 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows
-} from '../custom/customFlows.js';
-import { hasSystemWebSocket } from '../system/emitSystemWebSocketArtifacts.js';
-import { rbacFlowTag } from '../rbac/rbacFlowTag.js';
-import { CRUD_ACTIONS, createCrudActionPlans } from '../crud/crudActionPlan.js';
+} from '../../application/custom/customFlows.js';
+import { hasSystemWebSocket } from '../../application/system/emitSystemWebSocketArtifacts.js';
+import { rbacFlowTag } from '../../application/rbac/rbacFlowTag.js';
+import { CRUD_ACTIONS, createCrudActionPlans } from '../../application/crud/crudActionPlan.js';
 
 export const RELATIONSHIP_ACTIONS = [
   'CreateRelationship',