Merge pull request #313 from ml054/v5.2

RDBC-592 node.js typings issues

Author: ml054

package-lock.json

@@ -54,15 +54,13 @@
   "author": "Hibernating Rhinos",
   "license": "MIT",
   "devDependencies": {
-    "@types/bluebird": "^3.5.36",
     "@types/md5": "^2.3.2",
     "@types/mocha": "^9.1.1",
     "@types/pluralize": "0.0.29",
     "@types/rimraf": "^3.0.2",
     "@types/sinon": "^10.0.11",
     "@types/unzipper": "^0.10.5",
     "@types/util.promisify": "^1.0.4",
-    "@types/ws": "^7.4.7",
     "@typescript-eslint/eslint-plugin": "^5.26.0",
     "@typescript-eslint/parser": "^5.26.0",
     "cross-os": "^1.3.0",
@@ -81,12 +79,15 @@
     "unzipper": "^0.10.11"
   },
   "dependencies": {
+    "@types/bluebird": "^3.5.36",
+    "@types/node": "^18.0.0",
     "@types/node-fetch": "^2.6.1",
     "@types/qs": "^6.9.7",
     "@types/semaphore": "^1.1.0",
     "@types/stream-json": "^1.7.2",
     "@types/uuid": "^8.3.4",
     "@types/verror": "^1.10.5",
+    "@types/ws": "^7.4.7",
     "abort-controller": "^3.0.0",
     "bluebird": "^3.7.2",
     "change-case": "^3.1.0",

package.json

@@ -1,4 +1,4 @@
-import * as FilterBase from "stream-json/filters/FilterBase";
+import FilterBase = require("stream-json/filters/FilterBase");
 import { ObjectUtil, CasingConvention } from "../../../Utility/ObjectUtil";
 import { throwError } from "../../../Exceptions";
 

src/Mapping/Json/Streams/TransformKeysJsonStream.ts

@@ -1,5 +1,7 @@
 import "./Utility/Polyfills";
 
+import "./Types/readable-stream";
+
 export { DocumentConventions } from "./Documents/Conventions/DocumentConventions";
 export { BulkInsertConventions } from "./Documents/Conventions/BulkInsertConventions";
 export { RavenErrorType } from "./Exceptions";

src/Types/readable-stream.d.ts src/Types/readable-stream.tssrc/Types/readable-stream.d.ts renamed to src/Types/readable-stream.ts

@@ -3,11 +3,10 @@
 
   "include": [
     "./src/**/*",
-    "./src/Types/global.d.ts",
-    "./src/Types/readable-stream.d.ts"
+    "./src/Types/global.d.ts"
   ],
   "exclude": [
     "node_modules",
     "lib"
   ]
-}
+}

src/index.ts

@@ -22,12 +22,11 @@
   },
   "files": [
     "./src/index.ts",
-    "./src/Types/global.d.ts",
-    "./src/Types/readable-stream.d.ts"
+    "./src/Types/global.d.ts"
   ],
   "exclude": [
     "node_modules",
     "lib",
     "dist"
   ]
-}
+}

tsconfig.imports-check.json

@@ -26,10 +26,10 @@
   "include": [
     "test",
     "./src/Types/global.d.ts",
-    "./src/Types/readable-stream.d.ts"
+    "./src/Types/readable-stream.ts"
   ],
   "exclude": [
     "node_modules",
     "lib"
   ]
-}
+}