@naturalcycles/nodejs-lib 12.93.1 → 12.94.0

package/dist/bin/del.js

@@ -22,5 +22,5 @@ const script_1 = require("../script");
             type: 'number',
         },
     }).argv;
-    await (0, del_1.del)({ patterns: patterns, ...opt });
+    (0, del_1.delSync)({ patterns: patterns, ...opt });
 });

package/dist/fs/del.js

@@ -43,7 +43,9 @@ async function del(_opt) {
     }
     if (dry)
         return;
-    await (0, js_lib_1.pMap)(filenames, filepath => fsp.unlink(filepath), { concurrency });
+    await (0, js_lib_1.pMap)(filenames, filepath => fsp.rm(filepath, {
+        force: true,
+    }), { concurrency });
     // 2. glob only dirs, expand, delete only empty!
     let dirnames = await (0, index_1.globby)(patterns, {
         dot: true,
@@ -60,7 +62,7 @@ async function del(_opt) {
     for await (const dirpath of dirnamesSorted) {
         if (await isEmptyDir(dirpath)) {
             // console.log(`empty dir: ${dirpath}`)
-            await fsp.unlink(dirpath);
+            await fsp.rm(dirpath, { force: true, recursive: true });
             deletedDirs.push(dirpath);
         }
     }
@@ -98,7 +100,7 @@ function delSync(_opt) {
     }
     if (dry)
         return;
-    filenames.forEach(filepath => fs.unlinkSync(filepath));
+    filenames.forEach(filepath => fs.rmSync(filepath, { force: true }));
     // 2. glob only dirs, expand, delete only empty!
     let dirnames = index_1.globby.sync(patterns, {
         dot: true,
@@ -113,7 +115,7 @@ function delSync(_opt) {
     for (const dirpath of dirnamesSorted) {
         if (isEmptyDirSync(dirpath)) {
             // console.log(`empty dir: ${dirpath}`)
-            fs.unlinkSync(dirpath);
+            fs.rmSync(dirpath, { force: true, recursive: true });
             deletedDirs.push(dirpath);
         }
     }

package/dist/validation/joi/joi.validation.util.js

@@ -110,17 +110,23 @@ function createError(value, err, objectName) {
         tokens.push('Invalid ' + [objectName, objectId].filter(Boolean).join('.'));
     }
     const annotation = err.annotate(stripColors);
-    if (annotation.length > 4000) {
-        // Annotation message is too big and will be replaced by stringified `error.details` instead
-        tokens.push((0, js_lib_1._truncateMiddle)(annotation, 4000, `\n... ${(0, js_lib_1._hb)(annotation.length)} message truncated ...\n`));
+    if (annotation.length > 100) {
+        // For rather large annotations - we include up to 5 errors up front, before printing the whole object.
         // Up to 5 `details`
-        tokens.push(...err.details.slice(0, 5).map(i => `${i.message} @ .${i.path.join('.')}`));
+        tokens.push(...err.details.slice(0, 5).map(i => {
+            return i.message;
+            // Currently not specifying the path, to not "overwhelm" the message
+            // Can be reverted if needed.
+            // let msg = i.message
+            // const paths = i.path.filter(Boolean).join('.')
+            // if (paths) msg += ` @ .${paths}`
+            // return msg
+        }));
         if (err.details.length > 5)
-            tokens.push(`... ${err.details.length} errors`);
-    }
-    else {
-        tokens.push(annotation);
+            tokens.push(`... ${err.details.length} errors in total`);
+        tokens.push('');
     }
+    tokens.push((0, js_lib_1._truncateMiddle)(annotation, 4000, `\n... ${(0, js_lib_1._hb)(annotation.length)} message truncated ...\n`));
     const msg = tokens.join('\n');
     const data = {
         joiValidationErrorItems: err.details,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.93.1",
+  "version": "12.94.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

package/src/bin/del.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import * as yargs from 'yargs'
-import { del } from '../fs/del'
+import { delSync } from '../fs/del'
 import { runScript } from '../script'
 
 runScript(async () => {
@@ -23,5 +23,5 @@ runScript(async () => {
     },
   }).argv
 
-  await del({ patterns: patterns as string[], ...opt })
+  delSync({ patterns: patterns as string[], ...opt })
 })

package/src/fs/del.ts

@@ -71,7 +71,14 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
 
   if (dry) return
 
-  await pMap(filenames, filepath => fsp.unlink(filepath), { concurrency })
+  await pMap(
+    filenames,
+    filepath =>
+      fsp.rm(filepath, {
+        force: true,
+      }),
+    { concurrency },
+  )
 
   // 2. glob only dirs, expand, delete only empty!
   let dirnames = await globby(patterns, {
@@ -95,7 +102,7 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
   for await (const dirpath of dirnamesSorted) {
     if (await isEmptyDir(dirpath)) {
       // console.log(`empty dir: ${dirpath}`)
-      await fsp.unlink(dirpath)
+      await fsp.rm(dirpath, { force: true, recursive: true })
       deletedDirs.push(dirpath)
     }
   }
@@ -145,7 +152,7 @@ export function delSync(_opt: DelOptions | DelSingleOption): void {
 
   if (dry) return
 
-  filenames.forEach(filepath => fs.unlinkSync(filepath))
+  filenames.forEach(filepath => fs.rmSync(filepath, { force: true }))
 
   // 2. glob only dirs, expand, delete only empty!
   let dirnames = globby.sync(patterns, {
@@ -167,7 +174,7 @@ export function delSync(_opt: DelOptions | DelSingleOption): void {
   for (const dirpath of dirnamesSorted) {
     if (isEmptyDirSync(dirpath)) {
       // console.log(`empty dir: ${dirpath}`)
-      fs.unlinkSync(dirpath)
+      fs.rmSync(dirpath, { force: true, recursive: true })
       deletedDirs.push(dirpath)
     }
   }

package/src/validation/joi/joi.validation.util.ts

@@ -146,21 +146,30 @@ function createError(value: any, err: ValidationError, objectName?: string): Joi
 
   const annotation = err.annotate(stripColors)
 
-  if (annotation.length > 4000) {
-    // Annotation message is too big and will be replaced by stringified `error.details` instead
+  if (annotation.length > 100) {
+    // For rather large annotations - we include up to 5 errors up front, before printing the whole object.
 
+    // Up to 5 `details`
     tokens.push(
-      _truncateMiddle(annotation, 4000, `\n... ${_hb(annotation.length)} message truncated ...\n`),
+      ...err.details.slice(0, 5).map(i => {
+        return i.message
+        // Currently not specifying the path, to not "overwhelm" the message
+        // Can be reverted if needed.
+        // let msg = i.message
+        // const paths = i.path.filter(Boolean).join('.')
+        // if (paths) msg += ` @ .${paths}`
+        // return msg
+      }),
     )
 
-    // Up to 5 `details`
-    tokens.push(...err.details.slice(0, 5).map(i => `${i.message} @ .${i.path.join('.')}`))
-
-    if (err.details.length > 5) tokens.push(`... ${err.details.length} errors`)
-  } else {
-    tokens.push(annotation)
+    if (err.details.length > 5) tokens.push(`... ${err.details.length} errors in total`)
+    tokens.push('')
   }
 
+  tokens.push(
+    _truncateMiddle(annotation, 4000, `\n... ${_hb(annotation.length)} message truncated ...\n`),
+  )
+
   const msg = tokens.join('\n')
 
   const data: JoiValidationErrorData = {