fix: format compilerOptions for ts2php, fixes #19

baidu · Nov 14, 2019 · cb2329d · cb2329d
1 parent f72f7af
commit cb2329d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/loaders/common-js.ts b/src/loaders/common-js.ts
@@ -52,6 +52,12 @@ export class CommonJS {
                 if (isRelativePath(path)) {
                     return this.require(resolve(dirname(filepath), path), path)
                 }
+
+                // 兼容配置的模块名为 绝对路径或 node module 模块名
+                if (this.modules[path] !== undefined) {
+                    return this.require(path)
+                }
+
                 return require(path)
             })
             return mod.exports

diff --git a/src/target-php/index.ts b/src/target-php/index.ts
@@ -10,7 +10,7 @@ import { SanApp } from '../models/san-app'
 import camelCase from 'camelcase'
 import { SanSourceFile } from '../models/san-sourcefile'
 import { getDefaultConfigPath } from '../parsers/tsconfig'
-import { sep, extname } from 'path'
+import { sep, extname, isAbsolute, resolve } from 'path'
 import debugFactory from 'debug'
 import { Compiler } from '..'
 import { emitRuntime } from './emitters/runtime'
@@ -90,6 +90,15 @@ export class ToPHPCompiler implements Compiler {
         emitter.endNamespace()
     }
 
+    private formatCompilerOptions (compilerOptions = { baseUrl: '' }) {
+        let baseUrl = compilerOptions.baseUrl
+        if (baseUrl && !isAbsolute(baseUrl)) {
+            baseUrl = resolve(this.root, baseUrl)
+            compilerOptions.baseUrl = baseUrl
+        }
+        return compilerOptions
+    }
+
     public compileComponent (sourceFile: SanSourceFile, nsPrefix: string, modules: Modules) {
         if (!sourceFile.tsSourceFile) return ''
 
@@ -115,7 +124,7 @@ export class ToPHPCompiler implements Compiler {
         return generatePHPCode(
             sourceFile.tsSourceFile,
             modules,
-            tsconfig['compilerOptions'],
+            this.formatCompilerOptions(tsconfig['compilerOptions']),
             nsPrefix
         )
     }