@aifabrix/builder 2.43.0 → 2.44.1

package/lib/validation/validator.js

@@ -12,6 +12,7 @@
 const fs = require('fs');
 const path = require('path');
 const Ajv = require('ajv');
+const addFormats = require('ajv-formats');
 const applicationSchema = require('../schema/application-schema.json');
 const externalSystemSchema = require('../schema/external-system.schema.json');
 const externalDataSourceSchema = require('../schema/external-datasource.schema.json');
@@ -57,7 +58,8 @@ async function loadVariablesYaml(appName, options = {}) {
  * @returns {Function} Compiled validator function
  */
 function setupAjvValidator() {
-  const ajv = new Ajv({ allErrors: true, strict: false });
+  const ajv = new Ajv({ allErrors: true, strict: false, verbose: true });
+  addFormats(ajv);
   const externalSystemSchemaCopy = { ...externalSystemSchema };
   const externalDataSourceSchemaCopy = { ...externalDataSourceSchema };
 
@@ -65,6 +67,11 @@ function setupAjvValidator() {
     delete externalDataSourceSchemaCopy.$schema;
   }
 
+  // external-datasource.schema.json references these by $id (aifabrix://schema/type/*)
+  ajv.addSchema(require('../schema/type/document-storage.json'));
+  ajv.addSchema(require('../schema/type/message-service.json'));
+  ajv.addSchema(require('../schema/type/vector-store.json'));
+
   ajv.addSchema(externalSystemSchemaCopy, externalSystemSchema.$id);
   ajv.addSchema(externalDataSourceSchemaCopy, externalDataSourceSchema.$id);
   return ajv.compile(applicationSchema);
@@ -341,7 +348,8 @@ function validateDeploymentJson(deployment) {
 
   // verbose: true includes the actual data value in error objects for better error messages
   const ajv = new Ajv({ allErrors: true, strict: false, verbose: true });
-  // Register external schemas with their $id (GitHub raw URLs)
+  addFormats(ajv);
+  // Register external schemas with their $id
   // Create copies to avoid modifying the original schemas
   const externalSystemSchemaCopy = { ...externalSystemSchema };
   const externalDataSourceSchemaCopy = { ...externalDataSourceSchema };
@@ -349,6 +357,10 @@ function validateDeploymentJson(deployment) {
   if (externalDataSourceSchemaCopy.$schema && externalDataSourceSchemaCopy.$schema.includes('2020-12')) {
     delete externalDataSourceSchemaCopy.$schema;
   }
+  // external-datasource.schema.json references these by $id (aifabrix://schema/type/*)
+  ajv.addSchema(require('../schema/type/document-storage.json'));
+  ajv.addSchema(require('../schema/type/message-service.json'));
+  ajv.addSchema(require('../schema/type/vector-store.json'));
   ajv.addSchema(externalSystemSchemaCopy, externalSystemSchema.$id);
   ajv.addSchema(externalDataSourceSchemaCopy, externalDataSourceSchema.$id);
   const validate = ajv.compile(applicationSchema);
@@ -356,72 +368,17 @@ function validateDeploymentJson(deployment) {
 
   return {
     valid,
-    errors: valid ? [] : formatValidationErrors(validate.errors)
+    errors: valid ? [] : formatValidationErrors(validate.errors, {
+      deploymentManifest: deployment,
+      rootData: deployment
+    })
   };
 }
 
-/** Pattern matching ${VAR} style unresolved variables in strings */
-const UNRESOLVED_VAR_REGEX = /\$\{[^}]+\}/g;
-
-/**
- * Recursively finds all string values in obj that contain ${...} placeholders.
- * Used to ensure deployment manifest has no unresolved variables before deploy.
- *
- * @function findUnresolvedVariablesInObject
- * @param {Object} obj - Object to scan (e.g. deployment manifest)
- * @param {string} [prefix=''] - Path prefix for error reporting
- * @returns {string[]} List of paths with example placeholder (e.g. "port: ${PORT}")
- *
- * @example
- * findUnresolvedVariablesInObject({ port: '${PORT}' }) // ['port: ${PORT}']
- */
-function findUnresolvedVariablesInObject(obj, prefix = '') {
-  const found = [];
-  if (obj === null || obj === undefined) {
-    return found;
-  }
-  if (typeof obj === 'string') {
-    const matches = obj.match(UNRESOLVED_VAR_REGEX);
-    if (matches && matches.length > 0) {
-      const pathLabel = prefix || 'value';
-      found.push(`${pathLabel}: ${matches[0]}`);
-    }
-    return found;
-  }
-  if (Array.isArray(obj)) {
-    obj.forEach((item, i) => {
-      found.push(...findUnresolvedVariablesInObject(item, `${prefix}[${i}]`));
-    });
-    return found;
-  }
-  if (typeof obj === 'object') {
-    for (const [key, value] of Object.entries(obj)) {
-      const path = prefix ? `${prefix}.${key}` : key;
-      found.push(...findUnresolvedVariablesInObject(value, path));
-    }
-    return found;
-  }
-  return found;
-}
-
-/**
- * Validates that deployment manifest contains no unresolved ${...} variables.
- * Throws if any are found, with a message to use secret variables or literal values.
- *
- * @function validateNoUnresolvedVariablesInDeployment
- * @param {Object} deployment - Deployment manifest object
- * @throws {Error} If any ${...} placeholders are found
- */
-function validateNoUnresolvedVariablesInDeployment(deployment) {
-  const unresolved = findUnresolvedVariablesInObject(deployment);
-  if (unresolved.length > 0) {
-    const examples = [...new Set(unresolved)].slice(0, 5).join(', ');
-    throw new Error(
-      `Deployment manifest contains unresolved variables (e.g. ${examples}). ` +
-      'Use secret variables (kv://) in env.template for sensitive values, and set the application port as a number in application.yaml.'
-    );
-  }
-}
+const {
+  findUnresolvedVariablesInObject,
+  validateNoUnresolvedVariablesInDeployment
+} = require('./validator-unresolved-placeholders');
 
 /**
  * Validates all application configuration files

package/lib/validation/wizard-config-validator.js

@@ -1,3 +1,4 @@
+const { formatBlockingError } = require('../utils/cli-test-layout-chalk');
 /**
  * @fileoverview Wizard configuration validator for wizard.yaml files
  * @author AI Fabrix Team
@@ -281,7 +282,7 @@ function displayValidationResults(result) {
     console.log(chalk.green('Wizard configuration is valid'));
   } else {
     // eslint-disable-next-line no-console
-    console.log(chalk.red('✗ Wizard configuration validation failed:'));
+    console.log(formatBlockingError('Wizard configuration validation failed:'));
     result.errors.forEach(error => {
       // eslint-disable-next-line no-console
       console.log(chalk.red(`  - ${error}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.43.0",
+  "version": "2.44.1",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {
@@ -8,6 +8,7 @@
     "af": "bin/aifabrix.js"
   },
   "scripts": {
+    "all": "npm run precommit && npm run test:manual && npm run test:integration:fixtures && npm run test:hubspot-wizard",
     "test": "node tests/scripts/test-wrapper.js",
     "test:ci": "bash tests/scripts/ci-simulate.sh",
     "test:same-as-github": "npm run build:ci",
@@ -15,6 +16,7 @@
     "test:coverage:nyc": "nyc --reporter=text --reporter=lcov --reporter=html jest --config jest.config.coverage.js --runInBand",
     "test:watch": "jest --watch",
     "test:integration": "jest --config jest.config.integration.js --runInBand",
+    "test:integration:fixtures": "jest --config jest.config.integration.fixtures.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",
     "test:hubspot-wizard": "node integration/hubspot-test/test.js",
@@ -27,13 +29,16 @@
     "lint:ci": "eslint . --ext .js --format json --output-file eslint-report.json",
     "dev": "node bin/aifabrix.js",
     "build": "npm run lint && npm run test",
-    "build:ci": "npm run lint && npm run test:ci",
+    "build:ci": "npm run lint && npm run check:schema-sync && npm run check:flags && npm run test:ci",
     "pack": "npm run build && npm pack",
     "validate": "npm run build",
     "prepublishOnly": "npm run validate",
     "precommit": "npm run lint:fix && npm run test",
-    "install:local": "node scripts/install-local.js",
-    "uninstall:local": "node scripts/install-local.js uninstall"
+    "install:local": "node scripts/install-local.js && which aifabrix && which af",
+    "uninstall:local": "node scripts/install-local.js uninstall && which aifabrix && which af",
+    "diagnose:cli": "node scripts/diagnose-cli.js",
+    "check:schema-sync": "node scripts/check-datasource-test-run-schema-sync.js",
+    "check:flags": "jest tests/lib/schema/flag-map-validation-run.test.js --runInBand --config jest.config.default.js"
   },
   "keywords": [
     "aifabrix",

package/scripts/check-datasource-test-run-schema-sync.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+/**
+ * CI helper: fail when Builder lib/schema/datasource-test-run.schema.json drifts from Dataplane copy.
+ * @fileoverview Schema sync gate (plan §8.1)
+ */
+/* eslint-disable no-console -- CLI script */
+
+const path = require('path');
+const { assertDatasourceTestRunSchemasInSync } = require('../lib/utils/datasource-test-run-schema-sync');
+
+const root = path.join(__dirname, '..');
+const builderSchema = path.join(root, 'lib/schema/datasource-test-run.schema.json');
+const dpRoot = process.env.AIFABRIX_DATAPLANE_ROOT || path.join(root, '..', 'aifabrix-dataplane');
+const dataplaneSchema = path.join(dpRoot, 'app/schemas/json/datasource-test-run.schema.json');
+
+const strict = process.env.AIFABRIX_SCHEMA_SYNC_STRICT === '1';
+
+try {
+  const result = assertDatasourceTestRunSchemasInSync(builderSchema, dataplaneSchema);
+  if (result.skipped) {
+    const msg = result.reason || 'Dataplane schema path missing';
+    if (strict) {
+      console.error(`Schema sync failed (strict): ${msg}`);
+      process.exit(1);
+    }
+    console.warn(`Schema sync skipped: ${msg}`);
+    process.exit(0);
+  }
+  console.log(`DatasourceTestRun schema OK (sha256 ${result.builderSha})`);
+  process.exit(0);
+} catch (e) {
+  console.error(e.message || String(e));
+  process.exit(1);
+}

package/scripts/diagnose-cli.js

@@ -0,0 +1,150 @@
+#!/usr/bin/env node
+/* eslint-disable no-console */
+
+/**
+ * List every PATH hit for aifabrix / af and each --version (find duplicate installs).
+ *
+ * @fileoverview CLI path diagnostic for @aifabrix/builder
+ */
+
+const { execFileSync, execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Reads package.json `bin` field.
+ * @returns {Record<string, string>|string} Bin map or single path string
+ */
+function readBins() {
+  const pkgPath = path.join(__dirname, '..', 'package.json');
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+  return pkg.bin || { aifabrix: 'bin/aifabrix.js' };
+}
+
+/**
+ * Resolves every PATH directory that exposes an executable named `binName`.
+ * @param {string} binName - CLI name (e.g. aifabrix)
+ * @returns {Array<{ path: string, real: string }>} Deduped hits with real paths
+ */
+function locationsOnPath(binName) {
+  if (process.platform === 'win32') {
+    try {
+      const out = execSync(`where ${binName}`, {
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore']
+      }).trim();
+      return out.split(/\r?\n/).filter(Boolean).map((p) => ({ path: p, real: p }));
+    } catch {
+      return [];
+    }
+  }
+
+  const dirs = (process.env.PATH || '').split(path.delimiter).filter(Boolean);
+  const out = [];
+  const seenReal = new Set();
+  for (const dir of dirs) {
+    const candidate = path.join(dir, binName);
+    try {
+      const st = fs.lstatSync(candidate);
+      if (!st.isFile() && !st.isSymbolicLink()) continue;
+      fs.accessSync(candidate, fs.constants.X_OK);
+      const real = fs.realpathSync(candidate);
+      if (seenReal.has(real)) continue;
+      seenReal.add(real);
+      out.push({ path: candidate, real });
+    } catch {
+      // not found or not executable
+    }
+  }
+  return out;
+}
+
+/**
+ * Runs `executablePath --version` and returns stdout or null on failure.
+ * @param {string} executablePath - Absolute path to the binary
+ * @returns {string|null} Trimmed version output
+ */
+function versionAt(executablePath) {
+  try {
+    return execFileSync(executablePath, ['--version'], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore']
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Prints PNPM_HOME and npm prefix for debugging PATH issues.
+ * @returns {void}
+ */
+function printEnvironment() {
+  console.log('Environment (relevant to global CLIs)\n');
+  console.log(`  PNPM_HOME     ${process.env.PNPM_HOME || '(not set)'}`);
+  try {
+    const prefix = execSync('npm config get prefix', {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore']
+    }).trim();
+    console.log(`  npm prefix    ${prefix}`);
+  } catch {
+    console.log('  npm prefix    (could not read)');
+  }
+  console.log('');
+}
+
+/**
+ * @param {string[]} names - Bin names from package.json
+ * @returns {void}
+ */
+function printBinReports(names) {
+  for (const name of names) {
+    console.log(`── ${name} ──`);
+    const hits = locationsOnPath(name);
+    if (!hits.length) {
+      console.log('  (not found on PATH)\n');
+      continue;
+    }
+    hits.forEach((h, i) => {
+      const ver = versionAt(h.path);
+      const marker = i === 0 ? '  ← first on PATH (what your shell runs)' : '';
+      console.log(`  [${i + 1}] ${h.path}`);
+      if (h.real !== h.path) console.log(`      → ${h.real}`);
+      console.log(`      --version: ${ver ?? '(failed to run)'}${marker}`);
+    });
+    console.log('');
+  }
+}
+
+/**
+ * @param {string[]} names - Bin names from package.json
+ * @returns {void}
+ */
+function warnIfMultipleVersions(names) {
+  const uniqVersions = new Set();
+  for (const name of names) {
+    for (const h of locationsOnPath(name)) {
+      const v = versionAt(h.path);
+      if (v) uniqVersions.add(v);
+    }
+  }
+  if (uniqVersions.size > 1) {
+    console.log('⚠  Multiple distinct --version values above: remove or reorder PATH so only one install remains.');
+    console.log('   Often: npm uninstall -g @aifabrix/builder, then ensure PNPM_HOME is before /usr/local/bin in PATH.\n');
+  }
+}
+
+/**
+ * Entry: list PATH hits and versions for each package bin.
+ * @returns {void}
+ */
+function main() {
+  const binField = readBins();
+  const names = typeof binField === 'string' ? ['aifabrix'] : Object.keys(binField);
+  printEnvironment();
+  printBinReports(names);
+  warnIfMultipleVersions(names);
+}
+
+main();