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

package/hooks/useData/useData.d.ts

@@ -1,2 +1,2 @@
 import { type ApiEndpoints, type TEndpoint } from '../../types';
-export declare function useData<F extends Exclude<keyof TEndpoint, 'response'>, D extends keyof ApiEndpoints>(from: F, path?: D): ApiEndpoints[D][F];
+export declare function useData<F extends Exclude<keyof TEndpoint, 'response'>, D extends keyof ApiEndpoints = keyof ApiEndpoints>(from: F, path?: D): ApiEndpoints[D][F];

package/hooks/useData/useData.es6.js

@@ -1,9 +1,12 @@
+import { useContext } from '@innet/jsx';
 import '../useAction/index.es6.js';
 import '../useEndpoint/index.es6.js';
+import '../useParams/index.es6.js';
 import '../useThrow/index.es6.js';
 import { useEndpoint } from '../useEndpoint/useEndpoint.es6.js';
 import { useThrow } from '../useThrow/useThrow.es6.js';
 import { useAction } from '../useAction/useAction.es6.js';
+import { paramsContext } from '../useParams/useParams.es6.js';
 
 function useData(from, path) {
     if (path) {
@@ -17,6 +20,9 @@ function useData(from, path) {
     if (!action) {
         useThrow('<{type}> MUST be in <return> or <preset>');
     }
+    if (from === 'params') {
+        return useContext(paramsContext);
+    }
     return action[from];
 }
 

package/hooks/useData/useData.js

@@ -2,12 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var jsx = require('@innet/jsx');
 require('../useAction/index.js');
 require('../useEndpoint/index.js');
+require('../useParams/index.js');
 require('../useThrow/index.js');
 var useEndpoint = require('../useEndpoint/useEndpoint.js');
 var useThrow = require('../useThrow/useThrow.js');
 var useAction = require('../useAction/useAction.js');
+var useParams = require('../useParams/useParams.js');
 
 function useData(from, path) {
     if (path) {
@@ -21,6 +24,9 @@ function useData(from, path) {
     if (!action) {
         useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
     }
+    if (from === 'params') {
+        return jsx.useContext(useParams.paramsContext);
+    }
     return action[from];
 }
 

package/package.json

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

package/types.d.ts

@@ -84,5 +84,7 @@ 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 {
+}
+export interface ApiSchemas {
+}

package/utils/generateTypes/generateTypes.es6.js

@@ -97,18 +97,7 @@ 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 = '';
     const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
     const paths = docs.paths;
     if (schemas) {
@@ -183,12 +172,18 @@ function generateTypes(docs, namespace = 'Api') {
             result += '    }\n';
         }
     }
-    const body = result + '  }\n}';
-    return `${body}
+    const body = result + '  }';
+    return `import '@innet/server'
+${body.includes('Bin') ? 'import { Bin } from \'@innet/server\'\n' : ''}
+declare global {
+  namespace ${namespace} {
+  ${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,18 +101,7 @@ 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 = '';
     const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
     const paths = docs.paths;
     if (schemas) {
@@ -187,12 +176,18 @@ function generateTypes(docs, namespace = 'Api') {
             result += '    }\n';
         }
     }
-    const body = result + '  }\n}';
-    return `${body}
+    const body = result + '  }';
+    return `import '@innet/server'
+${body.includes('Bin') ? 'import { Bin } from \'@innet/server\'\n' : ''}
+declare global {
+  namespace ${namespace} {
+  ${body}
+  }
+}
 
 declare module '@innet/server' {
-  type ApiEndpoints = ${namespace}.Endpoints
-  type ApiSchemas = ${namespace}.Schemas
+  interface ApiEndpoints extends ${namespace}.Endpoints {}
+  interface ApiSchemas extends ${namespace}.Schemas {}
 }
 `;
 }