From: Aleksander Łukasz Date: Fri, 6 Dec 2013 09:52:15 +0000 (+0100) Subject: wip: extracting core transformations X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/fd6329db57fc3cc1cf2305da8d0127de4f2198e2 wip: extracting core transformations --- diff --git a/src/smartxml/core.js b/src/smartxml/core.js new file mode 100644 index 0000000..b5f8c44 --- /dev/null +++ b/src/smartxml/core.js @@ -0,0 +1,366 @@ +define([ + +], function() { + +'use strict'; + + +var INSERTION = function(implementation) { + var toret = function(node) { + var insertion = this.getNodeInsertion(node), + nodeWasContained = this.document.containsNode(insertion.ofNode), + nodeParent; + if(!(this.document.containsNode(this))) { + nodeParent = insertion.ofNode.parent(); + } + implementation.call(this, insertion.ofNode.nativeNode); + this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}, nodeParent, nodeWasContained); + return insertion.ofNode; + }; + return toret; +}; + +var documentNodeTransformations = { + detach: function() { + var parent = this.parent(); + this._$.detach(); + this.triggerChangeEvent('nodeDetached', {parent: parent}); + return this; + }, + + replaceWith: function(node) { + var toret; + if(this.isRoot()) { + return this.document.replaceRoot(node); + } + toret = this.after(node); + this.detach(); + return toret; + }, + + after: INSERTION(function(nativeNode) { + return this._$.after(nativeNode); + }), + + before: INSERTION(function(nativeNode) { + return this._$.before(nativeNode); + }), + + wrapWith: function(node) { + var insertion = this.getNodeInsertion(node); + if(this.parent()) { + this.before(insertion.ofNode); + } + insertion.ofNode.append(this); + return insertion.ofNode; + }, + + /** + * Removes parent of a node if node has no siblings. + */ + unwrap: function() { + if(this.isRoot()) { + return; + } + var parent = this.parent(), + grandParent; + if(parent.contents().length === 1) { + grandParent = parent.parent(); + parent.unwrapContent(); + return grandParent; + } + } +}; + +var elementNodeTransformations = { + + detach: function() { + var next; + if(this.parent() && this.isSurroundedByTextElements()) { + next = this.next(); + this.prev().appendText(next.getText()); + next.detach(); + } + return DocumentNode.prototype.detach.call(this); + }, + + setTag: function(tagName) { + var node = this.document.createDocumentNode({tagName: tagName}), + oldTagName = this.getTagName(), + myContents = this._$.contents(); + + this.getAttrs().forEach(function(attribute) { + node.setAttr(attribute.name, attribute.value, true); + }); + node.setData(this.getData()); + + if(this.sameNode(this.document.root)) { + defineDocumentProperties(this.document, node._$); + } + this._$.replaceWith(node._$); + this._setNativeNode(node._$[0]); + this._$.append(myContents); + this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()}); + }, + + + setAttr: function(name, value, silent) { + var oldVal = this.getAttr(name); + this._$.attr(name, value); + if(!silent) { + this.triggerChangeEvent('nodeAttrChange', {attr: name, oldVal: oldVal, newVal: value}); + } + }, + + append: INSERTION(function(nativeNode) { + this._$.append(nativeNode); + }), + + prepend: INSERTION(function(nativeNode) { + this._$.prepend(nativeNode); + }), + + insertAtIndex: function(nativeNode, index) { + var contents = this.contents(); + if(index < contents.length) { + return contents[index].before(nativeNode); + } else if(index === contents.length) { + return this.append(nativeNode); + } + }, + + unwrapContent: function() { + var parent = this.parent(); + if(!parent) { + return; + } + + var myContents = this.contents(), + myIdx = parent.indexOf(this); + + + if(myContents.length === 0) { + return this.detach(); + } + + var prev = this.prev(), + next = this.next(), + moveLeftRange, moveRightRange, leftMerged; + + if(prev && (prev.nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) { + prev.appendText(myContents[0].getText()); + myContents[0].detach(); + moveLeftRange = true; + leftMerged = true; + } else { + leftMerged = false; + } + + if(!(leftMerged && myContents.length === 1)) { + var lastContents = _.last(myContents); + if(next && (next.nodeType === TEXT_NODE) && (lastContents.nodeType === TEXT_NODE)) { + next.prependText(lastContents.getText()); + lastContents.detach(); + moveRightRange = true; + } + } + + var childrenLength = this.contents().length; + this.contents().forEach(function(child) { + this.before(child); + }.bind(this)); + + this.detach(); + + return { + element1: parent.contents()[myIdx + (moveLeftRange ? -1 : 0)], + element2: parent.contents()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)] + }; + }, + + wrapText: function(params) { + return this.document._wrapText(_.extend({inside: this}, params)); + } +}; + +var textNodeTransformations = { + setText: function(text) { + //console.log('smartxml: ' + text); + this.nativeNode.data = text; + this.triggerTextChangeEvent(); + }, + + appendText: function(text) { + this.nativeNode.data = this.nativeNode.data + text; + this.triggerTextChangeEvent(); + }, + + prependText: function(text) { + this.nativeNode.data = text + this.nativeNode.data; + this.triggerTextChangeEvent(); + }, + + wrapWith: function(desc) { + if(typeof desc.start === 'number' && typeof desc.end === 'number') { + return this.document._wrapText({ + inside: this.parent(), + textNodeIdx: this.parent().indexOf(this), + offsetStart: Math.min(desc.start, desc.end), + offsetEnd: Math.max(desc.start, desc.end), + _with: {tagName: desc.tagName, attrs: desc.attrs} + }); + } else { + return DocumentNode.prototype.wrapWith.call(this, desc); + } + }, + + split: function(params) { + var parentElement = this.parent(), + passed = false, + succeedingChildren = [], + prefix = this.getText().substr(0, params.offset), + suffix = this.getText().substr(params.offset); + + parentElement.contents().forEach(function(child) { + if(passed) { + succeedingChildren.push(child); + } + if(child.sameNode(this)) { + passed = true; + } + }.bind(this)); + + if(prefix.length > 0) { + this.setText(prefix); + } + else { + this.detach(); + } + + var attrs = {}; + parentElement.getAttrs().forEach(function(attr) {attrs[attr.name] = attr.value; }); + var newElement = this.document.createDocumentNode({tagName: parentElement.getTagName(), attrs: attrs}); + parentElement.after(newElement); + + if(suffix.length > 0) { + newElement.append({text: suffix}); + } + succeedingChildren.forEach(function(child) { + newElement.append(child); + }); + + return {first: parentElement, second: newElement}; + } +}; + +var documentTransformations = { + wrapNodes: function(params) { + if(!(params.node1.parent().sameNode(params.node2.parent()))) { + throw new Error('Wrapping non-sibling nodes not supported.'); + } + + var parent = params.node1.parent(), + parentContents = parent.contents(), + wrapper = this.createDocumentNode({ + tagName: params._with.tagName, + attrs: params._with.attrs}), + idx1 = parent.indexOf(params.node1), + idx2 = parent.indexOf(params.node2); + + if(idx1 > idx2) { + var tmp = idx1; + idx1 = idx2; + idx2 = tmp; + } + + var insertingMethod, insertingTarget; + if(idx1 === 0) { + insertingMethod = 'prepend'; + insertingTarget = parent; + } else { + insertingMethod = 'after'; + insertingTarget = parentContents[idx1-1]; + } + + for(var i = idx1; i <= idx2; i++) { + wrapper.append(parentContents[i].detach()); + } + + insertingTarget[insertingMethod](wrapper); + return wrapper; + }, + + _wrapText: function(params) { + params = _.extend({textNodeIdx: 0}, params); + if(typeof params.textNodeIdx === 'number') { + params.textNodeIdx = [params.textNodeIdx]; + } + + var contentsInside = params.inside.contents(), + idx1 = Math.min.apply(Math, params.textNodeIdx), + idx2 = Math.max.apply(Math, params.textNodeIdx), + textNode1 = contentsInside[idx1], + textNode2 = contentsInside[idx2], + sameNode = textNode1.sameNode(textNode2), + prefixOutside = textNode1.getText().substr(0, params.offsetStart), + prefixInside = textNode1.getText().substr(params.offsetStart), + suffixInside = textNode2.getText().substr(0, params.offsetEnd), + suffixOutside = textNode2.getText().substr(params.offsetEnd) + ; + + if(!(textNode1.parent().sameNode(textNode2.parent()))) { + throw new Error('Wrapping text in non-sibling text nodes not supported.'); + } + + var wrapperElement = this.createDocumentNode({tagName: params._with.tagName, attrs: params._with.attrs}); + textNode1.after(wrapperElement); + textNode1.detach(); + + if(prefixOutside.length > 0) { + wrapperElement.before({text:prefixOutside}); + } + if(sameNode) { + var core = textNode1.getText().substr(params.offsetStart, params.offsetEnd - params.offsetStart); + wrapperElement.append({text: core}); + } else { + textNode2.detach(); + if(prefixInside.length > 0) { + wrapperElement.append({text: prefixInside}); + } + for(var i = idx1 + 1; i < idx2; i++) { + wrapperElement.append(contentsInside[i]); + } + if(suffixInside.length > 0) { + wrapperElement.append({text: suffixInside}); + } + } + if(suffixOutside.length > 0) { + wrapperElement.after({text: suffixOutside}); + } + return wrapperElement; + }, + replaceRoot: function(node) { + var insertion = this.getNodeInsertion(node); + this.root.detach(); + defineDocumentProperties(this, insertion.ofNode._$); + insertion.ofNode.triggerChangeEvent('nodeAdded'); + return insertion.ofNode; + } +} + +return { + document: { + transformations: documentTransformations + }, + documentNode: { + transformations: documentNodeTransformations + }, + elementNode: { + transformations: elementNodeTransformations + }, + textNode: { + transformations: textNodeTransformations + } +}; + +}); \ No newline at end of file diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js index dbe0290..d74ec13 100644 --- a/src/smartxml/smartxml.js +++ b/src/smartxml/smartxml.js @@ -3,8 +3,9 @@ define([ 'libs/underscore', 'libs/backbone', 'smartxml/events', - 'smartxml/transformations' -], function($, _, Backbone, events, transformations) { + 'smartxml/transformations', + 'smartxml/core' +], function($, _, Backbone, events, transformations, coreTransformations) { 'use strict'; /* globals Node */ @@ -12,20 +13,6 @@ define([ var TEXT_NODE = Node.TEXT_NODE; -var INSERTION = function(implementation) { - var toret = function(node) { - var insertion = this.getNodeInsertion(node), - nodeWasContained = this.document.containsNode(insertion.ofNode), - nodeParent; - if(!(this.document.containsNode(this))) { - nodeParent = insertion.ofNode.parent(); - } - implementation.call(this, insertion.ofNode.nativeNode); - this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}, nodeParent, nodeWasContained); - return insertion.ofNode; - }; - return toret; -}; var DocumentNode = function(nativeNode, document) { if(!document) { @@ -84,23 +71,6 @@ $.extend(DocumentNode.prototype, { return this.document.root.sameNode(this); }, - detach: function() { - var parent = this.parent(); - this._$.detach(); - this.triggerChangeEvent('nodeDetached', {parent: parent}); - return this; - }, - - replaceWith: function(node) { - var toret; - if(this.isRoot()) { - return this.document.replaceRoot(node); - } - toret = this.after(node); - this.detach(); - return toret; - }, - sameNode: function(otherNode) { return !!(otherNode) && this.nativeNode === otherNode.nativeNode; }, @@ -142,39 +112,6 @@ $.extend(DocumentNode.prototype, { return prev && (prev.nodeType === Node.TEXT_NODE) && next && (next.nodeType === Node.TEXT_NODE); }, - after: INSERTION(function(nativeNode) { - return this._$.after(nativeNode); - }), - - before: INSERTION(function(nativeNode) { - return this._$.before(nativeNode); - }), - - wrapWith: function(node) { - var insertion = this.getNodeInsertion(node); - if(this.parent()) { - this.before(insertion.ofNode); - } - insertion.ofNode.append(this); - return insertion.ofNode; - }, - - /** - * Removes parent of a node if node has no siblings. - */ - unwrap: function() { - if(this.isRoot()) { - return; - } - var parent = this.parent(), - grandParent; - if(parent.contents().length === 1) { - grandParent = parent.parent(); - parent.unwrapContent(); - return grandParent; - } - }, - triggerChangeEvent: function(type, metaData, origParent, nodeWasContained) { var node = (metaData && metaData.node) ? metaData.node : this, event = new events.ChangeEvent(type, $.extend({node: node}, metaData || {})); @@ -199,6 +136,7 @@ $.extend(DocumentNode.prototype, { } }); + var ElementNode = function(nativeNode, document) { DocumentNode.call(this, nativeNode, document); }; @@ -207,16 +145,6 @@ ElementNode.prototype = Object.create(DocumentNode.prototype); $.extend(ElementNode.prototype, { nodeType: Node.ELEMENT_NODE, - detach: function() { - var next; - if(this.parent() && this.isSurroundedByTextElements()) { - next = this.next(); - this.prev().appendText(next.getText()); - next.detach(); - } - return DocumentNode.prototype.detach.call(this); - }, - setData: function(key, value) { if(value !== undefined) { this._$.data(key, value); @@ -256,37 +184,10 @@ $.extend(ElementNode.prototype, { return this._$.contents().index(node._$); }, - setTag: function(tagName) { - var node = this.document.createDocumentNode({tagName: tagName}), - oldTagName = this.getTagName(), - myContents = this._$.contents(); - - this.getAttrs().forEach(function(attribute) { - node.setAttr(attribute.name, attribute.value, true); - }); - node.setData(this.getData()); - - if(this.sameNode(this.document.root)) { - defineDocumentProperties(this.document, node._$); - } - this._$.replaceWith(node._$); - this._setNativeNode(node._$[0]); - this._$.append(myContents); - this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()}); - }, - getAttr: function(name) { return this._$.attr(name); }, - setAttr: function(name, value, silent) { - var oldVal = this.getAttr(name); - this._$.attr(name, value); - if(!silent) { - this.triggerChangeEvent('nodeAttrChange', {attr: name, oldVal: oldVal, newVal: value}); - } - }, - getAttrs: function() { var toret = []; for(var i = 0; i < this.nativeNode.attributes.length; i++) { @@ -295,76 +196,6 @@ $.extend(ElementNode.prototype, { return toret; }, - append: INSERTION(function(nativeNode) { - this._$.append(nativeNode); - }), - - prepend: INSERTION(function(nativeNode) { - this._$.prepend(nativeNode); - }), - - insertAtIndex: function(nativeNode, index) { - var contents = this.contents(); - if(index < contents.length) { - return contents[index].before(nativeNode); - } else if(index === contents.length) { - return this.append(nativeNode); - } - }, - - unwrapContent: function() { - var parent = this.parent(); - if(!parent) { - return; - } - - var myContents = this.contents(), - myIdx = parent.indexOf(this); - - - if(myContents.length === 0) { - return this.detach(); - } - - var prev = this.prev(), - next = this.next(), - moveLeftRange, moveRightRange, leftMerged; - - if(prev && (prev.nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) { - prev.appendText(myContents[0].getText()); - myContents[0].detach(); - moveLeftRange = true; - leftMerged = true; - } else { - leftMerged = false; - } - - if(!(leftMerged && myContents.length === 1)) { - var lastContents = _.last(myContents); - if(next && (next.nodeType === TEXT_NODE) && (lastContents.nodeType === TEXT_NODE)) { - next.prependText(lastContents.getText()); - lastContents.detach(); - moveRightRange = true; - } - } - - var childrenLength = this.contents().length; - this.contents().forEach(function(child) { - this.before(child); - }.bind(this)); - - this.detach(); - - return { - element1: parent.contents()[myIdx + (moveLeftRange ? -1 : 0)], - element2: parent.contents()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)] - }; - }, - - wrapText: function(params) { - return this.document._wrapText(_.extend({inside: this}, params)); - }, - toXML: function() { var wrapper = $('
'); wrapper.append(this._getXMLDOMToDump()); @@ -376,6 +207,7 @@ $.extend(ElementNode.prototype, { } }); + var TextNode = function(nativeNode, document) { DocumentNode.call(this, nativeNode, document); }; @@ -388,74 +220,6 @@ $.extend(TextNode.prototype, { return this.nativeNode.data; }, - setText: function(text) { - //console.log('smartxml: ' + text); - this.nativeNode.data = text; - this.triggerTextChangeEvent(); - }, - - appendText: function(text) { - this.nativeNode.data = this.nativeNode.data + text; - this.triggerTextChangeEvent(); - }, - - prependText: function(text) { - this.nativeNode.data = text + this.nativeNode.data; - this.triggerTextChangeEvent(); - }, - - wrapWith: function(desc) { - if(typeof desc.start === 'number' && typeof desc.end === 'number') { - return this.document._wrapText({ - inside: this.parent(), - textNodeIdx: this.parent().indexOf(this), - offsetStart: Math.min(desc.start, desc.end), - offsetEnd: Math.max(desc.start, desc.end), - _with: {tagName: desc.tagName, attrs: desc.attrs} - }); - } else { - return DocumentNode.prototype.wrapWith.call(this, desc); - } - }, - - split: function(params) { - var parentElement = this.parent(), - passed = false, - succeedingChildren = [], - prefix = this.getText().substr(0, params.offset), - suffix = this.getText().substr(params.offset); - - parentElement.contents().forEach(function(child) { - if(passed) { - succeedingChildren.push(child); - } - if(child.sameNode(this)) { - passed = true; - } - }.bind(this)); - - if(prefix.length > 0) { - this.setText(prefix); - } - else { - this.detach(); - } - - var attrs = {}; - parentElement.getAttrs().forEach(function(attr) {attrs[attr.name] = attr.value; }); - var newElement = this.document.createDocumentNode({tagName: parentElement.getTagName(), attrs: attrs}); - parentElement.after(newElement); - - if(suffix.length > 0) { - newElement.append({text: suffix}); - } - succeedingChildren.forEach(function(child) { - newElement.append(child); - }); - - return {first: parentElement, second: newElement}; - }, - triggerTextChangeEvent: function() { var event = new events.ChangeEvent('nodeTextChange', {node: this}); this.document.trigger('change', event); @@ -469,6 +233,8 @@ var parseXML = function(xml) { var registerTransformation = function(desc, name, target) { var Transformation = transformations.createContextTransformation(desc, name); + //+ to sie powinna nazywac registerTransformationFromDesc or sth + //+ ew. spr czy nie override (tylko jesli powyzej sa prototypy to trudno do nich dojsc) target[name] = function(args) { var instance = this; return instance.transform(Transformation, args); @@ -553,42 +319,6 @@ $.extend(Document.prototype, Backbone.Events, { return this.root && (node.nativeNode === this.root.nativeNode || node._$.parents().index(this.root._$) !== -1); }, - wrapNodes: function(params) { - if(!(params.node1.parent().sameNode(params.node2.parent()))) { - throw new Error('Wrapping non-sibling nodes not supported.'); - } - - var parent = params.node1.parent(), - parentContents = parent.contents(), - wrapper = this.createDocumentNode({ - tagName: params._with.tagName, - attrs: params._with.attrs}), - idx1 = parent.indexOf(params.node1), - idx2 = parent.indexOf(params.node2); - - if(idx1 > idx2) { - var tmp = idx1; - idx1 = idx2; - idx2 = tmp; - } - - var insertingMethod, insertingTarget; - if(idx1 === 0) { - insertingMethod = 'prepend'; - insertingTarget = parent; - } else { - insertingMethod = 'after'; - insertingTarget = parentContents[idx1-1]; - } - - for(var i = idx1; i <= idx2; i++) { - wrapper.append(parentContents[i].detach()); - } - - insertingTarget[insertingMethod](wrapper); - return wrapper; - }, - getSiblingParents: function(params) { var parents1 = [params.node1].concat(params.node1.parents()).reverse(), parents2 = [params.node2].concat(params.node2.parents()).reverse(), @@ -608,56 +338,6 @@ $.extend(Document.prototype, Backbone.Events, { return {node1: parents1[i], node2: parents2[i]}; }, - _wrapText: function(params) { - params = _.extend({textNodeIdx: 0}, params); - if(typeof params.textNodeIdx === 'number') { - params.textNodeIdx = [params.textNodeIdx]; - } - - var contentsInside = params.inside.contents(), - idx1 = Math.min.apply(Math, params.textNodeIdx), - idx2 = Math.max.apply(Math, params.textNodeIdx), - textNode1 = contentsInside[idx1], - textNode2 = contentsInside[idx2], - sameNode = textNode1.sameNode(textNode2), - prefixOutside = textNode1.getText().substr(0, params.offsetStart), - prefixInside = textNode1.getText().substr(params.offsetStart), - suffixInside = textNode2.getText().substr(0, params.offsetEnd), - suffixOutside = textNode2.getText().substr(params.offsetEnd) - ; - - if(!(textNode1.parent().sameNode(textNode2.parent()))) { - throw new Error('Wrapping text in non-sibling text nodes not supported.'); - } - - var wrapperElement = this.createDocumentNode({tagName: params._with.tagName, attrs: params._with.attrs}); - textNode1.after(wrapperElement); - textNode1.detach(); - - if(prefixOutside.length > 0) { - wrapperElement.before({text:prefixOutside}); - } - if(sameNode) { - var core = textNode1.getText().substr(params.offsetStart, params.offsetEnd - params.offsetStart); - wrapperElement.append({text: core}); - } else { - textNode2.detach(); - if(prefixInside.length > 0) { - wrapperElement.append({text: prefixInside}); - } - for(var i = idx1 + 1; i < idx2; i++) { - wrapperElement.append(contentsInside[i]); - } - if(suffixInside.length > 0) { - wrapperElement.append({text: suffixInside}); - } - } - if(suffixOutside.length > 0) { - wrapperElement.after({text: suffixOutside}); - } - return wrapperElement; - }, - trigger: function() { //console.log('trigger: ' + arguments[0] + (arguments[1] ? ', ' + arguments[1].type : '')); Backbone.Events.trigger.apply(this, arguments); @@ -675,14 +355,6 @@ $.extend(Document.prototype, Backbone.Events, { return insertion; }, - replaceRoot: function(node) { - var insertion = this.getNodeInsertion(node); - this.root.detach(); - defineDocumentProperties(this, insertion.ofNode._$); - insertion.ofNode.triggerChangeEvent('nodeAdded'); - return insertion.ofNode; - }, - registerMethod: function(methodName, method, dstName) { var doc = this; var destination = { @@ -738,6 +410,8 @@ $.extend(Document.prototype, Backbone.Events, { //console.log('transform'); var toret, transformation; + // ref: odrebnie przygotowanie transformacji, odrebnie jej wykonanie (to pierwsze to analog transform z node) + if(typeof Transformation === 'function') { transformation = new Transformation(this, this, args); } else { @@ -793,7 +467,9 @@ var defineDocumentProperties = function(doc, $document) { return { documentFromXML: function(xml) { - return new Document(xml); + var doc = new Document(xml); + doc.registerExtension(coreTransformations); + return doc; }, elementNodeFromXML: function(xml) {