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

package/src/emit/schemas/error/emitErrorSchemas.js

@@ -1,19 +1,43 @@
+import { existsSync, readFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
 import ejsLib from 'ejs';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 export const ERROR_SCHEMA_PATH =
-  'app/src/schemas/ErrorSchemas/generateCode/errorSchema.js';
+  'app/src/schemas/ErrorSchemas/generateCode/errorConsts.js';
+export const ERROR_CONSTS_PATH = ERROR_SCHEMA_PATH;
+
+export const SHARED_ERROR_PACKAGE_PATH = 'libs/errorLib/package.json';
+export const SHARED_ERROR_INDEX_PATH = 'libs/errorLib/index.js';
+export const SHARED_ERROR_CONSTS_PATH = 'libs/errorLib/src/errorConsts.js';
 
 export function errorSchemaManagedPaths(errors = []) {
   if (!errors || errors.length === 0) {
     return [];
   }
-  return [ERROR_SCHEMA_PATH];
+  const paths = [ERROR_SCHEMA_PATH];
+  const safeErrors = Array.isArray(errors) ? errors : [];
+  let hasShared = false;
+  for (const item of safeErrors) {
+    if (item && item.sharedLibrary === true) {
+      hasShared = true;
+      break;
+    }
+  }
+  if (hasShared) {
+    paths.push(
+      SHARED_ERROR_PACKAGE_PATH,
+      SHARED_ERROR_INDEX_PATH,
+      SHARED_ERROR_CONSTS_PATH
+    );
+  }
+  return paths;
 }
 
 /**
- * Emits errorSchema.js artifact based on loaded ErrorSchemas
+ * Emits errorConsts.js artifact and shared library artifacts based on
+ * loaded ErrorSchemas
  *
  * @param {Object} params
  * @param {Object} params.project
@@ -31,21 +55,28 @@ export async function emitErrorSchemas({
     return [];
   }
 
-  const defaultGraphServiceTag =
-    objectGraphServiceTags[0] || 'GraphHandler';
   const defaultServiceTag = project?.serviceTag || '';
 
   const errorTypes = {};
+  const sharedErrorTypes = {};
+
   for (const item of safeErrors) {
     if (!item || typeof item !== 'object' || !item.errorTag) {
       continue;
     }
     const errorTag = item.errorTag;
-    const serviceTag = item.serviceTag || defaultServiceTag;
-    errorTypes[errorTag] = {
+    let serviceTag = item.serviceTag;
+    if (!serviceTag) {
+      serviceTag = defaultServiceTag;
+    }
+    const errorEntry = {
       errorTag,
       serviceTag
     };
+    errorTypes[errorTag] = errorEntry;
+    if (item.sharedLibrary === true) {
+      sharedErrorTypes[errorTag] = errorEntry;
+    }
   }
 
   const sortedKeys = Object.keys(errorTypes).sort();
@@ -58,16 +89,95 @@ export async function emitErrorSchemas({
     sortedErrorTypes[key] = errorTypes[key];
   }
 
-  const templatePath = new URL('errorSchema.ejs', TEMPLATE_URL);
+  const templatePath = new URL('errorConsts.ejs', TEMPLATE_URL);
   const template = await readFile(templatePath, 'utf8');
   const content = ejsLib.render(template, {
-    errorTypes: sortedErrorTypes
+    errorTypes: sortedErrorTypes,
+    headerComment: null
   });
 
-  return [
+  const artifacts = [
     {
       path: ERROR_SCHEMA_PATH,
       content
     }
   ];
+
+  const sortedSharedKeys = Object.keys(sharedErrorTypes).sort();
+  if (sortedSharedKeys.length > 0) {
+    const sortedSharedErrorTypes = {};
+    for (const key of sortedSharedKeys) {
+      sortedSharedErrorTypes[key] = sharedErrorTypes[key];
+    }
+
+    const sharedContent = ejsLib.render(template, {
+      errorTypes: sortedSharedErrorTypes,
+      headerComment: '// only generate error that sharedLibrary: true'
+    });
+
+    let serviceName = 'service';
+    if (project?.serviceTag) {
+      serviceName = project.serviceTag.toLowerCase();
+    }
+    const packageName = `@izara_project/izara-${serviceName}-library-errorlib`;
+
+    let packageJson = {
+      name: packageName,
+      version: '1.0.0',
+      description: '',
+      type: 'module',
+      main: 'index.js',
+      scripts: {},
+      keywords: [],
+      author: '',
+      license: 'ISC',
+      devDependencies: {},
+      dependencies: {}
+    };
+
+    let targetDir = project?.outputPath;
+    if (!targetDir) {
+      targetDir = project?.rootPath;
+    }
+    if (targetDir) {
+      const existingPkgPath = join(targetDir, SHARED_ERROR_PACKAGE_PATH);
+      if (existsSync(existingPkgPath)) {
+        try {
+          const raw = readFileSync(existingPkgPath, 'utf8');
+          const parsed = JSON.parse(raw);
+          if (parsed && typeof parsed === 'object') {
+            packageJson = {
+              ...parsed,
+              name: packageName,
+              type: 'module',
+              main: 'index.js'
+            };
+          }
+        } catch {
+          // If parsing fails (e.g. comments in JSON), use default packageJson
+        }
+      }
+    }
+
+    const packageJsonContent = `${JSON.stringify(packageJson, null, 2)}\n`;
+    const indexContent =
+      "import * as errorLib from './src/errorConsts.js';\n\nexport { errorLib };\n";
+
+    artifacts.push(
+      {
+        path: SHARED_ERROR_PACKAGE_PATH,
+        content: packageJsonContent
+      },
+      {
+        path: SHARED_ERROR_INDEX_PATH,
+        content: indexContent
+      },
+      {
+        path: SHARED_ERROR_CONSTS_PATH,
+        content: sharedContent
+      }
+    );
+  }
+
+  return artifacts;
 }

package/src/emit/schemas/error/templates/errorConsts.ejs

@@ -0,0 +1,12 @@
+<% if (locals.headerComment) { -%>
+<%- headerComment %>
+<% } -%>
+export const ERROR_TYPES = {
+<% const keys = Object.keys(errorTypes); -%>
+<% keys.forEach((key, index) => { -%>
+  <%- key %>: {
+    errorTag: '<%- errorTypes[key].errorTag %>',
+    serviceTag: '<%- errorTypes[key].serviceTag %>'
+  }<%- index < keys.length - 1 ? ',' : '' %>
+<% }); -%>
+};

package/src/generate.js

@@ -1,3 +1,6 @@
+import { mkdir } from 'node:fs/promises';
+import { join } from 'node:path';
+
 import { buildGenerationPlan } from './plan/buildGenerationPlan.js';
 import { resolveEmissionGroups } from './plan/domainRegistry.js';
 import { commitArtifacts } from './output/commitArtifacts.js';
@@ -13,32 +16,32 @@ export async function generate(rootPath, options = {}) {
   console.log(`[INFO] [Generate] STATUS=STARTED | rootPath=${rootPath}`);
   try {
     const project = compileProject({ ...options, rootPath });
+    await mkdir(join(project.schemaRoot, 'ErrorSchemas'), {
+      recursive: true
+    });
     const schemaLoadOptions = {
       skipValidation: options.skipValidation
     };
-    const [
-      rawObjects,
-      relationships,
-      flows,
-      notifications,
-      errors
-    ] = await Promise.all([
-      loadLocalSchemaDirectory(project, 'ObjectSchemas', schemaLoadOptions),
-      loadLocalSchemaDirectory(
-        project,
-        'RelationshipSchemas',
-        schemaLoadOptions
-      ),
-      loadLocalSchemaDirectory(project, 'FlowSchemas', schemaLoadOptions),
-      loadLocalSchemaDirectory(
-        project,
-        'NotificationSchemas',
-        schemaLoadOptions
-      ),
-      loadLocalSchemaDirectory(project, 'ErrorSchemas', schemaLoadOptions)
-    ]);
+    const [rawObjects, relationships, flows, notifications, errors] =
+      await Promise.all([
+        loadLocalSchemaDirectory(project, 'ObjectSchemas', schemaLoadOptions),
+        loadLocalSchemaDirectory(
+          project,
+          'RelationshipSchemas',
+          schemaLoadOptions
+        ),
+        loadLocalSchemaDirectory(project, 'FlowSchemas', schemaLoadOptions),
+        loadLocalSchemaDirectory(
+          project,
+          'NotificationSchemas',
+          schemaLoadOptions
+        ),
+        loadLocalSchemaDirectory(project, 'ErrorSchemas', schemaLoadOptions)
+      ]);
     const schemaBucketName =
-      options.schemaBucketName || process.env.iz_serviceSchemaBucketName;
+      options.schemaBucketName ||
+      project.schemaBucketName ||
+      process.env.iz_serviceSchemaBucketName;
     const objects = await resolveExtendedObjectSchemas(
       rawObjects,
       schemaBucketName
@@ -58,17 +61,17 @@ export async function generate(rootPath, options = {}) {
     }
     console.log(
       `[INFO] [Generate] STATUS=SCHEMAS_LOADED | ` +
-      `objects=${objects.length}${objectSummary} ` +
-      `relationships=${relationships.length} flows=${flows.length} ` +
-      `notifications=${notifications.length} ` +
-      `errors=${errors.length}`
+        `objects=${objects.length}${objectSummary} ` +
+        `relationships=${relationships.length} flows=${flows.length} ` +
+        `notifications=${notifications.length} ` +
+        `errors=${errors.length}`
     );
     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)
+            JSON.stringify(objectSchema, null, 2)
         );
       }
     }
@@ -107,17 +110,16 @@ export async function generate(rootPath, options = {}) {
     const durationMs = Date.now() - startedAt;
     console.log(
       `[INFO] [Generate] STATUS=FINISHED | ` +
-      `files=${files.length} durationMs=${durationMs}`
+        `files=${files.length} durationMs=${durationMs}`
     );
 
     return { project, durationMs, files };
   } catch (error) {
     console.log(
       `[ERROR] [Generate] STATUS=FAILED | ` +
-      `durationMs=${Date.now() - startedAt}`,
+        `durationMs=${Date.now() - startedAt}`,
       error
     );
     throw error;
   }
 }
-

package/test/integration/publicApi.test.js

@@ -23,7 +23,7 @@ test('generate commits schemas, application artifacts, and resources in one publ
   const rootPath = await createCrudProject();
   const result = await generate(rootPath);
 
-  assert.strictEqual(result.files.length, 74);
+  assert.strictEqual(result.files.length, 59);
   assert.equal(result.project.rootPath, rootPath);
   assert.match(
     await readFile(
@@ -366,7 +366,7 @@ test('generate removes stale CRUD schemas and application artifacts', async () =
 
   const result = await generate(rootPath);
 
-  assert.equal(result.files.length, 38);
+  assert.equal(result.files.length, 23);
   await assert.rejects(
     readFile(
       join(
@@ -448,36 +448,45 @@ async function createTriggerCacheProject() {
 }
 
 test(
-  'emits ignoreExternalServices hooks in UploadSchema_Main.js and ' +
-    'commands/uploadSchema.js',
+  'emits ignoreExternalServices hooks in commands/uploadSchema.js',
   async () => {
     const rootPath = await createCrudProject();
     await generate(rootPath);
 
-    const uploadSchemaMain = await readFile(
+    // const uploadSchemaMain = await readFile(
+    //   join(
+    //     rootPath,
+    //     'app/src/generatedCode/CoreFunctions/UploadSchema_Main.js'
+    //   ),
+    //   'utf8'
+    // );
+    // assert.match(uploadSchemaMain, /\/\/\(<ignoreExternalServices>\)/);
+    // assert.match(uploadSchemaMain, /\/\/\(<\/ignoreExternalServices>\)/);
+
+    // const coreResource = await readFile(
+    //   join(
+    //     rootPath,
+    //     'app/sls_yaml/generatedCode/source/core-resource.yml'
+    //   ),
+    //   'utf8'
+    // );
+    // assert.match(
+    //   coreResource,
+    //   /UserAccount\$\{self:custom\.iz_stage\}AddLinkCreateByRelHdrInv/
+    // );
+    // assert.match(
+    //   coreResource,
+    //   /UserAccount\$\{self:custom\.iz_stage\}AddLinkBelongToHdrInv/
+    // );
+
+    const uploadSchemaCommand = await readFile(
       join(
         rootPath,
-        'app/src/generatedCode/CoreFunctions/UploadSchema_Main.js'
+        'app/initial_setup/generatedCode/source/commands/uploadSchema.js'
       ),
       'utf8'
     );
-    assert.match(uploadSchemaMain, /\/\/\(<ignoreExternalServices>\)/);
-    assert.match(uploadSchemaMain, /\/\/\(<\/ignoreExternalServices>\)/);
-
-    const coreResource = await readFile(
-      join(
-        rootPath,
-        'app/sls_yaml/generatedCode/source/core-resource.yml'
-      ),
-      'utf8'
-    );
-    assert.match(
-      coreResource,
-      /UserAccount\$\{self:custom\.iz_stage\}AddLinkCreateByRelHdrInv/
-    );
-    assert.match(
-      coreResource,
-      /UserAccount\$\{self:custom\.iz_stage\}AddLinkBelongToHdrInv/
-    );
+    assert.match(uploadSchemaCommand, /\/\/\(<ignoreExternalServices>\)/);
+    assert.match(uploadSchemaCommand, /\/\/\(<\/ignoreExternalServices>\)/);
   }
 );

package/test/unit/application/createTargetRoleHandler.test.js

@@ -14,10 +14,7 @@ const OWN_TOPIC_FLOWS = [
   'DeleteRolePermissions',
   'DeleteTargetRole',
   'CreateUserRole',
-  'DeleteUserFromRole',
-  'ReservedDynamicUsage',
-  'ConfirmUsage',
-  'CancelUsage'
+  'DeleteUserFromRole'
 ];
 
 const LIMIT_FLOWS = [
@@ -36,7 +33,7 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
   const rootPath = await createProject(true);
   const result = await generateCreateTargetRoleHandler(rootPath);
 
-  assert.equal(result.files.length, 67);
+  assert.equal(result.files.length, 60);
   assert.match(
     await readFile(join(rootPath, result.files[0].path), 'utf8'),
     /CreateTargetRole/
@@ -167,6 +164,15 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
     )
   );
 
+  await assert.rejects(
+    readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowLimit/ReservedDynamicUsage/source/ReservedDynamicUsage_HdrSqs.js'
+      )
+    )
+  );
+
   assert.match(
     await readFile(
       join(
@@ -196,20 +202,37 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
     'utf8'
   );
   for (const flowTag of OWN_TOPIC_FLOWS) {
-    const isLimit = LIMIT_FLOWS.includes(flowTag);
-    const folder = isLimit ? 'FlowLimit' : 'FlowRbac';
-    const yaml = isLimit ? limitYaml : rbacYaml;
     assert.match(
       await readFile(
         join(
           rootPath,
-          `app/src/generatedCode/${folder}/${flowTag}/source/${flowTag}_HdrWbs.js`
+          `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
         ),
         'utf8'
       ),
       new RegExp(`import ${flowTag}`)
     );
-    assert.match(yaml, new RegExp(`${flowTag}HdrWbs:\\n[\\s\\S]*websocket:`));
+    assert.match(rbacYaml, new RegExp(`${flowTag}HdrWbs:\\n[\\s\\S]*websocket:`));
+  }
+
+  for (const flowTag of LIMIT_FLOWS) {
+    await assert.rejects(
+      readFile(
+        join(
+          rootPath,
+          `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrWbs.js`
+        )
+      )
+    );
+    await assert.rejects(
+      readFile(
+        join(
+          rootPath,
+          `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_WbsMain.js`
+        )
+      )
+    );
+    assert.doesNotMatch(limitYaml, new RegExp(`${flowTag}HdrWbs:`));
   }
 
   const ttlExpiredFile = await readFile(

package/test/unit/application/customFlowApplicationArtifacts.test.js

@@ -924,7 +924,7 @@ test('renders nextSteps IAM permissions in InitialSetupConfig', async () => {
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -997,7 +997,7 @@ test('registers SQS queue, SNS subscription, and SNS out topic for custom flowSc
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1030,7 +1030,7 @@ test('uses synchronous RBAC without obsolete callback SQS subscriptions in Initi
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1096,7 +1096,7 @@ test('deduplicates duplicate nextSteps topics across flowSteps in InitialSetupCo
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1275,7 +1275,7 @@ test('renders previousSteps extTopic subscriptions in InitialSetupConfig', async
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1537,7 +1537,7 @@ test('does not emit RbacCallback artifacts or duplicate artifact paths for custo
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );