@hestia-earth/api 0.19.1 → 0.19.3

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

@@ -2,7 +2,7 @@ import { BaseModel } from '../../db/model.base';
 import { User } from '../../users/model/model';
 export declare const mb = 1048576;
 export declare const sizeInMb: (size: number) => number;
-export declare const maxFileSizeMb = 50;
+export declare const maxFileSizeMb = 100;
 export declare const maxFileSize: number;
 export declare enum SupportedExtensions {
     xlsx = "xlsx",
@@ -12,6 +12,7 @@ export declare enum SupportedExtensions {
     draft = "txt",
     pdf = "pdf"
 }
+export declare const maxFileSizeByFile: (filename: string) => any;
 export declare const finalFormatExtensions: SupportedExtensions[];
 export declare enum HestiaExtensions {
     nodes = "hestia",
@@ -133,18 +134,20 @@ export declare const filepathSearch: (...parts: string[]) => {
     };
 };
 export declare const fileExt: (path: string) => string;
-export declare const fileToExt: (path: string, extension: string) => string;
+export declare const fileToExt: (path: string, extension?: string) => string;
 export declare const filenameWithoutExt: (filename?: string) => string;
 export declare const validPathChars = "A-Za-z\\d.\\-_";
-export declare const replaceInvalidChars: (value: string) => string;
+export declare const replaceInvalidChars: (value: string) => any;
 export declare const folderFromPath: (path: string) => string;
 export declare const rootFolderFromPath: (path: string) => string;
 export declare const filenameFromPath: (path: string) => string;
 export declare const analysesFolder = "analyses";
 export declare const glossaryFolder = "glossary";
+export declare const termFolder = "term";
 export declare const reconciliationFolder = "reconciliation";
 export declare const isReconciliation: (path: string) => boolean;
 export declare const isGlossary: (path: string) => boolean;
+export declare const isTerm: (path: string) => boolean;
 export declare const aggregationFolder = "aggregation";
 export declare const isAggregation: (path: string) => boolean;
 export declare const isFolderUpload: (path: string, termsOnly?: boolean) => boolean;

package/dist/files/model/model.js

@@ -23,14 +23,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canEditComment = exports.isDraft = exports.canFeedback = exports.canSubmit = exports.isValidated = exports.canValidate = exports.validatedStatuses = exports.canRemove = exports.isAssigned = exports.isAuthorized = exports.isOwner = exports.isFolderUpload = exports.isAggregation = exports.aggregationFolder = exports.isGlossary = exports.isReconciliation = exports.reconciliationFolder = exports.glossaryFolder = exports.analysesFolder = exports.filenameFromPath = exports.rootFolderFromPath = exports.folderFromPath = exports.replaceInvalidChars = exports.validPathChars = exports.filenameWithoutExt = exports.fileToExt = exports.fileExt = exports.filepathSearch = exports.filenameSearch = exports.File = exports.FilePipelineError = exports.FilePipelineProgress = exports.FilePipelineStatus = exports.FileError = exports.FileStatus = exports.FileProgress = exports.HestiaExtensions = exports.finalFormatExtensions = exports.SupportedExtensions = exports.maxFileSize = exports.maxFileSizeMb = exports.sizeInMb = exports.mb = void 0;
+exports.canEditComment = exports.isDraft = exports.canFeedback = exports.canSubmit = exports.isValidated = exports.canValidate = exports.validatedStatuses = exports.canRemove = exports.isAssigned = exports.isAuthorized = exports.isOwner = exports.isFolderUpload = exports.isAggregation = exports.aggregationFolder = exports.isTerm = exports.isGlossary = exports.isReconciliation = exports.reconciliationFolder = exports.termFolder = exports.glossaryFolder = exports.analysesFolder = exports.filenameFromPath = exports.rootFolderFromPath = exports.folderFromPath = exports.replaceInvalidChars = exports.validPathChars = exports.filenameWithoutExt = exports.fileToExt = exports.fileExt = exports.filepathSearch = exports.filenameSearch = exports.File = exports.FilePipelineError = exports.FilePipelineProgress = exports.FilePipelineStatus = exports.FileError = exports.FileStatus = exports.FileProgress = exports.HestiaExtensions = exports.finalFormatExtensions = exports.maxFileSizeByFile = exports.SupportedExtensions = exports.maxFileSize = exports.maxFileSizeMb = exports.sizeInMb = exports.mb = void 0;
 var model_base_1 = require("../../db/model.base");
 var model_1 = require("../../users/model/model");
 exports.mb = 1048576;
 var sizeInMb = function (size) { return Math.round((size / exports.mb) * 1000) / 1000; };
 exports.sizeInMb = sizeInMb;
-exports.maxFileSizeMb = 50;
+exports.maxFileSizeMb = 100;
 exports.maxFileSize = exports.maxFileSizeMb * exports.mb;
 var SupportedExtensions;
 (function (SupportedExtensions) {
@@ -41,6 +42,16 @@ var SupportedExtensions;
     SupportedExtensions["draft"] = "txt";
     SupportedExtensions["pdf"] = "pdf";
 })(SupportedExtensions = exports.SupportedExtensions || (exports.SupportedExtensions = {}));
+var maxFileSizeExt = (_a = {},
+    _a[SupportedExtensions.csv] = exports.maxFileSize,
+    _a[SupportedExtensions.xlsx] = exports.maxFileSize / 2,
+    _a[SupportedExtensions.xls] = exports.maxFileSize / 2,
+    _a[SupportedExtensions.draft] = exports.maxFileSize,
+    _a[SupportedExtensions.json] = exports.maxFileSize,
+    _a[SupportedExtensions.pdf] = exports.maxFileSize / 2,
+    _a);
+var maxFileSizeByFile = function (filename) { return maxFileSizeExt[(0, exports.fileExt)(filename).replace('.', '')]; };
+exports.maxFileSizeByFile = maxFileSizeByFile;
 exports.finalFormatExtensions = [
     SupportedExtensions.json,
     SupportedExtensions.csv
@@ -145,10 +156,17 @@ var filepathSearch = function () {
     return fileNoExtSearch.apply(void 0, __spreadArray(['filepath'], parts, false));
 };
 exports.filepathSearch = filepathSearch;
-var fileExt = function (path) { return path.split('.').pop(); };
+var fileExt = function (path) {
+    var paths = path === null || path === void 0 ? void 0 : path.split('.');
+    return paths.length > 1 ? paths.pop() : null;
+};
 exports.fileExt = fileExt;
 var fileToExt = function (path, extension) {
-    return [path.split('.')[0], extension.startsWith('.') ? extension.substring(1) : extension].join('.');
+    if (extension === void 0) { extension = ''; }
+    return [
+        path.replace((0, exports.fileExt)(path), '').replace(/^\./g, '').replace(/\.$/g, ''),
+        (extension || '').replace(/^\./g, '').replace(/\.$/g, '')
+    ].filter(Boolean).join('.');
 };
 exports.fileToExt = fileToExt;
 var filenameWithoutExt = function (filename) {
@@ -159,21 +177,26 @@ var filenameWithoutExt = function (filename) {
 exports.filenameWithoutExt = filenameWithoutExt;
 exports.validPathChars = 'A-Za-z\\d.\\-_';
 var replaceInvalidChars = function (value) {
-    return value
-        ? value
+    var folder = (0, exports.folderFromPath)(value);
+    var newFilename = value
+        ? (0, exports.filenameWithoutExt)(value)
             .replace(/\s/g, '_')
-            .replace(/\.$/g, '')
+            .replace(/[\.\_]$/g, '')
             .replace(new RegExp("[^".concat(exports.validPathChars, "]"), 'g'), '')
-            .replace(new RegExp("(\\.)[^(".concat(Object.values(SupportedExtensions).map(function (v) { return ".".concat(v); }).join('|'), ")]"), 'g'), function (v) { return v.replace('.', '_'); })
             .replace(/\^/g, '')
+            .replace(/\./g, '_')
         : null;
+    return newFilename
+        ? (value === null || value === void 0 ? void 0 : value.includes('.'))
+            ? [
+                (0, exports.replaceInvalidChars)(folder),
+                (0, exports.fileToExt)(newFilename, (0, exports.fileExt)(value))
+            ].filter(Boolean).join('/')
+            : newFilename
+        : value;
 };
 exports.replaceInvalidChars = replaceInvalidChars;
-var folderFromPath = function (path) {
-    var folders = path.split('/');
-    folders.pop();
-    return folders.join('/');
-};
+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;
@@ -181,12 +204,14 @@ var filenameFromPath = function (path) { return path.split('/').pop(); };
 exports.filenameFromPath = filenameFromPath;
 exports.analysesFolder = 'analyses';
 exports.glossaryFolder = 'glossary';
+exports.termFolder = 'term';
 exports.reconciliationFolder = 'reconciliation';
 var isReconciliation = function (path) { return (0, exports.rootFolderFromPath)(path) === exports.reconciliationFolder; };
 exports.isReconciliation = isReconciliation;
 var isGlossary = function (path) { return (0, exports.rootFolderFromPath)(path) === exports.glossaryFolder; };
 exports.isGlossary = isGlossary;
-var isTerm = function (path) { return (0, exports.rootFolderFromPath)(path) === 'term'; };
+var isTerm = function (path) { return (0, exports.rootFolderFromPath)(path) === exports.termFolder; };
+exports.isTerm = isTerm;
 exports.aggregationFolder = 'aggregation';
 var isAggregation = function (path) { return (0, exports.rootFolderFromPath)(path) === exports.aggregationFolder; };
 exports.isAggregation = isAggregation;
@@ -194,7 +219,7 @@ var isFolderUpload = function (path, termsOnly) {
     if (termsOnly === void 0) { termsOnly = false; }
     return __spreadArray([
         exports.isGlossary,
-        isTerm
+        exports.isTerm
     ], (termsOnly ? [] : [
         exports.isAggregation,
         exports.isReconciliation

package/dist/nodes/model/model.js

@@ -117,7 +117,7 @@ var formatForUpload = function (nodes, typeToId) {
                         : (0, exports.formatForUpload)([value], typeToId)[0]
                     : value;
                 return [key, newValue];
-            }))));
+            }))), true);
     });
 };
 exports.formatForUpload = formatForUpload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.19.1",
+  "version": "0.19.3",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -31,7 +31,7 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@hestia-earth/schema": ">=14.0.0",
-    "@hestia-earth/utils": ">=0.11.0"
+    "@hestia-earth/utils": ">=0.11.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^16.2.4",