@izara_project/izara-core-generate-service-code 1.0.67 → 1.0.69

package/.prettierrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "endOfLine": "lf",
+  "plugins": ["prettier-plugin-ejs"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "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": {
@@ -10,31 +10,35 @@
   "license": "AGPL-3.0-or-later",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "type": "module",
-  "main": "index.js",
   "exports": "./index.js",
+  "main": "index.js",
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "format:ejs": "node scripts/format-ejs.js"
   },
   "jest": {
     "testEnvironment": "node"
   },
   "dependencies": {
+    "@izara_project/izara-attribute-tree": "^1.0.15",
     "@izara_project/izara-core-library-core": "^1.0.32",
-    "@izara_project/izara-core-library-logger": "^1.0.11",
+    "@izara_project/izara-property-nodes": "^1.0.16",
     "@izara_project/izara-shared-core": "^1.0.13",
     "ejs": "^6.0.1",
     "js-beautify": "^2.0.3",
-    "yaml": "^2.9.0",
-    "@izara_project/izara-property-nodes": "^1.0.16",
-    "@izara_project/izara-attribute-tree": "^1.0.15"
+    "yaml": "^2.9.0"
+  },
+  "devDependencies": {
+    "@izara_project/izara-core-library-logger": "^1.0.11",
+    "@izara_project/izara-core-library-service-schemas": "1.0.158",
+    "@izara_project/izara-shared-service-schemas": "^1.0.67",
+    "jest": "^30.4.2",
+    "prettier": "^3.9.6",
+    "prettier-plugin-ejs": "^1.0.3"
   },
   "peerDependencies": {
+    "@izara_project/izara-core-library-logger": "^1.0.11",
     "@izara_project/izara-core-library-service-schemas": "^1.0.157",
     "@izara_project/izara-shared-service-schemas": "^1.0.65"
-  },
-  "devDependencies": {
-    "@izara_project/izara-core-library-service-schemas": "1.0.158",
-    "@izara_project/izara-shared-service-schemas": "^1.0.66",
-    "jest": "^30.4.2"
   }
 }

package/scripts/format-ejs.js

@@ -0,0 +1,104 @@
+/* Copyright (C) 2026 Sven Mason <http://izara.io>
+ * Prettier formatting script for EJS template files under src/emit
+ */
+
+import fs from 'fs';
+import path from 'path';
+import prettier from 'prettier';
+
+function getAllEjsFiles(dirPath, arrayOfFiles = []) {
+  const files = fs.readdirSync(dirPath);
+  for (const file of files) {
+    const fullPath = path.join(dirPath, file);
+    if (fs.statSync(fullPath).isDirectory()) {
+      arrayOfFiles = getAllEjsFiles(fullPath, arrayOfFiles);
+    } else if (file.endsWith('.ejs')) {
+      arrayOfFiles.push(fullPath);
+    }
+  }
+  return arrayOfFiles;
+}
+
+export async function formatEjsFiles(targetDir = 'src/emit') {
+  const ejsFiles = getAllEjsFiles(targetDir);
+  let updatedCount = 0;
+
+  for (const filePath of ejsFiles) {
+    const content = fs.readFileSync(filePath, 'utf8');
+    const isYaml = filePath.includes('Yaml.ejs') || filePath.includes('Yaml');
+
+    const placeholders = [];
+    let masked = content;
+
+    masked = masked.replace(/<%[_-]?\s*([\s\S]*?)\s*[_-]?%>/g, (match) => {
+      const id = placeholders.length;
+      const isExpr = match.startsWith('<%=') || match.startsWith('<%-');
+      const isConditionalComma =
+        match.includes('?') && (match.includes("','") || match.includes('","'));
+
+      let replacement;
+      if (isYaml) {
+        replacement = isExpr ? `EJS_VAL_${id}` : `# __EJS_TAG_${id}__`;
+      } else {
+        if (isConditionalComma) {
+          replacement = `, /*__EJS_COMMA_${id}__*/`;
+        } else if (isExpr) {
+          replacement = `__EJS_VAR_${id}__`;
+        } else {
+          replacement = `/*__EJS_STMT_${id}__*/`;
+        }
+      }
+      placeholders.push({
+        id,
+        original: match,
+        replacement,
+        isConditionalComma
+      });
+      return replacement;
+    });
+
+    const parser = isYaml ? 'yaml' : 'babel';
+    let formatted = await prettier.format(masked, {
+      parser,
+      singleQuote: true,
+      semi: true,
+      tabWidth: 2,
+      useTabs: false,
+      trailingComma: 'none',
+      printWidth: 80,
+      endOfLine: 'lf'
+    });
+
+    for (const item of placeholders) {
+      if (item.isConditionalComma) {
+        formatted = formatted.replace(item.replacement, item.original);
+        formatted = formatted.replace(
+          `, /*__EJS_COMMA_${item.id}__*/`,
+          item.original
+        );
+      } else {
+        formatted = formatted.replace(item.replacement, item.original);
+      }
+    }
+
+    // Ensure unix newline at EOF
+    if (!formatted.endsWith('\n')) {
+      formatted += '\n';
+    }
+
+    if (formatted !== content) {
+      fs.writeFileSync(filePath, formatted, 'utf8');
+      updatedCount++;
+    }
+  }
+
+  return { total: ejsFiles.length, updated: updatedCount };
+}
+
+if (process.argv[1] === new URL(import.meta.url).pathname) {
+  formatEjsFiles().then(({ total, updated }) => {
+    console.log(
+      `Successfully formatted ${updated} / ${total} EJS template files in src/emit.`
+    );
+  });
+}

package/src/compile/compileProject.js

@@ -1,26 +1,57 @@
+import Logger from '@izara_project/izara-core-library-logger';
 import { join, resolve } from 'node:path';
+import { readFileSync, existsSync } from 'node:fs';
+import { parse as parseYaml } from 'yaml';
 
 export function compileProject(request = {}) {
-  if (!isNonEmptyString(request.rootPath)) {
-    throw new TypeError('GenerationRequest.rootPath must be a non-empty string');
+  if (!_isNonEmptyString(request.rootPath)) {
+    throw new TypeError(
+      'GenerationRequest.rootPath must be a non-empty string'
+    );
   }
 
   const rootPath = resolve(request.rootPath);
-  const outputPath = resolve(request.outputPath ?? rootPath);
-  const configPath = resolve(
-    request.configPath ?? join(rootPath, 'config', 'serverless.config.yml')
-  );
+  let outputPath = rootPath;
+  if (request.outputPath) {
+    outputPath = resolve(request.outputPath);
+  }
+  let configPath = join(rootPath, 'config', 'serverless.config.yml');
+  if (request.configPath) {
+    configPath = resolve(request.configPath);
+  }
+
+  let serviceTag = request.serviceTag;
+  if (!serviceTag && 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;
+        }
+      }
+    } catch (err) {
+      Logger?.debug?.('Could not read serverless.config.yml', err);
+    }
+  }
+
+  let schemaTemplateConfig = [];
+  if (request.schemaTemplateConfig) {
+    schemaTemplateConfig = request.schemaTemplateConfig;
+  }
 
   return Object.freeze({
     rootPath,
     outputPath,
     configPath,
     schemaRoot: join(rootPath, 'app', 'src', 'schemas'),
-    serviceTag: request.serviceTag,
-    schemaTemplateConfig: request.schemaTemplateConfig ?? []
+    serviceTag,
+    schemaTemplateConfig
   });
 }
 
-function isNonEmptyString(value) {
+function _isNonEmptyString(value) {
   return typeof value === 'string' && value.trim() !== '';
 }

package/src/compile/loadSchemas.js

@@ -1,7 +1,11 @@
 import { readdir, stat } from 'node:fs/promises';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { utils } from '@izara_project/izara-core-library-service-schemas';
+import {
+  getObjectSchema,
+  utils
+} from '@izara_project/izara-core-library-service-schemas';
+import Logger from '@izara_project/izara-core-library-logger';
 
 export async function loadLocalSchemaDirectory(project, directoryName) {
   const directoryPath = join(project.schemaRoot, directoryName);
@@ -15,31 +19,61 @@ export async function loadLocalSchemaDirectory(project, directoryName) {
     throw error;
   }
 
+  const validEntries = entries.filter(
+    (entry) => entry.isFile() && entry.name.endsWith('.js')
+  );
+  validEntries.sort((a, b) => a.name.localeCompare(b.name));
+
   const schemas = [];
-  for (const entry of entries.filter(entry => entry.isFile() && entry.name.endsWith('.js')).sort((a, b) => a.name.localeCompare(b.name))) {
+  for (const entry of validEntries) {
     const filePath = join(directoryPath, entry.name);
     const details = await stat(filePath);
-    const module = await import(`${pathToFileURL(filePath).href}?schemaVersion=${details.mtimeMs}-${details.size}`);
+    const module = await import(
+      `${pathToFileURL(filePath).href}?schemaVersion=${details.mtimeMs}-${details.size}`
+    );
     if (!module.default || typeof module.default !== 'object') {
-      throw new TypeError(`Schema module must default-export an object or array: ${filePath}`);
+      throw new TypeError(
+        `Schema module must default-export an object or array: ${filePath}`
+      );
+    }
+    let loadedSchemas = [module.default];
+    if (Array.isArray(module.default)) {
+      loadedSchemas = module.default;
     }
-    const loadedSchemas = Array.isArray(module.default) ? module.default : [module.default];
 
-    if (process.env.NODE_ENV !== 'test') {
+    if (process.env.NODE_ENV && process.env.NODE_ENV !== 'test') {
       for (const schema of loadedSchemas) {
         let status = true;
         let errors = [];
-        
+
         if (directoryName === 'ObjectSchemas') {
-          [status, errors] = utils.validateBasicObjectSchema({}, schema);
+          [status, errors] = utils.validateObjectSchema(
+            { logger: Logger },
+            schema
+          );
         } else if (directoryName === 'RelationshipSchemas') {
-          [status, errors] = utils.validateRelationshipSchema({}, schema);
+          if (entry.name.toLowerCase() === 'refobjectrelationships.js') {
+            [status, errors] = utils.validateRefRelationshipSchema(
+              { logger: Logger },
+              schema
+            );
+          } else {
+            [status, errors] = utils.validateRelationshipSchema(
+              { logger: Logger },
+              schema
+            );
+          }
         } else if (directoryName === 'FlowSchemas') {
-          [status, errors] = utils.validateBasicFlowSchema({}, schema);
+          [status, errors] = utils.validateBasicFlowSchema(
+            { logger: Logger },
+            schema
+          );
         }
 
         if (!status) {
-          throw new Error(`Schema validation failed for ${entry.name}:\n${errors.join('\n')}`);
+          throw new Error(
+            `Schema validation failed for ${entry.name}:\n${errors.join('\n')}`
+          );
         }
       }
     }
@@ -48,3 +82,78 @@ export async function loadLocalSchemaDirectory(project, directoryName) {
   }
   return schemas;
 }
+
+/**
+ * Resolves extendObjType for ObjectSchemas by fetching the parent schema
+ * from S3 and merging its storageResources into the child schema.
+ *
+ * Only schemas with `extendObjType` are processed; others are returned as-is.
+ * If `bucketName` is not provided, falls back to the
+ * `iz_serviceSchemaBucketName` environment variable.
+ *
+ * @param {Object[]} objectSchemas - Array of local ObjectSchemas from
+ *   loadLocalSchemaDirectory.
+ * @param {string} [bucketName] - S3 bucket name for fetching parent schemas.
+ * @returns {Promise<Object[]>} The same array with extended storageResources
+ *   merged in.
+ */
+export async function resolveExtendedObjectSchemas(objectSchemas, bucketName) {
+  if (!Array.isArray(objectSchemas)) {
+    throw new TypeError('objectSchemas must be an array');
+  }
+  const resolvedSchemas = [];
+  for (const schema of objectSchemas) {
+    if (!schema.hasOwnProperty('extendObjType')) {
+      resolvedSchemas.push(schema);
+      continue;
+    }
+    try {
+      // Track which storageResource keys existed in the child before merge
+      const initialResources = schema.storageResources || {};
+      const childStorageResourceKeys = new Set(Object.keys(initialResources));
+      const parentServiceTag = schema.extendObjType.serviceTag;
+
+      const mergedSchema = await getObjectSchema.mergeExtendObjSchema(
+        { logger: Logger },
+        schema,
+        bucketName
+      );
+
+      // Separate parent DynamoDB resources from child's own storageResources.
+      // Parent DynamoDB tables exist in the parent service — they must NOT be
+      // re-created here. Instead, track them as external references so that
+      // emitResourceArtifacts can add cross-service ARNs to IAM roles.
+      const externalDynamoResources = [];
+      const ownStorageResources = {};
+      const mergedStorageResources = mergedSchema.storageResources || {};
+      for (const [key, resource] of Object.entries(mergedStorageResources)) {
+        if (
+          resource?.storageType === 'dynamoDB' &&
+          !childStorageResourceKeys.has(key)
+        ) {
+          externalDynamoResources.push({
+            serviceTag: parentServiceTag,
+            tableName: resource.tableName
+          });
+        } else {
+          ownStorageResources[key] = resource;
+        }
+      }
+
+      mergedSchema.storageResources = ownStorageResources;
+      if (externalDynamoResources.length > 0) {
+        mergedSchema.externalDynamoResources = externalDynamoResources;
+      }
+
+      resolvedSchemas.push(mergedSchema);
+    } catch (error) {
+      Logger.error(
+        `resolveExtendedObjectSchemas: failed to merge extendObjType` +
+          ` for objectType=${schema.objectType}`,
+        { error }
+      );
+      throw error;
+    }
+  }
+  return resolvedSchemas;
+}