@hestia-earth/api 0.21.0 → 0.21.2

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

@@ -137,8 +137,9 @@ 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 filenameWithoutExt: (filename?: string) => string;
-export declare const validPathChars = "A-Za-z\\d.\\-_";
-export declare const replaceInvalidChars: (value: string) => any;
+export declare const validPathChars = "A-Za-z\\d\\-_";
+export declare const replaceInvalidChars: (value: string) => string;
+export declare const normalizeFolder: (folder: string) => string;
 export declare const folderFromPath: (path: string) => string;
 export declare const rootFolderFromPath: (path: string) => string;
 export declare const filenameFromPath: (path: string) => string;

package/dist/files/model/model.js

@@ -25,7 +25,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 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.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;
+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.normalizeFolder = 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;
@@ -175,29 +175,33 @@ var filenameWithoutExt = function (filename) {
     return file.endsWith('.') ? file.substring(0, file.length - 1) : file;
 };
 exports.filenameWithoutExt = filenameWithoutExt;
-exports.validPathChars = 'A-Za-z\\d.\\-_';
+exports.validPathChars = 'A-Za-z\\d\\-_';
 var replaceInvalidChars = function (value) {
     var folder = (0, exports.folderFromPath)(value);
     var newFilename = value
         ? (0, exports.filenameWithoutExt)(value)
-            .replace(/\s/g, '_')
-            .replace(/[\.\_]$/g, '')
-            .replace(new RegExp("[^".concat(exports.validPathChars, "]"), 'g'), '')
-            .replace(/\^/g, '')
-            .replace(/\./g, '_')
+            .replace(/(\.|\_)$/g, '')
+            .replace(new RegExp("[^".concat(exports.validPathChars, "]"), 'g'), '_')
             .replace(new RegExp(Object.values(SupportedExtensions).map(function (v) { return "(_".concat(v, ")"); }).join('|'), 'g'), '')
-            .replace(/_$/g, '')
+            .replace(/[\_]{2,}/g, '_')
+            .replace(/(\.|\_)$/g, '')
         : null;
     return newFilename
         ? (value === null || value === void 0 ? void 0 : value.includes('.'))
             ? [
-                (0, exports.replaceInvalidChars)(folder),
+                (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, '_');
+};
+exports.normalizeFolder = normalizeFolder;
 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]; };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",