@innet/server 2.0.0-alpha.3 → 2.0.0-alpha.4

package/README.md

@@ -3319,6 +3319,7 @@ Hook functions give you all features to control parent element functionality.
 [useParams](#useparams)  
 [useSearch](#usesearch)  
 [useBody](#usebody)  
+[useComponentName](#usecomponentname)  
 
 ---
 
@@ -3496,6 +3497,24 @@ export function Component () {
 }
 ```
 
+### useComponentName
+
+[← back](#hooks)
+
+This hook returns name of current component.
+
+*src/Component.tsx*
+```typescript jsx
+import { useComponentName } from '@innet/sever'
+
+export function Component () {
+// returns this ^-------^
+  const name = useComponentName()
+
+  return <success>{{ name }}</success>
+}
+```
+
 ## Issues
 If you find a bug or have a suggestion, please file an issue on [GitHub](https://github.com/d8corp/innet-server/issues).
 

package/example/requests/index.d.ts

@@ -1 +1 @@
-export * from './partners';
+export * from './todo';

package/example/requests/todo/AddTodo/AddTodo.d.ts

@@ -0,0 +1 @@
+export declare function AddTodo(): any;

package/example/requests/todo/AddTodo/index.d.ts

@@ -0,0 +1 @@
+export * from './AddTodo';

package/example/requests/todo/DeleteTodo/DeleteTodo.d.ts

@@ -0,0 +1 @@
+export declare function DeleteTodo(): any;

package/example/requests/todo/DeleteTodo/index.d.ts

@@ -0,0 +1 @@
+export * from './DeleteTodo';

package/example/requests/todo/EditTodo/EditTodo.d.ts

@@ -0,0 +1 @@
+export declare function EditTodo(): any;

package/example/requests/todo/EditTodo/index.d.ts

@@ -0,0 +1 @@
+export * from './EditTodo';

package/example/requests/todo/GetTodo/GetTodo.d.ts

@@ -0,0 +1 @@
+export declare function GetTodo(): any;

package/example/requests/todo/GetTodo/index.d.ts

@@ -0,0 +1 @@
+export * from './GetTodo';

package/example/requests/todo/GetTodos/GetTodos.d.ts

@@ -0,0 +1 @@
+export declare function GetTodos(): any;

package/example/requests/todo/GetTodos/index.d.ts

@@ -0,0 +1 @@
+export * from './GetTodos';

package/example/requests/todo/index.d.ts

@@ -0,0 +1,5 @@
+export * from './GetTodos';
+export * from './GetTodo';
+export * from './AddTodo';
+export * from './EditTodo';
+export * from './DeleteTodo';

package/example/requests/todo/todos.d.ts

@@ -0,0 +1 @@
+export declare const todos: Api.Schemas.TodoSchema[];

package/example/schemas/app/ListQueryParams/ListQueryParams.d.ts

@@ -0,0 +1 @@
+export declare function ListQueryParams(): any;

package/example/schemas/app/ListQueryParams/index.d.ts

@@ -0,0 +1 @@
+export * from './ListQueryParams';

package/example/schemas/app/ListSchema/ListSchema.d.ts

@@ -1 +1,4 @@
-export declare function ListSchema(): any;
+export interface ListSchemaProps {
+    key: string;
+}
+export declare function ListSchema({ key }: ListSchemaProps): any;

package/example/schemas/app/index.d.ts

@@ -1 +1,2 @@
 export * from './ListSchema';
+export * from './ListQueryParams';

package/example/schemas/index.d.ts

@@ -1,4 +1,2 @@
-export * from './location';
-export * from './address';
-export * from './partner';
 export * from './app';
+export * from './todo';

package/example/schemas/todo/TodoSchema/TodoSchema.d.ts

@@ -0,0 +1,4 @@
+export interface TodoSchemaProps {
+    add?: boolean;
+}
+export declare function TodoSchema(props: TodoSchemaProps): any;

package/example/schemas/todo/TodoSchema/index.d.ts

@@ -0,0 +1 @@
+export * from './TodoSchema';

package/example/schemas/todo/index.d.ts

@@ -0,0 +1 @@
+export * from './TodoSchema';

package/example/tags/Todo/Todo.d.ts

@@ -0,0 +1 @@
+export declare function Todo(): any;

package/example/tags/Todo/index.d.ts

@@ -0,0 +1 @@
+export * from './Todo';

package/example/tags/index.d.ts

@@ -1 +1 @@
-export * from './Partner';
+export * from './Todo';

package/hooks/useComponentName/useComponentName.d.ts

@@ -1 +1 @@
-export declare function useComponentName(): any;
+export declare function useComponentName(): string;

package/index.es6.js

@@ -81,6 +81,7 @@ export { maxBin } from './utils/rules/maxBin/maxBin.es6.js';
 export { binaryAccept } from './utils/rules/binaryAccept/binaryAccept.es6.js';
 export { JSONString } from './utils/JSONString/JSONString.es6.js';
 export { Bin } from './utils/FileData/Bin.es6.js';
+export { generateSchemaTypes, generateTypes } from './utils/generateTypes/generateTypes.es6.js';
 export { serverContext, useServer } from './hooks/useServer/useServer.es6.js';
 export { apiContext, useApi } from './hooks/useApi/useApi.es6.js';
 export { hostContext, useHost } from './hooks/useHost/useHost.es6.js';

package/index.js

@@ -85,6 +85,7 @@ var maxBin = require('./utils/rules/maxBin/maxBin.js');
 var binaryAccept = require('./utils/rules/binaryAccept/binaryAccept.js');
 var JSONString = require('./utils/JSONString/JSONString.js');
 var Bin = require('./utils/FileData/Bin.js');
+var generateTypes = require('./utils/generateTypes/generateTypes.js');
 var useServer = require('./hooks/useServer/useServer.js');
 var useApi = require('./hooks/useApi/useApi.js');
 var useHost = require('./hooks/useHost/useHost.js');
@@ -203,6 +204,8 @@ exports.maxBin = maxBin.maxBin;
 exports.binaryAccept = binaryAccept.binaryAccept;
 exports.JSONString = JSONString.JSONString;
 exports.Bin = Bin.Bin;
+exports.generateSchemaTypes = generateTypes.generateSchemaTypes;
+exports.generateTypes = generateTypes.generateTypes;
 exports.serverContext = useServer.serverContext;
 exports.useServer = useServer.useServer;
 exports.apiContext = useApi.apiContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -42,7 +42,6 @@
     "@types/multiparty": "^0.0.33",
     "@types/qs": "^6.9.7",
     "cookie": "^0.5.0",
-    "dtsgenerator": "^3.18.0",
     "http-proxy": "^1.18.1",
     "innet": "^2.0.0-alpha.3",
     "is-invalid-path": "^1.0.2",

package/plugins/main/response/response.d.ts

@@ -4,7 +4,7 @@ export interface ResponseProps {
      * A description of the response.
      * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
      * */
-    description: string;
+    description?: string;
     /**
      * Any [HTTP status code](https://swagger.io/specification/#http-codes) can be used as the property.
      * To define a range of response codes, this field MAY contain the uppercase wildcard character X.

package/plugins/main/response/response.es6.js

@@ -9,7 +9,7 @@ import { getOrAdd } from '../../../utils/getOrAdd/getOrAdd.es6.js';
 import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 
 const response = () => {
-    const { description, status = 'default' } = useProps();
+    const { description = '', status = 'default' } = useProps() || {};
     const { operation, props: { path } } = useEndpoint();
     const children = useChildren();
     const handler = useNewHandler();

package/plugins/main/response/response.js

@@ -17,7 +17,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const response = () => {
-    const { description, status = 'default' } = jsx.useProps();
+    const { description = '', status = 'default' } = jsx.useProps() || {};
     const { operation, props: { path } } = useEndpoint.useEndpoint();
     const children = jsx.useChildren();
     const handler = innet.useNewHandler();

package/plugins/utils/dts/dts.d.ts

@@ -1,6 +1,5 @@
 import { type HandlerPlugin } from 'innet';
-import { type Config } from 'dtsgenerator/dist/core/config';
-export interface DtsProps extends Partial<Config> {
+export interface DtsProps {
     path: string;
 }
 export declare const dts: HandlerPlugin;

package/plugins/utils/dts/dts.es6.js

@@ -1,34 +1,15 @@
-import { __rest, __awaiter } from 'tslib';
 import { useProps } from '@innet/jsx';
-import dtsGenerator, { parseSchema } from 'dtsgenerator';
-import fs from 'node:fs';
+import { promises } from 'node:fs';
 import '../../../hooks/index.es6.js';
+import '../../../utils/index.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
+import { generateTypes } from '../../../utils/generateTypes/generateTypes.es6.js';
 
 const dts = () => {
-    const _a = useProps(), { path } = _a, config = __rest(_a, ["path"]);
+    const { path } = useProps();
     const { docs } = useApi();
-    dtsGenerator({
-        contents: [parseSchema(JSON.parse(JSON.stringify(docs)))],
-        config,
-    }).then((content) => __awaiter(void 0, void 0, void 0, function* () {
-        yield fs.promises.writeFile(path, `interface Bin {
-  filename: string
-  fieldName: string
-  originalFilename: string
-  path: string
-  type: string
-  disposition: string
-  size: number
-  extension?: string
-}
-${content
-            .replaceAll(';', '')
-            .replaceAll('number // int64', 'bigint')
-            .replaceAll('string // binary', 'Bin')
-            .replaceAll('string // date-time', 'Date')}`);
-    })).catch(error => {
-        console.warn(error);
+    promises.writeFile(path, generateTypes(docs)).catch(e => {
+        console.error(e);
     });
 };
 

package/plugins/utils/dts/dts.js

@@ -2,42 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
-var dtsGenerator = require('dtsgenerator');
 var fs = require('node:fs');
 require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var dtsGenerator__default = /*#__PURE__*/_interopDefaultLegacy(dtsGenerator);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+var generateTypes = require('../../../utils/generateTypes/generateTypes.js');
 
 const dts = () => {
-    const _a = jsx.useProps(), { path } = _a, config = tslib.__rest(_a, ["path"]);
+    const { path } = jsx.useProps();
     const { docs } = useApi.useApi();
-    dtsGenerator__default["default"]({
-        contents: [dtsGenerator.parseSchema(JSON.parse(JSON.stringify(docs)))],
-        config,
-    }).then((content) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-        yield fs__default["default"].promises.writeFile(path, `interface Bin {
-  filename: string
-  fieldName: string
-  originalFilename: string
-  path: string
-  type: string
-  disposition: string
-  size: number
-  extension?: string
-}
-${content
-            .replaceAll(';', '')
-            .replaceAll('number // int64', 'bigint')
-            .replaceAll('string // binary', 'Bin')
-            .replaceAll('string // date-time', 'Date')}`);
-    })).catch(error => {
-        console.warn(error);
+    fs.promises.writeFile(path, generateTypes.generateTypes(docs)).catch(e => {
+        console.error(e);
     });
 };
 

package/utils/generateTypes/generateTypes.d.ts

@@ -0,0 +1,3 @@
+import { type Document, type SchemaObject } from '../../types';
+export declare function generateSchemaTypes(schema: SchemaObject, spaces?: number): string;
+export declare function generateTypes(docs: Document): string;

package/utils/generateTypes/generateTypes.es6.js

@@ -0,0 +1,93 @@
+function hasDefault(target) {
+    return Boolean(target && ('default' in target || 'x-default' in target));
+}
+function generateSchemaTypes(schema, spaces = 2) {
+    const space = [...new Array(spaces)].map(() => ' ').join('');
+    if ('$ref' in schema) {
+        return `Schemas.${schema.$ref.slice(21)}\n`;
+    }
+    if (schema.type === 'integer') {
+        return `${schema.format === 'int64' ? 'bigint' : 'number'}\n`;
+    }
+    if (['string', 'boolean', 'number', 'null'].includes(schema.type)) {
+        return `${schema.type}\n`;
+    }
+    if (schema.type === 'array') {
+        if (!schema.items)
+            return 'any[]\n';
+        return `(${generateSchemaTypes(schema.items, spaces + 2).slice(0, -1)})[]\n`;
+    }
+    if (schema.type !== 'object') {
+        console.error('unknown type', schema);
+        return 'any\n';
+    }
+    let result = '{\n';
+    const required = schema.required || [];
+    for (const key in schema.properties) {
+        const prop = schema.properties[key];
+        const splitter = required.includes(key) || hasDefault(prop)
+            ? ':'
+            : '?:';
+        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    }
+    return `${result}${space.slice(0, -2)}}\n`;
+}
+function generateTypes(docs) {
+    var _a;
+    let result = 'declare namespace Api {\n';
+    const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
+    const paths = docs.paths;
+    if (schemas) {
+        result += '  namespace Schemas {\n';
+        for (const name in schemas) {
+            result += `    export type ${name} = ${generateSchemaTypes(schemas[name], 6)}`;
+        }
+        result += '  }\n';
+    }
+    result += '  export interface Endpoints {\n';
+    for (const path in paths) {
+        const pathObject = paths[path];
+        for (const method in pathObject) {
+            // @ts-expect-error: FIXME
+            const endpoint = pathObject[method];
+            const parameters = endpoint.parameters;
+            const requestBody = endpoint.requestBody;
+            const responses = endpoint.responses;
+            result += `    ['${method.toUpperCase()}:${path}']: {\n`;
+            if (parameters) {
+                const params = {
+                    query: '',
+                    header: '',
+                    path: '',
+                    cookie: '',
+                };
+                for (const param of parameters) {
+                    const splitter = param.in === 'path' || hasDefault(param.schema) ? ':' : '?:';
+                    params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
+                }
+                if (params.path) {
+                    result += `      Params: {\n${params.path}      }\n`;
+                }
+                if (params.query) {
+                    result += `      Search: {\n${params.query}      }\n`;
+                }
+                if (params.header) {
+                    result += `      Headers: {\n${params.header}      }\n`;
+                }
+                if (params.cookie) {
+                    result += `      Cookies: {\n${params.cookie}      }\n`;
+                }
+            }
+            if (requestBody) {
+                result += `      Body: ${generateSchemaTypes(requestBody.content['multipart/form-data'].schema, 8)}`;
+            }
+            if (responses === null || responses === void 0 ? void 0 : responses.default) {
+                result += `      Response: ${generateSchemaTypes(responses.default.content['application/json'].schema, 8)}`;
+            }
+            result += '    }\n';
+        }
+    }
+    return result + '  }\n}';
+}
+
+export { generateSchemaTypes, generateTypes };

package/utils/generateTypes/generateTypes.js

@@ -0,0 +1,98 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function hasDefault(target) {
+    return Boolean(target && ('default' in target || 'x-default' in target));
+}
+function generateSchemaTypes(schema, spaces = 2) {
+    const space = [...new Array(spaces)].map(() => ' ').join('');
+    if ('$ref' in schema) {
+        return `Schemas.${schema.$ref.slice(21)}\n`;
+    }
+    if (schema.type === 'integer') {
+        return `${schema.format === 'int64' ? 'bigint' : 'number'}\n`;
+    }
+    if (['string', 'boolean', 'number', 'null'].includes(schema.type)) {
+        return `${schema.type}\n`;
+    }
+    if (schema.type === 'array') {
+        if (!schema.items)
+            return 'any[]\n';
+        return `(${generateSchemaTypes(schema.items, spaces + 2).slice(0, -1)})[]\n`;
+    }
+    if (schema.type !== 'object') {
+        console.error('unknown type', schema);
+        return 'any\n';
+    }
+    let result = '{\n';
+    const required = schema.required || [];
+    for (const key in schema.properties) {
+        const prop = schema.properties[key];
+        const splitter = required.includes(key) || hasDefault(prop)
+            ? ':'
+            : '?:';
+        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    }
+    return `${result}${space.slice(0, -2)}}\n`;
+}
+function generateTypes(docs) {
+    var _a;
+    let result = 'declare namespace Api {\n';
+    const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
+    const paths = docs.paths;
+    if (schemas) {
+        result += '  namespace Schemas {\n';
+        for (const name in schemas) {
+            result += `    export type ${name} = ${generateSchemaTypes(schemas[name], 6)}`;
+        }
+        result += '  }\n';
+    }
+    result += '  export interface Endpoints {\n';
+    for (const path in paths) {
+        const pathObject = paths[path];
+        for (const method in pathObject) {
+            // @ts-expect-error: FIXME
+            const endpoint = pathObject[method];
+            const parameters = endpoint.parameters;
+            const requestBody = endpoint.requestBody;
+            const responses = endpoint.responses;
+            result += `    ['${method.toUpperCase()}:${path}']: {\n`;
+            if (parameters) {
+                const params = {
+                    query: '',
+                    header: '',
+                    path: '',
+                    cookie: '',
+                };
+                for (const param of parameters) {
+                    const splitter = param.in === 'path' || hasDefault(param.schema) ? ':' : '?:';
+                    params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
+                }
+                if (params.path) {
+                    result += `      Params: {\n${params.path}      }\n`;
+                }
+                if (params.query) {
+                    result += `      Search: {\n${params.query}      }\n`;
+                }
+                if (params.header) {
+                    result += `      Headers: {\n${params.header}      }\n`;
+                }
+                if (params.cookie) {
+                    result += `      Cookies: {\n${params.cookie}      }\n`;
+                }
+            }
+            if (requestBody) {
+                result += `      Body: ${generateSchemaTypes(requestBody.content['multipart/form-data'].schema, 8)}`;
+            }
+            if (responses === null || responses === void 0 ? void 0 : responses.default) {
+                result += `      Response: ${generateSchemaTypes(responses.default.content['application/json'].schema, 8)}`;
+            }
+            result += '    }\n';
+        }
+    }
+    return result + '  }\n}';
+}
+
+exports.generateSchemaTypes = generateSchemaTypes;
+exports.generateTypes = generateTypes;

package/utils/generateTypes/generateTypes.test.d.ts

@@ -0,0 +1 @@
+export {};

package/utils/generateTypes/index.d.ts

@@ -0,0 +1 @@
+export * from './generateTypes';

package/utils/generateTypes/index.es6.js

@@ -0,0 +1 @@
+export { generateSchemaTypes, generateTypes } from './generateTypes.es6.js';

package/utils/generateTypes/index.js

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var generateTypes = require('./generateTypes.js');
+
+
+
+exports.generateSchemaTypes = generateTypes.generateSchemaTypes;
+exports.generateTypes = generateTypes.generateTypes;

package/utils/index.d.ts

@@ -10,3 +10,4 @@ export * from './parseFormBody';
 export * from './rules';
 export * from './JSONString';
 export * from './FileData';
+export * from './generateTypes';

package/utils/index.es6.js

@@ -10,3 +10,4 @@ import './parseFormBody/index.es6.js';
 import './rules/index.es6.js';
 import './JSONString/index.es6.js';
 import './FileData/index.es6.js';
+import './generateTypes/index.es6.js';

package/utils/index.js

@@ -12,4 +12,5 @@ require('./parseFormBody/index.js');
 require('./rules/index.js');
 require('./JSONString/index.js');
 require('./FileData/index.js');
+require('./generateTypes/index.js');
 

package/example/requests/partners/EditPartner/EditPartner.d.ts

@@ -1 +0,0 @@
-export declare function EditPartner(): any;

package/example/requests/partners/EditPartner/index.d.ts

@@ -1 +0,0 @@
-export * from './EditPartner';

package/example/requests/partners/GetPartner/GetPartner.d.ts

@@ -1 +0,0 @@
-export declare function GetPartner(): any;

package/example/requests/partners/GetPartner/index.d.ts

@@ -1 +0,0 @@
-export * from './GetPartner';

package/example/requests/partners/GetPartners/GetPartners.d.ts

@@ -1 +0,0 @@
-export declare function GetPartners(): any;

package/example/requests/partners/GetPartners/index.d.ts

@@ -1 +0,0 @@
-export * from './GetPartners';

package/example/requests/partners/index.d.ts

@@ -1,3 +0,0 @@
-export * from './GetPartner';
-export * from './GetPartners';
-export * from './EditPartner';

package/example/schemas/address/AddressSchema/AddressSchema.d.ts

@@ -1 +0,0 @@
-export declare function AddressSchema(): any;

package/example/schemas/address/AddressSchema/index.d.ts

@@ -1 +0,0 @@
-export * from './AddressSchema';

package/example/schemas/address/index.d.ts

@@ -1 +0,0 @@
-export * from './AddressSchema';

package/example/schemas/location/LocationSchema/LocationSchema.d.ts

@@ -1 +0,0 @@
-export declare function LocationSchema(): any;

package/example/schemas/location/LocationSchema/index.d.ts

@@ -1 +0,0 @@
-export * from './LocationSchema';

package/example/schemas/location/index.d.ts

@@ -1 +0,0 @@
-export * from './LocationSchema';

package/example/schemas/partner/EditPartnerSchema/EditPartnerSchema.d.ts

@@ -1 +0,0 @@
-export declare function EditPartnerSchema(): any;

package/example/schemas/partner/EditPartnerSchema/index.d.ts

@@ -1 +0,0 @@
-export * from './EditPartnerSchema';

package/example/schemas/partner/PartnerSchema/PartnerSchema.d.ts

@@ -1 +0,0 @@
-export declare function PartnerSchema(): any;

package/example/schemas/partner/PartnerSchema/index.d.ts

@@ -1 +0,0 @@
-export * from './PartnerSchema';

package/example/schemas/partner/index.d.ts

@@ -1,2 +0,0 @@
-export * from './PartnerSchema';
-export * from './EditPartnerSchema';

package/example/tags/Partner/Partner.d.ts

@@ -1 +0,0 @@
-export declare function Partner(): any;

package/example/tags/Partner/index.d.ts

@@ -1 +0,0 @@
-export * from './Partner';