diff --git a/src/core/ctx.ts b/src/core/ctx.ts index c9d313e..ff54244 100644 --- a/src/core/ctx.ts +++ b/src/core/ctx.ts @@ -78,7 +78,7 @@ ${dts}`.trim()}\n` const multilineCommentsRE = /\/\*.*?\*\//gms const singlelineCommentsRE = /\/\/.*$/gm - const dtsReg = /declare\s+global\s*{(.*?)}/s + const dtsReg = /declare\s+global\s*{(.*?)[\n\r]}/s function parseDTS(dts: string) { dts = dts .replace(multilineCommentsRE, '') diff --git a/test/dts.increase.test.ts b/test/dts.increase.test.ts index e2cc151..19c2109 100644 --- a/test/dts.increase.test.ts +++ b/test/dts.increase.test.ts @@ -15,4 +15,6 @@ it('dts', async () => { expect(dtsContent).toContain('AAA') expect(dtsContent).toContain('BBB') expect(dtsContent).toContain('$$') + expect(dtsContent).toContain('customFile') + expect(dtsContent).toContain('customFile1') }) diff --git a/test/tmp/dts.increase.d.ts b/test/tmp/dts.increase.d.ts index 7f3e83b..d5d9f5d 100644 --- a/test/tmp/dts.increase.d.ts +++ b/test/tmp/dts.increase.d.ts @@ -9,6 +9,8 @@ declare global { const $: typeof import('vue/macros')['$'] const AAA: typeof import('xxx/es')['AAA'] const BBB: typeof import('xxx/es')['BBB'] + const customFile: typeof import('../src/openapi/system/user/{id}/index')['customFile'] + const customFile1: typeof import('../src/openapi/system/user/{ id }/index')['customFile'] } // for type re-export declare global {