fix: startsWith cannot determine subdirectories correctly (#4916)

.changeset/shaggy-bears-retire.md

@@ -0,0 +1,6 @@
+---
+'@modern-js/app-tools': patch
+---
+
+fix: startsWith cannot determine subdirectories correctly
+fix: startsWith 函数不能正确地判断子目录

packages/solutions/app-tools/src/analyze/getBundleEntry.ts

@@ -10,6 +10,7 @@ import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig, IAppContext } from '../types';
 import { getFileSystemEntry } from './getFileSystemEntry';
 import { JS_EXTENSIONS } from './constants';
+import { isSubDirOrEqual } from './utils';
 
 const ensureExtensions = (file: string) => {
   if (!path.extname(file)) {
@@ -38,8 +39,8 @@ const ifAlreadyExists = (
     }
     // filesystem routes entrypoint conflict with normal entrypoint.
     if (
-      entrypoint.entry.startsWith(checked.entry) ||
-      checked.entry.startsWith(entrypoint.entry)
+      isSubDirOrEqual(entrypoint.entry, checked.entry) ||
+      isSubDirOrEqual(checked.entry, entrypoint.entry)
     ) {
       throw new Error(
         `Entry configuration conflicts\n Your configuration: ${checked.entry}.\n Default entrypoint: ${entrypoint.entry}\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`,

packages/solutions/app-tools/src/analyze/utils.ts

@@ -203,3 +203,13 @@ export const checkIsBuildCommands = () => {
 
   return buildCommands.includes(command);
 };
+
+export const isSubDirOrEqual = (parent: string, child: string): boolean => {
+  if (parent === child) {
+    return true;
+  }
+  const relative = path.relative(parent, child);
+  const isSubdir =
+    relative && !relative.startsWith('..') && !path.isAbsolute(relative);
+  return Boolean(isSubdir);
+};

packages/solutions/app-tools/tests/analyze/utils.test.ts

@@ -0,0 +1,28 @@
+import path from 'node:path';
+import { isSubDirOrEqual } from '../../src/analyze/utils';
+
+describe('isSubDirOrEqual', () => {
+  it('should return true for the same directories', () => {
+    const parent = path.resolve('/Users/test');
+    const child = path.resolve('/Users/test');
+    expect(isSubDirOrEqual(parent, child)).toBe(true);
+  });
+
+  it('should return true for a child directory', () => {
+    const parent = path.resolve('/Users');
+    const child = path.resolve('/Users/test');
+    expect(isSubDirOrEqual(parent, child)).toBe(true);
+  });
+
+  it('should return false for a non-child directory', () => {
+    const parent = path.resolve('/Users/test');
+    const child = path.resolve('/Users/anotherTest');
+    expect(isSubDirOrEqual(parent, child)).toBe(false);
+  });
+
+  it('should return false for a directory at a higher level', () => {
+    const parent = path.resolve('/Users/test/deeper');
+    const child = path.resolve('/Users/test');
+    expect(isSubDirOrEqual(parent, child)).toBe(false);
+  });
+});