@@ -64,14 +64,14 @@ describe('utilities performance', function () {
-
`, 'application/xml');
- const newNode = document.body.ownerDocument.importNode(editor.documentElement, true);
- document.body.append(newNode);
+ `, 'application/xml')
+ const newNode = document.body.ownerDocument.importNode(editor.documentElement, true)
+ document.body.append(newNode)
- currentLayer = document.getElementById('layer1');
- groupWithMatrixTransform = document.getElementById('svg_group_with_matrix_transform');
- textWithMatrixTransform = document.getElementById('svg_text_with_matrix_transform');
- });
+ currentLayer = document.getElementById('layer1')
+ groupWithMatrixTransform = document.getElementById('svg_group_with_matrix_transform')
+ textWithMatrixTransform = document.getElementById('svg_text_with_matrix_transform')
+ })
/**
* Create an SVG element for a mock.
@@ -79,11 +79,11 @@ describe('utilities performance', function () {
* @returns {SVGElement}
*/
function mockCreateSVGElement (jsonMap) {
- const elem = document.createElementNS(NS.SVG, jsonMap.element);
- Object.entries(jsonMap.attr).forEach(([ attr, value ]) => {
- elem.setAttribute(attr, value);
- });
- return elem;
+ const elem = document.createElementNS(NS.SVG, jsonMap.element)
+ Object.entries(jsonMap.attr).forEach(([attr, value]) => {
+ elem.setAttribute(attr, value)
+ })
+ return elem
}
/**
@@ -92,9 +92,9 @@ describe('utilities performance', function () {
* @returns {SVGElement}
*/
function mockaddSVGElemensFromJson (json) {
- const elem = mockCreateSVGElement(json);
- currentLayer.append(elem);
- return elem;
+ const elem = mockCreateSVGElement(json)
+ currentLayer.append(elem)
+ return elem
}
/**
@@ -104,49 +104,49 @@ describe('utilities performance', function () {
* @returns {void}
*/
function fillDocumentByCloningElement (elem, count) {
- const elemId = elem.getAttribute('id') + '-';
+ const elemId = elem.getAttribute('id') + '-'
for (let index = 0; index < count; index++) {
- const clone = elem.cloneNode(true); // t: deep clone
+ const clone = elem.cloneNode(true) // t: deep clone
// Make sure you set a unique ID like a real document.
- clone.setAttribute('id', elemId + index);
- const { parentNode } = elem;
- parentNode.append(clone);
+ clone.setAttribute('id', elemId + index)
+ const { parentNode } = elem
+ parentNode.append(clone)
}
}
const mockPathActions = {
resetOrientation (path) {
- if (utilities.isNullish(path) || path.nodeName !== 'path') { return false; }
- const tlist = path.transform.baseVal;
- const m = math.transformListToTransform(tlist).matrix;
- tlist.clear();
- path.removeAttribute('transform');
- const segList = path.pathSegList;
+ if (utilities.isNullish(path) || path.nodeName !== 'path') { return false }
+ const tlist = path.transform.baseVal
+ const m = math.transformListToTransform(tlist).matrix
+ tlist.clear()
+ path.removeAttribute('transform')
+ const segList = path.pathSegList
- const len = segList.numberOfItems;
+ const len = segList.numberOfItems
// let lastX, lastY;
for (let i = 0; i < len; ++i) {
- const seg = segList.getItem(i);
- const type = seg.pathSegType;
+ const seg = segList.getItem(i)
+ const type = seg.pathSegType
if (type === 1) {
- continue;
+ continue
}
const pts = [];
- [ '', 1, 2 ].forEach(function (n) {
- const x = seg['x' + n];
- const y = seg['y' + n];
+ ['', 1, 2].forEach(function (n) {
+ const x = seg['x' + n]
+ const y = seg['y' + n]
if (x !== undefined && y !== undefined) {
- const pt = math.transformPoint(x, y, m);
- pts.splice(pts.length, 0, pt.x, pt.y);
+ const pt = math.transformPoint(x, y, m)
+ pts.splice(pts.length, 0, pt.x, pt.y)
}
- });
+ })
// path.replacePathSeg(type, i, pts, path);
}
- return undefined;
+ return undefined
}
- };
+ }
// //////////////////////////////////////////////////////////
// Performance times with various browsers on Macbook 2011 8MB RAM OS X El Capitan 10.11.4
@@ -180,57 +180,57 @@ describe('utilities performance', function () {
// Pass2 svgCanvas.getStrokedBBox total ms 17, ave ms 0.2, min/max 0 23
it('Test svgCanvas.getStrokedBBox() performance with matrix transforms', function () {
- const { getStrokedBBox } = utilities;
- const { children } = currentLayer;
+ const { getStrokedBBox } = utilities
+ const { children } = currentLayer
- let lastTime; let now;
- let min = Number.MAX_VALUE;
- let max = 0;
- let total = 0;
+ let lastTime; let now
+ let min = Number.MAX_VALUE
+ let max = 0
+ let total = 0
- fillDocumentByCloningElement(groupWithMatrixTransform, 50);
- fillDocumentByCloningElement(textWithMatrixTransform, 50);
+ fillDocumentByCloningElement(groupWithMatrixTransform, 50)
+ fillDocumentByCloningElement(textWithMatrixTransform, 50)
// The first pass through all elements is slower.
- const count = children.length;
- const start = lastTime = now = Date.now();
+ const count = children.length
+ const start = lastTime = now = Date.now()
// Skip the first child which is the title.
for (let index = 1; index < count; index++) {
- const child = children[index];
- /* const obj = */ getStrokedBBox([ child ], mockaddSVGElemensFromJson, mockPathActions);
- now = Date.now(); const delta = now - lastTime; lastTime = now;
- total += delta;
- min = Math.min(min, delta);
- max = Math.max(max, delta);
+ const child = children[index]
+ /* const obj = */ getStrokedBBox([child], mockaddSVGElemensFromJson, mockPathActions)
+ now = Date.now(); const delta = now - lastTime; lastTime = now
+ total += delta
+ min = Math.min(min, delta)
+ max = Math.max(max, delta)
}
- total = lastTime - start;
- const ave = total / count;
- assert.isBelow(ave, 20, 'svgedit.utilities.getStrokedBBox average execution time is less than 20 ms');
- console.log('Pass1 svgCanvas.getStrokedBBox total ms ' + total + ', ave ms ' + ave.toFixed(1) + ',\t min/max ' + min + ' ' + max);
+ total = lastTime - start
+ const ave = total / count
+ assert.isBelow(ave, 20, 'svgedit.utilities.getStrokedBBox average execution time is less than 20 ms')
+ console.log('Pass1 svgCanvas.getStrokedBBox total ms ' + total + ', ave ms ' + ave.toFixed(1) + ',\t min/max ' + min + ' ' + max)
return new Promise((resolve) => {
// The second pass is two to ten times faster.
setTimeout(function () {
- const ct = children.length;
+ const ct = children.length
- const strt = lastTime = now = Date.now();
+ const strt = lastTime = now = Date.now()
// Skip the first child which is the title.
for (let index = 1; index < ct; index++) {
- const child = children[index];
- /* const obj = */ getStrokedBBox([ child ], mockaddSVGElemensFromJson, mockPathActions);
- now = Date.now(); const delta = now - lastTime; lastTime = now;
- total += delta;
- min = Math.min(min, delta);
- max = Math.max(max, delta);
+ const child = children[index]
+ /* const obj = */ getStrokedBBox([child], mockaddSVGElemensFromJson, mockPathActions)
+ now = Date.now(); const delta = now - lastTime; lastTime = now
+ total += delta
+ min = Math.min(min, delta)
+ max = Math.max(max, delta)
}
- total = lastTime - strt;
- const avg = total / ct;
- assert.isBelow(avg, 2, 'svgedit.utilities.getStrokedBBox average execution time is less than 1 ms');
- console.log('Pass2 svgCanvas.getStrokedBBox total ms ' + total + ', ave ms ' + avg.toFixed(1) + ',\t min/max ' + min + ' ' + max);
+ total = lastTime - strt
+ const avg = total / ct
+ assert.isBelow(avg, 2, 'svgedit.utilities.getStrokedBBox average execution time is less than 1 ms')
+ console.log('Pass2 svgCanvas.getStrokedBBox total ms ' + total + ', ave ms ' + avg.toFixed(1) + ',\t min/max ' + min + ' ' + max)
- resolve();
- });
- });
- });
-});
+ resolve()
+ })
+ })
+ })
+})
diff --git a/cypress/integration/unit/utilities.js b/cypress/integration/unit/utilities.js
index aa1616cc..5d8a2cc1 100644
--- a/cypress/integration/unit/utilities.js
+++ b/cypress/integration/unit/utilities.js
@@ -1,5 +1,5 @@
-import * as utilities from '../../../instrumented/svgcanvas/utilities.js';
-import { NS } from '../../../instrumented/svgcanvas/namespaces.js';
+import * as utilities from '../../../instrumented/svgcanvas/utilities.js'
+import { NS } from '../../../instrumented/svgcanvas/namespaces.js'
describe('utilities', function () {
/**
@@ -8,11 +8,11 @@ describe('utilities', function () {
* @returns {SVGElement}
*/
function mockCreateSVGElement (jsonMap) {
- const elem = document.createElementNS(NS.SVG, jsonMap.element);
- Object.entries(jsonMap.attr).forEach(([ attr, value ]) => {
- elem.setAttribute(attr, value);
- });
- return elem;
+ const elem = document.createElementNS(NS.SVG, jsonMap.element)
+ Object.entries(jsonMap.attr).forEach(([attr, value]) => {
+ elem.setAttribute(attr, value)
+ })
+ return elem
}
/**
* Adds SVG Element per parameters and appends to root.
@@ -20,225 +20,225 @@ describe('utilities', function () {
* @returns {SVGElement}
*/
function mockaddSVGElemensFromJson (json) {
- const elem = mockCreateSVGElement(json);
- svgroot.append(elem);
- return elem;
+ const elem = mockCreateSVGElement(json)
+ svgroot.append(elem)
+ return elem
}
- const mockPathActions = { resetOrientation () { /* empty fn */ } };
- let mockHistorySubCommands = [];
+ const mockPathActions = { resetOrientation () { /* empty fn */ } }
+ let mockHistorySubCommands = []
const mockHistory = {
BatchCommand: class {
addSubCommand (cmd) {
- mockHistorySubCommands.push(cmd);
+ mockHistorySubCommands.push(cmd)
}
},
RemoveElementCommand: class {
// Longhand needed since used as a constructor
constructor (elem, nextSibling, parent) {
- this.elem = elem;
- this.nextSibling = nextSibling;
- this.parent = parent;
+ this.elem = elem
+ this.nextSibling = nextSibling
+ this.parent = parent
}
},
InsertElementCommand: class {
constructor (path) { // Longhand needed since used as a constructor
- this.path = path;
+ this.path = path
}
}
- };
+ }
const mockCount = {
clearSelection: 0,
addToSelection: 0,
addCommandToHistory: 0
- };
+ }
/**
* Increments clear seleciton count for mock test.
* @returns {void}
*/
function mockClearSelection () {
- mockCount.clearSelection++;
+ mockCount.clearSelection++
}
/**
* Increments add selection count for mock test.
* @returns {void}
*/
function mockAddToSelection () {
- mockCount.addToSelection++;
+ mockCount.addToSelection++
}
/**
* Increments add command to history count for mock test.
* @returns {void}
*/
function mockAddCommandToHistory () {
- mockCount.addCommandToHistory++;
+ mockCount.addCommandToHistory++
}
- let svg; let svgroot;
+ let svg; let svgroot
beforeEach(() => {
- document.body.textContent = '';
+ document.body.textContent = ''
- mockHistorySubCommands = [];
- mockCount.clearSelection = 0;
- mockCount.addToSelection = 0;
- mockCount.addCommandToHistory = 0;
+ mockHistorySubCommands = []
+ mockCount.clearSelection = 0
+ mockCount.addToSelection = 0
+ mockCount.addCommandToHistory = 0
- const sandbox = document.createElement('div');
- svg = document.createElementNS(NS.SVG, 'svg');
+ const sandbox = document.createElement('div')
+ svg = document.createElementNS(NS.SVG, 'svg')
svgroot = mockCreateSVGElement({
element: 'svg',
attr: { id: 'svgroot' }
- });
- sandbox.append(svgroot);
- document.body.append(sandbox);
- });
+ })
+ sandbox.append(svgroot)
+ document.body.append(sandbox)
+ })
it('Test svgedit.utilities package', function () {
- assert.ok(utilities);
- assert.ok(utilities.toXml);
- assert.equal(typeof utilities.toXml, typeof function () { /* empty fn */ });
- });
+ assert.ok(utilities)
+ assert.ok(utilities.toXml)
+ assert.equal(typeof utilities.toXml, typeof function () { /* empty fn */ })
+ })
it('Test svgedit.utilities.toXml() function', function () {
- const { toXml } = utilities;
+ const { toXml } = utilities
- assert.equal(toXml('a'), 'a');
- assert.equal(toXml('ABC_'), 'ABC_');
- assert.equal(toXml('PB&J'), 'PB&J');
- assert.equal(toXml('2 < 5'), '2 < 5');
- assert.equal(toXml('5 > 2'), '5 > 2');
- assert.equal(toXml('\'<&>"'), ''<&>"');
- });
+ assert.equal(toXml('a'), 'a')
+ assert.equal(toXml('ABC_'), 'ABC_')
+ assert.equal(toXml('PB&J'), 'PB&J')
+ assert.equal(toXml('2 < 5'), '2 < 5')
+ assert.equal(toXml('5 > 2'), '5 > 2')
+ assert.equal(toXml('\'<&>"'), ''<&>"')
+ })
it('Test svgedit.utilities.encode64() function', function () {
- const { encode64 } = utilities;
+ const { encode64 } = utilities
- assert.equal(encode64('abcdef'), 'YWJjZGVm');
- assert.equal(encode64('12345'), 'MTIzNDU=');
- assert.equal(encode64(' '), 'IA==');
- assert.equal(encode64('`~!@#$%^&*()-_=+[{]}\\|;:\'",<.>/?'), 'YH4hQCMkJV4mKigpLV89K1t7XX1cfDs6JyIsPC4+Lz8=');
- });
+ assert.equal(encode64('abcdef'), 'YWJjZGVm')
+ assert.equal(encode64('12345'), 'MTIzNDU=')
+ assert.equal(encode64(' '), 'IA==')
+ assert.equal(encode64('`~!@#$%^&*()-_=+[{]}\\|;:\'",<.>/?'), 'YH4hQCMkJV4mKigpLV89K1t7XX1cfDs6JyIsPC4+Lz8=')
+ })
it('Test svgedit.utilities.decode64() function', function () {
- const { decode64 } = utilities;
+ const { decode64 } = utilities
- assert.equal(decode64('YWJjZGVm'), 'abcdef');
- assert.equal(decode64('MTIzNDU='), '12345');
- assert.equal(decode64('IA=='), ' ');
- assert.equal(decode64('YH4hQCMkJV4mKigpLV89K1t7XX1cfDs6JyIsPC4+Lz8='), '`~!@#$%^&*()-_=+[{]}\\|;:\'",<.>/?');
- });
+ assert.equal(decode64('YWJjZGVm'), 'abcdef')
+ assert.equal(decode64('MTIzNDU='), '12345')
+ assert.equal(decode64('IA=='), ' ')
+ assert.equal(decode64('YH4hQCMkJV4mKigpLV89K1t7XX1cfDs6JyIsPC4+Lz8='), '`~!@#$%^&*()-_=+[{]}\\|;:\'",<.>/?')
+ })
it('Test svgedit.utilities.convertToXMLReferences() function', function () {
- const convert = utilities.convertToXMLReferences;
- assert.equal(convert('ABC'), 'ABC');
+ const convert = utilities.convertToXMLReferences
+ assert.equal(convert('ABC'), 'ABC')
// assert.equal(convert('�BC'), 'ÀBC');
- });
+ })
it('Test svgedit.utilities.bboxToObj() function', function () {
- const { bboxToObj } = utilities;
+ const { bboxToObj } = utilities
- const rect = svg.createSVGRect();
- rect.x = 1;
- rect.y = 2;
- rect.width = 3;
- rect.height = 4;
+ const rect = svg.createSVGRect()
+ rect.x = 1
+ rect.y = 2
+ rect.width = 3
+ rect.height = 4
- const obj = bboxToObj(rect);
- assert.equal(typeof obj, typeof {});
- assert.equal(obj.x, 1);
- assert.equal(obj.y, 2);
- assert.equal(obj.width, 3);
- assert.equal(obj.height, 4);
- });
+ const obj = bboxToObj(rect)
+ assert.equal(typeof obj, typeof {})
+ assert.equal(obj.x, 1)
+ assert.equal(obj.y, 2)
+ assert.equal(obj.width, 3)
+ assert.equal(obj.height, 4)
+ })
it('Test getUrlFromAttr', function () {
- assert.equal(utilities.getUrlFromAttr('url(#foo)'), '#foo');
- assert.equal(utilities.getUrlFromAttr('url(somefile.svg#foo)'), 'somefile.svg#foo');
- assert.equal(utilities.getUrlFromAttr('url("#foo")'), '#foo');
- assert.equal(utilities.getUrlFromAttr('url("#foo")'), '#foo');
- });
+ assert.equal(utilities.getUrlFromAttr('url(#foo)'), '#foo')
+ assert.equal(utilities.getUrlFromAttr('url(somefile.svg#foo)'), 'somefile.svg#foo')
+ assert.equal(utilities.getUrlFromAttr('url("#foo")'), '#foo')
+ assert.equal(utilities.getUrlFromAttr('url("#foo")'), '#foo')
+ })
it('Test getPathDFromSegments', function () {
- const { getPathDFromSegments } = utilities;
+ const { getPathDFromSegments } = utilities
- const doc = utilities.text2xml('