fix(core): 🚨 fix TS errors, improve TS defs

Closes barbajs#468
codegorrilla · Nov 25, 2019 · a48acd2 · a48acd2
1 parent fea3c42
commit a48acd2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/packages/core/src/defs/hooks.ts b/packages/core/src/defs/hooks.ts
@@ -40,12 +40,12 @@ export type HookFunction = (
 ) => Promise<void> | void;
 
 export class HookMethods {
-  public before?: (fn: HookFunction, ctx?: any) => void;
-  public beforeLeave?: (fn: HookFunction, ctx?: any) => void;
-  public leave?: (fn: HookFunction, ctx?: any) => void;
-  public afterLeave?: (fn: HookFunction, ctx?: any) => void;
-  public beforeEnter?: (fn: HookFunction, ctx?: any) => void;
-  public enter?: (fn: HookFunction, ctx?: any) => void;
-  public afterEnter?: (fn: HookFunction, ctx?: any) => void;
-  public after?: (fn: HookFunction, ctx?: any) => void;
+  public before: (fn: HookFunction, ctx?: any) => void;
+  public beforeLeave: (fn: HookFunction, ctx?: any) => void;
+  public leave: (fn: HookFunction, ctx?: any) => void;
+  public afterLeave: (fn: HookFunction, ctx?: any) => void;
+  public beforeEnter: (fn: HookFunction, ctx?: any) => void;
+  public enter: (fn: HookFunction, ctx?: any) => void;
+  public afterEnter: (fn: HookFunction, ctx?: any) => void;
+  public after: (fn: HookFunction, ctx?: any) => void;
 }
diff --git a/packages/core/src/defs/schemas.ts b/packages/core/src/defs/schemas.ts
@@ -2,7 +2,10 @@
  * @module typings/core
  */
 
-import { IRouteResolved } from '@barba/router/src/defs/router';
+interface IRouteResolved {
+  name: string;
+  params: any;
+}
 import { IUrlFull } from '.';
 
 export type SchemaAttributeValues =
@@ -46,9 +49,9 @@ export interface ISchemaAttribute {
  */
 
 export interface ISchemaPage {
-  container: HTMLElement | undefined;
-  html: string | undefined;
-  namespace: string | undefined;
+  container: HTMLElement;
+  html: string;
+  namespace: string;
   url: IUrlFull;
   route?: IRouteResolved | null;
 }
diff --git a/packages/core/src/schemas/page.ts b/packages/core/src/schemas/page.ts
@@ -9,14 +9,14 @@ import { ISchemaPage } from '../defs';
  * See [[ISchemaPage]]
  */
 export const schemaPage: ISchemaPage = {
-  container: undefined,
-  html: undefined,
-  namespace: undefined,
+  container: null,
+  html: '',
+  namespace: '',
   url: {
-    hash: undefined,
-    href: undefined,
-    path: undefined,
-    port: undefined,
+    hash: '',
+    href: '',
+    path: '',
+    port: null,
     query: {},
   },
 };