feat(router): switch ownsScope separator to noScope

aurelia · Aug 16, 2019 · ee79039 · ee79039
1 parent 8b32b3b
commit ee79039
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/packages/router/src/instruction-resolver.ts b/packages/router/src/instruction-resolver.ts
@@ -8,7 +8,7 @@ export interface IRouteSeparators {
   viewport?: string;
   sibling?: string;
   scope?: string;
-  ownsScope?: string;
+  noScope?: string;
   parameters?: string;
   parametersEnd?: string;
   parameter?: string;
@@ -27,7 +27,7 @@ export class InstructionResolver {
         viewport: '@', // ':',
         sibling: '+', // '/',
         scope: '/', // '+',
-        ownsScope: '!',
+        noScope: '!',
         parameters: '(', // '='
         parametersEnd: ')', // ''
         parameter: '&',
@@ -155,12 +155,12 @@ export class InstructionResolver {
   }
 
   private parseAViewportInstruction(instruction: string): ViewportInstruction {
-    let scope: boolean;
+    let scope: boolean = true;
 
-    // Scope is always at the end, regardless of anything else
-    if (instruction.endsWith(this.separators.ownsScope)) {
-      scope = true;
-      instruction = instruction.slice(0, -this.separators.ownsScope.length);
+    // No scope is always at the end, regardless of anything else
+    if (instruction.endsWith(this.separators.noScope)) {
+      scope = false;
+      instruction = instruction.slice(0, -this.separators.noScope.length);
     }
 
     const [componentPart, viewport] = instruction.split(this.separators.viewport);
@@ -187,8 +187,8 @@ export class InstructionResolver {
       if (instruction.viewportName !== null && !excludeViewport) {
         instructionString += this.separators.viewport + instruction.viewportName;
       }
-      if (instruction.ownsScope) {
-        instructionString += this.separators.ownsScope;
+      if (!instruction.ownsScope) {
+        instructionString += this.separators.noScope;
       }
       return instructionString;
     }