@larsgw/formica 0.8.4 → 0.8.6

package/lib/catalog/tables/author.js

@@ -1,35 +1,18 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Author = void 0;
-var value_1 = require("../value");
-var entity_1 = require("../entity");
-var Author = /** @class */ (function (_super) {
-    __extends(Author, _super);
-    function Author(values) {
-        return _super.call(this, values, {
+const value_1 = require("../value");
+const entity_1 = require("../entity");
+class Author extends entity_1.Entity {
+    constructor(values) {
+        super(values, {
             name: { required: true, multiple: true },
             id: { required: true, multiple: false, format: value_1.FORMATS.AUTHOR_ID },
             qid: { required: false, multiple: false, format: value_1.FORMATS.QID },
             display_name: { required: true, multiple: false },
             full_names: { required: false, multiple: true },
             duplicate_of: { required: false, multiple: false, format: value_1.FORMATS.AUTHOR_ID }
-        }) || this;
+        });
     }
-    return Author;
-}(entity_1.Entity));
+}
 exports.Author = Author;

package/lib/catalog/tables/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TYPE_INFO = void 0;
-var author_1 = require("./author");
-var publisher_1 = require("./publisher");
-var place_1 = require("./place");
-var taxon_1 = require("./taxon");
-var work_1 = require("./work");
+const author_1 = require("./author");
+const publisher_1 = require("./publisher");
+const place_1 = require("./place");
+const taxon_1 = require("./taxon");
+const work_1 = require("./work");
 exports.TYPE_INFO = {
     authors: [author_1.Author, 'id'],
     publishers: [publisher_1.Publisher, 'id'],

package/lib/catalog/tables/place.js

@@ -1,34 +1,17 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Place = void 0;
-var value_1 = require("../value");
-var entity_1 = require("../entity");
-var Place = /** @class */ (function (_super) {
-    __extends(Place, _super);
-    function Place(values) {
-        return _super.call(this, values, {
+const value_1 = require("../value");
+const entity_1 = require("../entity");
+class Place extends entity_1.Entity {
+    constructor(values) {
+        super(values, {
             name: { required: true, multiple: false },
             id: { required: true, multiple: false, format: value_1.FORMATS.PLACE_ID },
             qid: { required: false, multiple: false, format: value_1.FORMATS.QID },
             display_name: { required: true, multiple: false },
             duplicate_of: { required: false, multiple: false, format: value_1.FORMATS.PLACE_ID }
-        }) || this;
+        });
     }
-    return Place;
-}(entity_1.Entity));
+}
 exports.Place = Place;

package/lib/catalog/tables/publisher.js

@@ -1,35 +1,18 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Publisher = void 0;
-var value_1 = require("../value");
-var entity_1 = require("../entity");
-var Publisher = /** @class */ (function (_super) {
-    __extends(Publisher, _super);
-    function Publisher(values) {
-        return _super.call(this, values, {
+const value_1 = require("../value");
+const entity_1 = require("../entity");
+class Publisher extends entity_1.Entity {
+    constructor(values) {
+        super(values, {
             name: { required: true, multiple: true },
             id: { required: true, multiple: false, format: value_1.FORMATS.PUBLISHER_ID },
             qid: { required: false, multiple: false, format: value_1.FORMATS.QID },
             display_name: { required: true, multiple: false },
             full_names: { required: false, multiple: true },
             duplicate_of: { required: false, multiple: false, format: value_1.FORMATS.PUBLISHER_ID }
-        }) || this;
+        });
     }
-    return Publisher;
-}(entity_1.Entity));
+}
 exports.Publisher = Publisher;

package/lib/catalog/tables/taxon.js

@@ -1,27 +1,11 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Taxon = void 0;
-var value_1 = require("../value");
-var entity_1 = require("../entity");
-var Taxon = /** @class */ (function (_super) {
-    __extends(Taxon, _super);
-    function Taxon(values) {
-        return _super.call(this, values, {
+const value_1 = require("../value");
+const entity_1 = require("../entity");
+class Taxon extends entity_1.Entity {
+    constructor(values) {
+        super(values, {
             name: { required: true, multiple: false },
             id: { required: true, multiple: false, format: value_1.FORMATS.TAXON_ID },
             qid: { required: false, multiple: false, format: value_1.FORMATS.QID },
@@ -30,8 +14,7 @@ var Taxon = /** @class */ (function (_super) {
             children_gbif: { required: false, multiple: true, format: value_1.FORMATS.INTEGER },
             ancestors_gbif: { required: false, multiple: true, format: value_1.FORMATS.INTEGER },
             duplicate_of: { required: false, multiple: false, format: value_1.FORMATS.TAXON_ID }
-        }) || this;
+        });
     }
-    return Taxon;
-}(entity_1.Entity));
+}
 exports.Taxon = Taxon;

package/lib/catalog/tables/work.js

@@ -1,27 +1,11 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Work = void 0;
-var value_1 = require("../value");
-var entity_1 = require("../entity");
-var Work = /** @class */ (function (_super) {
-    __extends(Work, _super);
-    function Work(values) {
-        return _super.call(this, values, {
+const value_1 = require("../value");
+const entity_1 = require("../entity");
+class Work extends entity_1.Entity {
+    constructor(values) {
+        super(values, {
             id: { required: true, multiple: false, format: value_1.FORMATS.WORK_ID },
             title: { required: true, multiple: value_1.CHECK.MULTILANG },
             author: { required: false, multiple: true },
@@ -54,11 +38,11 @@ var Work = /** @class */ (function (_super) {
             part_of: { required: false, multiple: true, format: value_1.FORMATS.WORK_ID },
             version_of: { required: false, multiple: true, format: value_1.FORMATS.WORK_ID },
             duplicate_of: { required: false, multiple: false, format: value_1.FORMATS.WORK_ID }
-        }) || this;
+        });
     }
-    Work.prototype.deriveFields = function () {
+    deriveFields() {
         if (typeof this.fields.date === 'string') {
-            var year = parseInt(this.fields.date.split('-')[0]);
+            const year = parseInt(this.fields.date.split('-')[0]);
             this.derivedFields.year = year.toString();
             this.derivedFields.decade = (year - (year % 10)).toString();
         }
@@ -66,9 +50,9 @@ var Work = /** @class */ (function (_super) {
             this.derivedFields.access = 'Open license';
         }
         else {
-            var info = this.fields.url;
-            var content = this.fields.fulltext_url;
-            var archive = this.fields.archive_url;
+            const info = this.fields.url;
+            const content = this.fields.fulltext_url;
+            const archive = this.fields.archive_url;
             if (typeof content === 'string') {
                 this.derivedFields.access = 'Full text available, no license';
             }
@@ -79,7 +63,6 @@ var Work = /** @class */ (function (_super) {
                 this.derivedFields.access = 'No full text available';
             }
         }
-    };
-    return Work;
-}(entity_1.Entity));
+    }
+}
 exports.Work = Work;

package/lib/catalog/value.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CHECK = exports.FORMATS = void 0;
 exports.parseValue = parseValue;
-var spdx_license_list_1 = __importDefault(require("spdx-license-list"));
-var ietf_language_tag_regex_1 = __importDefault(require("ietf-language-tag-regex"));
-var ietfTagList = (0, ietf_language_tag_regex_1.default)();
+const spdx_license_list_1 = __importDefault(require("spdx-license-list"));
+const ietf_language_tag_regex_1 = __importDefault(require("ietf-language-tag-regex"));
+const ietfTagList = (0, ietf_language_tag_regex_1.default)();
 exports.FORMATS = {
     ENTRY_TYPE: ['print', 'online', 'cd', 'application'],
     KEY_TYPE: ['key', 'matrix', 'reference', 'gallery', 'checklist', 'supplement', 'collection', 'algorithm'],
@@ -24,21 +24,21 @@ exports.FORMATS = {
     QID: /^Q[1-9][0-9]*$/,
     URL: /^(ftp|http|https):\/\/((?:[a-z0-9][a-z0-9-_]*?[a-z0-9]?\.)+(?:xn--)?[a-z0-9]+)(:\d*)?((?:\/(?:%\d\d|[!$&'()*+,\-.0-9";=@A-Z_a-z~])*)*)(\?(?:%\d\d|[!$&'()*+,\-./0-9:;=?@A-Z_a-z~])*)?(#(?:%\d\d|[!$&'()*+,\-./0-9:;=?@A-Z_a-z~])*)?/i,
     INTEGER: /^(0|[1-9]\d*)$/,
-    LICENSE: function (value) { return /^<(public domain|.+\?)>$/.test(value) || !!spdx_license_list_1.default[value]; },
-    LANGUAGE: function (value) { return ietfTagList.test(value); }
+    LICENSE(value) { return /^<(public domain|.+\?)>$/.test(value) || !!spdx_license_list_1.default[value]; },
+    LANGUAGE(value) { return ietfTagList.test(value); }
 };
 exports.CHECK = {
-    MULTILANG: function (entry) {
+    MULTILANG(entry) {
         return Array.isArray(entry.language) && entry.language.length > 1;
     },
-    ISBN: function (entry) {
+    ISBN(entry) {
         if (!Array.isArray(entry.ISBN) || entry.ISBN.length < 2) {
             return false;
         }
-        var a = entry.ISBN[0].length === 10;
-        var b = entry.ISBN[0].length === 13;
-        var c = entry.ISBN[1].length === 10;
-        var d = entry.ISBN[1].length === 13;
+        const a = entry.ISBN[0].length === 10;
+        const b = entry.ISBN[0].length === 13;
+        const c = entry.ISBN[1].length === 10;
+        const d = entry.ISBN[1].length === 13;
         return (a && d) || (b && c);
     }
 };

package/lib/csv.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCsv = parseCsv;
 exports.formatCsv = formatCsv;
 function parseCsv(file) {
-    var values = file
+    const values = file
         .trim()
         .match(/("([^"]|"")*?"|[^,\n]+|(?!$))(,|\n|$)/g);
     if (values === null) {
         throw new TypeError('Failed to parse csv');
     }
-    return values.reduce(function (rows, value) {
-        var last = rows[rows.length - 1];
+    return values.reduce((rows, value) => {
+        const last = rows[rows.length - 1];
         if (value.endsWith('\n')) {
             rows.push([]);
         }
@@ -19,13 +19,12 @@ function parseCsv(file) {
         return rows;
     }, [[]]);
 }
-function formatCsv(table, delimiter) {
-    if (delimiter === void 0) { delimiter = ','; }
+function formatCsv(table, delimiter = ',') {
     return table
-        .map(function (row) {
-        return row.map(function (value) {
+        .map((row) => {
+        return row.map(value => {
             if (/["\n]/.test(value) || value.includes(delimiter)) {
-                return "\"".concat(value.replace(/"/g, '""'), "\"");
+                return `"${value.replace(/"/g, '""')}"`;
             }
             else {
                 return value;

package/lib/resources/diff-resource.js

@@ -1,13 +1,4 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceDiffType = void 0;
 exports.createDiff = createDiff;
@@ -18,39 +9,38 @@ var ResourceDiffType;
     ResourceDiffType["Modified"] = "~";
     ResourceDiffType["Unchanged"] = "=";
 })(ResourceDiffType || (exports.ResourceDiffType = ResourceDiffType = {}));
-var Matrix = /** @class */ (function () {
-    function Matrix(m, n) {
+class Matrix {
+    constructor(m, n) {
         this.values = Array(m * n).fill(0);
         this.m = m;
         this.n = n;
     }
-    Matrix.prototype.getValue = function (i, j) {
+    getValue(i, j) {
         return this.values[(i * this.n) + j];
-    };
-    Matrix.prototype.setValue = function (i, j, value) {
+    }
+    setValue(i, j, value) {
         this.values[(i * this.n) + j] = value;
-    };
-    return Matrix;
-}());
+    }
+}
 function LCS(X, Y) {
-    var m = X.length;
-    var n = Y.length;
+    const m = X.length;
+    const n = Y.length;
     // Build matrix
-    var C = new Matrix(m + 1, n + 1);
-    for (var i_1 = 0; i_1 < m; i_1++) {
-        for (var j_1 = 0; j_1 < n; j_1++) {
-            if (X[i_1] === Y[j_1]) {
-                C.setValue(i_1 + 1, j_1 + 1, C.getValue(i_1, j_1) + 1);
+    const C = new Matrix(m + 1, n + 1);
+    for (let i = 0; i < m; i++) {
+        for (let j = 0; j < n; j++) {
+            if (X[i] === Y[j]) {
+                C.setValue(i + 1, j + 1, C.getValue(i, j) + 1);
             }
             else {
-                C.setValue(i_1 + 1, j_1 + 1, Math.max(C.getValue(i_1, j_1 + 1), C.getValue(i_1 + 1, j_1)));
+                C.setValue(i + 1, j + 1, Math.max(C.getValue(i, j + 1), C.getValue(i + 1, j)));
             }
         }
     }
     // Backtrace
-    var diff = [];
-    var i = m;
-    var j = n;
+    const diff = [];
+    let i = m;
+    let j = n;
     while (i + j !== 0) {
         if (X[i - 1] === Y[j - 1]) {
             diff.unshift({
@@ -88,7 +78,7 @@ function tokenizeLines(text) {
 }
 function diffTokens(X, Y) {
     // Remove common prefix
-    var prefix = [];
+    const prefix = [];
     while (X.length && X[0] === Y[0]) {
         prefix.push({
             text: X[0],
@@ -98,7 +88,7 @@ function diffTokens(X, Y) {
         Y.shift();
     }
     // Remove common suffix
-    var suffix = [];
+    const suffix = [];
     while (X.length && X[X.length - 1] === Y[Y.length - 1]) {
         suffix.unshift({
             text: X[X.length - 1],
@@ -108,16 +98,19 @@ function diffTokens(X, Y) {
         Y.pop();
     }
     // Generate diff from remains, combine with prefix and suffix
-    return __spreadArray(__spreadArray(__spreadArray([], prefix, true), LCS(X, Y), true), suffix, true);
+    return [
+        ...prefix,
+        ...LCS(X, Y),
+        ...suffix
+    ];
 }
 function convertWordDiff(changes) {
     var _a, _b;
-    var lines = [];
-    var line = null;
-    var deletedNewlines = 0;
-    var nextLineNew = false;
-    for (var _i = 0, changes_1 = changes; _i < changes_1.length; _i++) {
-        var change = changes_1[_i];
+    const lines = [];
+    let line = null;
+    let deletedNewlines = 0;
+    let nextLineNew = false;
+    for (const change of changes) {
         // Start of line
         if (line === null) {
             deletedNewlines = 0;
@@ -169,35 +162,39 @@ function convertWordDiff(changes) {
     return lines;
 }
 function getWordTokensFromLines(lines) {
-    return lines.flatMap(function (change) { return tokenizeWords(change.text).concat('\n'); });
+    return lines.flatMap(change => tokenizeWords(change.text).concat('\n'));
+}
+function mergeDiffPart(diffPart) {
+    if (diffPart.added.length && diffPart.deleted.length) {
+        return convertWordDiff(diffTokens(getWordTokensFromLines(diffPart.added), getWordTokensFromLines(diffPart.deleted)));
+    }
+    else if (diffPart.added.length) {
+        return diffPart.added;
+    }
+    else if (diffPart.deleted.length) {
+        return diffPart.deleted.map(change => ({ text: undefined, original: change.text, type: change.type }));
+    }
+    else {
+        return [];
+    }
 }
 function createDiff(a, b) {
-    var lines = diffTokens(tokenizeLines(a.trimEnd()), tokenizeLines(b.trimEnd()));
-    var changes = [];
-    var diffPart = { added: [], deleted: [] };
-    for (var i = 0; i < lines.length; i++) {
+    const lines = diffTokens(tokenizeLines(a.trimEnd()), tokenizeLines(b.trimEnd()));
+    const changes = [];
+    const diffPart = { added: [], deleted: [] };
+    for (let i = 0; i < lines.length; i++) {
         if (lines[i].type === ResourceDiffType.Added) {
             diffPart.added.push(lines[i]);
-            continue;
         }
         else if (lines[i].type === ResourceDiffType.Deleted) {
             diffPart.deleted.push(lines[i]);
-            continue;
         }
-        if (diffPart.added.length && diffPart.deleted.length) {
-            changes.push.apply(changes, convertWordDiff(diffTokens(getWordTokensFromLines(diffPart.added), getWordTokensFromLines(diffPart.deleted))));
-            diffPart.added.length = 0;
-            diffPart.deleted.length = 0;
-        }
-        else if (diffPart.added.length) {
-            changes.push.apply(changes, diffPart.added);
+        else {
+            changes.push(...mergeDiffPart(diffPart), lines[i]);
             diffPart.added.length = 0;
-        }
-        else if (diffPart.deleted.length) {
-            changes.push.apply(changes, diffPart.deleted.map(function (change) { return ({ text: undefined, original: change.text, type: change.type }); }));
             diffPart.deleted.length = 0;
         }
-        changes.push(lines[i]);
     }
+    changes.push(...mergeDiffPart(diffPart));
     return changes;
 }

package/lib/resources/parse-name.d.ts

@@ -0,0 +1,6 @@
+export declare class RecoverableSyntaxError<Result> extends SyntaxError {
+    result: Result;
+    constructor(message: string, result: Result);
+}
+export declare const RANKS: Rank[];
+export declare function parseName(name: string, rank: Rank, parent: WorkingTaxon): WorkingTaxon;