@flex-development/mlly 1.0.0-alpha.15 → 1.0.0-alpha.16

package/src/types/fn-change-ext.ts

@@ -3,7 +3,7 @@
  * @module mlly/types/ChangeExtFn
  */
 
-import type { Nilable } from '@flex-development/tutils'
+import type { Fn, Nilable } from '@flex-development/tutils'
 import type { URL } from 'node:url'
 
 /**
@@ -19,15 +19,15 @@ import type { URL } from 'node:url'
  * @see {@linkcode URL}
  * @see https://github.com/flex-development/pathe/tree/1.0.3#changeextpath-string-ext-nullablestring-string
  *
- * @template Ext - File extension type(s)
+ * @template X - File extension type
  *
  * @param {string} specifier - Original module specifier
  * @param {URL} url - Resolved module URL
- * @return {Ext | PromiseLike<Ext>} New file extension, `null`, or `undefined`
+ * @return {PromiseLike<X> | X} New file extension, `null`, or `undefined`
  */
-type ChangeExtFn<Ext extends Nilable<string> = Nilable<string>> = (
-  specifier: string,
-  url: URL
-) => Ext | PromiseLike<Ext>
+type ChangeExtFn<X extends Nilable<string> = Nilable<string>> = Fn<
+  [specifier: string, url: URL],
+  PromiseLike<X> | X
+>
 
 export type { ChangeExtFn as default }

package/src/utils/extract-statements.ts

@@ -6,6 +6,7 @@
 import type { Statement } from '#src/interfaces'
 import validateString from '#src/internal/validate-string'
 import type { NodeError } from '@flex-development/errnode'
+import { sort, trim } from '@flex-development/tutils'
 import findDynamicImports from './find-dynamic-imports'
 import findExports from './find-exports'
 import findRequires from './find-requires'
@@ -29,14 +30,17 @@ const extractStatements = (code: string = ''): Statement[] => {
   validateString(code, 'code')
 
   // code shorter than first shortest keyword => no possible matches
-  if (code.trim().length < 'export'.length) return []
+  if (trim(code).length < 'export'.length) return []
 
-  return [
-    ...findDynamicImports(code),
-    ...findExports(code),
-    ...findRequires(code),
-    ...findStaticImports(code)
-  ]
+  return sort(
+    [
+      ...findDynamicImports(code),
+      ...findExports(code),
+      ...findRequires(code),
+      ...findStaticImports(code)
+    ],
+    (s1: Statement, s2: Statement): number => s1.start - s2.start
+  )
 }
 
 export default extractStatements

package/src/utils/fill-modules.ts

@@ -5,8 +5,6 @@
 
 import { SpecifierSyntaxKind } from '#src/enums'
 import type { FillModuleOptions } from '#src/interfaces'
-import regexp from '#src/internal/escape-reg-exp'
-import isFunction from '#src/internal/is-function'
 import validateArraySet from '#src/internal/validate-array-set'
 import validateURLString from '#src/internal/validate-url-string'
 import {
@@ -14,6 +12,13 @@ import {
   type NodeError
 } from '@flex-development/errnode'
 import pathe from '@flex-development/pathe'
+import {
+  DOT,
+  isFunction,
+  regexp,
+  trim,
+  type Optional
+} from '@flex-development/tutils'
 import type { URL } from 'node:url'
 import CONDITIONS from './conditions'
 import extractStatements from './extract-statements'
@@ -46,77 +51,80 @@ const fillModules = async (
 ): Promise<string> => {
   const { conditions = CONDITIONS, ext, parent = import.meta.url } = options
 
+  // validate options
   validateArraySet(conditions, 'options.conditions')
   validateURLString(parent, 'options.parent')
 
   // ensure specifiers have file extensions
   for (const statement of extractStatements(code)) {
-    // do nothing if statement does not have specifier
-    if (!statement.specifier) continue
-
-    // ignore statements with dynamic specifiers
-    if (statement.specifier_syntax === SpecifierSyntaxKind.DYNAMIC) continue
-
-    /**
-     * Resolved module URL.
-     *
-     * @const {URL} url
-     */
-    const url: URL = await resolveModule(statement.specifier, {
-      ...options,
-      /**
-       * Returns a replacement file extension for the given module `specifier`
-       * **if it is non-bare and does not already have an extension**.
-       *
-       * Throws [`ERR_UNKNOWN_FILE_EXTENSION`][1] if the replacement extension
-       * is `null`, `undefined`, an empty string, or a dot character (`'.'`).
-       *
-       * [1]: https://nodejs.org/api/errors.html#err_unknown_file_extension
-       *
-       * @async
-       *
-       * @param {string} specifier - Module specifier
-       * @param {URL} url - Resolved module URL
-       * @return {Promise<string | undefined>} New file extension or `undefined`
-       */
-      async ext(specifier: string, url: URL): Promise<string | undefined> {
-        // skip replacement for bare specifiers
-        if (isBareSpecifier(specifier)) return void 0
-
-        // skip replacement for specifiers that are already fully specified
-        if (pathe.extname(specifier) === pathe.extname(url.href)) return void 0
-
+    if (statement.specifier) {
+      if (statement.specifier_syntax !== SpecifierSyntaxKind.DYNAMIC) {
         /**
-         * Replacement file extension.
+         * Resolved module URL.
          *
-         * @var {string} rext
+         * @const {URL} url
          */
-        const rext: string = isFunction(ext) ? await ext(specifier, url) : ext
+        const url: URL = await resolveModule(statement.specifier, {
+          ...options,
+          /**
+           * Returns a replacement file extension for the given `specifier` if
+           * it is non-bare and does not already have an extension.
+           *
+           * Throws [`ERR_UNKNOWN_FILE_EXTENSION`][1] if the new extension is
+           * `null`, `undefined`, an empty string, or a dot character (`'.'`).
+           *
+           * [1]: https://nodejs.org/api/errors.html#err_unknown_file_extension
+           *
+           * @async
+           *
+           * @param {string} specifier - Module specifier
+           * @param {URL} url - Resolved module URL
+           * @return {Promise<Optional<string>>} New file extension
+           */
+          async ext(specifier: string, url: URL): Promise<Optional<string>> {
+            // skip replacement for bare specifiers
+            if (isBareSpecifier(specifier)) return void 0
 
-        // ensure replacement extension is non-empty and non-dot ('.')
-        if (!(rext && rext.trim().length > (rext.startsWith('.') ? 1 : 0))) {
-          throw new ERR_UNKNOWN_FILE_EXTENSION(rext, specifier)
-        }
+            // skip replacement for specifiers that are already fully specified
+            if (pathe.extname(specifier) === pathe.extname(url.href)) {
+              return void 0
+            }
 
-        return rext
-      }
-    })
+            /**
+             * Replacement file extension.
+             *
+             * @var {string} rext
+             */
+            const rext: string = isFunction(ext)
+              ? await ext(specifier, url)
+              : ext
+
+            // ensure replacement extension is non-empty and non-dot ('.')
+            if (!(rext && trim(rext).length > (rext.startsWith(DOT) ? 1 : 0))) {
+              throw new ERR_UNKNOWN_FILE_EXTENSION(rext, specifier)
+            }
 
-    // replace original module specifier
-    code = code.replace(
-      statement.code,
-      statement.code.replace(
-        new RegExp(`(?<=["'])${regexp(statement.specifier)}(?=["'])`),
-        // convert module url back to absolute, bare, or relative specifier
-        statement.specifier.startsWith('#')
-          ? statement.specifier
-          : isAbsoluteSpecifier(statement.specifier)
-          ? url.href
-          : isBareSpecifier(statement.specifier)
-          ? toBareSpecifier(url, parent, new Set(conditions))
-          : toRelativeSpecifier(url, parent)
-      )
-    )
+            return rext
+          }
+        })
+
+        // replace original module specifier
+        code = code.replace(
+          statement.code,
+          statement.code.replace(
+            new RegExp(`(?<=["'])${regexp(statement.specifier)}(?=["'])`),
+            // convert module url back to absolute, bare, or relative specifier
+            statement.specifier.startsWith('#')
+              ? statement.specifier
+              : isAbsoluteSpecifier(statement.specifier)
+              ? url.href
+              : isBareSpecifier(statement.specifier)
+              ? toBareSpecifier(url, parent, new Set(conditions))
+              : toRelativeSpecifier(url, parent)
+          )
+        )
+      }
+    }
   }
 
   return code

package/src/utils/find-dynamic-imports.ts

@@ -9,10 +9,12 @@ import {
   StatementSyntaxKind
 } from '#src/enums'
 import type { DynamicImport } from '#src/interfaces'
+import dequote from '#src/internal/dequote'
 import getSpecifierKind from '#src/internal/get-specifier-kind'
 import validateString from '#src/internal/validate-string'
 import type { NodeError } from '@flex-development/errnode'
 import { DYNAMIC_IMPORT_REGEX } from '@flex-development/import-regex'
+import { split, trim } from '@flex-development/tutils'
 
 /**
  * Finds all dynamic import statements in `code`. Ignores matches in comments.
@@ -53,14 +55,12 @@ const findDynamicImports = (code: string = ''): DynamicImport[] => {
       imports:
         imports === ''
           ? []
-          : imports
-              .replace(/^{|}$/g, '')
-              .split(',')
-              .map(e => e.trim())
-              .filter(e => e.length > 0),
+          : split(imports.replace(/^{|}$/g, ''), ',')
+              .map(trim)
+              .filter(e => !!e.length),
       kind: StatementKind.IMPORT,
       options,
-      specifier: specifier.replace(/^["']|["']$/g, ''),
+      specifier: dequote(specifier),
       specifier_kind:
         specifier_syntax === SpecifierSyntaxKind.DYNAMIC
           ? null

package/src/utils/find-exports.ts

@@ -11,7 +11,6 @@ import {
 import type { ExportStatement } from '#src/interfaces'
 import getSpecifierKind from '#src/internal/get-specifier-kind'
 import validateString from '#src/internal/validate-string'
-import type { Declaration } from '#src/types'
 import type { NodeError } from '@flex-development/errnode'
 import {
   EXPORT_AGGREGATE_REGEX,
@@ -19,6 +18,7 @@ import {
   EXPORT_DEFAULT_REGEX,
   EXPORT_LIST_REGEX
 } from '@flex-development/export-regex'
+import { cast, sort, split, trim } from '@flex-development/tutils'
 
 /**
  * Finds all export statements in `code`. Ignores matches in comments.
@@ -55,11 +55,9 @@ const findExports = (code: string = ''): ExportStatement[] => {
       end: start + code.length,
       exports: exports.startsWith('*')
         ? [exports]
-        : exports
-            .replace(/^{|}$/g, '')
-            .split(',')
-            .map(e => e.trim())
-            .filter(e => e.length > 0),
+        : split(exports.replace(/^{|}$/g, ''), ',')
+            .map(trim)
+            .filter(e => !!e.length),
       kind: StatementKind.EXPORT,
       modifiers: [],
       specifier,
@@ -80,23 +78,20 @@ const findExports = (code: string = ''): ExportStatement[] => {
 
     statements.push({
       code,
-      declaration: declaration as Declaration,
+      declaration: cast(declaration),
       end: start + code.length,
       exports: /^\w+$/.test(exports)
         ? [exports]
-        : exports
-            .replace(/^[[{]|[\]}]$/g, '')
-            .split(',')
-            .map(e => e.trim().replace(/\s*=\s*.*$/, ''))
-            .filter(e => e.length > 0),
+        : split(exports.replace(/^[[{]|[\]}]$/g, ''), ',')
+            .map(e => trim(e).replace(/\s*=\s*.*$/, ''))
+            .filter(e => !!e.length),
       kind: StatementKind.EXPORT,
       modifiers:
         modifiers === ''
           ? []
-          : modifiers
-              .split(' ')
-              .map(e => e.trim())
-              .filter(e => e.length > 0),
+          : split(modifiers, ' ')
+              .map(trim)
+              .filter(e => !!e.length),
       specifier: null,
       specifier_kind: null,
       specifier_syntax: null,
@@ -113,17 +108,16 @@ const findExports = (code: string = ''): ExportStatement[] => {
 
     statements.push({
       code,
-      declaration: declaration ? (declaration as Declaration) : null,
+      declaration: declaration ? cast(declaration) : null,
       end: start + code.length,
       exports: exports === '' ? [] : [exports],
       kind: StatementKind.EXPORT,
       modifiers:
         modifiers === ''
           ? []
-          : modifiers
-              .split(' ')
-              .map(e => e.trim())
-              .filter(e => e.length > 0),
+          : split(modifiers, ' ')
+              .map(trim)
+              .filter(e => !!e.length),
       specifier: null,
       specifier_kind: null,
       specifier_syntax: null,
@@ -142,11 +136,9 @@ const findExports = (code: string = ''): ExportStatement[] => {
       code,
       declaration: null,
       end: start + code.length,
-      exports: exports
-        .replace(/^{|}$/g, '')
-        .split(',')
-        .map(e => e.trim())
-        .filter(e => e.length > 0),
+      exports: split(exports.replace(/^{|}$/g, ''), ',')
+        .map(trim)
+        .filter(e => !!e.length),
       kind: StatementKind.EXPORT,
       modifiers: [],
       specifier: null,
@@ -158,9 +150,7 @@ const findExports = (code: string = ''): ExportStatement[] => {
     })
   }
 
-  return statements.sort((s1: ExportStatement, s2: ExportStatement): number => {
-    return s1.start - s2.start
-  })
+  return sort(statements, (s1, s2): number => s1.start - s2.start)
 }
 
 export default findExports

package/src/utils/find-requires.ts

@@ -9,9 +9,11 @@ import {
   StatementSyntaxKind
 } from '#src/enums'
 import type { RequireStatement } from '#src/interfaces'
+import dequote from '#src/internal/dequote'
 import getSpecifierKind from '#src/internal/get-specifier-kind'
 import validateString from '#src/internal/validate-string'
 import type { NodeError } from '@flex-development/errnode'
+import { split, trim } from '@flex-development/tutils'
 
 /**
  * Finds all `require` statements in `code`. Ignores matches in comments.
@@ -54,13 +56,11 @@ const findRequires = (code: string = ''): RequireStatement[] => {
       imports:
         imports === ''
           ? []
-          : imports
-              .replace(/^{|}$/g, '')
-              .split(',')
-              .map(e => e.trim())
-              .filter(e => e.length > 0),
+          : split(imports.replace(/^{|}$/g, ''), ',')
+              .map(trim)
+              .filter(e => !!e.length),
       kind: StatementKind.REQUIRE,
-      specifier: specifier.replace(/^["']|["']$/g, ''),
+      specifier: dequote(specifier),
       specifier_kind:
         specifier_syntax === SpecifierSyntaxKind.DYNAMIC
           ? null

package/src/utils/find-static-imports.ts

@@ -13,6 +13,7 @@ import getSpecifierKind from '#src/internal/get-specifier-kind'
 import validateString from '#src/internal/validate-string'
 import type { NodeError } from '@flex-development/errnode'
 import { STATIC_IMPORT_REGEX } from '@flex-development/import-regex'
+import { split, trim } from '@flex-development/tutils'
 
 /**
  * Finds all static import statements in `code`. Ignores matches in comments.
@@ -58,22 +59,18 @@ const findStaticImports = (code: string = ''): StaticImport[] => {
         syntax === StatementSyntaxKind.SIDE_EFFECT
           ? []
           : syntax === StatementSyntaxKind.NAMED
-          ? imports
-              .replace(/^{|}$/g, '')
-              .split(',')
-              .map(e => e.trim())
-              .filter(e => e.length > 0)
+          ? split(imports.replace(/^{|}$/g, ''), ',')
+              .map(trim)
+              .filter(i => !!i.length)
           : syntax === StatementSyntaxKind.DEFAULT_WITH_NAMED
-          ? imports
-              .split(',')
-              .map(i => i.trim().replace(/^{|}$/g, ''))
-              .map(i => i.trim())
-              .filter(i => i.length > 0)
+          ? split(imports, ',')
+              .map(i => trim(i).replace(/^{|}$/g, ''))
+              .map(trim)
+              .filter(i => !!i.length)
           : syntax === StatementSyntaxKind.DEFAULT_WITH_NAMESPACE
-          ? imports
-              .split(',')
-              .map(i => i.trim())
-              .filter(i => i.length > 0)
+          ? split(imports, ',')
+              .map(trim)
+              .filter(i => !!i.length)
           : [imports],
       kind: StatementKind.IMPORT,
       specifier,