@deot/dev-shared 2.7.0 → 2.9.0

package/dist/index.cjs

@@ -43,8 +43,7 @@ const getHost = () => {
   return ips[0];
 };
 const formatBytes = (size, suffix = 2) => {
-  if (!size)
-    return "0B";
+  if (!size) return "0B";
   const base = 1024;
   const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
   const index = Math.floor(Math.log(size) / Math.log(base));
@@ -84,7 +83,7 @@ const logger = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 const SPACE = " ";
 const binDirectory = path__namespace.resolve(process.cwd(), "./node_modules/.bin");
 const toPromise = (target, promise) => {
-  let instance = target;
+  const instance = target;
   instance.then = (resolve, reject) => promise.then(resolve, reject);
   instance.catch = (callback) => promise.catch(callback);
   instance.finally = (callback) => promise.finally(callback);
@@ -104,7 +103,7 @@ const command = (command$, args) => {
   return v || [];
 };
 const exec = (command$, args, options) => {
-  let command$$ = command(command$, args).join(SPACE);
+  const command$$ = command(command$, args).join(SPACE);
   let reject;
   let resolve;
   const promise = new Promise((resolve$, reject$) => {
@@ -114,7 +113,11 @@ const exec = (command$, args, options) => {
   const subprocess = childProcess__namespace.exec(command$$, options, (error, stdout, stderr) => {
     process.off("beforeExit", handler);
     if (error) {
-      reject(error);
+      reject({
+        ...error,
+        stderr: stderr.toString(),
+        stdout: stdout.toString()
+      });
       return;
     }
     resolve({
@@ -132,11 +135,11 @@ const exec = (command$, args, options) => {
   return toPromise(subprocess, promise);
 };
 const spawn = (command$, args, options) => {
-  let [command$$, ...args$] = command(command$, args).map((i) => LOCAL_COMMAND_MAP[i] || i);
-  args$ = args$.map((i) => i.replace(/^['"]|['"]$/g, ""));
+  const [command$$, ...args$] = command(command$, args).map((i) => LOCAL_COMMAND_MAP[i] || i);
+  const args$$ = args$.map((i) => i.replace(/^['"]|['"]$/g, ""));
   const subprocess = childProcess__namespace.spawn(
     command$$,
-    args$,
+    args$$,
     {
       stdio: "inherit",
       ...options
@@ -145,7 +148,7 @@ const spawn = (command$, args, options) => {
   const promise = new Promise((resolve, reject) => {
     subprocess.on("close", (code) => {
       process.off("beforeExit", handler);
-      if (code === 0) {
+      if (typeof code === "number" && (code === 0 || code >= 128)) {
         resolve(code);
       } else {
         reject(code);
@@ -188,13 +191,13 @@ const getNormalizePackage = (dataMap) => {
   });
   const needUseMap = Object.keys(dataMap).reduce((pre, key) => (pre[key] = 0, pre), {});
   const queue = [];
-  for (let key in dataMap) {
+  for (const key in dataMap) {
     const dependencies = dataMap[key];
     dependencies.forEach((dependency) => {
       needUseMap[dependency] += 1;
     });
   }
-  for (let key in needUseMap) {
+  for (const key in needUseMap) {
     if (needUseMap[key] === 0) {
       queue.push(key);
     }
@@ -203,8 +206,7 @@ const getNormalizePackage = (dataMap) => {
   while (queue.length > 0) {
     const node = queue.shift();
     /* istanbul ignore next -- @preserve */
-    if (!node)
-      return [];
+    if (!node) return [];
     result.push(node);
     const dependencies = dataMap[node];
     for (let i = 0; i < dependencies.length; i++) {
@@ -228,17 +230,14 @@ const getPackageName = (packageFolderName$, cwd) => {
 const getPackageFolderName = (packageName$, cwd) => {
   const { workspace, packageFolderName, packageName } = impl(cwd);
   /* istanbul ignore next -- @preserve */
-  if (!workspace)
-    return "";
-  if (packageName$ === packageName)
-    return packageFolderName;
-  return packageName$?.replace(new RegExp(`${packageName}-?`), "");
+  if (!workspace) return "";
+  if (packageName$ === packageName) return packageFolderName;
+  return packageName$?.replace(new RegExp(`${packageName}-?`, "g"), "");
 };
 const getRealPackageName = (names, cwd) => {
   return names?.split(",").map((name) => {
     const { workspace, packageName, packageDir } = impl(cwd);
-    if (!workspace || !name || name === "*")
-      return name;
+    if (!workspace || !name || name === "*") return name;
     if (name.includes(packageName)) {
       name = getPackageFolderName(name);
     }
@@ -248,14 +247,13 @@ const getRealPackageName = (names, cwd) => {
     return "";
   }).filter((i) => !!i).join(",");
 };
-let configMap = {};
+const configMap = {};
 const impl = (cwd) => {
   cwd = cwd || cwd$;
-  if (configMap[cwd])
-    return configMap[cwd];
+  if (configMap[cwd]) return configMap[cwd];
   const rootPackageOptions = require$(`${cwd}/package.json`);
   let workspace = "packages";
-  let isMonorepo = fs__namespace.existsSync(path__namespace.resolve(cwd, workspace));
+  const isMonorepo = fs__namespace.existsSync(path__namespace.resolve(cwd, workspace));
   workspace = isMonorepo ? workspace : "";
   const packageFolderName = isMonorepo ? "index" : "";
   const packageDir = path__namespace.resolve(cwd, workspace);
@@ -279,8 +277,8 @@ const impl = (cwd) => {
     return pre;
   }, {});
   const packageRelation = packageFolderNames.reduce((pre, packageFolderName$) => {
-    let packagesOptions = packageOptionsMap[packageFolderName$];
-    let deps = {
+    const packagesOptions = packageOptionsMap[packageFolderName$];
+    const deps = {
       ...packagesOptions.dependencies || {},
       ...packagesOptions.devDependencies || {}
     };
@@ -288,7 +286,7 @@ const impl = (cwd) => {
     return pre;
   }, {});
   const subpackagesMap = packageFolderNames.reduce((pre, packageFolderName$) => {
-    let dir = path__namespace.resolve(packageDir, packageFolderName$);
+    const dir = path__namespace.resolve(packageDir, packageFolderName$);
     pre[packageFolderName$] = workspace && fs__namespace.existsSync(`${dir}/index.ts`) && !fs__namespace.existsSync(`${dir}/src`) ? fs__namespace.readdirSync(dir).filter((file) => {
       const fullpath = path__namespace.join(dir, file);
       const stat = fs__namespace.statSync(fullpath);

package/dist/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import * as childProcess from 'node:child_process';
 
 export declare interface AnyFunction<T = void> {

package/dist/index.js

@@ -18,8 +18,7 @@ const getHost = () => {
   return ips[0];
 };
 const formatBytes = (size, suffix = 2) => {
-  if (!size)
-    return "0B";
+  if (!size) return "0B";
   const base = 1024;
   const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
   const index = Math.floor(Math.log(size) / Math.log(base));
@@ -59,7 +58,7 @@ const logger = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 const SPACE = " ";
 const binDirectory = path.resolve(process.cwd(), "./node_modules/.bin");
 const toPromise = (target, promise) => {
-  let instance = target;
+  const instance = target;
   instance.then = (resolve, reject) => promise.then(resolve, reject);
   instance.catch = (callback) => promise.catch(callback);
   instance.finally = (callback) => promise.finally(callback);
@@ -79,7 +78,7 @@ const command = (command$, args) => {
   return v || [];
 };
 const exec = (command$, args, options) => {
-  let command$$ = command(command$, args).join(SPACE);
+  const command$$ = command(command$, args).join(SPACE);
   let reject;
   let resolve;
   const promise = new Promise((resolve$, reject$) => {
@@ -89,7 +88,11 @@ const exec = (command$, args, options) => {
   const subprocess = childProcess.exec(command$$, options, (error, stdout, stderr) => {
     process.off("beforeExit", handler);
     if (error) {
-      reject(error);
+      reject({
+        ...error,
+        stderr: stderr.toString(),
+        stdout: stdout.toString()
+      });
       return;
     }
     resolve({
@@ -107,11 +110,11 @@ const exec = (command$, args, options) => {
   return toPromise(subprocess, promise);
 };
 const spawn = (command$, args, options) => {
-  let [command$$, ...args$] = command(command$, args).map((i) => LOCAL_COMMAND_MAP[i] || i);
-  args$ = args$.map((i) => i.replace(/^['"]|['"]$/g, ""));
+  const [command$$, ...args$] = command(command$, args).map((i) => LOCAL_COMMAND_MAP[i] || i);
+  const args$$ = args$.map((i) => i.replace(/^['"]|['"]$/g, ""));
   const subprocess = childProcess.spawn(
     command$$,
-    args$,
+    args$$,
     {
       stdio: "inherit",
       ...options
@@ -120,7 +123,7 @@ const spawn = (command$, args, options) => {
   const promise = new Promise((resolve, reject) => {
     subprocess.on("close", (code) => {
       process.off("beforeExit", handler);
-      if (code === 0) {
+      if (typeof code === "number" && (code === 0 || code >= 128)) {
         resolve(code);
       } else {
         reject(code);
@@ -163,13 +166,13 @@ const getNormalizePackage = (dataMap) => {
   });
   const needUseMap = Object.keys(dataMap).reduce((pre, key) => (pre[key] = 0, pre), {});
   const queue = [];
-  for (let key in dataMap) {
+  for (const key in dataMap) {
     const dependencies = dataMap[key];
     dependencies.forEach((dependency) => {
       needUseMap[dependency] += 1;
     });
   }
-  for (let key in needUseMap) {
+  for (const key in needUseMap) {
     if (needUseMap[key] === 0) {
       queue.push(key);
     }
@@ -178,8 +181,7 @@ const getNormalizePackage = (dataMap) => {
   while (queue.length > 0) {
     const node = queue.shift();
     /* istanbul ignore next -- @preserve */
-    if (!node)
-      return [];
+    if (!node) return [];
     result.push(node);
     const dependencies = dataMap[node];
     for (let i = 0; i < dependencies.length; i++) {
@@ -203,17 +205,14 @@ const getPackageName = (packageFolderName$, cwd) => {
 const getPackageFolderName = (packageName$, cwd) => {
   const { workspace, packageFolderName, packageName } = impl(cwd);
   /* istanbul ignore next -- @preserve */
-  if (!workspace)
-    return "";
-  if (packageName$ === packageName)
-    return packageFolderName;
-  return packageName$?.replace(new RegExp(`${packageName}-?`), "");
+  if (!workspace) return "";
+  if (packageName$ === packageName) return packageFolderName;
+  return packageName$?.replace(new RegExp(`${packageName}-?`, "g"), "");
 };
 const getRealPackageName = (names, cwd) => {
   return names?.split(",").map((name) => {
     const { workspace, packageName, packageDir } = impl(cwd);
-    if (!workspace || !name || name === "*")
-      return name;
+    if (!workspace || !name || name === "*") return name;
     if (name.includes(packageName)) {
       name = getPackageFolderName(name);
     }
@@ -223,14 +222,13 @@ const getRealPackageName = (names, cwd) => {
     return "";
   }).filter((i) => !!i).join(",");
 };
-let configMap = {};
+const configMap = {};
 const impl = (cwd) => {
   cwd = cwd || cwd$;
-  if (configMap[cwd])
-    return configMap[cwd];
+  if (configMap[cwd]) return configMap[cwd];
   const rootPackageOptions = require$(`${cwd}/package.json`);
   let workspace = "packages";
-  let isMonorepo = fs.existsSync(path.resolve(cwd, workspace));
+  const isMonorepo = fs.existsSync(path.resolve(cwd, workspace));
   workspace = isMonorepo ? workspace : "";
   const packageFolderName = isMonorepo ? "index" : "";
   const packageDir = path.resolve(cwd, workspace);
@@ -254,8 +252,8 @@ const impl = (cwd) => {
     return pre;
   }, {});
   const packageRelation = packageFolderNames.reduce((pre, packageFolderName$) => {
-    let packagesOptions = packageOptionsMap[packageFolderName$];
-    let deps = {
+    const packagesOptions = packageOptionsMap[packageFolderName$];
+    const deps = {
       ...packagesOptions.dependencies || {},
       ...packagesOptions.devDependencies || {}
     };
@@ -263,7 +261,7 @@ const impl = (cwd) => {
     return pre;
   }, {});
   const subpackagesMap = packageFolderNames.reduce((pre, packageFolderName$) => {
-    let dir = path.resolve(packageDir, packageFolderName$);
+    const dir = path.resolve(packageDir, packageFolderName$);
     pre[packageFolderName$] = workspace && fs.existsSync(`${dir}/index.ts`) && !fs.existsSync(`${dir}/src`) ? fs.readdirSync(dir).filter((file) => {
       const fullpath = path.join(dir, file);
       const stat = fs.statSync(fullpath);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@deot/dev-shared",
-  "version": "2.7.0",
+  "version": "2.9.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "files": [