Fix Bug in calculation of "_raw.flattenedPath" #487

contentlayerdev · Jun 28, 2023 · 6d00de8 · 6d00de8
1 parent b014465
commit 6d00de8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/...source-files/src/__test__/mapping.spec.ts → ...test__/mapping/getDataForFieldDef.spec.ts b/...source-files/src/__test__/mapping.spec.ts → ...test__/mapping/getDataForFieldDef.spec.ts
@@ -8,16 +8,8 @@ import { OT, pipe, provideConsole, T } from '@contentlayer/utils/effect'
 import { NodeFsLive } from '@contentlayer/utils/node'
 import { describe, expect, test } from 'vitest'
 
-import { provideDocumentContext } from '../fetchData/DocumentContext.js'
-import { getFlattenedPath, testOnly_getDataForFieldDef as getDataForFieldDef } from '../fetchData/mapping/index.js'
-
-test('getFlattenedPath', () => {
-  expect(getFlattenedPath('some/path/doc.md')).toBe('some/path/doc')
-  expect(getFlattenedPath('some/path/index.md')).toBe('some/path')
-  expect(getFlattenedPath('some/index/index.md')).toBe('some/index')
-  expect(getFlattenedPath('index/index.md')).toBe('index')
-  expect(getFlattenedPath('index.md')).toBe('')
-})
+import { provideDocumentContext } from '../../fetchData/DocumentContext.js'
+import { testOnly_getDataForFieldDef as getDataForFieldDef } from '../../fetchData/mapping/index.js'
 
 const __unusedValue: any = ''
 

diff --git a/packages/@contentlayer/source-files/src/__test__/mapping/getFlattenedPath.spec.ts b/packages/@contentlayer/source-files/src/__test__/mapping/getFlattenedPath.spec.ts
@@ -0,0 +1,13 @@
+import { expect, test } from 'vitest'
+
+import { getFlattenedPath } from '../../fetchData/mapping/index.js'
+
+test('getFlattenedPath', () => {
+  expect(getFlattenedPath('some/path/doc.md')).toBe('some/path/doc')
+  expect(getFlattenedPath('some/path/index.md')).toBe('some/path')
+  expect(getFlattenedPath('some/index/index.md')).toBe('some/index')
+  expect(getFlattenedPath('index/index.md')).toBe('index')
+  expect(getFlattenedPath('index.md')).toBe('')
+  expect(getFlattenedPath('some/sub/path/index.md')).toBe('some/sub/path')
+  expect(getFlattenedPath('some/sub/path/some-file-with-index.md')).toBe('some/sub/path/some-file-with-index')
+})
diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts
@@ -100,8 +100,10 @@ export const getFlattenedPath = (relativeFilePath: string): string =>
     .split('.')
     .slice(0, -1)
     .join('.')
-    // remove tailing `/index` or `index`
-    .replace(/\/?index$/, '')
+    // deal with root `index` file
+    .replace(/^index$/, '')
+    // remove tailing `/index`
+    .replace(/\/index$/, '')
 
 // TODO aggregate all "global" params into an effect service
 const makeNestedDocument = ({