@lightningjs/blits 2.0.0-beta.10 → 2.0.0-beta.11

package/index.d.ts

@@ -401,11 +401,9 @@ declare module '@lightningjs/blits' {
     readonly $hasFocus: boolean,
 
     /**
-     * Parent component instance.
-     * Note: will be undefined for the root Application component or after destroy.
-     *
+     * Parent component instance. Undefined for the root Application component (destroyed case not modeled).
      */
-    readonly $parent: ComponentBase,
+    readonly $parent: ComponentBase | undefined,
 
     /**
     * Indicates whether the component currently is hovered
@@ -546,6 +544,20 @@ declare module '@lightningjs/blits' {
     }) => void
   }
 
+  /**
+   * Context type for the root Application: no parent.
+   */
+  export interface ApplicationBase extends Omit<ComponentBase, '$parent'> {
+    readonly $parent: undefined
+  }
+
+  /**
+   * Context type for Components (Blits.Component): always has a parent when mounted. Destroyed case is not modeled.
+   */
+  export interface ChildComponentBase extends Omit<ComponentBase, '$parent'> {
+    readonly $parent: ComponentBase
+  }
+
   /**
    * Prop object
    */
@@ -589,7 +601,14 @@ declare module '@lightningjs/blits' {
     S,
     M,
     C
-  > = ThisType<Readonly<InferProps<P>> & S & M & Readonly<C> & ComponentBase>
+  > = ThisType<Readonly<InferProps<P>> & S & M & Readonly<C> & ChildComponentBase>
+
+  export type ApplicationContext<
+    P extends Record<string, any>,
+    S,
+    M,
+    C
+  > = ThisType<Readonly<InferProps<P>> & S & M & Readonly<C> & ApplicationBase>
 
   export interface ComponentConfig<P extends Props = {}, S, M, C, W> {
     components?: {
@@ -647,7 +666,7 @@ declare module '@lightningjs/blits' {
      * }
      * ```
      */
-    state?: (this: Readonly<InferProps<P>> & ComponentBase) => S;
+    state?: (this: Readonly<InferProps<P>> & ChildComponentBase) => S;
     /**
      * Methods for abstracting more complex business logic into separate function
      */
@@ -718,32 +737,41 @@ declare module '@lightningjs/blits' {
     backNavigation?: boolean
   }
 
-  export type ApplicationConfig<P extends Props, S, M, C, W> = ComponentConfig<P, S, M, C, W> & (
-    {
-      /**
-       * Router Configuration
-       */
-      router?: RouterConfig<P, S, M, C>,
-      routes?: never
-    }
-    |
-    {
-      router?: never
-      /**
-       * Routes definition
-       *
-       * @example
-       *
-       * ```js
-       * routes: [
-       *  { path: '/', component: Home },
-       *  { path: '/details', component: Details },
-       *  { path: '/account', component: Account },
-       * ]
-       * ```
-     */
-      routes?: Route[]
-    }
+  export type ApplicationConfig<P extends Props, S, M, C, W> = Omit<
+    ComponentConfig<P, S, M, C, W>,
+    'hooks' | 'methods' | 'input' | 'computed' | 'watch' | 'state'
+  > & {
+    hooks?: Hooks & ApplicationContext<P, S, M, C>
+    methods?: M & ApplicationContext<P, S, M, C>
+    input?: Input & ApplicationContext<P, S, M, C>
+    computed?: C & ApplicationContext<P, S, M, C>
+    watch?: W & ApplicationContext<P, S, M, C>
+    state?: (this: Readonly<InferProps<P>> & ApplicationBase) => S
+  } & (
+    | {
+        /**
+         * Router Configuration
+         */
+        router?: RouterConfig<P, S, M, C>
+        routes?: never
+      }
+    | {
+        router?: never
+        /**
+         * Routes definition
+         *
+         * @example
+         *
+         * ```js
+         * routes: [
+         *  { path: '/', component: Home },
+         *  { path: '/details', component: Details },
+         *  { path: '/account', component: Account },
+         * ]
+         * ```
+         */
+        routes?: Route[]
+      }
   )
 
   export interface Transition {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/blits",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "description": "Blits: The Lightning 3 App Development Framework",
   "bin": "bin/index.js",
   "exports": {
@@ -75,7 +75,7 @@
     "tape": "^5.5.0"
   },
   "dependencies": {
-    "@lightningjs/renderer": "3.0.0-beta23",
+    "@lightningjs/renderer": "3.0.0-beta24",
     "magic-string": "^0.30.21"
   },
   "repository": {