jiek 2.3.3 → 2.3.4

package/dist/.internal/.chunks/{filterSupport.4rM7f6jB.cjs → getWD.Bdo2NGCR.cjs}

@@ -1,52 +1,28 @@
 'use strict';
 
+var process = require('node:process');
+var getWorkspaceDir = require('@jiek/utils/getWorkspaceDir');
 var fs = require('node:fs');
 var path = require('node:path');
-var process$1 = require('node:process');
 var commander = require('commander');
 var jsYaml = require('js-yaml');
-var getWorkspaceDir = require('@jiek/utils/getWorkspaceDir');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
+var process__default = /*#__PURE__*/_interopDefault(process);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
-var process__default = /*#__PURE__*/_interopDefault(process$1);
 
 var require$1 = require;
 
 let root;
 function getRoot() {
-  if (root) return root;
-  const rootOption = process.env.JIEK_ROOT;
-  root = rootOption ? path__default.default.isAbsolute(rootOption) ? rootOption : path__default.default.resolve(process.cwd(), rootOption) : void 0;
+  if (root != null) return root;
+  const rootOption = process__default.default.env.JIEK_ROOT;
+  root = rootOption != null ? path__default.default.isAbsolute(rootOption) ? rootOption : path__default.default.resolve(process__default.default.cwd(), rootOption) : void 0;
   return root;
 }
 
-let wd;
-let notWorkspace = false;
-function getWD() {
-  if (wd) return { wd, notWorkspace };
-  const root = getRoot();
-  if (root !== void 0) {
-    const isWorkspace = getWorkspaceDir.isWorkspaceDir(root, exports.type);
-    notWorkspace = !isWorkspace;
-    wd = root;
-    return { wd, notWorkspace };
-  }
-  try {
-    wd = getWorkspaceDir.getWorkspaceDir(exports.type);
-  } catch (e) {
-    if ("message" in e && e.message === "workspace root not found") {
-      wd = root ?? process.cwd();
-      notWorkspace = true;
-    } else {
-      throw e;
-    }
-  }
-  return { wd, notWorkspace };
-}
-
 exports.type = "";
 try {
   require$1.resolve("@pnpm/filter-workspace-packages");
@@ -108,6 +84,30 @@ async function getSelectedProjectsGraph(filter = commander.program.getOptionValu
   throw new Error(`not supported package manager ${exports.type}`);
 }
 
+let wd;
+let notWorkspace = false;
+function getWD() {
+  if (wd) return { wd, notWorkspace };
+  const root = getRoot();
+  if (root !== void 0) {
+    const isWorkspace = getWorkspaceDir.isWorkspaceDir(root, exports.type);
+    notWorkspace = !isWorkspace;
+    wd = root;
+    return { wd, notWorkspace };
+  }
+  try {
+    wd = getWorkspaceDir.getWorkspaceDir(exports.type);
+  } catch (e) {
+    if ("message" in e && e.message === "workspace root not found") {
+      wd = root ?? process__default.default.cwd();
+      notWorkspace = true;
+    } else {
+      throw e;
+    }
+  }
+  return { wd, notWorkspace };
+}
+
 exports.filterPackagesGraph = filterPackagesGraph;
 exports.getSelectedProjectsGraph = getSelectedProjectsGraph;
 exports.getWD = getWD;

package/dist/.internal/.chunks/{filterSupport.BXWpLBpT.js → getWD.DGvwAHMY.js}

@@ -1,45 +1,21 @@
+import process from 'node:process';
+import { isWorkspaceDir, getWorkspaceDir } from '@jiek/utils/getWorkspaceDir';
 import { createRequire } from 'node:module';
 import fs from 'node:fs';
 import path from 'node:path';
-import process$1 from 'node:process';
 import { program } from 'commander';
 import { load } from 'js-yaml';
-import { isWorkspaceDir, getWorkspaceDir } from '@jiek/utils/getWorkspaceDir';
 
 var require = /* @__PURE__ */ createRequire(import.meta.url);
 
 let root;
 function getRoot() {
-  if (root) return root;
+  if (root != null) return root;
   const rootOption = process.env.JIEK_ROOT;
-  root = rootOption ? path.isAbsolute(rootOption) ? rootOption : path.resolve(process.cwd(), rootOption) : void 0;
+  root = rootOption != null ? path.isAbsolute(rootOption) ? rootOption : path.resolve(process.cwd(), rootOption) : void 0;
   return root;
 }
 
-let wd;
-let notWorkspace = false;
-function getWD() {
-  if (wd) return { wd, notWorkspace };
-  const root = getRoot();
-  if (root !== void 0) {
-    const isWorkspace = isWorkspaceDir(root, type);
-    notWorkspace = !isWorkspace;
-    wd = root;
-    return { wd, notWorkspace };
-  }
-  try {
-    wd = getWorkspaceDir(type);
-  } catch (e) {
-    if ("message" in e && e.message === "workspace root not found") {
-      wd = root ?? process.cwd();
-      notWorkspace = true;
-    } else {
-      throw e;
-    }
-  }
-  return { wd, notWorkspace };
-}
-
 let type = "";
 try {
   require.resolve("@pnpm/filter-workspace-packages");
@@ -68,7 +44,7 @@ async function getSelectedProjectsGraph(filter = program.getOptionValue("filter"
       throw new Error("root path is workspace root, please provide a filter");
     }
     if (root === void 0) {
-      root = process$1.cwd();
+      root = process.cwd();
     }
     if (root !== wd && filter == null) {
       const packageJSONIsExist = fs.existsSync(path.resolve(root, "package.json"));
@@ -101,4 +77,28 @@ async function getSelectedProjectsGraph(filter = program.getOptionValue("filter"
   throw new Error(`not supported package manager ${type}`);
 }
 
+let wd;
+let notWorkspace = false;
+function getWD() {
+  if (wd) return { wd, notWorkspace };
+  const root = getRoot();
+  if (root !== void 0) {
+    const isWorkspace = isWorkspaceDir(root, type);
+    notWorkspace = !isWorkspace;
+    wd = root;
+    return { wd, notWorkspace };
+  }
+  try {
+    wd = getWorkspaceDir(type);
+  } catch (e) {
+    if ("message" in e && e.message === "workspace root not found") {
+      wd = root ?? process.cwd();
+      notWorkspace = true;
+    } else {
+      throw e;
+    }
+  }
+  return { wd, notWorkspace };
+}
+
 export { getSelectedProjectsGraph as a, filterPackagesGraph as f, getWD as g, require as r, type as t };

package/dist/.internal/.chunks/{loadConfig.OOKddvHF.cjs → loadConfig.8xhNFEJe.cjs}

@@ -1,8 +1,9 @@
 'use strict';
 
-var filterSupport = require('./filterSupport.4rM7f6jB.cjs');
+var filterSupport = require('./getWD.Bdo2NGCR.cjs');
 var fs = require('node:fs');
 var path = require('node:path');
+var process = require('node:process');
 var commander = require('commander');
 var jsYaml = require('js-yaml');
 
@@ -10,18 +11,19 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
+var process__default = /*#__PURE__*/_interopDefault(process);
 
 function packageIsExist(name) {
   try {
     filterSupport.require.resolve(name);
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 }
 exports.tsRegisterName = void 0;
 const registers = [
-  process.env.JIEK_TS_REGISTER,
+  process__default.default.env.JIEK_TS_REGISTER,
   "esbuild-register",
   "@swc-node/register",
   "ts-node/register"
@@ -35,15 +37,15 @@ for (const register of registers) {
 
 let configName = "jiek.config";
 function getConfigPath(root, dir) {
-  const isSupportTsLoader = !!exports.tsRegisterName;
+  const isSupportTsLoader = exports.tsRegisterName != null;
   function configWithExtIsExist(ext) {
     const filenames = [
-      path__default.default.resolve(process.cwd(), `${configName}.${ext}`),
-      path__default.default.resolve(process.cwd(), `.${configName}.${ext}`),
+      path__default.default.resolve(process__default.default.cwd(), `${configName}.${ext}`),
+      path__default.default.resolve(process__default.default.cwd(), `.${configName}.${ext}`),
       path__default.default.resolve(root, `${configName}.${ext}`),
       path__default.default.resolve(root, `.${configName}.${ext}`)
     ];
-    if (dir) {
+    if (dir != null) {
       filenames.unshift(...[
         path__default.default.resolve(dir, `${configName}.${ext}`),
         path__default.default.resolve(dir, `.${configName}.${ext}`)
@@ -54,7 +56,6 @@ function getConfigPath(root, dir) {
         return filename;
       }
     }
-    return;
   }
   configName = configWithExtIsExist("js") ?? configName;
   configName = configWithExtIsExist("json") ?? configName;
@@ -67,14 +68,15 @@ function getConfigPath(root, dir) {
 function loadConfig(dirOrOptions) {
   let dir;
   let root;
+  let configPath = commander.program.getOptionValue("configPath");
   if (typeof dirOrOptions === "object") {
     dir = dirOrOptions.dir;
     root = dirOrOptions.root ?? filterSupport.getWD().wd;
+    configPath = dirOrOptions.configPath ?? configPath;
   } else {
     dir = dirOrOptions;
     root = filterSupport.getWD().wd;
   }
-  let configPath = commander.program.getOptionValue("configPath");
   if (!configPath) {
     configPath = getConfigPath(root, dir);
   } else {
@@ -96,7 +98,7 @@ function loadConfig(dirOrOptions) {
     case ".yaml":
       return jsYaml.load(fs__default.default.readFileSync(configPath, "utf-8"));
     case ".ts":
-      if (exports.tsRegisterName) {
+      if (exports.tsRegisterName != null) {
         filterSupport.require(exports.tsRegisterName);
         module = filterSupport.require(configPath);
         break;
@@ -110,8 +112,24 @@ function loadConfig(dirOrOptions) {
     default:
       throw new Error(`unsupported config file type: ${ext}`);
   }
-  if (!module) throw new Error("config file is empty");
-  return module.default ?? module;
+  if (module == null) {
+    throw new Error("config file is empty");
+  }
+  if ("default" in module) {
+    if (module.default == null) {
+      throw new Error("config file is empty");
+    }
+    module = module.default;
+  }
+  if ("extends" in module && module.extends != null) {
+    const extendConfigPath = path__default.default.resolve(path__default.default.dirname(configPath), module.extends);
+    const extendConfig = loadConfig({ configPath: extendConfigPath });
+    module = {
+      ...extendConfig,
+      ...module
+    };
+  }
+  return module;
 }
 
 exports.loadConfig = loadConfig;

package/dist/.internal/.chunks/{loadConfig.CFfzkm_p.js → loadConfig.BjzxLOdC.js}

@@ -1,6 +1,7 @@
-import { r as require, g as getWD } from './filterSupport.BXWpLBpT.js';
+import { r as require, g as getWD } from './getWD.DGvwAHMY.js';
 import fs from 'node:fs';
 import path from 'node:path';
+import process from 'node:process';
 import { program } from 'commander';
 import { load } from 'js-yaml';
 
@@ -8,7 +9,7 @@ function packageIsExist(name) {
   try {
     require.resolve(name);
     return true;
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -28,7 +29,7 @@ for (const register of registers) {
 
 let configName = "jiek.config";
 function getConfigPath(root, dir) {
-  const isSupportTsLoader = !!tsRegisterName;
+  const isSupportTsLoader = tsRegisterName != null;
   function configWithExtIsExist(ext) {
     const filenames = [
       path.resolve(process.cwd(), `${configName}.${ext}`),
@@ -36,7 +37,7 @@ function getConfigPath(root, dir) {
       path.resolve(root, `${configName}.${ext}`),
       path.resolve(root, `.${configName}.${ext}`)
     ];
-    if (dir) {
+    if (dir != null) {
       filenames.unshift(...[
         path.resolve(dir, `${configName}.${ext}`),
         path.resolve(dir, `.${configName}.${ext}`)
@@ -47,7 +48,6 @@ function getConfigPath(root, dir) {
         return filename;
       }
     }
-    return;
   }
   configName = configWithExtIsExist("js") ?? configName;
   configName = configWithExtIsExist("json") ?? configName;
@@ -60,14 +60,15 @@ function getConfigPath(root, dir) {
 function loadConfig(dirOrOptions) {
   let dir;
   let root;
+  let configPath = program.getOptionValue("configPath");
   if (typeof dirOrOptions === "object") {
     dir = dirOrOptions.dir;
     root = dirOrOptions.root ?? getWD().wd;
+    configPath = dirOrOptions.configPath ?? configPath;
   } else {
     dir = dirOrOptions;
     root = getWD().wd;
   }
-  let configPath = program.getOptionValue("configPath");
   if (!configPath) {
     configPath = getConfigPath(root, dir);
   } else {
@@ -89,7 +90,7 @@ function loadConfig(dirOrOptions) {
     case ".yaml":
       return load(fs.readFileSync(configPath, "utf-8"));
     case ".ts":
-      if (tsRegisterName) {
+      if (tsRegisterName != null) {
         require(tsRegisterName);
         module = require(configPath);
         break;
@@ -103,8 +104,24 @@ function loadConfig(dirOrOptions) {
     default:
       throw new Error(`unsupported config file type: ${ext}`);
   }
-  if (!module) throw new Error("config file is empty");
-  return module.default ?? module;
+  if (module == null) {
+    throw new Error("config file is empty");
+  }
+  if ("default" in module) {
+    if (module.default == null) {
+      throw new Error("config file is empty");
+    }
+    module = module.default;
+  }
+  if ("extends" in module && module.extends != null) {
+    const extendConfigPath = path.resolve(path.dirname(configPath), module.extends);
+    const extendConfig = loadConfig({ configPath: extendConfigPath });
+    module = {
+      ...extendConfig,
+      ...module
+    };
+  }
+  return module;
 }
 
 export { loadConfig as l, tsRegisterName as t };