build(deps): bump @flex-development/tutils from 6.0.0-alpha.10 to 6.0.0-alpha.12

unicornware · unicornware · commit bb8d48a2cef4 · 2023-07-27T13:30:25.000-04:00
Signed-off-by: Lexus Drumgold &lt;unicornware@flexdevelopment.llc&gt;
diff --git a/README.md b/README.md
@@ -583,7 +583,7 @@ constructor arguments are passed to [`util.format`][15] instead.
 
 - `{ErrorCode}` **`code`** &mdash; Node.js error code
 - `{B extends ErrorConstructor}` **`Base`** &mdash; Error base class
-- `{M extends any[] | MessageFn | string}` **`message`** &mdash; Error message or message function
+- `{M extends MessageFn | unknown[] | string}` **`message`** &mdash; Error message or message function
 - **Returns**: `{NodeErrorConstructor<B, M>}` `NodeError` constructor
 
 > **Source**: [`src/create-node-error.ts`](src/create-node-error.ts)
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "typecheck:watch": "vitest typecheck"
   },
   "dependencies": {
-    "@flex-development/tutils": "6.0.0-alpha.10",
+    "@flex-development/tutils": "6.0.0-alpha.12",
     "node-inspect-extracted": "2.0.2"
   },
   "devDependencies": {
@@ -171,7 +171,7 @@
   },
   "resolutions": {
     "@ardatan/sync-fetch": "larsgw/sync-fetch#head=worker_threads",
-    "@flex-development/tutils": "6.0.0-alpha.10"
+    "@flex-development/tutils": "6.0.0-alpha.12"
   },
   "engines": {
     "node": ">=16.20.0",
diff --git a/src/internal/format-list.ts b/src/internal/format-list.ts
@@ -4,6 +4,8 @@
  * @see https://github.com/nodejs/node/blob/0f69ec4dd74d446765639274728466baf5f13cdd/lib/internal/errors.js#L905-L908
  */
 
+import { join } from '@flex-development/tutils'
+
 /**
  * Creates a list string in the form `'A and B'` or `'A, B, ..., and Z`.
  *
@@ -23,8 +25,8 @@
  */
 function formatList(arr: string[], transition: string = 'and'): string {
   return arr.length < 3
-    ? arr.join(` ${transition} `)
-    : `${arr.slice(0, -1).join(', ')}, ${transition} ${arr[arr.length - 1]}`
+    ? join(arr, ` ${transition} `)
+    : `${join(arr.slice(0, -1), ', ')}, ${transition} ${arr[arr.length - 1]}`
 }
 
 export default formatList
diff --git a/src/internal/prepare-stack-trace.ts b/src/internal/prepare-stack-trace.ts
@@ -4,6 +4,7 @@
  */
 
 import type { NodeError } from '#src/types'
+import { regexp } from '@flex-development/tutils'
 
 /**
  * Adds a stack trace to the given `error`.
@@ -23,19 +24,7 @@ function prepareStackTrace<T extends Error = Error>(
 
   // make sure stack trace is formatted properly
   error.stack = error.stack!.replace(
-    new RegExp(
-      `^${error.name}: ${error.message
-        /*
-         * Escape characters with special meaning, either inside or outside
-         * character sets.
-         *
-         * A simple backslash escape is used when it’s always valid; a `\xnn`
-         * escape is used when the simpler form would be disallowed by stricter
-         * unicode patterns.
-         */
-        .replace(/[$()*+.?[\\\]^{|}]/g, '\\$&')
-        .replace(/-/g, '\\x2d')}`
-    ),
+    new RegExp(`^${error.name}: ${regexp(error.message)}`),
     error.toString()
   )
 
diff --git a/src/models/err-invalid-arg-type.ts b/src/models/err-invalid-arg-type.ts
@@ -8,7 +8,13 @@ import { ErrorCode } from '#src/enums'
 import formatList from '#src/internal/format-list'
 import type { MessageFn, NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError, determineSpecificType } from '#src/utils'
-import type { OneOrMany } from '@flex-development/tutils'
+import {
+  DOT,
+  includes,
+  isArray,
+  lowercase,
+  type OneOrMany
+} from '@flex-development/tutils'
 
 /**
  * `ERR_INVALID_ARG_TYPE` model.
@@ -47,7 +53,7 @@ const ERR_INVALID_ARG_TYPE: NodeErrorConstructor<
     if (typeof name !== 'string') throw new TypeError("'name' must be a string")
 
     // ensure expected is an array
-    if (!Array.isArray(expected)) expected = [expected]
+    if (!isArray(expected)) expected = [expected]
 
     /**
      * Primitive value names.
@@ -78,7 +84,7 @@ const ERR_INVALID_ARG_TYPE: NodeErrorConstructor<
     // stylize invalid argument name
     msg += name.endsWith(' argument')
       ? name
-      : `'${name}' ${name.includes('.') ? 'property' : 'argument'}`
+      : `'${name}' ${includes(name, DOT) ? 'property' : 'argument'}`
 
     // continue building error message
     msg += ' must be '
@@ -151,7 +157,7 @@ const ERR_INVALID_ARG_TYPE: NodeErrorConstructor<
         msg += `one of ${formatList(other, 'or')}`
       } else {
         /* c8 ignore next */
-        if (other[0]!.toLowerCase() !== other[0]) msg += 'an '
+        if (lowercase(other[0]!) !== other[0]) msg += 'an '
         msg += `${other[0]}`
       }
     }
diff --git a/src/models/err-invalid-arg-value.ts b/src/models/err-invalid-arg-value.ts
@@ -7,6 +7,7 @@
 import { ErrorCode } from '#src/enums'
 import type { MessageFn, NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError } from '#src/utils'
+import { DOT, includes, truncate } from '@flex-development/tutils'
 import { inspect } from 'node-inspect-extracted'
 
 /**
@@ -58,16 +59,16 @@ const ERR_INVALID_ARG_VALUE: NodeErrorConstructor<
     let ret: string = 'The'
 
     // trim inspected value
-    if (inspected.length > 128) inspected = inspected.slice(0, 128) + '...'
+    if (inspected.length > 128) inspected = truncate(inspected, 131)
 
     // add stylized invalid argument or property name
-    ret += ` ${name.includes('.') ? 'property' : 'argument'} '${name}'`
+    ret += ` ${includes(name, DOT) ? 'property' : 'argument'} '${name}'`
 
     // add reason for error
     if (reason) ret += ` ${reason}`
 
     // add inspected value
-    ret += `. Received ${inspected}`
+    ret += `${DOT} Received ${inspected}`
 
     return ret
   }
diff --git a/src/models/err-invalid-module-specifier.ts b/src/models/err-invalid-module-specifier.ts
@@ -7,6 +7,7 @@
 import { ErrorCode } from '#src/enums'
 import type { MessageFn, NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError } from '#src/utils'
+import { trimEnd } from '@flex-development/tutils'
 
 /**
  * `ERR_INVALID_MODULE_SPECIFIER` model.
@@ -45,7 +46,7 @@ const ERR_INVALID_MODULE_SPECIFIER: NodeErrorConstructor<
      *
      * @var {string} ret
      */
-    let ret: string = `Invalid module '${request}' ${reason}`.trimEnd()
+    let ret: string = trimEnd(`Invalid module '${request}' ${reason}`)
 
     // add details regarding where error occurred
     if (base) ret += ` imported from ${base}`
diff --git a/src/models/err-invalid-package-config.ts b/src/models/err-invalid-package-config.ts
@@ -7,6 +7,7 @@
 import { ErrorCode } from '#src/enums'
 import type { MessageFn, NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError } from '#src/utils'
+import { DOT } from '@flex-development/tutils'
 
 /**
  * `ERR_INVALID_PACKAGE_CONFIG` model.
@@ -54,7 +55,7 @@ const ERR_INVALID_PACKAGE_CONFIG: NodeErrorConstructor<
     if (base) ret += ` while importing ${base}`
 
     // add reason package config is invalid
-    if (reason) ret += `. ${reason}`
+    if (reason) ret += `${DOT} ${reason}`
 
     return ret
   }
diff --git a/src/models/err-invalid-package-target.ts b/src/models/err-invalid-package-target.ts
@@ -7,6 +7,7 @@
 import { ErrorCode } from '#src/enums'
 import type { MessageFn, NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError } from '#src/utils'
+import { DOT, ifelse } from '@flex-development/tutils'
 
 /**
  * `ERR_INVALID_PACKAGE_TARGET` model.
@@ -63,14 +64,14 @@ const ERR_INVALID_PACKAGE_TARGET: NodeErrorConstructor<
      *
      * @const {boolean} main
      */
-    const main: boolean = !internal && key === '.'
+    const main: boolean = !internal && key === DOT
 
     /**
      * Error message.
      *
      * @var {string} ret
      */
-    let ret: string = `Invalid "${internal ? 'imports' : 'exports'}"`
+    let ret: string = `Invalid "${ifelse(internal, 'imports', 'exports')}"`
 
     // include if package target is main entry point
     if (main) ret += ' main'
@@ -89,8 +90,8 @@ const ERR_INVALID_PACKAGE_TARGET: NodeErrorConstructor<
 
     // add reason package target is invalid
     ret +=
-      typeof target === 'string' && !internal && !target.startsWith('./')
-        ? '; targets must start with "./"'
+      typeof target === 'string' && !internal && !target.startsWith(`${DOT}/`)
+        ? `; targets must start with "${DOT}/"`
         : ''
 
     return ret
diff --git a/src/models/err-package-path-not-exported.ts b/src/models/err-package-path-not-exported.ts
@@ -7,6 +7,7 @@
 import { ErrorCode } from '#src/enums'
 import type { NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError } from '#src/utils'
+import { DOT } from '@flex-development/tutils'
 
 /**
  * `ERR_PACKAGE_PATH_NOT_EXPORTED` model.
@@ -48,7 +49,7 @@ const ERR_PACKAGE_PATH_NOT_EXPORTED: NodeErrorConstructor<
      * @var {string} message
      */
     let message: string =
-      subpath === '.'
+      subpath === DOT
         ? "No 'exports' main defined in"
         : `Package subpath '${subpath}' is not defined by 'exports' in`
 
diff --git a/src/models/err-unknown-file-extension.ts b/src/models/err-unknown-file-extension.ts
@@ -7,6 +7,7 @@
 import { ErrorCode } from '#src/enums'
 import type { MessageFn, NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError } from '#src/utils'
+import { DOT } from '@flex-development/tutils'
 
 /**
  * `ERR_UNKNOWN_FILE_EXTENSION` model.
@@ -48,7 +49,7 @@ const ERR_UNKNOWN_FILE_EXTENSION: NodeErrorConstructor<
     let message: string = `Unknown file extension '${ext}' for ${id}`
 
     // add recommended fix
-    if (suggestion) message += `. ${suggestion}`
+    if (suggestion) message += `${DOT} ${suggestion}`
 
     return message
   }
diff --git a/src/models/err-unsupported-esm-url-scheme.ts b/src/models/err-unsupported-esm-url-scheme.ts
@@ -8,6 +8,7 @@ import { ErrorCode } from '#src/enums'
 import formatList from '#src/internal/format-list'
 import type { NodeError, NodeErrorConstructor } from '#src/types'
 import { createNodeError } from '#src/utils'
+import { DOT } from '@flex-development/tutils'
 import type { URL } from 'node:url'
 
 /**
@@ -58,11 +59,11 @@ const ERR_UNSUPPORTED_ESM_URL_SCHEME: NodeErrorConstructor<
 
     // add additional error details if operating system is windows
     if (windows && url.protocol.length === 2) {
-      message += '. On Windows, absolute paths must be valid file:// URLs'
+      message += `${DOT} On Windows, absolute paths must be valid file:// URLs`
     }
 
     // add url scheme provided by user
-    message += `. Received protocol '${url.protocol}'`
+    message += `${DOT} Received protocol '${url.protocol}'`
 
     return message
   }
diff --git a/src/types/__tests__/node-error-constructor.spec-d.ts b/src/types/__tests__/node-error-constructor.spec-d.ts
@@ -3,33 +3,11 @@
  * @module errnode/types/tests/unit-d/NodeErrorConstructor
  */
 
+import type { Times } from '@flex-development/tutils'
 import type NodeError from '../node-error'
 import type TestSubject from '../node-error-constructor'
 
 describe('unit-d:types/NodeErrorConstructor', () => {
-  it('should extract parameters of type any[] if M extends string', () => {
-    expectTypeOf<TestSubject>().parameters.toEqualTypeOf<any[]>()
-    expectTypeOf<TestSubject>().constructorParameters.toEqualTypeOf<any[]>()
-  })
-
-  it('should extract parameters of type M if M extends any[]', () => {
-    // Arrange
-    type B = ErrorConstructor
-    type M = [string, string, string]
-
-    expectTypeOf<TestSubject<B, M>>().parameters.toEqualTypeOf<M>()
-    expectTypeOf<TestSubject<B, M>>().constructorParameters.toEqualTypeOf<M>()
-  })
-
-  it('should extract parameters of type Parameters<M> if M extends MessageFn', () => {
-    type B = TypeErrorConstructor
-    type M = (ext: string, path: string) => string
-    type P = Parameters<M>
-
-    expectTypeOf<TestSubject<B, M>>().parameters.toEqualTypeOf<P>()
-    expectTypeOf<TestSubject<B, M>>().constructorParameters.toEqualTypeOf<P>()
-  })
-
   it('should match [prototype: NodeError<T>]', () => {
     expectTypeOf<TestSubject>()
       .toHaveProperty('prototype')
@@ -45,4 +23,42 @@ describe('unit-d:types/NodeErrorConstructor', () => {
       NodeError<TypeError>
     >()
   })
+
+  describe('M extends MessageFn', () => {
+    it('should be callable with Parameters<M>', () => {
+      // Arrange
+      type B = TypeErrorConstructor
+      type M = (ext: string, path: string) => string
+      type P = Parameters<M>
+
+      // Expect
+      expectTypeOf<TestSubject<B, M>>().parameters.toEqualTypeOf<P>()
+      expectTypeOf<TestSubject<B, M>>().constructorParameters.toEqualTypeOf<P>()
+    })
+  })
+
+  describe('M extends string', () => {
+    it('should be callable with any[]', () => {
+      // Arrange
+      type B = ErrorConstructor
+      type M = string
+      type P = any[]
+
+      // Expect
+      expectTypeOf<TestSubject<B, M>>().parameters.toEqualTypeOf<P>()
+      expectTypeOf<TestSubject<B, M>>().constructorParameters.toEqualTypeOf<P>()
+    })
+  })
+
+  describe('M extends unknown[]', () => {
+    it('should be callable with M', () => {
+      // Arrange
+      type B = ErrorConstructor
+      type M = Times<3, string>
+
+      // Expect
+      expectTypeOf<TestSubject<B, M>>().parameters.toEqualTypeOf<M>()
+      expectTypeOf<TestSubject<B, M>>().constructorParameters.toEqualTypeOf<M>()
+    })
+  })
 })
diff --git a/src/types/node-error-constructor.ts b/src/types/node-error-constructor.ts
@@ -3,7 +3,7 @@
  * @module errnode/types/NodeErrorConstructor
  */
 
-import type { Overwrite } from '@flex-development/tutils'
+import type { Omit } from '@flex-development/tutils'
 import type MessageFn from './fn-message'
 import type NodeError from './node-error'
 
@@ -15,9 +15,9 @@ import type NodeError from './node-error'
  * @template M - Error message type, [`util.format`][1] arguments type, or
  * custom message function parameters type
  */
-type Args<M extends any[] | MessageFn | string> = M extends MessageFn
+type Args<M extends MessageFn | unknown[] | string> = M extends MessageFn
   ? Parameters<M>
-  : M extends any[]
+  : M extends unknown[]
   ? M
   : any[]
 
@@ -31,13 +31,13 @@ type Args<M extends any[] | MessageFn | string> = M extends MessageFn
  * custom message function parameters type
  * @template T - Error base type
  *
- * @extends {Overwrite<B, B>}
+ * @extends {Omit<B, 'prototype'>}
  */
 type NodeErrorConstructor<
   B extends ErrorConstructor = ErrorConstructor,
-  M extends any[] | MessageFn | string = MessageFn,
+  M extends MessageFn | unknown[] | string = MessageFn,
   T extends B['prototype'] = B['prototype']
-> = Overwrite<B, B> & {
+> = Omit<B, 'prototype'> & {
   (...args: Args<M>): NodeError<T>
   new (...args: Args<M>): NodeError<T>
   readonly prototype: NodeError<T>
diff --git a/src/utils/create-node-error.ts b/src/utils/create-node-error.ts
diff --git a/src/utils/determine-specific-type.ts b/src/utils/determine-specific-type.ts
diff --git a/yarn.lock b/yarn.lock
