@innet/server 2.0.0-beta.17 → 2.0.0-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",

package/types.d.ts

@@ -75,6 +75,16 @@ export interface ValuesSchemaProps<T> extends BaseSchemaProps<T> {
     value?: T;
     values?: SchemaValues<T>;
 }
+export interface Bin {
+    disposition: string;
+    extension?: string;
+    fieldName: string;
+    filename: string;
+    originalFilename: string;
+    path: string;
+    size: number;
+    type: string;
+}
 export type TResponse = Record<ResponseStatus, unknown>;
 export interface TEndpoint {
     body?: unknown;
@@ -84,5 +94,9 @@ export interface TEndpoint {
     response?: Record<string, TResponse>;
     search?: Record<string, unknown>;
 }
-export type ApiEndpoints = Record<string, TEndpoint>;
-export type ApiSchemas = Record<string, unknown>;
+export interface ApiEndpoints {
+    [key: string]: TEndpoint;
+}
+export interface ApiSchemas {
+    [key: string]: unknown;
+}

package/utils/generateTypes/generateTypes.es6.js

@@ -97,17 +97,8 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
 }
 function generateTypes(docs, namespace = 'Api') {
     var _a;
-    let result = `declare namespace ${namespace} {
-  export interface Bin {
-    filename: string
-    fieldName: string
-    originalFilename: string
-    path: string
-    type: string
-    disposition: string
-    size: number
-    extension?: string
-  }
+    let result = `import { Bin } from '@innet/server'
+declare namespace ${namespace} {
 `;
     const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
     const paths = docs.paths;
@@ -187,8 +178,8 @@ function generateTypes(docs, namespace = 'Api') {
     return `${body}
 
 declare module '@innet/server' {
-  type ApiEndpoints = ${namespace}.Endpoints
-  type ApiSchemas = ${namespace}.Schemas
+  interface ApiEndpoints extends ${namespace}.Endpoints {}
+  interface ApiSchemas extends ${namespace}.Schemas {}
 }
 `;
 }

package/utils/generateTypes/generateTypes.js

@@ -101,17 +101,8 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
 }
 function generateTypes(docs, namespace = 'Api') {
     var _a;
-    let result = `declare namespace ${namespace} {
-  export interface Bin {
-    filename: string
-    fieldName: string
-    originalFilename: string
-    path: string
-    type: string
-    disposition: string
-    size: number
-    extension?: string
-  }
+    let result = `import { Bin } from '@innet/server'
+declare namespace ${namespace} {
 `;
     const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
     const paths = docs.paths;
@@ -191,8 +182,8 @@ function generateTypes(docs, namespace = 'Api') {
     return `${body}
 
 declare module '@innet/server' {
-  type ApiEndpoints = ${namespace}.Endpoints
-  type ApiSchemas = ${namespace}.Schemas
+  interface ApiEndpoints extends ${namespace}.Endpoints {}
+  interface ApiSchemas extends ${namespace}.Schemas {}
 }
 `;
 }