1.0.12

README.md

@@ -20,14 +20,18 @@ simplifies lazy loading with TypeScript
 ## Usage
 We recommend the use of TypeScript for best Intellisense
 
-```typescript
+smartsystem supports both npm and SystemJs as module loader.
+
+```javascript
 import { LazyModule } from 'smartsystem'
 
 import * as _myPlugin from 'myPlugin' // plugin does not get loaded here at runtime
 let myPluginLazy = new LazyModule<typeof _myPlugin>('myPlugin')
+myPluginLazy.setLoader('npm') // sets the loader, defaults to npm anyway
 
 import * as _anotherPlugin from 'anotherPlugin' // plugin does not get loaded here at runtime
 let anotherPluginLazy = new LazyModule<typeof _anotherPlugin>('anotherPlugin')
+anotherPluginLazy.setLoader('systemjs') // sets the loader to systemjs
 
 myPluginLazy.whenLoaded.then(myPlugin => {
     /* do something with myPlugin. 
@@ -42,3 +46,5 @@ myPluginLazy.load().then(myPlugin => {
        This DOES LOAD the module */
 })
 ```
+
+[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

dist/index.d.ts

@@ -4,13 +4,16 @@ import * as q from 'q';
 /**
  * defines a LazyModule
  */
+export declare type TLoader = 'npm' | 'systemjs';
 export declare class LazyModule<T> {
     name: string;
     nameIsPath: boolean;
     cwd: string;
     whenLoaded: q.Promise<T>;
+    loader: TLoader;
     private whenLoadedDeferred;
-    constructor(nameArg: string, cwdArg?: string);
+    constructor(nameArg: string, cwdArg: string);
+    setLoader(loaderArg: TLoader): void;
     /**
      * loads the module
      */

dist/index.js

@@ -3,7 +3,6 @@ require("typings-global");
 const path = require("path");
 const q = require("q");
 const lik_1 = require("lik");
-let systemjs = require('systemjs');
 class Smartsystem {
     constructor() {
         this.lazyModules = new lik_1.Objectmap();
@@ -17,11 +16,12 @@ class Smartsystem {
 }
 // create the internal smartsystem
 let smartsystem = new Smartsystem();
-/**
- * defines a LazyModule
- */
 class LazyModule {
-    constructor(nameArg, cwdArg = process.cwd()) {
+    constructor(nameArg, cwdArg) {
+        this.loader = 'npm';
+        if (!cwdArg) {
+            throw new Error('You must specify a directory to resolve from!');
+        }
         this.name = nameArg;
         this.cwd = cwdArg;
         smartsystem.addLazyModule(this); // add module to smartsystem instance
@@ -32,17 +32,30 @@ class LazyModule {
         this.whenLoadedDeferred = q.defer();
         this.whenLoaded = this.whenLoadedDeferred.promise;
     }
+    setLoader(loaderArg) {
+        this.loader = loaderArg;
+    }
     /**
      * loads the module
      */
     load() {
         let done = q.defer();
         let loadedModule;
-        systemjs.import(this.name).then((m) => {
+        if (this.loader === 'npm') {
-            loadedModule = m;
+            loadedModule = require(this.name);
-            this.whenLoadedDeferred.resolve(loadedModule);
             done.resolve(loadedModule);
-        }).catch(err => { console.log(err); });
+        }
+        else if (this.loader === 'systemjs') {
+            let systemjs = require('systemjs');
+            systemjs.import(this.name).then((m) => {
+                loadedModule = m;
+                this.whenLoadedDeferred.resolve(loadedModule);
+                done.resolve(loadedModule);
+            }).catch(err => { console.log(err); });
+        }
+        else {
+            throw Error('loader not supported');
+        }
         return done.promise;
     }
     /**
@@ -52,4 +65,4 @@ class LazyModule {
     }
 }
 exports.LazyModule = LazyModule;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBRXZCLDZCQUE0QjtBQUM1Qix1QkFBc0I7QUFDdEIsNkJBQStCO0FBQy9CLElBQUksUUFBUSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQTtBQUVsQztJQUFBO1FBQ0ksZ0JBQVcsR0FBRyxJQUFJLGVBQVMsRUFBbUIsQ0FBQTtJQVFsRCxDQUFDO0lBTkc7O09BRUc7SUFDSCxhQUFhLENBQUMsYUFBOEI7UUFDeEMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDdkMsQ0FBQztDQUNKO0FBRUQsa0NBQWtDO0FBQ2xDLElBQUksV0FBVyxHQUFHLElBQUksV0FBVyxFQUFFLENBQUE7QUFFbkM7O0dBRUc7QUFDSDtJQU1JLFlBQVksT0FBZSxFQUFFLE1BQU0sR0FBVyxPQUFPLENBQUMsR0FBRyxFQUFFO1FBQ3ZELElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFBO1FBQ25CLElBQUksQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFBO1FBQ2pCLFdBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQyxxQ0FBcUM7UUFDckUsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLDZCQUE2QjtRQUN0RSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNsQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDN0MsQ0FBQztRQUNELElBQUksQ0FBQyxrQkFBa0IsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFLLENBQUE7UUFDdEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFBO0lBQ3JELENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDQSxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFLLENBQUE7UUFDdkIsSUFBSSxZQUFlLENBQUE7UUFDbkIsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUM5QixZQUFZLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUE7WUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUM5QixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNyQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxRQUFRLENBQUMsR0FBRyxJQUF1QjtJQUVuQyxDQUFDO0NBQ0o7QUF0Q0QsZ0NBc0NDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBRXZCLDZCQUE0QjtBQUM1Qix1QkFBc0I7QUFDdEIsNkJBQStCO0FBRS9CO0lBQUE7UUFDSSxnQkFBVyxHQUFHLElBQUksZUFBUyxFQUFtQixDQUFBO0lBUWxELENBQUM7SUFORzs7T0FFRztJQUNILGFBQWEsQ0FBQyxhQUE4QjtRQUN4QyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUN2QyxDQUFDO0NBQ0o7QUFFRCxrQ0FBa0M7QUFDbEMsSUFBSSxXQUFXLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQTtBQVFuQztJQU9JLFlBQVksT0FBZSxFQUFFLE1BQWM7UUFGM0MsV0FBTSxHQUFZLEtBQUssQ0FBQTtRQUduQixFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDVixNQUFNLElBQUksS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUE7UUFDcEUsQ0FBQztRQUNELElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFBO1FBQ25CLElBQUksQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFBO1FBQ2pCLFdBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQyxxQ0FBcUM7UUFDckUsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLDZCQUE2QjtRQUN0RSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNsQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDOUMsQ0FBQztRQUNELElBQUksQ0FBQyxrQkFBa0IsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFLLENBQUE7UUFDdEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFBO0lBQ3JELENBQUM7SUFFRCxTQUFTLENBQUMsU0FBa0I7UUFDeEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUE7SUFDM0IsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSTtRQUNBLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUssQ0FBQTtRQUN2QixJQUFJLFlBQWUsQ0FBQTtRQUNuQixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDeEIsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUM5QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNwQyxJQUFJLFFBQVEsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUE7WUFDbEMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztnQkFDOUIsWUFBWSxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsSUFBSSxDQUFDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtnQkFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtZQUM5QixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUN6QyxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixNQUFNLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxDQUFBO1FBQ3ZDLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxRQUFRLENBQUMsR0FBRyxJQUF1QjtJQUVuQyxDQUFDO0NBQ0o7QUF0REQsZ0NBc0RDIn0=

npmextra.json

@@ -0,0 +1,7 @@
+{
+    "npmci": {
+        "globalNpmTools": [
+            "npmts"
+        ]
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartsystem",
-  "version": "1.0.5",
+  "version": "1.0.12",
   "description": "simplifies lazy loading with TypeScript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -24,14 +24,14 @@
   "homepage": "https://gitlab.com/pushrocks/smartsystem#README",
   "dependencies": {
     "@types/q": "0.0.32",
-    "lik": "^1.0.24",
+    "lik": "^1.0.27",
     "q": "^1.4.1",
-    "systemjs": "^0.19.39",
+    "systemjs": "^0.19.41",
     "typings-global": "^1.0.14"
   },
   "devDependencies": {
     "@types/should": "^8.1.30",
-    "should": "^11.1.1",
+    "should": "^11.1.2",
     "typings-test": "^1.0.3"
   }
 }

test/moduleExample.js

@@ -1,4 +1,4 @@
 "use strict";
 exports.exportedTestBoolean = true;
 console.log('moduleExample loaded successfully');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlRXhhbXBsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1vZHVsZUV4YW1wbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFXLFFBQUEsbUJBQW1CLEdBQUcsSUFBSSxDQUFBO0FBQ3JDLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUNBQW1DLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlRXhhbXBsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1vZHVsZUV4YW1wbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFXLFFBQUEsbUJBQW1CLEdBQUcsSUFBSSxDQUFBO0FBRXJDLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUNBQW1DLENBQUMsQ0FBQSJ9

test/moduleExample.ts

@@ -1,2 +1,3 @@
 export let exportedTestBoolean = true
+import * as q from 'q'
 console.log('moduleExample loaded successfully')

test/test.js

@@ -3,11 +3,11 @@ require("typings-test");
 const smartsystem = require("../dist/index");
 describe('smartsystem', function () {
     it('should load a module lazily', function (done) {
-        let lazyModuleExample = new smartsystem.LazyModule('./test/moduleExample.js');
+        let lazyModuleExample = new smartsystem.LazyModule('../test/moduleExample.js', __dirname);
         lazyModuleExample.load().then(m => {
             console.log(m.exportedTestBoolean);
             done();
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUVyQiw2Q0FBNEM7QUFJNUMsUUFBUSxDQUFDLGFBQWEsRUFBRTtJQUNwQixFQUFFLENBQUMsNkJBQTZCLEVBQUUsVUFBVSxJQUFJO1FBQzVDLElBQUksaUJBQWlCLEdBQUcsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUF3Qix5QkFBeUIsQ0FBQyxDQUFBO1FBRXBHLGlCQUFpQixDQUFDLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzNCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLG1CQUFtQixDQUFDLENBQUE7WUFDbEMsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUVyQiw2Q0FBNEM7QUFJNUMsUUFBUSxDQUFDLGFBQWEsRUFBRTtJQUNwQixFQUFFLENBQUMsNkJBQTZCLEVBQUUsVUFBVSxJQUFJO1FBQzVDLElBQUksaUJBQWlCLEdBQUcsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUF3QiwwQkFBMEIsRUFBQyxTQUFTLENBQUMsQ0FBQTtRQUUvRyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUMzQixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFBO1lBQ2xDLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBIn0=

test/test.ts

@@ -6,7 +6,7 @@ import * as _moduleExample from './moduleExample'
 
 describe('smartsystem', function () {
     it('should load a module lazily', function (done) {
-        let lazyModuleExample = new smartsystem.LazyModule<typeof _moduleExample>('./test/moduleExample.js')
+        let lazyModuleExample = new smartsystem.LazyModule<typeof _moduleExample>('../test/moduleExample.js',__dirname)
 
         lazyModuleExample.load().then(m => {
             console.log(m.exportedTestBoolean)

ts/index.ts

@@ -3,7 +3,6 @@ import 'typings-global'
 import * as path from 'path'
 import * as q from 'q'
 import { Objectmap } from 'lik'
-let systemjs = require('systemjs')
 
 class Smartsystem {
     lazyModules = new Objectmap<LazyModule<any>>()
@@ -22,35 +21,54 @@ let smartsystem = new Smartsystem()
 /**
  * defines a LazyModule
  */
+
+export type TLoader = 'npm' | 'systemjs'
+
 export class LazyModule<T> {
     name: string
     nameIsPath: boolean
     cwd: string
     whenLoaded: q.Promise<T>
+    loader: TLoader = 'npm'
     private whenLoadedDeferred: q.Deferred<T>
-    constructor(nameArg: string, cwdArg: string = process.cwd()) {
+    constructor(nameArg: string, cwdArg: string) {
+        if (!cwdArg) {
+            throw new Error('You must specify a directory to resolve from!')
+        }
         this.name = nameArg
         this.cwd = cwdArg
         smartsystem.addLazyModule(this) // add module to smartsystem instance
         this.nameIsPath = /\.\//.test(this.name) // figure out if name is path
         if (this.nameIsPath) {
-            this.name = path.join(this.cwd,this.name)
+            this.name = path.join(this.cwd, this.name)
         }
         this.whenLoadedDeferred = q.defer<T>()
         this.whenLoaded = this.whenLoadedDeferred.promise
     }
 
+    setLoader(loaderArg: TLoader) {
+        this.loader = loaderArg
+    }
+
     /**
      * loads the module
      */
     load(): q.Promise<T> {
         let done = q.defer<T>()
         let loadedModule: T
-        systemjs.import(this.name).then((m) => {
+        if (this.loader === 'npm') {
-            loadedModule = m
+            loadedModule = require(this.name)
-            this.whenLoadedDeferred.resolve(loadedModule)
             done.resolve(loadedModule)
-        }).catch(err => { console.log(err) })
+        } else if (this.loader === 'systemjs') {
+            let systemjs = require('systemjs')
+            systemjs.import(this.name).then((m) => {
+                loadedModule = m
+                this.whenLoadedDeferred.resolve(loadedModule)
+                done.resolve(loadedModule)
+            }).catch(err => { console.log(err) })
+        } else {
+            throw Error('loader not supported')
+        }
         return done.promise
     }