fix: inserting CSS when no head

Author: remy

.gitignore

@@ -1 +1,2 @@
 node_modules
+.vscode

__tests__/.eslintrc.js

@@ -1 +1,8 @@
-module.exports = Object.assign(require('@remy/eslint/jest'), {});
+const res = Object.assign({}, require('@remy/eslint/jest'), {
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 8,
+  },
+});
+
+module.exports = res;

__tests__/bins.test.js

@@ -0,0 +1,25 @@
+const fs = require('fs');
+const readdir = fs.readdirSync;
+const { promisify } = require('util');
+const readFile = promisify(fs.readFile);
+const base = __dirname + '/fixtures/bins';
+const fixtures = readdir(base);
+const binToFile = require('../');
+
+describe('bin fixtures', () => {
+  fixtures
+    .filter(f => f.endsWith('.json'))
+    .map(f => [`${base}/${f}`, f])
+    .forEach(([filename, fixture]) => {
+      it(fixture, async () => {
+        const bin = await readFile(filename, 'utf8');
+        const html = binToFile(JSON.parse(bin));
+
+        const expecting = await readFile(
+          filename.replace(/\.json$/, '.html'),
+          'utf8'
+        );
+        expect(html).toEqual(expecting.trim());
+      });
+    });
+});

__tests__/fixtures/bins/css-slurp.html

@@ -0,0 +1,12 @@
+<title>घर घर घर घर</title>
+<style id="jsbin-css">
+body {
+  background: blue;
+}
+</style>
+
+## Links: [Netflix](netflix.com)
+
+<!--boot js--><script id="jsbin-javascript" defer>
+//# sourceURL=holy-smoke-F0C.js
+</script>

__tests__/fixtures/bins/css-slurp.json

@@ -0,0 +1,5 @@
+{
+  "html": "<title>घर घर घर घर</title>\n## Links: [Netflix](netflix.com)\n",
+  "javascript": "\n//# sourceURL=holy-smoke-F0C.js",
+  "css": "body {\n  background: blue;\n}"
+}

lib/index.js

@@ -1,30 +1,22 @@
 const doctypeRe = new RegExp(/^<!doctype[^>]*>\n?/im);
 
-function hashOf(string) {
-  let hash = 0;
-
-  if (string.length === 0) {
-    return hash;
+function insert(source, needle, value, after = false) {
+  needle = needle.toLowerCase();
+  const sourceLC = source.toLowerCase();
+  if (!sourceLC.includes(needle)) {
+    return null;
   }
 
-  for (let i = 0; i < string.length; i++) {
-    const c = string.charCodeAt(i);
-    hash = (hash << 5) - hash + c;
-    hash = hash & hash; // Convert to 32bit integer
-  }
+  let left = source.substring(0, sourceLC.lastIndexOf(needle));
 
-  return hash.toString(16);
-}
+  let ri = sourceLC.lastIndexOf(needle);
 
-function insert(source, needle, value) {
-  needle = needle.toLowerCase();
-  const sourceLC = source.toLowerCase();
-  if (!source.toLowerCase().includes(needle)) {
-    return null;
+  if (after) {
+    ri += needle.length;
+    left += needle + '\n';
   }
 
-  const left = source.substring(0, sourceLC.lastIndexOf(needle));
-  const right = source.substring(sourceLC.lastIndexOf(needle));
+  const right = source.substring(ri);
 
   if (left && right) {
     return left + value + right;
@@ -54,8 +46,8 @@ function binToFile(bin, options = {}) {
 
   let file = '';
   let html = (bin.html || '').replace(/(\r\n)/g, '\n'); // remove windows nl.
-  var css = safeForHTML(bin.css);
-  var javascript = safeForHTML(bin.javascript);
+  let css = safeForHTML(bin.css);
+  let javascript = safeForHTML(bin.javascript);
   const { source, processors = {} } = bin;
   let meta =
     bin.meta ||
@@ -101,7 +93,7 @@ function binToFile(bin, options = {}) {
       if (head) {
         file = head;
       } else {
-        var title = insert(file, '</title>', css);
+        const title = insert(file, '</title>', css, true);
         if (title) {
           file = title;
         } else {
@@ -113,7 +105,7 @@ function binToFile(bin, options = {}) {
   }
 
   // only look for a doctype at the top of the document
-  var doctype =
+  const doctype =
     (html
       .trim()
       .split('\n')
@@ -133,9 +125,7 @@ function binToFile(bin, options = {}) {
       file = file.split('%code%').join(javascript);
     } else {
       // is there head tag?
-      javascript = `<!--boot js--><script id="jsbin-javascript">${
-        javascript
-      }\n</script>`;
+      javascript = `<!--boot js--><script id="jsbin-javascript" defer>${javascript}\n</script>`;
       const body = insert(file, '</body>', javascript + '\n');
       if (body) {
         file = body;
@@ -166,11 +156,9 @@ function binToFile(bin, options = {}) {
 
         const content = safeForHTML(source[type]);
         if (content) {
-          return `\n<script id="jsbin-source-${
+          return `\n<script id="jsbin-source-${type}" type="text/source-${processors[
             type
-          }" type="text/source-${processors[type] || type}">${
-            content
-          }\n</script>`;
+          ] || type}">${content}\n</script>`;
         }
 
         return '';
@@ -185,9 +173,6 @@ function binToFile(bin, options = {}) {
     }
   }
 
-  // no longer used
-  // file = file.split('^^hash^^').join(hashOf(file));
-
   return file;
 }