@zohodesk/unit-testing-framework 0.0.29-experimental → 0.0.30-experimental

package/build/src/config/config-loader.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deepMerge = deepMerge;
+exports.loadUserConfig = loadUserConfig;
+exports.resolveConfig = resolveConfig;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _defaultConfig = require("./default-config.js");
+var _logger = require("../utils/logger.js");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+const CONFIG_FILE_NAMES = ['ut.config.js', 'ut.config.mjs', 'ut.config.json'];
+function isPlainObject(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+function deepMerge(target, source) {
+  const result = {
+    ...target
+  };
+  for (const key of Object.keys(source)) {
+    const targetVal = target[key];
+    const sourceVal = source[key];
+    if (Array.isArray(targetVal) && Array.isArray(sourceVal)) {
+      result[key] = [...targetVal, ...sourceVal];
+    } else if (isPlainObject(targetVal) && isPlainObject(sourceVal)) {
+      result[key] = deepMerge(targetVal, sourceVal);
+    } else {
+      result[key] = sourceVal;
+    }
+  }
+  return result;
+}
+async function loadUserConfig(projectRoot, configPath) {
+  let resolvedPath = null;
+  if (configPath) {
+    resolvedPath = _path.default.resolve(projectRoot, configPath);
+    if (!_fs.default.existsSync(resolvedPath)) {
+      _logger.Logger.error(`Config file not found: ${resolvedPath}`);
+      return null;
+    }
+  } else {
+    for (const fileName of CONFIG_FILE_NAMES) {
+      const candidate = _path.default.resolve(projectRoot, fileName);
+      if (_fs.default.existsSync(candidate)) {
+        resolvedPath = candidate;
+        _logger.Logger.info(`Auto-discovered config: ${fileName}`);
+        break;
+      }
+    }
+  }
+  if (!resolvedPath) {
+    return null;
+  }
+  if (resolvedPath.endsWith('.json')) {
+    const raw = _fs.default.readFileSync(resolvedPath, 'utf-8');
+    return JSON.parse(raw);
+  }
+
+  // .js or .mjs — use dynamic import
+  const module = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(resolvedPath);
+  return module.default || module;
+}
+async function resolveConfig(projectRoot, configPath) {
+  const defaultConfig = (0, _defaultConfig.getDefaultConfig)(projectRoot);
+  const userConfig = await loadUserConfig(projectRoot, configPath);
+  if (userConfig) {
+    _logger.Logger.info('Merging user config with default config');
+    return userConfig;
+  }
+  return defaultConfig;
+}

package/build/src/runner/jest-runner.js

@@ -4,21 +4,47 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = createJestRunner;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
 var _runnerBase = require("./runner-base.js");
-var _defaultConfig = require("../config/default-config.js");
+var _configLoader = require("../config/config-loader.js");
+var _logger = require("../utils/logger.js");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function resolveTestFiles(testFiles, projectRoot) {
+  const files = testFiles.split(',').map(f => f.trim()).filter(Boolean);
+  const resolved = [];
+  for (const file of files) {
+    const abs = _path.default.resolve(projectRoot, file);
+    if (_fs.default.existsSync(abs)) {
+      resolved.push(abs);
+    } else {
+      _logger.Logger.error(`Test file not found: ${abs}`);
+    }
+  }
+  if (resolved.length === 0) {
+    return null;
+  }
+  return resolved;
+}
 async function createJestRunner(options = {}) {
   const {
     projectRoot = process.cwd(),
+    testFiles,
     testPathPattern,
-    watch = false // Re-runs tests automatically when source files change
+    configPath,
+    watch = false
   } = options;
 
-  // ── 1. Build framework-controlled config ───────────────────
-  const config = (0, _defaultConfig.getDefaultConfig)(projectRoot);
+  // ── 1. Resolve config (auto-discover / configPath / default) ──
+  const config = await (0, _configLoader.resolveConfig)(projectRoot, configPath);
 
-  // ── 2. Build argv & run Jest ───────────────────────────────
+  // ── 2. Resolve test file pattern ──────────────────────────────
+  const rawPattern = testFiles || testPathPattern;
+  const pattern = rawPattern && rawPattern.includes(',') ? resolveTestFiles(rawPattern, projectRoot) : rawPattern;
+
+  // ── 3. Build argv & run Jest ──────────────────────────────────
   const argv = (0, _runnerBase.buildArgv)(config, {
-    testPathPattern,
+    testMatch: pattern,
     watch,
     projectRoot
   });

package/build/src/runner/runner-base.js

@@ -7,15 +7,15 @@ exports.buildArgv = buildArgv;
 exports.executeJest = executeJest;
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function buildArgv(config, {
-  testPathPattern,
+  testMatch,
   watch = false
 }) {
   const argv = {
     config: JSON.stringify(config),
     watch
   };
-  if (testPathPattern) {
-    argv.testPathPatterns = [testPathPattern];
+  if (testMatch) {
+    argv.testMatch = testMatch;
   }
   return argv;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/unit-testing-framework",
-  "version": "0.0.29-experimental",
+  "version": "0.0.30-experimental",
   "description": "A modular Jest-based unit testing framework",
   "main": "./build/index.js",
   "exports": {
@@ -25,11 +25,11 @@
     "@jest/types": "30.2.0",
     "babel-jest": "30.2.0",
     "jest-environment-jsdom": "30.2.0",
-    "jest-html-reporter": "4.3.0"
+    "jest-html-reporter": "4.3.0",
+    "jest": "30.2.0"
   },
   "devDependencies": {
     "@babel/cli": "7.28.6",
-    "@babel/plugin-transform-modules-commonjs": "7.28.6",
-    "jest": "30.2.0"
+    "@babel/plugin-transform-modules-commonjs": "7.28.6"
   }
 }