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

package/src/generate.js

@@ -1,70 +1,17 @@
+import path from 'node:path';
 import { buildGenerationPlan } from './plan/buildGenerationPlan.js';
+import { resolveEmissionGroups } from './plan/domainRegistry.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 {
-  dynamicRelationshipFlowSchemaManagedPaths,
-  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,
   resolveGraphServiceTags
 } 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';
-import {
-  emitSystemTextSchemas,
-  systemTextSchemaManagedPaths
-} from './emit/systemText/emitSystemTextSchemas.js';
-import {
-  emitAttributeTreeObjectSchemas,
-  emitAttributeTreeRelationshipSchemas,
-  attributeTreeObjectSchemaManagedPaths,
-  attributeTreeRelationshipSchemaManagedPaths
-} from './emit/attributeTree/emitAttributeTreeSchemas.js';
-import {
-  emitErrorSchemas,
-  errorSchemaManagedPaths
-} from './emit/error/emitErrorSchemas.js';
+  resolveTargetServicePath,
+  emitAttributeTreeTargetSchemas
+} from './emit/schemas/attributeTree/emitAttributeTreeSchemas.js';
 
 export async function generate(rootPath, options = {}) {
   const startedAt = Date.now();
@@ -101,21 +48,28 @@ export async function generate(rootPath, options = {}) {
       relationships,
       schemaBucketName
     );
+    const objectNames = objects.map((obj) => obj.objectType).filter(Boolean);
+    let objectSummary = '';
+    if (objectNames.length > 0) {
+      objectSummary = ` (${objectNames.join(', ')})`;
+    }
     console.log(
-      `[DEBUG] [Generate] STATUS=SCHEMAS_LOADED | ` +
-      `objects=${objects.length} ` +
+      `[INFO] [Generate] STATUS=SCHEMAS_LOADED | ` +
+      `objects=${objects.length}${objectSummary} ` +
       `relationships=${relationships.length} flows=${flows.length} ` +
       `notifications=${notifications.length} ` +
       `errors=${errors.length}`
     );
-    for (const objectSchema of objects) {
-      const objectType = objectSchema.objectType || 'unknown';
-      console.log(
-        `[DEBUG] [Generate] OBJECT_SCHEMA | objectType=${objectType}\n` +
-        JSON.stringify(objectSchema, null, 2)
-      );
+    if (options.verbose || process.env.GENERATE_VERBOSE) {
+      for (const objectSchema of objects) {
+        const objectType = objectSchema.objectType || 'unknown';
+        console.log(
+          `[DEBUG] [Generate] OBJECT_SCHEMA | objectType=${objectType}\n` +
+          JSON.stringify(objectSchema, null, 2)
+        );
+      }
     }
-    const groups = await _emitGroups({
+    const groups = await resolveEmissionGroups({
       project,
       objects,
       relationships,
@@ -131,7 +85,7 @@ export async function generate(rootPath, options = {}) {
     });
     const emittedScopeSummary = scopeCounts.join(' ');
     console.log(
-      `[DEBUG] [Generate] STATUS=ARTIFACTS_EMITTED | ${emittedScopeSummary}`
+      `[INFO] [Generate] STATUS=ARTIFACTS_EMITTED | ${emittedScopeSummary}`
     );
     let files = [];
     if (groups.length > 0) {
@@ -147,6 +101,14 @@ export async function generate(rootPath, options = {}) {
         )
       );
     }
+    const targetFiles = await _emitTargetServiceAttributeTreeSchemas({
+      project,
+      objects,
+      logger: options.logger
+    });
+    for (const targetFile of targetFiles) {
+      files.push(targetFile);
+    }
     const durationMs = Date.now() - startedAt;
     console.log(
       `[INFO] [Generate] STATUS=FINISHED | ` +
@@ -164,182 +126,61 @@ export async function generate(rootPath, options = {}) {
   }
 }
 
-async function _emitGroups({
+async function _emitTargetServiceAttributeTreeSchemas({
   project,
   objects,
-  relationships,
-  flows,
-  notifications,
-  errors,
-  objectGraphServiceTags,
-  relationshipGraphServiceTags,
   logger
 }) {
-  const [
-    crud,
-    relationship,
-    rbac,
-    system,
-    findData,
-    resource,
-    coreFunction,
-    systemText,
-    errorSchemas
-  ] = await Promise.all([
-    emitCrudApplicationArtifacts({
-      objects,
-      flows,
-      serviceTag: project.serviceTag,
-      logger
-    }),
-    emitRelationshipApplicationArtifacts({
-      relationships,
-      flows,
-      serviceTag: project.serviceTag
-    }),
-    emitRbacApplicationArtifacts(objects),
-    emitSystemWebSocketArtifacts(flows, {
-      includeRelationshipOwnTopic: true,
-      objects,
-      relationships
-    }),
-    emitSystemFindDataArtifacts(objects),
-    emitResourceArtifacts({ objects, relationships, flows }),
-    emitCoreFunctionArtifacts({
-      project,
-      objects,
-      relationships,
-      flows,
-      objectGraphServiceTags,
-      relationshipGraphServiceTags
-    }),
-    emitSystemTextSchemas({
-      project,
-      objects,
-      relationships,
-      flows,
-      notifications
-    }),
-    emitErrorSchemas({
-      project,
-      errors,
-      objectGraphServiceTags
-    })
-  ]);
-  const custom = await emitCustomFlowApplicationArtifacts(flows, {
-    objects
-  });
-
-  const systemFunctions = [
-    ...(system.functions ?? []),
-    ...(findData.functions ?? [])
-  ].filter(Boolean);
-
-  const findDataArtifacts = [...(findData.artifacts ?? [])];
-
-  if (systemFunctions.length > 0) {
-    findDataArtifacts.push({
-      path: 'app/sls_yaml/generatedCode/source/flow-system.yml',
-      content: systemFunctions.join('\n\n')
-    });
+  if (!Array.isArray(objects)) {
+    return [];
   }
-
-  let resolvedCoreFunctionManagedPaths = coreFunctionManagedPaths;
-  if (typeof coreFunctionManagedPaths === 'function') {
-    resolvedCoreFunctionManagedPaths = coreFunctionManagedPaths({
-      project,
-      objects,
-      relationships,
-      flows,
-      objectGraphServiceTags,
-      relationshipGraphServiceTags
-    });
-  }
-
-  return [
-    {
-      scope: 'crud-flow-schemas',
-      managedPaths: dynamicCrudFlowSchemaPaths,
-      artifacts: emitDynamicCrudFlowSchemas({ objects, flows, logger })
-    },
-    {
-      scope: 'relationship-flow-schemas',
-      managedPaths: dynamicRelationshipFlowSchemaManagedPaths(relationships),
-      artifacts: emitDynamicRelationshipFlowSchemas({ relationships })
-    },
-    {
-      scope: 'rbac-flow-schemas',
-      managedPaths: rbacFlowSchemaManagedPaths(objects),
-      artifacts: await emitDynamicRbacFlowSchemas({
-        objects,
-        serviceTag: project.serviceTag
-      })
-    },
-    {
-      scope: 'attribute-tree-object-schemas',
-      managedPaths: attributeTreeObjectSchemaManagedPaths(objects),
-      artifacts: emitAttributeTreeObjectSchemas({
-        objects,
-        serviceTag: project.serviceTag
-      })
-    },
-    {
-      scope: 'attribute-tree-relationship-schemas',
-      managedPaths: attributeTreeRelationshipSchemaManagedPaths(objects),
-      artifacts: emitAttributeTreeRelationshipSchemas({
-        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: findDataArtifacts
-    },
-    {
-      scope: 'custom-flow-application',
-      managedPaths: customFlowApplicationManagedPaths(flows, { objects }),
-      artifacts: custom
-    },
-    {
-      scope: 'shared-resources',
-      managedPaths: resourceArtifactPaths,
-      artifacts: resource
-    },
-    {
-      scope: 'core-function',
-      managedPaths: resolvedCoreFunctionManagedPaths,
-      artifacts: coreFunction
-    },
-    {
-      scope: 'system-text-schemas',
-      managedPaths: systemTextSchemaManagedPaths(),
-      artifacts: systemText
-    },
-    {
-      scope: 'error-schemas',
-      managedPaths: errorSchemaManagedPaths(errors),
-      artifacts: errorSchemas
+  const committedFiles = [];
+  for (const object of objects) {
+    if (!Array.isArray(object?.addOnDataStructure)) {
+      continue;
+    }
+    for (const addOn of object.addOnDataStructure) {
+      if (addOn?.type === 'attributeTree' && addOn?.attributeTreeTag) {
+        const attributeTag = addOn.attributeTreeTag;
+        const targetServiceRoot = resolveTargetServicePath({
+          currentServiceRoot: project.rootPath,
+          attributeTag
+        });
+        if (targetServiceRoot) {
+          const artifacts = emitAttributeTreeTargetSchemas({
+            attributeTag,
+            targetServiceRoot
+          });
+          const relativeArtifacts = artifacts.map((artifact) => {
+            return {
+              path: path.relative(targetServiceRoot, artifact.path),
+              content: artifact.content
+            };
+          });
+          const targetPlan = buildGenerationPlan(
+            { outputPath: targetServiceRoot },
+            relativeArtifacts,
+            {
+              managedScopes: {
+                'attribute-tree-target-schemas': relativeArtifacts.map(
+                  (a) => a.path
+                )
+              }
+            }
+          );
+          const targetFiles = await commitArtifacts(targetPlan);
+          for (const targetFile of targetFiles) {
+            committedFiles.push(targetFile);
+          }
+          if (logger && typeof logger.info === 'function') {
+            logger.info(
+              `[INFO] [AttributeTree] Target schemas emitted for ` +
+                `tag=${attributeTag} to ${targetServiceRoot}`
+            );
+          }
+        }
+      }
     }
-  ];
+  }
+  return committedFiles;
 }

package/src/{generateIntTest.js → intTest/generateIntTest.js}

@@ -25,11 +25,11 @@ import { join } from 'path';
 import ejsLib from 'ejs';
 import beautify from 'js-beautify/js/index.js';
 
-import generateTestTemplate from './generateResources/IntTest/generateTests/generateTemplate.js';
+import generateTestTemplate from './generators/generateTests/generateTemplate.js';
 import {
   DEFAULT_BUCKET,
   uploadToS3
-} from './generateResources/IntTest/upload/uploadIntTest.js';
+} from './generators/upload/uploadIntTest.js';
 import {
   getIntTestOutputPath,
   getServiceTag,

package/src/{generateResourceIntTest.js → intTest/generateResourceIntTest.js}

@@ -18,11 +18,11 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import ejsLib from 'ejs';
 
-import generateResourceTemplate from './generateResources/IntTest/generateResources/generateResources.js';
+import generateResourceTemplate from './generators/generateResources/generateResources.js';
 import {
   DEFAULT_BUCKET,
   uploadToS3
-} from './generateResources/IntTest/upload/uploadIntTest.js';
+} from './generators/upload/uploadIntTest.js';
 import {
   getIntTestOutputPath,
   getServiceTag,

package/src/plan/domainRegistry.js

@@ -0,0 +1,271 @@
+import {
+  crudApplicationManagedPaths,
+  emitCrudApplicationArtifacts
+} from '../emit/application/crud/emitCrudApplicationArtifacts.js';
+import {
+  dynamicCrudFlowSchemaPaths,
+  emitDynamicCrudFlowSchemas
+} from '../emit/application/crud/emitDynamicCrudFlowSchemas.js';
+import {
+  customFlowApplicationManagedPaths,
+  emitCustomFlowApplicationArtifacts
+} from '../emit/application/custom/emitCustomFlowApplicationArtifacts.js';
+import {
+  emitDynamicRbacFlowSchemas,
+  rbacFlowSchemaManagedPaths
+} from '../emit/application/rbac/emitDynamicRbacFlowSchemas.js';
+import {
+  emitRbacApplicationArtifacts,
+  rbacApplicationManagedPaths
+} from '../emit/application/rbac/emitRbacApplicationArtifacts.js';
+import {
+  dynamicRelationshipFlowSchemaManagedPaths,
+  emitDynamicRelationshipFlowSchemas
+} from '../emit/application/relationship/emitDynamicRelationshipFlowSchemas.js';
+import {
+  emitRelationshipApplicationArtifacts,
+  relationshipApplicationManagedPaths
+} from '../emit/application/relationship/emitRelationshipApplicationArtifacts.js';
+import {
+  emitSystemWebSocketArtifacts,
+  systemWebSocketManagedPaths
+} from '../emit/application/system/emitSystemWebSocketArtifacts.js';
+import {
+  emitSystemFindDataArtifacts,
+  findDataManagedPaths
+} from '../emit/application/system/emitSystemFindDataArtifacts.js';
+import {
+  emitCoreFunctionArtifacts,
+  coreFunctionManagedPaths
+} from '../emit/application/coreFunction/emitCoreFunctionArtifacts.js';
+import {
+  emitResourceArtifacts,
+  resourceArtifactPaths
+} from '../emit/infrastructure/resources/emitResourceArtifacts.js';
+import {
+  emitSystemTextSchemas,
+  systemTextSchemaManagedPaths
+} from '../emit/schemas/systemText/emitSystemTextSchemas.js';
+import {
+  emitAttributeTreeObjectSchemas,
+  emitAttributeTreeRelationshipSchemas,
+  attributeTreeObjectSchemaManagedPaths,
+  attributeTreeRelationshipSchemaManagedPaths
+} from '../emit/schemas/attributeTree/emitAttributeTreeSchemas.js';
+import {
+  emitLedgerObjectSchemas,
+  emitLedgerRelationshipSchemas,
+  ledgerObjectSchemaManagedPaths,
+  ledgerRelationshipSchemaManagedPaths
+} from '../emit/schemas/ledger/emitLedgerSchemas.js';
+import {
+  emitErrorSchemas,
+  errorSchemaManagedPaths
+} from '../emit/schemas/error/emitErrorSchemas.js';
+
+export async function resolveEmissionGroups(context) {
+  const {
+    project,
+    objects,
+    relationships,
+    flows,
+    notifications,
+    errors,
+    objectGraphServiceTags,
+    relationshipGraphServiceTags,
+    logger
+  } = context;
+
+  const [
+    crud,
+    relationship,
+    rbac,
+    system,
+    findData,
+    resource,
+    coreFunction,
+    systemText,
+    errorSchemas
+  ] = await Promise.all([
+    emitCrudApplicationArtifacts({
+      objects,
+      flows,
+      serviceTag: project.serviceTag,
+      logger
+    }),
+    emitRelationshipApplicationArtifacts({
+      relationships,
+      flows,
+      serviceTag: project.serviceTag
+    }),
+    emitRbacApplicationArtifacts(objects),
+    emitSystemWebSocketArtifacts(flows, {
+      includeRelationshipOwnTopic: true,
+      objects,
+      relationships
+    }),
+    emitSystemFindDataArtifacts(objects),
+    emitResourceArtifacts({ objects, relationships, flows }),
+    emitCoreFunctionArtifacts({
+      project,
+      objects,
+      relationships,
+      flows,
+      objectGraphServiceTags,
+      relationshipGraphServiceTags
+    }),
+    emitSystemTextSchemas({
+      project,
+      objects,
+      relationships,
+      flows,
+      notifications
+    }),
+    emitErrorSchemas({
+      project,
+      errors,
+      objectGraphServiceTags
+    })
+  ]);
+
+  const custom = await emitCustomFlowApplicationArtifacts(flows, {
+    objects
+  });
+
+  let systemFunctions = [];
+  if (system.functions) {
+    systemFunctions = systemFunctions.concat(system.functions);
+  }
+  if (findData.functions) {
+    systemFunctions = systemFunctions.concat(findData.functions);
+  }
+
+  let findDataArtifacts = [];
+  if (findData.artifacts) {
+    findDataArtifacts = [...findData.artifacts];
+  }
+
+  if (systemFunctions.length > 0) {
+    findDataArtifacts.push({
+      path: 'app/sls_yaml/generatedCode/source/flow-system.yml',
+      content: systemFunctions.join('\n\n')
+    });
+  }
+
+  let resolvedCoreFunctionManagedPaths = coreFunctionManagedPaths;
+  if (typeof coreFunctionManagedPaths === 'function') {
+    resolvedCoreFunctionManagedPaths = coreFunctionManagedPaths({
+      project,
+      objects,
+      relationships,
+      flows,
+      objectGraphServiceTags,
+      relationshipGraphServiceTags
+    });
+  }
+
+  const rbacFlowArtifacts = await emitDynamicRbacFlowSchemas({
+    objects,
+    serviceTag: project.serviceTag
+  });
+
+  return [
+    {
+      scope: 'crud-flow-schemas',
+      managedPaths: dynamicCrudFlowSchemaPaths,
+      artifacts: emitDynamicCrudFlowSchemas({ objects, flows, logger })
+    },
+    {
+      scope: 'relationship-flow-schemas',
+      managedPaths: dynamicRelationshipFlowSchemaManagedPaths(relationships),
+      artifacts: emitDynamicRelationshipFlowSchemas({ relationships })
+    },
+    {
+      scope: 'rbac-flow-schemas',
+      managedPaths: rbacFlowSchemaManagedPaths(objects),
+      artifacts: rbacFlowArtifacts
+    },
+    {
+      scope: 'attribute-tree-object-schemas',
+      managedPaths: attributeTreeObjectSchemaManagedPaths(objects),
+      artifacts: emitAttributeTreeObjectSchemas({
+        objects,
+        serviceTag: project.serviceTag
+      })
+    },
+    {
+      scope: 'attribute-tree-relationship-schemas',
+      managedPaths: attributeTreeRelationshipSchemaManagedPaths(objects),
+      artifacts: emitAttributeTreeRelationshipSchemas({
+        objects,
+        serviceTag: project.serviceTag
+      })
+    },
+    {
+      scope: 'ledger-object-schemas',
+      managedPaths: ledgerObjectSchemaManagedPaths(objects),
+      artifacts: emitLedgerObjectSchemas({
+        objects,
+        serviceTag: project.serviceTag
+      })
+    },
+    {
+      scope: 'ledger-relationship-schemas',
+      managedPaths: ledgerRelationshipSchemaManagedPaths(objects),
+      artifacts: emitLedgerRelationshipSchemas({
+        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: findDataArtifacts
+    },
+    {
+      scope: 'custom-flow-application',
+      managedPaths: customFlowApplicationManagedPaths(flows, { objects }),
+      artifacts: custom
+    },
+    {
+      scope: 'shared-resources',
+      managedPaths: resourceArtifactPaths,
+      artifacts: resource
+    },
+    {
+      scope: 'core-function',
+      managedPaths: resolvedCoreFunctionManagedPaths,
+      artifacts: coreFunction
+    },
+    {
+      scope: 'system-text-schemas',
+      managedPaths: systemTextSchemaManagedPaths(),
+      artifacts: systemText
+    },
+    {
+      scope: 'error-schemas',
+      managedPaths: errorSchemaManagedPaths(errors),
+      artifacts: errorSchemas
+    }
+  ];
+}