@hestia-earth/schema-convert 23.4.0 → 23.5.0

package/json.js

@@ -82,7 +82,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var _a, _b;
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toJson = exports.filterEmptyNode = exports.formatNode = exports.cleanStringValue = exports.throwCSVError = exports.acceptedNodeTypes = void 0;
 var csvtojson = require("csvtojson");
@@ -92,7 +92,7 @@ var schema_1 = require("@hestia-earth/schema");
 var types_1 = require("@hestia-earth/json-schema/types");
 var utils_1 = require("./utils");
 var default_values_1 = require("./default-values");
-exports.acceptedNodeTypes = Object.values(schema_1.NodeType).filter(function (val) { return val !== schema_1.NodeType.Term; });
+exports.acceptedNodeTypes = Object.values(schema_1.NodeType);
 var IGNORE_FIELD_KEY = '-';
 var VALUE_TYPE_KEY = 'valueType';
 var DEFAULT_ARRAY_DELIMITER = ';';
@@ -150,7 +150,7 @@ var isEmptyValueType = (_a = {
     },
     _a);
 var isEmptyValue = function (value, schemas) {
-    return (typeof value) in isEmptyValueType ? isEmptyValueType[typeof value](value, schemas) : isEmptyCell(value);
+    return typeof value in isEmptyValueType ? isEmptyValueType[typeof value](value, schemas) : isEmptyCell(value);
 };
 var compileFullKey = function (key1, key2) {
     // handle arrays
@@ -168,24 +168,28 @@ var throwError = function (error) {
 };
 var throwCSVError = function (error) { return throwError(JSON.stringify(error)); };
 exports.throwCSVError = throwCSVError;
-var schemaNotFoundError = function (schema) { return (0, exports.throwCSVError)({
-    message: 'schema-not-found',
-    schema: schema
-}); };
+var schemaNotFoundError = function (schema) {
+    return (0, 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 !__spreadArray(__spreadArray([], __read(types_1.excludedDefaultProperties), false), __read(internal), false).includes(k); });
     return allKeys.filter(function (v) { return levenshtein.get(v, key) <= 3; });
 };
-var propertyNotFoundError = function (schema, key, value) { return (0, exports.throwCSVError)({
-    schema: schema.title,
-    message: 'property-not-found',
-    schemaKey: key,
-    key: key,
-    value: value,
-    suggestions: computeSuggestions(schema, key)
-}); };
+var propertyNotFoundError = function (schema, key, value) {
+    return (0, exports.throwCSVError)({
+        schema: schema.title,
+        message: 'property-not-found',
+        schemaKey: key,
+        key: key,
+        value: value,
+        suggestions: computeSuggestions(schema, key)
+    });
+};
 var propertyInvalidFormat = function (schema, key, value, func) {
     try {
         return func();
@@ -193,7 +197,8 @@ var propertyInvalidFormat = function (schema, key, value, func) {
     catch (err) {
         var data = parseError(err);
         // throw already handled error or throw a generic invalid-format error
-        return (0, exports.throwCSVError)(data ? __assign(__assign({}, data), { key: compileFullKey(key, data.key) }) : {
+        return (0, exports.throwCSVError)(data
+            ? __assign(__assign({}, data), { key: compileFullKey(key, data.key) }) : {
             schema: schema.title,
             message: 'property-invalid-format',
             schemaKey: key,
@@ -221,18 +226,14 @@ var handleArrayError = function (func) { return function (value, index) {
     catch (err) {
         var data = parseError(err);
         // throw already handled error or throw a generic invalid-format error
-        return data ?
-            (0, exports.throwCSVError)(__assign(__assign({}, data), { key: compileFullKey("".concat(index), data.key) })) :
-            (function () {
+        return data
+            ? (0, exports.throwCSVError)(__assign(__assign({}, data), { key: compileFullKey("".concat(index), data.key) }))
+            : (function () {
                 throw err;
             })();
     }
 }; };
-var allowedGeoJSONTypes = [
-    'FeatureCollection',
-    'Feature',
-    'GeometryCollection'
-];
+var allowedGeoJSONTypes = ['FeatureCollection', 'Feature', 'GeometryCollection'];
 var geoJSONGeomtryTypeValidation = {
     Point: function () { return throwError('use "latitude" and "longitude" instead of "Point"'); },
     MultiPoint: function () { return throwError('use a "Polygon" instead of "MultiPoint"'); },
@@ -271,11 +272,13 @@ var parseWtkValue = function (value) {
     try {
         return {
             type: 'FeatureCollection',
-            features: [{
+            features: [
+                {
                     type: 'Feature',
                     properties: {},
                     geometry: (0, wkt_1.wktToGeoJSON)(value)
-                }]
+                }
+            ]
         };
     }
     catch (error) {
@@ -288,17 +291,21 @@ var parseJsonValue = function (value) {
         return ['Polygon', 'MultiPolygon'].includes(data.type)
             ? {
                 type: 'FeatureCollection',
-                features: [{
+                features: [
+                    {
                         type: 'Feature',
                         properties: {},
                         geometry: data
-                    }]
+                    }
+                ]
             }
             : ['Feature'].includes(data.type)
                 ? {
                     type: 'FeatureCollection',
-                    features: [__assign(__assign({}, data), { properties: {} // make sure they are set or it is invalid
-                         })]
+                    features: [
+                        __assign(__assign({}, data), { properties: {} // make sure they are set or it is invalid
+                         })
+                    ]
                 }
                 : data;
     }
@@ -326,113 +333,120 @@ var schemaRefValue = function (value, type) {
                 ? { term: { name: value } }
                 : { id: value };
 };
-var cleanStringValue = function (value) { return (value.match(/^[\d]+\.[\d]+\.[\d]+$/) === null ? value.replace(/\.0$/, '') : value).trim(); };
+var cleanStringValue = function (value) {
+    return (value.match(/^[\d]+\.[\d]+\.[\d]+$/) === null ? value.replace(/\.0$/, '') : value).trim();
+};
 exports.cleanStringValue = cleanStringValue;
-var geojsonRef = 'http://json.schemastore.org/geojson';
-var propertyTypeToValue = (_b = {
-        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, __spreadArray([value], __read(args), false));
-        },
-        string: function (value) { return (0, exports.cleanStringValue)(value || ''); },
-        number: function (value) {
-            return isEmptyCell(value)
-                ? undefined
-                : isNaN(+value)
-                    ? (function () {
-                        throw new Error('failed to parse number');
-                    })()
-                    : +value;
-        },
-        integer: function (value) { return isEmptyCell(value) ? undefined : +value; },
-        boolean: function (value) {
-            return isEmptyCell(value)
-                ? undefined
-                : (0, utils_1.isBoolean)(value)
-                    ? value.toLowerCase() === 'true'
-                    : (0, 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;
-            return $ref === geojsonRef
-                ? propertyTypeToValue[geojsonRef](value)
-                : $ref
-                    ? propertyTypeToValue.$ref(value, schemas, { $ref: $ref }, _i)
-                    : propertyTypeToValue.required(value, schemas, { required: required }, _i);
-        },
-        array: function (value, schemas, _a, _i) {
-            var items = _a.items;
-            return (Array.isArray(value) ? value : value.split(arrayDelimiter()))
-                .map(handleArrayError(function (val) { return items ? ('$ref' in items ?
-                propertyTypeToValue.object(val, schemas, items, _i) :
-                Array.isArray(items.type) ?
-                    propertyTypeToValue.auto(val, schemas, items, _i) :
-                    propertyTypeToValue[items.type](val, schemas, items, _i)) : val; }))
-                .filter(function (val) { return !isEmptyValue(val, schemas); });
-        },
-        // try to determine the type automatically
-        auto: function (value, schemas, _d, _i) {
-            // iris are mapped as {@id: val}
-            return (0, utils_1.isIri)(value)
-                ? propertyTypeToValue.required(value, schemas, { required: ['@id'] }, _i)
-                : (0, utils_1.isBoolean)(value)
-                    ? propertyTypeToValue.boolean(value)
-                    : (0, utils_1.isNumber)(value)
-                        ? propertyTypeToValue.number(value)
-                        : value === 'null'
-                            ? null
-                            : propertyTypeToValue.string(value);
-        },
-        required: function (value, _schemas, _a) {
-            var required = _a.required;
-            var data = propertyRequiredValue(value, required);
-            return (0, utils_1.isEmpty)(data) ? {} : data;
-        },
-        $ref: function (value, schemas, _a, _i) {
-            var $ref = _a.$ref;
-            var schemaType = (0, schema_1.refToSchemaType)($ref);
-            var schema = schemaType ? schemas[schemaType] : undefined;
-            var data = schema
-                ? mapContent(schemas, schema, _i)(schemaRefValue(value, schemaType))
-                : $ref in propertyTypeToValue
-                    ? propertyTypeToValue[$ref](value)
-                    : safeParseJSON(value);
-            var includeDefaults = (0, schema_1.isBlankNode)(data) || schemaType === schema_1.SchemaType.Actor; // only blank nodes or actors allowed
-            return (0, utils_1.isEmpty)(data)
-                ? {}
-                : !!schema
-                    ? extendDataFromSchema(data, schema, schemaType, _i, includeDefaults)
-                    : data;
+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, __spreadArray([value], __read(args), false)));
+    },
+    string: function (value) { return (0, exports.cleanStringValue)(value || ''); },
+    number: function (value) {
+        return isEmptyCell(value)
+            ? undefined
+            : isNaN(+value)
+                ? (function () {
+                    throw new Error('failed to parse number');
+                })()
+                : +value;
+    },
+    integer: function (value) { return (isEmptyCell(value) ? undefined : +value); },
+    boolean: function (value) {
+        return isEmptyCell(value)
+            ? undefined
+            : (0, utils_1.isBoolean)(value)
+                ? value.toLowerCase() === 'true'
+                : (0, 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, geojson = _a.geojson;
+        return geojson
+            ? propertyTypeToValue.geojson(value)
+            : $ref
+                ? propertyTypeToValue.$ref(value, schemas, { $ref: $ref }, _i)
+                : propertyTypeToValue.required(value, schemas, { required: required }, _i);
+    },
+    array: function (value, schemas, _a, _i) {
+        var items = _a.items;
+        return (Array.isArray(value) ? value : value.split(arrayDelimiter()))
+            .map(handleArrayError(function (val) {
+            return items
+                ? '$ref' in items
+                    ? propertyTypeToValue.object(val, schemas, items, _i)
+                    : Array.isArray(items.type)
+                        ? propertyTypeToValue.auto(val, schemas, items, _i)
+                        : propertyTypeToValue[items.type](val, schemas, items, _i)
+                : val;
+        }))
+            .filter(function (val) { return !isEmptyValue(val, schemas); });
     },
-    _b[geojsonRef] = function (value) { return isEmptyCell(value) ? undefined : parseGeoJSONValue(value); },
-    _b);
+    // try to determine the type automatically
+    auto: function (value, schemas, _d, _i) {
+        // iris are mapped as {@id: val}
+        return (0, utils_1.isIri)(value)
+            ? propertyTypeToValue.required(value, schemas, { required: ['@id'] }, _i)
+            : (0, utils_1.isBoolean)(value)
+                ? propertyTypeToValue.boolean(value)
+                : (0, utils_1.isNumber)(value)
+                    ? propertyTypeToValue.number(value)
+                    : value === 'null'
+                        ? null
+                        : propertyTypeToValue.string(value);
+    },
+    required: function (value, _schemas, _a) {
+        var required = _a.required;
+        var data = propertyRequiredValue(value, required);
+        return (0, utils_1.isEmpty)(data) ? {} : data;
+    },
+    $ref: function (value, schemas, _a, _i) {
+        var $ref = _a.$ref;
+        var schemaType = (0, schema_1.refToSchemaType)($ref);
+        var schema = schemaType ? schemas[schemaType] : undefined;
+        var data = schema
+            ? mapContent(schemas, schema, _i)(schemaRefValue(value, schemaType))
+            : $ref in propertyTypeToValue
+                ? propertyTypeToValue[$ref](value)
+                : safeParseJSON(value);
+        var includeDefaults = (0, schema_1.isBlankNode)(data) || schemaType === schema_1.SchemaType.Actor; // only blank nodes or actors allowed
+        return (0, utils_1.isEmpty)(data) ? {} : !!schema ? extendDataFromSchema(data, schema, schemaType, _i, includeDefaults) : data;
+    },
+    geojson: function (value) { return (isEmptyCell(value) ? undefined : parseGeoJSONValue(value)); }
+};
 var getPropertyDefinition = function (schema, key, ignoreErrors, value) {
     if (ignoreErrors === void 0) { ignoreErrors = false; }
     return key in schema.properties ? schema.properties[key] : !ignoreErrors && propertyNotFoundError(schema, key, value);
 };
 var getValueType = function (schema, json) {
-    return VALUE_TYPE_KEY in schema.properties ? (
-    // valueType can be present but skipped
-    (json[VALUE_TYPE_KEY] !== IGNORE_FIELD_KEY ? json[VALUE_TYPE_KEY] : null) ||
-        schema.properties[VALUE_TYPE_KEY].default) : null;
+    return VALUE_TYPE_KEY in schema.properties
+        ? // valueType can be present but skipped
+            (json[VALUE_TYPE_KEY] !== IGNORE_FIELD_KEY ? json[VALUE_TYPE_KEY] : null) ||
+                schema.properties[VALUE_TYPE_KEY].default
+        : null;
 };
 var getPropertyType = function (def, key, valueType) {
     // default type is object (like $ref)
-    return (key === 'value' && valueType ? valueType : (Array.isArray(def.type) ? (def.type.includes('null') ? 'null' : '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; }
-    return prop !== VALUE_TYPE_KEY && (
-    // only get default if internal or not present
-    (!ignoreInternal && def.internal) || !node || !(prop in node));
+    return prop !== VALUE_TYPE_KEY &&
+        // only get default if internal or not present
+        ((!ignoreInternal && def.internal) || !node || !(prop in node));
 };
 var getDefaultProperties = function (schema, node, ignoreInternal) {
     if (ignoreInternal === void 0) { ignoreInternal = false; }
@@ -453,34 +467,31 @@ var filterProperties = function (data, excludedProps) {
 };
 var nodeType = function (id, type, existingNode) {
     if (existingNode === void 0) { existingNode = false; }
-    return type
-        ? (0, schema_1.isTypeNode)(type)
-            ? existingNode
-                ? { '@type': type }
-                : { id: id, type: type }
-            : { type: type }
-        : {};
+    return type ? ((0, schema_1.isTypeNode)(type) ? (existingNode ? { '@type': type } : { id: id, type: type }) : { type: type }) : {};
 };
 var extendDataFromSchema = function (_a, schema, type, ignoreInternal, addDefaults) {
     var id = _a.id, _t = _a.type, data = __rest(_a, ["id", "type"]);
     if (ignoreInternal === void 0) { ignoreInternal = false; }
     if (addDefaults === void 0) { addDefaults = false; }
-    return (0, utils_1.reduceUndefinedValues)(__assign(__assign(__assign({}, filterProperties(data, ignoreInternal ? [] : internalProperties(schema))), (addDefaults && !('@id' in data) && schema ?
-        getDefaultProperties(schema, data, ignoreInternal).reduce(function (prev, _a) {
+    return (0, 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 property = _a.property, defaultValue = _a.defaultValue;
             prev[property] = defaultValue;
             return prev;
-        }, {}) :
-        {})), nodeType(id, type, '@id' in data)), true);
+        }, {})
+        : {})), nodeType(id, type, '@id' in data)), true);
 };
 var validateArrayType = function (schema, def, key, value) {
-    return typeof value !== 'object' || def.type !== 'array' || Array.isArray(value) || (0, exports.throwCSVError)({
-        schema: schema.title,
-        message: 'object-array-invalid',
-        schemaKey: key,
-        key: key,
-        value: value
-    });
+    return typeof value !== 'object' ||
+        def.type !== 'array' ||
+        Array.isArray(value) ||
+        (0, exports.throwCSVError)({
+            schema: schema.title,
+            message: 'object-array-invalid',
+            schemaKey: key,
+            key: key,
+            value: value
+        });
 };
 var mapContent = function (schemas, schema, ignoreInternal) { return function (json) {
     return Object.keys(json)
@@ -493,11 +504,14 @@ var mapContent = function (schemas, schema, ignoreInternal) { return function (j
         var propertyDefinition = getPropertyDefinition(schema, key, false, json);
         var valueType = getValueType(schema, json);
         var type = getPropertyType(propertyDefinition, key, valueType);
-        // console.log(key, propertyDefinition, valueType, type, typeof value);
         validateArrayType(schema, propertyDefinition, key, value);
-        var newValue = key === VALUE_TYPE_KEY ? '' : propertyInvalidFormat(schema, key, value, function () {
-            return Array.isArray(type) ? value : propertyTypeToValue[type](value, schemas, propertyDefinition, ignoreInternal);
-        });
+        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, schemas) ? {} : (_a = {}, _a[key] = newValue, _a)));
     }, {});
 }; };

package/package.json

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