fix: windows relative (#12)

* fix: windows relative

* chore: relative path

* fix: relative

* test: add issue 11 case

* fix: lint

* test: add esm case

src/index.ts

@@ -1,8 +1,24 @@
-import { resolve, relative, extname, normalize, isAbsolute } from 'path';
+import {
+  resolve,
+  relative,
+  extname,
+  normalize,
+  isAbsolute,
+  posix,
+  sep,
+} from 'path';
 import { safeRequire, safelyGet } from '@midwayjs/core';
 import { run } from '@midwayjs/glob';
 import { writeFileSync, existsSync } from 'fs';
 import * as ts from 'typescript';
+import * as os from 'os';
+
+function formatWindowsPath(p: string) {
+  if (os.platform() === 'win32' && p) {
+    return p.split(sep).join(posix.sep);
+  }
+  return p;
+}
 
 interface EntryGeneratorOptions {
   baseUrl?: string;
@@ -33,6 +49,7 @@ export class EntryGenerator {
   private program!: ts.Program;
   private sourceDir!: string;
   private programFiles!: string[];
+  private isESM = false;
 
   DEFAULT_PATTERN = ['**/**.ts', '**/**.tsx', '**/**.js'];
   DEFAULT_IGNORE_PATTERN = [
@@ -68,6 +85,11 @@ export class EntryGenerator {
       );
     }
 
+    const pkg = safeRequire(resolve(baseUrl, 'package.json'));
+    if (pkg?.type === 'module') {
+      this.isESM = true;
+    }
+
     this.sourceDir = resolve(baseUrl, srcDir);
     this.programFiles = run(
       this.DEFAULT_PATTERN.concat(options.pattern || []),
@@ -137,18 +159,22 @@ export class EntryGenerator {
     const exportCodes = collection.exportFiles
       .filter(path => relative(collection.configurationFilepath, path) !== '')
       .map(path => {
-        return `export * from './${relative(this.sourceDir, path)
-          .replace(extname(path), '')
+        return `export * from './${formatWindowsPath(
+          relative(this.sourceDir, path)
+        )
+          .replace(extname(path), this.isESM ? '.js' : '')
           .replace(/\\/g, '/')}';\n`;
       });
 
     exportCodes.unshift(
       `export { ${
         collection.configurationClz
-      } as Configuration } from './${relative(
-        this.sourceDir,
-        collection.configurationFilepath
-      ).replace(extname(collection.configurationFilepath), '')}';\n`
+      } as Configuration } from './${formatWindowsPath(
+        relative(this.sourceDir, collection.configurationFilepath)
+      ).replace(
+        extname(collection.configurationFilepath),
+        this.isESM ? '.js' : ''
+      )}';\n`
     );
 
     exportCodes.unshift(this.BANNER);

test/__snapshots__/index.test.ts.snap

@@ -11,3 +11,27 @@ export * from './interface';
 export * from './service/user.service';
 "
 `;
+
+exports[`/test/index.test.ts fix issue11 1`] = `
+"/** This file generated by @midwayjs/bundle-helper */
+
+export { ContainerLifeCycle as Configuration } from './core/configuration';
+export * from './config/config.default';
+export * from './controller/test/api.controller';
+export * from './controller/ych/home.controller';
+export * from './interface';
+export * from './service/user.service';
+"
+`;
+
+exports[`/test/index.test.ts support esm project 1`] = `
+"/** This file generated by @midwayjs/bundle-helper */
+
+export { ContainerLifeCycle as Configuration } from './configuration.js';
+export * from './config/config.default.js';
+export * from './controller/test/api.controller.js';
+export * from './controller/ych/home.controller.js';
+export * from './interface.js';
+export * from './service/user.service.js';
+"
+`;

test/fixtures/base-app-esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

test/fixtures/base-app-esm/src/config/config.default.ts

@@ -0,0 +1,9 @@
+import { MidwayConfig } from '@midwayjs/core';
+
+const config: MidwayConfig = {};
+
+config.koa = {
+  port: 7001,
+}
+
+export default config;

test/fixtures/base-app-esm/src/configuration.ts

@@ -0,0 +1,28 @@
+import { Configuration, App, Inject } from '@midwayjs/decorator';
+import * as koa from '@midwayjs/koa';
+import * as bodyParser from 'koa-bodyparser';
+import * as session from 'koa-session';
+import * as axios from '@midwayjs/axios';
+
+@Configuration({
+  imports: [
+    koa,
+    axios,
+  ],
+})
+export class ContainerLifeCycle {
+  @App()
+  app: koa.Application;
+
+  @Inject()
+  httpService: axios.HttpService;
+
+  async onReady() {
+    this.app.keys = ['default value'];
+    this.app.use(session({key: "SESSIONID"}, this.app))
+    // bodyparser options see https://github.com/koajs/bodyparser
+    this.app.useMiddleware([bodyParser()]);
+
+    return await this.httpService.get('http://www.weather.com.cn/data/cityinfo/101010100.html');
+  }
+}

test/fixtures/base-app-esm/src/controller/test/api.controller.ts

@@ -0,0 +1,13 @@
+import { Inject, Controller, Get } from '@midwayjs/decorator';
+import { Context } from '@midwayjs/koa';
+
+@Controller('/api')
+export class APIController {
+  @Inject()
+  ctx: Context;
+
+  @Get('/get_user')
+  async getUser() {
+    return 'bbb';
+  }
+}

test/fixtures/base-app-esm/src/controller/ych/home.controller.ts

@@ -0,0 +1,14 @@
+import { Controller, Get } from '@midwayjs/decorator';
+
+@Controller('/')
+export class HomeController {
+  @Get('/')
+  async home(): Promise<string> {
+    return 'home value';
+  }
+
+  @Get('/login')
+  async login(): Promise<string> {
+    return 'login page'
+  }
+}

test/fixtures/base-app-esm/src/interface.ts

@@ -0,0 +1,6 @@
+/**
+ * @description User-Service parameters
+ */
+export interface IUserOptions {
+  uid: number;
+}

test/fixtures/base-app-esm/src/service/user.service.ts

@@ -0,0 +1,14 @@
+import { Provide } from '@midwayjs/decorator';
+import { IUserOptions } from '../interface';
+
+@Provide()
+export class UserService {
+  async getUser(options: IUserOptions) {
+    return {
+      uid: options.uid,
+      username: 'mockedName',
+      phone: '12345678901',
+      email: '[email protected]',
+    };
+  }
+}

test/fixtures/base-app-esm/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es2018",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "inlineSourceMap":true,
+    "noImplicitThis": true,
+    "noUnusedLocals": true,
+    "stripInternal": true,
+    "skipLibCheck": false,
+    "pretty": true,
+    "declaration": true,
+    "typeRoots": [ "./typings", "./node_modules/@types"],
+    "outDir": "dist"
+  },
+  "exclude": [
+    "dist",
+    "node_modules",
+    "test"
+  ]
+}

test/fixtures/issue11/src/config/config.default.ts

@@ -0,0 +1,9 @@
+import { MidwayConfig } from '@midwayjs/core';
+
+const config: MidwayConfig = {};
+
+config.koa = {
+  port: 7001,
+}
+
+export default config;

test/fixtures/issue11/src/controller/test/api.controller.ts

@@ -0,0 +1,13 @@
+import { Inject, Controller, Get } from '@midwayjs/decorator';
+import { Context } from '@midwayjs/koa';
+
+@Controller('/api')
+export class APIController {
+  @Inject()
+  ctx: Context;
+
+  @Get('/get_user')
+  async getUser() {
+    return 'bbb';
+  }
+}

test/fixtures/issue11/src/controller/ych/home.controller.ts

@@ -0,0 +1,14 @@
+import { Controller, Get } from '@midwayjs/decorator';
+
+@Controller('/')
+export class HomeController {
+  @Get('/')
+  async home(): Promise<string> {
+    return 'home value';
+  }
+
+  @Get('/login')
+  async login(): Promise<string> {
+    return 'login page'
+  }
+}

test/fixtures/issue11/src/core/configuration.ts

@@ -0,0 +1,30 @@
+import { Configuration, App, Inject } from '@midwayjs/decorator';
+import * as koa from '@midwayjs/koa';
+import * as bodyParser from 'koa-bodyparser';
+import { join } from 'path';
+import * as session from 'koa-session';
+import * as axios from '@midwayjs/axios';
+
+@Configuration({
+  imports: [
+    koa,
+    axios,
+  ],
+  importConfigs: [join(__dirname, './config')],
+})
+export class ContainerLifeCycle {
+  @App()
+  app: koa.Application;
+
+  @Inject()
+  httpService: axios.HttpService;
+
+  async onReady() {
+    this.app.keys = ['default value'];
+    this.app.use(session({key: "SESSIONID"}, this.app))
+    // bodyparser options see https://github.com/koajs/bodyparser
+    this.app.useMiddleware([bodyParser()]);
+
+    return await this.httpService.get('http://www.weather.com.cn/data/cityinfo/101010100.html');
+  }
+}

test/fixtures/issue11/src/interface.ts

@@ -0,0 +1,6 @@
+/**
+ * @description User-Service parameters
+ */
+export interface IUserOptions {
+  uid: number;
+}

test/fixtures/issue11/src/service/user.service.ts

@@ -0,0 +1,14 @@
+import { Provide } from '@midwayjs/decorator';
+import { IUserOptions } from '../interface';
+
+@Provide()
+export class UserService {
+  async getUser(options: IUserOptions) {
+    return {
+      uid: options.uid,
+      username: 'mockedName',
+      phone: '12345678901',
+      email: '[email protected]',
+    };
+  }
+}

test/fixtures/issue11/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es2018",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "inlineSourceMap":true,
+    "noImplicitThis": true,
+    "noUnusedLocals": true,
+    "stripInternal": true,
+    "skipLibCheck": false,
+    "pretty": true,
+    "declaration": true,
+    "typeRoots": [ "./typings", "./node_modules/@types"],
+    "outDir": "dist"
+  },
+  "exclude": [
+    "dist",
+    "node_modules",
+    "test"
+  ]
+}

test/index.test.ts

@@ -45,4 +45,26 @@ describe('/test/index.test.ts', () => {
       validate(resolve(__dirname, `./fixtures/case4`));
     });
   });
+
+  it('fix issue11', async () => {
+    const baseUrl = resolve(__dirname, './fixtures/issue11');
+    const generator = new EntryGenerator({
+      baseUrl,
+    });
+    generator.run();
+    expect(
+      readFileSync(resolve(baseUrl, 'src/index.ts')).toString()
+    ).toMatchSnapshot();
+  });
+
+  it('support esm project', async () => {
+    const baseUrl = resolve(__dirname, './fixtures/base-app-esm');
+    const generator = new EntryGenerator({
+      baseUrl,
+    });
+    generator.run();
+    expect(
+      readFileSync(resolve(baseUrl, 'src/index.ts')).toString()
+    ).toMatchSnapshot();
+  });
 });