@hestia-earth/schema-convert 7.3.0 → 7.5.0

package/json.d.ts

@@ -1,5 +1,5 @@
 import { SchemaType } from '@hestia-earth/schema';
-import { definitions } from '@hestia-earth/json-schema';
+import { definitions } from '@hestia-earth/json-schema/types';
 export interface INode {
     type: SchemaType;
     id?: string;
@@ -24,7 +24,8 @@ 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) => any;
+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;
 /**
  * Convert CSV to Hestia JSON-LD format.
  *

package/json.js

@@ -58,14 +58,22 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJson = exports.formatNode = exports.cleanStringValue = exports.throwCSVError = void 0;
+exports.toJson = exports.filterEmptyNode = exports.formatNode = exports.cleanStringValue = exports.throwCSVError = void 0;
 var csvtojson = require("csvtojson");
 var schema_1 = require("@hestia-earth/schema");
-var json_schema_1 = require("@hestia-earth/json-schema");
+var types_1 = require("@hestia-earth/json-schema/types");
 var utils_1 = require("./utils");
 var IGNORE_FIELD_KEY = '-';
 var VALUE_TYPE_KEY = 'valueType';
-var ARRAY_DELIMITER = process.env.CSV_ARRAY_DELIMITER || ';';
+var DEFAULT_ARRAY_DELIMITER = ';';
+var arrayDelimiter = function () {
+    try {
+        return process.env.CSV_ARRAY_DELIMITER || DEFAULT_ARRAY_DELIMITER;
+    }
+    catch (err) {
+        return DEFAULT_ARRAY_DELIMITER;
+    }
+};
 var safeParseJSON = function (obj) {
     // throw already handled error or throw a generic invalid-format error
     var data;
@@ -159,7 +167,7 @@ var propertyTypeToValue = {
     },
     array: function (value, schemas, _a, _i) {
         var items = _a.items;
-        return (Array.isArray(value) ? value : value.split(ARRAY_DELIMITER))
+        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) ?
@@ -208,7 +216,7 @@ var setDefaultProperty = function (prop, def, node, ignoreInternal) {
 };
 var getDefaultProperties = function (schema, node, ignoreInternal) {
     if (ignoreInternal === void 0) { ignoreInternal = false; }
-    return json_schema_1.defaultProperties(schema)
+    return types_1.defaultProperties(schema)
         .map(function (property) {
         var def = schema.properties[property];
         return setDefaultProperty(property, def, node, ignoreInternal) ? { property: property, defaultValue: def.default } : null;
@@ -227,10 +235,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) {
+var extendDataFromSchema = function (_a, schema, type, ignoreInternal, top) {
     if (ignoreInternal === void 0) { ignoreInternal = false; }
+    if (top === void 0) { top = 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))), (schema ?
+    return utils_1.reduceUndefinedValues(__assign(__assign(__assign({}, filterProperties(data, ignoreInternal ? [] : internalProperties(schema))), (top && schema ?
         getDefaultProperties(schema, data, ignoreInternal).reduce(function (prev, _a) {
             var _b;
             var property = _a.property, defaultValue = _a.defaultValue;
@@ -256,12 +265,13 @@ var mapContent = function (schemas, schema, ignoreInternal) { return function (j
         return __assign(__assign(__assign({}, prev), (schema.$id ? { type: schema.title } : {})), (isEmptyValue(newValue) ? {} : (_a = {}, _a[key] = newValue, _a)));
     }, {});
 }; };
-exports.formatNode = function (schemas, type, data, ignoreInternal) {
+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)));
+    return utils_1.reduceUndefinedValues(__assign({ id: !nonEmptyCell(data.id) ? undefined : data.id }, extendDataFromSchema(content, schema, type, ignoreInternal, top)));
 };
-var filterEmptyNode = function (schemas, _a) {
+exports.filterEmptyNode = function (schemas, _a) {
     var schemaVersion = _a.schemaVersion, node = __rest(_a, ["schemaVersion"]);
     // make sure defaultProperties are not counted
     var schema = node.type ? schemas[node.type] : null;
@@ -271,8 +281,8 @@ var filterEmptyNode = function (schemas, _a) {
 var convetToNode = function (schemas) { return function (data) {
     return Object.keys(data)
         .filter(utils_1.nonEmptyValue)
-        .map(function (type) { return exports.formatNode(schemas, schema_1.typeToSchemaType(type), data[type], true); })
-        .filter(function (node) { return filterEmptyNode(schemas, node); });
+        .map(function (type) { return exports.formatNode(schemas, schema_1.typeToSchemaType(type), data[type], true, true); })
+        .filter(function (node) { return exports.filterEmptyNode(schemas, node); });
 }; };
 /**
  * Convert CSV to Hestia JSON-LD format.

package/package.json

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