Upgrading project dependencies

paulpdaniels · paulpdaniels · commit 78abc56151d7 · 2018-08-27T23:54:38.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+/lib
+package-lock.json
+
 # User-specific stuff:
 .idea/
 
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "trailingComma": "all",
+  "singleQuote": true
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 language: node_js
 node_js:
+  - "10"
+  - "8"
   - "6"
   - "6.1"
   - "5.11"
diff --git a/codecov.yml b/codecov.yml
@@ -1 +1,10 @@
-
+coverage:
+  parsers:
+    javascript:
+      enable_partials: yes
+  status:
+    project:
+      default:
+        target: "83%"
+    patch:
+      enabled: false
diff --git a/index.js b/index.js
diff --git a/index.js.map b/index.js.map
diff --git a/index.ts b/index.ts
diff --git a/package.json b/package.json
@@ -2,11 +2,30 @@
   "name": "node-rx-http",
   "version": "1.0.1",
   "description": "A simple Rx wrapper around the native Node http module",
-  "main": "index.js",
+  "main": "./lib/bundle.umd.js",
+  "module": "./lib/index.js",
+  "jsnext:main": "./lib/index.js",
+  "typings": "./lib/index.d.ts",
   "scripts": {
-    "test": "mocha"
+    "build": "tsc -p .",
+    "bundle": "rollup -c",
+    "test": "jest",
+    "clean": "rimraf lib/* && rimraf coverage/*",
+    "postbuild": "npm run bundle",
+    "prebuild": "npm run clean",
+    "prepublishOnly": "npm run clean && npm run build",
+    "coverage": "npm run lint && jest --coverage",
+    "coverage:upload": "codecov",
+    "check-types": "tsc --noEmit -p tsconfig.json && tsc --noEmit -p tsconfig.tests.json"
   },
-  "repository": "https://github.com/Dapperware/node-rx-http.git",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Dapperware/node-rx-http.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Dapperware/node-rx-http/issues"
+  },
+  "homepage": "https://github.com/Dapperware/node-rx-http#readme",
   "keywords": [
     "rx",
     "reactive-extensions",
@@ -20,8 +39,32 @@
     "rxjs": "^6.2.2"
   },
   "devDependencies": {
+    "@types/jest": "^23.3.1",
     "chai": "^4.1.2",
+    "jest": "^23.5.0",
+    "jest-fetch-mock": "^1.6.5",
     "mocha": "^5.2.0",
-    "nock": "^9.6.1"
+    "nock": "^9.6.1",
+    "prettier": "^1.14.2",
+    "rimraf": "^2.6.2",
+    "rollup": "^0.65.0",
+    "rollup-plugin-sourcemaps": "^0.4.2",
+    "ts-jest": "^23.1.4",
+    "typescript": "^2.9.2",
+    "uglify-js": "^3.4.8"
+  },
+  "jest": {
+    "globals": {
+      "ts-jest": {
+        "useBabelrc": false,
+        "mapCoverage": true
+      }
+    },
+    "mapCoverage": true,
+    "transform": {
+      ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -0,0 +1,22 @@
+import sourcemaps from 'rollup-plugin-sourcemaps';
+
+export default {
+  input: 'lib/index.js',
+  output: {
+    file: 'lib/bundle.umd.js',
+    format: 'umd',
+    exports: 'named',
+    name: 'node-rx-http',
+    sourcemaps: true
+  },
+  onwarn,
+  plugins: [sourcemaps()]
+}
+
+function onwarn(message) {
+  const suppressed = ['UNRESOLVED_IMPORT', 'THIS_IS_UNDEFINED'];
+
+  if (!suppressed.find(code => message.code === code)) {
+    return console.warn(message.message);
+  }
+}
diff --git a/src/__tests__/index.ts b/src/__tests__/index.ts
@@ -1,6 +1,5 @@
-var RxHttp = require('../index');
-var nock = require('nock');
-var expect = require('chai').expect;
+import RxHttp from '../index';
+const nock = require('nock');
 
 describe('request', function () {
   describe('get', function () {
@@ -13,8 +12,8 @@ describe('request', function () {
     it('should forward errors to the handler', function (done) {
       RxHttp.get('http://example.com/error').subscribe(
         x => {
-          expect(x.statusCode).to.equal(401);
-          expect(x.body).to.equal('Error!');
+          expect(x.statusCode).toEqual(401);
+          expect(x.body).toEqual('Error!');
         },
         done,
         done
@@ -23,7 +22,7 @@ describe('request', function () {
 
     it('should return 200 on success', function (done) {
       RxHttp.get('http://example.com/safe').subscribe(x => {
-        expect(x.statusCode).to.equal(200);
+        expect(x.statusCode).toEqual(200);
       }, done, done);
     });
   });
diff --git a/src/index.ts b/src/index.ts
@@ -0,0 +1,68 @@
+'use strict';
+import { request as httpRequest, IncomingMessage, RequestOptions as httpRequestOptions } from 'http';
+import { Observable, Subscriber, fromEvent } from 'rxjs';
+import { first, map, mergeMap, reduce, takeUntil } from 'rxjs/operators';
+
+type RequestOptions = httpRequestOptions;
+
+export const methods = {
+  get: observableGet,
+  request: observableRequest
+};
+
+
+
+function observableGet(options: RequestOptions | string) {
+  return observableRequest(options);
+}
+
+function observableRequest(options: RequestOptions | string, body?: any) {
+  return new RequestObservable(options, body);
+}
+
+class RequestObservable extends Observable<any> {
+  constructor(private options: RequestOptions | string, private body?: any) {
+    super();
+  }
+
+  _subscribe(subscriber: Subscriber<any>) {
+    const req = httpRequest(this.options);
+
+    const sub1 = fromEvent(req, 'response')
+      .pipe(
+        first(),
+        mergeMap(
+          (res: IncomingMessage) => {
+            const data = fromEvent(res, 'data');
+            const done = fromEvent(res, 'end');
+            return data.pipe(
+              takeUntil(done),
+              reduce((body: string, delta: string) => body + delta, ''),
+            );
+          },
+          ({ statusCode, headers }, body: string) => ({
+            statusCode: statusCode,
+            headers: headers,
+            body: body,
+          })),
+      )
+      .subscribe(subscriber);
+
+    const sub2 = fromEvent(req, 'error')
+      .pipe(
+        map((e) => {
+          throw e;
+        }),
+      )
+      .subscribe(subscriber);
+
+    sub1.add(sub2);
+
+    this.body && req.write(this.body);
+    req.end();
+
+    return sub1;
+  }
+}
+
+export default methods;
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["es6"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "removeComments": true,
+    "sourceMap": true,
+    "declaration": true,
+    "noImplicitAny": false,
+    "noUnusedParameters": false,
+    "noUnusedLocals": true,
+    "skipLibCheck": true,
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/**/__tests__/*.ts"]
+}
diff --git a/tsconfig.tests.json b/tsconfig.tests.json
@@ -0,0 +1,5 @@
+{
+  "extends": "./tsconfig",
+  "include": ["src/**/__tests__/*.ts"],
+  "exclude": []
+}
diff --git a/typings.json b/typings.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "trailingComma": "all",
 +  "singleQuote": true
 +}