Clean up a few things and update version to 0.1.3

jgarber623 · Mar 27, 2018 · 4ff7914 · 4ff7914
1 parent b15daa5
commit 4ff7914
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -16,15 +16,15 @@ TemplateTemplate is also really tiny:
   <tbody>
     <tr>
       <th>Uncompressed</th>
-      <td>1,252 bytes</td>
+      <td>1,529 bytes</td>
     </tr>
     <tr>
       <th>Minified</th>
-      <td>767 bytes</td>
+      <td>878 bytes</td>
     </tr>
     <tr>
       <th>Minified and gzipped</th>
-      <td>446 bytes</td>
+      <td>493 bytes</td>
     </tr>
   </tbody>
 </table>

diff --git a/dist/templatetemplate.js b/dist/templatetemplate.js
@@ -1,5 +1,5 @@
 /*!
- *  TemplateTemplate 0.1.2
+ *  TemplateTemplate 0.1.3
  *
  *  A very small JavaScript <template> manipulation library.
  *
@@ -16,21 +16,25 @@
   return function(template, insertions) {
     template = template instanceof HTMLElement ? template : document.querySelector(template);
     insertions = insertions || {};
-    var fragment = document.importNode(template.content, true);
-    Object.entries(insertions).forEach(function(insertionArray) {
-      var node = fragment.querySelector(insertionArray[0]), insertion = insertionArray[1];
-      if (insertion instanceof Array) {
-        Object.entries(insertion[1]).forEach(function(attributesArray) {
-          node.setAttribute(attributesArray[0], attributesArray[1]);
-        });
-        insertion = insertion[0];
-      }
-      if (insertion instanceof DocumentFragment || insertion instanceof HTMLElement) {
-        node.appendChild(insertion);
-      } else {
-        node.textContent = insertion;
-      }
-    });
-    return fragment;
+    if (template instanceof HTMLTemplateElement) {
+      var importedNode = document.importNode(template.content, true);
+      Object.entries(insertions).forEach(function(insertionArray) {
+        var currentNode = importedNode.querySelector(insertionArray[0]), insertionValue = insertionArray[1];
+        if (insertionValue instanceof Array) {
+          Object.entries(insertionValue[1]).forEach(function(attributesArray) {
+            currentNode.setAttribute(attributesArray[0], attributesArray[1]);
+          });
+          insertionValue = insertionValue[0];
+        }
+        if (insertionValue instanceof DocumentFragment || insertionValue instanceof HTMLElement) {
+          currentNode.appendChild(insertionValue);
+        } else {
+          currentNode.textContent = insertionValue;
+        }
+      });
+      return importedNode;
+    } else {
+      throw new TypeError(template.constructor.name + " is not an HTMLTemplateElement.");
+    }
   };
 });
diff --git a/dist/templatetemplate.min.js b/dist/templatetemplate.min.js
@@ -1,5 +1,5 @@
 /*!
- *  TemplateTemplate 0.1.2
+ *  TemplateTemplate 0.1.3
  *
  *  A very small JavaScript <template> manipulation library.
  *
@@ -10,4 +10,4 @@
  *  TemplateTemplate may be freely distributed under the MIT license.
  */
 
-!function(e,t){e.TemplateTemplate=function(){return function(e,t){e=e instanceof HTMLElement?e:document.querySelector(e),t=t||{};var n=document.importNode(e.content,!0);return Object.entries(t).forEach(function(e){var t=n.querySelector(e[0]),o=e[1];o instanceof Array&&(Object.entries(o[1]).forEach(function(e){t.setAttribute(e[0],e[1])}),o=o[0]),o instanceof DocumentFragment||o instanceof HTMLElement?t.appendChild(o):t.textContent=o}),n}}()}(this);
+!function(e,t){e.TemplateTemplate=function(){return function(e,t){if(e=e instanceof HTMLElement?e:document.querySelector(e),t=t||{},e instanceof HTMLTemplateElement){var n=document.importNode(e.content,!0);return Object.entries(t).forEach(function(e){var t=n.querySelector(e[0]),o=e[1];o instanceof Array&&(Object.entries(o[1]).forEach(function(e){t.setAttribute(e[0],e[1])}),o=o[0]),o instanceof DocumentFragment||o instanceof HTMLElement?t.appendChild(o):t.textContent=o}),n}throw new TypeError(e.constructor.name+" is not an HTMLTemplateElement.")}}()}(this);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jgarber/templatetemplate",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A very small JavaScript <template> manipulation library.",
   "main": "dist/templatetemplate.js",
   "scripts": {

diff --git a/src/templatetemplate.js b/src/templatetemplate.js
@@ -5,27 +5,31 @@
     template = template instanceof HTMLElement ? template : document.querySelector(template);
     insertions = insertions || {};
 
-    var fragment = document.importNode(template.content, true);
+    if (template instanceof HTMLTemplateElement) {
+      var importedNode = document.importNode(template.content, true);
 
-    Object.entries(insertions).forEach(function(insertionArray) {
-      var node = fragment.querySelector(insertionArray[0]),
-          insertion = insertionArray[1];
+      Object.entries(insertions).forEach(function(insertionArray) {
+        var currentNode = importedNode.querySelector(insertionArray[0]),
+            insertionValue = insertionArray[1];
 
-      if (insertion instanceof Array) {
-        Object.entries(insertion[1]).forEach(function(attributesArray) {
-          node.setAttribute(attributesArray[0], attributesArray[1]);
-        });
+        if (insertionValue instanceof Array) {
+          Object.entries(insertionValue[1]).forEach(function(attributesArray) {
+            currentNode.setAttribute(attributesArray[0], attributesArray[1]);
+          });
 
-        insertion = insertion[0];
-      }
+          insertionValue = insertionValue[0];
+        }
 
-      if (insertion instanceof DocumentFragment || insertion instanceof HTMLElement) {
-        node.appendChild(insertion);
-      } else {
-        node.textContent = insertion;
-      }
-    });
+        if (insertionValue instanceof DocumentFragment || insertionValue instanceof HTMLElement) {
+          currentNode.appendChild(insertionValue);
+        } else {
+          currentNode.textContent = insertionValue;
+        }
+      });
 
-    return fragment;
+      return importedNode;
+    } else {
+      throw new TypeError(template.constructor.name + ' is not an HTMLTemplateElement.');
+    }
   };
 }));