@hestia-earth/api 0.12.2 → 0.12.4

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

@@ -17,4 +17,8 @@ export declare const parseLogMissingLookups: (data: string) => {
     termId: any;
     column: any;
 }[];
-export declare const groupLogsByModel: (data: string) => any;
+export declare const formatForUpload: ({ "@type": type, "@id": id, ...node }: {
+    [x: string]: any;
+    "@type": any;
+    "@id": any;
+}) => any;

package/dist/nodes/model/model.js

@@ -21,16 +21,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.groupLogsByModel = exports.parseLogMissingLookups = exports.paramToNodeType = exports.nodeTypeToParam = exports.pathWithState = exports.allowedDataStates = exports.dataStatesTypeMapping = exports.DataState = exports.blankNodeTypes = void 0;
+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");
@@ -98,87 +91,19 @@ exports.parseLogMissingLookups = function (data) {
     var messages = lines.map(parseMessage).filter(function (v) { return Object.keys(v).length > 1; });
     return utils_1.unique(messages.map(parseLookup));
 };
-var schemaTypesLowerCase = Object.values(schema_1.SchemaType).map(function (v) { return v.toLowerCase(); });
-var blankNodeTypesLowerCase = exports.blankNodeTypes.map(function (v) { return v.toLowerCase(); });
-var omitLogKeys = function (log) {
-    return Object.fromEntries(Object.entries(log).filter(function (_a) {
-        var key = _a[0];
-        return !schemaTypesLowerCase.includes(key);
-    }));
-};
-var includeBlankNodes = function (logs, log) {
-    return Object
-        .keys(log)
-        .filter(function (key) { return blankNodeTypesLowerCase.includes(key); })
-        .reduce(function (prev, key) {
-        var _a;
-        return (__assign(__assign({}, prev), (_a = {}, _a[key] = utils_1.unique(__spreadArrays(((typeof prev[key] === 'string' ? [prev[key]] : prev[key]) || []), [
-            log[key]
-        ])), _a)));
-    }, logs);
-};
-var groupLog = function (group, _a) {
-    var logger = _a.logger, term = _a.term, model = _a.model, key = _a.key, should_run = _a.should_run, run_required = _a.run_required, log = __rest(_a, ["logger", "term", "model", "key", "should_run", "run_required"]);
-    var isOrchestrator = logger.includes('orchestrator');
-    var modelKey = isOrchestrator ? model : key || model;
-    var isKey = !isOrchestrator && !!key;
-    group[term] = group[term] || {};
-    group[term][modelKey] = group[term][modelKey] || __assign({ isKey: isKey }, (isKey ? { model: model } : {}));
-    group[term][modelKey] = includeBlankNodes(group[term][modelKey], log);
-    if (typeof should_run !== 'undefined') {
-        var shouldRun = should_run === 'True';
-        group[term][modelKey] = isOrchestrator ? __assign(__assign({}, group[term][modelKey]), { shouldRunOrchestrator: shouldRun }) : __assign(__assign(__assign({}, group[term][modelKey]), omitLogKeys(log)), { shouldRun: shouldRun });
-    }
-    else if (typeof run_required !== 'undefined') {
-        var runRequired = run_required === 'True';
-        group[term][modelKey] = __assign(__assign(__assign({}, group[term][modelKey]), (runRequired ? {} : omitLogKeys(log))), { runRequired: runRequired });
-    }
-    else if ('requirements' in log) {
-        var requirements = log.requirements, logData = __rest(log, ["requirements"]);
-        group[term][modelKey].requirements = __assign(__assign({}, (group[term][modelKey].requirements || {})), logData);
-    }
-    else if (missingLookupPrefix in log) {
-        group[term][modelKey].missingLookups = utils_1.unique(__spreadArrays((group[term][modelKey].missingLookups || []), [
-            parseLookup(log)
-        ]));
-    }
-    else if (!isOrchestrator) {
-        group[term][modelKey].logs = __assign(__assign({}, (group[term][modelKey].logs || {})), omitLogKeys(log));
-    }
-    return group;
-};
-var groupLogSubValue = function (group, log, key) {
-    var id = log[key];
-    group[id] = groupLog(group[id] || {}, log);
-    if (key === 'transformation') {
-        Object.entries(group[id]).map(function (_a) {
-            var term = _a[0], models = _a[1];
-            return Object.keys(models).map(function (model) {
-                var _a;
-                if ((_a = group === null || group === void 0 ? void 0 : group[term]) === null || _a === void 0 ? void 0 : _a[model]) {
-                    group[term][model][key] = utils_1.unique(__spreadArrays((group[term][model][key] || []), [
-                        id
-                    ]));
-                }
-            });
-        });
-    }
-    return group;
-};
-var subValues = [
-    'property',
-    'transformation'
-];
-exports.groupLogsByModel = function (data) {
-    return data.split('\n')
-        .map(parseMessage)
-        .filter(function (v) { return !!(v === null || v === void 0 ? void 0 : v.term) && !!(v === null || v === void 0 ? void 0 : v.model); })
-        .reduce(function (group, log) {
-        var subValue = subValues.find(function (v) { return !!log[v]; });
-        return subValue ?
-            subValue === 'transformation' ?
-                groupLogSubValue(group, log, subValue) :
-                groupLog(groupLogSubValue(group, log, subValue), log)
-            : groupLog(group, log);
-    });
+exports.formatForUpload = function (_a) {
+    var type = _a["@type"], id = _a["@id"], node = __rest(_a, ['@type', '@id']);
+    return type === schema_1.NodeType.Term
+        ? { '@type': type, '@id': id }
+        : utils_1.reduceUndefinedValues(__assign({ type: type,
+            id: id }, Object.fromEntries(Object.entries(node).map(function (_a) {
+            var key = _a[0], value = _a[1];
+            var isArray = Array.isArray(value);
+            var newValue = schema_1.isExpandable(value)
+                ? isArray
+                    ? value.map(exports.formatForUpload)
+                    : exports.formatForUpload(value)
+                : value;
+            return [key, newValue];
+        }))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -109,8 +109,8 @@
     "swagger-jsdoc": "^4.3.2",
     "swagger-ui-dist": "^4.6.2",
     "swagger-ui-express": "^4.3.0",
-    "ts-node": "^8.10.2",
-    "ts-node-dev": "^1.1.8",
+    "ts-node": "^10.9.1",
+    "ts-node-dev": "^2.0.0",
     "typescript": "^3.9.10",
     "uid-generator": "^2.0.0",
     "winston": "^3.6.0"