Rename AppBase -> App, App -> AppForClient, same for Derby/DerbyForCl…

…ient

src/App.ts

@@ -13,7 +13,7 @@ import { util } from 'racer';
 
 import * as components from './components';
 import { type ComponentConstructor, type SingletonComponentConstructor } from './components';
-import { type Derby } from './Derby';
+import { type DerbyForClient } from './Derby';
 import { PageForClient, type Page } from './Page';
 import { PageParams, routes } from './routes';
 import * as derbyTemplates from './templates';
@@ -62,7 +62,7 @@ type Routes = [string, string, any][];
  */
 
 export abstract class App extends EventEmitter {
-  derby: Derby;
+  derby: DerbyForClient;
   name: string;
   filename: string;
   scriptHash: string;

src/AppForServer.ts

@@ -9,7 +9,7 @@
 import * as racer from 'racer';
 
 import { App } from './App';
-import { type DerbyBase } from './Derby';
+import { type Derby } from './Derby';
 import { type StyleCompilerOptions } from './files';
 import { PageForServer } from './PageForServer';
 import parsing = require('./parsing');
@@ -79,7 +79,7 @@ export class AppForServer extends App {
   watchFiles: boolean;
   router: any;
 
-  constructor(derby: DerbyBase, name: string, filename: string, options) {
+  constructor(derby: Derby, name: string, filename: string, options) {
     super(derby, name, filename, options);
     this._init(options);
   }

src/Derby.ts

@@ -9,13 +9,13 @@ import { AppForClient, type App, type AppOptions } from './App';
 import { Component } from './components';
 import { PageForClient } from './Page';
 
-export abstract class DerbyBase extends Racer {
+export abstract class Derby extends Racer {
   Component = Component;
 
   abstract createApp(name?: string, filename?: string, options?: AppOptions): App
 }
 
-export class Derby extends DerbyBase {
+export class DerbyForClient extends Derby {
   App = AppForClient;
   Page = PageForClient;
 

src/DerbyForServer.ts

@@ -2,12 +2,12 @@ import { util } from 'racer';
 
 import { App } from './App';
 import { AppForServer } from './AppForServer';
-import { DerbyBase } from './Derby';
+import { Derby } from './Derby';
 import { PageForServer } from './PageForServer';
 
 util.isProduction = process.env.NODE_ENV === 'production';
 
-export class DerbyForServer extends DerbyBase {
+export class DerbyForServer extends Derby {
   App = AppForServer;
   Page = PageForServer;
 

src/index.ts

@@ -1,10 +1,10 @@
 import { util } from 'racer';
 
 import { type AppOptions } from './App';
-import { Derby, type DerbyBase } from './Derby';
+import { DerbyForClient, type Derby } from './Derby';
 
-export { type AppForClient, type App as AppBase } from './App';
-export { type AppForServer } from './AppForServer';
+export { AppForClient, App } from './App';
+export { AppForServer } from './AppForServer';
 export { Dom } from './Dom';
 export { Page, PageForClient } from './Page';
 export { PageForServer } from './PageForServer';
@@ -19,8 +19,8 @@ export { type PageParams, type QueryParams } from './routes';
 
 const DerbyClass = util.isServer
   ? util.serverRequire(module, './DerbyForServer').DerbyForServer
-  : Derby;
-const instance: DerbyBase = new DerbyClass();
+  : DerbyForClient;
+const instance: Derby = new DerbyClass();
 
 export function createApp(name?: string, file?: string, options?: AppOptions) {
   return instance.createApp(name, file, options);
@@ -31,7 +31,7 @@ export function use<T = unknown>(plugin: (derby: Derby, options?: T) => Derby, o
 }
 
 export {
-  Derby,
+  DerbyForClient as Derby,
   instance,
   util,
 }