3.0.4

update

See merge request pushrocks/smartscaf!1

.gitlab-ci.yml

@@ -26,6 +26,7 @@ mirror:
 snyk:
   stage: security
   script:
+    - npmci npm prepare
     - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
@@ -33,24 +34,39 @@ snyk:
   - 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
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - 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 npm prepare
   - npmci node install lts
   - npmci npm install
   - npmci npm test
@@ -62,6 +78,7 @@ testLTS:
 testSTABLE:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install stable
   - npmci npm install
   - npmci npm test
@@ -118,6 +135,7 @@ pages:
   stage: metadata
   script:
     - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
@@ -130,13 +148,3 @@ pages:
     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/index.js

@@ -4,4 +4,4 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./smartscaf.classes.smartscaf"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQUE2QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQUE4QyJ9

dist/smartscaf.classes.smartscaf.d.ts

@@ -1,21 +1,36 @@
-import { Smartfile } from 'smartfile';
+import { Smartfile } from '@pushrocks/smartfile';
 export interface ScafTemplateContructorOptions {
     name?: string;
     description?: string;
     sourceDir?: string;
 }
 export declare class ScafTemplate {
+    static createTemplateFromDir(): Promise<void>;
+    /**
+     * 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);
     /**
      * read a template from a directory
      */
-    readTemplateFromDir(dirPathArg: string): Promise<void>;
+    readTemplateFromDir(): Promise<void>;
     /**
      * supply the variables to render the teplate with
      * @param variablesArg gets merged with this.suppliedVariables
@@ -25,6 +40,10 @@ export declare class ScafTemplate {
      * Will ask for the missing variables by cli interaction
      */
     askCliForMissingVariables(): Promise<void>;
+    /**
+     * writes a file to disk
+     * @param destinationDirArg
+     */
     writeToDisk(destinationDirArg: any): Promise<void>;
     /**
      * finds all variables in a Template in as string
@@ -36,7 +55,7 @@ export declare class ScafTemplate {
      */
     private _checkSuppliedVariables;
     /**
-     * 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
@@ -48,4 +67,8 @@ export declare class ScafTemplate {
      * >>     - yourDeeperKey: yourValue
      */
     private _checkDefaultVariables;
+    /**
+     * resolve template dependencies
+     */
+    private _resolveTemplateDependencies;
 }

dist/smartscaf.helpers.js

@@ -1,17 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * adds a variable in string dot notation to an already more or less expanded object
  */
-exports.deepAddToObject = (objectArg, varStringArg, valueArg) => __awaiter(this, void 0, void 0, function* () {
+exports.deepAddToObject = async (objectArg, varStringArg, valueArg) => {
     let varNamesArray = varStringArg.split('.');
     let referencePointer = objectArg;
     for (let i = 0; i !== varNamesArray.length; i++) {
@@ -39,5 +31,5 @@ exports.deepAddToObject = (objectArg, varStringArg, valueArg) => __awaiter(this,
             throw new Error('Something is strange!');
         }
     }
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBRUE7O0dBRUc7QUFDUSxRQUFBLGVBQWUsR0FBRyxDQUFPLFNBQVMsRUFBRSxZQUFvQixFQUFFLFFBQWdCLEVBQUUsRUFBRTtJQUN2RixJQUFJLGFBQWEsR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNDLElBQUksZ0JBQWdCLEdBQUcsU0FBUyxDQUFBO0lBQ2hDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsS0FBSyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQy9DLElBQUksT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUU5Qiw2QkFBNkI7UUFDN0IsSUFBSSxXQUFXLEdBQVcsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsSUFBSSxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO2dCQUN4QixPQUFPLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUE7YUFDNUI7WUFDRCxPQUFPLElBQUksQ0FBQTtRQUNiLENBQUMsQ0FBQyxFQUFFLENBQUE7UUFFSixzQ0FBc0M7UUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQzlDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLFFBQVEsQ0FBQTtZQUNwQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUE7U0FDeEI7YUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ3BELGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQTtZQUM5QixnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQTtTQUM3QzthQUFNLElBQUksZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ25ELGdCQUFnQixHQUFHLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFBO1NBQzdDO2FBQU07WUFDTCxNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUE7U0FDekM7S0FDRjtBQUNILENBQUMsQ0FBQSxDQUFBIn0=
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBOztHQUVHO0FBQ1EsUUFBQSxlQUFlLEdBQUcsS0FBSyxFQUFFLFNBQVMsRUFBRSxZQUFvQixFQUFFLFFBQWdCLEVBQUUsRUFBRTtJQUN2RixJQUFJLGFBQWEsR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzVDLElBQUksZ0JBQWdCLEdBQUcsU0FBUyxDQUFDO0lBQ2pDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsS0FBSyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQy9DLElBQUksT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUUvQiw2QkFBNkI7UUFDN0IsSUFBSSxXQUFXLEdBQVcsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsSUFBSSxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO2dCQUN4QixPQUFPLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7YUFDN0I7WUFDRCxPQUFPLElBQUksQ0FBQztRQUNkLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFFTCxzQ0FBc0M7UUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQzlDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLFFBQVEsQ0FBQztZQUNyQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUM7U0FDekI7YUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ3BELGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUMvQixnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUM5QzthQUFNLElBQUksZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ25ELGdCQUFnQixHQUFHLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzlDO2FBQU07WUFDTCxNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUM7U0FDMUM7S0FDRjtBQUNILENBQUMsQ0FBQyJ9

dist/smartscaf.plugins.d.ts

@@ -1,8 +1,9 @@
 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 { path, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml };
+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 { path, lik, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml };

dist/smartscaf.plugins.js

@@ -1,17 +1,26 @@
 "use strict";
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
+const path = __importStar(require("path"));
 exports.path = path;
-const smartfile = require("smartfile");
+const lik = __importStar(require("@pushrocks/lik"));
+exports.lik = lik;
+const smartfile = __importStar(require("@pushrocks/smartfile"));
 exports.smartfile = smartfile;
-const smartfm = require("smartfm");
+const smartfm = __importStar(require("@pushrocks/smartfm"));
 exports.smartfm = smartfm;
-const smarthbs = require("smarthbs");
+const smarthbs = __importStar(require("@pushrocks/smarthbs"));
 exports.smarthbs = smarthbs;
-const smartinteract = require("smartinteract");
+const smartinteract = __importStar(require("@pushrocks/smartinteract"));
 exports.smartinteract = smartinteract;
-const smartq = require("smartq");
+const smartq = __importStar(require("@pushrocks/smartpromise"));
 exports.smartq = smartq;
-const smartyaml = require("smartyaml");
+const smartyaml = __importStar(require("@pushrocks/smartyaml"));
 exports.smartyaml = smartyaml;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZCQUE0QjtBQVMxQixvQkFBSTtBQVJOLHVDQUFzQztBQVNwQyw4QkFBUztBQVJYLG1DQUFrQztBQVNoQywwQkFBTztBQVJULHFDQUFvQztBQVNsQyw0QkFBUTtBQVJWLCtDQUE4QztBQVM1QyxzQ0FBYTtBQVJmLGlDQUFnQztBQVM5Qix3QkFBTTtBQVJSLHVDQUFzQztBQVNwQyw4QkFBUyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSwyQ0FBNkI7QUFTcEIsb0JBQUk7QUFSYixvREFBc0M7QUFRdkIsa0JBQUc7QUFQbEIsZ0VBQWtEO0FBTzlCLDhCQUFTO0FBTjdCLDREQUE4QztBQU1mLDBCQUFPO0FBTHRDLDhEQUFnRDtBQUtSLDRCQUFRO0FBSmhELHdFQUEwRDtBQUlSLHNDQUFhO0FBSC9ELGdFQUFrRDtBQUdlLHdCQUFNO0FBRnZFLGdFQUFrRDtBQUV1Qiw4QkFBUyJ9

docs/index.md

@@ -1,33 +0,0 @@
-# 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

@@ -5,5 +5,15 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartscaf",
+      "shortDescription": "scaffold projects quickly",
+      "npmPackagename": "@pushrocks/smartscaf",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,14 +1,13 @@
 {
   "name": "@pushrocks/smartscaf",
-  "version": "2.0.2",
+  "version": "3.0.4",
   "private": false,
   "description": "scaffold projects quickly",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
-    "testLocal": "(npmts --notest && ts-node --compilerOptions '{\"target\":\"es6\"}' test/test.ts)"
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -26,21 +25,19 @@
     "npm"
   ],
   "devDependencies": {
-    "@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"
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/tapbundle": "^3.0.13",
+    "@types/node": "^12.7.4"
   },
   "dependencies": {
-    "@pushrocks/lik": "^3.0.1",
-    "@pushrocks/smartfile": "^6.0.8",
-    "@pushrocks/smartfm": "^2.0.1",
-    "@pushrocks/smarthbs": "^2.0.0",
+    "@pushrocks/lik": "^3.0.11",
+    "@pushrocks/smartfile": "^7.0.4",
+    "@pushrocks/smartfm": "^2.0.4",
+    "@pushrocks/smarthbs": "^2.0.4",
     "@pushrocks/smartinteract": "^2.0.4",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartyaml": "^2.0.3",
-    "@types/lodash": "^4.14.72",
-    "lodash": "^4.17.4"
+    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartyaml": "^2.0.3"
   }
 }

readme.md

@@ -1,24 +1,19 @@
-# smartscaf
-
+# @pushrocks/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/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartscaf)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartscaf)
+* [github.com (source mirror)](https://github.com/pushrocks/smartscaf)
+* [docs (typedoc)](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/)
+[![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/@pushrocks/smartscaf.svg)](https://www.npmjs.com/package/@pushrocks/smartscaf)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartscaf/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartscaf)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
@@ -31,3 +26,10 @@ For further information read the linked docs at the top of this README.
 > | 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://)
+
+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://maintainedby.lossless.com)

test/test.ts

@@ -3,18 +3,18 @@ import * as path from 'path';
 
 import * as smartscaf from '../ts/index';
 
-process.env.CI = 'true'
+process.env.CI = 'true';
 
 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);
 });
 
 tap.test('Smartscaf instance -> should read a template directory', async () => {
-  await testScafTemplate.readTemplateFromDir('./test/test_template');
-  expect(testScafTemplate.templateSmartfileArray.length).to.equal(5);
+  await testScafTemplate.readTemplateFromDir();
+  expect(testScafTemplate.templateSmartfileArray.length).to.equal(6);
 });
 
 tap.test('smartfile -> should accept variables', async () => {

test/test_output/defaults.yml

@@ -1,4 +0,0 @@
-templateVar1: from default yaml
-templateVar2: this is another value from yml
-templateObject.value1: wow
-templateObject.value2: here

test/test_output/hello.md

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

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,4 +0,0 @@
-templateVar1: from default yaml
-templateVar2: this is another value from yml
-templateObject.value1: wow
-templateObject.value2: here

test/test_template_2/hello.md

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

ts/smartscaf.classes.smartscaf.ts

@@ -11,26 +11,45 @@ export interface ScafTemplateContructorOptions {
 }
 
 export class ScafTemplate {
+  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[] = [];
 
-  dependencies: ScafTemplate[];
+  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, '**/*');
+  async readTemplateFromDir() {
+    this.templateSmartfileArray = await plugins.smartfile.fs.fileTreeToObject(this.dirPath, '**/*');
+    await this._resolveTemplateDependencies();
     await this._findVariablesInTemplate();
     await this._checkSuppliedVariables();
     await this._checkDefaultVariables();
-    await this._resolveTemplateDependencies();
   }
 
   /**
@@ -68,21 +87,30 @@ export class ScafTemplate {
       ]);
     }
     let answerBucket = await localSmartInteract.runQueue();
-    answerBucket.answerMap.forEach(async answer => {
+    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) {
-    let smartfileArrayToWrite = this.templateSmartfileArray;
-    for (let smartfile of smartfileArrayToWrite) {
+    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"
+        fmType: 'yaml'
       });
       let parsedTemplate = smartfmInstance.parse(renderedTemplateString) as any;
       if (parsedTemplate.data.fileName) {
@@ -90,6 +118,7 @@ export class ScafTemplate {
       }
 
       smartfile.contents = Buffer.from(parsedTemplate.content);
+      smartfileArrayToWrite.push(smartfile);
     }
 
     await plugins.smartfile.memory.smartfileArrayToFs(smartfileArrayToWrite, destinationDirArg);
@@ -122,8 +151,12 @@ export class ScafTemplate {
         templateSmartfile.contents.toString(),
         this.suppliedVariables
       );
+
+      // combine with other missingVars
       missingVars = [...missingVars, ...localMissingVars];
     }
+
+    // dedupe
     missingVars = missingVars.filter((value, index, self) => {
       return self.indexOf(value) === index;
     });
@@ -131,7 +164,7 @@ export class ScafTemplate {
   }
 
   /**
-   * 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
@@ -143,16 +176,21 @@ export class ScafTemplate {
    * >>     - yourDeeperKey: yourValue
    */
   private async _checkDefaultVariables() {
-    let defaultsSmartfile = this.templateSmartfileArray.filter(smartfileArg => {
-      return smartfileArg.parsedPath.base === 'defaults.yml';
-    })[0];
+    let smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
+      return smartfileArg.parsedPath.base === '.smartscaf.yml';
+    });
 
-    if (defaultsSmartfile) {
-      let defaultObject = await plugins.smartyaml.yamlStringToObject(
-        defaultsSmartfile.contents.toString()
+    if (smartscafSmartfile) {
+      const smartscafObject = await plugins.smartyaml.yamlStringToObject(
+        smartscafSmartfile.contents.toString()
       );
+      const defaultObject = smartscafObject.defaults;
       this.defaultVariables = defaultObject;
-    } else {
+    }
+
+    // safeguard against non existent defaults
+    if (!this.defaultVariables) {
+      console.log('this template does not specify defaults');
       this.defaultVariables = {};
     }
   }
@@ -161,14 +199,36 @@ export class ScafTemplate {
    * resolve template dependencies
    */
   private async _resolveTemplateDependencies() {
-    const dependencies = this.templateSmartfileArray.find(smartfileArg => {
-      return smartfileArg.parsedPath.base === "dependencies.yml"
+    const smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
+      return smartfileArg.parsedPath.base === '.smartscaf.yml';
     });
-    if(!dependencies) {
+    if (!smartscafSmartfile) {
       console.log('No further template dependencies defined!');
       return;
     }
-    console.log('Found template dependencies! Resolving them now!')
-
+    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);
+    }
   }
 }

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