fix: Wildcard pattern for secondary entry points

Author: Aukevanoost

libs/native-federation-core/src/lib/config/share-utils.ts

@@ -17,7 +17,6 @@ import {
 } from '../utils/package-info';
 import { getConfigContext } from './configuration-context';
 import { logger } from '../utils/logger';
-import { resolveGlobSync } from '../utils/resolve-glob';
 
 import {
   KeyValuePair,
@@ -224,10 +223,10 @@ function readConfiguredSecondaries(
   );
 
   const result = {} as Record<string, SharedConfig>;
+  const discoveredFiles = new Set<string>();
 
   for (const key of keys) {
     const secondaryName = path.join(parent, key).replace(/\\/g, '/');
-
     if (exclude.includes(secondaryName)) {
       continue;
     }
@@ -256,7 +255,11 @@ function readConfiguredSecondaries(
       libPath,
       parent,
       secondaryName,
-      entry
+      entry,
+      discoveredFiles
+    );
+    items.forEach((e) =>
+      discoveredFiles.add(typeof e === 'string' ? e : e.value)
     );
 
     for (const item of items) {
@@ -285,15 +288,18 @@ function resolveSecondaries(
   libPath: string,
   parent: string,
   secondaryName: string,
-  entry: string
+  entry: string,
+  discoveredFiles: Set<string>
 ): Array<string | KeyValuePair> {
   let items: Array<string | KeyValuePair> = [];
   if (key.includes('*')) {
     const expanded = resolveWildcardKeys(key, entry, libPath);
-    items = expanded.map((e) => ({
-      key: path.join(parent, e.key),
-      value: path.join(libPath, e.value),
-    }));
+    items = expanded
+      .map((e) => ({
+        key: path.join(parent, e.key),
+        value: path.join(libPath, e.value),
+      }))
+      .filter((e) => !discoveredFiles.has(typeof e === 'string' ? e : e.value));
   } else {
     items = [secondaryName];
   }

libs/native-federation-core/src/lib/utils/resolve-wildcard-keys.ts

@@ -9,14 +9,19 @@ function escapeRegex(str: string) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
+// Convert package.json exports pattern to glob pattern
+// * in exports means "one segment", but for glob we need ** for deep matching
+// Src: https://hirok.io/posts/package-json-exports#exposing-all-package-files
+function convertExportsToGlob(pattern: string) {
+  return pattern.replace(/(?<!\*)\*(?!\*)/g, '**');
+}
+
 function compilePattern(pattern: string) {
   const tokens = pattern.split(/(\*\*|\*)/);
   const regexParts = [];
 
   for (const token of tokens) {
     if (token === '*') {
-      regexParts.push('([^/]+)');
-    } else if (token === '**') {
       regexParts.push('(.*)');
     } else {
       regexParts.push(escapeRegex(token));
@@ -26,12 +31,12 @@ function compilePattern(pattern: string) {
   return new RegExp(`^${regexParts.join('')}$`);
 }
 
-function applyWildcards(template: string, wildcardValues: string[]) {
+function withoutWildcard(template: string, wildcardValues: string[]) {
   const tokens = template.split(/(\*\*|\*)/);
   let result = '';
   let i = 0;
   for (const token of tokens) {
-    if (token === '*' || token === '**') {
+    if (token === '*') {
       result += wildcardValues[i++];
     } else {
       result += token;
@@ -46,28 +51,29 @@ export function resolveWildcardKeys(
   cwd: string
 ): KeyValuePair[] {
   const normalizedPattern = valuePattern.replace(/^\.?\/+/, '');
+
+  const globPattern = convertExportsToGlob(normalizedPattern);
+
   const regex = compilePattern(normalizedPattern);
 
-  const files = fg.sync(valuePattern, {
+  const files = fg.sync(globPattern, {
     cwd,
     onlyFiles: true,
+    deep: Infinity,
   });
 
   const keys: KeyValuePair[] = [];
 
   for (const file of files) {
     const relPath = file.replace(/\\/g, '/').replace(/^\.\//, '');
 
-    const match = relPath.match(regex);
-    if (!match) {
-      continue;
-    }
-
-    const wildcards = match.slice(1);
-    const key = applyWildcards(keyPattern, wildcards);
+    const wildcards = relPath.match(regex);
+    if (!wildcards) continue;
 
-    // Change this:
-    keys.push({ key, value: relPath });
+    keys.push({
+      key: withoutWildcard(keyPattern, wildcards.slice(1)),
+      value: relPath,
+    });
   }
 
   return keys;