Merge pull request #127 from shirookie/fix/import-dir

fix: import from dir

Author: cxtom

src/index.ts

@@ -38,11 +38,20 @@ import { isRelativePath } from './utilities/index';
 const defaultOptions = {
     showDiagnostics: true,
     emitHeader: true,
-    getModulePathCode: (name, _, moduleIt) => {
+    getModulePathCode: (name, _, moduleIt, dirname) => {
         if (moduleIt && moduleIt.path) {
             return JSON.stringify(moduleIt.path);
         }
         const isRelative = isRelativePath(name);
+        if (isRelative && _) {
+            const { resolvedFileName, extension } = _;
+            name = path
+                .relative(dirname, resolvedFileName)
+                .replace(new RegExp(`${extension}$`, 'i'), '');
+            if (name[0] !== '.') {
+                name = './' + name;
+            }
+        }
         const outPath = isRelative ? (name + '.php') : name;
         const pathCode = JSON.stringify(outPath);
         return isRelative ? `dirname(__FILE__) . '/' . ${pathCode}` : pathCode;
@@ -206,11 +215,16 @@ export class Ts2Php {
             .getEmitResolver(sourceFile, /* cancellationToken */ undefined);
 
         if (sourceFile.resolvedModules) {
+            let fileName = sourceFile.fileName;
+            if (!path.isAbsolute(fileName)) {
+                fileName = path.resolve(fileName);
+            }
+            const dirname = path.dirname(fileName);
             sourceFile.resolvedModules.forEach((item, name) => {
                 const moduleIt = state.modules[name] || {} as ModuleInfo;
                 state.modules[name] = {
                     name,
-                    pathCode: state.getModulePathCode(name, item, moduleIt),
+                    pathCode: state.getModulePathCode(name, item, moduleIt, dirname),
                     namespace: state.getModuleNamespace(name, item, moduleIt),
                     ...moduleIt
                 };

test/features/helper/foo/index.ts

@@ -0,0 +1 @@
+export default function foo () {};

test/features/import.md

@@ -97,3 +97,15 @@ require_once("abcdef/multi-files/square.php");
 require_once("aaa/bbb.php");
 require_once("aaa/bbb/ccc.php");
 ```
+
+## import path is a directory
+
+```ts
+import foo from './helper/foo';
+foo();
+```
+
+```php
+require_once(dirname(__FILE__) . '/' . "./helper/foo/index.php");
+foo();
+```

types/index.d.ts

@@ -92,9 +92,10 @@ export interface Ts2phpCompileOptions {
      *
      * @params importPath 模块引入路径
      * @params module 模块相关信息
+     * @params dirname 当前文件所在目录
      * @returns 路径代码
      */
-    getModulePathCode?: (importPath: string, module?: ts.ResolvedModuleFull, moduleIt?: ModuleInfo) => string;
+    getModulePathCode?: (importPath: string, module?: ts.ResolvedModuleFull, moduleIt?: ModuleInfo, dirname?: string) => string;
 
     /**
      * 获取外部模块的命名空间