WIP: Optimize templating

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased][unreleased]
 
+## [1.0.4][] - 2021-07-18
+
+- Refactoerd tickplate function
+- Updated typings
+
 ## [1.0.3][] - 2021-07-17
 
 - Fix d.ts typings and include typings to package publishing files

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tickplate",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "Timur Shemsedinov <[email protected]>",
   "description": "Back-tick templates for JavaScript",
   "license": "MIT",

tickplate.d.ts

@@ -1,3 +1,6 @@
-declare function tickplate(strings: Array<string>, ...keys: Array<string>): (values: object) => string;
+declare function tickplate(
+  strings: TemplateStringsArray,
+  ...keys: string[]
+): (values: object) => string;
 
 export = tickplate;

tickplate.js

@@ -2,13 +2,7 @@
 
 const tickplate =
   (strings, ...keys) =>
-  (values) => {
-    const result = [strings[0]];
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i];
-      result.push(values[key], strings[i + 1]);
-    }
-    return result.join('');
-  };
+  (values) =>
+    String.raw(strings, ...keys.map((key) => values[key] ?? ''));
 
 module.exports = tickplate;