@symbiotejs/symbiote 2.0.0-alpha.21 → 2.0.0-alpha.23

package/core/AppRouter.js

@@ -2,6 +2,19 @@ import PubSub from './PubSub.js';
 
 export class AppRouter {
 
+  /**
+   * @typedef {{title?: String, default?: Boolean, error?: Boolean}} RouteDescriptor
+   */
+
+  /** @type {() => void} */
+  static #onPopstate;
+  /** @type {String} */
+  static #separator;
+  /** @type {String} */
+  static #routingEventName;
+  /** @type {Object<string, RouteDescriptor>} */
+  static appMap = Object.create(null);
+
   static #print(msg) {
     console.warn(msg);
   }
@@ -26,12 +39,12 @@ export class AppRouter {
   /** @param {String} name */
   static set routingEventName(name) {
     /** @private */
-    this.__routingEventName = name;
+    this.#routingEventName = name;
   }
 
   /** @returns {String} */
   static get routingEventName() {
-    return this.__routingEventName || 'sym-on-route';
+    return this.#routingEventName || 'sym-on-route';
   }
 
   static readAddressBar() {
@@ -116,17 +129,17 @@ export class AppRouter {
   /** @param {String} char */
   static setSeparator(char) {
     /** @private */
-    this._separator = char;
+    this.#separator = char;
   }
 
   /** @returns {String} */
   static get separator() {
-    return this._separator || '&';
+    return this.#separator || '&';
   }
 
   /**
    * @param {String} ctxName
-   * @param {Object<string, {}>} routingMap
+   * @param {Object<string, RouteDescriptor>} routingMap
    * @returns {PubSub}
    */
   static initRoutingCtx(ctxName, routingMap) {
@@ -141,33 +154,31 @@ export class AppRouter {
     );
     window.addEventListener(this.routingEventName, (/** @type {CustomEvent} */ e) => {
       routingCtx.multiPub({
-        route: e.detail.route,
         options: e.detail.options,
         title: e.detail.options?.title || this.defaultTitle || '',
+        route: e.detail.route,
       });
     });
     AppRouter.notify();
-    this.initPopstateListener();
+    this.#initPopstateListener();
     return routingCtx;
   }
 
-  static initPopstateListener() {
-    if (this.__onPopstate) {
+  static #initPopstateListener() {
+    if (this.#onPopstate) {
       return;
     }
     /** @private */
     this.__onPopstate = () => {
       this.notify();
     };
-    window.addEventListener('popstate', this.__onPopstate);
+    window.addEventListener('popstate', this.#onPopstate);
   }
 
   static removePopstateListener() {
-    window.removeEventListener('popstate', this.__onPopstate);
-    this.__onPopstate = null;
+    window.removeEventListener('popstate', this.#onPopstate);
+    this.#onPopstate = null;
   }
 }
 
-AppRouter.appMap = Object.create(null);
-
 export default AppRouter;

package/core/index.js

@@ -1,5 +1,7 @@
+import Symbiote from './Symbiote.js';
+
 // Core modules:
-export { Symbiote } from './Symbiote.js';
+export { Symbiote };
 export { html } from './html.js';
 export { css } from './css.js';
 export { PubSub } from './PubSub.js';
@@ -12,3 +14,5 @@ export { applyStyles } from '../utils/dom-helpers.js';
 export { applyAttributes } from '../utils/dom-helpers.js';
 export { create } from '../utils/dom-helpers.js';
 export { kebabToCamel } from '../utils/kebabToCamel.js';
+
+export default Symbiote;

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@symbiotejs/symbiote",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "scripts": {
     "types": "tsc -p dts.cfg.json"
   },

package/types/symbiote.d.ts

@@ -161,6 +161,16 @@ declare module "core/Symbiote" {
 }
 declare module "core/AppRouter" {
     export class AppRouter {
+        static "__#3@#onPopstate": () => void;
+        static "__#3@#separator": string;
+        static "__#3@#routingEventName": string;
+        static appMap: {
+            [x: string]: {
+                title?: string;
+                default?: boolean;
+                error?: boolean;
+            };
+        };
         static "__#3@#print"(msg: any): void;
         static setDefaultTitle(title: string): void;
         static setRoutingMap(map: {
@@ -181,21 +191,16 @@ declare module "core/AppRouter" {
         }): void;
         static setSeparator(char: string): void;
         static get separator(): string;
-        static createRouterData(ctxName: string, routingMap: {
-            [x: string]: {};
+        static initRoutingCtx(ctxName: string, routingMap: {
+            [x: string]: {
+                title?: string;
+                default?: boolean;
+                error?: boolean;
+            };
         }): PubSub<any>;
-        static initPopstateListener(): void;
+        static "__#3@#initPopstateListener"(): void;
         static removePopstateListener(): void;
     }
-    export namespace AppRouter {
-        const defaultTitle: string;
-        const defaultRoute: string;
-        const errorRoute: string;
-        const __routingEventName: string;
-        const _separator: string;
-        function __onPopstate(): void;
-        const appMap: any;
-    }
     export default AppRouter;
     import PubSub from "core/PubSub";
 }
@@ -225,7 +230,7 @@ declare module "utils/kebabToCamel" {
     export function kebabToCamel(string: string): string;
 }
 declare module "core/index" {
-    export { Symbiote } from "./Symbiote.js";
+    export { Symbiote };
     export { html } from "./html.js";
     export { css } from "./css.js";
     export { PubSub } from "./PubSub.js";
@@ -233,6 +238,8 @@ declare module "core/index" {
     export { UID } from "../utils/UID.js";
     export { setNestedProp } from "../utils/setNestedProp.js";
     export { kebabToCamel } from "../utils/kebabToCamel.js";
+    export default Symbiote;
+    import Symbiote from "core/Symbiote";
     export { applyStyles, applyAttributes, create } from "../utils/dom-helpers.js";
 }
 declare module "core/slotProcessor" {