one-src - npm Package Compare versions

Comparing version 1.0.10 to 1.0.11

package.json

 {
   "name": "one-src",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "",
@@ -5,0 +5,0 @@ "main": "bin/index.sh",

sample2.html.onesrc.js

@@ -1,58 +0,78 @@
-var __one_src_map = {
-  "type": "html",
-  "content": ["\n", {
-    "type": "head",
-    "content": ["\n  ", {"type": "meta", "attributes": {"charset": "utf-8"}}, "\n  ", {
-      "type": "title",
-      "content": ["pplink 3.0"]
-    }, "\n  ", {"type": "base", "attributes": {"href": "/"}}, "\n  ", {
-      "type": "meta",
-      "attributes": {
-        "name": "viewport",
-        "content": "width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"
+var __one_src_map = {"type":"html","content":["\n",{"type":"head","content":["\n  ",{"type":"meta","attributes":{"charset":"utf-8"}},"\n  ",{"type":"title","content":["pplink 3.0"]},"\n  ",{"type":"base","attributes":{"href":"/"}},"\n  ",{"type":"meta","attributes":{"name":"viewport","content":"width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"}},"\n  ",{"type":"script","attributes":{"src":"https://use.fortawesome.com/36c2cc36.js"}},"\n  ",{"type":"link","attributes":{"rel":"icon","type":"image/x-icon","href":"favicon.ico"}},"\n  ",{"type":"link","attributes":{"href":"https://supaja.com/cdn/pplink_canvas_app/1.4/styles.d7ad35e1c7d8705e151f.bundle.css","rel":"stylesheet"}},"\n"]},"\n",{"type":"body","content":["\n",{"type":"app-root"},"\n",{"type":"script","attributes":{"type":"text/javascript","src":"https://supaja.com/cdn/pplink_canvas_app/1.4/inline.bcd42f2cfa1b374d2234.bundle.js"}},"\n",{"type":"script","attributes":{"type":"text/javascript","src":"https://supaja.com/cdn/pplink_canvas_app/1.4/polyfills.2125241812344753088f.bundle.js"}},"\n",{"type":"script","attributes":{"type":"text/javascript","src":"https://supaja.com/cdn/pplink_canvas_app/1.4/main.64795698c3a1a3e39df0.bundle.js"}},"\n"]},"\n"],"attributes":{"lang":"en"}};(function (map, window) {
+  if (!window) console.error('global variable \'window\' is needed');
+
+  var rootNode = window.document;
+  var scriptQueue = [];
+
+  var setAttribute = function (currentNode, attributes) {
+    for (var attrName in attributes) {
+      currentNode.setAttribute(attrName, attributes[attrName]);
+    }
+  };
+
+  var makeCurrentNode = function (elem) {
+    var elemType = typeof elem;
+    var elemTag;
+    var existingNode;
+    var currentNode;
+
+    if (elemType === 'string') {
+      currentNode = document.createTextNode(elem);
+    } else if (elemType === 'object' && elem) {
+      elemTag = elem.type;
+      // html, head, body는 원래 있던 걸 쓴다.
+      if (elemTag === 'html' || elemTag === 'head' || elemTag === 'body') {
+        existingNode = document.getElementsByTagName(elemTag)[0];
+        if (existingNode) {
+          console.log('node exists :', elemTag);
+          currentNode = existingNode;
+        } else {
+          console.log('node not exists :', elemTag);
+          currentNode = document.createElement(elemTag);
+        }
+      } else {
+        currentNode = document.createElement(elemTag);
       }
-    }, "\n  ", {
-      "type": "script",
-      "attributes": {"src": "https://use.fortawesome.com/36c2cc36.js"}
-    }, "\n  ", {
-      "type": "link",
-      "attributes": {"rel": "icon", "type": "image/x-icon", "href": "favicon.ico"}
-    }, "\n  ", {
-      "type": "link",
-      "attributes": {"href": "cdn/pplink_canvas_app/1.4/styles.d7ad35e1c7d8705e151f.bundle.css", "rel": "stylesheet"}
-    }, "\n"]
-  }, "\n", {
-    "type": "body",
-    "content": ["\n", {"type": "app-root"}, "\n", {
-      "type": "script",
-      "attributes": {
-        "type": "text/javascript",
-        "src": "cdn/pplink_canvas_app/1.4/inline.bcd42f2cfa1b374d2234.bundle.js"
+    } else {
+      currentNode = document.createTextNode('null');
+      console.error('unexpected elemType : ' + elemType);
+    }
+
+    if (elem && elem.attributes) {
+      setAttribute(currentNode, elem.attributes);
+    }
+
+    return currentNode;
+  };
+
+  var createNode = function (elem, parentNode) {
+    var currentNode = makeCurrentNode(elem);
+    var childElems = elem.content;
+
+    for (var idx in childElems) {
+      createNode(childElems[idx], currentNode);
+    }
+
+    if (currentNode.tagName === 'SCRIPT') { // script
+      scriptQueue.push({parentNode: parentNode, currentNode: currentNode});
+    } else {
+      if (parentNode !== rootNode) {
+        parentNode.appendChild(currentNode);
       }
-    }, "\n", {
-      "type": "script",
-      "attributes": {
-        "type": "text/javascript",
-        "src": "cdn/pplink_canvas_app/1.4/polyfills.2125241812344753088f.bundle.js"
-      }
-    }, "\n", {
-      "type": "script",
-      "attributes": {"type": "text/javascript", "src": "cdn/pplink_canvas_app/1.4/main.64795698c3a1a3e39df0.bundle.js"}
-    }, "\n"]
-  }, "\n"],
-  "attributes": {"lang": "en"}
-};
-!function (e, t) {
-  t || console.error("global variable 'window' is needed");
-  var n = t.document, o = function (e, t) {
-    var r = function (e) {
-      var t, n, o, r = typeof e;
-      return "string" === r ? o = document.createTextNode(e) : "object" === r && e ? "html" === (t = e.type) || "head" === t || "body" === t ? (n = document.getElementsByTagName(t)[0]) ? (console.log("node exists :", t), o = n) : (console.log("node not exists :", t), o = document.createElement(t)) : o = document.createElement(t) : (o = document.createTextNode("null"), console.error("unexpected elemType : " + r)), e && e.attributes && function (e, t) {
-        for (var n in t) e.setAttribute(n, t[n])
-      }(o, e.attributes), o
-    }(e), c = e.content;
-    for (var a in c) o(c[a], r);
-    t !== n && t.appendChild(r)
+    }
   };
-  o(e, n)
-}(__one_src_map, window);
+
+  var appendScripts = function () {
+    for (var i = 0; i < scriptQueue.length-1; i++) {
+      (function(idx){
+        scriptQueue[idx].currentNode.onload = function(){scriptQueue[idx+1].parentNode.appendChild(scriptQueue[idx+1].currentNode)};
+      })(i);
+    }
+    if(scriptQueue[0]){
+      scriptQueue[0].parentNode.appendChild(scriptQueue[0].currentNode);
+    }
+  };
+
+  createNode(map, rootNode);
+  appendScripts();
+})(__one_src_map, window);

src/dom-builder.js

@@ -5,2 +5,3 @@ (function (map, window) {
   var rootNode = window.document;
+  var scriptQueue = [];
 
@@ -56,8 +57,24 @@ var setAttribute = function (currentNode, attributes) {
 
-    if(parentNode !== rootNode){
-      parentNode.appendChild(currentNode);
+    if (currentNode.tagName === 'SCRIPT') { // script
+      scriptQueue.push({parentNode: parentNode, currentNode: currentNode});
+    } else {
+      if (parentNode !== rootNode) {
+        parentNode.appendChild(currentNode);
+      }
     }
   };
 
+  var appendScripts = function () {
+    for (var i = 0; i < scriptQueue.length-1; i++) {
+      (function(idx){
+        scriptQueue[idx].currentNode.onload = function(){scriptQueue[idx+1].parentNode.appendChild(scriptQueue[idx+1].currentNode)};
+      })(i);
+    }
+    if(scriptQueue[0]){
+      scriptQueue[0].parentNode.appendChild(scriptQueue[0].currentNode);
+    }
+  };
+
   createNode(map, rootNode);
+  appendScripts();
 })(__one_src_map, window);

src/dom-builder.min.js

@@ -1,1 +0,1 @@
-!function(e,t){t||console.error("global variable 'window' is needed");var n=t.document,o=function(e,t){var r=function(e){var t,n,o,r=typeof e;return"string"===r?o=document.createTextNode(e):"object"===r&&e?"html"===(t=e.type)||"head"===t||"body"===t?(n=document.getElementsByTagName(t)[0])?(console.log("node exists :",t),o=n):(console.log("node not exists :",t),o=document.createElement(t)):o=document.createElement(t):(o=document.createTextNode("null"),console.error("unexpected elemType : "+r)),e&&e.attributes&&function(e,t){for(var n in t)e.setAttribute(n,t[n])}(o,e.attributes),o}(e),c=e.content;for(var a in c)o(c[a],r);t!==n&&t.appendChild(r)};o(e,n)}(__one_src_map,window);
+!function(e,n){n||console.error("global variable 'window' is needed");var t=n.document,o=[],r=function(e,n){var d=function(e){var n,t,o,r=typeof e;return"string"===r?o=document.createTextNode(e):"object"===r&&e?"html"===(n=e.type)||"head"===n||"body"===n?(t=document.getElementsByTagName(n)[0])?(console.log("node exists :",n),o=t):(console.log("node not exists :",n),o=document.createElement(n)):o=document.createElement(n):(o=document.createTextNode("null"),console.error("unexpected elemType : "+r)),e&&e.attributes&&function(e,n){for(var t in n)e.setAttribute(t,n[t])}(o,e.attributes),o}(e),c=e.content;for(var a in c)r(c[a],d);"SCRIPT"===d.tagName?o.push({parentNode:n,currentNode:d}):n!==t&&n.appendChild(d)};r(e,t),function(){for(var e=0;e<o.length-1;e++)!function(e){o[e].currentNode.onload=function(){o[e+1].parentNode.appendChild(o[e+1].currentNode)}}(e);o[0]&&o[0].parentNode.appendChild(o[0].currentNode)}()}(__one_src_map,window);

No alert changes

Improved metrics

Total package byte prevSize

48445

increased by64.86%

Lines of code

211

increased by15.93%

Worsened metrics

Number of package files

19

decreased by-5%

No dependency changes