3.0.2

fix(core): update
3.0.1
2019-01-27 18:55:39 +01:00 · 2019-01-27 18:55:38 +01:00 · 2018-10-04 17:00:33 +02:00 · 2018-10-04 17:00:33 +02:00 · 2018-10-04 14:48:20 +00:00 · 2018-10-04 16:04:42 +02:00
29 changed files with 2406 additions and 1281 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -3,69 +3,148 @@ image: hosttoday/ht-docker-node:npmci

 cache:
  paths:
-  - .yarn/
+  - .npmci_cache/
  key: "$CI_BUILD_STAGE"

 stages:
+- security
 - test
 - release
- trigger
- pages
+- metadata

-testLEGACY:
-  stage: test
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
  script:
-    - npmci test legacy
-  coverage: /\d+.?\d+?\%\s*coverage/
+  - npmci git mirror
  tags:
-    - docker
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
+  - priv
+
+# ====================
+# test stage
+# ====================

 testLTS:
  stage: test
  script:
-    - npmci test lts
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - docker
+  - docker
+  - notpriv
    
 testSTABLE:
  stage: test
  script:
-    - npmci test stable
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - docker
+  - docker
+  - notpriv

 release:
  stage: release
  script:
-    - npmci publish
+  - npmci node install stable
+  - npmci npm publish
  only:
-    - tags
+  - tags
  tags:
-    - docker
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv

 trigger:
-  stage: trigger
+  stage: metadata
  script:
-    - npmci trigger
+  - npmci trigger
  only:
-    - tags
+  - tags
  tags:
-    - docker
+  - docker
+  - notpriv

 pages:
  image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
  script:
-    - npmci command yarn global add npmpage
-    - npmci command npmpage
+    - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
  tags:
    - docker
+    - notpriv
  only:
    - tags
  artifacts:
    expire_in: 1 week
    paths:
    - public
+  allow_failure: true
--- a/dist/smartscaf.classes.smartscaf.d.ts
+++ b/dist/smartscaf.classes.smartscaf.d.ts
@ -30,11 +30,11 @@ export declare class ScafTemplate {
     * finds all variables in a Template in as string
     * e.g. myobject.someKey and myobject.someOtherKey
     */
-    private _findVariablesInTemplate();
+    private _findVariablesInTemplate;
    /**
     * checks if supplied Variables satisfy the template
     */
-    private _checkSuppliedVariables();
+    private _checkSuppliedVariables;
    /**
     * checks the default.yml at the root of a template for default variables
     * allows 2 ways of notation in YAML:
@ -47,5 +47,5 @@ export declare class ScafTemplate {
     * >>   - yourKey:
     * >>     - yourDeeperKey: yourValue
     */
-    private _checkDefaultVariables();
+    private _checkDefaultVariables;
 }
--- a/dist/smartscaf.classes.smartscaf.js
+++ b/dist/smartscaf.classes.smartscaf.js
@ -33,7 +33,7 @@ class ScafTemplate {
     */
    supplyVariables(variablesArg) {
        return __awaiter(this, void 0, void 0, function* () {
-            this.suppliedVariables = plugins.lodash.merge(this.suppliedVariables, variablesArg);
+            this.suppliedVariables = Object.assign({}, this.suppliedVariables, variablesArg);
            this.missingVariables = yield this._checkSuppliedVariables();
        });
    }
@ -45,11 +45,12 @@ class ScafTemplate {
            this.missingVariables = yield this._checkSuppliedVariables();
            let localSmartInteract = new plugins.smartinteract.SmartInteract();
            for (let missingVariable of this.missingVariables) {
-                localSmartInteract.addQuestions([{
+                localSmartInteract.addQuestions([
+                    {
                        name: missingVariable,
                        type: 'input',
                        default: (() => {
-                            if (this.defaultVariables[missingVariable]) {
+                            if (this.defaultVariables && this.defaultVariables[missingVariable]) {
                                return this.defaultVariables[missingVariable];
                            }
                            else {
@ -57,7 +58,8 @@ class ScafTemplate {
                            }
                        })(),
                        message: `What is the value of ${missingVariable}?`
-                    }]);
+                    }
+                ]);
            }
            let answerBucket = yield localSmartInteract.runQueue();
            answerBucket.answerMap.forEach((answer) => __awaiter(this, void 0, void 0, function* () {
@ -67,11 +69,17 @@ class ScafTemplate {
    }
    writeToDisk(destinationDirArg) {
        return __awaiter(this, void 0, void 0, function* () {
-            let smartfileArrayToWrite = plugins.lodash.cloneDeep(this.templateSmartfileArray);
+            let smartfileArrayToWrite = this.templateSmartfileArray;
            for (let smartfile of smartfileArrayToWrite) {
+                // render the template
                let template = yield plugins.smarthbs.getTemplateForString(smartfile.contents.toString());
                let renderedTemplateString = template(this.suppliedVariables);
-                smartfile.contents = Buffer.from(renderedTemplateString);
+                // handle frontmatter
+                let parsedTemplate = plugins.smartfm.parse(renderedTemplateString);
+                if (parsedTemplate.data.fileName) {
+                    smartfile.updateFileName(parsedTemplate.data.fileName);
+                }
+                smartfile.contents = Buffer.from(parsedTemplate.content);
            }
            yield plugins.smartfile.memory.smartfileArrayToFs(smartfileArrayToWrite, destinationDirArg);
        });
@ -85,9 +93,11 @@ class ScafTemplate {
            let templateVariables = [];
            for (let templateSmartfile of this.templateSmartfileArray) {
                let localTemplateVariables = yield plugins.smarthbs.findVarsInHbsString(templateSmartfile.contents.toString());
-                templateVariables = plugins.lodash.concat(templateVariables, localTemplateVariables);
+                templateVariables = [...templateVariables, ...localTemplateVariables];
            }
-            templateVariables = plugins.lodash.uniq(templateVariables);
+            templateVariables = templateVariables.filter((value, index, self) => {
+                return self.indexOf(value) === index;
+            });
        });
    }
    /**
@ -98,9 +108,14 @@ class ScafTemplate {
            let missingVars = [];
            for (let templateSmartfile of this.templateSmartfileArray) {
                let localMissingVars = yield plugins.smarthbs.checkVarsSatisfaction(templateSmartfile.contents.toString(), this.suppliedVariables);
-                missingVars = plugins.lodash.concat(missingVars, localMissingVars);
+                missingVars = [
+                    ...missingVars,
+                    ...localMissingVars
+                ];
            }
-            missingVars = plugins.lodash.uniq(missingVars);
+            missingVars = missingVars.filter((value, index, self) => {
+                return self.indexOf(value) === index;
+            });
            return missingVars;
        });
    }
@ -132,4 +147,4 @@ class ScafTemplate {
    }
 }
 exports.ScafTemplate = ScafTemplate;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwrQ0FBOEM7QUFDOUMsK0NBQThDO0FBVzlDO0lBQUE7UUFNRSxzQkFBaUIsR0FBUSxFQUFFLENBQUE7UUFDM0IscUJBQWdCLEdBQWEsRUFBRSxDQUFBO0lBb0hqQyxDQUFDO0lBbEhDOztPQUVHO0lBQ0csbUJBQW1CLENBQUUsVUFBa0I7O1lBQzNDLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFBO1lBQzlDLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQTtZQUMxRixNQUFNLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxDQUFBO1lBQ3JDLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUE7WUFDcEMsTUFBTSxJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQTtRQUNyQyxDQUFDO0tBQUE7SUFFRDs7O09BR0c7SUFDRyxlQUFlLENBQUUsWUFBWTs7WUFDakMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxZQUFZLENBQUMsQ0FBQTtZQUNuRixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxJQUFJLENBQUMsdUJBQXVCLEVBQUUsQ0FBQTtRQUM5RCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLHlCQUF5Qjs7WUFDN0IsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUE7WUFDNUQsSUFBSSxrQkFBa0IsR0FBRyxJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwrQ0FBK0M7QUFDL0MsK0NBQStDO0FBVy9DO0lBQUE7UUFNRSxzQkFBaUIsR0FBUSxFQUFFLENBQUM7UUFDNUIscUJBQWdCLEdBQWEsRUFBRSxDQUFDO0lBd0lsQyxDQUFDO0lBdElDOztPQUVHO0lBQ0csbUJBQW1CLENBQUMsVUFBa0I7O1lBQzFDLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQy9DLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztZQUMzRixNQUFNLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxDQUFDO1lBQ3RDLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUM7WUFDckMsTUFBTSxJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUN0QyxDQUFDO0tBQUE7SUFFRDs7O09BR0c7SUFDRyxlQUFlLENBQUMsWUFBWTs7WUFDaEMsSUFBSSxDQUFDLGlCQUFpQixxQkFDakIsSUFBSSxDQUFDLGlCQUFpQixFQUN0QixZQUFZLENBQ2hCLENBQUM7WUFDRixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxJQUFJLENBQUMsdUJBQXVCLEVBQUUsQ0FBQztRQUMvRCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLHlCQUF5Qjs7WUFDN0IsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUM7WUFDN0QsSUFBSSxrQkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxhQUFhLENBQUMsYUFB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
--- a/dist/smartscaf.helpers.js
+++ b/dist/smartscaf.helpers.js
@ -26,11 +26,18 @@ exports.deepAddToObject = (objectArg, varStringArg, valueArg) => __awaiter(this,
        // build the tree in suppliedVariables
        if (!referencePointer[varName] && !varNameNext) {
            referencePointer[varName] = valueArg;
+            referencePointer = null;
        }
        else if (!referencePointer[varName] && varNameNext) {
            referencePointer[varName] = {};
            referencePointer = referencePointer[varName];
        }
+        else if (referencePointer[varName] && varNameNext) {
+            referencePointer = referencePointer[varName];
+        }
+        else {
+            throw new Error('Something is strange!');
+        }
    }
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBRUE7O0dBRUc7QUFDUSxRQUFBLGVBQWUsR0FBRyxDQUFPLFNBQVMsRUFBRSxZQUFvQixFQUFFLFFBQWdCO0lBQ25GLElBQUksYUFBYSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0MsSUFBSSxnQkFBZ0IsR0FBRyxTQUFTLENBQUE7SUFDaEMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsS0FBSyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDaEQsSUFBSSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBRTlCLDZCQUE2QjtRQUM3QixJQUFJLFdBQVcsR0FBVyxDQUFDO1lBQ3pCLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN6QixNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtZQUM3QixDQUFDO1lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQTtRQUNiLENBQUMsQ0FBQyxFQUFFLENBQUE7UUFFSixzQ0FBc0M7UUFDdEMsRUFBRSxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDL0MsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsUUFBUSxDQUFBO1FBQ3RDLENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQ3JELGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQTtZQUM5QixnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUM5QyxDQUFDO0lBQ0gsQ0FBQztBQUNILENBQUMsQ0FBQSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBRUE7O0dBRUc7QUFDUSxRQUFBLGVBQWUsR0FBRyxDQUFPLFNBQVMsRUFBRSxZQUFvQixFQUFFLFFBQWdCLEVBQUUsRUFBRTtJQUN2RixJQUFJLGFBQWEsR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNDLElBQUksZ0JBQWdCLEdBQUcsU0FBUyxDQUFBO0lBQ2hDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsS0FBSyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQy9DLElBQUksT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUU5Qiw2QkFBNkI7UUFDN0IsSUFBSSxXQUFXLEdBQVcsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsSUFBSSxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO2dCQUN4QixPQUFPLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUE7YUFDNUI7WUFDRCxPQUFPLElBQUksQ0FBQTtRQUNiLENBQUMsQ0FBQyxFQUFFLENBQUE7UUFFSixzQ0FBc0M7UUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQzlDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLFFBQVEsQ0FBQTtZQUNwQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUE7U0FDeEI7YUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ3BELGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQTtZQUM5QixnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQTtTQUM3QzthQUFNLElBQUksZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ25ELGdCQUFnQixHQUFHLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFBO1NBQzdDO2FBQU07WUFDTCxNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUE7U0FDekM7S0FDRjtBQUNILENBQUMsQ0FBQSxDQUFBIn0=
--- a/dist/smartscaf.plugins.d.ts
+++ b/dist/smartscaf.plugins.d.ts
@ -1,9 +1,8 @@
-import 'typings-global';
-import * as lodash from 'lodash';
 import * as path from 'path';
 import * as smartfile from 'smartfile';
+import * as smartfm from 'smartfm';
 import * as smarthbs from 'smarthbs';
 import * as smartinteract from 'smartinteract';
 import * as smartq from 'smartq';
 import * as smartyaml from 'smartyaml';
-export { lodash, path, smartfile, smarthbs, smartinteract, smartq, smartyaml };
+export { path, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml };
--- a/dist/smartscaf.plugins.js
+++ b/dist/smartscaf.plugins.js
@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("typings-global");
-const lodash = require("lodash");
-exports.lodash = lodash;
 const path = require("path");
 exports.path = path;
 const smartfile = require("smartfile");
 exports.smartfile = smartfile;
+const smartfm = require("smartfm");
+exports.smartfm = smartfm;
 const smarthbs = require("smarthbs");
 exports.smarthbs = smarthbs;
 const smartinteract = require("smartinteract");
@ -15,4 +14,4 @@ const smartq = require("smartq");
 exports.smartq = smartq;
 const smartyaml = require("smartyaml");
 exports.smartyaml = smartyaml;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2QixpQ0FBZ0M7QUFTOUIsd0JBQU07QUFSUiw2QkFBNEI7QUFTMUIsb0JBQUk7QUFSTix1Q0FBc0M7QUFTcEMsOEJBQVM7QUFSWCxxQ0FBb0M7QUFTbEMsNEJBQVE7QUFSViwrQ0FBOEM7QUFTNUMsc0NBQWE7QUFSZixpQ0FBZ0M7QUFTOUIsd0JBQU07QUFSUix1Q0FBc0M7QUFTcEMsOEJBQVMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZCQUE0QjtBQVMxQixvQkFBSTtBQVJOLHVDQUFzQztBQVNwQyw4QkFBUztBQVJYLG1DQUFrQztBQVNoQywwQkFBTztBQVJULHFDQUFvQztBQVNsQyw0QkFBUTtBQVJWLCtDQUE4QztBQVM1QyxzQ0FBYTtBQVJmLGlDQUFnQztBQVM5Qix3QkFBTTtBQVJSLHVDQUFzQztBQVNwQyw4QkFBUyJ9
--- a/docs/index.md
+++ b/docs/index.md
@ -0,0 +1,33 @@
+# smartscaf
+
+scaffold projects quickly
+
+## Availabililty
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartscaf)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartscaf)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartscaf)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartscaf/)
+
+## Status for master
+
+[![build status](https://GitLab.com/pushrocks/smartscaf/badges/master/build.svg)](https://GitLab.com/pushrocks/smartscaf/commits/master)
+[![coverage report](https://GitLab.com/pushrocks/smartscaf/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartscaf/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/smartscaf.svg)](https://www.npmjs.com/package/smartscaf)
+[![Dependency Status](https://david-dm.org/pushrocks/smartscaf.svg)](https://david-dm.org/pushrocks/smartscaf)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartscaf/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartscaf/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/smartscaf/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartscaf)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+
+## Usage
+
+Use TypeScript for best in class instellisense.
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://)
--- a/npmextra.json
+++ b/npmextra.json
@ -3,8 +3,7 @@
    "coverageTreshold": 30
  },
  "npmci": {
-    "globalNpmTools": [
-      "npmts"
-    ]
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public"
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,11 +1,14 @@
 {
-  "name": "smartscaf",
-  "version": "1.0.3",
+  "name": "@pushrocks/smartscaf",
+  "version": "3.0.2",
+  "private": false,
  "description": "scaffold projects quickly",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "scripts": {
-    "test": "(npmts)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)",
+    "testLocal": "(npmts --notest && ts-node --compilerOptions '{\"target\":\"es6\"}' test/test.ts)"
  },
  "repository": {
    "type": "git",
@ -23,16 +26,21 @@
    "npm"
  ],
  "devDependencies": {
-    "tapbundle": "^1.0.12"
+    "@gitzone/tsbuild": "^2.1.6",
+    "@gitzone/tsrun": "^1.1.17",
+    "@gitzone/tstest": "^1.0.18",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.12.18"
  },
  "dependencies": {
-    "@types/lodash": "^4.14.64",
-    "lodash": "^4.17.4",
-    "smartfile": "^4.2.12",
-    "smarthbs": "^1.0.15",
-    "smartinteract": "^1.0.4",
-    "smartq": "^1.1.1",
-    "smartyaml": "^1.0.2",
-    "typings-global": "^1.0.16"
+    "@pushrocks/lik": "^3.0.4",
+    "@pushrocks/smartfile": "^6.0.12",
+    "@pushrocks/smartfm": "^2.0.1",
+    "@pushrocks/smarthbs": "^2.0.0",
+    "@pushrocks/smartinteract": "^2.0.4",
+    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartyaml": "^2.0.3",
+    "@types/lodash": "^4.14.120",
+    "lodash": "^4.17.11"
  }
 }
--- a/readme.md
+++ b/readme.md
@ -1,13 +1,16 @@
 # smartscaf
+
 scaffold projects quickly

 ## Availabililty
+
 [![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartscaf)
 [![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartscaf)
 [![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartscaf)
 [![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartscaf/)

 ## Status for master
+
 [![build status](https://GitLab.com/pushrocks/smartscaf/badges/master/build.svg)](https://GitLab.com/pushrocks/smartscaf/commits/master)
 [![coverage report](https://GitLab.com/pushrocks/smartscaf/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartscaf/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/smartscaf.svg)](https://www.npmjs.com/package/smartscaf)
@ -19,11 +22,12 @@ scaffold projects quickly
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)

 ## Usage
+
 Use TypeScript for best in class instellisense.

 For further information read the linked docs at the top of this README.

 > MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)

 [![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://)
--- a/test/test.ts
+++ b/test/test.ts
@ -1,33 +1,37 @@
-import { expect, tap } from 'tapbundle'
-import * as path from 'path'
+import { expect, tap } from '@pushrocks/tapbundle';
+import * as path from 'path';

-import * as smartscaf from '../dist/index'
+import * as smartscaf from '../ts/index';

-process.env.CI = 'true'
+process.env.CI = 'true';

-let testScafTemplate: smartscaf.ScafTemplate
+let testScafTemplate: smartscaf.ScafTemplate;

 tap.test('should create new Smartscaf instance', async () => {
-  testScafTemplate = new smartscaf.ScafTemplate()
-  expect(testScafTemplate).to.be.instanceof(smartscaf.ScafTemplate)
-})
+  testScafTemplate = new smartscaf.ScafTemplate('./test/test_template');
+  expect(testScafTemplate).to.be.instanceof(smartscaf.ScafTemplate);
+});

 tap.test('Smartscaf instance -> should read a template directory', async () => {
-  await testScafTemplate.readTemplateFromDir('./test/test_template')
-  expect(testScafTemplate.templateSmartfileArray.length).to.equal(4)
-})
+  await testScafTemplate.readTemplateFromDir();
+  expect(testScafTemplate.templateSmartfileArray.length).to.equal(6);
+});

 tap.test('smartfile -> should accept variables', async () => {
-  await testScafTemplate.supplyVariables({})
-  console.log(testScafTemplate.missingVariables)
-})
+  await testScafTemplate.supplyVariables({});
+  console.log(testScafTemplate.missingVariables);
+});

 tap.test('ask cli', async () => {
-  await testScafTemplate.askCliForMissingVariables()
-})
+  await testScafTemplate.askCliForMissingVariables();
+});
+
+tap.test('should have valid supplied variables', async () => {
+  console.log(testScafTemplate.suppliedVariables);
+});

 tap.test('should output ready rendered template', async () => {
-  await testScafTemplate.writeToDisk(path.resolve('./test/test_output'))
-})
+  await testScafTemplate.writeToDisk(path.resolve('./test/test_output'));
+});

-tap.start()
+tap.start();
--- a/test/test_output/changedname.md
+++ b/test/test_output/changedname.md
--- a/test/test_output/defaults.yml
+++ b/test/test_output/defaults.yml
@ -1,2 +0,0 @@
-templateVar1: from default yaml
-templateVar2: this is another value from yml
--- a/test/test_output/hello.md
+++ b/test/test_output/hello.md
@ -0,0 +1 @@
+# param1 10
--- a/test/test_output/notemplate.yml
+++ b/test/test_output/notemplate.yml
@ -0,0 +1 @@
+awesome!
--- a/test/test_output/template1.md
+++ b/test/test_output/template1.md
@ -1,3 +1,3 @@
-# this is a from default yaml
-# this is a this is another value from yml
+# this is a wow
+# this is a here
 # this is a undefined variable
--- a/test/test_template/.smartscaf.yml
+++ b/test/test_template/.smartscaf.yml
@ -0,0 +1,10 @@
+defaults:
+  templateVar1: from default yaml
+  templateVar2: this is another value from yml
+  templateObject.value1: wow
+  templateObject.value2: here
+  node_version: '10'
+
+dependencies:
+  merge:
+    - ../test_template_2
--- a/test/test_template/defaults.yml
+++ b/test/test_template/defaults.yml
@ -1,2 +0,0 @@
-templateVar1: from default yaml
-templateVar2: this is another value from yml
--- a/test/test_template/notemplate.yml
+++ b/test/test_template/notemplate.yml
@ -0,0 +1 @@
+awesome!
--- a/test/test_template/template1.md
+++ b/test/test_template/template1.md
@ -1,3 +1,3 @@
-# this is a {{templateVar1}}
-# this is a {{templateVar2}}
+# this is a {{templateObject.value1}}
+# this is a {{templateObject.value2}}
 # this is a {{templateVar3}}
--- a/test/test_template/template3.md
+++ b/test/test_template/template3.md
@ -1 +1,4 @@
+---
+fileName: changedname.md
+---
 # some {{wow}}
--- a/test/test_template_2/hello.md
+++ b/test/test_template_2/hello.md
@ -0,0 +1 @@
+# param1 {{node_version}}
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1 +1 @@
-export * from './smartscaf.classes.smartscaf'
+export * from './smartscaf.classes.smartscaf';
--- a/ts/smartscaf.classes.smartscaf.ts
+++ b/ts/smartscaf.classes.smartscaf.ts
@ -1,114 +1,170 @@
-import * as plugins from './smartscaf.plugins'
-import * as helpers from './smartscaf.helpers'
+import * as plugins from './smartscaf.plugins';
+import * as helpers from './smartscaf.helpers';

 // interfaces
-import { Smartfile } from 'smartfile'
+import { Smartfile } from '@pushrocks/smartfile';

 export interface ScafTemplateContructorOptions {
-  name?: string,
-  description?: string
-  sourceDir?: string
+  name?: string;
+  description?: string;
+  sourceDir?: string;
 }

 export class ScafTemplate {
-  name: string
-  description: string
-  templateSmartfileArray: Smartfile[]
-  requiredVariables: string[]
-  defaultVariables: any
-  suppliedVariables: any = {}
-  missingVariables: string[] = []
+  static async createTemplateFromDir() {}
+
+  /**
+   * the name of the template
+   */
+  name: string;
+
+  /**
+   * the descriptions of the template
+   */
+  description: string;
+
+  /**
+   * the location on disk of the template
+   */
+  dirPath: string;
+
+  /**
+   * the files of the template as array of Smartfiles
+   */
+  templateSmartfileArray: Smartfile[];
+  requiredVariables: string[];
+  defaultVariables: any;
+  suppliedVariables: any = {};
+  missingVariables: string[] = [];
+
+  constructor(dirPathArg: string) {
+    this.dirPath = plugins.path.resolve(dirPathArg);
+  }

  /**
   * read a template from a directory
   */
-  async readTemplateFromDir (dirPathArg: string) {
-    let dirPath = plugins.path.resolve(dirPathArg)
-    this.templateSmartfileArray = await plugins.smartfile.fs.fileTreeToObject(dirPath, '**/*')
-    await this._findVariablesInTemplate()
-    await this._checkSuppliedVariables()
-    await this._checkDefaultVariables()
+  async readTemplateFromDir() {
+    this.templateSmartfileArray = await plugins.smartfile.fs.fileTreeToObject(this.dirPath, '**/*');
+    await this._resolveTemplateDependencies();
+    await this._findVariablesInTemplate();
+    await this._checkSuppliedVariables();
+    await this._checkDefaultVariables();
  }

  /**
   * supply the variables to render the teplate with
   * @param variablesArg gets merged with this.suppliedVariables
   */
-  async supplyVariables (variablesArg) {
-    this.suppliedVariables = plugins.lodash.merge(this.suppliedVariables, variablesArg)
-    this.missingVariables = await this._checkSuppliedVariables()
+  async supplyVariables(variablesArg) {
+    this.suppliedVariables = {
+      ...this.suppliedVariables,
+      ...variablesArg
+    };
+    this.missingVariables = await this._checkSuppliedVariables();
  }

  /**
   * Will ask for the missing variables by cli interaction
   */
-  async askCliForMissingVariables () {
-    this.missingVariables = await this._checkSuppliedVariables()
-    let localSmartInteract = new plugins.smartinteract.SmartInteract()
+  async askCliForMissingVariables() {
+    this.missingVariables = await this._checkSuppliedVariables();
+    let localSmartInteract = new plugins.smartinteract.SmartInteract();
    for (let missingVariable of this.missingVariables) {
-      localSmartInteract.addQuestions([{
-        name: missingVariable,
-        type: 'input',
-        default: (() => {
-          if (this.defaultVariables[missingVariable]) {
-            return this.defaultVariables[missingVariable]
-          } else {
-            return 'undefined variable'
-          }
-        })(),
-        message: `What is the value of ${missingVariable}?`
-      }])
+      localSmartInteract.addQuestions([
+        {
+          name: missingVariable,
+          type: 'input',
+          default: (() => {
+            if (this.defaultVariables && this.defaultVariables[missingVariable]) {
+              return this.defaultVariables[missingVariable];
+            } else {
+              return 'undefined variable';
+            }
+          })(),
+          message: `What is the value of ${missingVariable}?`
+        }
+      ]);
    }
-    let answerBucket = await localSmartInteract.runQueue()
-    answerBucket.answerMap.forEach(async answer => {
-      await helpers.deepAddToObject(this.suppliedVariables, answer.name, answer.value)
-    })
-
+    let answerBucket = await localSmartInteract.runQueue();
+    await answerBucket.answerMap.forEach(async answer => {
+      await helpers.deepAddToObject(this.suppliedVariables, answer.name, answer.value);
+    });
  }

-  async writeToDisk (destinationDirArg) {
-    let smartfileArrayToWrite = plugins.lodash.cloneDeep(this.templateSmartfileArray)
-    for (let smartfile of smartfileArrayToWrite) {
-      let template = await plugins.smarthbs.getTemplateForString(
-        smartfile.contents.toString()
-      )
-      let renderedTemplateString = template(this.suppliedVariables)
-      smartfile.contents = Buffer.from(renderedTemplateString)
+  /**
+   * writes a file to disk
+   * @param destinationDirArg
+   */
+  async writeToDisk(destinationDirArg) {
+    const smartfileArrayToWrite: Smartfile[] = [];
+    for (let smartfile of this.templateSmartfileArray) {
+      // lets filter out template files
+      if (smartfile.path === '.smartscaf.yml') {
+        continue;
+      }
+
+      // render the template
+      let template = await plugins.smarthbs.getTemplateForString(smartfile.contents.toString());
+      let renderedTemplateString = template(this.suppliedVariables);
+
+      // handle frontmatter
+      const smartfmInstance = new plugins.smartfm.Smartfm({
+        fmType: 'yaml'
+      });
+      let parsedTemplate = smartfmInstance.parse(renderedTemplateString) as any;
+      if (parsedTemplate.data.fileName) {
+        smartfile.updateFileName(parsedTemplate.data.fileName);
+      }
+
+      smartfile.contents = Buffer.from(parsedTemplate.content);
+      smartfileArrayToWrite.push(smartfile);
    }
-    await plugins.smartfile.memory.smartfileArrayToFs(smartfileArrayToWrite, destinationDirArg)
+
+    await plugins.smartfile.memory.smartfileArrayToFs(smartfileArrayToWrite, destinationDirArg);
  }

  /**
   * finds all variables in a Template in as string
   * e.g. myobject.someKey and myobject.someOtherKey
   */
-  private async _findVariablesInTemplate () {
-    let templateVariables: string[] = []
+  private async _findVariablesInTemplate() {
+    let templateVariables: string[] = [];
    for (let templateSmartfile of this.templateSmartfileArray) {
-      let localTemplateVariables = await plugins.smarthbs.findVarsInHbsString(templateSmartfile.contents.toString())
-      templateVariables = plugins.lodash.concat(templateVariables, localTemplateVariables)
+      let localTemplateVariables = await plugins.smarthbs.findVarsInHbsString(
+        templateSmartfile.contents.toString()
+      );
+      templateVariables = [...templateVariables, ...localTemplateVariables];
    }
-    templateVariables = plugins.lodash.uniq(templateVariables)
+    templateVariables = templateVariables.filter((value, index, self) => {
+      return self.indexOf(value) === index;
+    });
  }

  /**
   * checks if supplied Variables satisfy the template
   */
-  private async _checkSuppliedVariables () {
-    let missingVars: string[] = []
+  private async _checkSuppliedVariables() {
+    let missingVars: string[] = [];
    for (let templateSmartfile of this.templateSmartfileArray) {
      let localMissingVars = await plugins.smarthbs.checkVarsSatisfaction(
        templateSmartfile.contents.toString(),
        this.suppliedVariables
-      )
-      missingVars = plugins.lodash.concat(missingVars, localMissingVars)
+      );
+
+      // combine with other missingVars
+      missingVars = [...missingVars, ...localMissingVars];
    }
-    missingVars = plugins.lodash.uniq(missingVars)
-    return missingVars
+
+    // dedupe
+    missingVars = missingVars.filter((value, index, self) => {
+      return self.indexOf(value) === index;
+    });
+    return missingVars;
  }

  /**
-   * checks the default.yml at the root of a template for default variables
+   * checks the smartscaf.yml default values at the root of a template
   * allows 2 ways of notation in YAML:
   * >> myObject.myKey.someDeeperKey: someValue
   * >> myObject.yourKey.yourDeeperKey: yourValue
@ -119,18 +175,60 @@ export class ScafTemplate {
   * >>   - yourKey:
   * >>     - yourDeeperKey: yourValue
   */
-  private async _checkDefaultVariables () {
-    let defaultsSmartfile = this.templateSmartfileArray.filter(smartfileArg => {
-      return smartfileArg.parsedPath.base === 'defaults.yml'
-    })[0]
+  private async _checkDefaultVariables() {
+    let smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
+      return smartfileArg.parsedPath.base === '.smartscaf.yml';
+    });

-    if (defaultsSmartfile) {
-      let defaultObject = await plugins.smartyaml.yamlStringToObject(
-        defaultsSmartfile.contents.toString()
-      )
-      this.defaultVariables = defaultObject
-    } else {
-      this.defaultVariables = {}
+    if (smartscafSmartfile) {
+      const smartscafObject = await plugins.smartyaml.yamlStringToObject(
+        smartscafSmartfile.contents.toString()
+      );
+      const defaultObject = smartscafObject.defaults;
+      this.defaultVariables = defaultObject;
+    }
+
+    // safeguard against non existent defaults
+    if (!this.defaultVariables) {
+      console.log('this template does not specify defaults');
+      this.defaultVariables = {};
+    }
+  }
+
+  /**
+   * resolve template dependencies
+   */
+  private async _resolveTemplateDependencies() {
+    const smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
+      return smartfileArg.parsedPath.base === '.smartscaf.yml';
+    });
+    if (!smartscafSmartfile) {
+      console.log('No further template dependencies defined!');
+      return;
+    }
+    console.log('Found template dependencies! Resolving them now!');
+    console.log('looking at templates to merge!');
+    const smartscafYamlObject = await plugins.smartyaml.yamlStringToObject(
+      smartscafSmartfile.contentBuffer.toString()
+    );
+    if (!smartscafYamlObject) {
+      console.log('Something seems strange about the supplied dependencies.yml file.');
+      return;
+    }
+    for (const dependency of smartscafYamlObject.dependencies.merge) {
+      console.log(`Now resolving ${dependency}`);
+      const templatePathToMerge = plugins.path.join(this.dirPath, dependency);
+      if (!plugins.smartfile.fs.isDirectory(templatePathToMerge)) {
+        console.log(
+          `dependency ${dependency} resolves to ${templatePathToMerge} which ist NOT a directory`
+        );
+        continue;
+      }
+      const templateSmartfileArray = await plugins.smartfile.fs.fileTreeToObject(
+        templatePathToMerge,
+        '**/*'
+      );
+      this.templateSmartfileArray = this.templateSmartfileArray.concat(templateSmartfileArray);
    }
  }
 }
--- a/ts/smartscaf.helpers.ts
+++ b/ts/smartscaf.helpers.ts
@ -1,28 +1,33 @@
-import * as plugins from './smartscaf.plugins'
+import * as plugins from './smartscaf.plugins';

 /**
 * adds a variable in string dot notation to an already more or less expanded object
 */
 export let deepAddToObject = async (objectArg, varStringArg: string, valueArg: string) => {
-  let varNamesArray = varStringArg.split('.')
-  let referencePointer = objectArg
+  let varNamesArray = varStringArg.split('.');
+  let referencePointer = objectArg;
  for (let i = 0; i !== varNamesArray.length; i++) {
-    let varName = varNamesArray[i]
+    let varName = varNamesArray[i];

    // is there a next variable ?
    let varNameNext: string = (() => {
      if (varNamesArray[i + 1]) {
-        return varNamesArray[i + 1]
+        return varNamesArray[i + 1];
      }
-      return null
-    })()
+      return null;
+    })();

    // build the tree in suppliedVariables
    if (!referencePointer[varName] && !varNameNext) {
-      referencePointer[varName] = valueArg
+      referencePointer[varName] = valueArg;
+      referencePointer = null;
    } else if (!referencePointer[varName] && varNameNext) {
-      referencePointer[varName] = {}
-      referencePointer = referencePointer[varName]
+      referencePointer[varName] = {};
+      referencePointer = referencePointer[varName];
+    } else if (referencePointer[varName] && varNameNext) {
+      referencePointer = referencePointer[varName];
+    } else {
+      throw new Error('Something is strange!');
    }
  }
-}
+};
--- a/ts/smartscaf.plugins.ts
+++ b/ts/smartscaf.plugins.ts
@ -1,18 +1,10 @@
-import 'typings-global'
-import * as lodash from 'lodash'
-import * as path from 'path'
-import * as smartfile from 'smartfile'
-import * as smarthbs from 'smarthbs'
-import * as smartinteract from 'smartinteract'
-import * as smartq from 'smartq'
-import * as smartyaml from 'smartyaml'
+import * as path from 'path';
+import * as lik from '@pushrocks/lik';
+import * as smartfile from '@pushrocks/smartfile';
+import * as smartfm from '@pushrocks/smartfm';
+import * as smarthbs from '@pushrocks/smarthbs';
+import * as smartinteract from '@pushrocks/smartinteract';
+import * as smartq from '@pushrocks/smartpromise';
+import * as smartyaml from '@pushrocks/smartyaml';

-export {
-  lodash,
-  path,
-  smartfile,
-  smarthbs,
-  smartinteract,
-  smartq,
-  smartyaml
-}
+export { path, lik, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml };
--- a/tslint.json
+++ b/tslint.json
@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Phil Kunz	ff0faa719b	3.0.2	2019-01-27 18:55:39 +01:00
Phil Kunz	400e228ffc	fix(core): update	2019-01-27 18:55:38 +01:00
Phil Kunz	25871fc970	3.0.1	2018-10-04 17:00:33 +02:00
Phil Kunz	eb990a8ec2	fix(core): update	2018-10-04 17:00:33 +02:00
Phil Kunz	f5194b76bd	Merge branch 'master' into 'master' update See merge request pushrocks/smartscaf!1	2018-10-04 14:48:20 +00:00
Phil Kunz	6b5e9ac617	update	2018-10-04 16:04:42 +02:00
Phil Kunz	60854250eb	3.0.0	2018-08-30 22:43:22 +02:00
Phil Kunz	53de92ac1a	BREAKING CHANGE(structure): templates now take their path within the constructor	2018-08-30 22:43:22 +02:00
Phil Kunz	6cb4fff0a5	2.0.2	2018-08-28 23:57:06 +02:00
Phil Kunz	45710ded00	2.0.1	2018-08-28 00:20:02 +02:00
Phil Kunz	aa87ed9427	fix(dependencies): resolve dependencies	2018-08-28 00:20:02 +02:00
Phil Kunz	f3594447ac	2.0.0	2018-08-27 23:55:14 +02:00
Phil Kunz	a3f18c17ed	BREAKING CHANGE(scope): switch to new @pushrocks scope	2018-08-27 23:55:14 +02:00
Phil Kunz	c5ec7e9c24	1.0.14	2017-08-09 16:57:39 +02:00
Phil Kunz	98875a2ece	fix variable distribution	2017-08-09 16:57:32 +02:00
Phil Kunz	5b42cf93cb	1.0.13	2017-08-09 15:31:39 +02:00
Phil Kunz	e0ab34c466	update dependencies	2017-08-09 15:31:35 +02:00
Phil Kunz	beb3013e2c	1.0.12	2017-07-28 14:47:46 +02:00
Phil Kunz	5d1c0a6f1e	update dependencies	2017-07-28 14:47:43 +02:00
Phil Kunz	fc450816e6	1.0.11	2017-06-02 01:03:27 +02:00
Phil Kunz	5fac35c75f	prevent empty defaults.yml causing error	2017-06-02 01:03:24 +02:00
Phil Kunz	dde29629b7	1.0.10	2017-05-28 00:14:25 +02:00
Phil Kunz	4347f800e6	update dependencies	2017-05-28 00:14:11 +02:00
Phil Kunz	59161f1eeb	1.0.9	2017-05-27 23:53:06 +02:00
Phil Kunz	b9a346c5d7	now supports frontmatter for advanced file templating	2017-05-27 23:52:58 +02:00
Phil Kunz	fa961f86b8	1.0.8	2017-05-27 03:25:50 +02:00
Phil Kunz	ff679c1787	add docs	2017-05-27 03:25:42 +02:00
Phil Kunz	35e3c9ae48	1.0.7	2017-05-27 03:22:00 +02:00
Phil Kunz	bf0007ff3a	fix deep add	2017-05-27 03:21:55 +02:00
Phil Kunz	3ab780e600	1.0.6	2017-05-27 02:57:25 +02:00
Phil Kunz	d0662f809f	update smartfile	2017-05-27 02:57:22 +02:00
Phil Kunz	e20bf7f610	1.0.5	2017-05-27 01:47:21 +02:00
Phil Kunz	0a97ec4d07	fix tests	2017-05-27 01:47:16 +02:00
Phil Kunz	69e09c8b4c	1.0.4	2017-05-27 01:28:42 +02:00
Phil Kunz	0e92554d0a	update smartfile	2017-05-27 01:28:37 +02:00