refactor(deep-linking): set default segment value to filename without…

… extension set default segment value to filename without extension
ionic-team · Mar 30, 2017 · 5a97ba5 · 5a97ba5
1 parent 526ed58
commit 5a97ba5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/deep-linking/util.spec.ts b/src/deep-linking/util.spec.ts
@@ -217,7 +217,7 @@ export class HomePage {
 
       const result = util.getDeepLinkDecoratorContentForSourceFile(sourceFile);
       expect(result.name).toEqual('HomePage');
-      expect(result.segment).toEqual(null);
+      expect(result.segment).toEqual('path');
       expect(result.defaultHistory[0]).toEqual('page-one');
       expect(result.defaultHistory[1]).toEqual('page-two');
       expect(result.priority).toEqual('high');
@@ -267,13 +267,13 @@ export class HomePage {
 
       `;
 
-      const knownPath = join(process.cwd(), 'some', 'fake', 'path');
+      const knownPath = join(process.cwd(), 'myApp', 'src', 'pages', 'about.ts');
 
       const sourceFile = tsUtils.getTypescriptSourceFile(knownPath, knownContent);
 
       const result = util.getDeepLinkDecoratorContentForSourceFile(sourceFile);
       expect(result.name).toEqual('HomePage');
-      expect(result.segment).toEqual(null);
+      expect(result.segment).toEqual('about');
       expect(result.defaultHistory).toBeTruthy();
       expect(result.defaultHistory.length).toEqual(0);
       expect(result.priority).toEqual('high');
@@ -328,7 +328,7 @@ export class HomePage {
 
       const result = util.getDeepLinkDecoratorContentForSourceFile(sourceFile);
       expect(result.name).toEqual('HomePage');
-      expect(result.segment).toEqual(null);
+      expect(result.segment).toEqual('path');
       expect(result.defaultHistory).toBeTruthy();
       expect(result.defaultHistory.length).toEqual(0);
       expect(result.priority).toEqual('low');
@@ -376,13 +376,13 @@ export class HomePage {
 
       `;
 
-      const knownPath = join(process.cwd(), 'some', 'fake', 'path');
+      const knownPath = join(process.cwd(), 'some', 'fake', 'path.ts');
 
       const sourceFile = tsUtils.getTypescriptSourceFile(knownPath, knownContent);
 
       const result = util.getDeepLinkDecoratorContentForSourceFile(sourceFile);
       expect(result.name).toEqual('HomePage');
-      expect(result.segment).toEqual(null);
+      expect(result.segment).toEqual('path');
       expect(result.defaultHistory).toBeTruthy();
       expect(result.defaultHistory.length).toEqual(0);
       expect(result.priority).toEqual('low');
@@ -1214,15 +1214,15 @@ export class PageThreeModule {
       expect(results.length).toEqual(3);
 
       expect(results[0].name).toEqual('SomeOtherName');
-      expect(results[0].segment).toEqual(null);
+      expect(results[0].segment).toEqual('page-one');
       expect(results[0].priority).toEqual('low');
       expect(results[0].defaultHistory.length).toEqual(0);
       expect(results[0].absolutePath).toEqual(join(srcDir, 'pages', 'page-one', 'page-one.module.ts'));
       expect(results[0].userlandModulePath).toEqual('../pages/page-one/page-one.module');
       expect(results[0].className).toEqual('PageOneModule');
 
       expect(results[1].name).toEqual('PageTwo');
-      expect(results[1].segment).toEqual(null);
+      expect(results[1].segment).toEqual('page-two');
       expect(results[1].priority).toEqual('low');
       expect(results[1].defaultHistory.length).toEqual(0);
       expect(results[1].absolutePath).toEqual(join(srcDir, 'pages', 'page-two', 'page-two.module.ts'));

diff --git a/src/deep-linking/util.ts b/src/deep-linking/util.ts
@@ -88,7 +88,7 @@ export function getNgModuleDataFromPage(appNgModuleFilePath: string, filePath: s
 
 export function getDeepLinkDecoratorContentForSourceFile(sourceFile: SourceFile): DeepLinkDecoratorAndClass {
   const classDeclarations = getClassDeclarations(sourceFile);
-
+  const defaultSegment = basename(changeExtension(sourceFile.fileName, ''));
   const list: DeepLinkDecoratorAndClass[] = [];
 
   classDeclarations.forEach(classDeclaration => {
@@ -107,7 +107,7 @@ export function getDeepLinkDecoratorContentForSourceFile(sourceFile: SourceFile)
           }
 
           const deepLinkName = getStringValueFromDeepLinkDecorator(sourceFile, propertyList, className, DEEPLINK_DECORATOR_NAME_ATTRIBUTE);
-          const deepLinkSegment = getStringValueFromDeepLinkDecorator(sourceFile, propertyList, null, DEEPLINK_DECORATOR_SEGMENT_ATTRIBUTE);
+          const deepLinkSegment = getStringValueFromDeepLinkDecorator(sourceFile, propertyList, defaultSegment, DEEPLINK_DECORATOR_SEGMENT_ATTRIBUTE);
           const deepLinkPriority = getStringValueFromDeepLinkDecorator(sourceFile, propertyList, 'low', DEEPLINK_DECORATOR_PRIORITY_ATTRIBUTE);
           const deepLinkDefaultHistory = getArrayValueFromDeepLinkDecorator(sourceFile, propertyList, [], DEEPLINK_DECORATOR_DEFAULT_HISTORY_ATTRIBUTE);
           const rawStringContent = getNodeStringContent(sourceFile, decorator.expression);