@hypernym/utils 1.1.0 → 1.2.0

package/dist/{node.cjs → node/index.cjs}

@@ -2,13 +2,13 @@
 
 var promises = require('node:fs/promises');
 var node_path = require('node:path');
-var formatBytes = require('../mix/format-bytes');
 
 async function exists(path) {
   return await promises.access(path, promises.constants.F_OK).then(() => true).catch(() => false);
 }
 
-async function getDirStats(dirPath, options) {
+async function getDirStats(path, options) {
+  const dirPath = node_path.resolve(path);
   const dirFiles = await promises.readdir(dirPath);
   const dirBase = node_path.basename(dirPath);
   let dirStats = [];
@@ -19,7 +19,7 @@ async function getDirStats(dirPath, options) {
   let fileIndex = -1;
   let subdirIndex = -1;
   for (const file of dirFiles) {
-    const filePath = node_path.resolve(dirPath, file);
+    const filePath = node_path.resolve(path, file);
     const fileStat = await promises.stat(filePath);
     if (fileStat.isDirectory()) {
       subdirIndex++;
@@ -29,20 +29,18 @@ async function getDirStats(dirPath, options) {
         base: file
       });
       if (options?.recursive) {
-        dirBase === dirPath ? dirBase : node_path.basename(filePath);
         const stats = await getDirStats(filePath);
         const updateDirStats = { ...stats[0], ...{ index: dirIndex++ } };
         dirStats = [...dirStats, updateDirStats];
       }
     } else {
       const { base, name, ext } = node_path.parse(file);
-      const path = filePath;
-      const size = formatBytes.formatBytes(fileStat.size);
+      const { size } = fileStat;
       fileIndex++;
-      dirSize += fileStat.size;
+      dirSize += size;
       fileList.push({
         index: fileIndex,
-        path,
+        path: filePath,
         base,
         name,
         ext,
@@ -54,12 +52,30 @@ async function getDirStats(dirPath, options) {
     index: dirIndex,
     path: dirPath,
     base: dirBase,
-    size: formatBytes.formatBytes(dirSize),
+    size: dirSize,
     subdirs: subdirList,
     files: fileList
   });
   return dirStats;
 }
 
+async function getDirFiles(path, options) {
+  const dirPath = node_path.resolve(path);
+  const dirFiles = await promises.readdir(dirPath, { withFileTypes: true });
+  let fileList = [];
+  for (const file of dirFiles) {
+    const filePath = node_path.resolve(path, file.name);
+    if (file.isDirectory()) {
+      if (options?.recursive) {
+        fileList = [...fileList, ...await getDirFiles(filePath)];
+      }
+    } else {
+      fileList.push(filePath);
+    }
+  }
+  return fileList;
+}
+
 exports.exists = exists;
+exports.getDirFiles = getDirFiles;
 exports.getDirStats = getDirStats;

package/dist/{node.d.ts → node/index.d.ts}

@@ -8,7 +8,7 @@ declare function exists(path: string): Promise<boolean>;
  *
  * By default, recursive mode is disabled so only one level is scanned.
  */
-declare function getDirStats(dirPath: string, options?: DirStatsOptions): Promise<DirStats[]>;
+declare function getDirStats(path: string, options?: DirStatsOptions): Promise<DirStats[]>;
 
 interface SubdirDetails {
     index: number;
@@ -21,13 +21,13 @@ interface FileDetails {
     base: string;
     name: string;
     ext: string;
-    size: string;
+    size: number;
 }
 interface DirStats {
     index: number;
     path: string;
     base: string;
-    size: string;
+    size: number;
     subdirs: SubdirDetails[];
     files: FileDetails[];
 }
@@ -35,4 +35,15 @@ interface DirStatsOptions {
     recursive?: boolean;
 }
 
-export { DirStats, DirStatsOptions, exists, getDirStats };
+/**
+ * Scans the specified directory and returns a list of all files.
+ *
+ * By default, recursive mode is disabled so only one level is scanned.
+ */
+declare function getDirFiles(path: string, options?: DirFilesOptions): Promise<string[]>;
+
+interface DirFilesOptions {
+    recursive?: boolean;
+}
+
+export { DirFilesOptions, DirStats, DirStatsOptions, exists, getDirFiles, getDirStats };

package/dist/{node.mjs → node/index.mjs}

@@ -1,12 +1,12 @@
 import { access, constants, readdir, stat } from 'node:fs/promises';
-import { basename, resolve, parse } from 'node:path';
-import { formatBytes } from '../mix/format-bytes';
+import { resolve, basename, parse } from 'node:path';
 
 async function exists(path) {
   return await access(path, constants.F_OK).then(() => true).catch(() => false);
 }
 
-async function getDirStats(dirPath, options) {
+async function getDirStats(path, options) {
+  const dirPath = resolve(path);
   const dirFiles = await readdir(dirPath);
   const dirBase = basename(dirPath);
   let dirStats = [];
@@ -17,7 +17,7 @@ async function getDirStats(dirPath, options) {
   let fileIndex = -1;
   let subdirIndex = -1;
   for (const file of dirFiles) {
-    const filePath = resolve(dirPath, file);
+    const filePath = resolve(path, file);
     const fileStat = await stat(filePath);
     if (fileStat.isDirectory()) {
       subdirIndex++;
@@ -27,20 +27,18 @@ async function getDirStats(dirPath, options) {
         base: file
       });
       if (options?.recursive) {
-        dirBase === dirPath ? dirBase : basename(filePath);
         const stats = await getDirStats(filePath);
         const updateDirStats = { ...stats[0], ...{ index: dirIndex++ } };
         dirStats = [...dirStats, updateDirStats];
       }
     } else {
       const { base, name, ext } = parse(file);
-      const path = filePath;
-      const size = formatBytes(fileStat.size);
+      const { size } = fileStat;
       fileIndex++;
-      dirSize += fileStat.size;
+      dirSize += size;
       fileList.push({
         index: fileIndex,
-        path,
+        path: filePath,
         base,
         name,
         ext,
@@ -52,11 +50,28 @@ async function getDirStats(dirPath, options) {
     index: dirIndex,
     path: dirPath,
     base: dirBase,
-    size: formatBytes(dirSize),
+    size: dirSize,
     subdirs: subdirList,
     files: fileList
   });
   return dirStats;
 }
 
-export { exists, getDirStats };
+async function getDirFiles(path, options) {
+  const dirPath = resolve(path);
+  const dirFiles = await readdir(dirPath, { withFileTypes: true });
+  let fileList = [];
+  for (const file of dirFiles) {
+    const filePath = resolve(path, file.name);
+    if (file.isDirectory()) {
+      if (options?.recursive) {
+        fileList = [...fileList, ...await getDirFiles(filePath)];
+      }
+    } else {
+      fileList.push(filePath);
+    }
+  }
+  return fileList;
+}
+
+export { exists, getDirFiles, getDirStats };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypernym/utils",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "author": "Hypernym Studio",
   "maintainers": [
     "Ivo Dolenc (https://github.com/ivodolenc)"
@@ -11,19 +11,19 @@
   "repository": "hypernym-studio/utils",
   "homepage": "https://github.com/hypernym-studio/utils",
   "type": "module",
-  "main": "./dist/utils.cjs",
-  "module": "./dist/utils.mjs",
-  "types": "./dist/utils.d.ts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/utils.d.ts",
-      "import": "./dist/utils.mjs",
-      "require": "./dist/utils.cjs"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
     },
     "./node": {
-      "types": "./dist/node.d.ts",
-      "import": "./dist/node.mjs",
-      "require": "./dist/node.cjs"
+      "types": "./dist/node/index.d.ts",
+      "import": "./dist/node/index.mjs",
+      "require": "./dist/node/index.cjs"
     }
   },
   "files": [
@@ -59,7 +59,7 @@
     "rollup-plugin-dts": "^5.3.0",
     "rollup-plugin-esbuild": "^5.0.0",
     "typescript": "^5.0.4",
-    "vite": "^4.4.2",
+    "vite": "^4.4.3",
     "vite-node": "^0.33.0",
     "vitest": "^0.33.0"
   },