Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

process: remove compareVersion and computedVersion (alternative to #19577) #19574

Closed
wants to merge 2 commits into from
Closed

process: remove compareVersion and computedVersion (alternative to #19577) #19574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
396a69c
process: remove compareVersion and computedVersion
tniessen Mar 24, 2018
bd1a280
test: add test for process.release.xxxVersion
tniessen Mar 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions doc/api/process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,17 +1507,6 @@ 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
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.

<!-- eslint-skip -->
```js
Expand All @@ -1530,8 +1519,7 @@ tarball.
majorVersion: 4,
minorVersion: 4,
patchVersion: 5,
prereleaseTag: '',
computedVersion: 263173,
prereleaseTag: ''
}
```

Expand Down
1 change: 0 additions & 1 deletion lib/internal/bootstrap/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
_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();
Expand Down
13 changes: 1 addition & 12 deletions lib/internal/process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,16 +269,6 @@ 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,
Expand All @@ -289,6 +279,5 @@ module.exports = {
setupSignalHandlers,
setupChannel,
setupRawDebug,
setupUncaughtExceptionCapture,
setupCompareVersion,
setupUncaughtExceptionCapture
};
7 changes: 0 additions & 7 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3032,13 +3032,6 @@ void SetupProcessObject(Environment* env,
READONLY_PROPERTY(release, "prereleaseTag",
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));
Expand Down
15 changes: 0 additions & 15 deletions test/parallel/test-process-release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,3 @@ if (versionParts[0] === '4' && versionParts[1] >= 2) {
} else {
assert.strictEqual(process.release.lts, undefined);
}

const {
majorVersion: major,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better to still test these other properties.

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));