chore: improve linting

Author: codebytere

.github/workflows/lint.yml

@@ -0,0 +1,23 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Use Node.js 12.x
+      uses: actions/setup-node@v1
+      with:
+        version: 12.x
+    - name: Lint
+      run: |
+        npm install
+        npm run lint

.github/workflows/nodejs.yml

@@ -1,12 +1,16 @@
 name: Test
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
-
     runs-on: macOS-latest
-
     steps:
     - uses: actions/checkout@master
     - name: Use Node.js 10.x

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "singleQuote": true,
+  "printWidth": 100,
+  "parser": "typescript",
+  "endOfLine": "lf"
+}

package-lock.json

@@ -6,7 +6,8 @@
   "scripts": {
     "build": "node-gyp rebuild",
     "clean": "node-gyp clean",
-    "format": "clang-format -i permissions.mm",
+    "lint": "prettier --check index.js",
+    "format": "clang-format -i permissions.mm && prettier --write index.js",
     "test": "./node_modules/.bin/mocha --reporter spec"
   },
   "repository": {
@@ -34,6 +35,7 @@
     "chai": "^4.2.0",
     "clang-format": "^1.3.0",
     "mocha": "^6.2.2",
-    "node-gyp": "^6.0.1"
+    "node-gyp": "^6.0.1",
+    "prettier": "^2.0.4"
   }
 }

package.json

@@ -287,59 +287,71 @@ void AskForFullDiskAccess(const Napi::CallbackInfo &info) {
 Napi::Promise AskForCameraAccess(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
   Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env);
-  Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New(env, Napi::Function::New(env, NoOp), "cameraAccessCallback", 0, 1, [](Napi::Env) {});
+  Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New(
+      env, Napi::Function::New(env, NoOp), "cameraAccessCallback", 0, 1,
+      [](Napi::Env) {});
 
   if (@available(macOS 10.14, *)) {
     std::string auth_status = MediaAuthStatus("camera");
 
     if (auth_status == "not determined") {
-        [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
-          auto callback = [=](Napi::Env env, Napi::Function js_cb, const char *granted) {
-            deferred.Resolve(Napi::String::New(env, granted));
-          };
-
-          ts_fn.BlockingCall(granted ? "authorized" : "denied", callback);
-        }];  
-    } else if (auth_status == "denied"){
+      [AVCaptureDevice
+          requestAccessForMediaType:AVMediaTypeVideo
+                  completionHandler:^(BOOL granted) {
+                    auto callback = [=](Napi::Env env, Napi::Function js_cb,
+                                        const char *granted) {
+                      deferred.Resolve(Napi::String::New(env, granted));
+                    };
+
+                    ts_fn.BlockingCall(granted ? "authorized" : "denied",
+                                       callback);
+                  }];
+    } else if (auth_status == "denied") {
       NSWorkspace *workspace = [[NSWorkspace alloc] init];
-      NSString *pref_string = @"x-apple.systempreferences:com.apple.preference.security?Privacy_Camera";
-  
+      NSString *pref_string = @"x-apple.systempreferences:com.apple.preference."
+                              @"security?Privacy_Camera";
+
       [workspace openURL:[NSURL URLWithString:pref_string]];
 
       deferred.Resolve(Napi::String::New(env, "denied"));
     } else {
       deferred.Resolve(Napi::String::New(env, auth_status));
-    }    
+    }
   } else {
     deferred.Resolve(Napi::String::New(env, "authorized"));
   }
 
   return deferred.Promise();
 }
 
-
-
 // Request Microphone Access.
 Napi::Promise AskForMicrophoneAccess(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
   Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env);
-  Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New(env, Napi::Function::New(env, NoOp), "microphoneAccessCallback", 0, 1, [](Napi::Env) {});
+  Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New(
+      env, Napi::Function::New(env, NoOp), "microphoneAccessCallback", 0, 1,
+      [](Napi::Env) {});
 
   if (@available(macOS 10.14, *)) {
     std::string auth_status = MediaAuthStatus("microphone");
 
     if (auth_status == "not determined") {
-        [AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio completionHandler:^(BOOL granted) {
-          auto callback = [=](Napi::Env env, Napi::Function js_cb, const char *granted) {
-            deferred.Resolve(Napi::String::New(env, granted));
-          };
-
-          ts_fn.BlockingCall(granted ? "authorized" : "denied", callback);
-        }];  
+      [AVCaptureDevice
+          requestAccessForMediaType:AVMediaTypeAudio
+                  completionHandler:^(BOOL granted) {
+                    auto callback = [=](Napi::Env env, Napi::Function js_cb,
+                                        const char *granted) {
+                      deferred.Resolve(Napi::String::New(env, granted));
+                    };
+
+                    ts_fn.BlockingCall(granted ? "authorized" : "denied",
+                                       callback);
+                  }];
     } else if (auth_status == "denied") {
       NSWorkspace *workspace = [[NSWorkspace alloc] init];
-      NSString *pref_string = @"x-apple.systempreferences:com.apple.preference.security?Privacy_Microphone";
-  
+      NSString *pref_string = @"x-apple.systempreferences:com.apple.preference."
+                              @"security?Privacy_Microphone";
+
       [workspace openURL:[NSURL URLWithString:pref_string]];
 
       deferred.Resolve(Napi::String::New(env, "denied"));
@@ -388,9 +400,9 @@ void AskForAccessibilityAccess(const Napi::CallbackInfo &info) {
               Napi::Function::New(env, AskForRemindersAccess));
   exports.Set(Napi::String::New(env, "askForFullDiskAccess"),
               Napi::Function::New(env, AskForFullDiskAccess));
-  exports.Set(Napi::String::New(env, "askForCameraAccess"),  
+  exports.Set(Napi::String::New(env, "askForCameraAccess"),
               Napi::Function::New(env, AskForCameraAccess));
-  exports.Set(Napi::String::New(env, "askForMicrophoneAccess"),  
+  exports.Set(Napi::String::New(env, "askForMicrophoneAccess"),
               Napi::Function::New(env, AskForMicrophoneAccess));
   exports.Set(Napi::String::New(env, "askForScreenCaptureAccess"),
               Napi::Function::New(env, AskForScreenCaptureAccess));