@hestia-earth/api 0.24.38 → 0.24.40

package/dist/files/model/model.js

@@ -196,17 +196,16 @@ var filenameWithoutExt = function (filepath) {
 };
 exports.filenameWithoutExt = filenameWithoutExt;
 exports.validPathChars = 'A-Za-z\\d\\-_';
+var rstripChar = function (value) { return (value.length > 1 ? value.replace(/(\.|\_)$/g, '') : value); };
 var replaceInvalidChars = function (value) {
     var folder = (0, exports.folderFromPath)(value);
     var newFilename = value
-        ? (0, exports.filenameWithoutExt)(value)
-            .replace(/(\.|\_)$/g, '')
+        ? rstripChar(rstripChar((0, exports.filenameWithoutExt)(value))
             .replace(new RegExp("[^".concat(exports.validPathChars, "]"), 'g'), '_')
             .replace(new RegExp(Object.values(SupportedExtensions)
             .map(function (v) { return "(_".concat(v, ")"); })
             .join('|'), 'g'), '')
-            .replace(/[\_]{2,}/g, '_')
-            .replace(/(\.|\_)$/g, '')
+            .replace(/[\_]{2,}/g, '_'))
         : null;
     return newFilename
         ? (value === null || value === void 0 ? void 0 : value.includes('.'))

package/dist/nodes/model/model.d.ts

@@ -18,5 +18,5 @@ export declare const parseLogMissingLookups: (data: string) => {
 }[];
 export declare const formatForUpload: (nodes: any[], typeToId?: {
     [type: string]: string[];
-}, schemas?: import("@hestia-earth/json-schema").definitions) => any;
+}) => any;
 export declare const setPrivate: ({ source, defaultSource, ...node }: any) => any;

package/dist/nodes/model/model.js

@@ -26,7 +26,6 @@ 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 json_schema_1 = require("@hestia-earth/json-schema");
 var model_1 = require("../../files/model/model");
 exports.blankNodeTypes = Object.values(schema_1.SchemaType).filter(function (t) { return !(0, schema_1.isTypeNode)(t); });
 var DataState;
@@ -99,26 +98,19 @@ var mapTypeToId = function (nodes) {
         return prev;
     }, {});
 };
-var formatForUpload = function (nodes, typeToId, schemas) {
+var formatForUpload = function (nodes, typeToId) {
     if (typeToId === void 0) { typeToId = mapTypeToId(nodes); }
-    if (schemas === void 0) { schemas = (0, json_schema_1.loadSchemas)(); }
     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)
-                .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) {
+            : (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, schemas)
-                        : (0, exports.formatForUpload)([value], typeToId, schemas)[0]
+                        ? (0, exports.formatForUpload)(value, typeToId)
+                        : (0, exports.formatForUpload)([value], typeToId)[0]
                     : value;
                 return [key, newValue];
             }))), true);

package/package.json

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