@hestia-earth/api 0.20.0 → 0.20.2

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

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

package/dist/nodes/model/model.js

@@ -26,6 +26,7 @@ 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;
@@ -102,19 +103,24 @@ var mapTypeToId = function (nodes) { return nodes.reduce(function (prev, _a) {
     prev[type].push(id);
     return prev;
 }, {}); };
-var formatForUpload = function (nodes, typeToId) {
+var formatForUpload = function (nodes, typeToId, schemas) {
     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).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).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) {
                 var key = _a[0], value = _a[1];
                 var newValue = (0, schema_1.isExpandable)(value)
                     ? Array.isArray(value)
-                        ? (0, exports.formatForUpload)(value, typeToId)
-                        : (0, exports.formatForUpload)([value], typeToId)[0]
+                        ? (0, exports.formatForUpload)(value, typeToId, schemas)
+                        : (0, exports.formatForUpload)([value], typeToId, schemas)[0]
                     : value;
                 return [key, newValue];
             }))), true);

package/dist/reconciliations/model/model.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from '../../db/model.base';
+import { status, pipelineStatus } from '../../files/model/model';
 export { getMainErrorMessage as reconciliationsGetMainErrorMessage, validateProductCorrespondence as reconciliationsValidateProductCorrespondence, validateImpactAssessmentLinks as reconciliationsValidateImpactAssessmentLinks, validateExpectedNodes as reconciliationsValidateExpectedNodes, validatePrivate as reconciliationsValidatePrivate } from './validations';
 export declare enum ReconciliationLevel {
     success = "success",
@@ -16,4 +17,6 @@ export declare class Reconciliation extends BaseModel {
         message: string;
         subMessages: string[];
     };
+    readonly uploadStatus?: status;
+    readonly uploadPipelineStatus?: pipelineStatus;
 }

package/dist/reconciliations/model/validations.d.ts

@@ -1,6 +1,5 @@
 import { NodeType, ICycleJSONLD, JSONLD, JSON, SchemaType, ITermJSONLD, Term } from '@hestia-earth/schema';
-import { INode } from '@hestia-earth/schema-convert';
-export type Node = (INode | JSONLD<NodeType>) & {
+export type Node = (JSONLD<NodeType> | JSON<SchemaType>) & {
     site?: JSON<SchemaType.Site> | JSONLD<NodeType.Site>;
     cycle?: JSON<SchemaType.Cycle> | JSONLD<NodeType.Cycle>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.20.0",
+  "version": "0.20.2",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -30,6 +30,7 @@
   "author": "Guillaume Royer <guillaumeroyer.mail@gmail.com>",
   "license": "UNLICENSED",
   "dependencies": {
+    "@hestia-earth/json-schema": ">=20.0.0",
     "@hestia-earth/schema": ">=20.0.0",
     "@hestia-earth/utils": ">=0.11.2"
   },
@@ -38,7 +39,6 @@
     "@commitlint/config-conventional": "^16.2.4",
     "@elastic/elasticsearch": "7.13.0",
     "@hestia-earth/eslint-config": "^0.0.5",
-    "@hestia-earth/json-schema": "^20.0.0",
     "@hestia-earth/schema-convert": "^20.0.0",
     "@hestia-earth/schema-validation": "^20.0.0",
     "@mendeley/api": "^10.0.2",