From 06b6fb8b56fa370326b7a7bed0b6da29f6b17d15 Mon Sep 17 00:00:00 2001 From: larssjogreen Date: Thu, 20 Dec 2018 16:18:13 +0100 Subject: [PATCH 1/4] Updated lodash to latest version. Fixed a breaking change (_.pluck replaced by _.map). Ran the tests and got all green. --- index.js | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 41a79c4..1b278b3 100644 --- a/index.js +++ b/index.js @@ -31,8 +31,8 @@ }, convFieldJson2FDF: function(fieldJson){ - var _keys = _.pluck(fieldJson, 'title'), - _values = _.pluck(fieldJson, 'fieldValue'); + var _keys = _.map(fieldJson, 'title'), + _values = _.map(fieldJson, 'fieldValue'); _values = _.map(_values, function(val){ if(val === true){ diff --git a/package.json b/package.json index 037e208..02ec714 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "pdf" ], "dependencies": { - "lodash": "~3.8.0", + "lodash": "~4.17.11", "utf8-fdf-generator": "0.0.3" }, "author": { From 7ed2bcd085887c3c7abbaab0302fa0e9d1075660 Mon Sep 17 00:00:00 2001 From: John Taylor Date: Tue, 21 May 2019 09:25:53 -0400 Subject: [PATCH 2/4] Bumping version 0.0.10 -> 0.0.11 Ignoring VSCode settings --- .gitignore | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 39c151b..86cd785 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,10 @@ uploads/ *.sublime-project *.sublime-workspace +# VSCode editor +# ============== +/.vscode + # Eclipse project files # ===================== .project diff --git a/package.json b/package.json index 02ec714..a636dde 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdffiller", - "version": "0.0.10", + "version": "0.0.11", "private": false, "description": "Take an existing PDF Form and data and PDF Filler will create a new PDF with all given fields populated.", "main": "index.js", From 2544e44be1d9c0c18399b6e300dfc47c2a83e479 Mon Sep 17 00:00:00 2001 From: Greg Yachuk Date: Wed, 22 Jul 2020 16:27:14 -0700 Subject: [PATCH 3/4] Return FieldValue in FDF data. --- index.js | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/index.js b/index.js index 1b278b3..c6a08dc 100644 --- a/index.js +++ b/index.js @@ -49,9 +49,10 @@ }, generateFieldJson: function( sourceFile, nameRegex, callback){ - var regName = /FieldName: ([^\n]*)/, - regType = /FieldType: ([A-Za-z\t .]+)/, - regFlags = /FieldFlags: ([0-9\t .]+)/, + var regName = /^FieldName: /, + regType = /^FieldType: /, + regFlags = /^FieldFlags: /, + regValue = /^FieldValue: /, fieldArray = [], currField = {}; @@ -63,28 +64,28 @@ return callback(error, null); } - fields = stdout.toString().split("---").slice(1); - fields.forEach(function(field){ - currField = {}; - - currField['title'] = field.match(regName)[1].trim() || ''; - - if(field.match(regType)){ - currField['fieldType'] = field.match(regType)[1].trim() || ''; - }else { - currField['fieldType'] = ''; - } - - if(field.match(regFlags)){ - currField['fieldFlags'] = field.match(regFlags)[1].trim()|| ''; - }else{ - currField['fieldFlags'] = ''; + var output = stdout.toString(); + var fields = output.split('\n').slice(1); + fields.forEach(function (line) { + if (line.match(regName)) { + currField.title = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line.match(regType)) { + currField.fieldType = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line.match(regFlags)) { + currField.fieldFlags = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line.match(regValue)) { + currField.fieldValue = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line === '---') { + currField.fieldValue = currField.fieldValue || ''; + fieldArray.push(currField); + currField = {}; } + }); - currField['fieldValue'] = ''; - + if (Object.keys(currField).length) { + currField.fieldValue = currField.fieldValue || ''; fieldArray.push(currField); - }); + } return callback(null, fieldArray); }); From 5cef7521bff035d9aa4362be1fcfa1b017520e16 Mon Sep 17 00:00:00 2001 From: Greg Yachuk Date: Wed, 22 Jul 2020 17:18:21 -0700 Subject: [PATCH 4/4] Return FieldValue in FDF data. --- index.js | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/index.js b/index.js index 16579a8..1ef6077 100644 --- a/index.js +++ b/index.js @@ -39,9 +39,10 @@ var pdffiller = { }, generateFieldJson: function (sourceFile, nameRegex) { - var regName = /FieldName: ([^\n]*)/, - regType = /FieldType: ([A-Za-z\t .]+)/, - regFlags = /FieldFlags: ([0-9\t .]+)/, + var regName = /^FieldName: /, + regType = /^FieldType: /, + regFlags = /^FieldFlags: /, + regValue = /^FieldValue: /, fieldArray = [], currField = {}; @@ -61,28 +62,27 @@ var pdffiller = { }); childProcess.stdout.on('end', function () { - - fields = output.split("---").slice(1); - - fields.forEach(function (field) { - currField = {}; - currField['title'] = field.match(regName)[1].trim() || ''; - - if (field.match(regType)) { - currField['fieldType'] = field.match(regType)[1].trim() || ''; - } else { - currField['fieldType'] = ''; - } - - if (field.match(regFlags)) { - currField['fieldFlags'] = field.match(regFlags)[1].trim() || ''; - } else { - currField['fieldFlags'] = ''; + var fields = output.split('\n').slice(1); + fields.forEach(function (line) { + if (line.match(regName)) { + currField.title = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line.match(regType)) { + currField.fieldType = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line.match(regFlags)) { + currField.fieldFlags = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line.match(regValue)) { + currField.fieldValue = line.substr(line.indexOf(' ') + 1).trim() || ''; + } else if (line === '---') { + currField.fieldValue = currField.fieldValue || ''; + fieldArray.push(currField); + currField = {}; } + }); - currField['fieldValue'] = ''; + if (Object.keys(currField).length) { + currField.fieldValue = currField.fieldValue || ''; fieldArray.push(currField); - }); + } resolve(fieldArray); });