ghtml 2.1.3 → 2.1.5

package/bin/example/assets/script.js

@@ -0,0 +1 @@
+console.warn("Hello World!");

package/bin/example/package.json

@@ -8,6 +8,6 @@
   "dependencies": {
     "@fastify/static": "^7.0.1",
     "fastify": "^4.26.1",
-    "fastify-html": "^0.3.3"
+    "fastify-html": "^0.5.0"
   }
 }

package/bin/example/routes/index.js

@@ -22,7 +22,7 @@ export default async (fastify) => {
   fastify.get("/", async (request, reply) => {
     return reply.html`
       <h1 class="caption">Hello, world!</h1>
-      <img width="500" src="/p/assets/cat.jpeg" alt="Picture of a cat" />
+      <script src="/p/assets/script.js"></script>
     `;
   });
 };

package/package.json

@@ -3,7 +3,7 @@
   "description": "Replace your template engine with fast JavaScript by leveraging the power of tagged templates.",
   "author": "Gürgün Dayıoğlu",
   "license": "MIT",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "type": "module",
   "bin": "./bin/src/index.js",
   "main": "./src/index.js",

package/src/html.js

@@ -3,9 +3,8 @@ const escapeRegExp = /["&'<>`]/;
 const escapeFunction = (string) => {
   let escaped = "";
   let start = 0;
-  let end = 0;
 
-  for (; end !== string.length; ++end) {
+  for (let end = 0; end !== string.length; ++end) {
     switch (string.charCodeAt(end)) {
       case 34: // "
         escaped += string.slice(start, end) + "&#34;";
@@ -34,7 +33,7 @@ const escapeFunction = (string) => {
     }
   }
 
-  escaped += string.slice(start, end);
+  escaped += string.slice(start, string.length);
 
   return escaped;
 };
@@ -46,11 +45,10 @@ const escapeFunction = (string) => {
  */
 const html = ({ raw: literals }, ...expressions) => {
   let accumulator = "";
-  let index = 0;
 
-  for (; index !== expressions.length; ++index) {
-    const expression = expressions[index];
-    let literal = literals[index];
+  for (let i = 0; i !== expressions.length; ++i) {
+    const expression = expressions[i];
+    let literal = literals[i];
     let string =
       typeof expression === "string"
         ? expression
@@ -69,7 +67,7 @@ const html = ({ raw: literals }, ...expressions) => {
     accumulator += literal + string;
   }
 
-  accumulator += literals[index];
+  accumulator += literals[expressions.length];
 
   return accumulator;
 };
@@ -80,11 +78,9 @@ const html = ({ raw: literals }, ...expressions) => {
  * @yields {string} The HTML strings.
  */
 const htmlGenerator = function* ({ raw: literals }, ...expressions) {
-  let index = 0;
-
-  for (; index !== expressions.length; ++index) {
-    let expression = expressions[index];
-    let literal = literals[index];
+  for (let i = 0; i !== expressions.length; ++i) {
+    let expression = expressions[i];
+    let literal = literals[i];
     let string;
 
     if (typeof expression === "string") {
@@ -165,8 +161,8 @@ const htmlGenerator = function* ({ raw: literals }, ...expressions) {
     }
   }
 
-  if (literals[index]) {
-    yield literals[index];
+  if (literals[expressions.length]) {
+    yield literals[expressions.length];
   }
 };
 
@@ -176,11 +172,9 @@ const htmlGenerator = function* ({ raw: literals }, ...expressions) {
  * @yields {string} The HTML strings.
  */
 const htmlAsyncGenerator = async function* ({ raw: literals }, ...expressions) {
-  let index = 0;
-
-  for (; index !== expressions.length; ++index) {
-    let expression = await expressions[index];
-    let literal = literals[index];
+  for (let i = 0; i !== expressions.length; ++i) {
+    let expression = await expressions[i];
+    let literal = literals[i];
     let string;
 
     if (typeof expression === "string") {
@@ -264,8 +258,8 @@ const htmlAsyncGenerator = async function* ({ raw: literals }, ...expressions) {
     }
   }
 
-  if (literals[index]) {
-    yield literals[index];
+  if (literals[expressions.length]) {
+    yield literals[expressions.length];
   }
 };