@aifabrix/builder 2.31.0 → 2.32.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.31.0",
+  "version": "2.32.1",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {
@@ -9,6 +9,7 @@
   "scripts": {
     "test": "node tests/scripts/test-wrapper.js",
     "test:coverage": "jest --config jest.config.coverage.js --coverage --runInBand",
+    "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:python": "cross-env TEST_LANGUAGE=python jest --config jest.config.integration.js --runInBand",
@@ -21,7 +22,9 @@
     "pack": "npm run build && npm pack",
     "validate": "npm run build",
     "prepublishOnly": "npm run validate",
-    "precommit": "npm run lint:fix && npm run test"
+    "precommit": "npm run lint:fix && npm run test",
+    "install:local": "node scripts/install-local.js",
+    "uninstall:local": "node scripts/install-local.js uninstall"
   },
   "keywords": [
     "aifabrix",
@@ -36,6 +39,32 @@
   "engines": {
     "node": ">=18.0.0"
   },
+  "nyc": {
+    "all": true,
+    "check-coverage": false,
+    "reporter": [
+      "text",
+      "lcov",
+      "html"
+    ],
+    "include": [
+      "lib/**/*.js",
+      "bin/**/*.js"
+    ],
+    "exclude": [
+      "**/node_modules/**",
+      "**/tests/**",
+      "lib/infra.js",
+      "bin/aifabrix.js"
+    ],
+    "cache": true,
+    "temp-dir": ".nyc_output"
+  },
+  "pnpm": {
+    "overrides": {
+      "@bcoe/v8-coverage": "^1.0.2"
+    }
+  },
   "dependencies": {
     "ajv": "^8.12.0",
     "axios": "^1.6.0",
@@ -47,10 +76,12 @@
     "ora": "^5.4.1"
   },
   "devDependencies": {
+    "@bcoe/v8-coverage": "^1.0.2",
     "@types/node": "^20.10.0",
     "cross-env": "^10.1.0",
     "eslint": "^8.55.0",
-    "jest": "^29.7.0"
+    "jest": "^30.2.0",
+    "nyc": "^17.1.0"
   },
   "repository": {
     "type": "git",

package/scripts/install-local.js

@@ -0,0 +1,210 @@
+#!/usr/bin/env node
+/* eslint-disable no-console */
+
+/**
+ * Install local package globally using npm link or pnpm link
+ * Automatically detects which package manager is being used
+ *
+ * @fileoverview Local installation script for @aifabrix/builder
+ * @author AI Fabrix Team
+ * @version 2.0.0
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Detect which package manager is being used (pnpm or npm)
+ * @returns {string} 'pnpm' or 'npm'
+ */
+function detectPackageManager() {
+  try {
+    // Check if pnpm is available
+    execSync('which pnpm', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+    return 'pnpm';
+  } catch {
+    // Fall back to npm
+    return 'npm';
+  }
+}
+
+/**
+ * Get currently installed version of aifabrix CLI
+ * @returns {string|null} Version string or null if not installed
+ */
+function getCurrentVersion() {
+  try {
+    const version = execSync('aifabrix --version', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    return version;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Get version from local package.json
+ * @returns {string|null} Version string or null if not found
+ */
+function getPackageVersion() {
+  try {
+    const packageJsonPath = path.join(__dirname, '..', 'package.json');
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    return packageJson.version;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Display version comparison information
+ * @param {string|null} currentVersion - Currently installed version
+ * @param {string|null} packageVersion - Version being linked
+ * @returns {void}
+ */
+function displayVersionInfo(currentVersion, packageVersion) {
+  if (currentVersion) {
+    console.log(`📦 Current installed version: ${currentVersion}`);
+  } else {
+    console.log('📦 No previous version detected (first install)');
+  }
+
+  if (packageVersion) {
+    if (currentVersion && currentVersion !== packageVersion) {
+      console.log(`🔄 Linking new version: ${packageVersion}`);
+      console.log(`   Version change: ${currentVersion} → ${packageVersion}\n`);
+    } else if (currentVersion && currentVersion === packageVersion) {
+      console.log(`🔄 Linking version: ${packageVersion} (same version)\n`);
+    } else {
+      console.log(`🔄 Linking version: ${packageVersion}\n`);
+    }
+  }
+}
+
+/**
+ * Display success message with version information
+ * @param {string|null} currentVersion - Version before linking
+ * @param {string|null} newVersion - Version after linking
+ * @returns {void}
+ */
+function displaySuccessMessage(currentVersion, newVersion) {
+  console.log('\n✅ Successfully linked!');
+  if (currentVersion && newVersion && currentVersion !== newVersion) {
+    console.log(`📊 Version updated: ${currentVersion} → ${newVersion}`);
+  } else if (newVersion) {
+    console.log(`📊 Installed version: ${newVersion}`);
+  }
+  console.log('Run "aifabrix --version" to verify.');
+}
+
+/**
+ * Install local package globally
+ * @returns {void}
+ */
+function installLocal() {
+  const pm = detectPackageManager();
+  const packageVersion = getPackageVersion();
+  const currentVersion = getCurrentVersion();
+
+  console.log(`Detected package manager: ${pm}\n`);
+
+  // Show version comparison
+  displayVersionInfo(currentVersion, packageVersion);
+
+  console.log('Linking @aifabrix/builder globally...\n');
+
+  try {
+    if (pm === 'pnpm') {
+      execSync('pnpm link --global', { stdio: 'inherit' });
+    } else {
+      execSync('npm link', { stdio: 'inherit' });
+    }
+
+    // Get new version after linking
+    const newVersion = getCurrentVersion();
+
+    displaySuccessMessage(currentVersion, newVersion);
+  } catch (error) {
+    console.error('\n❌ Failed to link package:', error.message);
+    process.exit(1);
+  }
+}
+
+/**
+ * Display version information before unlinking
+ * @param {string|null} currentVersion - Currently installed version
+ * @param {string|null} packageVersion - Local package version
+ * @returns {void}
+ */
+function displayUninstallVersionInfo(currentVersion, packageVersion) {
+  if (currentVersion) {
+    console.log(`📦 Current installed version: ${currentVersion}`);
+  } else {
+    console.log('📦 No installed version detected');
+  }
+
+  if (packageVersion) {
+    console.log(`📋 Local package version: ${packageVersion}`);
+    if (currentVersion && currentVersion === packageVersion) {
+      console.log('   (matches installed version)\n');
+    } else if (currentVersion && currentVersion !== packageVersion) {
+      console.log(`   (installed: ${currentVersion}, local: ${packageVersion})\n`);
+    } else {
+      console.log('\n');
+    }
+  } else {
+    console.log('\n');
+  }
+}
+
+/**
+ * Display success message after unlinking
+ * @param {string} pm - Package manager ('pnpm' or 'npm')
+ * @param {string|null} currentVersion - Version that was uninstalled
+ * @returns {void}
+ */
+function displayUninstallSuccess(pm, currentVersion) {
+  console.log(`\n✅ Successfully unlinked with ${pm}!`);
+  if (currentVersion) {
+    console.log(`📊 Uninstalled version: ${currentVersion}`);
+  }
+}
+
+/**
+ * Uninstall local package from global installation
+ * @returns {void}
+ */
+function uninstallLocal() {
+  const pm = detectPackageManager();
+  const currentVersion = getCurrentVersion();
+  const packageVersion = getPackageVersion();
+
+  console.log(`Detected package manager: ${pm}\n`);
+
+  // Show version information before unlinking
+  displayUninstallVersionInfo(currentVersion, packageVersion);
+
+  console.log('Unlinking @aifabrix/builder globally...\n');
+
+  try {
+    if (pm === 'pnpm') {
+      execSync('pnpm unlink --global @aifabrix/builder', { stdio: 'inherit' });
+      displayUninstallSuccess(pm, currentVersion);
+    } else {
+      execSync('npm unlink -g @aifabrix/builder', { stdio: 'inherit' });
+      displayUninstallSuccess(pm, currentVersion);
+    }
+  } catch (error) {
+    console.error('\n❌ Failed to unlink package:', error.message);
+    process.exit(1);
+  }
+}
+
+// Main execution
+const command = process.argv[2];
+
+if (command === 'uninstall' || command === 'unlink') {
+  uninstallLocal();
+} else {
+  installLocal();
+}

package/templates/external-system/deploy.ps1.hbs

@@ -0,0 +1,34 @@
+# Deploy {{systemKey}} external system and datasources using aifabrix CLI
+
+$ErrorActionPreference = "Stop"
+
+$SCRIPT_DIR = $PSScriptRoot
+$env:ENVIRONMENT = if ($env:ENVIRONMENT) { $env:ENVIRONMENT } else { "dev" }
+$env:CONTROLLER = if ($env:CONTROLLER) { $env:CONTROLLER } else { "http://localhost:3000" }
+
+Write-Host "🔍 Validating {{systemKey}} configuration files..."
+{{#each allJsonFiles}}
+aifabrix validate "${SCRIPT_DIR}\{{this}}"
+if ($LASTEXITCODE -ne 0) { exit 1 }
+{{/each}}
+
+Write-Host "✅ Validation passed"
+
+Write-Host "🚀 Deploying {{systemKey}} external system and datasources..."
+Write-Host "   Environment: $env:ENVIRONMENT"
+Write-Host "   Controller: $env:CONTROLLER"
+
+# Deploy datasources
+{{#each datasourceFileNames}}
+aifabrix datasource deploy {{../systemKey}} "${SCRIPT_DIR}\{{this}}" --environment $env:ENVIRONMENT --controller $env:CONTROLLER
+if ($LASTEXITCODE -ne 0) { exit 1 }
+{{/each}}
+
+Write-Host "✅ Deployment complete"
+
+# Optional: Run tests
+if ($env:RUN_TESTS -eq "true") {
+  Write-Host "🧪 Running integration tests..."
+  aifabrix test-integration {{systemKey}} --environment $env:ENVIRONMENT --controller $env:CONTROLLER
+}
+

package/templates/external-system/deploy.sh.hbs

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Deploy {{systemKey}} external system and datasources using aifabrix CLI
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ENVIRONMENT="${ENVIRONMENT:-dev}"
+CONTROLLER="${CONTROLLER:-http://localhost:3000}"
+
+echo "🔍 Validating {{systemKey}} configuration files..."
+{{#each allJsonFiles}}
+aifabrix validate "${SCRIPT_DIR}/{{this}}" || exit 1
+{{/each}}
+
+echo "✅ Validation passed"
+
+echo "🚀 Deploying {{systemKey}} external system and datasources..."
+echo "   Environment: ${ENVIRONMENT}"
+echo "   Controller: ${CONTROLLER}"
+
+# Deploy datasources
+{{#each datasourceFileNames}}
+aifabrix datasource deploy {{../systemKey}} "${SCRIPT_DIR}/{{this}}" \
+  --environment "${ENVIRONMENT}" --controller "${CONTROLLER}" || exit 1
+{{/each}}
+
+echo "✅ Deployment complete"
+
+# Optional: Run tests
+if [ "${RUN_TESTS:-false}" = "true" ]; then
+  echo "🧪 Running integration tests..."
+  aifabrix test-integration {{systemKey}} --environment "${ENVIRONMENT}" --controller "${CONTROLLER}"
+fi
+

package/templates/external-system/external-datasource.json.hbs

@@ -3,7 +3,7 @@
   "displayName": "{{datasourceDisplayName}}",
   "description": "{{datasourceDescription}}",
   "systemKey": "{{systemKey}}",
-  "entityKey": "{{entityKey}}",
+  "entityType": "{{entityType}}",
   "resourceType": "{{resourceType}}",
   "enabled": true,
   "version": "1.0.0",
@@ -12,41 +12,60 @@
     "properties": {}
   },
   "fieldMappings": {
-    "accessFields": ["id", "name"],
-    "fields": {
+    "dimensions": {
+      {{#if dimensions}}
+      {{#each dimensions}}
+      "{{@key}}": "{{this}}"{{#unless @last}},{{/unless}}
+      {{/each}}
+      {{else}}
+      "country": "metadata.country",
+      "department": "metadata.department"
+      {{/if}}
+    },
+    "attributes": {
+      {{#if attributes}}
+      {{#each attributes}}
+      "{{@key}}": {
+        {{#each this}}
+        "{{@key}}": {{#if (eq @key "indexed")}}{{this}}{{else}}"{{this}}"{{/if}}{{#unless @last}},{{/unless}}
+        {{/each}}
+      }{{#unless @last}},{{/unless}}
+      {{/each}}
+      {{else}}
       "id": {
         "expression": "{{raw.id}}",
         "type": "string",
         "description": "Unique identifier",
-        "required": true
+        "indexed": true
       },
       "name": {
         "expression": "{{raw.name}}",
         "type": "string",
         "description": "Display name",
-        "required": true
+        "indexed": false
       }
+      {{/if}}
     }
   },
   "exposed": {
-    "fields": ["id", "name"],
-    "description": "Exposed fields for {{datasourceDisplayName}}"
+    "attributes": ["id", "name"],
+    "description": "Exposed attributes for {{datasourceDisplayName}}"
   }{{#if (eq systemType "openapi")}},
   "openapi": {
     "enabled": true,
     "documentKey": "{{systemKey}}-api",
     "baseUrl": "https://api.example.com",
-    "resourcePath": "/{{entityKey}}",
+    "resourcePath": "/{{entityType}}",
     "operations": {
       "list": {
-        "operationId": "list{{entityKey}}",
+        "operationId": "list{{entityType}}",
         "method": "GET",
-        "path": "/{{entityKey}}"
+        "path": "/{{entityType}}"
       },
       "get": {
-        "operationId": "get{{entityKey}}",
+        "operationId": "get{{entityType}}",
         "method": "GET",
-        "path": "/{{entityKey}}/{id}"
+        "path": "/{{entityType}}/{id}"
       }
     },
     "autoRbac": true