occam-dom 5.0.6 → 5.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/example.js +11 -9
- package/lib/utilities/node.js +8 -6
- package/package.json +1 -1
- package/src/utilities/node.js +8 -5
package/lib/utilities/node.js
CHANGED
|
@@ -22,14 +22,16 @@ function _interop_require_default(obj) {
|
|
|
22
22
|
default: obj
|
|
23
23
|
};
|
|
24
24
|
}
|
|
25
|
-
function topmostNodeFromOuterNodes(
|
|
25
|
+
function topmostNodeFromOuterNodes(ClassFromOuterNode, outerNodes) {
|
|
26
26
|
if (outerNodes === undefined) {
|
|
27
|
-
outerNodes =
|
|
28
|
-
|
|
27
|
+
outerNodes = ClassFromOuterNode; ///
|
|
28
|
+
ClassFromOuterNode = function(outerNode) {
|
|
29
|
+
return _node.default;
|
|
30
|
+
}; ///
|
|
29
31
|
}
|
|
30
32
|
var nodes = outerNodes; ///
|
|
31
33
|
orderNodes(nodes);
|
|
32
|
-
var topmostNode =
|
|
34
|
+
var outerNode = null, Class = ClassFromOuterNode(outerNode), topmostNode = Class.fromNothing(), outerNodeToNodeMap = new WeakMap();
|
|
33
35
|
outerNodes.forEach(function(outerNode) {
|
|
34
36
|
var parentNode = topmostNode; ///
|
|
35
37
|
someAncestorNode(outerNode, function(ancestorNode) {
|
|
@@ -39,7 +41,7 @@ function topmostNodeFromOuterNodes(Class, outerNodes) {
|
|
|
39
41
|
return true;
|
|
40
42
|
}
|
|
41
43
|
});
|
|
42
|
-
var node = Class.fromOuterNode(outerNode), childNode = node, multiplicity = parentNode.getMultiplicity(), startIndex = multiplicity; ///
|
|
44
|
+
var Class = ClassFromOuterNode(outerNode), node = Class.fromOuterNode(outerNode), childNode = node, multiplicity = parentNode.getMultiplicity(), startIndex = multiplicity; ///
|
|
43
45
|
parentNode.addChildNode(childNode, startIndex);
|
|
44
46
|
outerNodeToNodeMap.set(outerNode, node);
|
|
45
47
|
});
|
|
@@ -91,4 +93,4 @@ function ancestorNodesFromNode(node) {
|
|
|
91
93
|
return ancestorNodes;
|
|
92
94
|
}
|
|
93
95
|
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/node.js"],"sourcesContent":["\"use strict\";\n\nimport Node from \"../node\";\n\nexport function topmostNodeFromOuterNodes(ClassFromOuterNode, outerNodes) {\n  if (outerNodes === undefined) {\n    outerNodes = ClassFromOuterNode; ///\n\n    ClassFromOuterNode = (outerNode) => Node;  ///\n  }\n\n  const nodes = outerNodes; ///\n\n  orderNodes(nodes);\n\n  const outerNode = null,\n        Class = ClassFromOuterNode(outerNode),\n        topmostNode = Class.fromNothing(),\n        outerNodeToNodeMap = new WeakMap();\n\n  outerNodes.forEach((outerNode) => {\n    let parentNode = topmostNode; ///\n\n    someAncestorNode(outerNode, (ancestorNode) => {\n      const outerNode = ancestorNode, ///\n            node = outerNodeToNodeMap.get(outerNode) || null;\n\n      if (node !== null) {\n        parentNode = node;  ///\n\n        return true;\n      }\n    });\n\n    const Class = ClassFromOuterNode(outerNode),\n          node = Class.fromOuterNode(outerNode),\n          childNode = node,  ///\n          multiplicity = parentNode.getMultiplicity(),\n          startIndex = multiplicity;  ///\n\n    parentNode.addChildNode(childNode, startIndex);\n\n    outerNodeToNodeMap.set(outerNode, node);\n  });\n\n  return topmostNode;\n}\n\nexport default {\n  topmostNodeFromOuterNodes\n};\n\nfunction orderNodes(nodes) {\n  nodes.sort((nodeA, nodeB) => {\n    const nodeALessThanNodeB = isLessThan(nodeA, nodeB),\n          result = nodeALessThanNodeB ?\n                     -1 :\n                       +1;\n\n    return result;\n  });\n}\n\nfunction isLessThan(nodeA, nodeB) {\n  let lessThan = null;\n\n  const ancestorNodesA = ancestorNodesFromNode(nodeA),\n        ancestorNodesB = ancestorNodesFromNode(nodeB),\n        ancestorNodesALength = ancestorNodesA.length,\n        ancestorNodesBLength = ancestorNodesB.length,\n        minimumAncestorNodesLength = Math.min(ancestorNodesALength, ancestorNodesBLength);\n\n  for (let index = 0; index < minimumAncestorNodesLength; index++) {\n    const ancestorNodeA = ancestorNodesA[index],\n          ancestorNodeB = ancestorNodesB[index];\n\n    if (ancestorNodeA !== ancestorNodeB) {\n      const parentIndex = index - 1,\n            ancestorNodeAParentNode = ancestorNodesA[parentIndex],\n            parentNode = ancestorNodeAParentNode, ///\n            childNodeA = ancestorNodeA, ///\n            childNodeB = ancestorNodeB, ///\n            indexA = parentNode.indexOfChildNode(childNodeA),\n            indexB = parentNode.indexOfChildNode(childNodeB);\n\n      lessThan = (indexA < indexB);\n\n      break;\n    }\n  }\n\n  if (lessThan === null) {\n    lessThan = (ancestorNodesALength < ancestorNodesBLength);\n  }\n\n  return lessThan;\n}\n\nfunction someAncestorNode(node, callback) {\n  let result = false;\n\n  let parentNode = node.getParentNode();\n\n  while (parentNode !== null) {\n    const ancestorNode = parentNode;  ///\n\n    result = !!callback(ancestorNode);  ///\n\n    if (result) {\n      break;\n    }\n\n    node = parentNode;  ///\n\n    parentNode = node.getParentNode();\n  }\n\n  return result;\n}\n\nfunction ancestorNodesFromNode(node) {\n  const ancestorNodes = node.getAncestorNodes();\n\n  ancestorNodes.unshift(node);\n\n  ancestorNodes.reverse();\n\n  return ancestorNodes;\n}"],"names":["topmostNodeFromOuterNodes","ClassFromOuterNode","outerNodes","undefined","outerNode","Node","nodes","orderNodes","Class","topmostNode","fromNothing","outerNodeToNodeMap","WeakMap","forEach","parentNode","someAncestorNode","ancestorNode","node","get","fromOuterNode","childNode","multiplicity","getMultiplicity","startIndex","addChildNode","set","sort","nodeA","nodeB","nodeALessThanNodeB","isLessThan","result","lessThan","ancestorNodesA","ancestorNodesFromNode","ancestorNodesB","ancestorNodesALength","length","ancestorNodesBLength","minimumAncestorNodesLength","Math","min","index","ancestorNodeA","ancestorNodeB","parentIndex","ancestorNodeAParentNode","childNodeA","childNodeB","indexA","indexOfChildNode","indexB","callback","getParentNode","ancestorNodes","getAncestorNodes","unshift","reverse"],"mappings":"AAAA;;;;;;;;;;;IAgDA,OAEE;eAFF;;IA5CgBA,yBAAyB;eAAzBA;;;2DAFC;;;;;;AAEV,SAASA,0BAA0BC,kBAAkB,EAAEC,UAAU;IACtE,IAAIA,eAAeC,WAAW;QAC5BD,aAAaD,oBAAoB,GAAG;QAEpCA,qBAAqB,SAACG;mBAAcC,aAAI;WAAG,GAAG;IAChD;IAEA,IAAMC,QAAQJ,YAAY,GAAG;IAE7BK,WAAWD;IAEX,IAAMF,YAAY,MACZI,QAAQP,mBAAmBG,YAC3BK,cAAcD,MAAME,WAAW,IAC/BC,qBAAqB,IAAIC;IAE/BV,WAAWW,OAAO,CAAC,SAACT;QAClB,IAAIU,aAAaL,aAAa,GAAG;QAEjCM,iBAAiBX,WAAW,SAACY;YAC3B,IAAMZ,cAAYY,cACZC,OAAON,mBAAmBO,GAAG,CAACd,gBAAc;YAElD,IAAIa,SAAS,MAAM;gBACjBH,aAAaG,MAAO,GAAG;gBAEvB,OAAO;YACT;QACF;QAEA,IAAMT,QAAQP,mBAAmBG,YAC3Ba,OAAOT,MAAMW,aAAa,CAACf,YAC3BgB,YAAYH,MACZI,eAAeP,WAAWQ,eAAe,IACzCC,aAAaF,cAAe,GAAG;QAErCP,WAAWU,YAAY,CAACJ,WAAWG;QAEnCZ,mBAAmBc,GAAG,CAACrB,WAAWa;IACpC;IAEA,OAAOR;AACT;IAEA,WAAe;IACbT,2BAAAA;AACF;AAEA,SAASO,WAAWD,KAAK;IACvBA,MAAMoB,IAAI,CAAC,SAACC,OAAOC;QACjB,IAAMC,qBAAqBC,WAAWH,OAAOC,QACvCG,SAASF,qBACE,CAAC,IACC,CAAC;QAEpB,OAAOE;IACT;AACF;AAEA,SAASD,WAAWH,KAAK,EAAEC,KAAK;IAC9B,IAAII,WAAW;IAEf,IAAMC,iBAAiBC,sBAAsBP,QACvCQ,iBAAiBD,sBAAsBN,QACvCQ,uBAAuBH,eAAeI,MAAM,EAC5CC,uBAAuBH,eAAeE,MAAM,EAC5CE,6BAA6BC,KAAKC,GAAG,CAACL,sBAAsBE;IAElE,IAAK,IAAII,QAAQ,GAAGA,QAAQH,4BAA4BG,QAAS;QAC/D,IAAMC,gBAAgBV,cAAc,CAACS,MAAM,EACrCE,gBAAgBT,cAAc,CAACO,MAAM;QAE3C,IAAIC,kBAAkBC,eAAe;YACnC,IAAMC,cAAcH,QAAQ,GACtBI,0BAA0Bb,cAAc,CAACY,YAAY,EACrD/B,aAAagC,yBACbC,aAAaJ,eACbK,aAAaJ,eACbK,SAASnC,WAAWoC,gBAAgB,CAACH,aACrCI,SAASrC,WAAWoC,gBAAgB,CAACF;YAE3ChB,WAAYiB,SAASE;YAErB;QACF;IACF;IAEA,IAAInB,aAAa,MAAM;QACrBA,WAAYI,uBAAuBE;IACrC;IAEA,OAAON;AACT;AAEA,SAASjB,iBAAiBE,IAAI,EAAEmC,QAAQ;IACtC,IAAIrB,SAAS;IAEb,IAAIjB,aAAaG,KAAKoC,aAAa;IAEnC,MAAOvC,eAAe,KAAM;QAC1B,IAAME,eAAeF,YAAa,GAAG;QAErCiB,SAAS,CAAC,CAACqB,SAASpC,eAAgB,GAAG;QAEvC,IAAIe,QAAQ;YACV;QACF;QAEAd,OAAOH,YAAa,GAAG;QAEvBA,aAAaG,KAAKoC,aAAa;IACjC;IAEA,OAAOtB;AACT;AAEA,SAASG,sBAAsBjB,IAAI;IACjC,IAAMqC,gBAAgBrC,KAAKsC,gBAAgB;IAE3CD,cAAcE,OAAO,CAACvC;IAEtBqC,cAAcG,OAAO;IAErB,OAAOH;AACT"}
|
package/package.json
CHANGED
package/src/utilities/node.js
CHANGED
|
@@ -2,18 +2,20 @@
|
|
|
2
2
|
|
|
3
3
|
import Node from "../node";
|
|
4
4
|
|
|
5
|
-
export function topmostNodeFromOuterNodes(
|
|
5
|
+
export function topmostNodeFromOuterNodes(ClassFromOuterNode, outerNodes) {
|
|
6
6
|
if (outerNodes === undefined) {
|
|
7
|
-
outerNodes =
|
|
7
|
+
outerNodes = ClassFromOuterNode; ///
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
ClassFromOuterNode = (outerNode) => Node; ///
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
const nodes = outerNodes; ///
|
|
13
13
|
|
|
14
14
|
orderNodes(nodes);
|
|
15
15
|
|
|
16
|
-
const
|
|
16
|
+
const outerNode = null,
|
|
17
|
+
Class = ClassFromOuterNode(outerNode),
|
|
18
|
+
topmostNode = Class.fromNothing(),
|
|
17
19
|
outerNodeToNodeMap = new WeakMap();
|
|
18
20
|
|
|
19
21
|
outerNodes.forEach((outerNode) => {
|
|
@@ -30,7 +32,8 @@ export function topmostNodeFromOuterNodes(Class, outerNodes) {
|
|
|
30
32
|
}
|
|
31
33
|
});
|
|
32
34
|
|
|
33
|
-
const
|
|
35
|
+
const Class = ClassFromOuterNode(outerNode),
|
|
36
|
+
node = Class.fromOuterNode(outerNode),
|
|
34
37
|
childNode = node, ///
|
|
35
38
|
multiplicity = parentNode.getMultiplicity(),
|
|
36
39
|
startIndex = multiplicity; ///
|