Reorder methods alphabetically in utility modules

Organizes methods in alphabetical order for improved readability:
- encode.ts: Move helper functions after encode functions
- purl-component.ts: Swap componentComparator and componentSortOrder
- strings.ts: Move localeCompare after isSemverString
- validate.ts: Swap validateQualifierKey and validateQualifiers

This consistent ordering makes functions easier to locate and maintain.

Author: jdalton

src/encode.ts

@@ -34,21 +34,6 @@ function encodeNamespace(namespace: unknown): string {
     : ''
 }
 
-/**
- * Normalize URLSearchParams output for qualifier encoding.
- */
-function normalizeSearchParamsEncoding(encoded: string): string {
-  return encoded.replaceAll('%2520', '%20').replaceAll('+', '%2B')
-}
-
-/**
- * Prepare string value for URLSearchParams encoding.
- */
-function prepareValueForSearchParams(value: unknown): string {
-  // Replace spaces with %20's so they don't get converted to plus signs.
-  return String(value).replaceAll(' ', '%20')
-}
-
 /**
  * Encode qualifier parameter key or value.
  */
@@ -109,6 +94,21 @@ function encodeVersion(version: unknown): string {
     : ''
 }
 
+/**
+ * Normalize URLSearchParams output for qualifier encoding.
+ */
+function normalizeSearchParamsEncoding(encoded: string): string {
+  return encoded.replaceAll('%2520', '%20').replaceAll('+', '%2B')
+}
+
+/**
+ * Prepare string value for URLSearchParams encoding.
+ */
+function prepareValueForSearchParams(value: unknown): string {
+  // Replace spaces with %20's so they don't get converted to plus signs.
+  return String(value).replaceAll(' ', '%20')
+}
+
 export {
   encodeComponent,
   encodeName,

src/purl-component.ts

@@ -52,16 +52,6 @@ const componentSortOrderLookup = {
   subpath: 7,
 }
 
-/**
- * Get sort order for component name.
- */
-function componentSortOrder(comp: string): string | number {
-  return (
-    (componentSortOrderLookup as unknown as Record<string, number>)[comp] ??
-    comp
-  )
-}
-
 /**
  * Compare two component names for sorting.
  */
@@ -72,6 +62,16 @@ function componentComparator(compA: string, compB: string): number {
   )
 }
 
+/**
+ * Get sort order for component name.
+ */
+function componentSortOrder(comp: string): string | number {
+  return (
+    (componentSortOrderLookup as unknown as Record<string, number>)[comp] ??
+    comp
+  )
+}
+
 /**
  * Encode PURL component value to string.
  */

src/strings.ts

@@ -3,28 +3,6 @@
  * Includes whitespace detection, semver validation, locale comparison, and character replacement.
  */
 
-// Intl.Collator is faster than String#localeCompare
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare:
-// > When comparing large numbers of strings, such as in sorting large arrays,
-// > it is better to create an Intl.Collator object and use the function provided
-// > by its compare() method.
-let _localeCompare: Intl.Collator['compare'] | undefined
-/**
- * Perform locale-aware string comparison.
- */
-function localeCompare(x: string, y: string): number {
-  if (_localeCompare === undefined) {
-    // Lazily call new Intl.Collator() because in Node it can take 10-14ms.
-    _localeCompare = new Intl.Collator().compare
-  }
-  return _localeCompare(x, y)
-}
-
-// This regexp is valid as of 2024-08-01.
-// https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
-const regexSemverNumberedGroups =
-  /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-
 /**
  * Check if string contains only whitespace characters.
  */
@@ -103,13 +81,36 @@ function isNonEmptyString(value: unknown): value is string {
   return typeof value === 'string' && value.length > 0
 }
 
+// This regexp is valid as of 2024-08-01.
+// https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+const regexSemverNumberedGroups =
+  /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+
 /**
  * Check if value is a valid semantic version string.
  */
 function isSemverString(value: unknown): value is string {
   return typeof value === 'string' && regexSemverNumberedGroups.test(value)
 }
 
+// Intl.Collator is faster than String#localeCompare
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare:
+// > When comparing large numbers of strings, such as in sorting large arrays,
+// > it is better to create an Intl.Collator object and use the function provided
+// > by its compare() method.
+let _localeCompare: Intl.Collator['compare'] | undefined
+
+/**
+ * Perform locale-aware string comparison.
+ */
+function localeCompare(x: string, y: string): number {
+  if (_localeCompare === undefined) {
+    // Lazily call new Intl.Collator() because in Node it can take 10-14ms.
+    _localeCompare = new Intl.Collator().compare
+  }
+  return _localeCompare(x, y)
+}
+
 /**
  * Convert package name to lowercase.
  */

src/validate.ts

@@ -51,36 +51,6 @@ function validateNamespace(namespace: unknown, throws: boolean): boolean {
   return validateStrings('namespace', namespace, throws)
 }
 
-/**
- * Validate qualifiers object structure and keys.
- * @throws {PurlError} When validation fails and throws is true.
- */
-function validateQualifiers(qualifiers: unknown, throws: boolean): boolean {
-  if (qualifiers === null || qualifiers === undefined) {
-    return true
-  }
-  if (typeof qualifiers !== 'object') {
-    if (throws) {
-      throw new PurlError('"qualifiers" must be an object')
-    }
-    return false
-  }
-  const qualifiersObj = qualifiers as QualifiersObject | URLSearchParams
-  const keysProperty = (qualifiersObj as QualifiersObject)['keys']
-  const keysIterable: Iterable<string> =
-    // URLSearchParams instances have a "keys" method that returns an iterator.
-    typeof keysProperty === 'function'
-      ? (ReflectApply(keysProperty, qualifiersObj, []) as Iterable<string>)
-      : (Object.keys(qualifiers as QualifiersObject) as Iterable<string>)
-  // Use for-of to work with URLSearchParams#keys iterators.
-  for (const key of keysIterable) {
-    if (!validateQualifierKey(key, throws)) {
-      return false
-    }
-  }
-  return true
-}
-
 /**
  * Validate qualifier key format and characters.
  * @throws {PurlError} When validation fails and throws is true.
@@ -122,6 +92,36 @@ function validateQualifierKey(key: string, throws: boolean): boolean {
   return true
 }
 
+/**
+ * Validate qualifiers object structure and keys.
+ * @throws {PurlError} When validation fails and throws is true.
+ */
+function validateQualifiers(qualifiers: unknown, throws: boolean): boolean {
+  if (qualifiers === null || qualifiers === undefined) {
+    return true
+  }
+  if (typeof qualifiers !== 'object') {
+    if (throws) {
+      throw new PurlError('"qualifiers" must be an object')
+    }
+    return false
+  }
+  const qualifiersObj = qualifiers as QualifiersObject | URLSearchParams
+  const keysProperty = (qualifiersObj as QualifiersObject)['keys']
+  const keysIterable: Iterable<string> =
+    // URLSearchParams instances have a "keys" method that returns an iterator.
+    typeof keysProperty === 'function'
+      ? (ReflectApply(keysProperty, qualifiersObj, []) as Iterable<string>)
+      : (Object.keys(qualifiers as QualifiersObject) as Iterable<string>)
+  // Use for-of to work with URLSearchParams#keys iterators.
+  for (const key of keysIterable) {
+    if (!validateQualifierKey(key, throws)) {
+      return false
+    }
+  }
+  return true
+}
+
 /**
  * Validate that component is present and not empty.
  * @throws {PurlError} When validation fails and throws is true.