From 67f79a51653ff1ecc776b21d62b6a7d236d02b12 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Sun, 18 Mar 2018 23:26:41 -0500 Subject: [PATCH 1/6] process: add computedVersion --- doc/api/process.md | 14 ++++++++++++++ src/node.cc | 7 +++++++ test/parallel/test-process-computed-version.js | 12 ++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 test/parallel/test-process-computed-version.js diff --git a/doc/api/process.md b/doc/api/process.md index e89e5c0281a23b..315db1b2ed9f91 100644 --- a/doc/api/process.md +++ b/doc/api/process.md @@ -1890,6 +1890,20 @@ The `process.version` property returns the Node.js version string. console.log(`Version: ${process.version}`); ``` +## process.computedVersion + + +* {number} + +The `process.computedVersion` property is the result of +`(NODE_MAJOR_VERSION << 16) + (NODE_MINOR_VERSION << 8) + NODE_PATCH_VERSION` + +This property is useful for inline version checks. Using the process above a +number such as `591872` (for version `9.8.0`) may be selected and easily used +for a version check (`process.computedVersion >= 591872`). + ## process.versions ```js @@ -1511,7 +1515,11 @@ tarball. lts: 'Argon', sourceUrl: 'https://nodejs.org/download/release/v4.4.5/node-v4.4.5.tar.gz', headersUrl: 'https://nodejs.org/download/release/v4.4.5/node-v4.4.5-headers.tar.gz', - libUrl: 'https://nodejs.org/download/release/v4.4.5/win-x64/node.lib' + libUrl: 'https://nodejs.org/download/release/v4.4.5/win-x64/node.lib', + majorVersion: 4, + minorVersion: 4, + patchVersion: 5, + tag: '', } ``` diff --git a/src/node.cc b/src/node.cc index 7570092938f3ac..e28205e4bbac94 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3027,6 +3027,15 @@ void SetupProcessObject(Environment* env, READONLY_PROPERTY(release, "name", OneByteString(env->isolate(), NODE_RELEASE)); + READONLY_PROPERTY(release, "majorVersion", + Integer::New(env->isolate(), NODE_MAJOR_VERSION)); + READONLY_PROPERTY(release, "minorVersion", + Integer::New(env->isolate(), NODE_MINOR_VERSION)); + READONLY_PROPERTY(release, "patchVersion", + Integer::New(env->isolate(), NODE_PATCH_VERSION)); + + READONLY_PROPERTY(release, "tag", OneByteString(env->isolate(), NODE_TAG)); + #if NODE_VERSION_IS_LTS READONLY_PROPERTY(release, "lts", OneByteString(env->isolate(), NODE_VERSION_LTS_CODENAME)); diff --git a/test/parallel/test-process-computed-version.js b/test/parallel/test-process-computed-version.js deleted file mode 100644 index 53e60f377320eb..00000000000000 --- a/test/parallel/test-process-computed-version.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; -require('../common'); - -const assert = require('assert'); - -// eslint-disable-next-line prefer-const -let [major, minor, patch] = process.version.split('.'); -major = major.slice(1); -patch = patch.slice('-')[0]; - -assert.strictEqual( - (major << 16) + (minor << 8) + +patch, process.computedVersion); diff --git a/test/parallel/test-process-version.js b/test/parallel/test-process-version.js new file mode 100644 index 00000000000000..ce699aff6c0d28 --- /dev/null +++ b/test/parallel/test-process-version.js @@ -0,0 +1,13 @@ +'use strict'; +require('../common'); + +const assert = require('assert'); + +const { + majorVersion: major, + minorVersion: minor, + patchVersion: patch, +} = process.release; + +assert.strictEqual( + (major << 16) + (minor << 8) + patch, process.computedVersion); From f64a994d89e8ba50d20338f005ea0989f642acd6 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Mon, 19 Mar 2018 09:20:29 -0500 Subject: [PATCH 3/6] move computedVersion to release --- src/node.cc | 14 +++++++------- test/parallel/test-process-release.js | 10 ++++++++++ test/parallel/test-process-version.js | 13 ------------- 3 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 test/parallel/test-process-version.js diff --git a/src/node.cc b/src/node.cc index e28205e4bbac94..afee06bc490778 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2937,13 +2937,6 @@ void SetupProcessObject(Environment* env, "version", FIXED_ONE_BYTE_STRING(env->isolate(), NODE_VERSION)); - READONLY_PROPERTY(process, - "computedVersion", - Integer::New(env->isolate(), - (NODE_MAJOR_VERSION << 16) + - (NODE_MINOR_VERSION << 8) + - NODE_PATCH_VERSION)); - // process.versions Local versions = Object::New(env->isolate()); READONLY_PROPERTY(process, "versions", versions); @@ -3036,6 +3029,13 @@ void SetupProcessObject(Environment* env, READONLY_PROPERTY(release, "tag", OneByteString(env->isolate(), NODE_TAG)); + READONLY_PROPERTY(release, + "computedVersion", + Integer::New(env->isolate(), + (NODE_MAJOR_VERSION << 16) + + (NODE_MINOR_VERSION << 8) + + NODE_PATCH_VERSION)); + #if NODE_VERSION_IS_LTS READONLY_PROPERTY(release, "lts", OneByteString(env->isolate(), NODE_VERSION_LTS_CODENAME)); diff --git a/test/parallel/test-process-release.js b/test/parallel/test-process-release.js index 8b6bca9141beed..9d3b5379cfb195 100644 --- a/test/parallel/test-process-release.js +++ b/test/parallel/test-process-release.js @@ -18,3 +18,13 @@ if (versionParts[0] === '4' && versionParts[1] >= 2) { } else { assert.strictEqual(process.release.lts, undefined); } + +const { + majorVersion: major, + minorVersion: minor, + patchVersion: patch, + computedVersion, +} = process.release; + +assert.strictEqual( + (major << 16) + (minor << 8) + patch, computedVersion); diff --git a/test/parallel/test-process-version.js b/test/parallel/test-process-version.js deleted file mode 100644 index ce699aff6c0d28..00000000000000 --- a/test/parallel/test-process-version.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; -require('../common'); - -const assert = require('assert'); - -const { - majorVersion: major, - minorVersion: minor, - patchVersion: patch, -} = process.release; - -assert.strictEqual( - (major << 16) + (minor << 8) + patch, process.computedVersion); From 4896ba5e90617f3e5f9a0cc6092f15dd88e29c72 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Mon, 19 Mar 2018 09:32:46 -0500 Subject: [PATCH 4/6] names and docs --- doc/api/process.md | 25 +++++++++---------------- src/node.cc | 3 ++- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/doc/api/process.md b/doc/api/process.md index cc8639823258e9..771a991b212abd 100644 --- a/doc/api/process.md +++ b/doc/api/process.md @@ -1506,7 +1506,13 @@ tarball. * `majorVersion` {number} The major version of Node.js. * `minorVersion` {number} The minor version of Node.js. * `patchVersion` {number} The patch version of Node.js. -* `tag` {string} The semver tag for Node.js +* `prereleaseTag` {string} The SemVer pre-release tag for Node.js. +* `computedVersion` {number} The result of + `(majorVersion << 16) + (minorVersion << 8) + patchVersion` + + This property is useful for inline version checks. Using the process above a + number such as `591872` (for version `9.8.0`) may be selected and easily used + for a version check (`process.computedVersion >= 591872`). ```js @@ -1519,7 +1525,8 @@ tarball. majorVersion: 4, minorVersion: 4, patchVersion: 5, - tag: '', + prereleaseTag: '', + computedVersion: 263173, } ``` @@ -1898,20 +1905,6 @@ The `process.version` property returns the Node.js version string. console.log(`Version: ${process.version}`); ``` -## process.computedVersion - - -* {number} - -The `process.computedVersion` property is the result of -`(NODE_MAJOR_VERSION << 16) + (NODE_MINOR_VERSION << 8) + NODE_PATCH_VERSION` - -This property is useful for inline version checks. Using the process above a -number such as `591872` (for version `9.8.0`) may be selected and easily used -for a version check (`process.computedVersion >= 591872`). - ## process.versions ```js { From 85cbf8d1b035548041071d3efd6b1cf0ddbf0e61 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Wed, 21 Mar 2018 10:07:55 -0500 Subject: [PATCH 6/6] compareVersion --- doc/api/process.md | 10 +++++++++- lib/internal/bootstrap/node.js | 1 + lib/internal/process.js | 13 ++++++++++++- test/parallel/test-process-release.js | 5 +++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/doc/api/process.md b/doc/api/process.md index 373f3bed56a1be..631a1458f97624 100644 --- a/doc/api/process.md +++ b/doc/api/process.md @@ -1507,9 +1507,17 @@ tarball. * `minorVersion` {number} The minor version of Node.js. * `patchVersion` {number} The patch version of Node.js. * `prereleaseTag` {string} The SemVer pre-release tag for Node.js. -* `computedVersion` {number} a number representing the current version, created +* `computedVersion` {number} A number representing the current version, created using the following method: `(majorVersion << 16) + (minorVersion << 8) + patchVersion` +* `compareVersion` {function} Perform a SemVer comparison to the release + version. + * `major` + * `minor` + * `patch` + * Returns: {number} `-1` if the given version is lower than the release version, + `0` if the given version matches the process version, and `1` if the given + version is greater than the release version. ```js diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 7d7ca03d36f7ac..4b5498a07da9cf 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -38,6 +38,7 @@ _process.setupConfig(NativeModule._source); _process.setupSignalHandlers(); _process.setupUncaughtExceptionCapture(exceptionHandlerState); + _process.setupCompareVersion(); NativeModule.require('internal/process/warning').setup(); NativeModule.require('internal/process/next_tick').setup(); NativeModule.require('internal/process/stdio').setup(); diff --git a/lib/internal/process.js b/lib/internal/process.js index d64fe9877198b8..573ffc1600ff74 100644 --- a/lib/internal/process.js +++ b/lib/internal/process.js @@ -269,6 +269,16 @@ function setupUncaughtExceptionCapture(exceptionHandlerState) { }; } +function setupCompareVersion() { + const { computedVersion } = process.release; + process.release.compareVersion = (major, minor, patch) => { + const comp = (major << 16) + (minor << 8) + patch; + if (comp === computedVersion) + return 0; + return comp > computedVersion ? 1 : -1; + }; +} + module.exports = { setup_performance, setup_cpuUsage, @@ -279,5 +289,6 @@ module.exports = { setupSignalHandlers, setupChannel, setupRawDebug, - setupUncaughtExceptionCapture + setupUncaughtExceptionCapture, + setupCompareVersion, }; diff --git a/test/parallel/test-process-release.js b/test/parallel/test-process-release.js index 9d3b5379cfb195..6356b1a7250f7d 100644 --- a/test/parallel/test-process-release.js +++ b/test/parallel/test-process-release.js @@ -24,7 +24,12 @@ const { minorVersion: minor, patchVersion: patch, computedVersion, + compareVersion, } = process.release; assert.strictEqual( (major << 16) + (minor << 8) + patch, computedVersion); + +assert.strictEqual(0, compareVersion(major, minor, patch)); +assert.strictEqual(1, compareVersion(major, minor, patch + 1)); +assert.strictEqual(-1, compareVersion(major - 1, minor, patch));