@aifabrix/builder 2.31.0 → 2.32.1

package/lib/{app-run-helpers.js → app/run-helpers.js}

@@ -16,16 +16,16 @@ const chalk = require('chalk');
 const yaml = require('js-yaml');
 const { exec } = require('child_process');
 const { promisify } = require('util');
-const validator = require('./validator');
-const infra = require('./infra');
-const secrets = require('./secrets');
-const config = require('./config');
-const buildCopy = require('./utils/build-copy');
-const logger = require('./utils/logger');
-const { waitForHealthCheck } = require('./utils/health-check');
-const composeGenerator = require('./utils/compose-generator');
-const dockerUtils = require('./utils/docker');
-const containerHelpers = require('./utils/app-run-containers');
+const validator = require('../validation/validator');
+const infra = require('../infrastructure');
+const secrets = require('../core/secrets');
+const config = require('../core/config');
+const buildCopy = require('../utils/build-copy');
+const logger = require('../utils/logger');
+const { waitForHealthCheck } = require('../utils/health-check');
+const composeGenerator = require('../utils/compose-generator');
+const dockerUtils = require('../utils/docker');
+const containerHelpers = require('../utils/app-run-containers');
 
 const execAsync = promisify(exec);
 

package/lib/{app-run.js → app/run.js}

@@ -10,12 +10,12 @@
  */
 
 const chalk = require('chalk');
-const config = require('./config');
-const logger = require('./utils/logger');
-const { checkPortAvailable, waitForHealthCheck } = require('./utils/health-check');
-const composeGenerator = require('./utils/compose-generator');
+const config = require('../core/config');
+const logger = require('../utils/logger');
+const { checkPortAvailable, waitForHealthCheck } = require('../utils/health-check');
+const composeGenerator = require('../utils/compose-generator');
 // Helper functions extracted to reduce file size and complexity
-const helpers = require('./app-run-helpers');
+const helpers = require('./run-helpers');
 
 /**
  * Validate app for run and check if it's an external system
@@ -31,7 +31,7 @@ async function validateAppForRun(appName, _debug) {
   }
 
   // Check if app type is external - skip Docker run
-  const { detectAppType } = require('./utils/paths');
+  const { detectAppType } = require('../utils/paths');
   try {
     const { isExternal } = await detectAppType(appName);
     if (isExternal) {

package/lib/{build.js → build/index.js}

@@ -13,18 +13,18 @@
 const fs = require('fs').promises;
 const fsSync = require('fs');
 const path = require('path');
-const paths = require('./utils/paths');
-const { detectAppType, getProjectRoot } = require('./utils/paths');
+const paths = require('../utils/paths');
+const { detectAppType, getProjectRoot } = require('../utils/paths');
 const chalk = require('chalk');
 const yaml = require('js-yaml');
-const secrets = require('./secrets');
-const config = require('./config');
-const logger = require('./utils/logger');
-const dockerfileUtils = require('./utils/dockerfile-utils');
-const dockerBuild = require('./utils/docker-build');
-const buildCopy = require('./utils/build-copy');
-const { buildDevImageName } = require('./utils/image-name');
-const buildHelpers = require('./utils/build-helpers');
+const secrets = require('../core/secrets');
+const config = require('../core/config');
+const logger = require('../utils/logger');
+const dockerfileUtils = require('../utils/dockerfile-utils');
+const dockerBuild = require('../utils/docker-build');
+const buildCopy = require('../utils/build-copy');
+const { buildDevImageName } = require('../utils/image-name');
+const buildHelpers = require('../utils/build-helpers');
 
 /**
  * Loads variables.yaml configuration for an application
@@ -208,7 +208,7 @@ async function postBuildTasks(appName, buildConfig) {
 async function checkExternalAppType(appName) {
   const variables = await loadVariablesYaml(appName);
   if (variables.app && variables.app.type === 'external') {
-    const generator = require('./generator');
+    const generator = require('../generator');
     const jsonPath = await generator.generateDeployJson(appName);
     logger.log(chalk.green(`✓ Generated deployment JSON: ${jsonPath}`));
     return true;
@@ -224,6 +224,51 @@ async function checkExternalAppType(appName) {
  * @param {Object} options - Build options
  * @returns {Promise<Object>} Object with devDir, effectiveImageName, imageName, appConfig, and developerId
  */
+/**
+ * Copies application source files if they exist
+ * @async
+ * @function copyApplicationSourceFiles
+ * @param {string} appName - Application name
+ * @param {string} devDir - Developer directory
+ * @returns {Promise<boolean>} True if files were copied
+ */
+async function copyApplicationSourceFiles(appName, devDir) {
+  const appsPath = path.join(process.cwd(), 'apps', appName);
+  if (fsSync.existsSync(appsPath)) {
+    await buildCopy.copyAppSourceFiles(appsPath, devDir);
+    logger.log(chalk.green(`✓ Copied application source files from apps/${appName}`));
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Copies template files if needed
+ * @async
+ * @function copyTemplateFilesIfNeeded
+ * @param {string} devDir - Developer directory
+ * @param {string} language - Language type
+ * @param {Object} buildConfig - Build configuration
+ * @param {Object} options - Build options
+ */
+async function copyTemplateFilesIfNeeded(devDir, language, buildConfig, options) {
+  const detectedLanguage = options.language || buildConfig.language || detectLanguage(devDir);
+  const packageJsonPath = path.join(devDir, 'package.json');
+  const requirementsPath = path.join(devDir, 'requirements.txt');
+
+  if (detectedLanguage === 'typescript' && !fsSync.existsSync(packageJsonPath)) {
+    const projectRoot = getProjectRoot();
+    const templatePath = path.join(projectRoot, 'templates', 'typescript');
+    await buildCopy.copyTemplateFilesToDevDir(templatePath, devDir, detectedLanguage);
+    logger.log(chalk.green(`✓ Generated application files from ${detectedLanguage} template`));
+  } else if (detectedLanguage === 'python' && !fsSync.existsSync(requirementsPath)) {
+    const projectRoot = getProjectRoot();
+    const templatePath = path.join(projectRoot, 'templates', 'python');
+    await buildCopy.copyTemplateFilesToDevDir(templatePath, devDir, detectedLanguage);
+    logger.log(chalk.green(`✓ Generated application files from ${detectedLanguage} template`));
+  }
+}
+
 async function prepareDevDirectory(appName, buildConfig, options) {
   const developerId = await config.getDeveloperId();
   const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
@@ -236,27 +281,9 @@ async function prepareDevDirectory(appName, buildConfig, options) {
   const effectiveImageName = buildDevImageName(imageName, developerId);
 
   // Check if application source files exist, if not copy from templates
-  const appsPath = path.join(process.cwd(), 'apps', appName);
-  if (fsSync.existsSync(appsPath)) {
-    await buildCopy.copyAppSourceFiles(appsPath, devDir);
-    logger.log(chalk.green(`✓ Copied application source files from apps/${appName}`));
-  } else {
-    // No apps directory - check if we need to copy template files
-    const language = options.language || buildConfig.language || detectLanguage(devDir);
-    const packageJsonPath = path.join(devDir, 'package.json');
-    const requirementsPath = path.join(devDir, 'requirements.txt');
-
-    if (language === 'typescript' && !fsSync.existsSync(packageJsonPath)) {
-      const projectRoot = getProjectRoot();
-      const templatePath = path.join(projectRoot, 'templates', 'typescript');
-      await buildCopy.copyTemplateFilesToDevDir(templatePath, devDir, language);
-      logger.log(chalk.green(`✓ Generated application files from ${language} template`));
-    } else if (language === 'python' && !fsSync.existsSync(requirementsPath)) {
-      const projectRoot = getProjectRoot();
-      const templatePath = path.join(projectRoot, 'templates', 'python');
-      await buildCopy.copyTemplateFilesToDevDir(templatePath, devDir, language);
-      logger.log(chalk.green(`✓ Generated application files from ${language} template`));
-    }
+  const filesCopied = await copyApplicationSourceFiles(appName, devDir);
+  if (!filesCopied) {
+    await copyTemplateFilesIfNeeded(devDir, null, buildConfig, options);
   }
 
   return { devDir, effectiveImageName, imageName, appConfig };

package/lib/build/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@aifabrix/builder-build",
+  "version": "1.0.0",
+  "main": "index.js",
+  "type": "commonjs"
+}
+