nullstack · Mortaro · May 22, 2023 · May 22, 2023
diff --git a/types/ClientContext.d.ts b/types/ClientContext.d.ts
@@ -1,4 +1,5 @@
 import { NullstackEnvironment } from './Environment'
+import { NullstackInstances } from './Instances'
 import { NullstackFragment } from './JSX'
 import { NullstackPage } from './Page'
 import { NullstackParams } from './Params'
@@ -10,7 +11,7 @@ import { NullstackWorker } from './Worker'
 /**
  * @see https://nullstack.app/context
  */
-export type NullstackClientContext<TProps = unknown> = TProps & {
+interface BaseNullstackClientContext {
   /**
    * Callback function that bootstrap the context for the application.
    */
@@ -53,7 +54,7 @@ export type NullstackClientContext<TProps = unknown> = TProps & {
    * @scope client
    * @see https://nullstack.app/context-instances
    */
-  instances: Record<string, unknown>
+  instances: NullstackInstances
 
   /**
    * It gives you information about the current environment.
@@ -129,3 +130,5 @@ export type NullstackClientContext<TProps = unknown> = TProps & {
 
   element?: HTMLElement
 }
+
+export type NullstackClientContext<TProps = unknown> = BaseNullstackClientContext & TProps
diff --git a/types/Environment.d.ts b/types/Environment.d.ts
@@ -1,4 +1,4 @@
-export type NullstackEnvironment = {
+export interface NullstackEnvironment {
   client: boolean
 
   server: boolean

diff --git a/types/Instances.d.ts b/types/Instances.d.ts
@@ -0,0 +1 @@
+export interface NullstackInstances extends Record<string, unknown> {}
diff --git a/types/Page.d.ts b/types/Page.d.ts
@@ -1,4 +1,4 @@
-export type NullstackPage = {
+export interface NullstackPage {
   /**
    * Current page title
    *

diff --git a/types/Plugin.d.ts b/types/Plugin.d.ts
@@ -1,7 +1,7 @@
 import { NullstackClientContext } from './ClientContext'
 import { AllHTMLAttributes, NullstackAttributes } from './JSX'
 
-type NullstackPluginNode = {
+interface NullstackPluginNode {
   type: string | boolean
   attributes: AllHTMLAttributes<HTMLElement> & NullstackAttributes
   children: NullstackClientContext['children']
@@ -11,7 +11,7 @@ interface NullstackNodeContext extends NullstackClientContext {
   node: NullstackPluginNode
 }
 
-export type NullstackPlugin = {
+export interface NullstackPlugin {
   /**
    * Runs transformation to node element
    * @param context Context with node attributes

diff --git a/types/Project.d.ts b/types/Project.d.ts
@@ -1,4 +1,4 @@
-export type NullstackProject = {
+export interface NullstackProject {
   domain: string
 
   /**

diff --git a/types/Request.d.ts b/types/Request.d.ts
@@ -0,0 +1,3 @@
+import { Request } from 'express'
+
+export interface NullstackRequest extends Request {}
diff --git a/types/Response.d.ts b/types/Response.d.ts
@@ -0,0 +1,3 @@
+import { Response } from 'express'
+
+export interface NullstackResponse extends Response {}
diff --git a/types/Router.d.ts b/types/Router.d.ts
@@ -1,4 +1,4 @@
-export type NullstackRouter = {
+export interface NullstackRouter {
   /**
    * The router path including query params.
    * Does not contain the domain and port.

diff --git a/types/Secrets.d.ts b/types/Secrets.d.ts
@@ -1 +1 @@
-export type NullstackSecrets = Record<string, string | boolean>
+export interface NullstackSecrets extends Record<string, string | boolean> {}
diff --git a/types/Server.d.ts b/types/Server.d.ts
@@ -1,4 +1,4 @@
-export type NullstackServer = {
+export interface NullstackServer {
   get(...args)
 
   post(...args)

diff --git a/types/ServerContext.d.ts b/types/ServerContext.d.ts
@@ -1,5 +1,7 @@
 import { NullstackEnvironment } from './Environment'
 import { NullstackProject } from './Project'
+import { NullstackRequest } from './Request'
+import { NullstackResponse } from './Response'
 import { NullstackSecrets } from './Secrets'
 import { NullstackServer } from './Server'
 import { NullstackSettings } from './Settings'
@@ -8,7 +10,7 @@ import { NullstackWorker } from './Worker'
 /**
  * @see https://nullstack.app/context
  */
-export type NullstackServerContext<TProps = unknown> = TProps & {
+interface BaseNullstackServerContext {
   /**
    * Callback function that bootstrap the context for the application.
    */
@@ -49,15 +51,15 @@ export type NullstackServerContext<TProps = unknown> = TProps & {
    * @scope server
    * @see https://nullstack.app/server-request-and-response
    */
-  request?: Record<string, any>
+  request?: NullstackRequest
 
   /**
    * Original `response` object from [Express](https://expressjs.com/)
    *
    * @scope server
    * @see https://nullstack.app/server-request-and-response
    */
-  response?: Record<string, any>
+  response?: NullstackResponse
 
   /**
    * You can assign any key with any type of public information.
@@ -83,3 +85,5 @@ export type NullstackServerContext<TProps = unknown> = TProps & {
    */
   secrets: NullstackSecrets
 }
+
+export type NullstackServerContext<TProps = unknown> = BaseNullstackServerContext & TProps
diff --git a/types/Settings.d.ts b/types/Settings.d.ts
@@ -1 +1 @@
-export type NullstackSettings = Record<string, string | boolean>
+export interface NullstackSettings extends Record<string, string | boolean> {}
diff --git a/types/Worker.d.ts b/types/Worker.d.ts
@@ -1,4 +1,4 @@
-export type NullstackWorker = {
+export interface NullstackWorker {
   /**
    * - keys: server functions names
    * - values: array of these functions arguments

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -5,10 +5,13 @@ import { NullstackServerContext } from './ServerContext'
 
 export * from './ClientContext'
 export * from './Environment'
+export * from './Instances'
 export * from './Page'
 export * from './Params'
 export * from './Plugin'
 export * from './Project'
+export * from './Request'
+export * from './Response'
 export * from './Router'
 export * from './Secrets'
 export * from './Server'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export interface NullstackInstances extends Record<string, unknown> {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { Request } from 'express'

		export interface NullstackRequest extends Request {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { Response } from 'express'

		export interface NullstackResponse extends Response {}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export type NullstackSecrets = Record<string, string \| boolean>
		export interface NullstackSecrets extends Record<string, string \| boolean> {}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export type NullstackSettings = Record<string, string \| boolean>
		export interface NullstackSettings extends Record<string, string \| boolean> {}