@hestia-earth/api 0.9.26 → 0.9.27-3

package/dev.ts

@@ -0,0 +1,3 @@
+require('dotenv').config();
+
+require('./src').run();

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

@@ -11,5 +11,9 @@ export declare const allowedDataStates: (type: SchemaType | NodeType) => DataSta
 export declare const pathWithState: (type: SchemaType | NodeType, id: string, dataState?: DataState) => string;
 export declare const nodeTypeToParam: (type: NodeType) => string;
 export declare const paramToNodeType: (type: string) => NodeType;
-export declare const parseLogMissingLookups: (data: string) => any[];
+export declare const parseLogMissingLookups: (data: string) => {
+    filename: string;
+    termId: any;
+    column: any;
+}[];
 export declare const groupLogsByModel: (data: string) => any;

package/dist/nodes/model/model.js

@@ -76,18 +76,17 @@ var parseFilename = function (filepath) {
     return model_1.fileToExt(filename, ext);
 };
 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,
+        column: column
+    });
+};
 exports.parseLogMissingLookups = function (data) {
     var lines = data.split('\n').filter(function (log) { return log.includes(missingLookupPrefix); });
     var messages = lines.map(parseMessage).filter(function (v) { return Object.keys(v).length > 1; });
-    var lookups = messages.map(function (_a) {
-        var _b = missingLookupPrefix, path = _a[_b], termId = _a.termid, column = _a.column;
-        return JSON.stringify({ filename: parseFilename(path), termId: termId, column: column });
-    });
-    return utils_1.unique(lookups).map(function (v) { return JSON.parse(v); });
-};
-var addMissingLookup = function (_a) {
-    var column = _a.column, termid = _a.termid, missingLookup = _a["Missing lookup"];
-    return missingLookup ? { filename: parseFilename(missingLookup), termId: termid, column: column } : null;
+    return utils_1.unique(messages.map(parseLookup));
 };
 exports.groupLogsByModel = function (data) {
     return data.split('\n')
@@ -98,7 +97,7 @@ exports.groupLogsByModel = function (data) {
         var term = _a.term, model = _a.model, key = _a.key, should_run = _a.should_run, log = __rest(_a, ["term", "model", "key", "should_run"]);
         var modelKey = key || model;
         group[term] = group[term] || {};
-        group[term][modelKey] = group[term][modelKey] || {};
+        group[term][modelKey] = group[term][modelKey] || { isKey: !!key };
         if (typeof should_run !== 'undefined') {
             group[term][modelKey] = __assign(__assign(__assign({}, group[term][modelKey]), log), { shouldRun: should_run === 'True' });
         }
@@ -106,10 +105,10 @@ exports.groupLogsByModel = function (data) {
             var requirements = log.requirements, logData = __rest(log, ["requirements"]);
             group[term][modelKey].requirements = __assign(__assign({}, (group[term][modelKey].requirements || {})), logData);
         }
-        else if ('Missing lookup' in log) {
-            group[term][modelKey].missingLookups = __spreadArrays((group[term][modelKey].missingLookups || []), [
-                addMissingLookup(log)
-            ]);
+        else if (missingLookupPrefix in log) {
+            group[term][modelKey].missingLookups = utils_1.unique(__spreadArrays((group[term][modelKey].missingLookups || []), [
+                parseLookup(log)
+            ]));
         }
         else {
             group[term][modelKey].logs = __assign(__assign({}, (group[term][modelKey].logs || {})), log);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.9.26",
+  "version": "0.9.27-3",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -9,6 +9,7 @@
     "build:module": "rm -rf dist && tsc -p tsconfig.dist.json",
     "validate:jsonld": "hestia-validate-jsonld '' test",
     "start": "node index.js",
+    "dev": "ts-node-dev --respawn --rs dev.ts",
     "watch": "tsc --watch",
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "npm run lint -- --fix",
@@ -37,11 +38,11 @@
     "@elastic/elasticsearch": "7.13.0",
     "@hestia-earth/schema-convert": "^7.0.0",
     "@hestia-earth/schema-validation": "^7.0.0",
-    "@hestia-earth/utils": "^0.10.3",
+    "@hestia-earth/utils": "^0.10.4",
     "@mendeley/api": "^10.0.2",
-    "@sentry/node": "^6.16.1",
-    "@sentry/tracing": "^6.16.1",
-    "@slack/web-api": "^6.5.1",
+    "@sentry/node": "^6.17.4",
+    "@sentry/tracing": "^6.17.4",
+    "@slack/web-api": "^6.6.0",
     "@sokratis/passport-linkedin-oauth2": "^2.1.0",
     "@types/chai": "^4.3.0",
     "@types/compression": "^1.7.2",
@@ -55,18 +56,18 @@
     "@types/mongoose": "^5.11.97",
     "@types/morgan": "^1.9.3",
     "@types/multer": "^1.4.7",
-    "@types/node": "^14.18.7",
+    "@types/node": "^14.18.10",
     "@types/orientjs": "^3.0.12",
     "@types/request": "^2.48.8",
     "@types/request-promise-native": "^1.0.18",
     "@types/winston": "^2.4.4",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
-    "aws-sdk": "^2.1058.0",
+    "aws-sdk": "^2.1067.0",
     "axios": "^0.21.4",
     "body-parser": "^1.19.1",
     "capitalize": "^2.0.4",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "compression": "^1.7.4",
     "cors": "^2.8.4",
     "dotenv": "^6.0.0",
@@ -81,7 +82,7 @@
     "lodash.get": "^4.4.2",
     "lodash.orderby": "^4.6.0",
     "lodash.pick": "^4.4.0",
-    "mocha": "^9.1.4",
+    "mocha": "^9.2.0",
     "mocha-prepare": "^0.1.0",
     "mongoose": "^5.13.14",
     "mongoose-bcrypt": "^1.9.0",
@@ -103,12 +104,13 @@
     "standard-version": "^9.3.2",
     "supertest": "^3.4.2",
     "swagger-jsdoc": "^4.3.2",
-    "swagger-ui-dist": "^4.1.3",
+    "swagger-ui-dist": "^4.4.1",
     "swagger-ui-express": "^4.3.0",
     "ts-node": "^8.10.2",
+    "ts-node-dev": "^1.1.8",
     "typescript": "^3.9.10",
     "uid-generator": "^2.0.0",
-    "winston": "^3.4.0"
+    "winston": "^3.5.1"
   },
   "husky": {
     "hooks": {