Merge pull request #1072 from napi-rs/format-toml

style: format toml files

Cargo.toml

@@ -11,9 +11,7 @@ members = [
   "./memory-testing",
 ]
 
-exclude = [
+exclude = ["./testing"]
-  "./testing"
-]
 
 [profile.release]
 lto = true

bench/Cargo.toml

@@ -9,13 +9,17 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = {path = "../crates/napi", features = ["tokio_rt", "serde-json", "compat-mode"]}
+napi = { path = "../crates/napi", features = [
-napi-derive = {path = "../crates/macro", features = ["compat-mode"]}
+  "tokio_rt",
+  "serde-json",
+  "compat-mode",
+] }
+napi-derive = { path = "../crates/macro", features = ["compat-mode"] }
 serde = "1"
 serde_json = "1"
 
 [target.'cfg(all(target_arch = "x86_64", not(target_env = "musl")))'.dependencies]
-mimalloc = {version = "0.1"}
+mimalloc = { version = "0.1" }
 
 [build-dependencies]
-napi-build = {path = "../crates/build"}
+napi-build = { path = "../crates/build" }

crates/backend/Cargo.toml

@@ -20,7 +20,7 @@ type-def = ["regex", "once_cell"]
 convert_case = "0.5"
 proc-macro2 = "1"
 quote = "1"
-syn = {version = "1", features = ["fold", "full", "extra-traits"]}
+syn = { version = "1", features = ["fold", "full", "extra-traits"] }
 
 [dependencies.regex]
 optional = true

crates/macro/Cargo.toml

@@ -22,10 +22,10 @@ type-def = ["napi-derive-backend/type-def"]
 
 [dependencies]
 convert_case = "0.5"
-napi-derive-backend = {version = "1.0.25", path = "../backend"}
+napi-derive-backend = { version = "1.0.25", path = "../backend" }
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = {version = "1.0", features = ["fold", "full", "extra-traits"]}
+syn = { version = "1.0", features = ["fold", "full", "extra-traits"] }
 
 [lib]
 proc-macro = true

crates/napi/Cargo.toml

@@ -48,7 +48,7 @@ tokio_time = ["tokio/time"]
 [dependencies]
 ctor = "0.1"
 lazy_static = "1"
-napi-sys = {version = "2.1.0", path = "../sys"}
+napi-sys = { version = "2.1.0", path = "../sys" }
 
 [dependencies.encoding_rs]
 optional = true
@@ -68,4 +68,8 @@ optional = true
 version = "1"
 
 [target.'cfg(windows)'.dependencies]
-windows = {version = "0.30", features = ["Win32_System_WindowsProgramming", "Win32_System_LibraryLoader", "Win32_Foundation"]}
+windows = { version = "0.32", features = [
+  "Win32_System_WindowsProgramming",
+  "Win32_System_LibraryLoader",
+  "Win32_Foundation",
+] }

examples/napi-compat-mode/Cargo.toml

@@ -14,13 +14,18 @@ napi3 = ["napi/napi3"]
 
 [dependencies]
 futures = "0.3"
-napi = {path = "../../crates/napi", features = ["tokio_rt", "serde-json", "latin1", "compat-mode"]}
+napi = { path = "../../crates/napi", features = [
-napi-derive = {path = "../../crates/macro", features = ["compat-mode"]}
+  "tokio_rt",
+  "serde-json",
+  "latin1",
+  "compat-mode",
+] }
+napi-derive = { path = "../../crates/macro", features = ["compat-mode"] }
 serde = "1"
 serde_bytes = "0.11"
 serde_derive = "1"
 serde_json = "1"
-tokio = {version = "1", features = ["default", "fs"]}
+tokio = { version = "1", features = ["default", "fs"] }
 
 [build-dependencies]
-napi-build = {path = "../../crates/build"}
+napi-build = { path = "../../crates/build" }

examples/napi/Cargo.toml

@@ -10,11 +10,19 @@ crate-type = ["cdylib"]
 
 [dependencies]
 futures = "0.3"
-napi = {path = "../../crates/napi", default-features = false, features = ["tokio_fs", "napi8", "tokio_rt", "serde-json", "async", "experimental", "latin1"]}
+napi = { path = "../../crates/napi", default-features = false, features = [
-napi-derive = {path = "../../crates/macro", features = ["type-def"]}
+  "tokio_fs",
+  "napi8",
+  "tokio_rt",
+  "serde-json",
+  "async",
+  "experimental",
+  "latin1",
+] }
+napi-derive = { path = "../../crates/macro", features = ["type-def"] }
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
 
 [build-dependencies]
-napi-build = {path = "../../crates/build"}
+napi-build = { path = "../../crates/build" }

examples/napi/__test__/values.spec.ts.md

@@ -14,6 +14,7 @@ Generated by [AVA](https://avajs.dev).
       '@rollup/plugin-json',
       '@rollup/plugin-node-resolve',
       '@rollup/plugin-replace',
+      '@taplo/cli',
       '@types/debug',
       '@types/lodash-es',
       '@types/node',

memory-testing/Cargo.toml

@@ -10,13 +10,18 @@ crate-type = ["cdylib"]
 
 [dependencies]
 futures = "0.3"
-napi = {path = "../crates/napi", features = ["tokio_rt", "serde-json", "latin1", "compat-mode"]}
+napi = { path = "../crates/napi", features = [
-napi-derive = {path = "../crates/macro", features = ["compat-mode"]}
+  "tokio_rt",
+  "serde-json",
+  "latin1",
+  "compat-mode",
+] }
+napi-derive = { path = "../crates/macro", features = ["compat-mode"] }
 serde = "1"
 serde_bytes = "0.11"
 serde_derive = "1"
 serde_json = "1"
-tokio = {version = "1", features = ["default", "fs"]}
+tokio = { version = "1", features = ["default", "fs"] }
 
 [build-dependencies]
-napi-build = {path = "../crates/build"}
+napi-build = { path = "../crates/build" }

package.json

@@ -27,9 +27,10 @@
     "build:test:android:armv7": "yarn workspace compat-mode-examples build --target armv7-linux-androideabi && yarn workspace examples build --target armv7-linux-androideabi",
     "build:test:armv7": "yarn workspace compat-mode-examples build-armv7 && yarn workspace examples build-armv7",
     "bundle": "rollup -c rollup.config.js",
-    "format": "run-p format:prettier format:rs",
+    "format": "run-p format:prettier format:rs format:toml",
     "format:prettier": "prettier . -w",
     "format:rs": "cargo fmt",
+    "format:toml": "taplo format",
     "lint": "eslint -c .eslintrc.yml .",
     "prepublishOnly": "npm run build && pinst --disable",
     "test": "ava",
@@ -54,6 +55,12 @@
     ],
     "*.@(js||ts|json|md|yml|yaml)": [
       "prettier --write"
+    ],
+    "*.toml": [
+      "taplo format"
+    ],
+    "*.rs": [
+      "cargo fmt"
     ]
   },
   "husky": {
@@ -67,6 +74,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^3.0.1",
+    "@taplo/cli": "^0.3.2",
     "@types/debug": "^4.1.7",
     "@types/lodash-es": "^4.17.5",
     "@types/node": "^17.0.10",

yarn.lock

@@ -1348,6 +1348,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@taplo/cli@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "@taplo/cli@npm:0.3.2"
+  dependencies:
+    fast-glob: ^3.2.4
+    node-fetch: ^2.6.1
+  bin:
+    taplo: dist/cli.js
+  checksum: aa289d561b767ee3730ee431dec8a55bf2b2da5bc8e837156ca8cf39a165ae0e2edf16f669e5a40da2b5c8b67ceea5bb80cd2e91803659b09af707505741992c
+  languageName: node
+  linkType: hard
+
 "@tootallnate/once@npm:1":
   version: 1.1.2
   resolution: "@tootallnate/once@npm:1.1.2"
@@ -3956,7 +3968,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9":
+"fast-glob@npm:^3.2.4, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9":
   version: 3.2.11
   resolution: "fast-glob@npm:3.2.11"
   dependencies:
@@ -6156,6 +6168,7 @@ __metadata:
     "@rollup/plugin-json": ^4.1.0
     "@rollup/plugin-node-resolve": ^13.1.3
     "@rollup/plugin-replace": ^3.0.1
+    "@taplo/cli": ^0.3.2
     "@types/debug": ^4.1.7
     "@types/lodash-es": ^4.17.5
     "@types/node": ^17.0.10