@izara_project/izara-core-generate-service-code 1.0.99 → 1.0.100

package/package.json

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

@@ -20,15 +20,25 @@ export function compileProject(request = {}) {
   }
 
   let serviceTag = request.serviceTag;
-  if (!serviceTag && existsSync(configPath)) {
+  let schemaBucketName = request.schemaBucketName;
+  if (existsSync(configPath)) {
     try {
       const configContent = readFileSync(configPath, 'utf8');
       const parsedConfig = parseYaml(configContent);
       if (parsedConfig && parsedConfig.main_config) {
-        if (parsedConfig.main_config.iz_serviceTag) {
-          serviceTag = parsedConfig.main_config.iz_serviceTag;
-        } else if (parsedConfig.main_config.iz_serviceName) {
-          serviceTag = parsedConfig.main_config.iz_serviceName;
+        if (!serviceTag) {
+          if (parsedConfig.main_config.iz_serviceTag) {
+            serviceTag = parsedConfig.main_config.iz_serviceTag;
+          } else if (parsedConfig.main_config.iz_serviceName) {
+            serviceTag = parsedConfig.main_config.iz_serviceName;
+          }
+        }
+        if (
+          !schemaBucketName &&
+          parsedConfig.main_config.iz_serviceSchemaBucketName
+        ) {
+          schemaBucketName =
+            parsedConfig.main_config.iz_serviceSchemaBucketName;
         }
       }
     } catch (err) {
@@ -49,6 +59,7 @@ export function compileProject(request = {}) {
     configPath,
     schemaRoot: join(rootPath, 'app', 'src', 'schemas'),
     serviceTag,
+    schemaBucketName,
     schemaTemplateConfig
   });
 }

package/src/compile/flowValidator.js

@@ -6,6 +6,7 @@ export const VALID_EVENT_ENUM = [
   'ownTopic',
   's3',
   'dsq',
+  'dss',
   'generateCode'
 ];
 
@@ -14,7 +15,8 @@ export const VALID_S3_STEP_NAMES = [
   'ReservedLimit',
   'CreatePreSignUrl',
   'ProcessAfterUpload',
-  'ConfirmAfterUpload'
+  'ConfirmAfterUpload',
+  'ConfirmComplete'
 ];
 
 

package/src/compile/loadSchemas.js

@@ -1,5 +1,5 @@
 import { readdir, stat } from 'node:fs/promises';
-import { join } from 'node:path';
+import { join, relative, sep } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { utils } from '@izara_project/izara-core-library-service-schemas';
 import { validateFlowSchema } from './flowValidator.js';
@@ -59,6 +59,13 @@ export async function loadLocalSchemaDirectory(
         return false;
       }
     }
+    if (directoryName === 'ErrorSchemas') {
+      const parentDir = entry.parentPath || entry.path || directoryPath;
+      const relDir = relative(directoryPath, parentDir);
+      if (relDir.split(sep).includes('generateCode')) {
+        return false;
+      }
+    }
     return true;
   });
   validEntries.sort((a, b) => {
@@ -416,10 +423,13 @@ export async function loadLocalSchemaDirectory(
               schema
             );
           }
+          const relTag = Object.keys(schema || {})[0];
+          const relGeneratedBy =
+            schema?.[relTag]?.generatedBy || schema?.generatedBy;
           if (
             !status &&
             Array.isArray(errors) &&
-            VALID_GENERATED_BY_ENUM.includes(schema?.generatedBy)
+            VALID_GENERATED_BY_ENUM.includes(relGeneratedBy)
           ) {
             errors = errors.filter(
               (err) =>
@@ -429,7 +439,7 @@ export async function loadLocalSchemaDirectory(
                 ) &&
                 !(
                   err.includes('should be one of enum') &&
-                  err.includes(schema?.generatedBy)
+                  err.includes(relGeneratedBy)
                 )
             );
             if (errors.length === 0) {
@@ -527,7 +537,11 @@ export async function loadLocalSchemaDirectory(
                 );
               });
             }
-            if (errors.length === 0) {
+            const remainingActionableErrors = errors.filter(
+              (err) => err && !err.trim().startsWith('FlowTag:')
+            );
+            if (remainingActionableErrors.length === 0) {
+              errors = [];
               status = true;
             }
           }

package/src/compile/schemaValidatorSetup.js

@@ -9,6 +9,7 @@ export const VALID_EVENT_ENUM = [
   'lambdaSyncInv',
   'lambdaSyncApi',
   'dsq',
+  'dss',
   'generateCode'
 ];
 export const VALID_CODE_HOOK_TAG_ENUM = ['before', 'after'];
@@ -110,6 +111,21 @@ export function setupBasicValidatorSchema(targetSchema = basicValidatorSchema) {
       VALID_GENERATED_BY_ENUM;
   }
 
+  if (targetSchema.relationshipBasicSchema?.patternProperties) {
+    for (const patternSchema of Object.values(
+      targetSchema.relationshipBasicSchema.patternProperties
+    )) {
+      if (patternSchema?.properties?.generatedBy) {
+        patternSchema.properties.generatedBy.enum = Array.from(
+          new Set([
+            ...(patternSchema.properties.generatedBy.enum || []),
+            ...VALID_GENERATED_BY_ENUM
+          ])
+        );
+      }
+    }
+  }
+
   const objectSchemasToPatch = [
     targetSchema.basicObjectSchema,
     targetSchema.basicExtendObjectSchema

package/src/emit/application/coreFunction/emitCoreFunctionArtifacts.js

@@ -5,8 +5,8 @@ import { customFlowNextSteps } from '../custom/customFlows.js';
 import { createCrudActionPlans } from '../crud/crudActionPlan.js';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
-const APP_ROOT = 'app/sls_yaml/generatedCode/source';
-const SRC_ROOT = 'app/src/generatedCode/CoreFunctions';
+// const APP_ROOT = 'app/sls_yaml/generatedCode/source';
+// const SRC_ROOT = 'app/src/generatedCode/CoreFunctions';
 const INITIAL_SETUP_ROOT = 'app/initial_setup/generatedCode/source';
 const INITIAL_SETUP_DATA_ROOT = 'app/initial_setup/generatedCode/data';
 
@@ -159,21 +159,21 @@ export function coreFunctionManagedPaths(
   ]);
 
   const paths = [
-    `${APP_ROOT}/core-function.yml`,
-    `${APP_ROOT}/core-resource.yml`,
-    `${SRC_ROOT}/UploadSchema_HdrInv.js`,
-    `${SRC_ROOT}/UploadSchema_Main.js`,
-    `${SRC_ROOT}/GenerateSeedDataDynamo_HdrInv.js`,
-    `${SRC_ROOT}/GenerateSeedDataDynamo_Main.js`,
-    `${SRC_ROOT}/RemoveSeedDataDynamo_HdrInv.js`,
-    `${SRC_ROOT}/RemoveSeedDataDynamo_Main.js`,
-    `${SRC_ROOT}/GenerateSeedDataGraphData_HdrInv.js`,
-    `${SRC_ROOT}/GenerateSeedDataGraphData_Main.js`,
-    `${SRC_ROOT}/GenerateSeedDataGraphSchema_HdrInv.js`,
-    `${SRC_ROOT}/GenerateSeedDataGraphSchema_Main.js`,
-    `${SRC_ROOT}/InitialSetup_HdrInv.js`,
-    `${SRC_ROOT}/InitialSetup_Main.js`,
-    `${SRC_ROOT}/InitialSetupConfig.js`,
+    // `${APP_ROOT}/core-function.yml`,
+    // `${APP_ROOT}/core-resource.yml`,
+    // `${SRC_ROOT}/UploadSchema_HdrInv.js`,
+    // `${SRC_ROOT}/UploadSchema_Main.js`,
+    // `${SRC_ROOT}/GenerateSeedDataDynamo_HdrInv.js`,
+    // `${SRC_ROOT}/GenerateSeedDataDynamo_Main.js`,
+    // `${SRC_ROOT}/RemoveSeedDataDynamo_HdrInv.js`,
+    // `${SRC_ROOT}/RemoveSeedDataDynamo_Main.js`,
+    // `${SRC_ROOT}/GenerateSeedDataGraphData_HdrInv.js`,
+    // `${SRC_ROOT}/GenerateSeedDataGraphData_Main.js`,
+    // `${SRC_ROOT}/GenerateSeedDataGraphSchema_HdrInv.js`,
+    // `${SRC_ROOT}/GenerateSeedDataGraphSchema_Main.js`,
+    // `${SRC_ROOT}/InitialSetup_HdrInv.js`,
+    // `${SRC_ROOT}/InitialSetup_Main.js`,
+    // `${SRC_ROOT}/InitialSetupConfig.js`,
     `${INITIAL_SETUP_ROOT}/InitialSetupConfig.js`,
     `${INITIAL_SETUP_ROOT}/runner.js`,
     `${INITIAL_SETUP_ROOT}/commands/initialSetup.js`,
@@ -253,20 +253,20 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
   };
 
   const [
-    coreFunctionYaml,
-    coreResourceYaml,
-    uploadSchemaHdrInv,
-    uploadSchemaMain,
-    generateSeedDataDynamoHdrInv,
-    generateSeedDataDynamoMain,
-    removeSeedDataDynamoHdrInv,
-    removeSeedDataDynamoMain,
-    generateSeedDataGraphDataHdrInv,
-    generateSeedDataGraphDataMain,
-    generateSeedDataGraphSchemaHdrInv,
-    generateSeedDataGraphSchemaMain,
-    initialSetupHdrInv,
-    initialSetupMain,
+    // coreFunctionYaml,
+    // coreResourceYaml,
+    // uploadSchemaHdrInv,
+    // uploadSchemaMain,
+    // generateSeedDataDynamoHdrInv,
+    // generateSeedDataDynamoMain,
+    // removeSeedDataDynamoHdrInv,
+    // removeSeedDataDynamoMain,
+    // generateSeedDataGraphDataHdrInv,
+    // generateSeedDataGraphDataMain,
+    // generateSeedDataGraphSchemaHdrInv,
+    // generateSeedDataGraphSchemaMain,
+    // initialSetupHdrInv,
+    // initialSetupMain,
     initialSetupConfig,
     initialSetupRunner,
     commandInitialSetup,
@@ -275,20 +275,20 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     commandSeedGraph,
     commandUploadSchema
   ] = await Promise.all([
-    render('CoreFunction_Yaml.ejs', state),
-    render('CoreResource_Yaml.ejs', state),
-    render('UploadSchema_HdrInv.ejs', state),
-    render('UploadSchema_Main.ejs', state),
-    render('GenerateSeedDataDynamo_HdrInv.ejs', state),
-    render('GenerateSeedDataDynamo_Main.ejs', state),
-    render('RemoveSeedDataDynamo_HdrInv.ejs', state),
-    render('RemoveSeedDataDynamo_Main.ejs', state),
-    render('GenerateSeedDataGraphData_HdrInv.ejs', state),
-    render('GenerateSeedDataGraphData_Main.ejs', state),
-    render('GenerateSeedDataGraphSchema_HdrInv.ejs', state),
-    render('GenerateSeedDataGraphSchema_Main.ejs', state),
-    render('InitialSetup_HdrInv.ejs', state),
-    render('InitialSetup_Main.ejs', state),
+    // render('CoreFunction_Yaml.ejs', state),
+    // render('CoreResource_Yaml.ejs', state),
+    // render('UploadSchema_HdrInv.ejs', state),
+    // render('UploadSchema_Main.ejs', state),
+    // render('GenerateSeedDataDynamo_HdrInv.ejs', state),
+    // render('GenerateSeedDataDynamo_Main.ejs', state),
+    // render('RemoveSeedDataDynamo_HdrInv.ejs', state),
+    // render('RemoveSeedDataDynamo_Main.ejs', state),
+    // render('GenerateSeedDataGraphData_HdrInv.ejs', state),
+    // render('GenerateSeedDataGraphData_Main.ejs', state),
+    // render('GenerateSeedDataGraphSchema_HdrInv.ejs', state),
+    // render('GenerateSeedDataGraphSchema_Main.ejs', state),
+    // render('InitialSetup_HdrInv.ejs', state),
+    // render('InitialSetup_Main.ejs', state),
     render('InitialSetupConfig.ejs', state),
     render('InitialSetupRunner.ejs', state),
     render('InitialSetupRunner_initialSetup.ejs', state),
@@ -299,66 +299,66 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
   ]);
 
   const baseArtifacts = [
-    {
-      path: `${APP_ROOT}/core-function.yml`,
-      content: normalizeYaml(coreFunctionYaml)
-    },
-    {
-      path: `${APP_ROOT}/core-resource.yml`,
-      content: normalizeYaml(coreResourceYaml)
-    },
-    {
-      path: `${SRC_ROOT}/UploadSchema_HdrInv.js`,
-      content: uploadSchemaHdrInv
-    },
-    {
-      path: `${SRC_ROOT}/UploadSchema_Main.js`,
-      content: uploadSchemaMain
-    },
-    {
-      path: `${SRC_ROOT}/GenerateSeedDataDynamo_HdrInv.js`,
-      content: generateSeedDataDynamoHdrInv
-    },
-    {
-      path: `${SRC_ROOT}/GenerateSeedDataDynamo_Main.js`,
-      content: generateSeedDataDynamoMain
-    },
-    {
-      path: `${SRC_ROOT}/RemoveSeedDataDynamo_HdrInv.js`,
-      content: removeSeedDataDynamoHdrInv
-    },
-    {
-      path: `${SRC_ROOT}/RemoveSeedDataDynamo_Main.js`,
-      content: removeSeedDataDynamoMain
-    },
-    {
-      path: `${SRC_ROOT}/GenerateSeedDataGraphData_HdrInv.js`,
-      content: generateSeedDataGraphDataHdrInv
-    },
-    {
-      path: `${SRC_ROOT}/GenerateSeedDataGraphData_Main.js`,
-      content: generateSeedDataGraphDataMain
-    },
-    {
-      path: `${SRC_ROOT}/GenerateSeedDataGraphSchema_HdrInv.js`,
-      content: generateSeedDataGraphSchemaHdrInv
-    },
-    {
-      path: `${SRC_ROOT}/GenerateSeedDataGraphSchema_Main.js`,
-      content: generateSeedDataGraphSchemaMain
-    },
-    {
-      path: `${SRC_ROOT}/InitialSetup_HdrInv.js`,
-      content: initialSetupHdrInv
-    },
-    {
-      path: `${SRC_ROOT}/InitialSetup_Main.js`,
-      content: initialSetupMain
-    },
-    {
-      path: `${SRC_ROOT}/InitialSetupConfig.js`,
-      content: initialSetupConfig
-    },
+    // {
+    //   path: `${APP_ROOT}/core-function.yml`,
+    //   content: normalizeYaml(coreFunctionYaml)
+    // },
+    // {
+    //   path: `${APP_ROOT}/core-resource.yml`,
+    //   content: normalizeYaml(coreResourceYaml)
+    // },
+    // {
+    //   path: `${SRC_ROOT}/UploadSchema_HdrInv.js`,
+    //   content: uploadSchemaHdrInv
+    // },
+    // {
+    //   path: `${SRC_ROOT}/UploadSchema_Main.js`,
+    //   content: uploadSchemaMain
+    // },
+    // {
+    //   path: `${SRC_ROOT}/GenerateSeedDataDynamo_HdrInv.js`,
+    //   content: generateSeedDataDynamoHdrInv
+    // },
+    // {
+    //   path: `${SRC_ROOT}/GenerateSeedDataDynamo_Main.js`,
+    //   content: generateSeedDataDynamoMain
+    // },
+    // {
+    //   path: `${SRC_ROOT}/RemoveSeedDataDynamo_HdrInv.js`,
+    //   content: removeSeedDataDynamoHdrInv
+    // },
+    // {
+    //   path: `${SRC_ROOT}/RemoveSeedDataDynamo_Main.js`,
+    //   content: removeSeedDataDynamoMain
+    // },
+    // {
+    //   path: `${SRC_ROOT}/GenerateSeedDataGraphData_HdrInv.js`,
+    //   content: generateSeedDataGraphDataHdrInv
+    // },
+    // {
+    //   path: `${SRC_ROOT}/GenerateSeedDataGraphData_Main.js`,
+    //   content: generateSeedDataGraphDataMain
+    // },
+    // {
+    //   path: `${SRC_ROOT}/GenerateSeedDataGraphSchema_HdrInv.js`,
+    //   content: generateSeedDataGraphSchemaHdrInv
+    // },
+    // {
+    //   path: `${SRC_ROOT}/GenerateSeedDataGraphSchema_Main.js`,
+    //   content: generateSeedDataGraphSchemaMain
+    // },
+    // {
+    //   path: `${SRC_ROOT}/InitialSetup_HdrInv.js`,
+    //   content: initialSetupHdrInv
+    // },
+    // {
+    //   path: `${SRC_ROOT}/InitialSetup_Main.js`,
+    //   content: initialSetupMain
+    // },
+    // {
+    //   path: `${SRC_ROOT}/InitialSetupConfig.js`,
+    //   content: initialSetupConfig
+    // },
     {
       path: `${INITIAL_SETUP_ROOT}/InitialSetupConfig.js`,
       content: initialSetupConfig
@@ -432,9 +432,9 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
   return baseArtifacts;
 }
 
-function normalizeYaml(content) {
-  return `${content.trimEnd()}\n`;
-}
+// function normalizeYaml(content) {
+//   return `${content.trimEnd()}\n`;
+// }
 
 async function render(templateName, data) {
   return ejsLib.render(

package/src/emit/application/coreFunction/templates/InitialSetupRunner.ejs

@@ -14,13 +14,13 @@
  */
 
 import fs from 'fs';
-import yaml from 'yaml';
+import { readYamlFileSync } from 'read-yaml-file';
 import { join } from 'path';
 
 // 1. Parse serverless config and set environment variables
 const configPath = join(process.cwd(), '..', 'config', 'serverless.config.yml');
 if (fs.existsSync(configPath)) {
-  const serverlessConfig = yaml.parse(fs.readFileSync(configPath, 'utf8'));
+  const serverlessConfig = readYamlFileSync(configPath);
   const izConfig = serverlessConfig.main_config || {};
   process.env.iz_stage = izConfig.iz_stage || process.env.iz_stage;
   process.env.iz_region = izConfig.iz_region || process.env.iz_region;

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

@@ -145,6 +145,8 @@ export default async function CreateComplete(
       }
       const callingFlowConfig =
         result?.additionalAttributes?.callingFlowConfig ||
+        requestParams?.passBackProperties?.parentPassBackProperties ||
+        passBackProperties?.passBackProperties?.parentPassBackProperties ||
         passBackProperties;
       const actionData = {
         objType: returnValue.requestParams.objType,

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

@@ -170,13 +170,20 @@ export async function resolveAndGenerateIdentifiers(
     objectSchemas
   );
 
-  foundErrors.push(
-    ...(await createNodeLib.validateRequiredOnCreateLinks(
-      _izContext,
-      objType,
-      requestParams.relationships
-    ))
-  );
+  try {
+    foundErrors.push(
+      ...(await createNodeLib.validateRequiredOnCreateLinks(
+        _izContext,
+        objType,
+        requestParams.relationships
+      ))
+    );
+  } catch (err) {
+    _izContext.logger.warn(
+      `[${process.env.iz_serviceTag}:<%- flowTag %>] validateRequiredOnCreateLinks warning:`,
+      err.message
+    );
+  }
   _izContext.logger.debug(
     `[${process.env.iz_serviceTag}:<%- flowTag %>] foundErrors:`,
     foundErrors

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

@@ -145,6 +145,8 @@ export default async function DeleteComplete(
       }
       const callingFlowConfig =
         result?.additionalAttributes?.callingFlowConfig ||
+        requestParams?.passBackProperties?.parentPassBackProperties ||
+        passBackProperties?.passBackProperties?.parentPassBackProperties ||
         passBackProperties;
       const actionData = {
         objType: returnValue.requestParams.objType,

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

@@ -89,10 +89,10 @@ export const main = middleware.wrap(async (event, context) => {
             flowSchema.statusType === 'triggerCache'
           ) {
             const taskKey = `${createFlowTypeConcat(event._izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${identifiers}`;
-            event._izContext.logger.debug('[FlowEndpoint_HdrWbs] registering WebSocketTask with ttl', {
+            event._izContext.logger.debug('[FlowEndpoint_HdrWbs] registering WebSocketTask with expirationTime', {
               taskKey,
               connectionId,
-              ttl: 600
+              expirationTime: Math.floor(Date.now() / 1000) + 7200
             });
             await dynamodbSharedLib.putItem(
               event._izContext,
@@ -103,14 +103,15 @@ export const main = middleware.wrap(async (event, context) => {
               {
                 taskKey,
                 connectionId: connectionId,
-                ttl: 600
+                expirationTime: Math.floor(Date.now() / 1000) + 7200
               }
             );
           } else if (flowSchema.statusType === 'none') {
             const taskKey = `${createFlowTypeConcat(event._izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${correlationId}`;
             event._izContext.logger.debug('[FlowEndpoint_HdrWbs] registering WebSocketTask for status none', {
               taskKey,
-              connectionId
+              connectionId,
+              expirationTime: Math.floor(Date.now() / 1000) + 7200
             });
             await dynamodbSharedLib.putItem(
               event._izContext,
@@ -120,7 +121,8 @@ export const main = middleware.wrap(async (event, context) => {
               ),
               {
                 taskKey,
-                connectionId: connectionId
+                connectionId: connectionId,
+                expirationTime: Math.floor(Date.now() / 1000) + 7200
               }
             );
           }

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

@@ -145,6 +145,8 @@ export default async function UpdateComplete(
       }
       const callingFlowConfig =
         result?.additionalAttributes?.callingFlowConfig ||
+        requestParams?.passBackProperties?.parentPassBackProperties ||
+        passBackProperties?.passBackProperties?.parentPassBackProperties ||
         passBackProperties;
 
       const actionData = {

package/src/emit/application/custom/customFlowPaths.js

@@ -4,7 +4,8 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows,
-  upperFirst
+  upperFirst,
+  resolveS3Parts
 } from './customFlows.js';
 
 export const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-schema.yml';
@@ -70,23 +71,19 @@ export function flowPaths(flow, objects = []) {
     paths.push(...ownTopicRootPaths(flow, objects));
   }
   if (flow.event.includes('s3')) {
-    const s3Actions = [
-      'ConfirmAfterUpload',
-      'CreateObject',
-      'CreatePreSignUrl',
-      'ProcessAfterUpload',
-      'ReservedLimit'
-    ];
-    for (const action of s3Actions) {
-      let handler = 'HdrSqs';
-      if (action === 'CreateObject') {
-        handler = 'HdrWbs';
-      } else if (action === 'ProcessAfterUpload') {
-        handler = 'HdrS3';
+    const parts = resolveS3Parts(flow);
+    for (const { action, handler } of parts) {
+      let isStart = false;
+      if (typeof action === 'string' && action.toLowerCase() === 'start') {
+        isStart = true;
+      }
+      let baseName = `${tag}${action}`;
+      if (isStart) {
+        baseName = tag;
       }
       paths.push(
-        `${source}/${tag}${action}_Main.js`,
-        `${source}/${tag}${action}_${handler}.js`
+        `${source}/${baseName}_Main.js`,
+        `${source}/${baseName}_${handler}.js`
       );
     }
   }