@aifabrix/builder 2.22.2 → 2.31.0

package/lib/validate.js

@@ -19,6 +19,81 @@ const { formatValidationErrors } = require('./utils/error-formatter');
 const { detectAppType } = require('./utils/paths');
 const logger = require('./utils/logger');
 
+/**
+ * Validates a file path (detects type and validates)
+ * @async
+ * @param {string} filePath - Path to file
+ * @returns {Promise<Object>} Validation result
+ */
+async function validateFilePath(filePath) {
+  if (!fs.existsSync(filePath)) {
+    throw new Error(`File not found: ${filePath}`);
+  }
+
+  const content = fs.readFileSync(filePath, 'utf8');
+  const type = detectSchemaType(filePath, content);
+
+  return await validateExternalFile(filePath, type);
+}
+
+/**
+ * Validates external files for an application
+ * @async
+ * @param {string} appName - Application name
+ * @returns {Promise<Array>} Array of validation results
+ */
+async function validateExternalFilesForApp(appName) {
+  const files = await resolveExternalFiles(appName);
+  const validations = [];
+
+  for (const file of files) {
+    const result = await validateExternalFile(file.path, file.type);
+    validations.push({
+      file: file.fileName,
+      path: file.path,
+      type: file.type,
+      ...result
+    });
+  }
+
+  return validations;
+}
+
+/**
+ * Aggregates validation results from multiple sources
+ * @param {Object} appValidation - Application validation result
+ * @param {Array} externalValidations - External file validation results
+ * @param {Object|null} rbacValidation - RBAC validation result (optional)
+ * @returns {Object} Aggregated validation result
+ */
+function aggregateValidationResults(appValidation, externalValidations, rbacValidation) {
+  const allErrors = [...(appValidation.errors || [])];
+  const allWarnings = [...(appValidation.warnings || [])];
+
+  if (rbacValidation && !rbacValidation.valid) {
+    allErrors.push(...(rbacValidation.errors || []));
+    allWarnings.push(...(rbacValidation.warnings || []));
+  }
+
+  externalValidations.forEach(validation => {
+    if (!validation.valid) {
+      allErrors.push(`External ${validation.type} file "${validation.file}": ${validation.errors.join(', ')}`);
+    }
+    if (validation.warnings && validation.warnings.length > 0) {
+      allWarnings.push(`External ${validation.type} file "${validation.file}": ${validation.warnings.join(', ')}`);
+    }
+  });
+
+  return {
+    valid: appValidation.valid && (!rbacValidation || rbacValidation.valid) && externalValidations.every(v => v.valid),
+    application: appValidation,
+    externalFiles: externalValidations,
+    rbac: rbacValidation,
+    errors: allErrors,
+    warnings: allWarnings
+  };
+}
+
 /**
  * Validates a single external file against its schema
  *
@@ -47,9 +122,11 @@ async function validateExternalFile(filePath, type) {
   }
 
   let validate;
-  if (type === 'system') {
+  // Normalize type: handle both 'external-system'/'external-datasource' and 'system'/'datasource'
+  const normalizedType = type === 'external-system' ? 'system' : (type === 'external-datasource' ? 'datasource' : type);
+  if (normalizedType === 'system') {
     validate = loadExternalSystemSchema();
-  } else if (type === 'datasource') {
+  } else if (normalizedType === 'datasource') {
     validate = loadExternalDataSourceSchema();
   } else {
     throw new Error(`Unknown file type: ${type}`);
@@ -61,7 +138,7 @@ async function validateExternalFile(filePath, type) {
   const warnings = [];
 
   // Additional validation for external system files: check role references in permissions
-  if (type === 'system' && parsed.permissions && Array.isArray(parsed.permissions)) {
+  if (normalizedType === 'system' && parsed.permissions && Array.isArray(parsed.permissions)) {
     const roles = parsed.roles || [];
     const roleValues = new Set(roles.map(r => r.value));
 
@@ -79,7 +156,9 @@ async function validateExternalFile(filePath, type) {
   return {
     valid: errors.length === 0,
     errors,
-    warnings
+    warnings,
+    file: filePath,
+    type: type
   };
 }
 
@@ -106,45 +185,7 @@ async function validateAppOrFile(appOrFile) {
   const isFilePath = fs.existsSync(appOrFile) && fs.statSync(appOrFile).isFile();
 
   if (isFilePath) {
-    // Validate single file
-    const schemaType = detectSchemaType(appOrFile);
-    let result;
-
-    if (schemaType === 'application') {
-      // For application files, we'd need to transform them first
-      // For now, just validate JSON structure
-      const content = fs.readFileSync(appOrFile, 'utf8');
-      try {
-        JSON.parse(content);
-      } catch (error) {
-        return {
-          valid: false,
-          errors: [`Invalid JSON syntax: ${error.message}`],
-          warnings: []
-        };
-      }
-      // Note: Full application validation requires variables.yaml transformation
-      // This is a simplified validation for direct JSON files
-      result = {
-        valid: true,
-        errors: [],
-        warnings: ['Application file validation is simplified. Use app name for full validation.']
-      };
-    } else if (schemaType === 'external-system') {
-      result = await validateExternalFile(appOrFile, 'system');
-    } else if (schemaType === 'external-datasource') {
-      result = await validateExternalFile(appOrFile, 'datasource');
-    } else {
-      throw new Error(`Unknown schema type: ${schemaType}`);
-    }
-
-    return {
-      valid: result.valid,
-      file: appOrFile,
-      type: schemaType,
-      errors: result.errors,
-      warnings: result.warnings
-    };
+    return await validateFilePath(appOrFile);
   }
 
   // Treat as app name
@@ -204,54 +245,11 @@ async function validateAppOrFile(appOrFile) {
     };
   }
 
-  // Resolve and validate external files
-  const externalFiles = await resolveExternalFiles(appName);
-  const externalValidations = [];
-
-  for (const fileInfo of externalFiles) {
-    try {
-      const validation = await validateExternalFile(fileInfo.path, fileInfo.type);
-      externalValidations.push({
-        file: fileInfo.fileName,
-        path: fileInfo.path,
-        type: fileInfo.type,
-        ...validation
-      });
-    } catch (error) {
-      externalValidations.push({
-        file: fileInfo.fileName,
-        path: fileInfo.path,
-        type: fileInfo.type,
-        valid: false,
-        errors: [error.message],
-        warnings: []
-      });
-    }
-  }
+  // Validate external files
+  const externalValidations = await validateExternalFilesForApp(appName);
 
   // Aggregate results
-  const rbacErrors = rbacValidation ? rbacValidation.errors : [];
-  const rbacWarnings = rbacValidation ? rbacValidation.warnings : [];
-  const allValid = appValidation.valid && externalValidations.every(v => v.valid) && (!rbacValidation || rbacValidation.valid);
-  const allErrors = [
-    ...appValidation.errors,
-    ...externalValidations.flatMap(v => v.errors.map(e => `${v.file}: ${e}`)),
-    ...rbacErrors.map(e => `rbac.yaml: ${e}`)
-  ];
-  const allWarnings = [
-    ...appValidation.warnings,
-    ...externalValidations.flatMap(v => v.warnings),
-    ...rbacWarnings
-  ];
-
-  return {
-    valid: allValid,
-    application: appValidation,
-    externalFiles: externalValidations,
-    rbac: rbacValidation,
-    errors: allErrors,
-    warnings: allWarnings
-  };
+  return aggregateValidationResults(appValidation, externalValidations, rbacValidation);
 }
 
 /**

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.22.2",
+  "version": "2.31.0",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {
     "aifabrix": "bin/aifabrix.js"
   },
   "scripts": {
-    "test": "jest --coverage",
+    "test": "node tests/scripts/test-wrapper.js",
+    "test:coverage": "jest --config jest.config.coverage.js --coverage --runInBand",
     "test:watch": "jest --watch",
-    "test:ci": "jest --ci --coverage --watchAll=false",
     "test:integration": "jest --config jest.config.integration.js --runInBand",
     "test:integration:python": "cross-env TEST_LANGUAGE=python jest --config jest.config.integration.js --runInBand",
     "test:integration:typescript": "cross-env TEST_LANGUAGE=typescript jest --config jest.config.integration.js --runInBand",
@@ -17,7 +17,7 @@
     "lint:fix": "eslint . --ext .js --fix",
     "lint:ci": "eslint . --ext .js --format json --output-file eslint-report.json",
     "dev": "node bin/aifabrix.js",
-    "build": "npm run lint && npm run test:ci",
+    "build": "npm run lint && npm run test",
     "pack": "npm run build && npm pack",
     "validate": "npm run build",
     "prepublishOnly": "npm run validate",

package/scripts/ci-fix.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# CI Fix Script Wrapper
+# This script is a wrapper that calls the actual CI fix script
+# located in tests/scripts/ci-fix.sh
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ACTUAL_SCRIPT="$SCRIPT_DIR/../tests/scripts/ci-fix.sh"
+
+if [ ! -f "$ACTUAL_SCRIPT" ]; then
+  echo "Error: CI fix script not found at $ACTUAL_SCRIPT" >&2
+  exit 1
+fi
+
+# Make sure the script is executable
+chmod +x "$ACTUAL_SCRIPT" 2>/dev/null || true
+
+# Execute the actual script
+exec "$ACTUAL_SCRIPT" "$@"
+

package/scripts/ci-simulate.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# CI Simulation Script Wrapper
+# This script is a wrapper that calls the actual CI simulation script
+# located in tests/scripts/ci-simulate.sh
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ACTUAL_SCRIPT="$SCRIPT_DIR/../tests/scripts/ci-simulate.sh"
+
+if [ ! -f "$ACTUAL_SCRIPT" ]; then
+  echo "Error: CI simulation script not found at $ACTUAL_SCRIPT" >&2
+  exit 1
+fi
+
+# Make sure the script is executable
+chmod +x "$ACTUAL_SCRIPT" 2>/dev/null || true
+
+# Execute the actual script
+exec "$ACTUAL_SCRIPT" "$@"
+

package/templates/applications/miso-controller/test.yaml

@@ -0,0 +1 @@
+test content

package/templates/python/Dockerfile.hbs

@@ -1,49 +1,12 @@
-# Python Dockerfile Template
-# Generated by AI Fabrix Builder SDK
-# Base image: Python 3.11 Alpine for optimal size and security
-
 FROM python:3.11-alpine
-
-# Set working directory
 WORKDIR /app
-
-# Install system dependencies
-RUN apk add --no-cache \
-    dumb-init \
-    curl \
-    gcc \
-    musl-dev \
-    libffi-dev \
-    && rm -rf /var/cache/apk/*
-
-# Copy requirements first for better layer caching
-COPY requirements*.txt ./
-
-# Install Python dependencies
+COPY {{appSourcePath}}requirements*.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
-
-# Copy application code
-COPY . .
-
-# Create non-root user for security
-RUN addgroup -g 1001 -S python && \
-    adduser -S python -u 1001
-
-# Change ownership of app directory
-RUN chown -R python:python /app
-USER python
-
-# Expose application port
-# Template variable: {{port}} will be replaced with actual port number
+COPY {{appSourcePath}} .
 EXPOSE {{port}}
-
-# Health check
-# Template variables: {{healthCheck.interval}} and {{healthCheck.path}} will be replaced
-HEALTHCHECK --interval={{healthCheck.interval}}s --timeout=3s --start-period=5s --retries=3 \
-    CMD curl -f http://localhost:{{port}}{{healthCheck.path}} || exit 1
-
-# Use dumb-init to handle signals properly
-ENTRYPOINT ["dumb-init", "--"]
-
-# Start application
-CMD {{#if startupCommand}}["{{startupCommand}}"]{{else}}["python", "main.py"]{{/if}}
+{{#if healthCheck}}
+HEALTHCHECK --interval={{healthCheck.interval}}s CMD curl -f http://localhost:{{port}}{{healthCheck.path}} || exit 1
+{{/if}}
+{{#if startupCommand}}
+CMD {{startupCommand}}
+{{/if}}

package/templates/typescript/Dockerfile.hbs

@@ -1,46 +1,12 @@
-# TypeScript/Node.js Dockerfile Template
-# Generated by AI Fabrix Builder SDK
-# Base image: Node 20 Alpine for optimal size and security
-
 FROM node:20-alpine
-
-# Set working directory
 WORKDIR /app
-
-# Install system dependencies
-RUN apk add --no-cache \
-    dumb-init \
-    curl \
-    && rm -rf /var/cache/apk/*
-
-# Copy package files first for better layer caching
-COPY package*.json ./
-
-# Install dependencies (including devDependencies for ts-node)
+COPY {{appSourcePath}}package*.json ./
 RUN npm install && npm cache clean --force
-
-# Copy application code
-COPY . .
-
-# Create non-root user for security
-RUN addgroup -g 1001 -S nodejs && \
-    adduser -S nextjs -u 1001
-
-# Change ownership of app directory
-RUN chown -R nextjs:nodejs /app
-USER nextjs
-
-# Expose application port
-# Template variable: {{port}} will be replaced with actual port number
+COPY {{appSourcePath}} .
 EXPOSE {{port}}
-
-# Health check
-# Template variables: {{healthCheck.interval}} and {{healthCheck.path}} will be replaced
-HEALTHCHECK --interval={{healthCheck.interval}}s --timeout=3s --start-period=5s --retries=3 \
-    CMD curl -f http://localhost:{{port}}{{healthCheck.path}} || exit 1
-
-# Use dumb-init to handle signals properly
-ENTRYPOINT ["dumb-init", "--"]
-
-# Start application
-CMD {{#if startupCommand}}["{{startupCommand}}"]{{else}}["npm", "start"]{{/if}}
+{{#if healthCheck}}
+HEALTHCHECK --interval={{healthCheck.interval}}s CMD curl -f http://localhost:{{port}}{{healthCheck.path}} || exit 1
+{{/if}}
+{{#if startupCommand}}
+CMD {{startupCommand}}
+{{/if}}