Merge pull request #130 from ChainSafe/mkeil/migrate-rebuild-move-nap…

…i-src-to-root

feat: move napi code, utils and config files out of rebuild to repo root

.eslintrc.js

@@ -11,8 +11,9 @@ module.exports = {
   },
   parser: "@typescript-eslint/parser",
   parserOptions: {
-    ecmaVersion: 10,
+    ecmaVersion: "latest",
     project: "./tsconfig.json",
+    sourceType: "script",
   },
   plugins: ["@typescript-eslint", "eslint-plugin-import", "eslint-plugin-node", "prettier"],
   extends: [
@@ -82,11 +83,29 @@ module.exports = {
   },
   overrides: [
     {
-      files: ["**/test/**/*.ts"],
+      files: ["lib/index.mjs"],
+      parserOptions: {
+        sourceType: "module"
+      },
+      rules: {
+        // The imports are all resolved via tsconfig.mjs.json but the root tsconfig that eslint uses
+        // shows them as unresolved.
+        "import/no-unresolved": "off",
+      },
+    }, 
+    {
+      files: ["test/**/*.ts"],
       rules: {
         "import/no-extraneous-dependencies": "off",
         "@typescript-eslint/no-explicit-any": "off",
       },
+    }, 
+    {
+      // Is a dev file and squacks about chokidar being a devDependency
+      files: ["scripts/watch.ts"],
+      rules: {
+        "import/no-extraneous-dependencies": "off"
+      },
     },
   ],
 };

rebuild/.vscode/c_cpp_properties.json → .vscode/c_cpp_properties.json

@@ -1,10 +1,11 @@
 {
     "configurations": [
         {
-            "name": "Mac",
+            "name": "OSX - Napi Dependency Configuration",
             "includePath": [
                 "${workspaceFolder}/**",
-                "/Users/matthewkeil/.node-gyp/**"
+                "${env:HOME}/.node-gyp/**",
+                "${env:HOME}/.nvm/versions/node/**"
             ],
             "defines": [],
             "macFrameworkPath": [

.vscode/launch.json

@@ -21,6 +21,18 @@
             "console": "integratedTerminal",
             "protocol": "inspector",
             "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug Native Addon",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "npm: build:debug",
+            "program": "node",
+            "args": [
+                "node_modules/.bin/mocha",
+                "test/unit/**/*.test.ts"
+            ]
         }
     ]
 }

rebuild/binding.gyp → binding.gyp

@@ -3,16 +3,16 @@
     {
       'target_name': 'blst_ts_addon',
       'sources': [
-        'deps/blst/src/server.c',
-        'deps/blst/build/assembly.S',
+        'blst/src/server.c',
+        'blst/build/assembly.S',
         'src/addon.cc',
         'src/secret_key.cc',
         'src/public_key.cc',
         'src/signature.cc',
         'src/functions.cc',
       ],
       'include_dirs': [
-        'deps/blst/bindings',
+        'blst/bindings',
         "<!@(node -p \"require('node-addon-api').include_dir\")",
       ],
       'dependencies': [ "<!(node -p \"require('node-addon-api').gyp\")" ],

package.json

@@ -10,12 +10,16 @@
     "blst"
   ],
   "scripts": {
-    "install": "node dist/scripts/install.js",
-    "lint": "eslint --color --ext .ts src/ test/",
+    "bootstrap": "yarn install --ignore-scripts && yarn build && yarn install",
     "build": "tsc --project tsconfig.build.json",
+    "build:gyp": "node-gyp build",
+    "build:gyp:debug": "node-gyp build --debug",
     "build:fuzz": "tsc --project tsconfig.fuzz.json",
-    "bootstrap": "yarn install --ignore-scripts && yarn build && yarn install",
     "clean": "rm -rf prebuild/*.node dist blst/libblst.a blst/bindings/libblst.a blst/bindings/node.js/blst.node blst/bindings/node.js/blst_wrap.cpp",
+    "clean:gyp": "node-gyp clean && node-gyp configure",
+    "lint": "npm run lint:c && npm run lint:ts",
+    "lint:c": "clang-format -i ./src/*",
+    "lint:ts": "eslint --color --ext .js,.mjs,.cjs,.ts lib/ scripts/ test/ utils/",
     "test": "yarn test:unit && yarn test:spec && yarn test:perf && yarn test:memory",
     "test:fuzz": "ts-node test/fuzz/fuzz.test.ts",
     "test:memory": "node -r ts-node/register --expose-gc test/memory/memory.test.ts",
@@ -59,7 +63,9 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
+    "bindings": "^1.5.0",
+    "node-addon-api": "^6.1.0",
     "node-fetch": "^2.6.1",
-    "node-gyp": "^8.4.0"
+    "node-gyp": "^10.0.1"
   }
 }