3.0.1

update

See merge request pushrocks/smartscaf!1

.gitlab-ci.yml

@@ -3,69 +3,140 @@ image: hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .yarn/
+  - .npmci_cache/
   key: "$CI_BUILD_STAGE"
 
 stages:
+- security
 - test
 - release
-- trigger
+- metadata
-- pages
 
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  script:
+  - npmci git mirror
+  tags:
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# test stage
+# ====================
 testLEGACY:
   stage: test
   script:
-    - npmci test legacy
+  - npmci node install legacy
+  - npmci npm install
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
   allow_failure: true
 
 testLTS:
   stage: test
   script:
-    - npmci test lts
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
     
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
 
 release:
   stage: release
   script:
-    - npmci publish
+  - npmci node install stable
+  - npmci npm publish
   only:
   - tags
   tags:
   - 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
   only:
   - tags
   tags:
   - docker
+  - notpriv
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g typedoc typescript
-    - npmci command npmpage
+    - 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
+
+windowsCompatibility:
+  image: stefanscherer/node-windows:10-build-tools
+  stage: metadata
+  script:
+  - npm install & npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - windows
+  allow_failure: true

dist/smartscaf.classes.smartscaf.d.ts

@@ -25,15 +25,16 @@ export declare class ScafTemplate {
      * Will ask for the missing variables by cli interaction
      */
     askCliForMissingVariables(): Promise<void>;
+    writeToDisk(destinationDirArg: any): Promise<void>;
     /**
      * 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:
@@ -46,5 +47,5 @@ export declare class ScafTemplate {
      * >>   - yourKey:
      * >>     - yourDeeperKey: yourValue
      */
-    private _checkDefaultVariables();
+    private _checkDefaultVariables;
 }

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* () {
@@ -65,6 +67,23 @@ class ScafTemplate {
             }));
         });
     }
+    writeToDisk(destinationDirArg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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);
+                // 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);
+        });
+    }
     /**
      * finds all variables in a Template in as string
      * e.g. myobject.someKey and myobject.someOtherKey
@@ -74,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;
+            });
         });
     }
     /**
@@ -87,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;
         });
     }
@@ -121,4 +147,4 @@ class ScafTemplate {
     }
 }
 exports.ScafTemplate = ScafTemplate;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwrQ0FBOEM7QUFDOUMsK0NBQThDO0FBVzlDO0lBQUE7UUFNRSxzQkFBaUIsR0FBUSxFQUFFLENBQUE7UUFDM0IscUJBQWdCLEdBQWEsRUFBRSxDQUFBO0lBd0dqQyxDQUFDO0lBdEdDOztPQUVHO0lBQ0csbUJBQW1CLENBQUUsVUFBa0I7O1lBQzNDLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFBO1lBQzlDLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQTtZQUMxRixNQUFNLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxDQUFBO1lBQ3JDLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUE7WUFDcEMsTUFBTSxJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQTtRQUNyQyxDQUFDO0tBQUE7SUFFRDs7O09BR0c7SUFDRyxlQUFlLENBQUUsWUFBWTs7WUFDakMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxZQUFZLENBQUMsQ0FBQTtZQUNuRixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxJQUFJLENBQUMsdUJBQXVCLEVBQUUsQ0FBQTtRQUM5RCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLHlCQUF5Qjs7WUFDN0IsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUE7WUFDNUQsSUFBSSxrQkFBa0IsR0FBRyxJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzY2FmLmNsYXNzZXMuc21hcnRzY2FmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwrQ0FBK0M7QUFDL0MsK0NBQStDO0FBVy9DO0lBQUE7UUFNRSxzQkFBaUIsR0FBUSxFQUFFLENBQUM7UUFDNUIscUJBQWdCLEdBQWEsRUFBRSxDQUFDO0lBd0lsQyxDQUFDO0lBdElDOztPQUVHO0lBQ0csbUJBQW1CLENBQUMsVUFBa0I7O1lBQzFDLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQy9DLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztZQUMzRixNQUFNLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxDQUFDO1lBQ3RDLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUM7WUFDckMsTUFBTSxJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUN0QyxDQUFDO0tBQUE7SUFFRDs7O09BR0c7SUFDRyxlQUFlLENBQUMsWUFBWTs7WUFDaEMsSUFBSSxDQUFDLGlCQUFpQixxQkFDakIsSUFBSSxDQUFDLGlCQUFpQixFQUN0QixZQUFZLENBQ2hCLENBQUM7WUFDRixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxJQUFJLENBQUMsdUJBQXVCLEVBQUUsQ0FBQztRQUMvRCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLHlCQUF5Qjs7WUFDN0IsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE1BQU0sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUM7WUFDN0QsSUFBSSxrQkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxhQUFhLENBQUMsYUFB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

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=

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 };

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

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 | **©** [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://)

npmextra.json

@@ -3,8 +3,7 @@
     "coverageTreshold": 30
   },
   "npmci": {
-    "globalNpmTools": [
+    "npmGlobalTools": [],
-      "npmts"
+    "npmAccessLevel": "public"
-    ]
   }
 }

package.json

@@ -1,11 +1,14 @@
 {
-  "name": "smartscaf",
+  "name": "@pushrocks/smartscaf",
-  "version": "1.0.2",
+  "version": "3.0.1",
+  "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.0.22",
+    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tstest": "^1.0.15",
+    "@pushrocks/tapbundle": "^3.0.5",
+    "@types/node": "^10.9.2"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.64",
+    "@pushrocks/lik": "^3.0.1",
-    "lodash": "^4.17.4",
+    "@pushrocks/smartfile": "^6.0.8",
-    "smartfile": "^4.2.11",
+    "@pushrocks/smartfm": "^2.0.1",
-    "smarthbs": "^1.0.12",
+    "@pushrocks/smarthbs": "^2.0.0",
-    "smartinteract": "^1.0.4",
+    "@pushrocks/smartinteract": "^2.0.4",
-    "smartq": "^1.1.1",
+    "@pushrocks/smartpromise": "^2.0.5",
-    "smartyaml": "^1.0.2",
+    "@pushrocks/smartyaml": "^2.0.3",
-    "typings-global": "^1.0.16"
+    "@types/lodash": "^4.14.72",
+    "lodash": "^4.17.4"
   }
 }

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 | **©** [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://)

test/test.ts

@@ -1,28 +1,37 @@
-import { expect, tap } from 'tapbundle'
+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'
 
-let testScafTemplate: smartscaf.ScafTemplate
+let testScafTemplate: smartscaf.ScafTemplate;
 
 tap.test('should create new Smartscaf instance', async () => {
-  testScafTemplate = new smartscaf.ScafTemplate()
+  testScafTemplate = new smartscaf.ScafTemplate('./test/test_template');
-  expect(testScafTemplate).to.be.instanceof(smartscaf.ScafTemplate)
+  expect(testScafTemplate).to.be.instanceof(smartscaf.ScafTemplate);
-})
+});
 
 tap.test('Smartscaf instance -> should read a template directory', async () => {
-  await testScafTemplate.readTemplateFromDir('./test/test_template')
+  await testScafTemplate.readTemplateFromDir();
-  expect(testScafTemplate.templateSmartfileArray.length).to.equal(4)
+  expect(testScafTemplate.templateSmartfileArray.length).to.equal(6);
-})
+});
 
 tap.test('smartfile -> should accept variables', async () => {
-  await testScafTemplate.supplyVariables({})
+  await testScafTemplate.supplyVariables({});
-  console.log(testScafTemplate.missingVariables)
+  console.log(testScafTemplate.missingVariables);
-})
+});
 
 tap.test('ask cli', async () => {
-  await testScafTemplate.askCliForMissingVariables()
+  await testScafTemplate.askCliForMissingVariables();
-})
+});
 
-tap.start()
+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'));
+});
+
+tap.start();

test/test_output/changedname.md

@@ -0,0 +1 @@
+# some undefined variable

test/test_output/hello.md

@@ -0,0 +1 @@
+# param1 10

test/test_output/notemplate.yml

@@ -0,0 +1 @@
+awesome!

test/test_output/template1.md

@@ -0,0 +1,3 @@
+# this is a wow
+# this is a here
+# this is a undefined variable

test/test_output/template2.md

@@ -0,0 +1,3 @@
+# this is a from default yaml
+# this is a this is another value from yml
+# this is a undefined variable

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

test/test_template/defaults.yml

@@ -1,2 +0,0 @@
-templateVar1: from default yaml
-templateVar2: this is another value from yml

test/test_template/notemplate.yml

@@ -0,0 +1 @@
+awesome!

test/test_template/template1.md

@@ -1,3 +1,3 @@
-# this is a {{templateVar1}}
+# this is a {{templateObject.value1}}
-# this is a {{templateVar2}}
+# this is a {{templateObject.value2}}
 # this is a {{templateVar3}}

test/test_template/template3.md

@@ -1 +1,4 @@
+---
+fileName: changedname.md
+---
 # some {{wow}}

test/test_template_2/hello.md

@@ -0,0 +1 @@
+# param1 {{node_version}}

ts/index.ts

@@ -1 +1 @@
-export * from './smartscaf.classes.smartscaf'
+export * from './smartscaf.classes.smartscaf';

ts/smartscaf.classes.smartscaf.ts

@@ -1,102 +1,172 @@
-import * as plugins from './smartscaf.plugins'
+import * as plugins from './smartscaf.plugins';
-import * as helpers from './smartscaf.helpers'
+import * as helpers from './smartscaf.helpers';
 
 // interfaces
-import { Smartfile } from 'smartfile'
+import { Smartfile } from '@pushrocks/smartfile';
 
 export interface ScafTemplateContructorOptions {
-  name?: string,
+  name?: string;
-  description?: string
+  description?: string;
-  sourceDir?: string
+  sourceDir?: string;
 }
 
 export class ScafTemplate {
-  name: string
+  static async createTemplateFromDir() {
-  description: string
+
-  templateSmartfileArray: Smartfile[]
+  }
-  requiredVariables: string[]
+
-  defaultVariables: any
+  /**
-  suppliedVariables: any = {}
+   * the name of the template
-  missingVariables: string[] = []
+   */
+  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) {
+  async readTemplateFromDir() {
-    let dirPath = plugins.path.resolve(dirPathArg)
+    this.templateSmartfileArray = await plugins.smartfile.fs.fileTreeToObject(this.dirPath, '**/*');
-    this.templateSmartfileArray = await plugins.smartfile.fs.fileTreeToObject(dirPath, '**/*')
+    await this._resolveTemplateDependencies();
-    await this._findVariablesInTemplate()
+    await this._findVariablesInTemplate();
-    await this._checkSuppliedVariables()
+    await this._checkSuppliedVariables();
-    await this._checkDefaultVariables()
+    await this._checkDefaultVariables();
   }
 
   /**
    * supply the variables to render the teplate with
    * @param variablesArg gets merged with this.suppliedVariables
    */
-  async supplyVariables (variablesArg) {
+  async supplyVariables(variablesArg) {
-    this.suppliedVariables = plugins.lodash.merge(this.suppliedVariables, variablesArg)
+    this.suppliedVariables = {
-    this.missingVariables = await this._checkSuppliedVariables()
+      ...this.suppliedVariables,
+      ...variablesArg
+    };
+    this.missingVariables = await this._checkSuppliedVariables();
   }
 
   /**
    * Will ask for the missing variables by cli interaction
    */
-  async askCliForMissingVariables () {
+  async askCliForMissingVariables() {
-    this.missingVariables = await this._checkSuppliedVariables()
+    this.missingVariables = await this._checkSuppliedVariables();
-    let localSmartInteract = new plugins.smartinteract.SmartInteract()
+    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]
+              return this.defaultVariables[missingVariable];
             } else {
-            return 'undefined variable'
+              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);
+    });
+  }
 
+  /**
+   * 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);
   }
 
   /**
    * finds all variables in a Template in as string
    * e.g. myobject.someKey and myobject.someOtherKey
    */
-  private async _findVariablesInTemplate () {
+  private async _findVariablesInTemplate() {
-    let templateVariables: string[] = []
+    let templateVariables: string[] = [];
     for (let templateSmartfile of this.templateSmartfileArray) {
-      let localTemplateVariables = await plugins.smarthbs.findVarsInHbsString(templateSmartfile.contents.toString())
+      let localTemplateVariables = await plugins.smarthbs.findVarsInHbsString(
-      templateVariables = plugins.lodash.concat(templateVariables, localTemplateVariables)
+        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 () {
+  private async _checkSuppliedVariables() {
-    let missingVars: string[] = []
+    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
@@ -107,18 +177,53 @@ export class ScafTemplate {
    * >>   - yourKey:
    * >>     - yourDeeperKey: yourValue
    */
-  private async _checkDefaultVariables () {
+  private async _checkDefaultVariables() {
-    let defaultsSmartfile = this.templateSmartfileArray.filter(smartfileArg => {
+    let smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
-      return smartfileArg.parsedPath.base === 'defaults.yml'
+      return smartfileArg.parsedPath.base === '.smartscaf.yml';
-    })[0]
+    });
 
-    if (defaultsSmartfile) {
+    if (smartscafSmartfile) {
-      let defaultObject = await plugins.smartyaml.yamlStringToObject(
+      const smartscafObject = await plugins.smartyaml.yamlStringToObject(
-        defaultsSmartfile.contents.toString()
+        smartscafSmartfile.contents.toString()
-      )
+      );
-      this.defaultVariables = defaultObject
+      const defaultObject = smartscafObject.defaults;
-    } else {
+      this.defaultVariables = defaultObject;
-      this.defaultVariables = {}
+    }
+
+    // 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);
     }
   }
 }

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 varNamesArray = varStringArg.split('.');
-  let referencePointer = objectArg
+  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[varName] = {};
-      referencePointer = referencePointer[varName]
+      referencePointer = referencePointer[varName];
+    } else if (referencePointer[varName] && varNameNext) {
+      referencePointer = referencePointer[varName];
+    } else {
+      throw new Error('Something is strange!');
     }
   }
-}
+};

ts/smartscaf.plugins.ts

@@ -1,18 +1,10 @@
-import 'typings-global'
+import * as path from 'path';
-import * as lodash from 'lodash'
+import * as lik from '@pushrocks/lik';
-import * as path from 'path'
+import * as smartfile from '@pushrocks/smartfile';
-import * as smartfile from 'smartfile'
+import * as smartfm from '@pushrocks/smartfm';
-import * as smarthbs from 'smarthbs'
+import * as smarthbs from '@pushrocks/smarthbs';
-import * as smartinteract from 'smartinteract'
+import * as smartinteract from '@pushrocks/smartinteract';
-import * as smartq from 'smartq'
+import * as smartq from '@pushrocks/smartpromise';
-import * as smartyaml from 'smartyaml'
+import * as smartyaml from '@pushrocks/smartyaml';
 
-export {
+export { path, lik, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml };
-  lodash,
-  path,
-  smartfile,
-  smarthbs,
-  smartinteract,
-  smartq,
-  smartyaml
-}