@microsoft/fast-router 1.0.0-alpha.2 → 1.0.0-alpha.20

package/dist/esm/recognizer.js

@@ -1,6 +1,8 @@
 import { __awaiter } from "tslib";
 import { QueryString } from "./query-string.js";
-const defaultParameterConverter = (value) => value;
+const defaultParameterConverter = (name, value, context) => {
+    return value;
+};
 /**
  * @beta
  */
@@ -35,7 +37,7 @@ export class RecognizedRoute {
         this.typedParams = typedParams;
         this.queryParams = queryParams;
         this.allParams = Object.assign(Object.assign({}, params), queryParams);
-        this.allTypedParams = Object.assign(Object.assign({}, typedParams), queryParams);
+        this.allTypedParams = Object.assign(Object.assign({}, queryParams), typedParams);
     }
     get settings() {
         return this.endpoint.settings;
@@ -386,12 +388,17 @@ export class DefaultRouteRecognizer {
             const paramTypes = endpoint.paramTypes;
             const params = candidate.getParams();
             const typedParams = {};
+            const converterContext = {
+                endpoint,
+                params,
+                typedParams,
+                queryParams,
+            };
             for (let i = 0, ii = paramNames.length; i < ii; ++i) {
-                const name = paramNames[i];
+                const paramName = paramNames[i];
+                const paramValue = params[paramName];
                 const convert = converters[paramTypes[i]] || defaultParameterConverter;
-                const untypedValue = params[name];
-                const typedValue = yield convert(untypedValue);
-                typedParams[name] = typedValue;
+                typedParams[paramName] = yield convert(paramName, paramValue, converterContext);
             }
             return new RecognizedRoute(endpoint, params, typedParams, queryParams);
         });

package/dist/esm/router.js

@@ -3,7 +3,6 @@ import { FASTElement } from "@microsoft/fast-element";
 import { composedParent } from "@microsoft/fast-element/utilities";
 import { NavigationMessage } from "./navigation.js";
 import { childRouteParameter } from "./routes.js";
-import { RouterExecutionContext } from "./view.js";
 const routerProperty = "$router";
 function findParentRouterForElement(element) {
     let parent = element;
@@ -32,13 +31,20 @@ export const Router = Object.freeze({
         class RouterBase extends BaseType {
             constructor() {
                 super();
-                Router.getOrCreateFor(this);
-            }
-            get config() {
-                return this[routerProperty].config;
-            }
-            set config(value) {
-                this[routerProperty].config = value;
+                const router = Router.getOrCreateFor(this);
+                const config = this.config || null;
+                delete this.config;
+                Reflect.defineProperty(this, "config", {
+                    get() {
+                        return router.config;
+                    },
+                    set(value) {
+                        router.config = value;
+                    },
+                });
+                if (config !== null) {
+                    router.config = config;
+                }
             }
         }
         const proto = RouterBase.prototype;
@@ -114,7 +120,7 @@ export class DefaultRouter {
             }
             this.parentRouter = findParentRouterForElement(this.host);
         }
-        return this.parentRouter || null;
+        return this.parentRouter;
     }
     get level() {
         if (this.parent === null) {
@@ -137,7 +143,8 @@ export class DefaultRouter {
         return __awaiter(this, void 0, void 0, function* () {
             this.newRoute = route;
             this.newView = yield command.createView();
-            this.newView.bind(route.allTypedParams, RouterExecutionContext.create(this));
+            this.newView.context.router = this;
+            this.newView.bind(route.allTypedParams);
             this.newView.appendTo(this.host);
             yield command.transition.begin(this.host, this.view, this.newView);
             return {

package/dist/esm/routes.js

@@ -17,7 +17,7 @@ function getFallbackCommand(config, definition) {
         return Render.fromDefinition(config, definition);
     }
 }
-const booleanConverter = value => {
+const booleanConverter = (name, value) => {
     if (value === void 0 || value === null) {
         return false;
     }
@@ -31,11 +31,11 @@ const booleanConverter = value => {
     }
 };
 const defaultConverters = {
-    number: value => (value === void 0 ? NaN : parseFloat(value)),
-    float: value => (value === void 0 ? NaN : parseFloat(value)),
-    int: value => (value === void 0 ? NaN : parseInt(value)),
-    integer: value => (value === void 0 ? NaN : parseInt(value)),
-    Date: value => (value === void 0 ? new Date(Date.now()) : new Date(value)),
+    number: (name, value) => (value === void 0 ? NaN : parseFloat(value)),
+    float: (name, value) => (value === void 0 ? NaN : parseFloat(value)),
+    int: (name, value) => (value === void 0 ? NaN : parseInt(value)),
+    integer: (name, value) => (value === void 0 ? NaN : parseInt(value)),
+    Date: (name, value) => value === void 0 ? new Date(Date.now()) : new Date(value),
     boolean: booleanConverter,
     bool: booleanConverter,
 };
@@ -129,9 +129,9 @@ export class RouteCollection {
             normalizedConverter = converter.convert.bind(converter);
         }
         else if (converter.prototype && "convert" in converter.prototype) {
-            normalizedConverter = (value) => {
+            normalizedConverter = (name, value, context) => {
                 const obj = this.owner.construct(converter);
-                return obj.convert(value);
+                return obj.convert(name, value, context);
             };
         }
         else {

package/dist/esm/view.js

@@ -1,18 +1,6 @@
 import { __awaiter } from "tslib";
-import { ElementStyles, ExecutionContext, html, } from "@microsoft/fast-element";
+import { ElementStyles, html, } from "@microsoft/fast-element";
 import { isFASTElementHost } from "./router.js";
-/**
- * @beta
- */
-export const RouterExecutionContext = Object.freeze({
-    create(router) {
-        return Object.create(ExecutionContext.default, {
-            router: {
-                value: router,
-            },
-        });
-    },
-});
 /**
  * @beta
  */
@@ -33,17 +21,11 @@ export const Transition = Object.freeze({
  * @beta
  */
 export class FASTElementLayout {
-    constructor(template = null, styles = null, runBeforeCommit = true) {
+    constructor(template = null, styles = undefined, runBeforeCommit = true) {
+        var _a;
         this.template = template;
         this.runBeforeCommit = runBeforeCommit;
-        this.styles =
-            styles === void 0 || styles === null
-                ? null
-                : Array.isArray(styles)
-                    ? new ElementStyles(styles)
-                    : styles instanceof ElementStyles
-                        ? styles
-                        : new ElementStyles([styles]);
+        this.styles = (_a = ElementStyles.normalize(styles)) !== null && _a !== void 0 ? _a : null;
     }
     beforeCommit(routerElement) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -64,8 +46,8 @@ export class FASTElementLayout {
             if (routerElement.$fastController.template !== this.template) {
                 routerElement.$fastController.template = this.template;
             }
-            if (routerElement.$fastController.styles !== this.styles) {
-                routerElement.$fastController.styles = this.styles;
+            if (routerElement.$fastController.mainStyles !== this.styles) {
+                routerElement.$fastController.mainStyles = this.styles;
             }
         }
     }

package/dist/fast-router.api.json

@@ -461,40 +461,6 @@
             "endIndex": 2
           }
         },
-        {
-          "kind": "TypeAlias",
-          "canonicalReference": "@microsoft/fast-router!ConverterObject:type",
-          "docComment": "/**\n * @beta\n */\n",
-          "excerptTokens": [
-            {
-              "kind": "Content",
-              "text": "export declare type ConverterObject = "
-            },
-            {
-              "kind": "Content",
-              "text": "{\n    convert: "
-            },
-            {
-              "kind": "Reference",
-              "text": "RouteParameterConverter",
-              "canonicalReference": "@microsoft/fast-router!RouteParameterConverter:type"
-            },
-            {
-              "kind": "Content",
-              "text": ";\n}"
-            },
-            {
-              "kind": "Content",
-              "text": ";"
-            }
-          ],
-          "releaseTag": "Beta",
-          "name": "ConverterObject",
-          "typeTokenRange": {
-            "startIndex": 1,
-            "endIndex": 4
-          }
-        },
         {
           "kind": "Class",
           "canonicalReference": "@microsoft/fast-router!DefaultLinkHandler:class",
@@ -2410,7 +2376,7 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "[] | null"
+                  "text": "[] | undefined"
                 },
                 {
                   "kind": "Content",
@@ -3674,7 +3640,7 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "any"
+                  "text": "void"
                 },
                 {
                   "kind": "Content",
@@ -4817,8 +4783,8 @@
             },
             {
               "kind": "Reference",
-              "text": "ConverterObject",
-              "canonicalReference": "@microsoft/fast-router!ConverterObject:type"
+              "text": "RouteParameterConverterObject",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverterObject:type"
             },
             {
               "kind": "Content",
@@ -4835,8 +4801,8 @@
             },
             {
               "kind": "Reference",
-              "text": "ConverterObject",
-              "canonicalReference": "@microsoft/fast-router!ConverterObject:type"
+              "text": "RouteParameterConverterObject",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverterObject:type"
             },
             {
               "kind": "Content",
@@ -4999,12 +4965,12 @@
             },
             {
               "kind": "Reference",
-              "text": "Object",
-              "canonicalReference": "!Object:interface"
+              "text": "Record",
+              "canonicalReference": "!Record:type"
             },
             {
               "kind": "Content",
-              "text": ", traditional?: boolean): string;\n    separate(path: string): "
+              "text": "<string, string>, traditional?: boolean): string;\n    separate(path: string): "
             },
             {
               "kind": "Reference",
@@ -7187,7 +7153,16 @@
             },
             {
               "kind": "Content",
-              "text": "(value: string | undefined) => any | "
+              "text": "(name: string, value: string | undefined, context: "
+            },
+            {
+              "kind": "Reference",
+              "text": "RouteParameterConverterContext",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverterContext:interface"
+            },
+            {
+              "kind": "Content",
+              "text": ") => any | "
             },
             {
               "kind": "Reference",
@@ -7205,6 +7180,210 @@
           ],
           "releaseTag": "Beta",
           "name": "RouteParameterConverter",
+          "typeTokenRange": {
+            "startIndex": 1,
+            "endIndex": 6
+          }
+        },
+        {
+          "kind": "Interface",
+          "canonicalReference": "@microsoft/fast-router!RouteParameterConverterContext:interface",
+          "docComment": "/**\n * @beta\n */\n",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export interface RouteParameterConverterContext<TSettings = "
+            },
+            {
+              "kind": "Content",
+              "text": "any"
+            },
+            {
+              "kind": "Content",
+              "text": "> "
+            }
+          ],
+          "releaseTag": "Beta",
+          "typeParameters": [
+            {
+              "typeParameterName": "TSettings",
+              "constraintTokenRange": {
+                "startIndex": 0,
+                "endIndex": 0
+              },
+              "defaultTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            }
+          ],
+          "name": "RouteParameterConverterContext",
+          "members": [
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverterContext#endpoint:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly endpoint: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Endpoint",
+                  "canonicalReference": "@microsoft/fast-router!Endpoint:class"
+                },
+                {
+                  "kind": "Content",
+                  "text": "<TSettings>"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isOptional": false,
+              "releaseTag": "Beta",
+              "name": "endpoint",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverterContext#params:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly params: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Readonly",
+                  "canonicalReference": "!Readonly:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": "<"
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Record",
+                  "canonicalReference": "!Record:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": "<string, string | undefined>>"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isOptional": false,
+              "releaseTag": "Beta",
+              "name": "params",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 5
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverterContext#queryParams:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly queryParams: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Record",
+                  "canonicalReference": "!Record:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": "<string, string>"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isOptional": false,
+              "releaseTag": "Beta",
+              "name": "queryParams",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverterContext#typedParams:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly typedParams: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Record",
+                  "canonicalReference": "!Record:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": "<string, any>"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isOptional": false,
+              "releaseTag": "Beta",
+              "name": "typedParams",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              }
+            }
+          ],
+          "extendsTokenRanges": []
+        },
+        {
+          "kind": "TypeAlias",
+          "canonicalReference": "@microsoft/fast-router!RouteParameterConverterObject:type",
+          "docComment": "/**\n * @beta\n */\n",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export declare type RouteParameterConverterObject = "
+            },
+            {
+              "kind": "Content",
+              "text": "{\n    convert: "
+            },
+            {
+              "kind": "Reference",
+              "text": "RouteParameterConverter",
+              "canonicalReference": "@microsoft/fast-router!RouteParameterConverter:type"
+            },
+            {
+              "kind": "Content",
+              "text": ";\n}"
+            },
+            {
+              "kind": "Content",
+              "text": ";"
+            }
+          ],
+          "releaseTag": "Beta",
+          "name": "RouteParameterConverterObject",
           "typeTokenRange": {
             "startIndex": 1,
             "endIndex": 4
@@ -9032,7 +9211,7 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "any"
+                  "text": "void"
                 },
                 {
                   "kind": "Content",
@@ -9060,7 +9239,7 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "any"
+                  "text": "void"
                 },
                 {
                   "kind": "Content",
@@ -9097,11 +9276,11 @@
             {
               "kind": "Reference",
               "text": "ExecutionContext",
-              "canonicalReference": "@microsoft/fast-element!ExecutionContext:class"
+              "canonicalReference": "@microsoft/fast-element!ExecutionContext:interface"
             },
             {
               "kind": "Content",
-              "text": " & {\n    router: "
+              "text": " & {\n    router?: "
             },
             {
               "kind": "Reference",
@@ -9124,41 +9303,6 @@
             "endIndex": 5
           }
         },
-        {
-          "kind": "Variable",
-          "canonicalReference": "@microsoft/fast-router!RouterExecutionContext:var",
-          "docComment": "/**\n * @beta\n */\n",
-          "excerptTokens": [
-            {
-              "kind": "Content",
-              "text": "RouterExecutionContext: "
-            },
-            {
-              "kind": "Reference",
-              "text": "Readonly",
-              "canonicalReference": "!Readonly:type"
-            },
-            {
-              "kind": "Content",
-              "text": "<{\n    create(router: "
-            },
-            {
-              "kind": "Reference",
-              "text": "Router",
-              "canonicalReference": "@microsoft/fast-router!Router:interface"
-            },
-            {
-              "kind": "Content",
-              "text": "): any;\n}>"
-            }
-          ],
-          "releaseTag": "Beta",
-          "name": "RouterExecutionContext",
-          "variableTypeTokenRange": {
-            "startIndex": 1,
-            "endIndex": 5
-          }
-        },
         {
           "kind": "Interface",
           "canonicalReference": "@microsoft/fast-router!RouteView:interface",
@@ -9245,15 +9389,6 @@
                   "kind": "Content",
                   "text": "<string, any>>"
                 },
-                {
-                  "kind": "Content",
-                  "text": ", context: "
-                },
-                {
-                  "kind": "Reference",
-                  "text": "RouterExecutionContext",
-                  "canonicalReference": "@microsoft/fast-router!RouterExecutionContext:type"
-                },
                 {
                   "kind": "Content",
                   "text": "): "
@@ -9269,8 +9404,8 @@
               ],
               "isOptional": false,
               "returnTypeTokenRange": {
-                "startIndex": 8,
-                "endIndex": 9
+                "startIndex": 6,
+                "endIndex": 7
               },
               "releaseTag": "Beta",
               "overloadIndex": 1,
@@ -9282,17 +9417,36 @@
                     "endIndex": 5
                   },
                   "isOptional": false
+                }
+              ],
+              "name": "bind"
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@microsoft/fast-router!RouteView#context:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "context: "
                 },
                 {
-                  "parameterName": "context",
-                  "parameterTypeTokenRange": {
-                    "startIndex": 6,
-                    "endIndex": 7
-                  },
-                  "isOptional": false
+                  "kind": "Reference",
+                  "text": "RouterExecutionContext",
+                  "canonicalReference": "@microsoft/fast-router!RouterExecutionContext:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
                 }
               ],
-              "name": "bind"
+              "isOptional": false,
+              "releaseTag": "Beta",
+              "name": "context",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
             },
             {
               "kind": "MethodSignature",