Merge pull request #519 from zeromq/dev

Author: aminya

.eslintrc

@@ -9,5 +9,5 @@
   "rules": {
     "@typescript-eslint/quotes": ["error", "double"]
   },
-  "ignorePatterns": ["node_modules/", "build/", "lib/", "libzmq/", "tmp/", "zmq/"]
+  "ignorePatterns": ["node_modules/", "build/", "lib/", "libzmq/", "tmp/", "zmq/", "v5-compat.d.ts", "draft.d.ts"]
 }

.github/workflows/CI.yml

@@ -107,4 +107,4 @@ jobs:
 
       - name: Lint
         if: contains(matrix.os, 'ubuntu')
-        run: npm run lint
+        run: npm run lint-test

.gitignore

@@ -11,3 +11,5 @@ lib/binary/napi-v*/*.node
 build-tmp-napi-v*
 prebuilds
 test.js
+.cache/
+test/typings-compatibility/

binding.gyp

@@ -16,9 +16,16 @@
         ["zmq_shared == 'false'", {
           'actions': [{
             'action_name': 'build_libzmq',
-            'inputs': ['package.json'],
-            'outputs': ['libzmq/lib'],
-            'action': ['sh', '<(PRODUCT_DIR)/../../script/build.sh', '<(CONFIGURATION_NAME)'],
+            'inputs': ['package.json', './script/build.ts'],
+            'conditions': [
+              ['OS != "win"', {
+                'outputs': ['build/libzmq/lib/libzmq.a', 'build/libzmq/include/zmq.h', 'build/libzmq/include/zmq_utils.h'],
+              }],
+              ['OS == "win"', {
+                'outputs': ['build/libzmq/lib/libzmq.lib', 'build/libzmq/include/zmq.h', 'build/libzmq/include/zmq_utils.h'],
+              }],
+            ],
+            'action': ['ts-node', '<(PRODUCT_DIR)/../../script/build.ts'],
           }],
         }],
       ],
@@ -95,6 +102,7 @@
           ],
           'conditions': [
             ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+              # flag removal
               'cflags_cc!': [
                 '-std=gnu++0x',
                 '-std=gnu++1y'
@@ -172,6 +180,7 @@
           'defines': [
             'NAPI_CPP_EXCEPTIONS',
           ],
+          # flag removal
           'cflags_cc!': [
             "-fno-exceptions",
           ],

package.json

@@ -17,14 +17,18 @@
     "url": "https://github.com/zeromq/zeromq.js.git"
   },
   "dependencies": {
-    "node-gyp-build": "^4.5.0"
+    "@types/node": "^18.11.9",
+    "@types/shelljs": "^0.8.11",
+    "cross-env": "^7.0.3",
+    "node-gyp-build": "^4.5.0",
+    "shelljs": "^0.8.5",
+    "ts-node": "10.9"
   },
   "devDependencies": {
     "@gnd/typedoc": "^0.15.0-0",
     "@types/chai": ">=4.3",
     "@types/fs-extra": "^9.0.13",
     "@types/mocha": ">=10.0",
-    "@types/node": ">=18.11",
     "@types/semver": ">=7",
     "@types/weak-napi": "^2.0.1",
     "benchmark": ">=2",
@@ -38,13 +42,14 @@
     "mocha": ">=10.1",
     "node-addon-api": "^5.0.0",
     "node-fetch": "^3.3.0",
+    "node-gyp": "^9.3.0",
+    "npm-run-all2": "^6.0.4",
     "prebuildify": "^5.0.1",
     "prettier": "^2.7.1",
     "semver": ">=7",
     "shx": "^0.3.4",
     "tar-fs": "^2.1.1",
     "ts-morph": "^16.0.0",
-    "ts-node": ">=10",
     "typescript": "4.8",
     "weak-napi": "^2.0.2"
   },
@@ -75,12 +80,16 @@
     "build.js": "tsc --project tsconfig-build.json && node script/ci/downlevel-dts.js",
     "build.doc": "typedoc --out docs --name zeromq.js --excludeProtected --excludePrivate --excludeNotExported --excludeExternals --externalPattern 'src/+(draft|native|compat).ts' --tsconfig tsconfig-build.json --mode file",
     "prebuild": "ts-node -P ./tsconfig.json ./script/prebuild.ts",
-    "build.native": "prebuildify --napi --build-from-source",
-    "build.native.debug": "npm run build.native -- --debug",
-    "build": "npm run build.js && npm run build.native",
-    "build.debug": "npm run build.js && npm run build.native.debug",
-    "test": "npm run build.debug && mocha",
-    "lint": "sh script/lint.sh",
+    "build.native": "node-gyp configure --release && node-gyp build --release",
+    "build.native.debug": "cross-env CMAKE_BUILD_TYPE=Debug node-gyp configure --debug && cross-env CMAKE_BUILD_TYPE=Debug node-gyp build --debug",
+    "build": "run-p build.js build.native",
+    "build.debug": "run-p build.js build.native.debug",
+    "test": "run-s build.debug && mocha",
+    "lint.clang-format": "clang-format -i -style=file src/*.{cc,h} src/*/*.h",
+    "lint-test.eslint": "eslint **/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/",
+    "lint.eslint": "run-s lint-test.eslint -- --fix",
+    "lint": "run-p lint.eslint lint.clang-format",
+    "lint-test": "run-s lint-test.eslint",
     "bench": "node --expose-gc test/bench"
   },
   "keywords": [