@naturalcycles/nodejs-lib 13.39.0 → 13.39.1

package/dist/bin/kpy.js

@@ -9,11 +9,11 @@ const runScript_1 = require("../script/runScript");
     const { _: [baseDir, ...inputPatterns], ...opt } = yargs_1.default.demandCommand(2).options({
         silent: {
             type: 'boolean',
-            descr: 'Suppress all text output', // todo: desc!
+            desc: 'Suppress all text output',
         },
         verbose: {
             type: 'boolean',
-            descr: 'Report progress on every file',
+            desc: 'Report progress on every file',
         },
         overwrite: {
             type: 'boolean',

package/dist/fs/fs2.d.ts

@@ -61,6 +61,12 @@ declare class FS2 {
     renamePathAsync(src: string, dest: string): Promise<void>;
     movePath(src: string, dest: string, opt?: fs.CopySyncOptions): void;
     movePathAsync(src: string, dest: string, opt?: fs.CopyOptions): Promise<void>;
+    /**
+     * Returns true if the path is a directory.
+     * Otherwise returns false.
+     * Doesn't throw, returns false instead.
+     */
+    isDirectory(filePath: string): boolean;
     fs: typeof fs;
     fsp: typeof fs.promises;
     lstat: fs.StatSyncFn;

package/dist/fs/fs2.js

@@ -279,6 +279,18 @@ class FS2 {
         await this.copyPathAsync(src, dest, opt);
         await this.removePathAsync(src);
     }
+    /**
+     * Returns true if the path is a directory.
+     * Otherwise returns false.
+     * Doesn't throw, returns false instead.
+     */
+    isDirectory(filePath) {
+        return (exports.fs2
+            .stat(filePath, {
+            throwIfNoEntry: false,
+        })
+            ?.isDirectory() || false);
+    }
     /*
     Returns a Readable of [already parsed] NDJSON objects.
   

package/dist/fs/kpy.js

@@ -8,7 +8,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("../colors/colors");
 const index_1 = require("../index");
 async function kpy(opt) {
-    const started = Date.now();
+    const started = js_lib_1.localTime.nowUnixMillis();
     kpyPrepare(opt);
     const filenames = await (0, index_1.fastGlob)(opt.inputPatterns, {
         cwd: opt.baseDir,
@@ -37,7 +37,7 @@ async function kpy(opt) {
     kpyLogResult(opt, filenames, started);
 }
 function kpySync(opt) {
-    const started = Date.now();
+    const started = js_lib_1.localTime.nowUnixMillis();
     kpyPrepare(opt);
     const filenames = index_1.fastGlob.sync(opt.inputPatterns, {
         cwd: opt.baseDir,
@@ -75,6 +75,19 @@ function kpyPrepare(opt) {
         return;
     }
     index_1.fs2.ensureDir(opt.outputDir);
+    // Expand directories (ex-globby feature), experimental!
+    const extraPatterns = [];
+    for (const pattern of opt.inputPatterns) {
+        if (pattern.includes('*'))
+            continue;
+        if (index_1.fs2.isDirectory(node_path_1.default.resolve(opt.baseDir, pattern))) {
+            extraPatterns.push(`${pattern}/**`);
+        }
+    }
+    if (opt.verbose) {
+        console.log({ extraPatterns });
+    }
+    opt.inputPatterns.push(...extraPatterns);
 }
 function kpyLogFilenames(opt, filenames) {
     if (opt.silent)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.39.0",
+  "version": "13.39.1",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -14,7 +14,9 @@
     "secrets-gen-key-debug": "tsn ./src/bin/secrets-gen-key.ts",
     "secrets-encrypt-debug": "tsn ./src/bin/secrets-encrypt.ts",
     "secrets-decrypt-debug": "tsn ./src/bin/secrets-decrypt.ts",
-    "kpy-debug": "tsn ./src/bin/kpy.ts node_modules dist",
+    "kpy-debug": "tsn ./src/bin/kpy.ts --verbose scripts tmp/scripts",
+    "kpy-debug2": "tsn ./src/bin/kpy.ts --verbose scripts bench non-ex non-ex/** colors* tmp/scripts",
+    "kpy-debug3": "tsn ./src/bin/kpy.ts --verbose src colors csv stream non-ex non-ex/** tmp/src",
     "json2env-debug": "tsn ./src/bin/json2env.ts ./src/test/someFile.json"
   },
   "dependencies": {

package/src/bin/kpy.ts

@@ -11,11 +11,11 @@ runScript(() => {
   } = yargs.demandCommand(2).options({
     silent: {
       type: 'boolean',
-      descr: 'Suppress all text output', // todo: desc!
+      desc: 'Suppress all text output',
     },
     verbose: {
       type: 'boolean',
-      descr: 'Report progress on every file',
+      desc: 'Report progress on every file',
     },
     overwrite: {
       type: 'boolean',

package/src/fs/fs2.ts

@@ -299,6 +299,21 @@ class FS2 {
     await this.removePathAsync(src)
   }
 
+  /**
+   * Returns true if the path is a directory.
+   * Otherwise returns false.
+   * Doesn't throw, returns false instead.
+   */
+  isDirectory(filePath: string): boolean {
+    return (
+      fs2
+        .stat(filePath, {
+          throwIfNoEntry: false,
+        })
+        ?.isDirectory() || false
+    )
+  }
+
   // Re-export the whole fs/fsp, for the edge cases where they are needed
   fs = fs
   fsp = fsp

package/src/fs/kpy.ts

@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { _since, UnixTimestampMillis } from '@naturalcycles/js-lib'
+import { _since, localTime, UnixTimestampMillis } from '@naturalcycles/js-lib'
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors'
 import { fastGlob, fs2 } from '../index'
 
@@ -43,7 +43,7 @@ export interface KpyOptions {
 }
 
 export async function kpy(opt: KpyOptions): Promise<void> {
-  const started = Date.now() as UnixTimestampMillis
+  const started = localTime.nowUnixMillis()
 
   kpyPrepare(opt)
 
@@ -82,7 +82,7 @@ export async function kpy(opt: KpyOptions): Promise<void> {
 }
 
 export function kpySync(opt: KpyOptions): void {
-  const started = Date.now() as UnixTimestampMillis
+  const started = localTime.nowUnixMillis()
 
   kpyPrepare(opt)
 
@@ -130,6 +130,21 @@ function kpyPrepare(opt: KpyOptions): void {
   }
 
   fs2.ensureDir(opt.outputDir)
+
+  // Expand directories (ex-globby feature), experimental!
+  const extraPatterns: string[] = []
+
+  for (const pattern of opt.inputPatterns) {
+    if (pattern.includes('*')) continue
+    if (fs2.isDirectory(path.resolve(opt.baseDir, pattern))) {
+      extraPatterns.push(`${pattern}/**`)
+    }
+  }
+
+  if (opt.verbose) {
+    console.log({ extraPatterns })
+  }
+  opt.inputPatterns.push(...extraPatterns)
 }
 
 function kpyLogFilenames(opt: KpyOptions, filenames: string[]): void {