@izara_project/izara-core-generate-service-code 1.0.68 → 1.0.70

package/src/generate.js

@@ -1,16 +1,55 @@
 import { buildGenerationPlan } from './plan/buildGenerationPlan.js';
 import { commitArtifacts } from './output/commitArtifacts.js';
 import { compileProject } from './compile/compileProject.js';
-import { crudApplicationManagedPaths, emitCrudApplicationArtifacts } from './emit/crud/emitCrudApplicationArtifacts.js';
-import { dynamicCrudFlowSchemaPaths, emitDynamicCrudFlowSchemas } from './emit/crud/emitDynamicCrudFlowSchemas.js';
-import { customFlowApplicationManagedPaths, emitCustomFlowApplicationArtifacts } from './emit/custom/emitCustomFlowApplicationArtifacts.js';
-import { emitDynamicRbacFlowSchemas, rbacFlowSchemaManagedPaths } from './emit/rbac/emitDynamicRbacFlowSchemas.js';
-import { emitRbacApplicationArtifacts, rbacApplicationManagedPaths } from './emit/rbac/emitRbacApplicationArtifacts.js';
-import { dynamicRelationshipFlowSchemaPaths, emitDynamicRelationshipFlowSchemas } from './emit/relationship/emitDynamicRelationshipFlowSchemas.js';
-import { emitRelationshipApplicationArtifacts, relationshipApplicationManagedPaths } from './emit/relationship/emitRelationshipApplicationArtifacts.js';
-import { emitResourceArtifacts, resourceArtifactPaths } from './emit/resource/emitResourceArtifacts.js';
-import { loadLocalSchemaDirectory, resolveExtendedObjectSchemas } from './compile/loadSchemas.js';
-import { emitSystemWebSocketArtifacts, hasSystemWebSocket, systemWebSocketManagedPaths } from './emit/system/emitSystemWebSocketArtifacts.js';
+import {
+  crudApplicationManagedPaths,
+  emitCrudApplicationArtifacts
+} from './emit/crud/emitCrudApplicationArtifacts.js';
+import {
+  dynamicCrudFlowSchemaPaths,
+  emitDynamicCrudFlowSchemas
+} from './emit/crud/emitDynamicCrudFlowSchemas.js';
+import {
+  customFlowApplicationManagedPaths,
+  emitCustomFlowApplicationArtifacts
+} from './emit/custom/emitCustomFlowApplicationArtifacts.js';
+import {
+  emitDynamicRbacFlowSchemas,
+  rbacFlowSchemaManagedPaths
+} from './emit/rbac/emitDynamicRbacFlowSchemas.js';
+import {
+  emitRbacApplicationArtifacts,
+  rbacApplicationManagedPaths
+} from './emit/rbac/emitRbacApplicationArtifacts.js';
+import {
+  dynamicRelationshipFlowSchemaPaths,
+  emitDynamicRelationshipFlowSchemas
+} from './emit/relationship/emitDynamicRelationshipFlowSchemas.js';
+import {
+  emitRelationshipApplicationArtifacts,
+  relationshipApplicationManagedPaths
+} from './emit/relationship/emitRelationshipApplicationArtifacts.js';
+import {
+  emitResourceArtifacts,
+  resourceArtifactPaths
+} from './emit/resource/emitResourceArtifacts.js';
+import {
+  loadLocalSchemaDirectory,
+  resolveExtendedObjectSchemas
+} from './compile/loadSchemas.js';
+import {
+  emitSystemWebSocketArtifacts,
+  hasSystemWebSocket,
+  systemWebSocketManagedPaths
+} from './emit/system/emitSystemWebSocketArtifacts.js';
+import {
+  emitSystemFindDataArtifacts,
+  findDataManagedPaths
+} from './emit/system/emitSystemFindDataArtifacts.js';
+import {
+  emitCoreFunctionArtifacts,
+  coreFunctionManagedPaths
+} from './emit/coreFunction/emitCoreFunctionArtifacts.js';
 
 export async function generate(rootPath, options = {}) {
   const startedAt = Date.now();
@@ -23,46 +62,137 @@ export async function generate(rootPath, options = {}) {
       loadLocalSchemaDirectory(project, 'RelationshipSchemas'),
       loadLocalSchemaDirectory(project, 'FlowSchemas')
     ]);
+    const schemaBucketName =
+      options.schemaBucketName || process.env.iz_serviceSchemaBucketName;
     const objects = await resolveExtendedObjectSchemas(
       rawObjects,
-      options.schemaBucketName
+      schemaBucketName
     );
-    logger?.debug?.(`[DEBUG] [Generate] STATUS=SCHEMAS_LOADED | objects=${objects.length} relationships=${relationships.length} flows=${flows.length}`);
-    const groups = await emitGroups({ project, objects, relationships, flows });
-    logger?.debug?.(`[DEBUG] [Generate] STATUS=ARTIFACTS_EMITTED | ${groups.map(group => `${group.scope}=${group.artifacts.length}`).join(' ')}`);
-    const files = groups.length === 0
-      ? []
-      : await commitArtifacts(buildGenerationPlan(project, groups.flatMap(group => group.artifacts), {
-        managedScopes: Object.fromEntries(groups.map(group => [group.scope, group.managedPaths]))
-      }));
+    logger?.debug?.(
+      `[DEBUG] [Generate] STATUS=SCHEMAS_LOADED | objects=${objects.length} relationships=${relationships.length} flows=${flows.length}`
+    );
+    const groups = await _emitGroups({
+      project,
+      objects,
+      relationships,
+      flows
+    });
+    logger?.debug?.(
+      `[DEBUG] [Generate] STATUS=ARTIFACTS_EMITTED | ${groups.map((group) => `${group.scope}=${group.artifacts.length}`).join(' ')}`
+    );
+    let files = [];
+    if (groups.length > 0) {
+      files = await commitArtifacts(
+        buildGenerationPlan(
+          project,
+          groups.flatMap((group) => group.artifacts),
+          {
+            managedScopes: Object.fromEntries(
+              groups.map((group) => [group.scope, group.managedPaths])
+            )
+          }
+        )
+      );
+    }
     const durationMs = Date.now() - startedAt;
-    logger?.info?.(`[INFO] [Generate] STATUS=FINISHED | files=${files.length} durationMs=${durationMs}`);
+    logger?.info?.(
+      `[INFO] [Generate] STATUS=FINISHED | files=${files.length} durationMs=${durationMs}`
+    );
 
     return { project, durationMs, files };
   } catch (error) {
-    logger?.error?.(`[ERROR] [Generate] STATUS=FAILED | durationMs=${Date.now() - startedAt}`, error);
+    logger?.error?.(
+      `[ERROR] [Generate] STATUS=FAILED | durationMs=${Date.now() - startedAt}`,
+      error
+    );
     throw error;
   }
 }
 
-async function emitGroups({ project, objects, relationships, flows }) {
-  const [crud, relationship, rbac, system, resource] = await Promise.all([
-    emitCrudApplicationArtifacts({ objects, flows, serviceTag: project.serviceTag }),
-    emitRelationshipApplicationArtifacts({ relationships, flows, serviceTag: project.serviceTag }),
+async function _emitGroups({ project, objects, relationships, flows }) {
+  const [crud, relationship, rbac, system, findData, resource, coreFunction] = await Promise.all([
+    emitCrudApplicationArtifacts({
+      objects,
+      flows,
+      serviceTag: project.serviceTag
+    }),
+    emitRelationshipApplicationArtifacts({
+      relationships,
+      flows,
+      serviceTag: project.serviceTag
+    }),
     emitRbacApplicationArtifacts(objects),
     emitSystemWebSocketArtifacts(flows, { includeRelationshipOwnTopic: true }),
-    emitResourceArtifacts({ objects, relationships, flows })
+    emitSystemFindDataArtifacts(objects),
+    emitResourceArtifacts({ objects, relationships, flows }),
+    emitCoreFunctionArtifacts({ project, objects, relationships })
   ]);
-  const custom = await emitCustomFlowApplicationArtifacts(flows, { systemFunctions: system.functions, objects });
+  const custom = await emitCustomFlowApplicationArtifacts(flows, {
+    systemFunctions: system.functions,
+    objects
+  });
   return [
-    { scope: 'crud-flow-schemas', managedPaths: dynamicCrudFlowSchemaPaths, artifacts: emitDynamicCrudFlowSchemas({ objects, flows }) },
-    { scope: 'relationship-flow-schemas', managedPaths: dynamicRelationshipFlowSchemaPaths, artifacts: emitDynamicRelationshipFlowSchemas() },
-    { scope: 'rbac-flow-schemas', managedPaths: rbacFlowSchemaManagedPaths(objects), artifacts: await emitDynamicRbacFlowSchemas({ objects, serviceTag: project.serviceTag }) },
-    { scope: 'crud-application', managedPaths: crudApplicationManagedPaths(), artifacts: crud },
-    { scope: 'relationship-application', managedPaths: relationshipApplicationManagedPaths(), artifacts: relationship },
-    { scope: 'rbac-application', managedPaths: rbacApplicationManagedPaths(objects), artifacts: rbac },
-    { scope: 'system-websocket', managedPaths: systemWebSocketManagedPaths(), artifacts: system.artifacts },
-    { scope: 'custom-flow-application', managedPaths: customFlowApplicationManagedPaths(flows, { includeYaml: hasSystemWebSocket(flows, { includeRelationshipOwnTopic: true }) }), artifacts: custom },
-    { scope: 'shared-resources', managedPaths: resourceArtifactPaths, artifacts: resource }
+    {
+      scope: 'crud-flow-schemas',
+      managedPaths: dynamicCrudFlowSchemaPaths,
+      artifacts: emitDynamicCrudFlowSchemas({ objects, flows })
+    },
+    {
+      scope: 'relationship-flow-schemas',
+      managedPaths: dynamicRelationshipFlowSchemaPaths,
+      artifacts: emitDynamicRelationshipFlowSchemas()
+    },
+    {
+      scope: 'rbac-flow-schemas',
+      managedPaths: rbacFlowSchemaManagedPaths(objects),
+      artifacts: await emitDynamicRbacFlowSchemas({
+        objects,
+        serviceTag: project.serviceTag
+      })
+    },
+    {
+      scope: 'crud-application',
+      managedPaths: crudApplicationManagedPaths(),
+      artifacts: crud
+    },
+    {
+      scope: 'relationship-application',
+      managedPaths: relationshipApplicationManagedPaths(),
+      artifacts: relationship
+    },
+    {
+      scope: 'rbac-application',
+      managedPaths: rbacApplicationManagedPaths(objects),
+      artifacts: rbac
+    },
+    {
+      scope: 'system-websocket',
+      managedPaths: systemWebSocketManagedPaths(),
+      artifacts: system.artifacts
+    },
+    {
+      scope: 'system-find-data',
+      managedPaths: findDataManagedPaths(),
+      artifacts: findData
+    },
+    {
+      scope: 'custom-flow-application',
+      managedPaths: customFlowApplicationManagedPaths(flows, {
+        includeYaml: hasSystemWebSocket(flows, {
+          includeRelationshipOwnTopic: true
+        })
+      }),
+      artifacts: custom
+    },
+    {
+      scope: 'shared-resources',
+      managedPaths: resourceArtifactPaths,
+      artifacts: resource
+    },
+    {
+      scope: 'core-function',
+      managedPaths: coreFunctionManagedPaths,
+      artifacts: coreFunction
+    }
   ];
 }

package/src/generateIntTest.js

@@ -14,14 +14,27 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import {
+  appendFileSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  writeFileSync
+} from 'fs';
 import { join } from 'path';
-import ejs from 'ejs';
+import ejsLib from 'ejs';
 import beautify from 'js-beautify/js/index.js';
 
 import generateTestTemplate from './generateResources/IntTest/generateTests/generateTemplate.js';
-import { DEFAULT_BUCKET, uploadToS3 } from './generateResources/IntTest/upload/uploadIntTest.js';
-import { getIntTestOutputPath, getServiceTag, runTemplateItems } from './intTestGeneratorShared.js';
+import {
+  DEFAULT_BUCKET,
+  uploadToS3
+} from './generateResources/IntTest/upload/uploadIntTest.js';
+import {
+  getIntTestOutputPath,
+  getServiceTag,
+  runTemplateItems
+} from './intTestGeneratorShared.js';
 
 const BEAUTIFY_SETTING = {
   indent_size: '2',
@@ -33,9 +46,14 @@ const BEAUTIFY_SETTING = {
   space_before_conditional: true
 };
 
-async function writeSource({ templatePath, templateData, setting }, { checkCreateSourcePass = false } = {}) {
+async function _writeSource(
+  { templatePath, templateData, setting },
+  { checkCreateSourcePass = false } = {}
+) {
   if (!templatePath || !templateData || !setting) {
-    throw new Error('Invalid IntTest source item: missing templatePath/templateData/setting');
+    throw new Error(
+      'Invalid IntTest source item: missing templatePath/templateData/setting'
+    );
   }
 
   const {
@@ -50,7 +68,7 @@ async function writeSource({ templatePath, templateData, setting }, { checkCreat
 
   if (checkCreateSourcePass) {
     try {
-      ejs.compile(readFileSync(templatePath, 'utf8'))(templateData);
+      ejsLib.compile(readFileSync(templatePath, 'utf8'))(templateData);
       return [true, {}];
     } catch (error) {
       return [false, error];
@@ -63,36 +81,60 @@ async function writeSource({ templatePath, templateData, setting }, { checkCreat
   const filePath = `${savePath}${saveFileName}${fileExtension}`.trim();
   const hookFilePath = `${hookDataPath}${saveFileName}${fileExtension}`.trim();
 
-  if (!existsSync(savePath)) mkdirSync(savePath, { recursive: true });
-  if (generateHookFile && !existsSync(hookDataPath)) mkdirSync(hookDataPath, { recursive: true });
+  if (!existsSync(savePath)) {
+    mkdirSync(savePath, { recursive: true });
+  }
+  if (generateHookFile && !existsSync(hookDataPath)) {
+    mkdirSync(hookDataPath, { recursive: true });
+  }
 
-  let dataToSave = ejs.compile(readFileSync(templatePath, 'utf8'))(templateData);
+  let dataToSave = ejsLib.compile(readFileSync(templatePath, 'utf8'))(
+    templateData
+  );
 
   if (existsSync(hookFilePath)) {
     const hookData = readFileSync(hookFilePath, 'utf8');
-    const anyDoubleTag = isJs
-      ? new RegExp('\\/\\/\\(<(\\w+)>\\)([\\s\\S]*?)\\/\\/\\(<\\/\\1>\\)', 'gm')
-      : isYml
-        ? new RegExp('\\#<#(\\w+)#>([\\s\\S]*?)\\#<#\\/\\1#>', 'gm')
-        : null;
-    const doubleTag = isJs
-      ? (name) => new RegExp(`\\/\\/\\(<${name}>\\)([\\s\\S]*?)\\/\\/\\(<\\/${name}>\\)`, 'gm')
-      : isYml
-        ? (name) => new RegExp(`\\#<#${name}#>([\\s\\S]*?)\\#<#\\/${name}#>`, 'gm')
-        : null;
+    let anyDoubleTag = null;
+    let doubleTag = null;
+
+    if (isJs) {
+      anyDoubleTag = new RegExp(
+        '\\/\\/\\(<(\\w+)>\\)([\\s\\S]*?)\\/\\/\\(<\\/\\1>\\)',
+        'gm'
+      );
+      doubleTag = (name) =>
+        new RegExp(
+          `\\/\\/\\(<${name}>\\)([\\s\\S]*?)\\/\\/\\(<\\/${name}>\\)`,
+          'gm'
+        );
+    } else if (isYml) {
+      anyDoubleTag = new RegExp(
+        '\\#<#(\\w+)#>([\\s\\S]*?)\\#<#\\/\\1#>',
+        'gm'
+      );
+      doubleTag = (name) =>
+        new RegExp(`\\#<#${name}#>([\\s\\S]*?)\\#<#\\/${name}#>`, 'gm');
+    }
 
     if (anyDoubleTag && doubleTag) {
-      dataToSave = dataToSave.replace(anyDoubleTag, (match, tagName) => (
-        hookData.match(doubleTag(tagName)) ?? match
-      ));
+      dataToSave = dataToSave.replace(
+        anyDoubleTag,
+        (match, tagName) => hookData.match(doubleTag(tagName)) ?? match
+      );
     }
   }
 
-  if (isJs) dataToSave = beautify(dataToSave, BEAUTIFY_SETTING);
+  if (isJs) {
+    dataToSave = beautify(dataToSave, BEAUTIFY_SETTING);
+  }
 
   if (isAppend) {
     const shouldWriteWithInitial = !existsSync(filePath) && initialData;
-    const content = `${shouldWriteWithInitial ? initialData : ''}${dataToSave}\n\n`;
+    let initialPrefix = '';
+    if (shouldWriteWithInitial) {
+      initialPrefix = initialData;
+    }
+    const content = `${initialPrefix}${dataToSave}\n\n`;
 
     if (shouldWriteWithInitial) {
       writeFileSync(filePath, content, 'utf8');
@@ -139,7 +181,9 @@ export async function generateIntTest(rootPath, options = {}) {
   const startTime = Date.now();
   const serviceTag = getServiceTag(rootPath);
   if (!serviceTag) {
-    throw new Error('Missing iz_serviceTag in serverless.config.yml — required IntTest generation');
+    throw new Error(
+      'Missing iz_serviceTag in serverless.config.yml — required IntTest generation'
+    );
   }
 
   const savePath = getIntTestOutputPath(outputPath, rootPath);
@@ -150,7 +194,7 @@ export async function generateIntTest(rootPath, options = {}) {
   });
 
   await runTemplateItems(items, {
-    writeSource,
+    writeSource: _writeSource,
     errorPrefix: 'IntTest source'
   });
 
@@ -164,11 +208,15 @@ export async function generateIntTest(rootPath, options = {}) {
   }
 
   const durationMs = Date.now() - startTime;
+  let targetBucket = null;
+  if (shouldUploadToS3) {
+    targetBucket = s3Bucket;
+  }
   return {
     serviceTag,
     count: items.length,
     durationMs,
     uploadedCount: uploadedKeys.length,
-    s3Bucket: shouldUploadToS3 ? s3Bucket : null
+    s3Bucket: targetBucket
   };
 }

package/src/generateResourceIntTest.js

@@ -16,22 +16,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import ejs from 'ejs';
+import ejsLib from 'ejs';
 
 import generateResourceTemplate from './generateResources/IntTest/generateResources/generateResources.js';
-import { DEFAULT_BUCKET, uploadToS3 } from './generateResources/IntTest/upload/uploadIntTest.js';
-import { getIntTestOutputPath, getServiceTag, runTemplateItems } from './intTestGeneratorShared.js';
-
-function writeSource({ templatePath, templateData, setting }, { checkCreateSourcePass = false } = {}) {
+import {
+  DEFAULT_BUCKET,
+  uploadToS3
+} from './generateResources/IntTest/upload/uploadIntTest.js';
+import {
+  getIntTestOutputPath,
+  getServiceTag,
+  runTemplateItems
+} from './intTestGeneratorShared.js';
+
+function _writeSource(
+  { templatePath, templateData, setting },
+  { checkCreateSourcePass = false } = {}
+) {
   if (!templatePath || !templateData || !setting) {
-    throw new Error('Invalid IntTest resource item: missing templatePath/templateData/setting');
+    throw new Error(
+      'Invalid IntTest resource item: missing templatePath/templateData/setting'
+    );
   }
 
   const { savePath, saveFileName, fileExtension } = setting;
 
   if (checkCreateSourcePass) {
     try {
-      ejs.compile(readFileSync(templatePath, 'utf8'))(templateData);
+      ejsLib.compile(readFileSync(templatePath, 'utf8'))(templateData);
       return [true, {}];
     } catch (error) {
       return [false, error];
@@ -41,7 +53,9 @@ function writeSource({ templatePath, templateData, setting }, { checkCreateSourc
   const filePath = `${savePath}${saveFileName}${fileExtension}`.trim();
   if (!existsSync(savePath)) mkdirSync(savePath, { recursive: true });
 
-  const dataToSave = ejs.compile(readFileSync(templatePath, 'utf8'))(templateData);
+  const dataToSave = ejsLib.compile(readFileSync(templatePath, 'utf8'))(
+    templateData
+  );
   writeFileSync(filePath, dataToSave, 'utf8');
   return [true, {}];
 }
@@ -78,14 +92,18 @@ export async function generateResourceIntTest(rootPath, options = {}) {
   const startTime = Date.now();
   const serviceTag = getServiceTag(rootPath);
   if (!serviceTag) {
-    throw new Error('Missing iz_serviceTag in serverless.config.yml — required IntTest resource generation');
+    throw new Error(
+      'Missing iz_serviceTag in serverless.config.yml — required IntTest resource generation'
+    );
   }
 
   const savePath = getIntTestOutputPath(outputPath, rootPath);
-  const items = await generateResourceTemplate(_izContext, savePath, { serviceTag });
+  const items = await generateResourceTemplate(_izContext, savePath, {
+    serviceTag
+  });
 
   await runTemplateItems(items, {
-    writeSource,
+    writeSource: _writeSource,
     errorPrefix: 'IntTest resource'
   });
 
@@ -98,12 +116,17 @@ export async function generateResourceIntTest(rootPath, options = {}) {
     });
   }
 
+  let resultBucket = null;
+  if (shouldUploadToS3) {
+    resultBucket = s3Bucket;
+  }
+
   const durationMs = Date.now() - startTime;
   return {
     serviceTag,
     count: items.length,
     durationMs,
     uploadedCount: uploadedKeys.length,
-    s3Bucket: shouldUploadToS3 ? s3Bucket : null
+    s3Bucket: resultBucket
   };
 }

package/src/generateResources/IntTest/generateResources/generateResources.js

@@ -20,8 +20,11 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { getObjectSchema, consts as coreConsts } from '@izara_project/izara-core-library-service-schemas';
-import libs from '../libs/libs.js';
+import {
+  getObjectSchema,
+  consts as coreConsts
+} from '@izara_project/izara-core-library-service-schemas';
+import libs from '../libs/IntTestGenerateLib.js';
 const { directoryPath } = libs;
 const { STORAGE_TYPES } = coreConsts;
 const templatePath = path.join(__dirname, './templateResources.ejs');

package/src/generateResources/IntTest/generateResources/templateResources.ejs

@@ -1,33 +1,21 @@
-{
-  "Lambda": {
-    <% Object.entries(functionComponent).forEach(([funcName, filePath], index, array) => { %>
-      "<%= funcName %>": {
-        "localLocation": "/<%= filePath %>.js",
-        "localHandler": "main",
-        "functionName": "<%= funcName %>"
-      }<%= index < array.length - 1 ? "," : "" %>
-    <% }) %>
-  }<%= Object.keys(s3Component).length || Object.keys(tableNames).length ? "," : "" %>
+{ "Lambda": { <% Object.entries(functionComponent).forEach(([funcName,
+filePath], index, array) => { %> "<%= funcName %>": { "localLocation": "/<%= filePath %>.js",
+"localHandler": "main", "functionName": "<%= funcName %>" }<%= index < array.length - 1 ? "," : "" %>
+<% }) %>
+}<%= Object.keys(s3Component).length || Object.keys(tableNames).length ? "," : "" %>
 
-  <% if (Object.keys(s3Component).length) { %>
-  "S3": {
-    <% Object.entries(s3Component).forEach(([functionName, filePath], index, array) => { %>
-      "<%= functionName %>": {
-        "localLocation": "/<%= filePath %>",
-        "localHandler": "main",
-        "functionName": "<%= functionName %>"
-      }<%= index < array.length - 1 ? "," : "" %>
-    <% }) %>
-  }<%= Object.keys(tableNames).length ? "," : "" %>
-  <% } %>
+<% if (Object.keys(s3Component).length) { %>
+"S3": { <% Object.entries(s3Component).forEach(([functionName, filePath], index,
+array) => { %> "<%= functionName %>": { "localLocation": "/<%= filePath %>",
+"localHandler": "main", "functionName": "<%= functionName %>" }<%= index < array.length - 1 ? "," : "" %>
+<% }) %>
+}<%= Object.keys(tableNames).length ? "," : "" %>
+<% } %>
 
-  <% if (Object.keys(tableNames).length) { %>
-  "Dynamodb": {
-    <% tableNames.forEach((tableName, index) => { %>
-      "<%= tableName %>": {
-        "tableName": "<%= tableName %>"
-      }<%= index < tableNames.length - 1 ? "," : "" %>
-    <% }) %>
-  }
-  <% } %>
+<% if (Object.keys(tableNames).length) { %>
+"Dynamodb": { <% tableNames.forEach((tableName, index) => { %> "<%= tableName %>":
+{ "tableName": "<%= tableName %>" }<%= index < tableNames.length - 1 ? "," : "" %>
+<% }) %>
+}
+<% } %>
 }

package/src/generateResources/IntTest/generateTests/events/events.js

@@ -21,7 +21,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const templatePath = path.join(__dirname, './templateEvents.ejs');
 
-import libs from '../../libs/libs.js';
+import libs from '../../libs/IntTestGenerateLib.js';
 const {
   setEvent,
   createEventCaseByHandler,

package/src/generateResources/IntTest/generateTests/events/templateEvents.ejs

@@ -1,11 +1,14 @@
-{
-  "<%- inputEventTag %>": <%- JSON.stringify(inputConfig, null, 2) %>,
-  "<%- outputEventTag %>": <%- JSON.stringify(outputConfig, null, 2) %> <%- eventDynamos.length ? "," : "" -%>
-  <% eventDynamos.forEach((eventDynamo,idx) => { %>
-      "<%- eventDynamo.eventTag %>": <%- JSON.stringify(eventDynamo.event,null,2) %> <%- idx < eventDynamos.length - 1 ? ",": "" -%>
-  <% }) %> <%- eventInvokes.length ? "," : "" -%>
-  <% eventInvokes.forEach((invokeEventComponent,index) => { %>
-  "<%- invokeEventComponent.inputInvokeName %>": <%- JSON.stringify(invokeEventComponent.inputInvoke,null,2) %>,
-  "<%- invokeEventComponent.outputInvokeName %>": <%- JSON.stringify(invokeEventComponent.outputInvoke,null,2) %><%- index < eventInvokes.length - 1 ? ",": "" -%>
-  <% }) %>
+{ "<%- inputEventTag %>":
+<%- JSON.stringify(inputConfig, null, 2) %>, "<%- outputEventTag %>":
+<%- JSON.stringify(outputConfig, null, 2) %>
+<%- eventDynamos.length ? "," : "" -%>
+<% eventDynamos.forEach((eventDynamo,idx) => { %> "<%- eventDynamo.eventTag %>":
+<%- JSON.stringify(eventDynamo.event,null,2) %>
+<%- idx < eventDynamos.length - 1 ? ",": "" -%>
+<% }) %>
+<%- eventInvokes.length ? "," : "" -%>
+<% eventInvokes.forEach((invokeEventComponent,index) => { %> "<%- invokeEventComponent.inputInvokeName %>":
+<%- JSON.stringify(invokeEventComponent.inputInvoke,null,2) %>, "<%- invokeEventComponent.outputInvokeName %>":
+<%- JSON.stringify(invokeEventComponent.outputInvoke,null,2) %><%- index < eventInvokes.length - 1 ? ",": "" -%>
+<% }) %>
 }

package/src/generateResources/IntTest/generateTests/generateTemplate.js

@@ -20,7 +20,7 @@ import generateEvent from './events/events.js';
 import generateTest from './tests/tests.js';
 import generatePathIntTest from './pathIntTest/pathIntTest.js';
 // import generateBashScript from './bashScript/data.js'
-import libs from '../libs/libs.js';
+import libs from '../libs/IntTestGenerateLib.js';
 const { getIntTestConfig } = libs;
 
 /**
@@ -66,7 +66,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     allCreateSource.push(
       ...[event, test, intTestBucketPath]
         .flat()
-        .filter(item => !(Array.isArray(item) && item.length === 0))
+        .filter((item) => !(Array.isArray(item) && item.length === 0))
     );
 
     return allCreateSource;

package/src/generateResources/IntTest/generateTests/pathIntTest/pathIntTest.js

@@ -21,7 +21,8 @@ import { bucketPathForUpload } from '../../upload/uploadIntTest.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const templatePath = path.join(__dirname, './template.ejs');
-const INT_TEST_SUFFIX_PATTERN = /(events|tests|resources|dynamoDBSeedDataTags|graphSeedDataTags)\.json$/;
+const INT_TEST_SUFFIX_PATTERN =
+  /(events|tests|resources|dynamoDBSeedDataTags|graphSeedDataTags)\.json$/;
 
 async function data(_izContext, srcPath, settings) {
   const pathIntTestInBuckets = await bucketPathForUpload(

package/src/generateResources/IntTest/generateTests/pathIntTest/template.ejs

@@ -1,5 +1,3 @@
-let intTestPath = [
-<% intTestPaths.forEach((intTestPath,index) => { -%>
-"<%- intTestPath %>"<%= index < intTestPaths.length - 1 ? "," : "" %>
+let intTestPath = [ <% intTestPaths.forEach((intTestPath,index) => { -%> "<%- intTestPath %>"<%= index < intTestPaths.length - 1 ? "," : "" %>
 <% }) -%>
 ]

package/src/generateResources/IntTest/generateTests/tests/templateTests.ejs

@@ -1,3 +1,3 @@
 [
-  <%- JSON.stringify(baseIntTest, null, 2) %>
+<%- JSON.stringify(baseIntTest, null, 2) %>
 ]