pseudo-dom 0.1.0 → 0.2.0

package/dist/services/NodeService.js

@@ -1,7 +1,5 @@
 'use strict'
 
-require('core-js/modules/esnext.iterator.constructor.js')
-require('core-js/modules/esnext.iterator.for-each.js')
 const __importDefault = void 0 && (void 0).__importDefault || function (mod) {
   return mod && mod.__esModule
     ? mod
@@ -19,6 +17,7 @@ exports.NodeService = void 0
  * @version 1.0.0
  */
 const generateNodeList_1 = __importDefault(require('../factories/generateNodeList'))
+const TreeLinker_1 = require('collect-your-stuff/dist/collections/linked-tree-list/TreeLinker')
 const EventTargetService_1 = __importDefault(require('./EventTargetService'))
 /**
  * Simulate the behaviour of the Node Class when there is no DOM available.
@@ -41,8 +40,7 @@ class NodeService extends EventTargetService_1.default {
     this.nodeNameValue = ''
     this.children = (0, generateNodeList_1.default)()
     this.parent = null
-    this.next = null
-    this.prev = null
+    this.listLinker = null
   }
 
   get baseURI () {
@@ -66,7 +64,7 @@ class NodeService extends EventTargetService_1.default {
   }
 
   get nextSibling () {
-    return this.isConnected ? this.next : null
+    return this.listLinker && this.listLinker.next ? this.listLinker.next.data : null
   }
 
   get nodeName () {
@@ -98,7 +96,7 @@ class NodeService extends EventTargetService_1.default {
   }
 
   get previousSibling () {
-    return this.isConnected ? this.prev : null
+    return this.listLinker && this.listLinker.prev ? this.listLinker.prev.data : null
   }
 
   get textContent () {
@@ -110,15 +108,20 @@ class NodeService extends EventTargetService_1.default {
   }
 
   /**
-   *
-   * @param {PseudoNode} childNode
-   * @returns {PseudoNode}
+   * Add a node as the last child of this node (a node which is already in a tree is moved).
+   * @param {PseudoNode} childNode The node to add
+   * @returns {PseudoNode} The added node
    */
   appendChild (childNode) {
-    this.children.append(childNode)
-    return childNode
+    return this.insertBefore(childNode, null)
   }
 
+  /**
+   * Called each time a node has been inserted as a child of this node, so that nodes which need to react to children
+   * (for example elements applying default events) can do so.
+   * @param {NodeService} child The node which was inserted
+   */
+  childInserted (child) {}
   /**
    * Not implemented yet.
    * @throws {Error}
@@ -136,11 +139,19 @@ class NodeService extends EventTargetService_1.default {
   }
 
   /**
-   * Not implemented yet.
-   * @throws {Error}
+   * Check whether a node is this node or one of its descendants.
+   * @param {PseudoNode|null} otherNode The node to look for
+   * @returns {boolean}
    */
   contains (otherNode) {
-    throw new Error('NodeService.contains() is not implemented yet.')
+    let current = otherNode
+    while (current) {
+      if (current === this) {
+        return true
+      }
+      current = current.parentNode
+    }
+    return false
   }
 
   getRootNode (options = {
@@ -154,11 +165,44 @@ class NodeService extends EventTargetService_1.default {
   }
 
   /**
-   * Not implemented yet.
-   * @throws {Error}
+   * Insert a node as a child of this node, before the given child (or at the end when there is none). A node which is
+   * already in a tree is moved, and the children of a document fragment are moved in order.
+   * @param {PseudoNode} newNode The node to insert
+   * @param {PseudoNode|null} [referenceNode=null] The child of this node to insert before, or null to insert at the end
+   * @returns {PseudoNode} The inserted node
+   * @throws {Error} When the reference node is not a child of this node, or the new node is this node or contains it
    */
-  insertBefore (newNode, referenceNode) {
-    throw new Error('NodeService.insertBefore() is not implemented yet.')
+  insertBefore (newNode, referenceNode = null) {
+    if (referenceNode !== null && referenceNode.parentNode !== this) {
+      throw new Error('The node before which the new node is to be inserted is not a child of this node.')
+    }
+    if (newNode === referenceNode) {
+      // Inserting a node before itself leaves it where it is
+      return newNode
+    }
+    if (typeof newNode.contains === 'function' && newNode.contains(this)) {
+      throw new Error('The new node cannot be inserted into itself or one of its own descendants.')
+    }
+    if (newNode.nodeType === NodeService.DOCUMENT_FRAGMENT_NODE) {
+      // The children of a fragment are inserted (moved) in order, and the fragment is left empty
+      while (newNode.firstChild) {
+        this.insertBefore(newNode.firstChild, referenceNode)
+      }
+      return newNode
+    }
+    if (newNode.parentNode) {
+      // A node can only be in one place, so it is moved from where it was
+      newNode.parentNode.removeChild(newNode)
+    }
+    const linker = new TreeLinker_1.TreeLinker({
+      data: newNode
+    })
+    this.children.insertBefore(referenceNode ? referenceNode.listLinker : null, linker)
+    const inserted = newNode
+    inserted.parent = this
+    inserted.listLinker = linker
+    this.childInserted(inserted)
+    return newNode
   }
 
   isDefaultNamespace (namespaceURI) {
@@ -187,31 +231,44 @@ class NodeService extends EventTargetService_1.default {
 
   normalize () {}
   /**
-   * Remove the given child from this node.
-   * @param {PseudoNode} childElement The child node, or its TreeLinker from the children list
-   * @returns {PseudoNode}
+   * Remove a child from this node, it no longer has a parent or siblings afterwards.
+   * @param {PseudoNode} childElement The child node to remove
+   * @returns {PseudoNode} The removed node
    * @throws {Error} When the node is not a child of this node
    */
   removeChild (childElement) {
-    let found = null
-    this.children.forEach(linker => {
-      if (found === null && (linker === childElement || linker.data === childElement)) {
-        found = linker
-      }
-    })
-    if (found === null) {
+    if (!childElement || childElement.parentNode !== this) {
       throw new Error('The node to be removed is not a child of this node.')
     }
-    this.children.remove(found)
-    return found.data
+    const removed = childElement
+    this.children.remove(removed.listLinker)
+    removed.parent = null
+    removed.listLinker = null
+    return childElement
   }
 
   /**
-   * Not implemented yet.
-   * @throws {Error}
+   * Replace a child of this node with another node (which is moved if it is already in a tree).
+   * @param {PseudoNode} newChild The node which takes the place
+   * @param {PseudoNode} oldChild The child of this node to replace
+   * @returns {PseudoNode} The replaced node
+   * @throws {Error} When the old node is not a child of this node
    */
   replaceChild (newChild, oldChild) {
-    throw new Error('NodeService.replaceChild() is not implemented yet.')
+    if (!oldChild || oldChild.parentNode !== this) {
+      throw new Error('The node to be replaced is not a child of this node.')
+    }
+    if (newChild === oldChild) {
+      return oldChild
+    }
+    // The new node goes where the old one was, which is before the old node's next sibling (unless that is the new node)
+    let reference = oldChild.nextSibling
+    if (reference === newChild) {
+      reference = newChild.nextSibling
+    }
+    this.removeChild(oldChild)
+    this.insertBefore(newChild, reference)
+    return oldChild
   }
 }
 exports.NodeService = NodeService

package/dist/services/NodeService.min.js

@@ -1 +1 @@
-"use strict";require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.for-each.js");var __importDefault=function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.NodeService=void 0;const generateNodeList_1=__importDefault(require("../factories/generateNodeList")),EventTargetService_1=__importDefault(require("./EventTargetService"));class NodeService extends EventTargetService_1.default{constructor(){super(),this.nodeValueStore="",this.textContentStore="",this.nodeNameValue="",this.children=(0,generateNodeList_1.default)(),this.parent=null,this.next=null,this.prev=null}get baseURI(){return window.location||"/"}get childNodes(){return this.children}get firstChild(){return this.children.first?this.children.first.data:null}get isConnected(){return!!this.parent}get lastChild(){return this.children.last?this.children.last.data:null}get nextSibling(){return this.isConnected?this.next:null}get nodeName(){return this.nodeNameValue||""}get nodeType(){return NodeService.DEFAULT_NODE}get nodeValue(){return this.nodeValueStore}set nodeValue(e){this.nodeValueStore=e}get ownerDocument(){return null}get parentNode(){return this.parent}get parentElement(){return this.parent&&this.parent.nodeType===NodeService.ELEMENT_NODE?this.parent:null}get previousSibling(){return this.isConnected?this.prev:null}get textContent(){return this.textContentStore}set textContent(e){this.textContentStore=e}appendChild(e){return this.children.append(e),e}cloneNode(e=!1){throw new Error(`NodeService.cloneNode(${e}) is not implemented yet.`)}compareDocumentPosition(e){throw new Error("NodeService.compareDocumentPosition() is not implemented yet.")}contains(e){throw new Error("NodeService.contains() is not implemented yet.")}getRootNode(e={composed:!1}){return this.parent?this.parent.getRootNode(e):this}hasChildNodes(){return this.children.length>0}insertBefore(e,t){throw new Error("NodeService.insertBefore() is not implemented yet.")}isDefaultNamespace(e){return null===e}isEqualNode(e){throw new Error("NodeService.isEqualNode() is not implemented yet.")}isSameNode(e){return this===e}lookupPrefix(e){return null}lookupNamespaceURI(e){return null}normalize(){}removeChild(e){let t=null;if(this.children.forEach(r=>{null!==t||r!==e&&r.data!==e||(t=r)}),null===t)throw new Error("The node to be removed is not a child of this node.");return this.children.remove(t),t.data}replaceChild(e,t){throw new Error("NodeService.replaceChild() is not implemented yet.")}}exports.NodeService=NodeService,NodeService.DEFAULT_NODE=0,NodeService.ELEMENT_NODE=1,NodeService.ATTRIBUTE_NODE=2,NodeService.TEXT_NODE=3,NodeService.CDATA_SECTION_NODE=4,NodeService.ENTITY_REFERENCE_NODE=5,NodeService.ENTITY_NODE=6,NodeService.PROCESSING_INSTRUCTION_NODE=7,NodeService.COMMENT_NODE=8,NodeService.DOCUMENT_NODE=9,NodeService.DOCUMENT_TYPE_NODE=10,NodeService.DOCUMENT_FRAGMENT_NODE=11,NodeService.NOTATION_NODE=12;
+"use strict";var __importDefault=function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.NodeService=void 0;const generateNodeList_1=__importDefault(require("../factories/generateNodeList")),TreeLinker_1=require("collect-your-stuff/dist/collections/linked-tree-list/TreeLinker"),EventTargetService_1=__importDefault(require("./EventTargetService"));class NodeService extends EventTargetService_1.default{constructor(){super(),this.nodeValueStore="",this.textContentStore="",this.nodeNameValue="",this.children=(0,generateNodeList_1.default)(),this.parent=null,this.listLinker=null}get baseURI(){return window.location||"/"}get childNodes(){return this.children}get firstChild(){return this.children.first?this.children.first.data:null}get isConnected(){return!!this.parent}get lastChild(){return this.children.last?this.children.last.data:null}get nextSibling(){return this.listLinker&&this.listLinker.next?this.listLinker.next.data:null}get nodeName(){return this.nodeNameValue||""}get nodeType(){return NodeService.DEFAULT_NODE}get nodeValue(){return this.nodeValueStore}set nodeValue(e){this.nodeValueStore=e}get ownerDocument(){return null}get parentNode(){return this.parent}get parentElement(){return this.parent&&this.parent.nodeType===NodeService.ELEMENT_NODE?this.parent:null}get previousSibling(){return this.listLinker&&this.listLinker.prev?this.listLinker.prev.data:null}get textContent(){return this.textContentStore}set textContent(e){this.textContentStore=e}appendChild(e){return this.insertBefore(e,null)}childInserted(e){}cloneNode(e=!1){throw new Error(`NodeService.cloneNode(${e}) is not implemented yet.`)}compareDocumentPosition(e){throw new Error("NodeService.compareDocumentPosition() is not implemented yet.")}contains(e){let t=e;for(;t;){if(t===this)return!0;t=t.parentNode}return!1}getRootNode(e={composed:!1}){return this.parent?this.parent.getRootNode(e):this}hasChildNodes(){return this.children.length>0}insertBefore(e,t=null){if(null!==t&&t.parentNode!==this)throw new Error("The node before which the new node is to be inserted is not a child of this node.");if(e===t)return e;if("function"==typeof e.contains&&e.contains(this))throw new Error("The new node cannot be inserted into itself or one of its own descendants.");if(e.nodeType===NodeService.DOCUMENT_FRAGMENT_NODE){for(;e.firstChild;)this.insertBefore(e.firstChild,t);return e}e.parentNode&&e.parentNode.removeChild(e);const r=new TreeLinker_1.TreeLinker({data:e});this.children.insertBefore(t?t.listLinker:null,r);const i=e;return i.parent=this,i.listLinker=r,this.childInserted(i),e}isDefaultNamespace(e){return null===e}isEqualNode(e){throw new Error("NodeService.isEqualNode() is not implemented yet.")}isSameNode(e){return this===e}lookupPrefix(e){return null}lookupNamespaceURI(e){return null}normalize(){}removeChild(e){if(!e||e.parentNode!==this)throw new Error("The node to be removed is not a child of this node.");const t=e;return this.children.remove(t.listLinker),t.parent=null,t.listLinker=null,e}replaceChild(e,t){if(!t||t.parentNode!==this)throw new Error("The node to be replaced is not a child of this node.");if(e===t)return t;let r=t.nextSibling;return r===e&&(r=e.nextSibling),this.removeChild(t),this.insertBefore(e,r),t}}exports.NodeService=NodeService,NodeService.DEFAULT_NODE=0,NodeService.ELEMENT_NODE=1,NodeService.ATTRIBUTE_NODE=2,NodeService.TEXT_NODE=3,NodeService.CDATA_SECTION_NODE=4,NodeService.ENTITY_REFERENCE_NODE=5,NodeService.ENTITY_NODE=6,NodeService.PROCESSING_INSTRUCTION_NODE=7,NodeService.COMMENT_NODE=8,NodeService.DOCUMENT_NODE=9,NodeService.DOCUMENT_TYPE_NODE=10,NodeService.DOCUMENT_FRAGMENT_NODE=11,NodeService.NOTATION_NODE=12;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pseudo-dom",
   "description": "Mock the DOM on the server side for managing state and testing",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
   "author": "Joshua Heagle",
@@ -18,7 +18,7 @@
     "watch:test": "gulp watchTest"
   },
   "dependencies": {
-    "collect-your-stuff": "^1.2.8",
+    "collect-your-stuff": "^2.1.0",
     "core-js": "^3.50.0"
   },
   "devDependencies": {