@hestia-earth/schema-convert 32.1.0 → 32.1.2

package/json.d.ts

@@ -34,7 +34,7 @@ export declare enum ErrorKeys {
     DuplicatedIdFields = "duplicated-id-fields",
     ObjectArrayInvalid = "object-array-invalid"
 }
-interface IConversionParams {
+export interface IJSONConversionParams {
     /**
      * Ignore all internal fields (see `internal: true` in the schema). Defaults to `true`.
      */
@@ -50,7 +50,7 @@ interface IConversionParams {
 }
 export declare const throwCSVErrors: <T extends ICSVError>(errors: T[]) => never;
 export declare const cleanStringValue: (value: string) => string;
-export declare const formatNode: (schemas: definitions, type: SchemaType, data: ICSVContent, params?: IConversionParams) => any;
+export declare const formatNode: (schemas: definitions, type: SchemaType, data: ICSVContent, params?: IJSONConversionParams) => any;
 export declare const filterEmptyNode: (schemas: definitions, node: any) => boolean;
 /**
  * Convert CSV to HESTIA JSON-LD format.
@@ -60,5 +60,5 @@ export declare const filterEmptyNode: (schemas: definitions, node: any) => boole
  * @param params Conversion parameters.
  * @returns A list of JSON-LD content.
  */
-export declare const toJson: (schemas: definitions, content: string, params?: IConversionParams) => Promise<any[]>;
+export declare const toJson: (schemas: definitions, content: string, params?: IJSONConversionParams) => Promise<any[]>;
 export {};

package/json.js

@@ -493,18 +493,26 @@ var filterProperties = function (data, excludedProps) {
 };
 var nodeType = function (id, type, existingNode) {
     if (existingNode === void 0) { existingNode = false; }
-    return type ? (existingNode ? { '@type': type } : { id: id, type: type }) : {};
+    return type
+        ? existingNode
+            ? (0, schema_1.isTypeNode)(type)
+                ? { '@type': type, '@id': id }
+                : { '@type': type }
+            : (0, schema_1.isTypeNode)(type)
+                ? { type: type, id: id }
+                : { type: type }
+        : {};
 };
 var extendDataFromSchema = function (_a, schema, type, _b) {
-    var id = _a.id, _t = _a.type, data = __rest(_a, ["id", "type"]);
+    var id = _a.id, _id = _a["@id"], _t = _a.type, data = __rest(_a, ["id", '@id', "type"]);
     var _c = _b === void 0 ? {} : _b, ignoreInternal = _c.ignoreInternal, addDefaults = _c.addDefaults, convertToExistingNodes = _c.convertToExistingNodes;
-    return (0, utils_1.reduceUndefinedValues)(__assign(__assign(__assign({}, filterProperties(data, ignoreInternal ? [] : internalProperties(schema))), (addDefaults && !('@id' in data) && schema
+    return (0, utils_1.reduceUndefinedValues)(__assign(__assign(__assign({}, filterProperties(data, ignoreInternal ? [] : internalProperties(schema))), (addDefaults && !_id && 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 || convertToExistingNodes)), true);
+        : {})), nodeType(id || _id, type, !!_id || convertToExistingNodes)), true);
 };
 var validateArrayType = function (schema, def, key, value) {
     return typeof value !== 'object' ||
@@ -566,7 +574,7 @@ var formatNode = function (schemas, type, data, params) {
     var schema = type in schemas && exports.acceptedNodeTypes.includes(type) ? schemas[type] : schemaNotFoundError(type);
     var content = mapContent(schemas, schema, params)(data);
     var id = isEmptyCell(data.id) ? undefined : data.id;
-    return (0, utils_1.reduceUndefinedValues)(__assign(__assign({}, (params.convertToExistingNodes ? { '@id': id } : { id: id })), extendDataFromSchema(content, schema, type, params)), true);
+    return (0, utils_1.reduceUndefinedValues)(extendDataFromSchema(content, schema, type, params), true);
 };
 exports.formatNode = formatNode;
 var filterEmptyNode = function (schemas, node) {

package/package.json

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