@modern-js/types 2.55.0 → 2.56.1

package/cli/index.d.ts

@@ -1,5 +1,3 @@
-import type { Merge } from 'type-fest';
-
 import type { Config as JestConfigTypes } from '@jest/types';
 
 export type JestConfig = JestConfigTypes.Config;
@@ -34,7 +32,9 @@ export interface Entrypoint {
    * Using customEntry instead.
    */
   customBootstrap?: string | false;
-
+  /**
+   * use src/{entryName}/entry.tsx to custom entry
+   */
   customEntry?: boolean;
 
   customServerEntry?: string | false;
@@ -44,6 +44,10 @@ export interface Entrypoint {
     routes?: any[];
   };
   absoluteEntryDir?: string;
+  /**
+   * use source.entries to custom entry
+   */
+  isCustomSourceEntry?: boolean;
 }
 
 /**
@@ -58,54 +62,47 @@ export type RouteLegacy = {
   parent?: RouteLegacy;
 };
 
-export type Route = Partial<{
-  caseSensitive: boolean;
-  path: string;
-  id: string;
-  loader: any;
-  action: any;
-  hasErrorBoundary: boolean;
-  shouldRevalidate: any;
-  handle: any;
-  index: boolean;
-  children: Route[] | undefined;
-  element: React.ReactNode | null;
-  errorElement: React.ReactNode | null;
-}> & {
+export interface Route {
+  caseSensitive?: boolean;
+  path?: string;
+  id?: string;
+  loader?: any;
+  action?: any;
+  hasErrorBoundary?: boolean;
+  shouldRevalidate?: any;
+  handle?: any;
+  index?: boolean;
+  children?: Route[] | undefined;
+  element?: React.ReactNode | null;
+  errorElement?: React.ReactNode | null;
   type: string;
-};
+}
 
 export type NestedRouteForCli = NestedRoute<string>;
 
-export type NestedRoute<T = string | (() => JSX.Element)> = Merge<
-  Route,
-  {
-    type: 'nested';
-    parentId?: string;
-    data?: string;
-    clientData?: string;
-    children?: NestedRoute<T>[];
-    filename?: string;
-    _component?: string;
-    component?: T;
-    lazyImport?: () => Promise<any>;
-    loading?: T;
-    error?: T;
-    isRoot?: boolean;
-    config?: string | Record<string, any>;
-  }
->;
-
-export type PageRoute = Merge<
-  Route,
-  {
-    type: 'page';
-    parent?: PageRoute;
-    _component: string;
-    component: string;
-    children?: PageRoute[];
-  }
->;
+export interface NestedRoute<T = string | (() => JSX.Element)> extends Route {
+  type: 'nested';
+  parentId?: string;
+  data?: string;
+  clientData?: string;
+  children?: NestedRoute<T>[];
+  filename?: string;
+  _component?: string;
+  component?: T;
+  lazyImport?: () => Promise<any>;
+  loading?: T;
+  error?: T;
+  isRoot?: boolean;
+  config?: string | Record<string, any>;
+}
+
+export interface PageRoute extends Route {
+  type: 'page';
+  parent?: PageRoute;
+  _component: string;
+  component: string;
+  children?: PageRoute[];
+}
 
 /**
  * custom html partials.

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.55.0",
+  "version": "2.56.1",
   "types": "./index.d.ts",
   "exports": {
     ".": {
@@ -39,14 +39,14 @@
     }
   },
   "devDependencies": {
-    "@types/babel__core": "^7.20.1",
+    "@types/babel__core": "^7.20.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "http-proxy-middleware": "^2.0.4",
     "jest": "^29",
     "type-fest": "2.15.0",
-    "@scripts/build": "2.55.0",
-    "@scripts/jest-config": "2.55.0"
+    "@scripts/jest-config": "2.56.1",
+    "@scripts/build": "2.56.1"
   },
   "sideEffects": false,
   "publishConfig": {

package/server/index.d.ts

@@ -5,3 +5,4 @@ export * from './route';
 export * from './bff';
 export * from './devServer';
 export * from './middleware';
+export * from './monitor';

package/server/monitor.d.ts

@@ -0,0 +1,36 @@
+/* eslint-disable @typescript-eslint/method-signature-style */
+/** Monitor Events  */
+export type LogLevel = 'warn' | 'error' | 'debug' | 'info';
+
+export interface LogEvent {
+  type: 'log';
+  payload: {
+    level: LogLevel;
+    message: string;
+    args?: any[];
+  };
+}
+
+export interface TimingEvent {
+  type: 'timing';
+  payload: {
+    name: string;
+    dur: number;
+    desc?: string;
+  };
+}
+
+export type MonitorEvent = LogEvent | TimingEvent;
+
+export type CoreMonitor = (event: MonitorEvent) => void;
+
+export interface Monitors {
+  push(monitor: CoreMonitor): void;
+
+  error(message: string, ...args: any[]): void;
+  warn(message: string, ...args: any[]): void;
+  debug(message: string, ...args: any[]): void;
+  info(message: string, ...args: any[]): void;
+
+  timing(name: string, dur: number, desc?: string): void;
+}