@hestia-earth/schema-convert 32.0.2 → 32.1.0

package/json.d.ts

@@ -43,16 +43,14 @@ interface IConversionParams {
      * Add default values (see `default: true` in the schema). Defaults to `true`.
      */
     addDefaults?: boolean;
-}
-interface IExtendedConversionParams extends IConversionParams {
     /**
-     * If it's an existing Node on HESTIA, i.e. the `@id` is used instead of `id`.
+     * If it's an existing Node on HESTIA, i.e. the `@type` / `@id` is used instead of ``type / `id`.
      */
-    existingNode?: boolean;
+    convertToExistingNodes?: boolean;
 }
 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?: IExtendedConversionParams) => any;
+export declare const formatNode: (schemas: definitions, type: SchemaType, data: ICSVContent, params?: IConversionParams) => any;
 export declare const filterEmptyNode: (schemas: definitions, node: any) => boolean;
 /**
  * Convert CSV to HESTIA JSON-LD format.

package/json.js

@@ -497,14 +497,14 @@ var nodeType = function (id, type, existingNode) {
 };
 var extendDataFromSchema = function (_a, schema, type, _b) {
     var id = _a.id, _t = _a.type, data = __rest(_a, ["id", "type"]);
-    var _c = _b === void 0 ? {} : _b, ignoreInternal = _c.ignoreInternal, addDefaults = _c.addDefaults, existingNode = _c.existingNode;
+    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
         ? 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 || existingNode)), true);
+        : {})), nodeType(id, type, '@id' in data || convertToExistingNodes)), true);
 };
 var validateArrayType = function (schema, def, key, value) {
     return typeof value !== 'object' ||
@@ -565,7 +565,8 @@ var formatNode = function (schemas, type, data, params) {
     if (params === void 0) { params = {}; }
     var schema = type in schemas && exports.acceptedNodeTypes.includes(type) ? schemas[type] : schemaNotFoundError(type);
     var content = mapContent(schemas, schema, params)(data);
-    return (0, utils_1.reduceUndefinedValues)(__assign({ id: isEmptyCell(data.id) ? undefined : data.id }, extendDataFromSchema(content, schema, type, params)), true);
+    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);
 };
 exports.formatNode = formatNode;
 var filterEmptyNode = function (schemas, node) {
@@ -579,7 +580,7 @@ var convetToNode = function (schemas, params) { return function (data) {
     return Object.keys(data)
         .filter(utils_1.nonEmptyValue)
         .map(function (type) {
-        return (0, exports.formatNode)(schemas, (0, schema_1.typeToSchemaType)(type) || type, data[type], __assign(__assign({}, params), { existingNode: typeof data[type] === 'object' ? '@id' in data[type] : false }));
+        return (0, exports.formatNode)(schemas, (0, schema_1.typeToSchemaType)(type) || type, data[type], __assign(__assign({}, params), { convertToExistingNodes: params.convertToExistingNodes || (typeof data[type] === 'object' ? '@id' in data[type] : false) }));
     })
         .filter(function (node) { return (0, exports.filterEmptyNode)(schemas, node); });
 }; };

package/package.json

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