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

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/{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`;
@@ -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 → 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/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 → application/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/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/{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/{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,

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',