@boundaries/elements 1.2.0 → 2.0.0-beta.2

package/dist/index.browser.js

@@ -45,8 +45,9 @@ __export(src_exports, {
   isBaseElementSelectorData: () => isBaseElementSelectorData,
   isCapturedValuesSelector: () => isCapturedValuesSelector,
   isCoreDependencyElement: () => isCoreDependencyElement,
+  isDependencyDataSelector: () => isDependencyDataSelector,
+  isDependencyDataSelectorData: () => isDependencyDataSelectorData,
   isDependencyDescription: () => isDependencyDescription,
-  isDependencyElementDescription: () => isDependencyElementDescription,
   isDependencyKind: () => isDependencyKind,
   isDependencyRelationship: () => isDependencyRelationship,
   isDependencyRelationshipDescription: () => isDependencyRelationshipDescription,
@@ -63,12 +64,6 @@ __export(src_exports, {
   isElementsDependencyInfo: () => isElementsDependencyInfo,
   isElementsSelector: () => isElementsSelector,
   isExternalDependencyElement: () => isExternalDependencyElement,
-  isExternalLibrariesSelector: () => isExternalLibrariesSelector,
-  isExternalLibrarySelector: () => isExternalLibrarySelector,
-  isExternalLibrarySelectorOptions: () => isExternalLibrarySelectorOptions,
-  isExternalLibrarySelectorOptionsWithPath: () => isExternalLibrarySelectorOptionsWithPath,
-  isExternalLibrarySelectorOptionsWithSpecifiers: () => isExternalLibrarySelectorOptionsWithSpecifiers,
-  isExternalLibrarySelectorWithOptions: () => isExternalLibrarySelectorWithOptions,
   isIgnoredElement: () => isIgnoredElement,
   isInternalDependency: () => isInternalDependency,
   isKnownLocalElement: () => isKnownLocalElement,
@@ -76,6 +71,7 @@ __export(src_exports, {
   isLocalElement: () => isLocalElement,
   isSimpleElementSelectorByType: () => isSimpleElementSelectorByType,
   isUnknownLocalElement: () => isUnknownLocalElement,
+  normalizeElementSelector: () => normalizeElementSelector,
   normalizeElementsSelector: () => normalizeElementsSelector
 });
 module.exports = __toCommonJS(src_exports);
@@ -84,12 +80,15 @@ module.exports = __toCommonJS(src_exports);
 function isString(value) {
   return typeof value === "string";
 }
-function isNullish(value) {
-  return value === null || value === void 0;
+function isUndefined(value) {
+  return value === void 0;
 }
 function isNull(value) {
   return value === null;
 }
+function isNullish(value) {
+  return isUndefined(value) || isNull(value);
+}
 function isBoolean(value) {
   return typeof value === "boolean";
 }
@@ -199,102 +198,8 @@ var Config = class {
 
 // src/Matcher/BaseElementsMatcher.ts
 var import_handlebars = __toESM(require("handlebars"));
-
-// src/Matcher/MatcherHelpers.ts
-function isCapturedValuesSelector(value) {
-  if (!isObject(value) || isArray(value)) {
-    return false;
-  }
-  return Object.values(value).every(
-    (pattern) => isString(pattern) || isStringArray(pattern)
-  );
-}
-function isSimpleElementSelectorByType(value) {
-  return isString(value);
-}
-function isBaseElementSelectorData(value) {
-  return isObjectWithAnyOfProperties(value, [
-    "path",
-    "elementPath",
-    "internalPath",
-    "type",
-    "category",
-    "captured",
-    "origin",
-    "source",
-    "baseSource",
-    "isIgnored",
-    "isUnknown"
-  ]);
-}
-function isElementSelectorData(value) {
-  return isBaseElementSelectorData(value) || isObjectWithAnyOfProperties(value, [
-    "relationship",
-    "kind",
-    "specifiers",
-    "nodeKind"
-  ]);
-}
-function isElementSelectorWithLegacyOptions(value) {
-  return isArray(value) && (value.length === 2 && isSimpleElementSelectorByType(value[0]) && // NOTE: Arrays of length 2 with captured values selector as second element having a key "type" or "category" will be treated as legacy options instead of two different selectors. We have to live with this limitation for now.
-  isCapturedValuesSelector(value[1]) || // NOTE: Backwards compatibility: Allow arrays of length 1 with simple element selector. Some users might defined arrays without options.
-  value.length === 1 && isSimpleElementSelectorByType(value[0]));
-}
-function isElementSelector(value) {
-  return isSimpleElementSelectorByType(value) || isElementSelectorData(value) || isElementSelectorWithLegacyOptions(value);
-}
-function isElementsSelector(value) {
-  return isElementSelector(value) || isArray(value) && !isEmptyArray(value) && value.every(isElementSelector);
-}
-function isDependencySelector(value) {
-  return isObjectWithAnyOfProperties(value, ["from", "to"]);
-}
-function isExternalLibrarySelectorOptionsWithPath(value) {
-  return isObjectWithProperty(value, "path") && (isString(value.path) || isStringArray(value.path));
-}
-function isExternalLibrarySelectorOptionsWithSpecifiers(value) {
-  return isObjectWithProperty(value, "specifiers") && isStringArray(value.specifiers);
-}
-function isExternalLibrarySelectorOptions(value) {
-  return isExternalLibrarySelectorOptionsWithPath(value) || isExternalLibrarySelectorOptionsWithSpecifiers(value);
-}
-function isExternalLibrarySelectorWithOptions(value) {
-  return isArray(value) && value.length === 2 && isSimpleElementSelectorByType(value[0]) && isExternalLibrarySelectorOptions(value[1]);
-}
-function isExternalLibrarySelector(value) {
-  return isSimpleElementSelectorByType(value) || isExternalLibrarySelectorWithOptions(value);
-}
-function isExternalLibrariesSelector(value) {
-  return isExternalLibrarySelector(value) || isArray(value) && !isEmptyArray(value) && value.every(isExternalLibrarySelector);
-}
-
-// src/Matcher/BaseElementsMatcher.ts
-var HANDLEBARS_TEMPLATE_REGEX = /{{\s*[^}\s]+(?:\s+[^}\s]+)*\s*}}/;
 var LEGACY_TEMPLATE_REGEX = /\$\{([^}]+)\}/g;
-function normalizeSelector(selector) {
-  if (isSimpleElementSelectorByType(selector)) {
-    return { type: selector };
-  }
-  if (isElementSelectorData(selector)) {
-    return { ...selector };
-  }
-  if (isElementSelectorWithLegacyOptions(selector)) {
-    return {
-      type: selector[0],
-      captured: selector[1] ? { ...selector[1] } : void 0
-    };
-  }
-  throw new Error("Invalid element selector");
-}
-function normalizeElementsSelector(elementsSelector) {
-  if (isArray(elementsSelector)) {
-    if (isElementSelectorWithLegacyOptions(elementsSelector)) {
-      return [normalizeSelector(elementsSelector)];
-    }
-    return elementsSelector.map((sel) => normalizeSelector(sel));
-  }
-  return [normalizeSelector(elementsSelector)];
-}
+var HANDLEBARS_TEMPLATE_REGEX = /{{\s*[^{}\s][^{}]*}}/;
 var BaseElementsMatcher = class {
   /**
    * Option to use legacy templates with ${} syntax.
@@ -319,6 +224,9 @@ var BaseElementsMatcher = class {
    * @returns The converted template.
    */
   _getBackwardsCompatibleTemplate(template) {
+    if (!template) {
+      return template;
+    }
     return template.replaceAll(LEGACY_TEMPLATE_REGEX, "{{ $1 }}");
   }
   /**
@@ -327,6 +235,9 @@ var BaseElementsMatcher = class {
    * @returns True if the template contains Handlebars syntax, false otherwise.
    */
   _isHandlebarsTemplate(template) {
+    if (!template) {
+      return false;
+    }
     return HANDLEBARS_TEMPLATE_REGEX.test(template);
   }
   /**
@@ -358,6 +269,14 @@ var BaseElementsMatcher = class {
     }
     return this._getRenderedTemplate(template, templateData);
   }
+  /**
+   * Cleans a micromatch pattern by removing falsy values from arrays.
+   * @param pattern The micromatch pattern(s) to clean.
+   * @returns The cleaned pattern. If an array is provided, falsy entries are removed and the resulting array may be empty. If null is provided, null is returned unchanged.
+   */
+  cleanMicromatchPattern(pattern) {
+    return isArray(pattern) ? pattern.filter(Boolean) : pattern;
+  }
   /**
    * Returns whether the given value matches the micromatch pattern, converting non-string values to strings.
    * Optimized version with caching for better performance.
@@ -366,9 +285,18 @@ var BaseElementsMatcher = class {
    * @returns Whether the value matches the pattern.
    */
   isMicromatchMatch(value, pattern) {
+    if (isNull(pattern)) {
+      return isNull(value);
+    }
+    if (isNull(value)) {
+      return isArray(pattern) && pattern.some(isNull);
+    }
+    const patternToCheck = this.cleanMicromatchPattern(pattern);
+    if (!patternToCheck?.length) {
+      return false;
+    }
     const elementValueToCheck = !value || !isString(value) ? String(value) : value;
-    const selectorValueToCheck = isArray(pattern) ? pattern.filter(Boolean) : pattern;
-    return this.micromatch.isMatch(elementValueToCheck, selectorValueToCheck);
+    return this.micromatch.isMatch(elementValueToCheck, patternToCheck);
   }
   /**
    * Returns whether the given value matches the micromatch pattern after rendering it as a template.
@@ -378,18 +306,17 @@ var BaseElementsMatcher = class {
    * @returns Whether the value matches the rendered pattern.
    */
   isTemplateMicromatchMatch(pattern, templateData, value) {
-    if (isNullish(value)) {
+    if (isUndefined(value)) {
       return false;
     }
     const patternRendered = this.getRenderedTemplates(pattern, templateData);
-    if (!patternRendered) {
+    if (!isNull(patternRendered) && !patternRendered) {
       return false;
     }
-    const filteredPattern = isArray(patternRendered) ? patternRendered.filter(Boolean) : patternRendered;
     if (isArray(value)) {
-      return value.some((val) => this.isMicromatchMatch(val, filteredPattern));
+      return value.some((val) => this.isMicromatchMatch(val, patternRendered));
     }
-    return this.isMicromatchMatch(value, filteredPattern);
+    return this.isMicromatchMatch(value, patternRendered);
   }
   /**
    * Whether the given element key matches the selector key as booleans.
@@ -433,20 +360,113 @@ var BaseElementsMatcher = class {
     if (!(selectorKey in selector)) {
       return true;
     }
-    if (!selectorValue) {
-      return false;
-    }
-    if (!isObjectWithProperty(element, elementKey)) {
+    if (isUndefined(selectorValue) || !isObjectWithProperty(element, String(elementKey))) {
       return false;
     }
+    const elementValue = element[elementKey];
     return this.isTemplateMicromatchMatch(
       selectorValue,
       templateData,
-      element[elementKey]
+      elementValue
     );
   }
 };
 
+// src/Matcher/MatcherHelpers.ts
+function isCapturedValuesObjectSelector(value) {
+  if (!isObject(value) || isArray(value)) {
+    return false;
+  }
+  return Object.values(value).every(
+    (pattern) => isString(pattern) || isStringArray(pattern)
+  );
+}
+function isCapturedValuesSelector(value) {
+  if (isArray(value)) {
+    return value.every((item) => isCapturedValuesObjectSelector(item));
+  }
+  return isCapturedValuesObjectSelector(value);
+}
+function isSimpleElementSelectorByType(value) {
+  return isString(value);
+}
+function isBaseElementSelectorData(value) {
+  return isObjectWithAnyOfProperties(value, [
+    "path",
+    "elementPath",
+    "internalPath",
+    "type",
+    "category",
+    "captured",
+    "parent",
+    "origin",
+    "source",
+    "module",
+    "isIgnored",
+    "isUnknown"
+  ]);
+}
+function isElementSelectorData(value) {
+  return isBaseElementSelectorData(value);
+}
+function isElementSelectorWithLegacyOptions(value) {
+  return isArray(value) && (value.length === 2 && isSimpleElementSelectorByType(value[0]) && // NOTE: Arrays of length 2 with captured values selector as second element having a key "type" or "category" will be treated as legacy options instead of two different selectors. We have to live with this limitation for now.
+  isCapturedValuesSelector(value[1]) || // NOTE: Backwards compatibility: Allow arrays of length 1 with simple element selector. Some users might defined arrays without options.
+  value.length === 1 && isSimpleElementSelectorByType(value[0]));
+}
+function isElementSelector(value) {
+  return isSimpleElementSelectorByType(value) || isElementSelectorData(value) || isElementSelectorWithLegacyOptions(value);
+}
+function isElementsSelector(value) {
+  return isElementSelector(value) || isArray(value) && !isEmptyArray(value) && value.every(isElementSelector);
+}
+function normalizeElementSelector(selector) {
+  if (isSimpleElementSelectorByType(selector)) {
+    return { type: selector };
+  }
+  if (isElementSelectorData(selector)) {
+    return { ...selector };
+  }
+  if (isElementSelectorWithLegacyOptions(selector)) {
+    return {
+      type: selector[0],
+      captured: selector[1] ? { ...selector[1] } : void 0
+    };
+  }
+  throw new Error("Invalid element selector");
+}
+function normalizeElementsSelector(elementsSelector) {
+  if (isArray(elementsSelector)) {
+    if (isElementSelectorWithLegacyOptions(elementsSelector)) {
+      return [normalizeElementSelector(elementsSelector)];
+    }
+    return elementsSelector.map((sel) => normalizeElementSelector(sel));
+  }
+  return [normalizeElementSelector(elementsSelector)];
+}
+function isDependencySelector(value) {
+  if (!isObjectWithAnyOfProperties(value, ["from", "to", "dependency"])) {
+    return false;
+  }
+  const fromIsValid = !isObjectWithProperty(value, "from") || isElementsSelector(value.from);
+  const toIsValid = !isObjectWithProperty(value, "to") || isElementsSelector(value.to);
+  const dependencyIsValid = !isObjectWithProperty(value, "dependency") || isDependencyDataSelector(value.dependency);
+  return fromIsValid && toIsValid && dependencyIsValid;
+}
+function isDependencyDataSelectorData(value) {
+  return isObjectWithAnyOfProperties(value, [
+    "kind",
+    "relationship",
+    "specifiers",
+    "nodeKind",
+    "source",
+    "module"
+  ]);
+}
+function isDependencyDataSelector(value) {
+  return isDependencyDataSelectorData(value) || isArray(value) && !isEmptyArray(value) && value.every(isDependencyDataSelectorData);
+}
+
 // src/Matcher/DependenciesMatcher.ts
 var DependenciesMatcher = class extends BaseElementsMatcher {
   /**
@@ -469,68 +489,20 @@ var DependenciesMatcher = class extends BaseElementsMatcher {
    * @param selector The dependency selector to normalize.
    * @returns The normalized dependency selector.
    */
-  _normalizeDependencySelector(selector, dependencySelectorsGlobals) {
+  _normalizeDependencySelector(selector) {
     if (!isDependencySelector(selector)) {
       throw new Error("Invalid dependency selector");
     }
-    let normalizedDependencySelectors = selector.to ? normalizeElementsSelector(selector.to) : null;
-    if (normalizedDependencySelectors) {
-      normalizedDependencySelectors = normalizedDependencySelectors.map(
-        (depSelector) => {
-          return {
-            ...dependencySelectorsGlobals,
-            ...depSelector
-          };
-        }
-      );
+    let normalizedDependencySelectors = null;
+    if (selector.dependency && isDependencyDataSelector(selector.dependency)) {
+      normalizedDependencySelectors = isArray(selector.dependency) ? selector.dependency : [selector.dependency];
     }
     return {
       from: selector.from ? normalizeElementsSelector(selector.from) : null,
-      to: normalizedDependencySelectors
+      to: selector.to ? normalizeElementsSelector(selector.to) : null,
+      dependency: normalizedDependencySelectors
     };
   }
-  /**
-   * Converts a DependencyElementSelectorData to a BaseElementSelectorData, by removing dependency-specific properties.
-   * @param selector The dependency element selector data.
-   * @returns The base element selector data.
-   */
-  _convertDependencyElementSelectorDataToBaseElementSelectorData(selector) {
-    const baseSelector = {};
-    if (selector.type) {
-      baseSelector.type = selector.type;
-    }
-    if (selector.category) {
-      baseSelector.category = selector.category;
-    }
-    if (selector.path) {
-      baseSelector.path = selector.path;
-    }
-    if (selector.elementPath) {
-      baseSelector.elementPath = selector.elementPath;
-    }
-    if (selector.internalPath) {
-      baseSelector.internalPath = selector.internalPath;
-    }
-    if (selector.captured) {
-      baseSelector.captured = selector.captured;
-    }
-    if (selector.origin) {
-      baseSelector.origin = selector.origin;
-    }
-    if (selector.baseSource) {
-      baseSelector.baseSource = selector.baseSource;
-    }
-    if (selector.source) {
-      baseSelector.source = selector.source;
-    }
-    if (!isNullish(selector.isIgnored)) {
-      baseSelector.isIgnored = selector.isIgnored;
-    }
-    if (!isNullish(selector.isUnknown)) {
-      baseSelector.isUnknown = selector.isUnknown;
-    }
-    return baseSelector;
-  }
   /**
    * Returns the selectors matching result for the given dependency.
    * @param dependency The dependency description.
@@ -538,56 +510,37 @@ var DependenciesMatcher = class extends BaseElementsMatcher {
    * @param extraTemplateData The extra template data for selector values.
    * @returns The selectors matching result for the given dependency.
    */
-  _getSelectorMatching(dependency, selector, templateData) {
-    const getFromSelectorMatching = () => {
-      for (const fromSelectorData of selector.from) {
-        const fromMatch = this._elementsMatcher.isElementMatch(
-          dependency.from,
-          fromSelectorData,
-          {
-            extraTemplateData: templateData
-          }
-        );
-        const dependencyPropertiesMatch = this._dependencyFromPropertiesMatch(
+  _getSelectorsMatching(dependency, selector, templateData) {
+    const getDependencyMetadataSelectorMatching = () => {
+      for (const dependencySelectorData of selector.dependency) {
+        const dependencyPropertiesMatch = this._dependencyPropertiesMatch(
           dependency,
-          [fromSelectorData],
+          dependencySelectorData,
           templateData
         );
-        if (fromMatch && dependencyPropertiesMatch) {
-          return fromSelectorData;
+        if (dependencyPropertiesMatch) {
+          return dependencySelectorData;
         }
       }
       return null;
     };
-    const getToSelectorMatching = () => {
-      for (const toSelectorData of selector.to) {
-        const toMatch = isBaseElementSelectorData(toSelectorData) ? this._elementsMatcher.isElementMatch(
-          dependency.to,
-          this._convertDependencyElementSelectorDataToBaseElementSelectorData(
-            toSelectorData
-          ),
-          {
-            extraTemplateData: templateData
-          }
-        ) : true;
-        const dependencyPropertiesMatch = this._dependencyToPropertiesMatch(
-          dependency,
-          [toSelectorData],
-          templateData
-        );
-        if (toMatch && dependencyPropertiesMatch) {
-          return toSelectorData;
-        }
+    const fromSelectorMatching = selector.from ? this._elementsMatcher.getSelectorMatching(
+      dependency.from,
+      selector.from,
+      {
+        extraTemplateData: templateData
       }
-      return null;
-    };
-    const fromSelectorMatching = selector.from ? getFromSelectorMatching() : null;
-    const toSelectorMatching = selector.to ? getToSelectorMatching() : null;
+    ) : null;
+    const toSelectorMatching = selector.to ? this._elementsMatcher.getSelectorMatching(dependency.to, selector.to, {
+      extraTemplateData: templateData
+    }) : null;
+    const dependencyMetadataSelectorMatching = selector.dependency ? getDependencyMetadataSelectorMatching() : null;
     return {
       from: fromSelectorMatching,
       to: toSelectorMatching,
+      dependency: dependencyMetadataSelectorMatching,
       isMatch: Boolean(
-        (selector.from ? fromSelectorMatching : true) && (selector.to ? toSelectorMatching : true)
+        (selector.from ? fromSelectorMatching : true) && (selector.to ? toSelectorMatching : true) && (selector.dependency ? dependencyMetadataSelectorMatching : true)
       )
     };
   }
@@ -597,12 +550,29 @@ var DependenciesMatcher = class extends BaseElementsMatcher {
    * @param selector The data of an element selector.
    * @returns Whether the dependency relationship matches the selector.
    */
-  _relationshipMatches(selector, relationship, templateData) {
-    if (!selector.relationship) {
+  _relationshipFromMatches(selector, relationship, templateData) {
+    if (!selector.relationship?.from) {
+      return true;
+    }
+    return this.isTemplateMicromatchMatch(
+      selector.relationship.from,
+      templateData,
+      relationship
+    );
+  }
+  /**
+   * Determines if the dependency origin relationship matches the selector.
+   * @param selector The dependency selector data.
+   * @param relationship The relationship from origin element to target element.
+   * @param templateData The template data for rendering selector values.
+   * @returns Whether the dependency origin relationship matches.
+   */
+  _relationshipToMatches(selector, relationship, templateData) {
+    if (!selector.relationship?.to) {
       return true;
     }
     return this.isTemplateMicromatchMatch(
-      selector.relationship,
+      selector.relationship.to,
       templateData,
       relationship
     );
@@ -655,75 +625,85 @@ var DependenciesMatcher = class extends BaseElementsMatcher {
     );
   }
   /**
-   * Determines if the dependency description matches the selector for 'from'.
+   * Determines if the dependency description matches the selector for 'to'.
    * @param dependency The dependency description.
-   * @param fromSelector The selector for 'from' elements.
+   * @param toSelector The selector for 'to' elements.
    * @param templateData The template data for rendering selector values
-   * @returns Whether the dependency properties match the selector for 'from'.
-   */
-  _dependencyFromPropertiesMatch(dependency, fromSelector, templateData) {
-    return fromSelector.some(
-      (selectorData) => this._relationshipMatches(
-        selectorData,
-        dependency.dependency.relationship.from,
-        templateData
-      )
+   * @returns Whether the dependency properties match the selector for 'to'.
+   */
+  _sourceMatches(selector, source, templateData) {
+    if (!selector.source) {
+      return true;
+    }
+    return this.isTemplateMicromatchMatch(
+      selector.source,
+      templateData,
+      source
     );
   }
   /**
-   * Determines if the dependency description matches the selector for 'to'.
+   * Determines if the selector matches the module
+   * @param selector The dependency selector data
+   * @param module The module to check
+   * @param templateData The template data for rendering selector values
+   * @returns Whether the selector matches the module
+   */
+  _moduleMatches(selector, dependencyModule, templateData) {
+    if (!selector.module) {
+      return true;
+    }
+    return this.isTemplateMicromatchMatch(
+      selector.module,
+      templateData,
+      dependencyModule
+    );
+  }
+  /**
+   * Determines if the dependency description matches the selector for dependency metadata.
    * @param dependency The dependency description.
-   * @param toSelector The selector for 'to' elements.
+   * @param selectorData The selector for dependency metadata.
    * @param templateData The template data for rendering selector values
-   * @returns Whether the dependency properties match the selector for 'to'.
+   * @returns Whether the dependency properties match the selector.
    */
-  _dependencyToPropertiesMatch(dependency, toSelector, templateData) {
+  _dependencyPropertiesMatch(dependency, selectorData, templateData) {
     const dependencyInfo = dependency.dependency;
+    const relationshipFrom = dependencyInfo.relationship.from;
     const relationshipTo = dependencyInfo.relationship.to;
     const kind = dependencyInfo.kind;
     const nodeKind = dependencyInfo.nodeKind;
     const specifiers = dependencyInfo.specifiers;
-    for (const selectorData of toSelector) {
-      if (this._kindMatches(selectorData, kind, templateData) && this._nodeKindMatches(selectorData, nodeKind, templateData) && this._relationshipMatches(selectorData, relationshipTo, templateData) && this._specifierMatches(selectorData, specifiers, templateData)) {
-        return true;
-      }
-    }
-    return false;
+    const source = dependencyInfo.source;
+    const dependencyModule = dependencyInfo.module;
+    return this._kindMatches(selectorData, kind, templateData) && this._nodeKindMatches(selectorData, nodeKind, templateData) && this._sourceMatches(selectorData, source, templateData) && this._moduleMatches(selectorData, dependencyModule, templateData) && this._relationshipFromMatches(
+      selectorData,
+      relationshipFrom,
+      templateData
+    ) && this._relationshipToMatches(selectorData, relationshipTo, templateData) && this._specifierMatches(selectorData, specifiers, templateData);
   }
   /**
    * Returns the selectors matching result for the given dependency.
    * @param dependency The dependency to check.
    * @param selector The selector to check against.
-   * @param options Extra options for matching, such as templates data, globals for dependency selectors, etc.
+   * @param options Extra options for matching, such as templates data, etc.
    * @returns The matching result for the dependency against the selector.
    */
-  getSelectorsMatching(dependency, selector, {
-    extraTemplateData = {},
-    dependencySelectorsGlobals = {}
-  } = {}) {
-    const normalizedSelector = this._normalizeDependencySelector(
-      selector,
-      dependencySelectorsGlobals
-    );
+  getSelectorsMatching(dependency, selector, { extraTemplateData = {} } = {}) {
+    const normalizedSelector = this._normalizeDependencySelector(selector);
     const fromExtraData = extraTemplateData.from || {};
     const toExtraData = extraTemplateData.to || {};
     const templateData = {
       ...extraTemplateData,
       from: {
         ...dependency.from,
-        relationship: dependency.dependency.relationship.from,
         ...fromExtraData
       },
       to: {
         ...dependency.to,
-        relationship: dependency.dependency.relationship.to,
-        kind: dependency.dependency.kind,
-        nodeKind: dependency.dependency.nodeKind,
-        specifiers: dependency.dependency.specifiers,
         ...toExtraData
-      }
+      },
+      dependency: dependency.dependency
     };
-    const result = this._getSelectorMatching(
+    const result = this._getSelectorsMatching(
       dependency,
       normalizedSelector,
       templateData
@@ -734,7 +714,7 @@ var DependenciesMatcher = class extends BaseElementsMatcher {
    * Returns whether the given dependency matches the selector.
    * @param dependency The dependency to check.
    * @param selector The selector to check against.
-   * @param options Extra options for matching, such as templates data, globals for dependency selectors, etc.
+   * @param options Extra options for matching, such as templates data, etc.
    * @returns Whether the dependency matches the selector properties.
    */
   isDependencyMatch(dependency, selector, options) {
@@ -749,8 +729,6 @@ var DependenciesMatcher = class extends BaseElementsMatcher {
 
 // src/Matcher/ElementsMatcher.ts
 var ElementsMatcher = class extends BaseElementsMatcher {
-  /** Whether the cache is enabled or not */
-  _cacheIsEnabled;
   /**
    * Creates a new ElementsSelectorMatcher.
    * @param config Configuration options for the matcher.
@@ -863,41 +841,36 @@ var ElementsMatcher = class extends BaseElementsMatcher {
     });
   }
   /**
-   * Whether the given element baseSource matches the selector baseSource
-   * @param element The element to check.
-   * @param selector The selector to check against.
-   * @param templateData The data to use for replace in selector value
-   * @returns Whether the element baseSource matches the selector baseSource.
-   */
-  _isBaseSourceMatch(element, selector, templateData) {
-    return this.isElementKeyMicromatchMatch({
-      element,
-      selector,
-      elementKey: "baseSource",
-      selectorKey: "baseSource",
-      selectorValue: selector.baseSource,
-      templateData
-    });
-  }
-  /**
-   * Whether the given element source matches the selector source
-   * @param element The element to check.
-   * @param selector The selector to check against.
-   * @param templateData The data to use for replace in selector value
-   * @returns Whether the element source matches the selector source.
+   * Checks if a single captured values object matches the element.
+   * @param capturedValues The captured values to check.
+   * @param capturedSelector The captured values selector object to check against
+   * @param templateData The data to use for replace in selector values
+   * @returns True if all captured values in the selector match those in the element, false otherwise.
    */
-  _isSourceMatch(element, selector, templateData) {
-    return this.isElementKeyMicromatchMatch({
-      element,
-      selector,
-      elementKey: "source",
-      selectorKey: "source",
-      selectorValue: selector.source,
-      templateData
-    });
+  _checkCapturedValuesObject(capturedValues, capturedSelector, templateData) {
+    if (!capturedValues) {
+      return false;
+    }
+    for (const [key, pattern] of Object.entries(capturedSelector)) {
+      const elementValue = capturedValues[key];
+      if (!elementValue) {
+        return false;
+      }
+      const renderedPattern = this.getRenderedTemplates(pattern, templateData);
+      const filteredPattern = this.cleanMicromatchPattern(renderedPattern);
+      if (!filteredPattern) {
+        return false;
+      }
+      const isMatch = this.micromatch.isMatch(elementValue, filteredPattern);
+      if (!isMatch) {
+        return false;
+      }
+    }
+    return true;
   }
   /**
    * Determines if the captured values of the element match those in the selector.
+   * When the selector is an array, the element matches if it matches any of the array elements (OR logic).
    * @param element The element to check.
    * @param selector The selector to check against
    * @param templateData The data to use for replace in selector values
@@ -907,23 +880,98 @@ var ElementsMatcher = class extends BaseElementsMatcher {
     if (!selector.captured || isEmptyObject(selector.captured)) {
       return true;
     }
-    if (!element.captured) {
-      return false;
-    }
-    for (const [key, pattern] of Object.entries(selector.captured)) {
-      const elementValue = element.captured?.[key];
-      if (!elementValue) {
-        return false;
-      }
-      const renderedPattern = this.getRenderedTemplates(pattern, templateData);
-      if (!renderedPattern) {
+    if (isArray(selector.captured)) {
+      if (selector.captured.length === 0) {
         return false;
       }
-      const filteredPattern = isArray(renderedPattern) ? renderedPattern.filter(Boolean) : renderedPattern;
-      const isMatch = this.micromatch.isMatch(elementValue, filteredPattern);
-      if (!isMatch) {
+      return selector.captured.some(
+        (capturedSelector) => this._checkCapturedValuesObject(
+          element.captured,
+          capturedSelector,
+          templateData
+        )
+      );
+    }
+    return this._checkCapturedValuesObject(
+      element.captured,
+      selector.captured,
+      templateData
+    );
+  }
+  /**
+   * Determines if the parent captured values match the selector.
+   * @param parentSelector The parent selector to match.
+   * @param parentCaptured The captured values from first parent.
+   * @param templateData The data to use for replace in selector values
+   * @returns True if the captured values match, false otherwise.
+   */
+  _isParentCapturedValuesMatch(parentSelector, parentCaptured, templateData) {
+    if (!parentSelector.captured || isEmptyObject(parentSelector.captured)) {
+      return true;
+    }
+    if (isArray(parentSelector.captured)) {
+      if (parentSelector.captured.length === 0) {
         return false;
       }
+      return parentSelector.captured.some(
+        (capturedSelector) => this._checkCapturedValuesObject(
+          parentCaptured,
+          capturedSelector,
+          templateData
+        )
+      );
+    }
+    return this._checkCapturedValuesObject(
+      parentCaptured,
+      parentSelector.captured,
+      templateData
+    );
+  }
+  /**
+   * Whether the given element first parent matches the selector parent.
+   * @param element The element to check.
+   * @param selector The selector to check against.
+   * @param templateData The data to use for replace in selector values
+   * @returns Whether the first parent matches the selector parent.
+   */
+  _isParentMatch(element, selector, templateData) {
+    if (isUndefined(selector.parent)) {
+      return true;
+    }
+    if (isNull(selector.parent)) {
+      return !element.parents || element.parents.length === 0;
+    }
+    const firstParent = element.parents?.[0];
+    if (!firstParent) {
+      return false;
+    }
+    if (!isUndefined(selector.parent.type) && !this.isTemplateMicromatchMatch(
+      selector.parent.type,
+      templateData,
+      firstParent.type
+    )) {
+      return false;
+    }
+    if (!isUndefined(selector.parent.category) && !this.isTemplateMicromatchMatch(
+      selector.parent.category,
+      templateData,
+      firstParent.category
+    )) {
+      return false;
+    }
+    if (!isUndefined(selector.parent.elementPath) && !this.isTemplateMicromatchMatch(
+      selector.parent.elementPath,
+      templateData,
+      firstParent.elementPath
+    )) {
+      return false;
+    }
+    if (!this._isParentCapturedValuesMatch(
+      selector.parent,
+      firstParent.captured,
+      templateData
+    )) {
+      return false;
     }
     return true;
   }
@@ -968,7 +1016,7 @@ var ElementsMatcher = class extends BaseElementsMatcher {
       ...extraTemplateData
     };
     for (const selectorData of selectorsData) {
-      if (!this._isTypeMatch(element, selectorData, templateData) || !this._isCategoryMatch(element, selectorData, templateData) || !this._isOriginMatch(element, selectorData, templateData) || !this._isIgnoredMatch(element, selectorData) || !this._isUnknownMatch(element, selectorData) || !this._isPathMatch(element, selectorData, templateData) || !this._isElementPathMatch(element, selectorData, templateData) || !this._isInternalPathMatch(element, selectorData, templateData) || !this._isSourceMatch(element, selectorData, templateData) || !this._isBaseSourceMatch(element, selectorData, templateData) || !this._isCapturedValuesMatch(element, selectorData, templateData)) {
+      if (!this._isTypeMatch(element, selectorData, templateData) || !this._isCategoryMatch(element, selectorData, templateData) || !this._isOriginMatch(element, selectorData, templateData) || !this._isIgnoredMatch(element, selectorData) || !this._isUnknownMatch(element, selectorData) || !this._isPathMatch(element, selectorData, templateData) || !this._isElementPathMatch(element, selectorData, templateData) || !this._isInternalPathMatch(element, selectorData, templateData) || !this._isCapturedValuesMatch(element, selectorData, templateData) || !this._isParentMatch(element, selectorData, templateData)) {
         continue;
       }
       return selectorData;
@@ -980,7 +1028,7 @@ var ElementsMatcher = class extends BaseElementsMatcher {
    * It omits checks in keys applying only to dependency between elements, such as relationship.
    * @param element The element to check.
    * @param selector The selector to check against.
-   * @param options Extra options for matching, such as templates data, globals for dependency selectors, etc.
+   * @param options Extra options for matching, such as templates data, etc.
    * @returns The selector matching result for the given element, or null if none matches.
    */
   getSelectorMatching(element, selector, { extraTemplateData = {} } = {}) {
@@ -992,7 +1040,7 @@ var ElementsMatcher = class extends BaseElementsMatcher {
    * It omits checks in keys applying only to dependency between elements, such as relationship.
    * @param element The element to check.
    * @param selector The selector to check against.
-   * @param options Extra options for matching, such as templates data, globals for dependency selectors, etc.
+   * @param options Extra options for matching, such as templates data, etc.
    * @returns Whether the element matches the selector properties applying to elements.
    */
   isElementMatch(element, selector, options) {
@@ -1059,20 +1107,17 @@ function isUnknownLocalElement(value) {
 function isKnownLocalElement(value) {
   return isLocalElement(value) && value.isUnknown === false;
 }
-function isDependencyElementDescription(value) {
-  return isBaseElement(value) && isObjectWithProperty(value, "source") && isString(value.source);
-}
-function isElementDescription(value) {
-  return isIgnoredElement(value) || isUnknownLocalElement(value) || isKnownLocalElement(value) || isDependencyElementDescription(value);
-}
 function isLocalDependencyElement(value) {
-  return isDependencyElementDescription(value) && isLocalElement(value);
+  return isLocalElement(value) && value.isIgnored === false;
 }
 function isExternalDependencyElement(value) {
-  return isDependencyElementDescription(value) && value.origin === ELEMENT_ORIGINS_MAP.EXTERNAL && isObjectWithProperty(value, "baseSource") && isString(value.baseSource);
+  return isBaseElement(value) && value.origin === ELEMENT_ORIGINS_MAP.EXTERNAL;
 }
 function isCoreDependencyElement(value) {
-  return isDependencyElementDescription(value) && value.origin === ELEMENT_ORIGINS_MAP.CORE && isObjectWithProperty(value, "baseSource") && isString(value.baseSource);
+  return isBaseElement(value) && value.origin === ELEMENT_ORIGINS_MAP.CORE;
+}
+function isElementDescription(value) {
+  return isIgnoredElement(value) || isUnknownLocalElement(value) || isKnownLocalElement(value) || isExternalDependencyElement(value) || isCoreDependencyElement(value);
 }
 
 // src/Descriptor/DependenciesDescriptor.types.ts
@@ -1129,7 +1174,7 @@ function isDependencyRelationshipDescription(value) {
   return isObjectWithProperty(value, "to") && (isNull(value.to) || isDependencyRelationship(value.to)) && isObjectWithProperty(value, "from") && (isNull(value.from) || isDependencyRelationship(value.from));
 }
 function isElementsDependencyInfo(value) {
-  return isObjectWithProperty(value, "kind") && isDependencyKind(value.kind) && isObjectWithProperty(value, "relationship") && isDependencyRelationshipDescription(value.relationship) && isObjectWithProperty(value, "nodeKind") && (isNull(value.nodeKind) || isString(value.nodeKind));
+  return isObjectWithProperty(value, "source") && isString(value.source) && isObjectWithProperty(value, "module") && (isNullish(value.module) || isString(value.module)) && isObjectWithProperty(value, "kind") && isDependencyKind(value.kind) && isObjectWithProperty(value, "relationship") && isDependencyRelationshipDescription(value.relationship) && isObjectWithProperty(value, "nodeKind") && (isNull(value.nodeKind) || isString(value.nodeKind)) && isObjectWithProperty(value, "specifiers") && (isNull(value.specifiers) || isStringArray(value.specifiers));
 }
 function isDependencyDescription(value) {
   return isObjectWithProperty(value, "to") && isElementDescription(value.to) && isObjectWithProperty(value, "from") && isElementDescription(value.from) && isObjectWithProperty(value, "dependency") && isElementsDependencyInfo(value.dependency);
@@ -1467,17 +1512,20 @@ var DependenciesDescriptor = class {
       return this._dependenciesCache.get(cacheKey);
     }
     const fromElement = this._elementsDescriptor.describeElement(from);
-    const toElement = this._elementsDescriptor.describeDependencyElement(
-      source,
-      to
-    );
+    const toElement = this._elementsDescriptor.describeElement(to, source);
+    const { module: dependencyModule, ...toElementDescription } = toElement;
     const result = {
       from: fromElement,
-      to: toElement,
+      to: toElementDescription,
       dependency: {
+        source,
+        module: dependencyModule || null,
         kind,
         nodeKind: nodeKind || null,
-        relationship: this._dependencyRelationships(fromElement, toElement),
+        relationship: this._dependencyRelationships(
+          fromElement,
+          toElementDescription
+        ),
         specifiers: specifiers || null
       }
     };
@@ -1492,8 +1540,6 @@ var UNKNOWN_ELEMENT = {
   path: null,
   elementPath: null,
   internalPath: null,
-  source: null,
-  baseSource: null,
   parents: null,
   type: null,
   category: null,
@@ -1595,8 +1641,8 @@ var ElementsDescriptor = class {
    */
   _dependencySourceIsCoreModule(dependencySource, baseDependencySource) {
     if (this._mod) {
-      const baseSourceWithoutPrefix = baseDependencySource.startsWith("node:") ? baseDependencySource.slice(5) : baseDependencySource;
-      return this._mod.builtinModules.includes(baseSourceWithoutPrefix);
+      const moduleWithoutPrefix = baseDependencySource.startsWith("node:") ? baseDependencySource.slice(5) : baseDependencySource;
+      return this._mod.builtinModules.includes(moduleWithoutPrefix);
     }
     return (0, import_is_core_module.default)(dependencySource);
   }
@@ -1621,7 +1667,7 @@ var ElementsDescriptor = class {
    * @param dependencySource The source of the dependency to check.
    * @returns The base source of the external module. (e.g., for "@scope/package/submodule", it returns "@scope/package")
    */
-  _getExternalOrCoreModuleBaseSource(dependencySource) {
+  _getExternalOrCoreModuleModule(dependencySource) {
     if (this._dependencySourceIsScoped(dependencySource)) {
       const [scope, packageName] = dependencySource.split("/");
       return `${scope}/${packageName}`;
@@ -1932,7 +1978,7 @@ var ElementsDescriptor = class {
    * @returns The external or core dependency element, or null if it is a local dependency.
    */
   _getExternalOrCoreDependencyElement(dependencySource, isOutsideRootPath, filePath) {
-    const baseDependencySource = this._getExternalOrCoreModuleBaseSource(dependencySource);
+    const baseDependencySource = this._getExternalOrCoreModuleModule(dependencySource);
     const isCore = this._dependencySourceIsCoreModule(
       dependencySource,
       baseDependencySource
@@ -1940,8 +1986,7 @@ var ElementsDescriptor = class {
     if (isCore) {
       const coreElement = {
         ...UNKNOWN_ELEMENT,
-        source: dependencySource,
-        baseSource: baseDependencySource,
+        module: baseDependencySource,
         origin: ELEMENT_ORIGINS_MAP.CORE
       };
       return coreElement;
@@ -1955,9 +2000,8 @@ var ElementsDescriptor = class {
       const externalElement = {
         ...UNKNOWN_ELEMENT,
         path: filePath || null,
-        internalPath: dependencySource.replace(baseDependencySource, ""),
-        source: dependencySource,
-        baseSource: baseDependencySource,
+        internalPath: dependencySource.replace(baseDependencySource, "") || null,
+        module: baseDependencySource,
         origin: ELEMENT_ORIGINS_MAP.EXTERNAL
       };
       return externalElement;
@@ -1982,28 +2026,10 @@ var ElementsDescriptor = class {
       return externalOrCoreDependencyElement;
     }
     const fileDescription = this._describeFile(relativePath);
-    const elementResult = dependencySource ? {
-      ...fileDescription,
-      source: dependencySource
-    } : fileDescription;
-    this._descriptionsCache.set(cacheKey, elementResult);
-    return elementResult;
+    this._descriptionsCache.set(cacheKey, fileDescription);
+    return fileDescription;
   }
-  /**
-   * Describes an element given its file path.
-   * @param filePath The path of the file to describe. Can be absolute if rootPath is configured, or relative if not.
-   * @returns The description of the element.
-   */
-  describeElement(filePath) {
-    return this._describeElement(filePath);
-  }
-  /**
-   * Describes a dependency element given its dependency source and file path.
-   * @param dependencySource The source of the dependency.
-   * @param filePath The path of the file being the dependency, if known. Can be absolute if rootPath is configured, or relative if not.
-   * @returns The description of the dependency element.
-   */
-  describeDependencyElement(dependencySource, filePath) {
+  describeElement(filePath, dependencySource) {
     return this._describeElement(filePath, dependencySource);
   }
 };
@@ -2063,18 +2089,6 @@ var Descriptors = class {
   describeElement(filePath) {
     return this._elementsDescriptor.describeElement(filePath);
   }
-  /**
-   * Describes a dependency element given its dependency source and file path.
-   * @param dependencySource The source of the dependency.
-   * @param filePath The path of the file being the dependency, if known.
-   * @returns The description of the dependency element.
-   */
-  describeDependencyElement(dependencySource, filePath) {
-    return this._elementsDescriptor.describeDependencyElement(
-      dependencySource,
-      filePath
-    );
-  }
   /**
    * Describes elements in a dependency relationship, and provides additional information about the dependency itself.
    * @param options The options for describing the elements and the dependency details.
@@ -2103,6 +2117,22 @@ var Matcher = class {
     this._elementsMatcher = elementsMatcher;
     this._dependenciesMatcher = dependenciesMatcher;
   }
+  /**
+   * Describes an element given its file path.
+   * @param filePath The path of the file to describe.
+   * @returns The description of the element.
+   */
+  describeElement(filePath) {
+    return this._descriptors.describeElement(filePath);
+  }
+  /**
+   * Describes elements in a dependency relationship, and provides additional information about the dependency itself.
+   * @param options The options for describing the elements and the dependency details.
+   * @returns The description of the dependency between the elements.
+   */
+  describeDependency(options) {
+    return this._descriptors.describeDependency(options);
+  }
   /**
    * Determines if an element matches a given selector.
    * @param filePath The file path of the element
@@ -2110,7 +2140,7 @@ var Matcher = class {
    * @param options Extra matcher options
    * @returns True if the element matches the selector, false otherwise
    */
-  _isElementMatch(filePath, selector, options) {
+  isElementMatch(filePath, selector, options) {
     const description = this._descriptors.describeElement(filePath);
     return this._elementsMatcher.isElementMatch(description, selector, options);
   }
@@ -2121,7 +2151,7 @@ var Matcher = class {
    * @param options Extra matcher options
    * @returns True if the dependency matches the selector, false otherwise
    */
-  _isDependencyMatch(dependencyData, selector, options) {
+  isDependencyMatch(dependencyData, selector, options) {
     const description = this._descriptors.describeDependency(dependencyData);
     return this._dependenciesMatcher.isDependencyMatch(
       description,
@@ -2129,20 +2159,6 @@ var Matcher = class {
       options
     );
   }
-  isMatch(descriptorOptions, selector, options) {
-    if (isString(descriptorOptions)) {
-      return this._isElementMatch(
-        descriptorOptions,
-        selector,
-        options
-      );
-    }
-    return this._isDependencyMatch(
-      descriptorOptions,
-      selector,
-      options
-    );
-  }
   /**
    * Determines the selector matching for an element.
    * @param filePath The file path of the element
@@ -2150,7 +2166,7 @@ var Matcher = class {
    * @param options Extra options for matching
    * @returns The matching selector data or null if no match is found
    */
-  _getElementSelectorMatching(filePath, selector, options) {
+  getElementSelectorMatching(filePath, selector, options) {
     const description = this._descriptors.describeElement(filePath);
     return this._elementsMatcher.getSelectorMatching(
       description,
@@ -2165,7 +2181,7 @@ var Matcher = class {
    * @param options Extra options for matching
    * @returns The matching dependency result or null if no match is found
    */
-  _getDependencySelectorMatching(dependencyData, selector, options) {
+  getDependencySelectorMatching(dependencyData, selector, options) {
     const description = this._descriptors.describeDependency(dependencyData);
     return this._dependenciesMatcher.getSelectorsMatching(
       description,
@@ -2173,66 +2189,44 @@ var Matcher = class {
       options
     );
   }
-  getSelectorMatching(descriptorOptions, selector, options) {
-    if (isString(descriptorOptions)) {
-      return this._getElementSelectorMatching(
-        descriptorOptions,
+  /**
+   * Returns the selectors matching result for the given element or dependency description.
+   * @param description The element or dependency  description to check.
+   * @param selector The selector to check against.
+   * @param options Extra options for matching, such as templates data, etc.
+   * @returns The selectors matching result for the given description, and whether it matches or not.
+   */
+  getDependencySelectorMatchingDescription(description, selector, options) {
+    if (isDependencySelector(selector) && isDependencyDescription(description)) {
+      return this._dependenciesMatcher.getSelectorsMatching(
+        description,
         selector,
         options
       );
     }
-    return this._getDependencySelectorMatching(
-      descriptorOptions,
-      selector,
-      options
+    throw new Error(
+      "Invalid arguments: Please provide a valid description and selector"
     );
   }
-  getSelectorMatchingDescription(description, selector, options) {
+  /**
+   * Returns the first element selector matching result for the given element description.
+   * @param description The element description to check.
+   * @param selector The selector to check against.
+   * @param options Extra options for matching, such as templates data, etc.
+   * @returns The first matching selector result for the given description, or null if no match is found.
+   */
+  getElementSelectorMatchingDescription(description, selector, options) {
     if (isElementsSelector(selector) && isElementDescription(description)) {
       return this._elementsMatcher.getSelectorMatching(
         description,
         selector,
         options
       );
-    } else if (isDependencySelector(selector) && isDependencyDescription(description)) {
-      return this._dependenciesMatcher.getSelectorsMatching(
-        description,
-        selector,
-        options
-      );
     }
     throw new Error(
       "Invalid arguments: Please provide a valid description and selector"
     );
   }
-  /**
-   * Describes an element given its file path.
-   * @param filePath The path of the file to describe.
-   * @returns The description of the element.
-   */
-  describeElement(filePath) {
-    return this._descriptors.describeElement(filePath);
-  }
-  /**
-   * Describes a dependency element given its dependency source and file path.
-   * @param dependencySource The source of the dependency.
-   * @param filePath The path of the file being the dependency, if known.
-   * @returns The description of the dependency element.
-   */
-  describeDependencyElement(dependencySource, filePath) {
-    return this._descriptors.describeDependencyElement(
-      dependencySource,
-      filePath
-    );
-  }
-  /**
-   * Describes elements in a dependency relationship, and provides additional information about the dependency itself.
-   * @param options The options for describing the elements and the dependency details.
-   * @returns The description of the dependency between the elements.
-   */
-  describeDependency(options) {
-    return this._descriptors.describeDependency(options);
-  }
   /**
    * Clears all caches.
    */