@hestia-earth/schema-convert 7.6.4 → 7.7.0

package/json.d.ts

@@ -25,7 +25,7 @@ export interface ICSVError {
 export declare const throwCSVError: <T extends ICSVError>(error: T) => never;
 export declare const cleanStringValue: (value: string) => string;
 export declare const formatNode: (schemas: definitions, type: SchemaType, data: ICSVContent, ignoreInternal: boolean, top?: boolean) => any;
-export declare const filterEmptyNode: (schemas: definitions, { schemaVersion, ...node }: any) => boolean;
+export declare const filterEmptyNode: (schemas: definitions, node: any) => boolean;
 /**
  * Convert CSV to Hestia JSON-LD format.
  *

package/json.js

@@ -77,6 +77,7 @@ var __spread = (this && this.__spread) || function () {
     for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
     return ar;
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toJson = exports.filterEmptyNode = exports.formatNode = exports.cleanStringValue = exports.throwCSVError = void 0;
 var csvtojson = require("csvtojson");
@@ -114,6 +115,11 @@ var compileFullKey = function (key1, key2) {
     var joinKey = (key2 || '').startsWith('[') ? '' : '.';
     return [key1, key2].filter(Boolean).join(joinKey);
 };
+var schemaMinKeys = function (schemas, _a) {
+    var schemaVersion = _a.schemaVersion, node = __rest(_a, ["schemaVersion"]);
+    var schema = node.type ? schemas[node.type] : null;
+    return schema ? getDefaultProperties(schema).length + 1 : 1;
+};
 var propertyRequiredValue = function (value, required) {
     var _a;
     var val = typeof value === 'object' && required[0] in value ? value[required[0]] : value;
@@ -188,7 +194,7 @@ var propertyTypeToValue = {
             })() : +value;
     },
     integer: function (value) { return isEmptyCell(value) ? undefined : +value; },
-    boolean: function (value) { return value.toLowerCase() === 'true'; },
+    boolean: function (value) { return isEmptyCell(value) ? undefined : value.toLowerCase() === 'true'; },
     object: function (value, schemas, _a, _i) {
         var $ref = _a.$ref, required = _a.required;
         return $ref ?
@@ -203,7 +209,7 @@ var propertyTypeToValue = {
             Array.isArray(items.type) ?
                 propertyTypeToValue.auto(val, schemas, items, _i) :
                 propertyTypeToValue[items.type](val, schemas, items, _i)) : val; }))
-            .filter(function (val) { return !utils_1.isEmpty(val); });
+            .filter(function (val) { return !isEmptyValue(val, schemas); });
     },
     // try to determine the type automatically
     auto: function (value, schemas, _d, _i) {
@@ -277,10 +283,24 @@ var extendDataFromSchema = function (_a, schema, type, ignoreInternal, top) {
         }, {}) :
         {})), nodeType(id, type, '@id' in data)), true);
 };
-var isEmptyValue = function (value) {
-    return typeof value === 'object' && (value['@type'] || value.type) === schema_1.SchemaType.Term ?
-        !(value['@id'] || value.id || value.name) :
-        isEmptyCell(value);
+var isEmptyValueType = (_a = {},
+    _a[schema_1.SchemaType.Term] = function (value) { return !(value['@id'] || value.id || value.name); },
+    _a.BlankNode = function (value, schemas) {
+        return Object.values(value).filter(function (value) { return !utils_1.isEmpty(value); }).length <= schemaMinKeys(schemas, value);
+    },
+    _a.array = function (value) { return value.filter(function (v) { return !utils_1.isEmpty(v); }).length === 0; },
+    _a.object = function (value, schemas) {
+        return Array.isArray(value) ?
+            isEmptyValueType.array(value) :
+            (value['@type'] || value.type) === schema_1.SchemaType.Term ?
+                isEmptyValueType[schema_1.SchemaType.Term](value) :
+                schema_1.isBlankNode(value) ?
+                    isEmptyValueType.BlankNode(value, schemas) :
+                    Object.keys(value).length === 0;
+    },
+    _a);
+var isEmptyValue = function (value, schemas) {
+    return (typeof value) in isEmptyValueType ? isEmptyValueType[typeof value](value, schemas) : isEmptyCell(value);
 };
 var mapContent = function (schemas, schema, ignoreInternal) { return function (json) {
     return Object.keys(json)
@@ -294,7 +314,7 @@ var mapContent = function (schemas, schema, ignoreInternal) { return function (j
         var newValue = key === VALUE_TYPE_KEY ? '' : propertyInvalidFormat(schema, key, value, function () {
             return Array.isArray(type) ? value : propertyTypeToValue[type](value, schemas, propertyDefinition, ignoreInternal);
         });
-        return __assign(__assign(__assign({}, prev), (schema.$id ? { type: schema.title } : {})), (type !== 'null' && isEmptyValue(newValue) ? {} : (_a = {}, _a[key] = newValue, _a)));
+        return __assign(__assign(__assign({}, prev), (schema.$id ? { type: schema.title } : {})), (type !== 'null' && isEmptyValue(newValue, schemas) ? {} : (_a = {}, _a[key] = newValue, _a)));
     }, {});
 }; };
 exports.formatNode = function (schemas, type, data, ignoreInternal, top) {
@@ -303,12 +323,10 @@ exports.formatNode = function (schemas, type, data, ignoreInternal, top) {
     var content = mapContent(schemas, schema, ignoreInternal)(data);
     return utils_1.reduceUndefinedValues(__assign({ id: isEmptyCell(data.id) ? undefined : data.id }, extendDataFromSchema(content, schema, type, ignoreInternal, top)), true);
 };
-exports.filterEmptyNode = function (schemas, _a) {
-    var schemaVersion = _a.schemaVersion, node = __rest(_a, ["schemaVersion"]);
-    // make sure defaultProperties are not counted
+exports.filterEmptyNode = function (schemas, node) {
     var schema = node.type ? schemas[node.type] : null;
-    var minKeysLength = schema ? getDefaultProperties(schema).length + 1 : 1;
-    return !utils_1.isEmpty(node, minKeysLength) && !!schema;
+    // make sure defaultProperties are not counted
+    return !!schema && !utils_1.isEmpty(node, schemaMinKeys(schemas, node));
 };
 var convetToNode = function (schemas) { return function (data) {
     return Object.keys(data)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/schema-convert",
-  "version": "7.6.4",
+  "version": "7.7.0",
   "description": "Hestia Schema Converters",
   "main": "index.js",
   "typings": "index.d.ts",