1.0.8

README.md

@@ -20,14 +20,18 @@ simplifies lazy loading with TypeScript
 ## Usage
 We recommend the use of TypeScript for best Intellisense
 
+smartsystem supports both npm and SystemJs as module loader.
+
 ```typescript
 import { LazyModule } from 'smartsystem'
 
-import * as myPluginType from 'myPlugin' // plugin does not get loaded here at runtime
+import * as _myPlugin from 'myPlugin' // plugin does not get loaded here at runtime
-let myPluginLazy = new LazyModule<typeof myPlugin>('myPlugin')
+let myPluginLazy = new LazyModule<typeof _myPlugin>('myPlugin')
+let myPluginLazy.setLoader('npm') // sets the loader, defaults to npm anyway
 
-import * as anotherPluginType from 'anotherPlugin' // plugin does not get loaded here at runtime
+import * as _anotherPlugin from 'anotherPlugin' // plugin does not get loaded here at runtime
-let anotherPluginPromised = LazyModule<typeof anotherPlugin>('anotherPlugin')
+let anotherPluginLazy = new LazyModule<typeof _anotherPlugin>('anotherPlugin')
+let anotherPluginLazy.setLoader('systemjs') // sets the loader to systemjs
 
 myPluginLazy.whenLoaded.then(myPlugin => {
     /* do something with myPlugin. 

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);
+    setLoader(loaderArg: TLoader): void;
     /**
      * loads the module
      */

dist/index.js

@@ -1,8 +1,8 @@
 "use strict";
 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();
@@ -16,29 +16,43 @@ class Smartsystem {
 }
 // create the internal smartsystem
 let smartsystem = new Smartsystem();
-/**
- * defines a LazyModule
- */
 class LazyModule {
     constructor(nameArg, cwdArg = process.cwd()) {
+        this.loader = 'npm';
         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.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;
     }
     /**
@@ -48,4 +62,4 @@ class LazyModule {
     }
 }
 exports.LazyModule = LazyModule;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBRXZCLHVCQUFzQjtBQUN0Qiw2QkFBK0I7QUFDL0IsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFBO0FBRWxDO0lBQUE7UUFDSSxnQkFBVyxHQUFHLElBQUksZUFBUyxFQUFtQixDQUFBO0lBUWxELENBQUM7SUFORzs7T0FFRztJQUNILGFBQWEsQ0FBQyxhQUE4QjtRQUN4QyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUN2QyxDQUFDO0NBQ0o7QUFFRCxrQ0FBa0M7QUFDbEMsSUFBSSxXQUFXLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQTtBQUVuQzs7R0FFRztBQUNIO0lBTUksWUFBWSxPQUFlLEVBQUUsTUFBTSxHQUFXLE9BQU8sQ0FBQyxHQUFHLEVBQUU7UUFDdkQsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUE7UUFDbkIsSUFBSSxDQUFDLEdBQUcsR0FBRyxNQUFNLENBQUE7UUFDakIsV0FBVyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLHFDQUFxQztRQUNyRSxJQUFJLENBQUMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBLENBQUMsNkJBQTZCO1FBQ3RFLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFLLENBQUE7UUFDdEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFBO0lBQ3JELENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDQSxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFLLENBQUE7UUFDdkIsSUFBSSxZQUFlLENBQUE7UUFDbkIsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUM5QixZQUFZLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUE7WUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUM5QixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNyQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxRQUFRLENBQUMsR0FBRyxJQUF1QjtJQUVuQyxDQUFDO0NBQ0o7QUFuQ0QsZ0NBbUNDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBRXZCLDZCQUE0QjtBQUM1Qix1QkFBc0I7QUFDdEIsNkJBQStCO0FBRS9CO0lBQUE7UUFDSSxnQkFBVyxHQUFHLElBQUksZUFBUyxFQUFtQixDQUFBO0lBUWxELENBQUM7SUFORzs7T0FFRztJQUNILGFBQWEsQ0FBQyxhQUE4QjtRQUN4QyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUN2QyxDQUFDO0NBQ0o7QUFFRCxrQ0FBa0M7QUFDbEMsSUFBSSxXQUFXLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQTtBQVFuQztJQU9JLFlBQVksT0FBZSxFQUFFLE1BQU0sR0FBVyxPQUFPLENBQUMsR0FBRyxFQUFFO1FBRjNELFdBQU0sR0FBWSxLQUFLLENBQUE7UUFHbkIsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUE7UUFDbkIsSUFBSSxDQUFDLEdBQUcsR0FBRyxNQUFNLENBQUE7UUFDakIsV0FBVyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLHFDQUFxQztRQUNyRSxJQUFJLENBQUMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBLENBQUMsNkJBQTZCO1FBQ3RFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2xCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUM5QyxDQUFDO1FBQ0QsSUFBSSxDQUFDLGtCQUFrQixHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUssQ0FBQTtRQUN0QyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUE7SUFDckQsQ0FBQztJQUVELFNBQVMsQ0FBQyxTQUFrQjtRQUN4QixJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQTtJQUMzQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJO1FBQ0EsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBSyxDQUFBO1FBQ3ZCLElBQUksWUFBZSxDQUFBO1FBQ25CLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQztZQUN4QixZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtZQUNqQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO1FBQzlCLENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ3BDLElBQUksUUFBUSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQTtZQUNsQyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUM5QixZQUFZLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO2dCQUM3QyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO1lBQzlCLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3pDLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE1BQU0sS0FBSyxDQUFDLHNCQUFzQixDQUFDLENBQUE7UUFDdkMsQ0FBQztRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7T0FFRztJQUNILFFBQVEsQ0FBQyxHQUFHLElBQXVCO0lBRW5DLENBQUM7Q0FDSjtBQW5ERCxnQ0FtREMifQ==

package.json

@@ -1,7 +1,7 @@
 {
   "name": "smartsystem",
-  "version": "1.0.2",
+  "version": "1.0.8",
-  "description": "wraps systemjs for smarter workflows",
+  "description": "simplifies lazy loading with TypeScript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -11,6 +11,11 @@
     "type": "git",
     "url": "git+ssh://git@gitlab.com/pushrocks/smartsystem.git"
   },
+  "keywords": [
+    "TypeScript",
+    "lazy",
+    "module loader"
+  ],
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {

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')

ts/index.ts

@@ -1,8 +1,8 @@
 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>>()
@@ -21,32 +21,51 @@ 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()) {
         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.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
     }