@speclynx/apidom-core 2.13.1 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-core",
-  "version": "2.13.1",
+  "version": "3.1.0",
   "description": "Tools for manipulating ApiDOM structures.",
   "publishConfig": {
     "access": "public",
@@ -40,9 +40,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
-    "@speclynx/apidom-datamodel": "2.13.1",
-    "@speclynx/apidom-error": "2.13.1",
-    "@speclynx/apidom-traverse": "2.13.1",
+    "@speclynx/apidom-datamodel": "3.1.0",
+    "@speclynx/apidom-error": "3.1.0",
+    "@speclynx/apidom-traverse": "3.1.0",
     "ramda": "~0.32.0",
     "ramda-adjunct": "^6.0.0",
     "short-unique-id": "^5.3.2",
@@ -59,5 +59,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "7a15e77dd776ef85f3e4421f0b4be52362b16f68"
+  "gitHead": "c0807dd0b7770eaaf594bd0013be65e2c28c504a"
 }

package/src/identity/index.cjs

@@ -29,9 +29,9 @@ class IdentityManager {
 
     // use already assigned identity
     if (element.hasMetaProperty('id')) {
-      const existingId = element.meta.get('id');
-      if ((0, _apidomDatamodel.isStringElement)(existingId) && !existingId.equals('')) {
-        return element.id;
+      const existingId = element.id;
+      if (typeof existingId === 'string' && existingId !== '') {
+        return existingId;
       }
     }
 
@@ -41,7 +41,7 @@ class IdentityManager {
     }
 
     // return element identity
-    const id = new _apidomDatamodel.StringElement(this.generateId());
+    const id = this.generateId();
     this.identityMap.set(element, id);
     return id;
   }

package/src/identity/index.mjs

@@ -1,4 +1,4 @@
-import { StringElement, isElement, isStringElement } from '@speclynx/apidom-datamodel';
+import { isElement } from '@speclynx/apidom-datamodel';
 import ShortUniqueId from 'short-unique-id';
 import ElementIdentityError from "./errors/ElementIdentityError.mjs";
 /**
@@ -24,9 +24,9 @@ export class IdentityManager {
 
     // use already assigned identity
     if (element.hasMetaProperty('id')) {
-      const existingId = element.meta.get('id');
-      if (isStringElement(existingId) && !existingId.equals('')) {
-        return element.id;
+      const existingId = element.id;
+      if (typeof existingId === 'string' && existingId !== '') {
+        return existingId;
       }
     }
 
@@ -36,7 +36,7 @@ export class IdentityManager {
     }
 
     // return element identity
-    const id = new StringElement(this.generateId());
+    const id = this.generateId();
     this.identityMap.set(element, id);
     return id;
   }

package/src/merge/deepmerge.cjs

@@ -46,7 +46,7 @@ var _value = _interopRequireDefault(require("../transformers/serializers/value.c
  */
 
 const emptyElement = element => {
-  const meta = !element.isMetaEmpty ? (0, _apidomDatamodel.cloneDeep)(element.meta) : undefined;
+  const meta = !element.isMetaEmpty ? element.meta.cloneDeep() : undefined;
   const attributes = !element.isAttributesEmpty ? (0, _apidomDatamodel.cloneDeep)(element.attributes) : undefined;
 
   // @ts-ignore
@@ -63,7 +63,7 @@ const getMergeFunction = (keyElement, options) => {
 };
 const getMetaMergeFunction = options => {
   if (typeof options.customMetaMerge !== 'function') {
-    return targetMeta => (0, _apidomDatamodel.cloneDeep)(targetMeta);
+    return targetMeta => targetMeta.cloneDeep();
   }
   return options.customMetaMerge;
 };
@@ -135,8 +135,20 @@ const deepmerge = (targetElement, sourceElement, options) => {
   const mergedElement = sourceIsArrayElement && typeof mergedOptions.arrayElementMerge === 'function' ? mergedOptions.arrayElementMerge(targetElement, sourceElement, mergedOptions) : mergedOptions.objectElementMerge(targetElement, sourceElement, mergedOptions);
 
   // merging meta & attributes
-  mergedElement.meta = getMetaMergeFunction(mergedOptions)(targetElement.meta, sourceElement.meta);
-  mergedElement.attributes = getAttributesMergeFunction(mergedOptions)(targetElement.attributes, sourceElement.attributes);
+  if (!targetElement.isMetaEmpty && !sourceElement.isMetaEmpty) {
+    mergedElement.meta = getMetaMergeFunction(mergedOptions)(targetElement.meta, sourceElement.meta);
+  } else if (!targetElement.isMetaEmpty) {
+    mergedElement.meta = targetElement.meta.cloneDeep();
+  } else if (!sourceElement.isMetaEmpty) {
+    mergedElement.meta = sourceElement.meta.cloneDeep();
+  }
+  if (!targetElement.isAttributesEmpty && !sourceElement.isAttributesEmpty) {
+    mergedElement.attributes = getAttributesMergeFunction(mergedOptions)(targetElement.attributes, sourceElement.attributes);
+  } else if (!targetElement.isAttributesEmpty) {
+    mergedElement.attributes = (0, _apidomDatamodel.cloneDeep)(targetElement.attributes);
+  } else if (!sourceElement.isAttributesEmpty) {
+    mergedElement.attributes = (0, _apidomDatamodel.cloneDeep)(sourceElement.attributes);
+  }
   return mergedElement;
 };
 deepmerge.all = (list, options) => {

package/src/merge/deepmerge.mjs

@@ -31,7 +31,7 @@ import toValue from "../transformers/serializers/value.mjs";
  * @public
  */
 export const emptyElement = element => {
-  const meta = !element.isMetaEmpty ? cloneDeep(element.meta) : undefined;
+  const meta = !element.isMetaEmpty ? element.meta.cloneDeep() : undefined;
   const attributes = !element.isAttributesEmpty ? cloneDeep(element.attributes) : undefined;
 
   // @ts-ignore
@@ -47,7 +47,7 @@ const getMergeFunction = (keyElement, options) => {
 };
 const getMetaMergeFunction = options => {
   if (typeof options.customMetaMerge !== 'function') {
-    return targetMeta => cloneDeep(targetMeta);
+    return targetMeta => targetMeta.cloneDeep();
   }
   return options.customMetaMerge;
 };
@@ -119,8 +119,20 @@ const deepmerge = (targetElement, sourceElement, options) => {
   const mergedElement = sourceIsArrayElement && typeof mergedOptions.arrayElementMerge === 'function' ? mergedOptions.arrayElementMerge(targetElement, sourceElement, mergedOptions) : mergedOptions.objectElementMerge(targetElement, sourceElement, mergedOptions);
 
   // merging meta & attributes
-  mergedElement.meta = getMetaMergeFunction(mergedOptions)(targetElement.meta, sourceElement.meta);
-  mergedElement.attributes = getAttributesMergeFunction(mergedOptions)(targetElement.attributes, sourceElement.attributes);
+  if (!targetElement.isMetaEmpty && !sourceElement.isMetaEmpty) {
+    mergedElement.meta = getMetaMergeFunction(mergedOptions)(targetElement.meta, sourceElement.meta);
+  } else if (!targetElement.isMetaEmpty) {
+    mergedElement.meta = targetElement.meta.cloneDeep();
+  } else if (!sourceElement.isMetaEmpty) {
+    mergedElement.meta = sourceElement.meta.cloneDeep();
+  }
+  if (!targetElement.isAttributesEmpty && !sourceElement.isAttributesEmpty) {
+    mergedElement.attributes = getAttributesMergeFunction(mergedOptions)(targetElement.attributes, sourceElement.attributes);
+  } else if (!targetElement.isAttributesEmpty) {
+    mergedElement.attributes = cloneDeep(targetElement.attributes);
+  } else if (!sourceElement.isAttributesEmpty) {
+    mergedElement.attributes = cloneDeep(sourceElement.attributes);
+  }
   return mergedElement;
 };
 deepmerge.all = (list, options) => {

package/types/apidom-core.d.ts

@@ -23,12 +23,12 @@ import { isPrimitiveElement } from '@speclynx/apidom-datamodel';
 import { isRefElement } from '@speclynx/apidom-datamodel';
 import { isSourceMapElement } from '@speclynx/apidom-datamodel';
 import { isStringElement } from '@speclynx/apidom-datamodel';
+import { Metadata } from '@speclynx/apidom-datamodel';
 import { Namespace } from '@speclynx/apidom-datamodel';
 import { ObjectElement } from '@speclynx/apidom-datamodel';
 import { Path } from '@speclynx/apidom-traverse';
 import { SchemaOptions } from 'yaml';
 import ShortUniqueId from 'short-unique-id';
-import { StringElement } from '@speclynx/apidom-datamodel';
 import { ToStringOptions } from 'yaml';
 
 /**
@@ -72,7 +72,7 @@ export declare type DeepMergeCustomMerge = (keyElement: Element_2, options: Deep
 /**
  * @public
  */
-export declare type DeepMergeCustomMetaMerge = (targetElementMeta: ObjectElement, sourceElementMeta: ObjectElement) => ObjectElement;
+export declare type DeepMergeCustomMetaMerge = (targetElementMeta: Metadata, sourceElementMeta: Metadata) => Metadata;
 
 /**
  * @public
@@ -222,11 +222,11 @@ export declare const from: (data: unknown, namespace?: Namespace) => Element_2 |
  */
 export declare class IdentityManager {
     protected readonly uuid: ShortUniqueId;
-    protected readonly identityMap: WeakMap<Element_2, StringElement>;
+    protected readonly identityMap: WeakMap<Element_2, string>;
     constructor({ length }?: {
         length?: number | undefined;
     });
-    identify<T extends Element_2>(this: IdentityManager, element: T): StringElement;
+    identify<T extends Element_2>(this: IdentityManager, element: T): string;
     forget<T extends Element_2>(element: T): boolean;
     generateId(): string;
 }