Tweaks

Author: ehmicky

README.md

@@ -31,17 +31,8 @@ const {
   // [
   //   { node: '18.4.0', npm: '8.12.1' },
   //   { node: '18.3.0', npm: '8.11.0' },
-  //   { node: '18.2.0', npm: '8.9.0' },
-  //   { node: '18.1.0', npm: '8.8.0' },
-  //   { node: '18.0.0', npm: '8.6.0' },
-  //   { node: '17.9.1', npm: '8.11.0' },
-  //   { node: '17.9.0', npm: '8.5.5' },
-  //   { node: '17.8.0', npm: '8.5.5' },
-  //   { node: '17.7.2', npm: '8.5.2' },
-  //   { node: '17.7.1', npm: '8.5.2' },
-  //   { node: '17.7.0', npm: '8.5.2' },
-  //   { node: '17.6.0', npm: '8.5.1' },
   //   ...
+  //   { node: '0.1.14' },
   // ]
   majors,
   // [
@@ -78,21 +69,21 @@ The return value resolves to an object with the following properties.
 
 _Type_: `object[]`
 
-List of available Node.js versions and default NPM versions sorted from the most
+List of available Node.js versions and related information. Sorted from the most
 to the least recent Node.js version.
 
 ##### node
 
 _Type_: `string`
 
-Node.js version is a `major.minor.patch` string.
+Node.js version as a `major.minor.patch` string.
 
 ##### npm
 
 _Type_: `string?`
 
-Default NPM version is a raw version value: can be `"6.5.0-next.0"`, for
-example. `undefined` for ancient node that didn't ship with npm.
+Default NPM version as a `major.minor.patch[-tags]` string. `undefined` if the
+[`node` version](#node) is `0.6.2` or older.
 
 #### majors
 

package-lock.json

@@ -7,13 +7,13 @@ export type SemverVersion = `${number}.${number}.${number}${string}`
 
 export interface NodeVersionInfo {
   /**
-   * Node.js version is a `major.minor.patch` string.
+   * Node.js version as a `major.minor.patch` string.
    */
   node: SemverVersion
 
   /**
-   * Default NPM version is a raw version value: can be `"6.5.0-next.0"`, for example.
-   * `undefined` for ancient node that didn't ship with npm.
+   * Default NPM version as a `major.minor.patch[-tags]` string.
+   * `undefined` if the `node` version is `0.6.2` or older.
    */
   npm?: SemverVersion
 }
@@ -37,7 +37,8 @@ export interface MajorNodeVersion {
 
 export interface AllNodeVersions {
   /**
-   * List of available Node.js versions and default NPM versions sorted from the most to the least recent Node.js version.
+   * List of available Node.js versions and related information.
+   * Sorted from the most to the least recent Node.js version.
    */
   versions: NodeVersionInfo[]
 

src/main.d.ts

@@ -2,6 +2,7 @@ import allNodeVersions, {
   Options,
   AllNodeVersions,
   MajorNodeVersion,
+  NodeVersionInfo,
   SemverVersion,
 } from 'all-node-versions'
 import {
@@ -10,7 +11,6 @@ import {
   expectAssignable,
   expectNotAssignable,
 } from 'tsd'
-import { NodeVersionInfo } from './main'
 
 const nodeVersions = await allNodeVersions()
 
@@ -29,14 +29,14 @@ expectError(allNodeVersions({ fetch: 'true' }))
 
 expectType<AllNodeVersions>(nodeVersions)
 const {
-  versions: [version],
+  versions: [nodeVersion],
   majors: [majorNodeVersion],
 } = nodeVersions
 
-expectType<NodeVersionInfo>(version)
-const { node, npm } = version
+expectType<NodeVersionInfo>(nodeVersion)
+const { node, npm } = nodeVersion
 expectAssignable<SemverVersion>(node)
-expectType<SemverVersion | undefined>(npm)
+expectAssignable<SemverVersion | undefined>(npm)
 
 expectType<MajorNodeVersion>(majorNodeVersion)
 const { major, latest, lts } = majorNodeVersion

src/main.test-d.ts

@@ -17,12 +17,13 @@ const normalizeVersion = function ({ version, lts, npm }) {
   return { version: versionA, major, lts, npm }
 }
 
-// Array with all {node: string, npm: string} version infos
+// Array with all `{ node: string, npm: string }` version infos
 const getAllVersions = function (indexItems) {
-  return indexItems.map(({ version, npm }) => ({
-    node: version,
-    npm,
-  }))
+  return indexItems.map(getVersionField)
+}
+
+const getVersionField = function ({ version, npm }) {
+  return { node: version, npm }
 }
 
 // Array with all major releases latest version, sorted from most to least

src/normalize.js

@@ -3,46 +3,28 @@ import test from 'ava'
 import isPlainObj from 'is-plain-obj'
 import semver from 'semver'
 
-const isNodeVersion = function (nodeVersion) {
-  return typeof nodeVersion === 'string' && VERSION_REGEXP.test(nodeVersion)
-}
-
-const isNpmVersion = function (npmVersion) {
-  return typeof npmVersion === 'string' && NPM_VERSION_REGEXP.test(npmVersion)
+const isValidVersionInfo = function ({ node, npm }) {
+  return isSemverVersion(node) && (npm === undefined || isSemverVersion(npm))
 }
 
-const isVersion = function (version) {
-  return (
-    isNodeVersion(version.node) &&
-    (version.npm === undefined || isNpmVersion(version.npm))
-  )
+const isSemverVersion = function (nodeVersion) {
+  return typeof nodeVersion === 'string' && VERSION_REGEXP.test(nodeVersion)
 }
 
-const VERSION_REGEXP = /^\d+\.\d+\.\d+$/u
-
-/**
- * Real examples:
- * 1.1.0-beta-4
- * 1.1.0-alpha-6
- * 1.1.18
- * 6.5.0-next.0
- * 1.1.0-3
- */
-const NPM_VERSION_REGEXP =
-  /^\d+\.\d+\.\d+((-(alpha|beta)-\d+)|(-next\.\d+)|(-\d+))?$/u
+const VERSION_REGEXP = /^\d+\.\d+\.\d+/u
 
 test('"versions" are present', async (t) => {
   const { versions } = await allNodeVersions({ fetch: true })
 
   t.true(Array.isArray(versions))
-  t.true(versions.every(isVersion))
+  t.true(versions.every(isValidVersionInfo))
 })
 
 test('"versions" are sorted', async (t) => {
   const { versions } = await allNodeVersions({ fetch: true })
-  // eslint-disable-next-line fp/no-mutating-methods, id-length
-  const sortedVersions = [...versions].sort((a, b) =>
-    semver.rcompare(a.node, b.node),
+  // eslint-disable-next-line fp/no-mutating-methods
+  const sortedVersions = [...versions].sort((versionInfoA, versionInfoB) =>
+    semver.rcompare(versionInfoA.node, versionInfoB.node),
   )
 
   t.deepEqual(versions, sortedVersions)
@@ -84,7 +66,7 @@ test('"majors.latest" are present', async (t) => {
 })
 
 const isValidLatest = function ({ latest }) {
-  return isNodeVersion(latest)
+  return isSemverVersion(latest)
 }
 
 test('"majors.lts" are present', async (t) => {