updated dependencies, fixed issues with non global metadata storage

Author: Umed Khudoiberdiev

.gitignore

@@ -1,5 +1,4 @@
 build/
 node_modules/
-typings/
 coverage/
 npm-debug.log

gulpfile.js

@@ -1,4 +1,3 @@
-import "es6-shim";
 import {Gulpclass, Task, SequenceTask, MergedTask} from "gulpclass";
 
 const gulp = require("gulp");
@@ -36,7 +35,7 @@ export class Gulpfile {
      */
     @Task()
     compile() {
-        return gulp.src("*.js", { read: false })
+        return gulp.src("package.json", { read: false })
             .pipe(shell(["tsc"]));
     }
 
@@ -49,7 +48,7 @@ export class Gulpfile {
      */
     @Task()
     npmPublish() {
-        return gulp.src("*.js", { read: false })
+        return gulp.src("package.json", { read: false })
             .pipe(shell([
                 "cd ./build/package && npm publish"
             ]));
@@ -61,9 +60,9 @@ export class Gulpfile {
     @MergedTask()
     packageCompile() {
         const tsProject = ts.createProject("tsconfig.json");
-        const tsResult = gulp.src(["./src/**/*.ts", "./typings/**/*.ts"])
+        const tsResult = gulp.src(["./src/**/*.ts"])
             .pipe(sourcemaps.init())
-            .pipe(ts(tsProject));
+            .pipe(tsProject());
 
         return [
             tsResult.dts.pipe(gulp.dest("./build/package")),
@@ -113,15 +112,6 @@ export class Gulpfile {
             .pipe(gulp.dest("./build/package"));
     }
 
-    /**
-     * This task will copy typings.json file to the build package.
-     */
-    @Task()
-    copyTypingsFile() {
-        return gulp.src("./typings.json")
-            .pipe(gulp.dest("./build/package"));
-    }
-
     /**
      * Creates a package that can be published to npm.
      */
@@ -132,7 +122,7 @@ export class Gulpfile {
             "packageCompile",
             "packageMoveCompiledFiles",
             "packageClearCompileDirectory",
-            ["packagePreparePackageFile", "packageReadmeFile", "copyTypingsFile"]
+            ["packagePreparePackageFile", "packageReadmeFile"]
         ];
     }
 
@@ -167,7 +157,7 @@ export class Gulpfile {
      */
     @Task()
     coveragePre() {
-        return gulp.src(["./build/es5/src/**/*.js"])
+        return gulp.src(["./build/compiled/src/**/*.js"])
             .pipe(istanbul())
             .pipe(istanbul.hookRequire());
     }
@@ -181,7 +171,7 @@ export class Gulpfile {
         chai.use(require("sinon-chai"));
         chai.use(require("chai-as-promised"));
 
-        return gulp.src(["./build/es5/test/functional/**/*.js"])
+        return gulp.src(["./build/compiled/test/functional/**/*.js"])
             .pipe(mocha())
             .pipe(istanbul.writeReports());
     }

gulpfile.ts

@@ -1,7 +1,7 @@
 {
   "name": "socket-controllers",
   "private": true,
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Use class-based controllers to handle websocket events",
   "license": "MIT",
   "readmeFilename": "README.md",
@@ -26,38 +26,41 @@
     "socket-controllers"
   ],
   "dependencies": {
-    "class-transformer": "^0.1.1",
-    "reflect-metadata": "^0.1.8",
-    "socket.io": "^1.4.8"
+    "class-transformer": "^0.1.6",
+    "reflect-metadata": "^0.1.10",
+    "socket.io": "^2.0.1"
   },
   "devDependencies": {
+    "@types/chai": "^3.5.2",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^7.0.18",
+    "@types/sinon": "^2.2.1",
     "chai": "^3.4.1",
-    "chai-as-promised": "^5.3.0",
-    "chakram": "^1.4.0",
-    "del": "^2.2.1",
-    "es6-shim": "^0.35.1",
-    "express": "^4.14.0",
+    "chai-as-promised": "^6.0.0",
+    "chakram": "^1.5.0",
+    "del": "^2.2.2",
+    "express": "^4.15.2",
     "gulp": "^3.9.1",
-    "gulp-istanbul": "^1.0.0",
-    "gulp-mocha": "^2.2.0",
+    "gulp-istanbul": "^1.1.1",
+    "gulp-mocha": "^4.3.1",
     "gulp-replace": "^0.5.4",
-    "gulp-shell": "^0.5.0",
-    "gulp-sourcemaps": "^1.6.0",
-    "gulp-tslint": "^6.0.1",
-    "gulp-typescript": "^2.13.6",
-    "gulpclass": "^0.1.1",
-    "mocha": "^3.0.0",
-    "multer": "^1.1.0",
-    "remap-istanbul": "^0.6.4",
-    "request": "^2.74.0",
-    "sinon": "^1.17.4",
-    "sinon-chai": "^2.8.0",
-    "socket.io-client": "^1.4.8",
-    "tslint": "^3.13.0",
-    "tslint-stylish": "^2.1.0-beta",
-    "typedi": "^0.4.2",
-    "typescript": "^1.8.10",
-    "typings": "^1.3.1"
+    "gulp-shell": "^0.6.3",
+    "gulp-sourcemaps": "^2.6.0",
+    "gulp-tslint": "^8.0.0",
+    "gulp-typescript": "^3.1.6",
+    "gulpclass": "^0.1.2",
+    "mocha": "^3.3.0",
+    "multer": "^1.3.0",
+    "remap-istanbul": "^0.9.5",
+    "request": "^2.81.0",
+    "sinon": "^2.2.0",
+    "sinon-chai": "^2.10.0",
+    "socket.io-client": "^2.0.1",
+    "ts-node": "^3.0.4",
+    "tslint": "^5.2.0",
+    "tslint-stylish": "^2.1.0",
+    "typedi": "^0.5.2",
+    "typescript": "^2.3.2"
   },
   "scripts": {
     "test": "gulp tests"

package.json

@@ -1,7 +1,6 @@
 import {MetadataArgsStorage} from "./metadata-builder/MetadataArgsStorage";
 import {importClassesFromDirectories} from "./util/DirectoryExportedClassesLoader";
 import {SocketControllerExecutor} from "./SocketControllerExecutor";
-import {getFromContainer} from "./container";
 import {SocketControllersOptions} from "./SocketControllersOptions";
 
 // -------------------------------------------------------------------------
@@ -56,7 +55,10 @@ function createExecutor(io: any, options: SocketControllersOptions): void {
  * Gets the metadata arguments storage.
  */
 export function defaultMetadataArgsStorage(): MetadataArgsStorage {
-    return getFromContainer(MetadataArgsStorage);
+    if (!(global as any).socketControllersMetadataArgsStorage)
+        (global as any).socketControllersMetadataArgsStorage = new MetadataArgsStorage();
+
+    return (global as any).socketControllersMetadataArgsStorage;
 }
 
 // -------------------------------------------------------------------------

src/index.ts

@@ -1,10 +1,10 @@
 {
-    "version": "1.8.0",
     "compilerOptions": {
-        "outDir": "build/es5",
+        "outDir": "build/compiled",
         "target": "es5",
         "module": "commonjs",
         "moduleResolution": "node",
+        "lib": ["es6"],
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "sourceMap": true,