Merge pull request #235 from NativeScript/tachev/fix-attach

fix: support internal Android runtime ts files during debug

Author: Dimitar Tachev

src/debug-adapter/nativeScriptPathTransformer.ts

@@ -22,6 +22,8 @@ export class NativeScriptPathTransformer extends UrlPathTransformer {
             return;
         }
 
+        const isAndroid = this.targetPlatform === 'android';
+
         if (_.startsWith(scriptUrl, 'mdha:')) {
             scriptUrl = _.trimStart(scriptUrl, 'mdha:');
         }
@@ -37,7 +39,7 @@ export class NativeScriptPathTransformer extends UrlPathTransformer {
         let relativePath = scriptUrl;
 
         if (matches) {
-            relativePath = this.targetPlatform === 'android' ? matches[3] : matches[2];
+            relativePath = isAndroid ? matches[3] : matches[2];
         }
 
         const nodePath = path.join('..', 'node_modules');
@@ -48,22 +50,41 @@ export class NativeScriptPathTransformer extends UrlPathTransformer {
             relativePath = relativePath.replace('app', this.appDirPath);
         }
 
-        const absolutePath = path.resolve(path.join(webRoot, relativePath));
+        let absolutePath = path.resolve(path.join(webRoot, relativePath));
+        let platformSpecificPath = this.getPlatformSpecificPath(absolutePath);
 
-        if (fs.existsSync(absolutePath)) {
-            return Promise.resolve(absolutePath);
+        if (platformSpecificPath) {
+            return Promise.resolve(platformSpecificPath);
         }
 
-        const fileExtension = path.extname(absolutePath);
+        if (isAndroid) {
+            // handle files like /data/data/internal/ts_helpers.ts
+            absolutePath = path.resolve(path.join(webRoot, 'platforms', this.targetPlatform.toLowerCase(), 'app', 'src', 'main', 'assets', relativePath));
+            platformSpecificPath = this.getPlatformSpecificPath(absolutePath);
+
+            if (platformSpecificPath) {
+                return Promise.resolve(platformSpecificPath);
+            }
+        }
+
+        return Promise.resolve(scriptUrl);
+    }
+
+    private getPlatformSpecificPath(rawPath: string): string {
+        if (fs.existsSync(rawPath)) {
+            return rawPath;
+        }
+
+        const fileExtension = path.extname(rawPath);
 
         if (fileExtension) {
-            const platformSpecificPath = absolutePath.replace(fileExtension, `.${this.targetPlatform}${fileExtension}`);
+            const platformSpecificPath = rawPath.replace(fileExtension, `.${this.targetPlatform}${fileExtension}`);
 
             if (fs.existsSync(platformSpecificPath)) {
-                return Promise.resolve(platformSpecificPath);
+                return platformSpecificPath;
             }
         }
 
-        return Promise.resolve(scriptUrl);
+        return null;
     }
 }

src/tests/pathTransformData.ts

@@ -5,7 +5,7 @@ const tests = [
     { platform: 'android', scriptUrl: 'native prologue.js', expectedResult: 'native prologue.js' },
     { platform: 'android', scriptUrl: 'v8/gc', expectedResult: 'v8/gc' },
     { platform: 'android', scriptUrl: 'VM25', expectedResult: 'VM25' },
-    { platform: 'android', scriptUrl: '/data/data/org.nativescript.TabNavigation/files/internal/ts_helpers.js', expectedResult: '/data/data/org.nativescript.TabNavigation/files/internal/ts_helpers.js' },
+    { platform: 'android', scriptUrl: '/data/data/org.nativescript.TabNavigation/files/internal/ts_helpers.js', expectedResult: `C:\\projectpath\\platforms\\android\\app\\src\\main\\assets\\internal\\ts_helpers.js`, existingPath: 'C:\\projectpath\\platforms\\android\\app\\src\\main\\assets\\internal\\ts_helpers.js' },
     { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/tns_modules/nativescript-angular/platform.js', expectedResult: 'C:\\projectpath\\node_modules\\nativescript-angular\\platform.js', existingPath: 'C:\\projectpath\\node_modules\\nativescript-angular\\platform.js' },
     { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/tns_modules/nativescript-angular/platform-common.js', expectedResult: 'C:\\projectpath\\node_modules\\nativescript-angular\\platform-common.js', existingPath: 'C:\\projectpath\\node_modules\\nativescript-angular\\platform-common.js' },
     { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/tns_modules/@angular/common/bundles/common.umd.js', expectedResult: 'C:\\projectpath\\node_modules\\@angular\\common\\bundles\\common.umd.js', existingPath: 'C:\\projectpath\\node_modules\\@angular\\common\\bundles\\common.umd.js' },
@@ -15,9 +15,9 @@ const tests = [
     { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/tns_modules/tns-core-modules/ui/page/page.js', expectedResult: 'C:\\projectpath\\node_modules\\tns-core-modules\\ui\\page\\page.android.js', existingPath: 'C:\\projectpath\\node_modules\\tns-core-modules\\ui\\page\\page.android.js' },
     { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/tns_modules/tns-core-modules/ui/layouts/layout-base.js', expectedResult: 'C:\\projectpath\\node_modules\\tns-core-modules\\ui\\layouts\\layout-base.android.js', existingPath: 'C:\\projectpath\\node_modules\\tns-core-modules\\ui\\layouts\\layout-base.android.js' },
     { platform: 'android', scriptUrl: 'ng:///css/0/data/data/org.nativescript.TabNavigation/files/app/tabs/tabs.component.scss.ngstyle.js', expectedResult: 'ng:///css/0/data/data/org.nativescript.TabNavigation/files/app/tabs/tabs.component.scss.ngstyle.js' },
-    { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/main.js', expectedResult: 'C:\\projectpath\\src\\main.js', nsconfig: { appPath: 'src' },  existingPath: 'C:\\projectpath\\src\\main.js' },
-    { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/app/main.js', expectedResult: 'C:\\projectpath\\src\\app\\main.js', nsconfig: { appPath: 'src' },  existingPath: 'C:\\projectpath\\src\\app\\main.js' },
-    { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.app1/files/app/app/main.js', expectedResult: 'C:\\projectpath\\src\\app\\main.js', nsconfig: { appPath: 'src' },  existingPath: 'C:\\projectpath\\src\\app\\main.js' },
+    { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/main.js', expectedResult: 'C:\\projectpath\\src\\main.js', nsconfig: { appPath: 'src' }, existingPath: 'C:\\projectpath\\src\\main.js' },
+    { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.TabNavigation/files/app/app/main.js', expectedResult: 'C:\\projectpath\\src\\app\\main.js', nsconfig: { appPath: 'src' }, existingPath: 'C:\\projectpath\\src\\app\\main.js' },
+    { platform: 'android', scriptUrl: 'file:///data/data/org.nativescript.app1/files/app/app/main.js', expectedResult: 'C:\\projectpath\\src\\app\\main.js', nsconfig: { appPath: 'src' }, existingPath: 'C:\\projectpath\\src\\app\\main.js' },
 ];
 
 export = tests;