Skip to content
This repository has been archived by the owner on Nov 2, 2020. It is now read-only.

Commit

Permalink
fix: changed the module format back to commonjs for compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
tannerntannern committed Nov 24, 2018
1 parent d05a5b7 commit 8248f4a
Show file tree
Hide file tree
Showing 14 changed files with 292 additions and 139 deletions.
18 changes: 10 additions & 8 deletions dist/client/express-client.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import axios from 'axios';
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var axios_1 = require("axios");
/**
* Basic AJAX class than can be used in Node or the browser. Essentially just wraps around some axios methods and
* provides the proper typing based on the given HttpInterface, so that no requests are malformed.
Expand All @@ -18,7 +20,7 @@ var ExpressClient = /** @class */ (function () {
Object.assign(config, {
url: this.host + endpoint
});
return axios.request(config);
return axios_1.default.request(config);
};
/**
* Sends a GET request to the given endpoint. Note that since GET requests cannot have a body, the args are passed
Expand All @@ -28,7 +30,7 @@ var ExpressClient = /** @class */ (function () {
if (config === undefined)
config = {};
config.params = args;
return axios.get(this.host + endpoint, config);
return axios_1.default.get(this.host + endpoint, config);
};
/**
* Sends a DELETE request to the given endpoint. Note that since DELETE requests cannot have a body, the args are
Expand All @@ -38,26 +40,26 @@ var ExpressClient = /** @class */ (function () {
if (config === undefined)
config = {};
config.params = args;
return axios.delete(this.host + endpoint, config);
return axios_1.default.delete(this.host + endpoint, config);
};
/**
* Sends a POST request to the given endpoint with the given arguments.
*/
ExpressClient.prototype.post = function (endpoint, args, config) {
return axios.post(this.host + endpoint, args, config);
return axios_1.default.post(this.host + endpoint, args, config);
};
/**
* Sends a PUT request to the given endpoint with the given arguments.
*/
ExpressClient.prototype.put = function (endpoint, args, config) {
return axios.put(this.host + endpoint, args, config);
return axios_1.default.put(this.host + endpoint, args, config);
};
/**
* Sends a PATCH request to the given endpoint with the given arguments.
*/
ExpressClient.prototype.patch = function (endpoint, args, config) {
return axios.patch(this.host + endpoint, args, config);
return axios_1.default.patch(this.host + endpoint, args, config);
};
return ExpressClient;
}());
export { ExpressClient };
exports.ExpressClient = ExpressClient;
10 changes: 6 additions & 4 deletions dist/client/socket-client.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
Expand All @@ -11,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
import * as socketio from 'socket.io-client';
import { SocketMixin } from '../lib/socket-mixin';
Object.defineProperty(exports, "__esModule", { value: true });
var socketio = require("socket.io-client");
var socket_mixin_1 = require("../lib/socket-mixin");
/**
* Basic socket client that can be used in Node or in the browser.
*/
Expand Down Expand Up @@ -110,5 +112,5 @@ var SocketClient = /** @class */ (function (_super) {
(_a = this.socket).emit.apply(_a, [response.name].concat(response.args));
};
return SocketClient;
}(SocketMixin));
export { SocketClient };
}(socket_mixin_1.SocketMixin));
exports.SocketClient = SocketClient;
12 changes: 7 additions & 5 deletions dist/client/socket-express-client.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
"use strict";
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
import { MixinDecorator } from 'ts-mixer';
import { SocketClient } from './socket-client';
import { ExpressClient } from './express-client';
Object.defineProperty(exports, "__esModule", { value: true });
var ts_mixer_1 = require("ts-mixer");
var socket_client_1 = require("./socket-client");
var express_client_1 = require("./express-client");
/**
* Simply mixes SocketClient and ExpressClient together into one class.
*/
Expand All @@ -15,8 +17,8 @@ var SocketExpressClient = /** @class */ (function () {
function SocketExpressClient() {
}
SocketExpressClient = __decorate([
MixinDecorator(SocketClient, ExpressClient)
ts_mixer_1.MixinDecorator(socket_client_1.SocketClient, express_client_1.ExpressClient)
], SocketExpressClient);
return SocketExpressClient;
}());
export { SocketExpressClient };
exports.SocketExpressClient = SocketExpressClient;
21 changes: 14 additions & 7 deletions dist/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { HttpServer } from './server/http-server';
import { ExpressServerManager } from './server/express-server';
import { ExpressClient } from './client/express-client';
import { SocketServerManager } from './server/socket-server';
import { SocketClient } from './client/socket-client';
import { SocketExpressClient } from './client/socket-express-client';
export { HttpServer, ExpressServerManager, ExpressClient, SocketServerManager, SocketClient, SocketExpressClient };
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var http_server_1 = require("./server/http-server");
exports.HttpServer = http_server_1.HttpServer;
var express_server_1 = require("./server/express-server");
exports.ExpressServerManager = express_server_1.ExpressServerManager;
var express_client_1 = require("./client/express-client");
exports.ExpressClient = express_client_1.ExpressClient;
var socket_server_1 = require("./server/socket-server");
exports.SocketServerManager = socket_server_1.SocketServerManager;
var socket_client_1 = require("./client/socket-client");
exports.SocketClient = socket_client_1.SocketClient;
var socket_express_client_1 = require("./client/socket-express-client");
exports.SocketExpressClient = socket_express_client_1.SocketExpressClient;
2 changes: 2 additions & 0 deletions dist/interface/http-interface.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
2 changes: 2 additions & 0 deletions dist/interface/socket-interface.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
4 changes: 3 additions & 1 deletion dist/lib/socket-mixin.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
/**
* Mixin for shared socket functionality between the server and client.
*/
Expand Down Expand Up @@ -54,4 +56,4 @@ var SocketMixin = /** @class */ (function () {
};
return SocketMixin;
}());
export { SocketMixin };
exports.SocketMixin = SocketMixin;
2 changes: 2 additions & 0 deletions dist/lib/types.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
12 changes: 7 additions & 5 deletions dist/server/express-server.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
Expand All @@ -11,9 +12,10 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
import * as express from 'express';
import * as bodyParser from 'body-parser';
import { ServerManager } from './http-server';
Object.defineProperty(exports, "__esModule", { value: true });
var express = require("express");
var bodyParser = require("body-parser");
var http_server_1 = require("./http-server");
/**
* A simple HTTP server built on Express, with an API protected by TypeScript.
*
Expand Down Expand Up @@ -91,5 +93,5 @@ var ExpressServerManager = /** @class */ (function (_super) {
// Nothing to clean up
};
return ExpressServerManager;
}(ServerManager));
export { ExpressServerManager };
}(http_server_1.ServerManager));
exports.ExpressServerManager = ExpressServerManager;
8 changes: 5 additions & 3 deletions dist/server/http-server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import * as http from 'http';
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var http = require("http");
/**
* Defines the common interface and shared functionality that all Servers should have.
*/
Expand Down Expand Up @@ -97,7 +99,7 @@ var HttpServer = /** @class */ (function () {
};
return HttpServer;
}());
export { HttpServer };
exports.HttpServer = HttpServer;
/**
* A special class that can be attached to HttpServers to manage them; the "management" part must be implemented.
*/
Expand Down Expand Up @@ -128,4 +130,4 @@ var ServerManager = /** @class */ (function () {
};
return ServerManager;
}());
export { ServerManager };
exports.ServerManager = ServerManager;
16 changes: 9 additions & 7 deletions dist/server/socket-server.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
Expand All @@ -17,10 +18,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
import * as socketio from 'socket.io';
import { ServerManager } from './http-server';
import { SocketMixin } from '../lib/socket-mixin';
import { MixinDecorator } from 'ts-mixer';
Object.defineProperty(exports, "__esModule", { value: true });
var socketio = require("socket.io");
var http_server_1 = require("./http-server");
var socket_mixin_1 = require("../lib/socket-mixin");
var ts_mixer_1 = require("ts-mixer");
/**
* A simple SocketServer with an API protected by TypeScript.
*/
Expand Down Expand Up @@ -161,8 +163,8 @@ var SocketServerManager = /** @class */ (function (_super) {
this.io = null;
};
SocketServerManager = __decorate([
MixinDecorator(SocketMixin)
ts_mixer_1.MixinDecorator(socket_mixin_1.SocketMixin)
], SocketServerManager);
return SocketServerManager;
}(ServerManager));
export { SocketServerManager };
}(http_server_1.ServerManager));
exports.SocketServerManager = SocketServerManager;
Loading

0 comments on commit 8248f4a

Please sign in to comment.