@hestia-earth/schema-convert 7.11.0 → 8.2.0

package/csv.js

@@ -50,7 +50,11 @@ var isIgnored = function (val) { return Object.values(ignoreValues).some(functio
 exports.headersFromCsv = function (csv) { return csv.split('\n')[0].split(exports.csvColSep); };
 var convertValue = {
     default: function (value) { return "" + value; },
-    object: function (value) { return value instanceof Date ? value.toJSON() : JSON.stringify(value); }
+    object: function (value) { return value === null
+        ? noValue
+        : value instanceof Date
+            ? value.toJSON()
+            : JSON.stringify(value); }
 };
 var escapeField = function (value) {
     var convertType = (typeof value) in convertValue ? typeof value : 'default';

package/json.d.ts

@@ -21,6 +21,7 @@ export interface ICSVError {
     value?: any;
     error?: string;
     headers?: ICSVHeader[];
+    suggestions?: string[];
 }
 export declare const throwCSVError: <T extends ICSVError>(error: T) => never;
 export declare const cleanStringValue: (value: string) => string;

package/json.js

@@ -81,6 +81,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toJson = exports.filterEmptyNode = exports.formatNode = exports.cleanStringValue = exports.throwCSVError = void 0;
 var csvtojson = require("csvtojson");
+var levenshtein = require("fast-levenshtein");
 var schema_1 = require("@hestia-earth/schema");
 var types_1 = require("@hestia-earth/json-schema/types");
 var utils_1 = require("./utils");
@@ -155,12 +156,21 @@ var schemaNotFoundError = function (schema) { return exports.throwCSVError({
     message: 'schema-not-found',
     schema: schema
 }); };
+var computeSuggestions = function (_a, key) {
+    var properties = _a.properties;
+    var internal = internalProperties({ properties: properties });
+    var allKeys = Object.keys(properties).filter(function (k) { return !__spread([
+        '@type', 'type'
+    ], internal).includes(k); });
+    return allKeys.filter(function (v) { return levenshtein.get(v, key) <= 3; });
+};
 var propertyNotFoundError = function (schema, key, value) { return exports.throwCSVError({
     schema: schema.title,
     message: 'property-not-found',
     schemaKey: key,
     key: key,
-    value: value
+    value: value,
+    suggestions: computeSuggestions(schema, key)
 }); };
 var propertyInvalidFormat = function (schema, key, value, func) {
     try {
@@ -221,13 +231,15 @@ var propertyTypeToValue = {
     },
     integer: function (value) { return isEmptyCell(value) ? undefined : +value; },
     boolean: function (value) {
-        return isEmptyCell(value) ?
-            undefined :
-            utils_1.isBoolean(value) ?
-                value.toLowerCase() === 'true' :
-                (function () {
-                    throw new Error('failed to parse boolean, expected true or false');
-                })();
+        return isEmptyCell(value)
+            ? undefined
+            : utils_1.isBoolean(value)
+                ? value.toLowerCase() === 'true'
+                : utils_1.isNumber(value)
+                    ? +value === 1 // handle setting 1 or 1.0 as true
+                    : (function () {
+                        throw new Error('failed to parse boolean, expected true or false');
+                    })();
     },
     object: function (value, schemas, _a, _i) {
         var $ref = _a.$ref, required = _a.required;
@@ -261,7 +273,8 @@ var propertyTypeToValue = {
         var schemaType = schema_1.refToSchemaType($ref);
         var schema = schemaType ? schemas[schemaType] : undefined;
         var data = schema ? mapContent(schemas, schema, _i)(schemaRefValue(value, schemaType)) : safeParseJSON(value);
-        return utils_1.isEmpty(data) ? {} : (schema ? extendDataFromSchema(data, schema, schemaType, _i) : data);
+        var includeDefaults = [schema_1.SchemaType.Actor].includes(schemaType); // only nested node allowed
+        return utils_1.isEmpty(data) ? {} : (schema ? extendDataFromSchema(data, schema, schemaType, _i, includeDefaults) : data);
     }
 };
 var getPropertyDefinition = function (schema, key, ignoreErrors, value) {
@@ -305,11 +318,11 @@ var nodeType = function (id, type, existingNode) {
     if (existingNode === void 0) { existingNode = false; }
     return type ? (schema_1.isTypeNode(type) ? (existingNode ? { '@type': type } : { id: id, type: type }) : { type: type }) : {};
 };
-var extendDataFromSchema = function (_a, schema, type, ignoreInternal, top) {
+var extendDataFromSchema = function (_a, schema, type, ignoreInternal, addDefaults) {
     if (ignoreInternal === void 0) { ignoreInternal = false; }
-    if (top === void 0) { top = false; }
+    if (addDefaults === void 0) { addDefaults = false; }
     var id = _a.id, _t = _a.type, data = __rest(_a, ["id", "type"]);
-    return utils_1.reduceUndefinedValues(__assign(__assign(__assign({}, filterProperties(data, ignoreInternal ? [] : internalProperties(schema))), (top && schema ?
+    return utils_1.reduceUndefinedValues(__assign(__assign(__assign({}, filterProperties(data, ignoreInternal ? [] : internalProperties(schema))), (addDefaults && !('@id' in data) && schema ?
         getDefaultProperties(schema, data, ignoreInternal).reduce(function (prev, _a) {
             var _b;
             var property = _a.property, defaultValue = _a.defaultValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/schema-convert",
-  "version": "7.11.0",
+  "version": "8.2.0",
   "description": "Hestia Schema Converters",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -29,6 +29,7 @@
     "@hestia-earth/json-schema": "*",
     "@hestia-earth/schema": "*",
     "csvtojson": "^2.0.0",
+    "fast-levenshtein": "^3.0.0",
     "json-2-csv": "^3.14.0",
     "lodash.get": "^4.0.0",
     "lodash.unset": "^4.0.0"