@hestia-earth/api 0.21.13 → 0.22.0

package/dist/earth-engine/model/model.d.ts

@@ -5,31 +5,28 @@ export declare enum EarthEngineCallType {
 }
 export declare enum EarthEngineType {
     raster = "raster",
-    raster_by_period = "raster_by_period",
     vector = "vector"
 }
 export interface IEarthEngineParams {
-    collection: string;
     ee_type: EarthEngineType;
+    collection: string;
+    band_name?: string;
     fields?: string;
     reducer?: string;
-    scale?: number;
+    reducer_by_period?: string;
     year?: number;
     start_date?: string;
     end_date?: string;
-    band_name?: string;
     force?: boolean;
 }
 export interface IEarthEngineParamsBoundary extends IEarthEngineParams {
     boundary: any;
-    max_area?: number;
 }
 export interface IEarthEngineParamsCoordinates extends IEarthEngineParams {
     latitude: number;
     longitude: number;
 }
 export interface IEarthEngineParamsGadm extends IEarthEngineParams {
-    gadm_id?: string;
-    max_area?: number;
+    'gadm-ids': string[];
 }
 export type earthEngineParams = IEarthEngineParamsBoundary | IEarthEngineParamsCoordinates | IEarthEngineParamsGadm;

package/dist/earth-engine/model/model.js

@@ -10,6 +10,5 @@ var EarthEngineCallType;
 var EarthEngineType;
 (function (EarthEngineType) {
     EarthEngineType["raster"] = "raster";
-    EarthEngineType["raster_by_period"] = "raster_by_period";
     EarthEngineType["vector"] = "vector";
 })(EarthEngineType = exports.EarthEngineType || (exports.EarthEngineType = {}));

package/dist/files/model/model.d.ts

@@ -32,6 +32,7 @@ export declare enum FileProgress {
     validateHestia = "validateHestia",
     validateData = "validateData",
     copyHestia = "copyHestia",
+    processJson = "processJson",
     indexJson = "indexJson"
 }
 export declare enum FileStatus {
@@ -44,6 +45,7 @@ export declare enum FileStatus {
     validateHestiaDone = "validateHestiaDone",
     validateDataDone = "validateDataDone",
     copyHestiaDone = "copyHestiaDone",
+    processJsonDone = "processJsonDone",
     indexJsonDone = "indexJsonDone"
 }
 export declare enum FileError {
@@ -56,6 +58,7 @@ export declare enum FileError {
     validateHestiaError = "validateHestiaError",
     validateDataError = "validateDataError",
     copyHestiaError = "copyHestiaError",
+    processJsonError = "processJsonError",
     indexJsonError = "indexJsonError"
 }
 export type status = FileStatus | FileProgress | FileError;

package/dist/files/model/model.js

@@ -52,10 +52,7 @@ var maxFileSizeExt = (_a = {},
     _a);
 var maxFileSizeByFile = function (filename) { return maxFileSizeExt[(0, exports.fileExt)(filename).replace('.', '')]; };
 exports.maxFileSizeByFile = maxFileSizeByFile;
-exports.finalFormatExtensions = [
-    SupportedExtensions.json,
-    SupportedExtensions.csv
-];
+exports.finalFormatExtensions = [SupportedExtensions.json, SupportedExtensions.csv];
 var HestiaExtensions;
 (function (HestiaExtensions) {
     HestiaExtensions["nodes"] = "hestia";
@@ -76,6 +73,7 @@ var FileProgress;
     FileProgress["validateHestia"] = "validateHestia";
     FileProgress["validateData"] = "validateData";
     FileProgress["copyHestia"] = "copyHestia";
+    FileProgress["processJson"] = "processJson";
     FileProgress["indexJson"] = "indexJson";
 })(FileProgress = exports.FileProgress || (exports.FileProgress = {}));
 var FileStatus;
@@ -89,6 +87,7 @@ var FileStatus;
     FileStatus["validateHestiaDone"] = "validateHestiaDone";
     FileStatus["validateDataDone"] = "validateDataDone";
     FileStatus["copyHestiaDone"] = "copyHestiaDone";
+    FileStatus["processJsonDone"] = "processJsonDone";
     FileStatus["indexJsonDone"] = "indexJsonDone";
 })(FileStatus = exports.FileStatus || (exports.FileStatus = {}));
 var FileError;
@@ -102,6 +101,7 @@ var FileError;
     FileError["validateHestiaError"] = "validateHestiaError";
     FileError["validateDataError"] = "validateDataError";
     FileError["copyHestiaError"] = "copyHestiaError";
+    FileError["processJsonError"] = "processJsonError";
     FileError["indexJsonError"] = "indexJsonError";
 })(FileError = exports.FileError || (exports.FileError = {}));
 var FilePipelineStatus;
@@ -165,9 +165,14 @@ exports.fileExt = fileExt;
 var fileToExt = function (path, extension) {
     if (extension === void 0) { extension = ''; }
     return [
-        path.replace(".".concat((0, exports.fileExt)(path)), '').replace(/^\./g, '').replace(/\.$/g, ''),
+        path
+            .replace(".".concat((0, exports.fileExt)(path)), '')
+            .replace(/^\./g, '')
+            .replace(/\.$/g, ''),
         (extension || '').replace(/[.]/g, '')
-    ].filter(Boolean).join('.');
+    ]
+        .filter(Boolean)
+        .join('.');
 };
 exports.fileToExt = fileToExt;
 var filenameWithoutExt = function (filepath) {
@@ -184,27 +189,24 @@ var replaceInvalidChars = function (value) {
         ? (0, exports.filenameWithoutExt)(value)
             .replace(/(\.|\_)$/g, '')
             .replace(new RegExp("[^".concat(exports.validPathChars, "]"), 'g'), '_')
-            .replace(new RegExp(Object.values(SupportedExtensions).map(function (v) { return "(_".concat(v, ")"); }).join('|'), 'g'), '')
+            .replace(new RegExp(Object.values(SupportedExtensions)
+            .map(function (v) { return "(_".concat(v, ")"); })
+            .join('|'), 'g'), '')
             .replace(/[\_]{2,}/g, '_')
             .replace(/(\.|\_)$/g, '')
         : null;
     return newFilename
         ? (value === null || value === void 0 ? void 0 : value.includes('.'))
-            ? [
-                (0, exports.normalizeFolder)(folder),
-                (0, exports.fileToExt)(newFilename, (0, exports.fileExt)(value))
-            ].filter(Boolean).join('/')
+            ? [(0, exports.normalizeFolder)(folder), (0, exports.fileToExt)(newFilename, (0, exports.fileExt)(value))].filter(Boolean).join('/')
             : newFilename
         : value;
 };
 exports.replaceInvalidChars = replaceInvalidChars;
 var normalizeFolder = function (folder) {
-    return folder
-        .replace(new RegExp("[^".concat(exports.validPathChars, "]"), 'g'), '_')
-        .replace(/[\_]{2,}/g, '_');
+    return folder.replace(new RegExp("[^".concat(exports.validPathChars, "]"), 'g'), '_').replace(/[\_]{2,}/g, '_');
 };
 exports.normalizeFolder = normalizeFolder;
-var folderFromPath = function (path) { return (path === null || path === void 0 ? void 0 : path.includes('.')) ? path.split('/').slice(0, -1).join('/') : path; };
+var folderFromPath = function (path) { return ((path === null || path === void 0 ? void 0 : path.includes('.')) ? path.split('/').slice(0, -1).join('/') : path); };
 exports.folderFromPath = folderFromPath;
 var rootFolderFromPath = function (path) { return path.split('/')[0]; };
 exports.rootFolderFromPath = rootFolderFromPath;
@@ -225,16 +227,10 @@ var isAggregation = function (path) { return (0, exports.rootFolderFromPath)(pat
 exports.isAggregation = isAggregation;
 var isFolderUpload = function (path, termsOnly) {
     if (termsOnly === void 0) { termsOnly = false; }
-    return __spreadArray([
-        exports.isGlossary,
-        exports.isTerm
-    ], (termsOnly ? [] : [
-        exports.isAggregation,
-        exports.isReconciliation
-    ]), true).some(function (f) { return f(path); });
+    return __spreadArray([exports.isGlossary, exports.isTerm], (termsOnly ? [] : [exports.isAggregation, exports.isReconciliation]), true).some(function (f) { return f(path); });
 };
 exports.isFolderUpload = isFolderUpload;
-var asString = function (v) { var _a, _b; return typeof v === 'object' ? ((_a = v === null || v === void 0 ? void 0 : v._id) === null || _a === void 0 ? void 0 : _a.toString()) || ((_b = v === null || v === void 0 ? void 0 : v.id) === null || _b === void 0 ? void 0 : _b.toString()) : v === null || v === void 0 ? void 0 : v.toString(); };
+var asString = function (v) { var _a, _b; return (typeof v === 'object' ? ((_a = v === null || v === void 0 ? void 0 : v._id) === null || _a === void 0 ? void 0 : _a.toString()) || ((_b = v === null || v === void 0 ? void 0 : v.id) === null || _b === void 0 ? void 0 : _b.toString()) : v === null || v === void 0 ? void 0 : v.toString()); };
 var isOwner = function (file, user) { return asString(file === null || file === void 0 ? void 0 : file.user) === asString(user); };
 exports.isOwner = isOwner;
 var isAuthorized = function (_a, user) {
@@ -247,21 +243,10 @@ var isAssigned = function (_a, user) {
     return (assignedUsers || []).map(asString).includes(asString(user));
 };
 exports.isAssigned = isAssigned;
-var canRemove = function (file, user) {
-    return (0, model_1.isAdmin)(user) ||
-        !(0, exports.isValidated)(file) ||
-        file.isPrivate;
-};
+var canRemove = function (file, user) { return (0, model_1.isAdmin)(user) || !(0, exports.isValidated)(file) || file.isPrivate; };
 exports.canRemove = canRemove;
-var validateStatuses = [
-    FileStatus.validateDataDone,
-    FileStatus.indexJsonDone,
-    FileError.indexJsonError
-];
-exports.validatedStatuses = [
-    FileStatus.indexJsonDone,
-    FileStatus.copyHestiaDone
-];
+var validateStatuses = [FileStatus.validateDataDone, FileStatus.indexJsonDone, FileError.indexJsonError];
+exports.validatedStatuses = [FileStatus.copyHestiaDone, FileStatus.processJsonDone, FileStatus.indexJsonDone];
 var canValidate = function (_a, user) {
     var status = _a.status, isPrivate = _a.isPrivate, archived = _a.archived;
     return !archived && validateStatuses.includes(status) && (isPrivate || (0, model_1.isReviewer)(user));
@@ -269,17 +254,15 @@ var canValidate = function (_a, user) {
 exports.canValidate = canValidate;
 var isValidated = function (_a) {
     var validatedAt = _a.validatedAt, status = _a.status;
-    return !!validatedAt ||
-        exports.validatedStatuses.includes(status);
+    return !!validatedAt || exports.validatedStatuses.includes(status);
 };
 exports.isValidated = isValidated;
-var submitStatuses = [
-    FileStatus.validateDataDone
-];
+var submitStatuses = [FileStatus.validateDataDone];
 var canSubmit = function (file, user) {
     return !file.archived &&
         submitStatuses.includes(file.status) &&
-        !file.userValidatedAt && ((0, exports.isOwner)(file, user) || (0, exports.isAuthorized)(file, user));
+        !file.userValidatedAt &&
+        ((0, exports.isOwner)(file, user) || (0, exports.isAuthorized)(file, user));
 };
 exports.canSubmit = canSubmit;
 var feedbackStatuses = [

package/dist/nodes/model/model.js

@@ -37,11 +37,7 @@ var DataState;
 })(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[DataState.recalculated] = [schema_1.NodeType.Cycle, schema_1.NodeType.ImpactAssessment, schema_1.NodeType.Site],
     _a[DataState.aggregated] = [],
     _a);
 var allowedDataStates = function (type) {
@@ -52,10 +48,9 @@ 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;
-    return (state !== null || !strictDataState) ? [
-        state === DataState.original ? null : state,
-        (0, schema_1.jsonldPath)(type, id)
-    ].filter(Boolean).join('/') : 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"); };
@@ -87,7 +82,8 @@ 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,
+        filename: parseFilename(missingLookup),
+        termId: termid,
         column: column
     });
 };
@@ -97,12 +93,14 @@ var parseLogMissingLookups = function (data) {
     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 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, schemas) {
     if (typeToId === void 0) { typeToId = mapTypeToId(nodes); }
     if (schemas === void 0) { schemas = (0, json_schema_1.loadSchemas)(); }
@@ -111,11 +109,13 @@ var formatForUpload = function (nodes, typeToId, schemas) {
         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).filter(function (_a) {
+            : (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)
+                .filter(function (_a) {
                 var _b, _c, _d;
                 var key = _a[0];
                 return !((_d = (_c = (_b = schemas === null || schemas === void 0 ? void 0 : schemas[type]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.internal);
-            }).map(function (_a) {
+            })
+                .map(function (_a) {
                 var key = _a[0], value = _a[1];
                 var newValue = (0, schema_1.isExpandable)(value)
                     ? Array.isArray(value)

package/dist/reconciliations/model/validations.js

@@ -78,7 +78,9 @@ var validateProductCorrespondence = function (expectedProducts, recalculatedProd
         .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(', '))
+            ? "Cycle ".concat(idRecalculated, " has ").concat(errorType, " impact assessment for products: ").concat(products
+                .map(function (p) { return p['@id']; })
+                .join(', '))
             : null;
     })
         .filter(Boolean);

package/dist/users/model/model.js

@@ -64,19 +64,12 @@ var isAdmin = function (_a) {
 exports.isAdmin = isAdmin;
 var isReviewer = function (_a) {
     var role = _a.role;
-    return [
-        UserRole.Reviewer,
-        UserRole.Admin
-    ].includes(role);
+    return [UserRole.Reviewer, UserRole.Admin].includes(role);
 };
 exports.isReviewer = isReviewer;
 var isDeveloper = function (_a) {
     var role = _a.role;
-    return [
-        UserRole.Developer,
-        UserRole.Reviewer,
-        UserRole.Admin
-    ].includes(role);
+    return [UserRole.Developer, UserRole.Reviewer, UserRole.Admin].includes(role);
 };
 exports.isDeveloper = isDeveloper;
 var contains = function (users, user) { return users.some(function (u) { return u.email === user.email; }); };
@@ -86,9 +79,13 @@ 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) : {};
+    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 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: user.dataPrivate }, profileData(user)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.21.13",
+  "version": "0.22.0",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -39,7 +39,7 @@
     "@commitlint/cli": "^16.2.4",
     "@commitlint/config-conventional": "^16.2.4",
     "@elastic/elasticsearch": "7.13.0",
-    "@hestia-earth/eslint-config": "^0.0.5",
+    "@hestia-earth/eslint-config": "^0.1.0",
     "@hestia-earth/schema-convert": "^21.0.0",
     "@hestia-earth/schema-validation": "^21.0.0",
     "@mendeley/api": "^10.0.2",
@@ -100,6 +100,7 @@
     "passport": "^0.4.1",
     "passport-google-oauth20": "^2.0.0",
     "passport-orcid": "0.0.4",
+    "prettier": "^3.0.3",
     "python-shell": "^2.0.3",
     "redis": "^3.1.2",
     "request": "^2.88.2",
@@ -121,5 +122,6 @@
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
-  }
+  },
+  "prettier": "@hestia-earth/eslint-config/prettier.json"
 }