From 8646f153e8bef322a6cf56cd333e08784070a56a Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Thu, 1 Aug 2019 17:09:29 +0600
Subject: [PATCH 1/8] added IoC

---
 .gitignore        |  2 ++
 package.json      | 34 +++++++++++++++++++++++++
 src/Dependency.ts | 31 +++++++++++++++++++++++
 src/IConfig.ts    |  3 +++
 src/IoC.ts        | 45 +++++++++++++++++++++++++++++++++
 src/Scope.ts      | 20 +++++++++++++++
 src/index.ts      | 10 ++++++++
 tsconfig.json     | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 tslint.json       | 15 +++++++++++
 9 files changed, 223 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 package.json
 create mode 100644 src/Dependency.ts
 create mode 100644 src/IConfig.ts
 create mode 100644 src/IoC.ts
 create mode 100644 src/Scope.ts
 create mode 100644 src/index.ts
 create mode 100644 tsconfig.json
 create mode 100644 tslint.json

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0654345
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*dist
+*node_modules
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..a5b2913
--- /dev/null
+++ b/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "ioc-type",
+  "version": "1.0.0",
+  "description": "Inversion of control container for Typescript.",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "prebuild": "tslint --fix --project .",
+    "start": "npm run build:live",
+    "build": "tsc",
+    "build:live": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/index.ts",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/hwdtech/ioc.git"
+  },
+  "author": "Ivan Molodtsov (https://github.com/IvanMolodtsov)",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/hwdtech/ioc/issues"
+  },
+  "devDependencies": {
+    "@types/node": "^12.6.8",
+    "nodemon": "^1.19.1",
+    "ts-node": "^8.3.0",
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
+  },
+  "dependencies": {
+    "reflect-metadata": "^0.1.13"
+  },
+  "homepage": "https://github.com/hwdtech/ioc#readme"
+}
diff --git a/src/Dependency.ts b/src/Dependency.ts
new file mode 100644
index 0000000..ab28e67
--- /dev/null
+++ b/src/Dependency.ts
@@ -0,0 +1,31 @@
+interface IDependency {
+    invoke(params?: any): any;
+}
+
+export type depType = "value" | "function" | "dependency";
+
+export function wrap(param: {type: depType, dependency: any}) {
+    const {type, dependency}  = param;
+    if (type === "function") {
+        return {
+            invoke(params?: any) {
+                return dependency(params);
+            }
+        };
+    }
+    if (type === "dependency") {
+
+        return dependency;
+    }
+    if (type === "value") {
+
+        return {
+            invoke() {
+                return dependency;
+            }
+        };
+    }
+    return null;
+}
+
+export default IDependency;
diff --git a/src/IConfig.ts b/src/IConfig.ts
new file mode 100644
index 0000000..340111d
--- /dev/null
+++ b/src/IConfig.ts
@@ -0,0 +1,3 @@
+export default interface IConfig {
+    [key: string]: any;
+}
diff --git a/src/IoC.ts b/src/IoC.ts
new file mode 100644
index 0000000..0f7479e
--- /dev/null
+++ b/src/IoC.ts
@@ -0,0 +1,45 @@
+import Dependency from "./Dependency";
+import Scope, {newScope} from "./Scope";
+
+export type depType = "value" | "function" | "dependency";
+
+class IoC {
+    private scope: Scope;
+
+    constructor(scope: Scope) {
+        this.scope = scope;
+    }
+
+    public register(key: string, type: depType, dependency: Dependency | ((...params: any[]) => any) | any) {
+        this.scope.body[key] = this.resolve<Dependency>("Dependency Wraper", {type, dependency});
+    }
+
+    public resolve<T>(key: string, params?: any): T {
+        try {
+            const dependency = this.scope.body[key];
+            if (!dependency) {
+                throw Error(`dependency "${key}" is undefined`);
+            } else {
+                return dependency.invoke(params) as T;
+            }
+        } catch (ex) {
+            throw ex;
+        }
+    }
+
+    public new(field: (IoC: IoC) => void) {
+        const childScope = newScope(this.scope);
+        const child = new IoC(childScope);
+        try {
+            field(child);
+        } catch (ex) {
+            throw ex;
+        }
+    }
+
+    public delete(key: string) {
+        this.scope.body[key] = undefined;
+    }
+}
+
+export default IoC;
diff --git a/src/Scope.ts b/src/Scope.ts
new file mode 100644
index 0000000..34b0c97
--- /dev/null
+++ b/src/Scope.ts
@@ -0,0 +1,20 @@
+import Dependency from "./Dependency";
+
+export interface IScope {
+    readonly id: number;
+    readonly parent?: IScope;
+    body: {
+        [k: string]: Dependency | undefined
+    };
+}
+
+export function newScope(other: IScope) {
+    const child = {
+        body: Object.assign({}, other.body),
+        id: 1 + other.id,
+        parent: other
+    };
+    return child;
+}
+
+export default IScope;
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 0000000..90f1e35
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,10 @@
+import IoC from "./IoC";
+import Scope from "./Scope";
+
+const RootScope: Scope = {
+    body: {},
+    id: 0
+};
+
+const ioc = new IoC(RootScope);
+export default ioc;
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..84fe3f6
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,63 @@
+{
+  "compilerOptions": {
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    "outDir": "./dist",                        /* Redirect output structure to the directory. */
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true,                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+  }
+}
diff --git a/tslint.json b/tslint.json
new file mode 100644
index 0000000..37cec62
--- /dev/null
+++ b/tslint.json
@@ -0,0 +1,15 @@
+{
+    "defaultSeverity": "error",
+    "extends": [
+        "tslint:recommended"
+    ],
+    "jsRules": {},
+    "rules": {
+        "trailing-comma": [ false ],
+        "no-var-requires": false,
+        "no-console": [false],
+        "object-literal-sort-keys": false,
+        "ordered-imports": false
+    },
+    "rulesDirectory": []
+}
\ No newline at end of file

From c404f59e72ea41d8fa4dd5eaf26260193e5483c0 Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Thu, 1 Aug 2019 17:38:14 +0600
Subject: [PATCH 2/8] fixed dependency wraper

---
 src/Dependency.ts | 3 +--
 src/IoC.ts        | 6 ++----
 src/index.ts      | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Dependency.ts b/src/Dependency.ts
index ab28e67..d63b633 100644
--- a/src/Dependency.ts
+++ b/src/Dependency.ts
@@ -4,8 +4,7 @@ interface IDependency {
 
 export type depType = "value" | "function" | "dependency";
 
-export function wrap(param: {type: depType, dependency: any}) {
-    const {type, dependency}  = param;
+export function wrap(type: depType, dependency: any) {
     if (type === "function") {
         return {
             invoke(params?: any) {
diff --git a/src/IoC.ts b/src/IoC.ts
index 0f7479e..3584a10 100644
--- a/src/IoC.ts
+++ b/src/IoC.ts
@@ -1,8 +1,6 @@
-import Dependency from "./Dependency";
+import Dependency, {wrap, depType} from "./Dependency";
 import Scope, {newScope} from "./Scope";
 
-export type depType = "value" | "function" | "dependency";
-
 class IoC {
     private scope: Scope;
 
@@ -11,7 +9,7 @@ class IoC {
     }
 
     public register(key: string, type: depType, dependency: Dependency | ((...params: any[]) => any) | any) {
-        this.scope.body[key] = this.resolve<Dependency>("Dependency Wraper", {type, dependency});
+        this.scope.body[key] = wrap(type, dependency);
     }
 
     public resolve<T>(key: string, params?: any): T {
diff --git a/src/index.ts b/src/index.ts
index 90f1e35..86f24e2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -7,4 +7,4 @@ const RootScope: Scope = {
 };
 
 const ioc = new IoC(RootScope);
-export default ioc;
\ No newline at end of file
+export default ioc;

From a7c37afdcf5c3d3b012de40ae316c4171f834302 Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Thu, 1 Aug 2019 17:50:57 +0600
Subject: [PATCH 3/8] fixed npm account

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a5b2913..ed07a40 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "type": "git",
     "url": "git+https://github.com/hwdtech/ioc.git"
   },
-  "author": "Ivan Molodtsov (https://github.com/IvanMolodtsov)",
+  "author": "Ivan Molodtsov vanmolodtsov@gmail.com (https://github.com/IvanMolodtsov)",
   "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/hwdtech/ioc/issues"

From cf140796b7689afd1867581377bb582b0f4e6b85 Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Thu, 1 Aug 2019 18:30:29 +0600
Subject: [PATCH 4/8] fixed npm packaging

---
 src/index.ts => index.ts | 6 ++++--
 package.json             | 6 +++---
 tsconfig.json            | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename src/index.ts => index.ts (57%)

diff --git a/src/index.ts b/index.ts
similarity index 57%
rename from src/index.ts
rename to index.ts
index 86f24e2..7af9362 100644
--- a/src/index.ts
+++ b/index.ts
@@ -1,10 +1,12 @@
-import IoC from "./IoC";
-import Scope from "./Scope";
+import IoC from "./src/IoC";
+import Scope from "./src/Scope";
 
 const RootScope: Scope = {
     body: {},
     id: 0
 };
 
+console.log("da")
+
 const ioc = new IoC(RootScope);
 export default ioc;
diff --git a/package.json b/package.json
index ed07a40..5a79e93 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "ioc-type",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Inversion of control container for Typescript.",
-  "main": "dist/index.js",
+  "main": "index.ts",
   "types": "dist/index.d.ts",
   "scripts": {
     "prebuild": "tslint --fix --project .",
     "start": "npm run build:live",
     "build": "tsc",
-    "build:live": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/index.ts",
+    "build:live": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' ./index.ts",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
diff --git a/tsconfig.json b/tsconfig.json
index 84fe3f6..bf444fe 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,7 +13,7 @@
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     "outDir": "./dist",                        /* Redirect output structure to the directory. */
-    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     // "composite": true,                     /* Enable project compilation */
     // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
     // "removeComments": true,                /* Do not emit comments to output. */

From 3c440a3e7157d0f1d5fb68ac3dc29684a9d10b6c Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Thu, 1 Aug 2019 18:52:03 +0600
Subject: [PATCH 5/8] fix conflicts

---
 index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.ts b/index.ts
index 7af9362..e8580c5 100644
--- a/index.ts
+++ b/index.ts
@@ -1,6 +1,9 @@
+import IDependency from './src/Dependency'
 import IoC from "./src/IoC";
 import Scope from "./src/Scope";
 
+export type Dependency = IDependency
+
 const RootScope: Scope = {
     body: {},
     id: 0

From 3ab0e922291037994b6000a94223576120e5db49 Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Thu, 1 Aug 2019 18:52:45 +0600
Subject: [PATCH 6/8] added license

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5a79e93..6678de5 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "url": "git+https://github.com/hwdtech/ioc.git"
   },
   "author": "Ivan Molodtsov vanmolodtsov@gmail.com (https://github.com/IvanMolodtsov)",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/hwdtech/ioc/issues"
   },

From 7806a0abd5c3a9d2a41d3537e6e7bde343dd1331 Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Fri, 2 Aug 2019 10:16:24 +0600
Subject: [PATCH 7/8] reduced dependency type

---
 index.ts          |  9 ++-------
 package.json      |  4 ++--
 src/Dependency.ts | 29 +----------------------------
 src/IConfig.ts    |  3 ---
 src/IoC.ts        |  8 ++++----
 5 files changed, 9 insertions(+), 44 deletions(-)
 delete mode 100644 src/IConfig.ts

diff --git a/index.ts b/index.ts
index e8580c5..ee38470 100644
--- a/index.ts
+++ b/index.ts
@@ -1,15 +1,10 @@
-import IDependency from './src/Dependency'
 import IoC from "./src/IoC";
-import Scope from "./src/Scope";
+import IScope from "./src/Scope";
 
-export type Dependency = IDependency
-
-const RootScope: Scope = {
+const RootScope: IScope = {
     body: {},
     id: 0
 };
 
-console.log("da")
-
 const ioc = new IoC(RootScope);
 export default ioc;
diff --git a/package.json b/package.json
index 6678de5..c2507b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ioc-type",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Inversion of control container for Typescript.",
   "main": "index.ts",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "prebuild": "tslint --fix --project .",
     "start": "npm run build:live",
     "build": "tsc",
-    "build:live": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' ./index.ts",
+    "build:live": "nodemon --watch './**/*.ts' --exec 'ts-node' ./index.ts",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
diff --git a/src/Dependency.ts b/src/Dependency.ts
index d63b633..aa13678 100644
--- a/src/Dependency.ts
+++ b/src/Dependency.ts
@@ -1,30 +1,3 @@
-interface IDependency {
-    invoke(params?: any): any;
-}
-
-export type depType = "value" | "function" | "dependency";
-
-export function wrap(type: depType, dependency: any) {
-    if (type === "function") {
-        return {
-            invoke(params?: any) {
-                return dependency(params);
-            }
-        };
-    }
-    if (type === "dependency") {
-
-        return dependency;
-    }
-    if (type === "value") {
-
-        return {
-            invoke() {
-                return dependency;
-            }
-        };
-    }
-    return null;
-}
+type IDependency = (params?: any) => any;
 
 export default IDependency;
diff --git a/src/IConfig.ts b/src/IConfig.ts
deleted file mode 100644
index 340111d..0000000
--- a/src/IConfig.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default interface IConfig {
-    [key: string]: any;
-}
diff --git a/src/IoC.ts b/src/IoC.ts
index 3584a10..ecd46a4 100644
--- a/src/IoC.ts
+++ b/src/IoC.ts
@@ -1,4 +1,4 @@
-import Dependency, {wrap, depType} from "./Dependency";
+import Dependency from "./Dependency";
 import Scope, {newScope} from "./Scope";
 
 class IoC {
@@ -8,8 +8,8 @@ class IoC {
         this.scope = scope;
     }
 
-    public register(key: string, type: depType, dependency: Dependency | ((...params: any[]) => any) | any) {
-        this.scope.body[key] = wrap(type, dependency);
+    public register(key: string, dependency: Dependency) {
+        this.scope.body[key] = dependency;
     }
 
     public resolve<T>(key: string, params?: any): T {
@@ -18,7 +18,7 @@ class IoC {
             if (!dependency) {
                 throw Error(`dependency "${key}" is undefined`);
             } else {
-                return dependency.invoke(params) as T;
+                return dependency(params) as T;
             }
         } catch (ex) {
             throw ex;

From 915e23bd4b8a7ae05c7ed3e1ddc3b3621caaf63b Mon Sep 17 00:00:00 2001
From: IvanMolodtsov <vanmolodtsov@gmail.com>
Date: Fri, 2 Aug 2019 11:52:30 +0600
Subject: [PATCH 8/8] publish fix

---
 package.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c2507b7..1eb9c59 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,11 @@
 {
   "name": "ioc-type",
-  "version": "1.0.3",
+  "version": "1.0.8",
   "description": "Inversion of control container for Typescript.",
-  "main": "index.ts",
+  "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
+    "prepublish": "npm run build",
     "prebuild": "tslint --fix --project .",
     "start": "npm run build:live",
     "build": "tsc",
@@ -30,5 +31,8 @@
   "dependencies": {
     "reflect-metadata": "^0.1.13"
   },
+  "files": [
+    "dist/**/*"
+  ],
   "homepage": "https://github.com/hwdtech/ioc#readme"
 }