@hestia-earth/schema-convert 32.1.1 → 32.2.0

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' ||
@@ -565,8 +573,7 @@ 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);
-    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.1",
+  "version": "32.2.0",
   "description": "HESTIA Schema Converters",
   "main": "index.js",
   "typings": "index.d.ts",