@hestia-earth/schema-convert 7.6.1 → 7.6.2

package/json.js

@@ -57,6 +57,26 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spread = (this && this.__spread) || function () {
+    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
+    return ar;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toJson = exports.filterEmptyNode = exports.formatNode = exports.cleanStringValue = exports.throwCSVError = void 0;
 var csvtojson = require("csvtojson");
@@ -87,7 +107,8 @@ var internalProperties = function (_a) {
     var properties = _a.properties;
     return Object.keys(properties).filter(function (property) { return properties[property].internal; });
 };
-var nonEmptyCell = function (value) { return value !== IGNORE_FIELD_KEY && value !== ''; };
+var isEmptyCell = function (value) { return value === IGNORE_FIELD_KEY || value === ''; };
+var nonEmptyCell = function (value) { return !isEmptyCell(value); };
 var compileFullKey = function (key1, key2) {
     // handle arrays
     var joinKey = (key2 || '').startsWith('[') ? '' : '.';
@@ -151,13 +172,22 @@ var handleArrayError = function (func) { return function (value, index) {
 var schemaRefValue = function (value) { return typeof value === 'object' ? value : ({ name: value }); };
 exports.cleanStringValue = function (value) { return (value.match(/^[\d]+\.[\d]+\.[\d]+$/) === null ? value.replace(/\.0$/, '') : value).trim(); };
 var propertyTypeToValue = {
+    null: function (value) {
+        var args = [];
+        for (var _a = 1; _a < arguments.length; _a++) {
+            args[_a - 1] = arguments[_a];
+        }
+        return isEmptyCell(value) ? null : propertyTypeToValue.auto.apply(propertyTypeToValue, __spread([value], args));
+    },
     string: function (value) { return exports.cleanStringValue(value || ''); },
     number: function (value) {
-        return isNaN(+value) ? (function () {
-            throw new Error('failed to parse number');
-        })() : +value;
+        return isEmptyCell(value) ?
+            undefined :
+            isNaN(+value) ? (function () {
+                throw new Error('failed to parse number');
+            })() : +value;
     },
-    integer: function (value) { return +value; },
+    integer: function (value) { return isEmptyCell(value) ? undefined : +value; },
     boolean: function (value) { return value.toLowerCase() === 'true'; },
     object: function (value, schemas, _a, _i) {
         var $ref = _a.$ref, required = _a.required;
@@ -206,7 +236,7 @@ var getValueType = function (schema, json) {
 };
 var getPropertyType = function (def, key, valueType) {
     // default type is object (like $ref)
-    return (key === 'value' && valueType ? valueType : (Array.isArray(def.type) ? 'auto' : def.type)) || 'object';
+    return (key === 'value' && valueType ? valueType : (Array.isArray(def.type) ? (def.type.includes('null') ? 'null' : 'auto') : def.type)) || 'object';
 };
 var setDefaultProperty = function (prop, def, node, ignoreInternal) {
     if (ignoreInternal === void 0) { ignoreInternal = false; }
@@ -245,14 +275,14 @@ var extendDataFromSchema = function (_a, schema, type, ignoreInternal, top) {
             var property = _a.property, defaultValue = _a.defaultValue;
             return (__assign(__assign({}, prev), (_b = {}, _b[property] = defaultValue, _b)));
         }, {}) :
-        {})), nodeType(id, type, '@id' in data)));
+        {})), nodeType(id, type, '@id' in data)), true);
 };
 var isEmptyValue = function (value) {
     return (value['@type'] || value.type) === schema_1.SchemaType.Term ? !(value['@id'] || value.id || value.name) : utils_1.isEmpty(value);
 };
 var mapContent = function (schemas, schema, ignoreInternal) { return function (json) {
     return Object.keys(json)
-        .filter(function (key) { return nonEmptyCell(key) && nonEmptyCell(json[key]); })
+        .filter(nonEmptyCell)
         .reduce(function (prev, key) {
         var _a;
         var value = json[key];
@@ -262,14 +292,14 @@ 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 } : {})), (isEmptyValue(newValue) ? {} : (_a = {}, _a[key] = newValue, _a)));
+        return __assign(__assign(__assign({}, prev), (schema.$id ? { type: schema.title } : {})), (type !== 'null' && isEmptyValue(newValue) ? {} : (_a = {}, _a[key] = newValue, _a)));
     }, {});
 }; };
 exports.formatNode = function (schemas, type, data, ignoreInternal, top) {
     if (top === void 0) { top = false; }
     var schema = type in schemas ? schemas[type] : schemaNotFoundError();
     var content = mapContent(schemas, schema, ignoreInternal)(data);
-    return utils_1.reduceUndefinedValues(__assign({ id: !nonEmptyCell(data.id) ? undefined : data.id }, extendDataFromSchema(content, schema, type, ignoreInternal, top)));
+    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"]);

package/package.json

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

package/utils.d.ts

@@ -6,4 +6,4 @@ export declare const isNumber: (n: string | number) => boolean;
 export declare const isEmpty: (value: any, minKeys?: number) => boolean;
 export declare const nonEmptyValue: (value: any) => boolean;
 export declare const nonEmptyNode: (node: any) => boolean;
-export declare const reduceUndefinedValues: <T>(obj: T) => Partial<T>;
+export declare const reduceUndefinedValues: <T>(obj: T, allowNull?: boolean) => Partial<T>;

package/utils.js

@@ -41,14 +41,15 @@ exports.nonEmptyNode = function (node) {
             .length > 0 :
         exports.nonEmptyValue(node);
 };
-var isUndefined = function (value) {
-    return value === null ||
-        typeof value === 'undefined' || (typeof value === 'object' && !(value instanceof Date) && !Object.keys(value).length);
+var isUndefined = function (value, allowNull) {
+    return (value === null && !allowNull) ||
+        typeof value === 'undefined' || (typeof value === 'object' && value !== null && !(value instanceof Date) && !Object.keys(value).length);
 };
-exports.reduceUndefinedValues = function (obj) {
+exports.reduceUndefinedValues = function (obj, allowNull) {
+    if (allowNull === void 0) { allowNull = false; }
     return Object.keys(obj).reduce(function (prev, key) {
         var _a;
         var value = obj[key];
-        return __assign(__assign({}, prev), (isUndefined(value) ? {} : (_a = {}, _a[key] = value, _a)));
+        return __assign(__assign({}, prev), (isUndefined(value, allowNull) ? {} : (_a = {}, _a[key] = value, _a)));
     }, {});
 };