2.0.9

Master

See merge request pushrocks/tlt!1

.gitignore

@@ -1,4 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,59 +1,118 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"
 
 stages:
+- security
 - test
 - release
-- trigger
+- metadata
-- pages
 
-testLEGACY:
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  script:
+  - npmci git mirror
+  tags:
+  - 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
+
+# ====================
+# test stage
+# ====================
+
+testStable:
   stage: test
   script:
-    - npmci test legacy
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
-  allow_failure: true
+  - priv
 
-testLTS:
+testBuild:
   stage: test
   script:
-    - npmci test lts
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
-    
+  - notpriv
-testSTABLE:
-  stage: test
-  script:
-    - npmci test stable
-  tags:
-    - docker
 
 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
+  allow_failure: true
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  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:npmpage
+  stage: metadata
-  stage: pages
   script:
-    - npmci command npmpage --host gitlab
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
+  tags:
+    - docker
+    - notpriv
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.3
+ignore: {}
+patch: {}

README.md

@@ -1,15 +1,40 @@
-# tlt
+# @pushrocks/smartmustache
 templates done right
 
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartmustache)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartmustache)
+* [github.com (source mirror)](https://github.com/pushrocks/smartmustache)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartmustache/)
+
+## Status for master
+[![build status](https://gitlab.com/pushrocks/smartmustache/badges/master/build.svg)](https://gitlab.com/pushrocks/smartmustache/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/smartmustache/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartmustache/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartmustache.svg)](https://www.npmjs.com/package/@pushrocks/smartmustache)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartmustache/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartmustache)
+[![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-prettier-ff69b4.svg)](https://prettier.io/)
+
 ## Usage
-We recommend the use of TypeScript for best in class Intellisense
+
+Use TypeScript for best in class instellisense.
 
 ```javascript
-import { Tlt } from 'tlt'
+import { SmartMustache } from '@pushrocks/smartmustache';
 
-let myTlt = new Tlt('my template String for {{somePlaceholder}} and {{anotherPlaceholder}}')
+const mySmartmustache = new SmartMustache('my {{somePlaceholder}} are {{anotherPlaceholder}}!');
-myTlt.getStringFor({
+const appliedString = myTlt.applyData({
-    "somePlaceholder": "pushrocks",
+  somePlaceholder: 'horses',
-    "anotherPlaceholder": "anotherPlaceholder"
+  anotherPlaceholder: 'awesome'
-})
+});
+
+// appliedString will be 'my horses are awesome!'
 ```
+
+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)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

dist/index.d.ts

@@ -1,18 +0,0 @@
-/**
- * class Tlt allows templates to be used with different sets of data
- */
-export declare class Tlt {
-    templateString: string;
-    /**
-     * constructor of class Tlt
-     */
-    constructor(templateStringArg: string);
-    /**
-     * returns template string with data applied
-     */
-    applyData(data: any): string;
-    /**
-     * set a new template string
-     */
-    setTemplate(templateStringArg: string): void;
-}

dist/index.js

@@ -1,27 +0,0 @@
-"use strict";
-const mustache = require("mustache");
-/**
- * class Tlt allows templates to be used with different sets of data
- */
-class Tlt {
-    /**
-     * constructor of class Tlt
-     */
-    constructor(templateStringArg) {
-        this.templateString = templateStringArg;
-    }
-    /**
-     * returns template string with data applied
-     */
-    applyData(data) {
-        return mustache.render(this.templateString, data);
-    }
-    /**
-     * set a new template string
-     */
-    setTemplate(templateStringArg) {
-        this.templateString = templateStringArg;
-    }
-}
-exports.Tlt = Tlt;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEscUNBQW9DO0FBRXBDOztHQUVHO0FBQ0g7SUFHSTs7T0FFRztJQUNILFlBQVksaUJBQXlCO1FBQ2pDLElBQUksQ0FBQyxjQUFjLEdBQUcsaUJBQWlCLENBQUE7SUFDM0MsQ0FBQztJQUVEOztPQUVHO0lBQ0gsU0FBUyxDQUFDLElBQVM7UUFDZixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQ3JELENBQUM7SUFFRDs7T0FFRztJQUNILFdBQVcsQ0FBQyxpQkFBeUI7UUFDakMsSUFBSSxDQUFDLGNBQWMsR0FBRyxpQkFBaUIsQ0FBQTtJQUMzQyxDQUFDO0NBQ0o7QUF2QkQsa0JBdUJDIn0=

npmextra.json

@@ -0,0 +1,15 @@
+{
+  "npmci": {
+    "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartmustache",
+      "shortDescription": "templates done right",
+      "npmPackagename": "@pushrocks/smartmustache",
+      "license": "MIT"
+    }
+  }
+}

package.json

@@ -1,11 +1,13 @@
 {
-  "name": "tlt",
+  "name": "@pushrocks/smartmustache",
-  "version": "1.0.2",
+  "version": "2.0.9",
   "description": "templates done right",
+  "private": false,
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -21,13 +23,23 @@
   },
   "homepage": "https://gitlab.com/pushrocks/tlt#README",
   "dependencies": {
-    "@types/mustache": "^0.8.29",
+    "handlebars": "^4.7.1"
-    "mustache": "^2.3.0",
-    "typings-global": "^1.0.14"
   },
   "devDependencies": {
-    "@types/should": "^8.1.30",
+    "@gitzone/tsbuild": "^2.1.17",
-    "should": "^11.1.1",
+    "@gitzone/tsrun": "^1.2.8",
-    "typings-test": "^1.0.3"
+    "@gitzone/tstest": "^1.0.28",
-  }
+    "@pushrocks/tapbundle": "^3.2.0"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

test/test.d.ts

@@ -1 +0,0 @@
-import 'typings-test';

test/test.js

@@ -1,16 +0,0 @@
-"use strict";
-require("typings-test");
-const should = require("should");
-const tlt = require("../dist/index");
-describe('tlt', function () {
-    let testTlt;
-    it('should create a valid instance of tlt', function () {
-        testTlt = new tlt.Tlt('some awesome {{customString}}');
-        should(testTlt).be.instanceOf(tlt.Tlt);
-    });
-    it('should output a valid string with some data', function () {
-        let appliedString = testTlt.applyData({ customString: 'horse' });
-        should(appliedString).equal('some awesome horse');
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMscUNBQW9DO0FBRXBDLFFBQVEsQ0FBQyxLQUFLLEVBQUU7SUFDWixJQUFJLE9BQWdCLENBQUE7SUFDcEIsRUFBRSxDQUFDLHVDQUF1QyxFQUFFO1FBQ3hDLE9BQU8sR0FBRyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsK0JBQStCLENBQUMsQ0FBQTtRQUN0RCxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDMUMsQ0FBQyxDQUFDLENBQUE7SUFDRixFQUFFLENBQUMsNkNBQTZDLEVBQUU7UUFDOUMsSUFBSSxhQUFhLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFDLFlBQVksRUFBRSxPQUFPLEVBQUMsQ0FBQyxDQUFBO1FBQzlELE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQyxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtJQUNyRCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBIn0=

test/test.ts

@@ -1,16 +1,20 @@
-import 'typings-test'
+import { tap, expect } from '@pushrocks/tapbundle';
-import * as should from 'should'
 
-import * as tlt from '../dist/index'
+import * as tlt from '../ts/index';
 
-describe('tlt', function() {
+let testMustache: tlt.SmartMustache;
-    let testTlt: tlt.Tlt
+tap.test('should create a valid instance of tlt', async () => {
-    it('should create a valid instance of tlt', function() {
+  testMustache = new tlt.SmartMustache(
-        testTlt = new tlt.Tlt('some awesome {{customString}}')
+    'some awesome {{customString}} that is {{license}} licensed'
-        should(testTlt).be.instanceOf(tlt.Tlt)
+  );
-    })
+  expect(testMustache).to.be.instanceOf(tlt.SmartMustache);
-    it('should output a valid string with some data', function(){
+});
-        let appliedString = testTlt.applyData({customString: 'horse'})
+tap.test('should output a valid string with some data', async () => {
-        should(appliedString).equal('some awesome horse')
+  let appliedString = testMustache.applyData({
-    })
+    customString: 'horse',
-})
+    license: 'MIT'
+  });
+  expect(appliedString).to.equal('some awesome horse that is MIT licensed');
+});
+
+tap.start();

ts/index.ts

@@ -1,29 +1,29 @@
-import * as mustache from 'mustache'
+import * as handlebars from 'handlebars';
 
 /**
  * class Tlt allows templates to be used with different sets of data
  */
-export class Tlt {
+export class SmartMustache {
-    templateString: string
+  template: any;
 
-    /**
+  /**
-     * constructor of class Tlt
+   * constructor of class Tlt
-     */
+   */
-    constructor(templateStringArg: string) {
+  constructor(templateStringArg: string) {
-        this.templateString = templateStringArg
+    this.template = handlebars.compile(templateStringArg);
-    }
+  }
 
-    /**
+  /**
-     * returns template string with data applied
+   * returns template string with data applied
-     */
+   */
-    applyData(data: any): string {
+  applyData(data: any): string {
-        return mustache.render(this.templateString, data)
+    return this.template(data);
-    }
+  }
 
-    /**
+  /**
-     * set a new template string
+   * set a new template string
-     */
+   */
-    setTemplate(templateStringArg: string) {
+  setTemplate(templateStringArg: string) {
-        this.templateString = templateStringArg
+    this.template = handlebars.compile(templateStringArg);
-    }
+  }
 }

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