fix: debugger when using Angular based projects. (#279)

Author: rob4226

package.json

@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/NativeScript/nativescript-vscode-extension/"
   },
-  "publisher": "Telerik",
+  "publisher": "NativeScript",
   "bugs": "https://github.com/NativeScript/nativescript-vscode-extension/issues",
   "engines": {
     "vscode": "^1.19.0"

src/debug-adapter/nativeScriptDebugAdapter.ts

@@ -166,6 +166,22 @@ export class NativeScriptDebugAdapter extends ChromeDebugAdapter {
         }
     }
 
+    /**
+     * Determines if the NativeScript project being debugged is an Angular based
+     * project by returning true if an **angular.json** file exists at the base
+     * of the project or returns false if not found.
+     * @param webRoot The root of the project.
+     */
+    private isAngularProject(webRoot): boolean {
+        const isAngularProject = existsSync(join(webRoot, 'angular.json'));
+
+        if (isAngularProject) {
+            logger.log('Angular project detected, found angular.json file.');
+        }
+
+        return isAngularProject;
+    }
+
     private translateArgs(args): any {
         if (args.diagnosticLogging) {
             args.trace = args.diagnosticLogging;
@@ -179,7 +195,7 @@ export class NativeScriptDebugAdapter extends ChromeDebugAdapter {
             args.sourceMapPathOverrides = {};
         }
 
-        const appDirPath = this.getAppDirPath(args.webRoot) || 'app';
+        const appDirPath = this.getAppDirPath(args.webRoot) || (this.isAngularProject(args.webRoot) ? 'src' : 'app');
         const fullAppDirPath = join(args.webRoot, appDirPath);
 
         if (!args.sourceMapPathOverrides['webpack:///*']) {

src/main.ts

@@ -20,7 +20,7 @@ export function activate(context: vscode.ExtensionContext) {
 
     services.logger = new ChannelLogger(channel);
 
-    const packageJSON = vscode.extensions.getExtension('Telerik.nativescript').packageJSON;
+    const packageJSON = vscode.extensions.getExtension('nativescript.nativescript').packageJSON;
     const cliVersion = services.cli().executeGetVersion();
 
     if (!cliVersion) {

src/tests/nativeScriptDebugAdapter.tests.ts

@@ -141,8 +141,12 @@ describe('NativeScriptDebugAdapter', () => {
             it(`${method} for ${platform} should add sourceMapPathOverrides data`, async () => {
                 const spy = sinon.spy(ChromeDebugAdapter.prototype, 'attach');
                 const existsSyncStub = sinon.stub(fs, 'existsSync');
+                // Need to also stub isAngularProject to return false or it will always return true bc it utilizes
+                // `fs.existsSync` which is also stubbed and made to return true in this test.
+                const isAngularProjectStub = sinon.stub(nativeScriptDebugAdapter, 'isAngularProject');
 
                 existsSyncStub.returns(true);
+                isAngularProjectStub.returns(false);
                 webpackConfigFunctionStub
                     .withArgs({ [platform]: platform })
                     .returns({ output: { library: 'myLib' } });
@@ -164,8 +168,12 @@ describe('NativeScriptDebugAdapter', () => {
             it(`${method} for ${platform} should not fail when unable to require webpack.config.js`, async () => {
                 const spy = sinon.spy(ChromeDebugAdapter.prototype, 'attach');
                 const existsSyncStub = sinon.stub(fs, 'existsSync');
+                // Need to also stub isAngularProject to return false or it will always return true bc it utilizes
+                // `fs.existsSync` which is also stubbed and made to return true in this test.
+                const isAngularProjectStub = sinon.stub(nativeScriptDebugAdapter, 'isAngularProject');
 
                 existsSyncStub.returns(true);
+                isAngularProjectStub.returns(false);
                 webpackConfigFunctionStub
                     .withArgs({ [platform]: platform })
                     .throws(new Error('test'));