@hestia-earth/api 0.25.45 → 0.25.47

package/dist/nodes/model/model.js

@@ -1,124 +1,88 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setPrivate = exports.formatForUpload = exports.parseLogMissingLookups = exports.paramToNodeType = exports.nodeTypeToParam = exports.pathWithState = exports.allowedDataStates = exports.dataStatesTypeMapping = exports.DataState = exports.blankNodeTypes = void 0;
-var schema_1 = require("@hestia-earth/schema");
-var utils_1 = require("@hestia-earth/utils");
-var model_1 = require("../../files/model/model");
-exports.blankNodeTypes = Object.values(schema_1.SchemaType).filter(function (t) { return !(0, schema_1.isTypeNode)(t); });
+const schema_1 = require("@hestia-earth/schema");
+const utils_1 = require("@hestia-earth/utils");
+const model_1 = require("../../files/model/model");
+exports.blankNodeTypes = Object.values(schema_1.SchemaType).filter(t => !(0, schema_1.isTypeNode)(t));
 var DataState;
 (function (DataState) {
     DataState["original"] = "original";
     DataState["recalculated"] = "recalculated";
-})(DataState = exports.DataState || (exports.DataState = {}));
-exports.dataStatesTypeMapping = (_a = {},
-    _a[DataState.original] = Object.values(schema_1.NodeType),
-    _a[DataState.recalculated] = [schema_1.NodeType.Cycle, schema_1.NodeType.ImpactAssessment, schema_1.NodeType.Site],
-    _a);
-var allowedDataStates = function (type) {
-    return Object.values(DataState).filter(function (dataState) { return exports.dataStatesTypeMapping[dataState].includes(type); });
+})(DataState || (exports.DataState = DataState = {}));
+exports.dataStatesTypeMapping = {
+    [DataState.original]: Object.values(schema_1.NodeType),
+    [DataState.recalculated]: [schema_1.NodeType.Cycle, schema_1.NodeType.ImpactAssessment, schema_1.NodeType.Site]
 };
+const allowedDataStates = (type) => Object.values(DataState).filter(dataState => exports.dataStatesTypeMapping[dataState].includes(type));
 exports.allowedDataStates = allowedDataStates;
-var pathWithState = function (type, id, dataState, strictDataState) {
-    if (dataState === void 0) { dataState = DataState.original; }
-    if (strictDataState === void 0) { strictDataState = false; }
-    var state = exports.dataStatesTypeMapping[dataState].includes(type) ? dataState : null;
+const pathWithState = (type, id, dataState = DataState.original, strictDataState = false) => {
+    const state = exports.dataStatesTypeMapping[dataState].includes(type) ? dataState : null;
     return state !== null || !strictDataState
         ? [state === DataState.original ? null : state, (0, schema_1.jsonldPath)(type, id)].filter(Boolean).join('/')
         : null;
 };
 exports.pathWithState = pathWithState;
-var nodeTypeToParam = function (type) { return "".concat((type || '').toLowerCase(), "s"); };
+const nodeTypeToParam = (type) => `${(type || '').toLowerCase()}s`;
 exports.nodeTypeToParam = nodeTypeToParam;
-var paramToNodeType = function (type) { return Object.values(schema_1.NodeType).find(function (v) { return (0, exports.nodeTypeToParam)(v) === type; }); };
+const paramToNodeType = (type) => Object.values(schema_1.NodeType).find(v => (0, exports.nodeTypeToParam)(v) === type);
 exports.paramToNodeType = paramToNodeType;
-var csvValue = function (value) { return (value || '').replace('[', '').replace(']', ''); };
-var parseMessage = function (message) {
+const csvValue = (value) => (value || '').replace('[', '').replace(']', '');
+const parseMessage = (message) => {
     try {
-        var data = JSON.parse(message);
-        return data.message.split(',').reduce(function (prev, parts) {
-            var _a;
-            var _b = parts.split('='), key = _b[0], value = _b[1];
-            var val = csvValue(value);
-            return __assign(__assign({}, prev), (key && val ? (_a = {}, _a[key.trim()] = val, _a) : {}));
+        const data = JSON.parse(message);
+        return data.message.split(',').reduce((prev, parts) => {
+            const [key, value] = parts.split('=');
+            const val = csvValue(value);
+            return {
+                ...prev,
+                ...(key && val ? { [key.trim()]: val } : {})
+            };
         }, { logger: data.logger });
     }
     catch (err) {
         return {};
     }
 };
-var termTypes = Object.values(schema_1.TermTermType);
-var parseFilename = function (filepath) {
-    var filename = filepath.split('.')[0];
-    var ext = termTypes.includes(filename) ? model_1.SupportedExtensions.xlsx : model_1.SupportedExtensions.csv;
+const termTypes = Object.values(schema_1.TermTermType);
+const parseFilename = (filepath) => {
+    const [filename] = filepath.split('.');
+    const ext = termTypes.includes(filename) ? model_1.SupportedExtensions.xlsx : model_1.SupportedExtensions.csv;
     return (0, model_1.fileToExt)(filename, ext);
 };
-var missingLookupPrefix = 'Missing lookup';
-var parseLookup = function (_a) {
-    var column = _a.column, termid = _a.termid, _b = missingLookupPrefix, missingLookup = _a[_b];
-    return ({
-        filename: parseFilename(missingLookup),
-        termId: termid,
-        column: column
-    });
-};
-var parseLogMissingLookups = function (data) {
-    var lines = data.split('\n').filter(function (log) { return log.includes(missingLookupPrefix); });
-    var messages = lines.map(parseMessage).filter(function (v) { return Object.keys(v).length > 1; });
+const missingLookupPrefix = 'Missing lookup';
+const parseLookup = ({ column, termid, [missingLookupPrefix]: missingLookup }) => ({
+    filename: parseFilename(missingLookup),
+    termId: termid,
+    column
+});
+const parseLogMissingLookups = (data) => {
+    const lines = data.split('\n').filter(log => log.includes(missingLookupPrefix));
+    const messages = lines.map(parseMessage).filter(v => Object.keys(v).length > 1);
     return (0, utils_1.unique)(messages.map(parseLookup));
 };
 exports.parseLogMissingLookups = parseLogMissingLookups;
-var mapTypeToId = function (nodes) {
-    return nodes.reduce(function (prev, _a) {
-        var type = _a["@type"], id = _a["@id"];
-        prev[type] = prev[type] || [];
-        prev[type].push(id);
-        return prev;
-    }, {});
-};
-var formatForUpload = function (nodes, typeToId) {
-    if (typeToId === void 0) { typeToId = mapTypeToId(nodes); }
-    return nodes.map(function (_a) {
-        var _b;
-        var type = _a["@type"], id = _a["@id"], node = __rest(_a, ['@type', '@id']);
-        return type === schema_1.NodeType.Term
-            ? { '@type': type, '@id': id }
-            : (0, utils_1.reduceUndefinedValues)(__assign(__assign({}, (!id || ((_b = typeToId[type]) !== null && _b !== void 0 ? _b : []).includes(id) ? { type: type, id: id } : { '@type': type, '@id': id })), Object.fromEntries(Object.entries(node).map(function (_a) {
-                var key = _a[0], value = _a[1];
-                var newValue = (0, schema_1.isExpandable)(value)
-                    ? Array.isArray(value)
-                        ? (0, exports.formatForUpload)(value, typeToId)
-                        : (0, exports.formatForUpload)([value], typeToId)[0]
-                    : value;
-                return [key, newValue];
-            }))), true);
-    });
-};
+const mapTypeToId = (nodes) => nodes.reduce((prev, { '@type': type, '@id': id }) => {
+    prev[type] = prev[type] || [];
+    prev[type].push(id);
+    return prev;
+}, {});
+const formatForUpload = (nodes, typeToId = mapTypeToId(nodes)) => nodes.map(({ '@type': type, '@id': id, ...node }) => type === schema_1.NodeType.Term
+    ? { '@type': type, '@id': id }
+    : (0, utils_1.reduceUndefinedValues)({
+        ...(!id || (typeToId[type] ?? []).includes(id) ? { type, id } : { '@type': type, '@id': id }),
+        ...Object.fromEntries(Object.entries(node).map(([key, value]) => {
+            const newValue = (0, schema_1.isExpandable)(value)
+                ? Array.isArray(value)
+                    ? (0, exports.formatForUpload)(value, typeToId)
+                    : (0, exports.formatForUpload)([value], typeToId)[0]
+                : value;
+            return [key, newValue];
+        }))
+    }, true));
 exports.formatForUpload = formatForUpload;
-var setPrivate = function (_a) {
-    var source = _a.source, defaultSource = _a.defaultSource, node = __rest(_a, ["source", "defaultSource"]);
-    return (__assign(__assign({}, node), { dataPrivate: true }));
-};
+const setPrivate = ({ source, defaultSource, ...node }) => ({
+    ...node,
+    dataPrivate: true
+});
 exports.setPrivate = setPrivate;

package/dist/reconciliations/model/model.js

@@ -1,22 +1,7 @@
 "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.Reconciliation = exports.ReconciliationLevel = exports.reconciliationsValidatePrivate = exports.reconciliationsValidateExpectedNodes = exports.reconciliationsValidateImpactAssessmentLinks = exports.reconciliationsValidateProductCorrespondence = exports.reconciliationsGetMainErrorMessage = void 0;
-var model_base_1 = require("../../db/model.base");
+const model_base_1 = require("../../db/model.base");
 var validations_1 = require("./validations");
 Object.defineProperty(exports, "reconciliationsGetMainErrorMessage", { enumerable: true, get: function () { return validations_1.getMainErrorMessage; } });
 Object.defineProperty(exports, "reconciliationsValidateProductCorrespondence", { enumerable: true, get: function () { return validations_1.validateProductCorrespondence; } });
@@ -28,12 +13,16 @@ var ReconciliationLevel;
     ReconciliationLevel["success"] = "success";
     ReconciliationLevel["warning"] = "warning";
     ReconciliationLevel["danger"] = "danger";
-})(ReconciliationLevel = exports.ReconciliationLevel || (exports.ReconciliationLevel = {}));
-var Reconciliation = (function (_super) {
-    __extends(Reconciliation, _super);
-    function Reconciliation() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return Reconciliation;
-}(model_base_1.BaseModel));
+})(ReconciliationLevel || (exports.ReconciliationLevel = ReconciliationLevel = {}));
+class Reconciliation extends model_base_1.BaseModel {
+    idExpected;
+    idRecalculated;
+    dataPrivate;
+    name;
+    level;
+    details;
+    error;
+    uploadStatus;
+    uploadPipelineStatus;
+}
 exports.Reconciliation = Reconciliation;

package/dist/reconciliations/model/validations.js

@@ -1,96 +1,70 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMainErrorMessage = exports.validateProductCorrespondence = exports.validatePrivate = exports.validateImpactAssessmentLinks = exports.validateExpectedNodes = exports.EXTRANEOUS = exports.notPrivateError = void 0;
-var schema_1 = require("@hestia-earth/schema");
+const schema_1 = require("@hestia-earth/schema");
 exports.notPrivateError = 'expected-not-private';
 exports.EXTRANEOUS = 'extraneous';
-var isExtraneousError = function (error) { var _a; return (_a = (typeof error === 'string' ? error : error === null || error === void 0 ? void 0 : error.message)) === null || _a === void 0 ? void 0 : _a.includes(exports.EXTRANEOUS); };
-var isNotPrivateError = function (error) { return (typeof error === 'string' ? error : error === null || error === void 0 ? void 0 : error.message) === exports.notPrivateError; };
-var getType = function (node) { return (node === null || node === void 0 ? void 0 : node['@type']) || (node === null || node === void 0 ? void 0 : node.type); };
-var getId = function (node) { return (node === null || node === void 0 ? void 0 : node['@id']) || (node === null || node === void 0 ? void 0 : node.id); };
-var filterByType = function (nodeType) { return function (node) { return getType(node) === nodeType; }; };
-var getErrorsFromValidationsObj = function (validations) {
-    return Object.entries(validations)
-        .filter(function (_a) {
-        var _errorMsg = _a[0], validationFailed = _a[1];
-        return !!validationFailed;
-    })
-        .map(function (_a) {
-        var errorMsg = _a[0];
-        return errorMsg;
+const isExtraneousError = (error) => (typeof error === 'string' ? error : error?.message)?.includes(exports.EXTRANEOUS);
+const isNotPrivateError = (error) => (typeof error === 'string' ? error : error?.message) === exports.notPrivateError;
+const getType = (node) => node?.['@type'] || node?.type;
+const getId = (node) => node?.['@id'] || node?.id;
+const filterByType = (nodeType) => (node) => getType(node) === nodeType;
+const getErrorsFromValidationsObj = validations => Object.entries(validations)
+    .filter(([_errorMsg, validationFailed]) => !!validationFailed)
+    .map(([errorMsg]) => errorMsg);
+const validateExpectedNodes = (nodes) => {
+    const cycles = nodes.filter(node => getType(node) === schema_1.NodeType.Cycle);
+    const sites = nodes.filter(node => getType(node) === schema_1.NodeType.Site);
+    const impactAssessments = nodes.filter(node => getType(node) === schema_1.NodeType.ImpactAssessment);
+    const cycleId = getId(cycles?.[0]);
+    const cycleSiteId = getId(cycles?.[0]?.site);
+    const siteId = getId(sites?.[0]);
+    return getErrorsFromValidationsObj({
+        ['More than one Cycle found in expected nodes']: cycles.length > 1,
+        ['No Cycle found in expected nodes']: cycles.length < 1,
+        ['Cycle missing name field in expected nodes']: cycles.length && !cycles[0].name,
+        ['More than one Site found in expected nodes']: sites.length > 1,
+        [`Cycle ${cycleId} is not linked to Site ${siteId} in expected nodes`]: cycleSiteId !== siteId,
+        ...impactAssessments.reduce((acc, ia) => {
+            acc[`ImpactAssessment ${getId(ia)} is not linked to Cycle ${cycleId} in expected nodes`] =
+                getId(ia?.cycle) !== cycleId;
+            return acc;
+        }, {})
     });
 };
-var validateExpectedNodes = function (nodes) {
-    var _a;
-    var _b;
-    var cycles = nodes.filter(function (node) { return getType(node) === schema_1.NodeType.Cycle; });
-    var sites = nodes.filter(function (node) { return getType(node) === schema_1.NodeType.Site; });
-    var impactAssessments = nodes.filter(function (node) { return getType(node) === schema_1.NodeType.ImpactAssessment; });
-    var cycleId = getId(cycles === null || cycles === void 0 ? void 0 : cycles[0]);
-    var cycleSiteId = getId((_b = cycles === null || cycles === void 0 ? void 0 : cycles[0]) === null || _b === void 0 ? void 0 : _b.site);
-    var siteId = getId(sites === null || sites === void 0 ? void 0 : sites[0]);
-    return getErrorsFromValidationsObj(__assign((_a = {}, _a['More than one Cycle found in expected nodes'] = cycles.length > 1, _a['No Cycle found in expected nodes'] = cycles.length < 1, _a['Cycle missing name field in expected nodes'] = cycles.length && !cycles[0].name, _a['More than one Site found in expected nodes'] = sites.length > 1, _a["Cycle ".concat(cycleId, " is not linked to Site ").concat(siteId, " in expected nodes")] = cycleSiteId !== siteId, _a), impactAssessments.reduce(function (acc, ia) {
-        acc["ImpactAssessment ".concat(getId(ia), " is not linked to Cycle ").concat(cycleId, " in expected nodes")] =
-            getId(ia === null || ia === void 0 ? void 0 : ia.cycle) !== cycleId;
-        return acc;
-    }, {})));
-};
 exports.validateExpectedNodes = validateExpectedNodes;
-var matchedProduct = function (impacts) { return function (product) {
-    return impacts.filter(function (ia) { return getId(product.term) === getId(ia.product.term); }).length > 1;
-}; };
-var validateImpactAssessmentLinks = function (nodes) {
-    var _a;
-    var _b, _c;
-    var impactAssessments = nodes.filter(filterByType(schema_1.NodeType.ImpactAssessment));
-    var cycle = nodes.find(filterByType(schema_1.NodeType.Cycle));
-    var cycleId = getId(cycle);
-    return getErrorsFromValidationsObj((_a = {},
-        _a["Cycle ".concat(cycleId, " has no associated impact assessment")] = !impactAssessments.length,
-        _a["Cycle ".concat(cycleId, " has no products")] = !((_b = cycle.products) === null || _b === void 0 ? void 0 : _b.length),
-        _a["Cycle ".concat(cycleId, " has a product with more than one linked impact assessment")] = (_c = cycle.products) === null || _c === void 0 ? void 0 : _c.some(matchedProduct(impactAssessments)),
-        _a));
+const matchedProduct = (impacts) => (product) => impacts.filter(ia => getId(product.term) === getId(ia.product.term)).length > 1;
+const validateImpactAssessmentLinks = (nodes) => {
+    const impactAssessments = nodes.filter(filterByType(schema_1.NodeType.ImpactAssessment));
+    const cycle = nodes.find(filterByType(schema_1.NodeType.Cycle));
+    const cycleId = getId(cycle);
+    return getErrorsFromValidationsObj({
+        [`Cycle ${cycleId} has no associated impact assessment`]: !impactAssessments.length,
+        [`Cycle ${cycleId} has no products`]: !cycle.products?.length,
+        [`Cycle ${cycleId} has a product with more than one linked impact assessment`]: cycle.products?.some(matchedProduct(impactAssessments))
+    });
 };
 exports.validateImpactAssessmentLinks = validateImpactAssessmentLinks;
-var validatePrivate = function (cycle) {
-    var _a;
-    return getErrorsFromValidationsObj((_a = {}, _a[exports.notPrivateError] = !cycle.dataPrivate, _a));
-};
+const validatePrivate = (cycle) => getErrorsFromValidationsObj({ [exports.notPrivateError]: !cycle.dataPrivate });
 exports.validatePrivate = validatePrivate;
-var validateProductCorrespondence = function (expectedProducts, recalculatedProducts, idRecalculated) {
-    var missingProducts = expectedProducts.filter(function (pExpected) { return !recalculatedProducts.some(function (pRecalculated) { return getId(pRecalculated) === getId(pExpected); }); });
-    var extraneousProducts = recalculatedProducts.filter(function (pRecalculated) { return !expectedProducts.some(function (pExpected) { return getId(pRecalculated) === getId(pExpected); }); });
+const validateProductCorrespondence = (expectedProducts, recalculatedProducts, idRecalculated) => {
+    const missingProducts = expectedProducts.filter(pExpected => !recalculatedProducts.some(pRecalculated => getId(pRecalculated) === getId(pExpected)));
+    const extraneousProducts = recalculatedProducts.filter(pRecalculated => !expectedProducts.some(pExpected => getId(pRecalculated) === getId(pExpected)));
     return [
         [missingProducts, 'missing'],
         [extraneousProducts, exports.EXTRANEOUS]
     ]
-        .map(function (_a) {
-        var products = _a[0], errorType = _a[1];
-        return products.length
-            ? "Cycle ".concat(idRecalculated, " has ").concat(errorType, " impact assessment for products: ").concat(products
-                .map(function (p) { return p['@id']; })
-                .join(', '))
-            : null;
-    })
+        .map(([products, errorType]) => products.length
+        ? `Cycle ${idRecalculated} has ${errorType} impact assessment for products: ${products
+            .map(p => p['@id'])
+            .join(', ')}`
+        : null)
         .filter(Boolean);
 };
 exports.validateProductCorrespondence = validateProductCorrespondence;
-var getMainErrorMessage = function (errors) {
-    return (errors === null || errors === void 0 ? void 0 : errors.length) === 1 && isExtraneousError(errors[0])
-        ? 'recalculation-error'
-        : errors.some(isNotPrivateError)
-            ? exports.notPrivateError
-            : 'invalid-nodes';
-};
+const getMainErrorMessage = errors => errors?.length === 1 && isExtraneousError(errors[0])
+    ? 'recalculation-error'
+    : errors.some(isNotPrivateError)
+        ? exports.notPrivateError
+        : 'invalid-nodes';
 exports.getMainErrorMessage = getMainErrorMessage;

package/dist/settings/model/model.js

@@ -1,22 +1,7 @@
 "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.Setting = exports.SettingKey = exports.cacheKey = void 0;
-var model_base_1 = require("../../db/model.base");
+const model_base_1 = require("../../db/model.base");
 exports.cacheKey = 'settings';
 var SettingKey;
 (function (SettingKey) {
@@ -28,12 +13,10 @@ var SettingKey;
     SettingKey["calculationEngine"] = "calculationEngine";
     SettingKey["users"] = "users";
     SettingKey["dataReleases"] = "dataReleases";
-})(SettingKey = exports.SettingKey || (exports.SettingKey = {}));
-var Setting = (function (_super) {
-    __extends(Setting, _super);
-    function Setting() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return Setting;
-}(model_base_1.BaseModel));
+})(SettingKey || (exports.SettingKey = SettingKey = {}));
+class Setting extends model_base_1.BaseModel {
+    key;
+    value;
+    metadata;
+}
 exports.Setting = Setting;

package/dist/users/model/model.d.ts

@@ -59,10 +59,10 @@ export declare class User extends BaseModel {
     readonly actorId?: string;
 }
 export declare const name: ({ firstName, lastName }: Partial<User>) => string;
-export declare const isAdmin: (user?: Pick<User, 'role'>) => boolean;
-export declare const isReviewer: (user?: Pick<User, 'role'>) => boolean;
-export declare const isDeveloper: (user?: Pick<User, 'role'>) => boolean;
-export declare const hasPermission: (permission: UserPermission, user?: Pick<User, 'role' | 'permissions'>) => boolean;
+export declare const isAdmin: (user?: Pick<User, "role">) => boolean;
+export declare const isReviewer: (user?: Pick<User, "role">) => boolean;
+export declare const isDeveloper: (user?: Pick<User, "role">) => boolean;
+export declare const hasPermission: (permission: UserPermission, user?: Pick<User, "role" | "permissions">) => boolean;
 export declare const contains: (users: Partial<User>[], user: Partial<User>) => boolean;
 export declare const actorId: (user: Partial<User>) => string;
 export declare const userToActor: (user: Partial<User>, domain?: string) => Partial<IActorJSONLD>;

package/dist/users/model/model.js

@@ -1,47 +1,21 @@
 "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 __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.userToActor = exports.actorId = exports.contains = exports.hasPermission = exports.isDeveloper = exports.isReviewer = exports.isAdmin = exports.name = exports.User = exports.UserPermission = exports.UserRole = exports.MaxUploads = exports.defaultMaxApiCalls = void 0;
-var schema_1 = require("@hestia-earth/schema");
-var model_base_1 = require("../../db/model.base");
+const schema_1 = require("@hestia-earth/schema");
+const model_base_1 = require("../../db/model.base");
 exports.defaultMaxApiCalls = 100;
 var MaxUploads;
 (function (MaxUploads) {
     MaxUploads[MaxUploads["New"] = 1] = "New";
     MaxUploads[MaxUploads["Confirmed"] = 10] = "Confirmed";
-})(MaxUploads = exports.MaxUploads || (exports.MaxUploads = {}));
+})(MaxUploads || (exports.MaxUploads = MaxUploads = {}));
 var UserRole;
 (function (UserRole) {
     UserRole["Researcher"] = "default";
     UserRole["Developer"] = "developer";
     UserRole["Reviewer"] = "reviewer";
     UserRole["Admin"] = "admin";
-})(UserRole = exports.UserRole || (exports.UserRole = {}));
+})(UserRole || (exports.UserRole = UserRole = {}));
 var UserPermission;
 (function (UserPermission) {
     UserPermission["aggregationsCreate"] = "aggregations-create";
@@ -53,59 +27,79 @@ var UserPermission;
     UserPermission["reconciliationsRead"] = "reconciliations-view";
     UserPermission["reconciliationsUpdate"] = "reconciliations-update";
     UserPermission["reconciliationsDelete"] = "reconciliations-delete";
-})(UserPermission = exports.UserPermission || (exports.UserPermission = {}));
-var User = (function (_super) {
-    __extends(User, _super);
-    function User() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.role = UserRole.Researcher;
-        _this.maxUploads = MaxUploads.New;
-        _this.maxApiCalls = exports.defaultMaxApiCalls;
-        _this.dataPrivate = false;
-        _this.validFilesCount = 0;
-        _this.canCommitHestiaData = false;
-        _this.permissions = [];
-        _this.emailNotificationsSuccess = false;
-        _this.emailNotificationsFailure = false;
-        _this.emailNotificationsFeedback = false;
-        _this.autoSubmitPrivateSubmissions = false;
-        _this.metadata = {};
-        return _this;
-    }
-    return User;
-}(model_base_1.BaseModel));
+})(UserPermission || (exports.UserPermission = UserPermission = {}));
+class User extends model_base_1.BaseModel {
+    email;
+    firstName;
+    lastName;
+    displayName;
+    password;
+    token;
+    role = UserRole.Researcher;
+    maxUploads = MaxUploads.New;
+    maxApiCalls = exports.defaultMaxApiCalls;
+    dataPrivate = false;
+    validFilesCount = 0;
+    canCommitHestiaData = false;
+    permissions = [];
+    emailNotificationsSuccess = false;
+    emailNotificationsFailure = false;
+    emailNotificationsFeedback = false;
+    autoSubmitPrivateSubmissions = false;
+    confirmToken;
+    confirmedAt;
+    lastActiveAt;
+    scopusID;
+    googleID;
+    linkedInID;
+    gitlabID;
+    gitlabUsername;
+    orcid;
+    website;
+    city;
+    country;
+    primaryInstitution;
+    metadata = {};
+    admin;
+    name;
+    actorId;
+}
 exports.User = User;
-var name = function (_a) {
-    var firstName = _a.firstName, lastName = _a.lastName;
-    return [firstName, lastName].filter(Boolean).join(' ');
-};
+const name = ({ firstName, lastName }) => [firstName, lastName].filter(Boolean).join(' ');
 exports.name = name;
-var isAdmin = function (user) { return (user === null || user === void 0 ? void 0 : user.role) === UserRole.Admin; };
+const isAdmin = (user) => user?.role === UserRole.Admin;
 exports.isAdmin = isAdmin;
-var isReviewer = function (user) { return [UserRole.Reviewer, UserRole.Admin].includes(user === null || user === void 0 ? void 0 : user.role); };
+const isReviewer = (user) => [UserRole.Reviewer, UserRole.Admin].includes(user?.role);
 exports.isReviewer = isReviewer;
-var isDeveloper = function (user) {
-    return [UserRole.Developer, UserRole.Reviewer, UserRole.Admin].includes(user === null || user === void 0 ? void 0 : user.role);
-};
+const isDeveloper = (user) => [UserRole.Developer, UserRole.Reviewer, UserRole.Admin].includes(user?.role);
 exports.isDeveloper = isDeveloper;
-var hasPermission = function (permission, user) { var _a; return (0, exports.isAdmin)(user) || ((_a = user === null || user === void 0 ? void 0 : user.permissions) !== null && _a !== void 0 ? _a : []).includes(permission); };
+const hasPermission = (permission, user) => (0, exports.isAdmin)(user) || (user?.permissions ?? []).includes(permission);
 exports.hasPermission = hasPermission;
-var contains = function (users, user) { return users.some(function (u) { return u.email === user.email; }); };
+const contains = (users, user) => users.some(u => u.email === user.email);
 exports.contains = contains;
-var actorId = function (user) { return "".concat((user._id || user.id).toString()); };
+const actorId = (user) => `${(user._id || user.id).toString()}`;
 exports.actorId = actorId;
-var jsonLDContext = function (type, domain) { return "".concat(domain, "/schema/").concat(type, ".jsonld"); };
-var addIfDefined = function (key, value) {
-    var _a;
-    return (!!value ? (_a = {}, _a[key] = value, _a) : {});
-};
-var profileData = function (user) {
-    return user.dataPrivate
-        ? {}
-        : __assign(__assign(__assign(__assign(__assign(__assign({ email: user.email, firstName: user.firstName, lastName: user.lastName, name: user.displayName || (0, exports.name)(user) }, addIfDefined('scopusID', user.scopusID)), addIfDefined('orcid', user.orcid)), addIfDefined('primaryInstitution', user.primaryInstitution)), addIfDefined('city', user.city)), addIfDefined('country', user.country ? { type: schema_1.NodeType.Term, name: user.country } : undefined)), addIfDefined('website', user.website ? { '@id': user.website } : undefined));
-};
-var userToActor = function (user, domain) {
-    if (domain === void 0) { domain = 'https://hestia.earth'; }
-    return (__assign({ '@context': jsonLDContext(schema_1.NodeType.Actor, domain), '@type': schema_1.NodeType.Actor, '@id': (0, exports.actorId)(user), dataPrivate: false }, profileData(user)));
-};
+const jsonLDContext = (type, domain) => `${domain}/schema/${type}.jsonld`;
+const addIfDefined = (key, value) => (!!value ? { [key]: value } : {});
+const profileData = (user) => user.dataPrivate
+    ? {}
+    : {
+        email: user.email,
+        firstName: user.firstName,
+        lastName: user.lastName,
+        name: user.displayName || (0, exports.name)(user),
+        ...addIfDefined('scopusID', user.scopusID),
+        ...addIfDefined('orcid', user.orcid),
+        ...addIfDefined('primaryInstitution', user.primaryInstitution),
+        ...addIfDefined('city', user.city),
+        ...addIfDefined('country', user.country ? { type: schema_1.NodeType.Term, name: user.country } : undefined),
+        ...addIfDefined('website', user.website ? { '@id': user.website } : undefined)
+    };
+const userToActor = (user, domain = 'https://hestia.earth') => ({
+    '@context': jsonLDContext(schema_1.NodeType.Actor, domain),
+    '@type': schema_1.NodeType.Actor,
+    '@id': (0, exports.actorId)(user),
+    dataPrivate: false,
+    ...profileData(user)
+});
 exports.userToActor = userToActor;