Skip to content

Commit 6742455

Browse files
durrandurran
authored
chore(NODE-4250): update formatting options (#6)
1 parent 4ede9b6 commit 6742455

File tree

7 files changed

+103
-84
lines changed

7 files changed

+103
-84
lines changed

‎.cargo/config.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
[target.aarch64-unknown-linux-gnu]
22
linker = "aarch64-linux-gnu-gcc"
3-
[target.aarch64-unknown-linux-musl]
4-
linker = "aarch64-linux-musl-gcc"
5-
rustflags = ["-C", "target-feature=-crt-static"]
6-
[target.armv7-unknown-linux-gnueabihf]
7-
linker = "arm-linux-gnueabihf-gcc"

‎index.js

Lines changed: 59 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,154 +1,142 @@
1-
const { existsSync, readFileSync } = require('fs')
2-
const { join } = require('path')
1+
const { existsSync, readFileSync } = require('fs');
2+
const { join } = require('path');
33

4-
const { platform, arch } = process
4+
const { platform, arch } = process;
55

6-
let nativeBinding = null
7-
let localFileExisted = false
8-
let loadError = null
6+
let nativeBinding = null;
7+
let localFileExisted = false;
8+
let loadError = null;
99

1010
switch (platform) {
1111
case 'win32':
1212
switch (arch) {
1313
case 'x64':
14-
localFileExisted = existsSync(
15-
join(__dirname, 'zstd.win32-x64-msvc.node')
16-
)
14+
localFileExisted = existsSync(join(__dirname, 'zstd.win32-x64-msvc.node'));
1715
try {
1816
if (localFileExisted) {
19-
nativeBinding = require('./zstd.win32-x64-msvc.node')
17+
nativeBinding = require('./zstd.win32-x64-msvc.node');
2018
} else {
21-
nativeBinding = require('@mongodb-js/zstd-win32-x64-msvc')
19+
nativeBinding = require('@mongodb-js/zstd-win32-x64-msvc');
2220
}
2321
} catch (e) {
24-
loadError = e
22+
loadError = e;
2523
}
26-
break
24+
break;
2725
case 'arm64':
28-
localFileExisted = existsSync(
29-
join(__dirname, 'zstd.win32-arm64-msvc.node')
30-
)
26+
localFileExisted = existsSync(join(__dirname, 'zstd.win32-arm64-msvc.node'));
3127
try {
3228
if (localFileExisted) {
33-
nativeBinding = require('./zstd.win32-arm64-msvc.node')
29+
nativeBinding = require('./zstd.win32-arm64-msvc.node');
3430
} else {
35-
nativeBinding = require('@mongodb-js/zstd-win32-arm64-msvc')
31+
nativeBinding = require('@mongodb-js/zstd-win32-arm64-msvc');
3632
}
3733
} catch (e) {
38-
loadError = e
34+
loadError = e;
3935
}
40-
break
36+
break;
4137
default:
42-
throw new Error(`Unsupported architecture on Windows: ${arch}`)
38+
throw new Error(`Unsupported architecture on Windows: ${arch}`);
4339
}
44-
break
40+
break;
4541
case 'darwin':
4642
switch (arch) {
4743
case 'x64':
48-
localFileExisted = existsSync(join(__dirname, 'zstd.darwin-x64.node'))
44+
localFileExisted = existsSync(join(__dirname, 'zstd.darwin-x64.node'));
4945
try {
5046
if (localFileExisted) {
51-
nativeBinding = require('./zstd.darwin-x64.node')
47+
nativeBinding = require('./zstd.darwin-x64.node');
5248
} else {
53-
nativeBinding = require('@mongodb-js/zstd-darwin-x64')
49+
nativeBinding = require('@mongodb-js/zstd-darwin-x64');
5450
}
5551
} catch (e) {
56-
loadError = e
52+
loadError = e;
5753
}
58-
break
54+
break;
5955
case 'arm64':
60-
localFileExisted = existsSync(
61-
join(__dirname, 'zstd.darwin-arm64.node')
62-
)
56+
localFileExisted = existsSync(join(__dirname, 'zstd.darwin-arm64.node'));
6357
try {
6458
if (localFileExisted) {
65-
nativeBinding = require('./zstd.darwin-arm64.node')
59+
nativeBinding = require('./zstd.darwin-arm64.node');
6660
} else {
67-
nativeBinding = require('@mongodb-js/zstd-darwin-arm64')
61+
nativeBinding = require('@mongodb-js/zstd-darwin-arm64');
6862
}
6963
} catch (e) {
70-
loadError = e
64+
loadError = e;
7165
}
72-
break
66+
break;
7367
default:
74-
throw new Error(`Unsupported architecture on macOS: ${arch}`)
68+
throw new Error(`Unsupported architecture on macOS: ${arch}`);
7569
}
76-
break
70+
break;
7771
case 'freebsd':
7872
if (arch !== 'x64') {
79-
throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
73+
throw new Error(`Unsupported architecture on FreeBSD: ${arch}`);
8074
}
81-
localFileExisted = existsSync(join(__dirname, 'zstd.freebsd-x64.node'))
75+
localFileExisted = existsSync(join(__dirname, 'zstd.freebsd-x64.node'));
8276
try {
8377
if (localFileExisted) {
84-
nativeBinding = require('./zstd.freebsd-x64.node')
78+
nativeBinding = require('./zstd.freebsd-x64.node');
8579
} else {
86-
nativeBinding = require('@mongodb-js/zstd-freebsd-x64')
80+
nativeBinding = require('@mongodb-js/zstd-freebsd-x64');
8781
}
8882
} catch (e) {
89-
loadError = e
83+
loadError = e;
9084
}
91-
break
85+
break;
9286
case 'linux':
9387
switch (arch) {
9488
case 'x64':
95-
localFileExisted = existsSync(
96-
join(__dirname, 'zstd.linux-x64-gnu.node')
97-
)
89+
localFileExisted = existsSync(join(__dirname, 'zstd.linux-x64-gnu.node'));
9890
try {
9991
if (localFileExisted) {
100-
nativeBinding = require('./zstd.linux-x64-gnu.node')
92+
nativeBinding = require('./zstd.linux-x64-gnu.node');
10193
} else {
102-
nativeBinding = require('@mongodb-js/zstd-linux-x64-gnu')
94+
nativeBinding = require('@mongodb-js/zstd-linux-x64-gnu');
10395
}
10496
} catch (e) {
105-
loadError = e
97+
loadError = e;
10698
}
107-
break
99+
break;
108100
case 'arm64':
109-
localFileExisted = existsSync(
110-
join(__dirname, 'zstd.linux-arm64-gnu.node')
111-
)
101+
localFileExisted = existsSync(join(__dirname, 'zstd.linux-arm64-gnu.node'));
112102
try {
113103
if (localFileExisted) {
114-
nativeBinding = require('./zstd.linux-arm64-gnu.node')
104+
nativeBinding = require('./zstd.linux-arm64-gnu.node');
115105
} else {
116-
nativeBinding = require('@mongodb-js/zstd-linux-arm64-gnu')
106+
nativeBinding = require('@mongodb-js/zstd-linux-arm64-gnu');
117107
}
118108
} catch (e) {
119-
loadError = e
109+
loadError = e;
120110
}
121-
break
111+
break;
122112
case 'arm':
123-
localFileExisted = existsSync(
124-
join(__dirname, 'zstd.linux-arm-gnueabihf.node')
125-
)
113+
localFileExisted = existsSync(join(__dirname, 'zstd.linux-arm-gnueabihf.node'));
126114
try {
127115
if (localFileExisted) {
128-
nativeBinding = require('./zstd.linux-arm-gnueabihf.node')
116+
nativeBinding = require('./zstd.linux-arm-gnueabihf.node');
129117
} else {
130-
nativeBinding = require('@mongodb-js/zstd-linux-arm-gnueabihf')
118+
nativeBinding = require('@mongodb-js/zstd-linux-arm-gnueabihf');
131119
}
132120
} catch (e) {
133-
loadError = e
121+
loadError = e;
134122
}
135-
break
123+
break;
136124
default:
137-
throw new Error(`Unsupported architecture on Linux: ${arch}`)
125+
throw new Error(`Unsupported architecture on Linux: ${arch}`);
138126
}
139-
break
127+
break;
140128
default:
141-
throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
129+
throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`);
142130
}
143131

144132
if (!nativeBinding) {
145133
if (loadError) {
146-
throw loadError
134+
throw loadError;
147135
}
148-
throw new Error(`Failed to load native binding`)
136+
throw new Error(`Failed to load native binding`);
149137
}
150138

151-
const { compress, decompress } = nativeBinding
139+
const { compress, decompress } = nativeBinding;
152140

153-
module.exports.compress = compress
154-
module.exports.decompress = decompress
141+
module.exports.compress = compress;
142+
module.exports.decompress = decompress;

‎package-lock.json

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,26 @@
2626
"@napi-rs/cli": "^2.7.0",
2727
"chai": "^4.3.6",
2828
"mocha": "^9.2.1",
29+
"prettier": "^2.6.2",
2930
"standard-version": "^9.3.2"
3031
},
3132
"engines": {
3233
"node": ">= 10"
3334
},
35+
"prettier": {
36+
"printWidth": 100,
37+
"tabWidth": 2,
38+
"semi": true,
39+
"trailingComma": "none",
40+
"singleQuote": true,
41+
"arrowParens": "avoid"
42+
},
3443
"scripts": {
3544
"artifacts": "napi artifacts",
3645
"build": "napi build --platform --release",
3746
"build:debug": "napi build --platform",
47+
"format:js": "prettier --config ./package.json --write *.js",
48+
"format:rs": "cargo fmt",
3849
"prepublishOnly": "napi prepublish -t npm",
3950
"release": "standard-version -i HISTORY.md",
4051
"test": "mocha --recursive test/",

‎rustfmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
tab_spaces = 2
2-
edition = "2021"

‎src/lib.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
extern crate napi_derive;
33

44
use napi::{
5-
bindgen_prelude::AsyncTask,
6-
Env, Error, JsBuffer, JsBufferValue, Ref, Result, Status, Task,
5+
bindgen_prelude::AsyncTask, Env, Error, JsBuffer, JsBufferValue, Ref, Result, Status, Task,
76
};
8-
use zstd::stream::{encode_all, decode_all};
7+
use zstd::stream::{decode_all, encode_all};
98

109
const DEFAULT_LEVEL: i32 = 3;
1110

1211
struct Encoder {
1312
data: Ref<JsBufferValue>,
14-
level: i32
13+
level: i32,
1514
}
1615

1716
#[napi]
@@ -35,7 +34,7 @@ impl Task for Encoder {
3534
}
3635

3736
struct Decoder {
38-
data: Ref<JsBufferValue>
37+
data: Ref<JsBufferValue>,
3938
}
4039

4140
#[napi]
@@ -62,7 +61,7 @@ impl Task for Decoder {
6261
fn compress(data: JsBuffer, level: Option<i32>) -> Result<AsyncTask<Encoder>> {
6362
let encoder = Encoder {
6463
data: data.into_ref()?,
65-
level: level.unwrap_or(DEFAULT_LEVEL)
64+
level: level.unwrap_or(DEFAULT_LEVEL),
6665
};
6766
Ok(AsyncTask::new(encoder))
6867
}

‎yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,6 +1255,11 @@
12551255
"resolved" "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
12561256
"version" "3.0.0"
12571257

1258+
"prettier@^2.6.2":
1259+
"integrity" "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew=="
1260+
"resolved" "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz"
1261+
"version" "2.6.2"
1262+
12581263
"process-nextick-args@~2.0.0":
12591264
"integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
12601265
"resolved" "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"

0 commit comments

Comments
 (0)