Commit b0833136 by Edgar HIPP

Fix for issue with null tags

parent ad79e03e
......@@ -73,7 +73,6 @@
"no-duplicate-case": 2,
"no-else-return": 2,
"no-empty": 2,
"no-empty-label": 2,
"no-empty-character-class": 2,
"no-eval": 2,
"no-ex-assign": 2,
......@@ -113,15 +112,14 @@
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-param-reassign": 0,
"no-path-concat": 2,
"no-process-env": 2,
"no-process-exit": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-restricted-modules": 0,
"no-restricted-syntax": 0,
"no-restricted-modules": 2,
"no-restricted-syntax": 2,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
......@@ -136,17 +134,16 @@
"no-trailing-spaces": 2,
"no-undef": 2,
"no-undef-init": 0,
"no-undefined": 0,
"no-underscore-dangle": 0,
"no-unexpected-multiline": 2,
"no-unneeded-ternary": 2,
"no-unreachable": 2,
"no-unused-expressions": 2,
"no-unused-vars": 2,
"no-use-before-define": [2, "nofunc"],
"no-use-before-define": ["error", { "functions" : true }],
"no-useless-call": 2,
"no-useless-concat": 2,
"no-var": 0,
"no-var": 2,
"no-void": 2,
"no-warning-comments": [2, {"terms": ["todo", "fixme"], "location": "anywhere"}],
"no-with": 2,
......@@ -172,10 +169,9 @@
"space-before-blocks": 2,
"space-before-keywords": 0,
"space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
"space-after-keywords": 2,
"keyword-spacing": 2,
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, {"words": true, "nonwords": false}],
"spaced-comment": [2, "always"],
"use-isnan": 2,
......
"use strict";
var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
const _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
// public method for encoding
module.exports.encode = function (input) {
var output = "";
var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
var i = 0;
let output = "";
let chr1, chr2, chr3, enc1, enc2, enc3, enc4;
let i = 0;
while (i < input.length) {
chr1 = input.charCodeAt(i++);
......
"use strict";
var DOMParser = require("xmldom").DOMParser;
var XMLSerializer = require("xmldom").XMLSerializer;
var DocUtils = {};
const DOMParser = require("xmldom").DOMParser;
const XMLSerializer = require("xmldom").XMLSerializer;
const DocUtils = {};
DocUtils.xml2Str = function (xmlNode) {
var a = new XMLSerializer();
const a = new XMLSerializer();
return a.serializeToString(xmlNode);
};
DocUtils.str2xml = function (str, errorHandler) {
var parser = new DOMParser({errorHandler});
const parser = new DOMParser({errorHandler});
return parser.parseFromString(str, "text/xml");
};
......@@ -24,7 +23,7 @@ DocUtils.decodeUtf8 = function (s) {
return decodeURIComponent(escape(DocUtils.convertSpaces(s)));
}
catch (e) {
var err = new Error("End");
const err = new Error("End");
err.properties.data = s;
err.properties.explanation = "Could not decode string to UFT8";
throw err;
......@@ -43,15 +42,16 @@ DocUtils.pregMatchAll = function (regex, content) {
/* regex is a string, content is the content. It returns an array of all matches with their offset, for example:
regex=la
content=lolalolilala
returns: [{0:'la',offset:2},{0:'la',offset:8},{0:'la',offset:10}]
returns: [{0: 'la',offset: 2},{0: 'la',offset: 8},{0: 'la',offset: 10}]
*/
if (typeof regex !== "object") {
regex = (new RegExp(regex, "g"));
}
var matchArray = [];
var replacer = function (...pn) {
const matchArray = [];
const replacer = function () {
const pn = Array.prototype.slice.call(arguments);
pn.pop();
var offset = pn.pop();
const offset = pn.pop();
// add match so that pn[0] = whole match, pn[1]= first parenthesis,...
pn.offset = offset;
return matchArray.push(pn);
......
"use strict";
var XmlTemplater = require("docxtemplater").XmlTemplater;
var QrCode = require("qrcode-reader");
const XmlTemplater = require("docxtemplater").XmlTemplater;
const QrCode = require("qrcode-reader");
module.exports = class DocxQrCode {
constructor(imageData, xmlTemplater, imgName = "", num, getDataFromString) {
constructor(imageData, xmlTemplater, imgName, num, getDataFromString) {
this.xmlTemplater = xmlTemplater;
this.imgName = imgName;
this.imgName = imgName || "";
this.num = num;
this.getDataFromString = getDataFromString;
this.callbacked = false;
......@@ -18,12 +17,12 @@ module.exports = class DocxQrCode {
}
decode(callback) {
this.callback = callback;
var self = this;
const self = this;
this.qr = new QrCode();
this.qr.callback = function () {
self.ready = true;
self.result = this.result;
var testdoc = new XmlTemplater(this.result,
const testdoc = new XmlTemplater(this.result,
{fileTypeConfig: self.xmlTemplater.fileTypeConfig,
tags: self.xmlTemplater.tags,
Tags: self.xmlTemplater.Tags,
......@@ -36,8 +35,8 @@ module.exports = class DocxQrCode {
return this.qr.decode({width: this.data.width, height: this.data.height}, this.data.decoded);
}
searchImage() {
var cb = (_err, data = this.data.data) => {
this.data = data;
const cb = (_err, data) => {
this.data = data || this.data.data;
return this.callback(this, this.imgName, this.num);
};
if (!(this.result != null)) { return cb(); }
......
"use strict";
var DocUtils = require("./docUtils");
const DocUtils = require("./docUtils");
var imageExtensions = ["gif", "jpeg", "jpg", "emf", "png"];
const imageExtensions = ["gif", "jpeg", "jpg", "emf", "png"];
const imageListRegex = /[^.]+\.([^.]+)/;
module.exports = class ImgManager {
constructor(zip, fileName) {
......@@ -11,17 +12,17 @@ module.exports = class ImgManager {
this.endFileName = this.fileName.replace(/^.*?([a-z0-9]+)\.xml$/, "$1");
}
getImageList() {
var regex = / [^.]+ \. ([^.]+) /;
var imageList = [];
const imageList = [];
Object.keys(this.zip.files).forEach(function (path) {
var extension = path.replace(regex, "$1");
const extension = path.replace(imageListRegex, "$1");
if (imageExtensions.indexOf(extension) >= 0) {
imageList.push({path: path, files: this.zip.files[path]});
}
});
return imageList;
}
setImage(fileName, data, options = {}) {
setImage(fileName, data, options) {
options = options || {};
this.zip.remove(fileName);
return this.zip.file(fileName, data, options);
}
......@@ -29,14 +30,14 @@ module.exports = class ImgManager {
return this.zip.files[fileName] != null;
}
loadImageRels() {
var file = this.zip.files[`word/_rels/${this.endFileName}.xml.rels`] || this.zip.files["word/_rels/document.xml.rels"];
const file = this.zip.files[`word/_rels/${this.endFileName}.xml.rels`] || this.zip.files["word/_rels/document.xml.rels"];
if (file === undefined) { return; }
var content = DocUtils.decodeUtf8(file.asText());
const content = DocUtils.decodeUtf8(file.asText());
this.xmlDoc = DocUtils.str2xml(content);
// Get all Rids
var RidArray = [];
var iterable = this.xmlDoc.getElementsByTagName("Relationship");
for (var i = 0, tag; i < iterable.length; i++) {
const RidArray = [];
const iterable = this.xmlDoc.getElementsByTagName("Relationship");
for (let i = 0, tag; i < iterable.length; i++) {
tag = iterable[i];
RidArray.push(parseInt(tag.getAttribute("Id").substr(3), 10));
}
......@@ -46,17 +47,17 @@ module.exports = class ImgManager {
}
// Add an extension type in the [Content_Types.xml], is used if for example you want word to be able to read png files (for every extension you add you need a contentType)
addExtensionRels(contentType, extension) {
var content = this.zip.files["[Content_Types].xml"].asText();
var xmlDoc = DocUtils.str2xml(content);
var addTag = true;
var defaultTags = xmlDoc.getElementsByTagName("Default");
for (var i = 0, tag; i < defaultTags.length; i++) {
const content = this.zip.files["[Content_Types].xml"].asText();
const xmlDoc = DocUtils.str2xml(content);
let addTag = true;
const defaultTags = xmlDoc.getElementsByTagName("Default");
for (let i = 0, tag; i < defaultTags.length; i++) {
tag = defaultTags[i];
if (tag.getAttribute("Extension") === extension) { addTag = false; }
}
if (addTag) {
var types = xmlDoc.getElementsByTagName("Types")[0];
var newTag = xmlDoc.createElement("Default");
const types = xmlDoc.getElementsByTagName("Types")[0];
const newTag = xmlDoc.createElement("Default");
newTag.namespaceURI = null;
newTag.setAttribute("ContentType", contentType);
newTag.setAttribute("Extension", extension);
......@@ -65,13 +66,16 @@ module.exports = class ImgManager {
}
}
// Adding an image and returns it's Rid
addImageRels(imageName, imageData, i = 0) {
var realImageName = i === 0 ? imageName : imageName + `(${i})`;
addImageRels(imageName, imageData, i) {
if (i == null) {
i = 0;
}
const realImageName = i === 0 ? imageName : imageName + `(${i})`;
if ((this.zip.files[`word/media/${realImageName}`] != null)) {
return this.addImageRels(imageName, imageData, i + 1);
}
this.maxRid++;
var file = {
const file = {
name: `word/media/${realImageName}`,
data: imageData,
options: {
......@@ -83,10 +87,10 @@ module.exports = class ImgManager {
},
};
this.zip.file(file.name, file.data, file.options);
var extension = realImageName.replace(/[^.]+\.([^.]+)/, "$1");
const extension = realImageName.replace(/[^.]+\.([^.]+)/, "$1");
this.addExtensionRels(`image/${extension}`, extension);
var relationships = this.xmlDoc.getElementsByTagName("Relationships")[0];
var newTag = this.xmlDoc.createElement("Relationship");
const relationships = this.xmlDoc.getElementsByTagName("Relationships")[0];
const newTag = this.xmlDoc.createElement("Relationship");
newTag.namespaceURI = null;
newTag.setAttribute("Id", `rId${this.maxRid}`);
newTag.setAttribute("Type", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image");
......@@ -95,9 +99,10 @@ module.exports = class ImgManager {
this.setImage(`word/_rels/${this.endFileName}.xml.rels`, DocUtils.encodeUtf8(DocUtils.xml2Str(this.xmlDoc)));
return this.maxRid;
}
getImageName(id = 0) {
var nameCandidate = "Copie_" + id + ".png";
var fullPath = this.getFullPath(nameCandidate);
getImageName(id) {
id = id || 0;
const nameCandidate = "Copie_" + id + ".png";
const fullPath = this.getFullPath(nameCandidate);
if (this.hasImage(fullPath)) {
return this.getImageName(id + 1);
}
......@@ -106,12 +111,12 @@ module.exports = class ImgManager {
getFullPath(imgName) { return `word/media/${imgName}`; }
// This is to get an image by it's rId (returns null if no img was found)
getImageByRid(rId) {
var relationships = this.xmlDoc.getElementsByTagName("Relationship");
for (var i = 0, relationship; i < relationships.length; i++) {
const relationships = this.xmlDoc.getElementsByTagName("Relationship");
for (let i = 0, relationship; i < relationships.length; i++) {
relationship = relationships[i];
var cRId = relationship.getAttribute("Id");
const cRId = relationship.getAttribute("Id");
if (rId === cRId) {
var path = relationship.getAttribute("Target");
const path = relationship.getAttribute("Target");
if (path.substr(0, 6) === "media/") {
return this.zip.files[`word/${path}`];
}
......
"use strict";
var DocUtils = require("./docUtils");
var DocxQrCode = require("./docxQrCode");
var PNG = require("png-js");
var base64encode = require("./base64").encode;
const DocUtils = require("./docUtils");
const DocxQrCode = require("./docxQrCode");
const PNG = require("png-js");
const base64encode = require("./base64").encode;
module.exports = class ImgReplacer {
constructor(xmlTemplater, imgManager) {
......@@ -20,8 +20,8 @@ module.exports = class ImgReplacer {
replaceImages() {
this.qr = [];
this.xmlTemplater.numQrCode += this.imgMatches.length;
var iterable = this.imgMatches;
for (var imgNum = 0, match; imgNum < iterable.length; imgNum++) {
const iterable = this.imgMatches;
for (let imgNum = 0, match; imgNum < iterable.length; imgNum++) {
match = iterable[imgNum];
this.replaceImage(match, imgNum);
}
......@@ -35,7 +35,7 @@ module.exports = class ImgReplacer {
return this.popQrQueue(this.imgManager.fileName + "-" + docxqrCode.num, false);
}
getXmlImg(match) {
var baseDocument = `<?xml version="1.0" ?>
const baseDocument = `<?xml version="1.0" ?>
<w:document
mc:Ignorable="w14 wp14"
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
......@@ -54,7 +54,7 @@ module.exports = class ImgReplacer {
xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk"
xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape">${match[0]}</w:document>
`;
var f = function (e) {
const f = function (e) {
if (e === "fatalError") {
throw new Error("fatalError");
}
......@@ -62,46 +62,46 @@ module.exports = class ImgReplacer {
return DocUtils.str2xml(baseDocument, f);
}
replaceImage(match, imgNum) {
var num = parseInt(Math.random() * 10000, 10);
var xmlImg;
const num = parseInt(Math.random() * 10000, 10);
let xmlImg;
try {
xmlImg = this.getXmlImg(match);
}
catch (e) {
return;
}
var tagrId = xmlImg.getElementsByTagName("a:blip")[0];
const tagrId = xmlImg.getElementsByTagName("a:blip")[0];
if (tagrId === undefined) { throw new Error("tagRiD undefined !"); }
var rId = tagrId.getAttribute("r:embed");
var tag = xmlImg.getElementsByTagName("wp:docPr")[0];
const rId = tagrId.getAttribute("r:embed");
const tag = xmlImg.getElementsByTagName("wp:docPr")[0];
if (tag === undefined) { throw new Error("tag undefined"); }
// if image is already a replacement then do nothing
if (tag.getAttribute("name").substr(0, 6) === "Copie_") { return; }
var imgName = this.imgManager.getImageName();
const imgName = this.imgManager.getImageName();
this.pushQrQueue(this.imgManager.fileName + "-" + num, true);
var newId = this.imgManager.addImageRels(imgName, "");
const newId = this.imgManager.addImageRels(imgName, "");
this.xmlTemplater.imageId++;
var oldFile = this.imgManager.getImageByRid(rId);
const oldFile = this.imgManager.getImageByRid(rId);
this.imgManager.setImage(this.imgManager.getFullPath(imgName), oldFile.data, {binary: true});
tag.setAttribute("name", `${imgName}`);
tagrId.setAttribute("r:embed", `rId${newId}`);
var imageTag = xmlImg.getElementsByTagName("w:drawing")[0];
const imageTag = xmlImg.getElementsByTagName("w:drawing")[0];
if (imageTag === undefined) { throw new Error("imageTag undefined"); }
var replacement = DocUtils.xml2Str(imageTag);
const replacement = DocUtils.xml2Str(imageTag);
this.xmlTemplater.content = this.xmlTemplater.content.replace(match[0], replacement);
return this.decodeImage(oldFile, imgName, num, imgNum);
}
decodeImage(oldFile, imgName, num, imgNum) {
var mockedQrCode = {xmlTemplater: this.xmlTemplater, imgName: imgName, data: oldFile.asBinary(), num: num};
const mockedQrCode = {xmlTemplater: this.xmlTemplater, imgName: imgName, data: oldFile.asBinary(), num: num};
if (!/\.png$/.test(oldFile.name)) {
return this.imageSetter(mockedQrCode);
}
return ((imgName) => {
var base64 = base64encode(oldFile.asBinary());
var binaryData = new Buffer(base64, "base64");
var png = new PNG(binaryData);
var finished = (a) => {
const base64 = base64encode(oldFile.asBinary());
const binaryData = new Buffer(base64, "base64");
const png = new PNG(binaryData);
const finished = (a) => {
png.decoded = a;
try {
this.qr[imgNum] = new DocxQrCode(png, this.xmlTemplater, imgName, num, this.getDataFromString);
......
"use strict";
var SubContent = require("docxtemplater").SubContent;
var ImgManager = require("./imgManager");
var ImgReplacer = require("./imgReplacer");
const SubContent = require("docxtemplater").SubContent;
const ImgManager = require("./imgManager");
const ImgReplacer = require("./imgReplacer");
class ImageModule {
constructor(options = {}) {
this.options = options;
constructor(options) {
this.options = options || {};
if (!(this.options.centered != null)) { this.options.centered = false; }
if (!(this.options.getImage != null)) { throw new Error("You should pass getImage"); }
if (!(this.options.getSize != null)) { throw new Error("You should pass getSize"); }
......@@ -16,7 +16,7 @@ class ImageModule {
handleEvent(event, eventData) {
if (event === "rendering-file") {
this.renderingFileName = eventData;
var gen = this.manager.getInstance("gen");
const gen = this.manager.getInstance("gen");
this.imgManager = new ImgManager(gen.zip, this.renderingFileName);
this.imgManager.loadImageRels();
}
......@@ -26,7 +26,7 @@ class ImageModule {
}
get(data) {
if (data === "loopType") {
var templaterState = this.manager.getInstance("templaterState");
const templaterState = this.manager.getInstance("templaterState");
if (templaterState.textInsideTag[0] === "%") {
return "image";
}
......@@ -34,14 +34,14 @@ class ImageModule {
return null;
}
getNextImageName() {
var name = `image_generated_${this.imageNumber}.png`;
const name = `image_generated_${this.imageNumber}.png`;
this.imageNumber++;
return name;
}
replaceBy(text, outsideElement) {
var xmlTemplater = this.manager.getInstance("xmlTemplater");
var templaterState = this.manager.getInstance("templaterState");
var subContent = new SubContent(xmlTemplater.content);
const xmlTemplater = this.manager.getInstance("xmlTemplater");
const templaterState = this.manager.getInstance("templaterState");
let subContent = new SubContent(xmlTemplater.content);
subContent = subContent.getInnerTag(templaterState);
subContent = subContent.getOuterXml(outsideElement);
return xmlTemplater.replaceXml(subContent, text);
......@@ -50,42 +50,41 @@ class ImageModule {
return Math.round(pixel * 9525);
}
replaceTag() {
var scopeManager = this.manager.getInstance("scopeManager");
var templaterState = this.manager.getInstance("templaterState");
var xmlTemplater = this.manager.getInstance("xmlTemplater");
var tagXml = xmlTemplater.fileTypeConfig.tagsXmlArray[0];
const scopeManager = this.manager.getInstance("scopeManager");
const templaterState = this.manager.getInstance("templaterState");
const xmlTemplater = this.manager.getInstance("xmlTemplater");
const tagXml = xmlTemplater.fileTypeConfig.tagsXmlArray[0];
const tagXmlParagraph = tagXml.substr(0, 1) + ":p";
var tag = templaterState.textInsideTag.substr(1);
var tagValue = scopeManager.getValue(tag);
const tag = templaterState.textInsideTag.substr(1);
const tagValue = scopeManager.getValue(tag);
const startEnd = `<${tagXml}></${tagXml}>`;
const outsideElement = this.options.centered ? tagXmlParagraph : tagXml;
if (tagValue == null) {
return this.replaceBy(startEnd, tagXml);
}
var tagXmlParagraph = tagXml.substr(0, 1) + ":p";
var startEnd = `<${tagXml}></${tagXml}>`;
var imgBuffer;
let imgBuffer;
try {
imgBuffer = this.options.getImage(tagValue, tag);
}
catch (e) {
return this.replaceBy(startEnd, tagXml);
}
var imageRels = this.imgManager.loadImageRels();
const imageRels = this.imgManager.loadImageRels();
if (!imageRels) {
return;
}
var rId = imageRels.addImageRels(this.getNextImageName(), imgBuffer);
var sizePixel = this.options.getSize(imgBuffer, tagValue, tag);
var size = [this.convertPixelsToEmus(sizePixel[0]), this.convertPixelsToEmus(sizePixel[1])];
var newText = this.options.centered ? this.getImageXmlCentered(rId, size) : this.getImageXml(rId, size);
var outsideElement = this.options.centered ? tagXmlParagraph : tagXml;
const rId = imageRels.addImageRels(this.getNextImageName(), imgBuffer);
const sizePixel = this.options.getSize(imgBuffer, tagValue, tag);
const size = [this.convertPixelsToEmus(sizePixel[0]), this.convertPixelsToEmus(sizePixel[1])];
const newText = this.options.centered ? this.getImageXmlCentered(rId, size) : this.getImageXml(rId, size);
return this.replaceBy(newText, outsideElement);
}
replaceQr() {
var xmlTemplater = this.manager.getInstance("xmlTemplater");
var imR = new ImgReplacer(xmlTemplater, this.imgManager);
const xmlTemplater = this.manager.getInstance("xmlTemplater");
const imR = new ImgReplacer(xmlTemplater, this.imgManager);
imR.getDataFromString = (result, cb) => {
if ((this.options.getImageAsync != null)) {
return this.options.getImageAsync(result, cb);
......@@ -96,7 +95,7 @@ class ImageModule {
return this.qrQueue.push(num);
};
imR.popQrQueue = (num) => {
var found = this.qrQueue.indexOf(num);
const found = this.qrQueue.indexOf(num);
if (found !== -1) {
this.qrQueue.splice(found, 1);
}
......@@ -105,7 +104,7 @@ class ImageModule {
}
if (this.qrQueue.length === 0) { return this.finished(); }
};
var num = parseInt(Math.random() * 10000, 10);
const num = parseInt(Math.random() * 10000, 10);
imR.pushQrQueue("rendered-" + num);
try {
imR.findImages().replaceImages();
......@@ -113,7 +112,7 @@ class ImageModule {
catch (e) {
this.on("error", e);
}
var f = () => imR.popQrQueue("rendered-" + num);
const f = () => imR.popQrQueue("rendered-" + num);
return setTimeout(f, 1);
}
finished() {}
......
......@@ -4,18 +4,19 @@
"description": "Image Module for docxtemplater v1.0",
"main": "js/index.js",
"scripts": {
"compile": "rm js -rf ; mkdir -p test/spec; mkdir -p js; babel es6 --out-dir js; mv js/test.js test/test.js",
"test:compiled": "mocha",
"compile": "rm js -rf ; mkdir -p test/spec; mkdir -p js; babel es6 --out-dir js",
"test:compiled": "mocha js/test.js",
"test:es6": "mocha es6/test.js",
"lint": "eslint .",
"test": "npm run compile && npm run test:compiled"
},
"devDependencies": {
"babel-cli": "^6.4.0",
"babel-eslint": "^4.1.2",
"babel-cli": "^6.7.5",
"babel-eslint": "^6.0.2",
"babel-preset-es2015": "^6.3.13",
"chai": "^3.4.1",
"docxtemplater": "^2.0.0",
"eslint": "^1.10.3",
"docxtemplater": "^2.1.0",
"eslint": "^2.7.0",
"mocha": "^2.4.5"
},
"repository": {
......@@ -25,8 +26,9 @@
"author": "Edgar Hipp",
"license": "MIT",
"dependencies": {
"eslint": "^2.7.0",
"png-js": "^0.1.1",
"qrcode-reader": "0.0.7",
"xmldom": "0.1.21"
"qrcode-reader": "^0.1.1",
"xmldom": "^0.1.22"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment