@innet/server 2.0.0-beta.2 → 2.0.0-beta.21

package/utils/generateTypes/generateTypes.js

@@ -2,6 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function getElement(docs, target) {
+    var _a, _b, _c;
+    if (!target)
+        return target;
+    if ('$ref' in target) {
+        return (_c = (_b = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas) === null || _b === void 0 ? void 0 : _b[String(target.$ref).replace('#/components/schemas/', '')]) !== null && _c !== void 0 ? _c : target;
+    }
+    return target;
+}
 function hasDefault(target) {
     return Boolean(target && ('default' in target || 'x-default' in target));
 }
@@ -10,88 +19,95 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     if ('$ref' in schema) {
         return `Schemas.${schema.$ref.slice(21)}${lastChar}`;
     }
-    if (schema.type === 'integer') {
-        return `${schema.format === 'int64' ? 'bigint' : 'number'}${lastChar}`;
-    }
-    if (schema.type === 'string') {
-        if (schema.format === 'date-time') {
-            return `Date${lastChar}`;
+    const types = Array.isArray(schema.type) ? schema.type : [schema.type];
+    let scope = '';
+    for (let i = 0; i < types.length; i++) {
+        const type = types[i];
+        const operator = i ? ' | ' : '';
+        if (schema.oneOf) {
+            let result = '';
+            for (const item of schema.oneOf) {
+                if (result) {
+                    result += ' | ';
+                }
+                result += generateSchemaTypes(item, spaces + 2, '');
+            }
+            scope += `${operator}${result}`;
+            continue;
         }
-        if (schema.format === 'binary') {
-            return `Bin${lastChar}`;
+        if (!type) {
+            scope += `${operator}any`;
+            continue;
         }
-        return `string${lastChar}`;
-    }
-    if (['boolean', 'null', 'number'].includes(schema.type)) {
-        return `${schema.type}${lastChar}`;
-    }
-    if (schema.oneOf) {
-        let result = '';
-        for (const item of schema.oneOf) {
-            if (result) {
-                result += ' | ';
+        if (type === 'integer') {
+            scope += `${operator}${schema.format === 'int64' ? 'bigint' : 'number'}`;
+            continue;
+        }
+        if (type === 'string') {
+            if (schema.format === 'date-time') {
+                scope += `${operator}Date`;
+                continue;
+            }
+            if (schema.format === 'binary') {
+                scope += `${operator}Bin`;
+                continue;
             }
-            result += generateSchemaTypes(item, spaces + 2, '');
+            scope += `${operator}string`;
+            continue;
         }
-        return result + lastChar;
-    }
-    if (schema.type === 'array') {
-        if (!schema.items)
-            return `any[]${lastChar}`;
-        return `Array<${generateSchemaTypes(schema.items, spaces + 2, '')}>${lastChar}`;
-    }
-    if (!schema.type) {
-        return `any${lastChar}`;
-    }
-    if (schema.type !== 'object') {
-        console.error('unknown type', schema);
-        return `any${lastChar}`;
-    }
-    let result = '{\n';
-    const required = schema.required || [];
-    const hasProps = Boolean(schema.properties && Object.keys(schema.properties).length);
-    const hasRestProps = Boolean(typeof schema.additionalProperties === 'object' &&
-        Object.keys(schema.additionalProperties).length);
-    if (hasProps) {
-        for (const key in schema.properties) {
-            const prop = schema.properties[key];
-            const splitter = required.includes(key) || hasDefault(prop)
-                ? ':'
-                : '?:';
-            if ('deprecated' in prop && prop.deprecated) {
-                result += `${space}/** @deprecated */\n`;
+        if (['boolean', 'null', 'number'].includes(type)) {
+            scope += `${operator}${type}`;
+            continue;
+        }
+        if (type === 'array') {
+            if (schema.type !== 'array' || !schema.items) {
+                scope += `${operator}any[]`;
+                continue;
             }
-            result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+            scope += `${operator}Array<${generateSchemaTypes(schema.items, spaces + 2, '')}>`;
+            continue;
         }
+        if (type !== 'object') {
+            console.error('Error: Unknown Type', schema);
+            scope += `${operator}any`;
+            continue;
+        }
+        let result = '{\n';
+        const required = schema.required || [];
+        const hasProps = Boolean(schema.properties && Object.keys(schema.properties).length);
+        const hasRestProps = Boolean(typeof schema.additionalProperties === 'object' &&
+            Object.keys(schema.additionalProperties).length);
+        if (hasProps) {
+            for (const key in schema.properties) {
+                const prop = schema.properties[key];
+                const splitter = required.includes(key) || hasDefault(prop)
+                    ? ':'
+                    : '?:';
+                if ('deprecated' in prop && prop.deprecated) {
+                    result += `${space}/** @deprecated */\n`;
+                }
+                result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+            }
+        }
+        if (hasRestProps) {
+            const value = hasProps
+                ? 'any\n'
+                : generateSchemaTypes(schema.additionalProperties, spaces + 2);
+            result += `${space}[key: string]: ${value}`;
+        }
+        scope += `${operator}${result}${space.slice(0, -2)}}`;
     }
-    if (hasRestProps) {
-        const value = hasProps
-            ? 'any\n'
-            : generateSchemaTypes(schema.additionalProperties, spaces + 2);
-        result += `${space}[key: string]: ${value}`;
-    }
-    return `${result}${space.slice(0, -2)}}${lastChar}`;
+    return `${scope}${lastChar}`;
 }
 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) {
-        result += '  namespace Schemas {\n';
+        result += '  export interface Schemas {\n';
         for (const name in schemas) {
-            result += `    export type ${name} = ${generateSchemaTypes(schemas[name], 6)}`;
+            result += `    ${name}: ${generateSchemaTypes(schemas[name], 6)}`;
         }
         result += '  }\n';
     }
@@ -116,27 +132,27 @@ function generateTypes(docs, namespace = 'Api') {
                     query: '',
                 };
                 for (const param of parameters) {
-                    const splitter = param.in === 'path' || hasDefault(param.schema) || param.required ? ':' : '?:';
+                    const splitter = param.in === 'path' || hasDefault(getElement(docs, param.schema)) || param.required ? ':' : '?:';
                     params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
                 }
                 if (params.path) {
-                    result += `      Params: {\n${params.path}      }\n`;
+                    result += `      params: {\n${params.path}      }\n`;
                 }
                 if (params.query) {
-                    result += `      Search: {\n${params.query}      }\n`;
+                    result += `      search: {\n${params.query}      }\n`;
                 }
                 if (params.header) {
-                    result += `      Headers: {\n${params.header}      }\n`;
+                    result += `      headers: {\n${params.header}      }\n`;
                 }
                 if (params.cookie) {
-                    result += `      Cookies: {\n${params.cookie}      }\n`;
+                    result += `      cookies: {\n${params.cookie}      }\n`;
                 }
             }
             if (requestBody) {
-                result += `      Body: ${generateSchemaTypes(requestBody.content['multipart/form-data'].schema, 8)}`;
+                result += `      body: ${generateSchemaTypes(requestBody.content['multipart/form-data'].schema, 8)}`;
             }
             if (responses) {
-                result += '      Response: {\n';
+                result += '      response: {\n';
                 for (const key in responses) {
                     let multiple = false;
                     const response = responses[key];
@@ -160,7 +176,20 @@ function generateTypes(docs, namespace = 'Api') {
             result += '    }\n';
         }
     }
-    return result + '  }\n}';
+    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' {
+  interface ApiEndpoints extends ${namespace}.Endpoints {}
+  interface ApiSchemas extends ${namespace}.Schemas {}
+}
+`;
 }
 
 exports.generateSchemaTypes = generateSchemaTypes;

package/utils/getSafeSchema/getSafeSchema.d.ts

@@ -0,0 +1,2 @@
+import { type SchemaObject } from '../../types';
+export declare function getSafeSchema(schema: SchemaObject): SchemaObject;

package/utils/getSafeSchema/getSafeSchema.es6.js

@@ -0,0 +1,5 @@
+function getSafeSchema(schema) {
+    return 'oneOf' in schema ? schema.oneOf[0] : schema;
+}
+
+export { getSafeSchema };

package/utils/getSafeSchema/getSafeSchema.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function getSafeSchema(schema) {
+    return 'oneOf' in schema ? schema.oneOf[0] : schema;
+}
+
+exports.getSafeSchema = getSafeSchema;

package/utils/getSafeSchema/index.d.ts

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

package/utils/getSafeSchema/index.es6.js

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

package/utils/getSafeSchema/index.js

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

package/utils/index.d.ts

@@ -1,13 +1,14 @@
-export * from './parseSearch';
-export * from './stringifySearch';
-export * from './httpOnStart';
+export * from './FileData';
+export * from './JSONString';
+export * from './action';
+export * from './decorators';
+export * from './generateTypes';
 export * from './getEndpoint';
 export * from './getOrAdd';
-export * from './decorators';
-export * from './action';
+export * from './getSafeSchema';
+export * from './httpOnStart';
 export * from './parseBody';
 export * from './parseFormBody';
+export * from './parseSearch';
 export * from './rules';
-export * from './JSONString';
-export * from './FileData';
-export * from './generateTypes';
+export * from './stringifySearch';

package/utils/index.es6.js

@@ -1,13 +1,14 @@
-import './parseSearch/index.es6.js';
-import './stringifySearch/index.es6.js';
-import './httpOnStart/index.es6.js';
+import './FileData/index.es6.js';
+import './JSONString/index.es6.js';
+import './action/index.es6.js';
+import './decorators/index.es6.js';
+import './generateTypes/index.es6.js';
 import './getEndpoint/index.es6.js';
 import './getOrAdd/index.es6.js';
-import './decorators/index.es6.js';
-import './action/index.es6.js';
+import './getSafeSchema/index.es6.js';
+import './httpOnStart/index.es6.js';
 import './parseBody/index.es6.js';
 import './parseFormBody/index.es6.js';
+import './parseSearch/index.es6.js';
 import './rules/index.es6.js';
-import './JSONString/index.es6.js';
-import './FileData/index.es6.js';
-import './generateTypes/index.es6.js';
+import './stringifySearch/index.es6.js';

package/utils/index.js

@@ -1,16 +1,17 @@
 'use strict';
 
-require('./parseSearch/index.js');
-require('./stringifySearch/index.js');
-require('./httpOnStart/index.js');
+require('./FileData/index.js');
+require('./JSONString/index.js');
+require('./action/index.js');
+require('./decorators/index.js');
+require('./generateTypes/index.js');
 require('./getEndpoint/index.js');
 require('./getOrAdd/index.js');
-require('./decorators/index.js');
-require('./action/index.js');
+require('./getSafeSchema/index.js');
+require('./httpOnStart/index.js');
 require('./parseBody/index.js');
 require('./parseFormBody/index.js');
+require('./parseSearch/index.js');
 require('./rules/index.js');
-require('./JSONString/index.js');
-require('./FileData/index.js');
-require('./generateTypes/index.js');
+require('./stringifySearch/index.js');
 

package/utils/rules/index.d.ts

@@ -1,28 +1,28 @@
-export * from './helpers';
-export * from './constants';
-export * from './types';
-export * from './num';
 export * from './arrayOf';
-export * from './oneOf';
+export * from './bin';
+export * from './binaryAccept';
+export * from './constants';
 export * from './dateTo';
+export * from './defaultTo';
+export * from './helpers';
 export * from './int';
+export * from './max';
+export * from './maxBin';
+export * from './maxDate';
+export * from './maxLength';
+export * from './min';
+export * from './minBin';
+export * from './minDate';
+export * from './minLength';
 export * from './nullable';
+export * from './num';
 export * from './objectOf';
+export * from './oneOf';
 export * from './optional';
 export * from './pattern';
+export * from './pipe';
 export * from './required';
 export * from './tupleOf';
+export * from './types';
 export * from './uuidTo';
 export * from './values';
-export * from './pipe';
-export * from './maxDate';
-export * from './minDate';
-export * from './maxLength';
-export * from './minLength';
-export * from './max';
-export * from './min';
-export * from './defaultTo';
-export * from './bin';
-export * from './minBin';
-export * from './maxBin';
-export * from './binaryAccept';

package/utils/rules/index.es6.js

@@ -1,28 +1,28 @@
-export { RulesError, addKey } from './helpers.es6.js';
-export { rulesErrors } from './constants.es6.js';
-import './types.es6.js';
-import './num/index.es6.js';
 import './arrayOf/index.es6.js';
-import './oneOf/index.es6.js';
+import './bin/index.es6.js';
+import './binaryAccept/index.es6.js';
+export { rulesErrors } from './constants.es6.js';
 import './dateTo/index.es6.js';
+import './defaultTo/index.es6.js';
+export { RulesError, addKey } from './helpers.es6.js';
 import './int/index.es6.js';
+import './max/index.es6.js';
+import './maxBin/index.es6.js';
+import './maxDate/index.es6.js';
+import './maxLength/index.es6.js';
+import './min/index.es6.js';
+import './minBin/index.es6.js';
+import './minDate/index.es6.js';
+import './minLength/index.es6.js';
 import './nullable/index.es6.js';
+import './num/index.es6.js';
 import './objectOf/index.es6.js';
+import './oneOf/index.es6.js';
 import './optional/index.es6.js';
 import './pattern/index.es6.js';
+import './pipe/index.es6.js';
 import './required/index.es6.js';
 import './tupleOf/index.es6.js';
+import './types.es6.js';
 import './uuidTo/index.es6.js';
 import './values/index.es6.js';
-import './pipe/index.es6.js';
-import './maxDate/index.es6.js';
-import './minDate/index.es6.js';
-import './maxLength/index.es6.js';
-import './minLength/index.es6.js';
-import './max/index.es6.js';
-import './min/index.es6.js';
-import './defaultTo/index.es6.js';
-import './bin/index.es6.js';
-import './minBin/index.es6.js';
-import './maxBin/index.es6.js';
-import './binaryAccept/index.es6.js';

package/utils/rules/index.js

@@ -2,37 +2,37 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var helpers = require('./helpers.js');
-var constants = require('./constants.js');
-require('./types.js');
-require('./num/index.js');
 require('./arrayOf/index.js');
-require('./oneOf/index.js');
+require('./bin/index.js');
+require('./binaryAccept/index.js');
+var constants = require('./constants.js');
 require('./dateTo/index.js');
+require('./defaultTo/index.js');
+var helpers = require('./helpers.js');
 require('./int/index.js');
+require('./max/index.js');
+require('./maxBin/index.js');
+require('./maxDate/index.js');
+require('./maxLength/index.js');
+require('./min/index.js');
+require('./minBin/index.js');
+require('./minDate/index.js');
+require('./minLength/index.js');
 require('./nullable/index.js');
+require('./num/index.js');
 require('./objectOf/index.js');
+require('./oneOf/index.js');
 require('./optional/index.js');
 require('./pattern/index.js');
+require('./pipe/index.js');
 require('./required/index.js');
 require('./tupleOf/index.js');
+require('./types.js');
 require('./uuidTo/index.js');
 require('./values/index.js');
-require('./pipe/index.js');
-require('./maxDate/index.js');
-require('./minDate/index.js');
-require('./maxLength/index.js');
-require('./minLength/index.js');
-require('./max/index.js');
-require('./min/index.js');
-require('./defaultTo/index.js');
-require('./bin/index.js');
-require('./minBin/index.js');
-require('./maxBin/index.js');
-require('./binaryAccept/index.js');
 
 
 
+exports.rulesErrors = constants.rulesErrors;
 exports.RulesError = helpers.RulesError;
 exports.addKey = helpers.addKey;
-exports.rulesErrors = constants.rulesErrors;

package/utils/rules/values/index.es6.js

@@ -1 +1 @@
-export { values } from './values.es6.js';
+export { getArrayValues, values } from './values.es6.js';

package/utils/rules/values/index.js

@@ -6,4 +6,5 @@ var values = require('./values.js');
 
 
 
+exports.getArrayValues = values.getArrayValues;
 exports.values = values.values;

package/utils/rules/values/values.d.ts

@@ -1 +1,3 @@
-export declare function values(values: any[]): (value: any, data?: object) => any;
+import { type SchemaValues } from '../../../types';
+export declare function getArrayValues<T, F extends (value: T | string) => any = () => T>(values: SchemaValues<T>, format?: F): ReturnType<F>[];
+export declare function values<T>(values: T[]): (value: any, data?: object) => any;

package/utils/rules/values/values.es6.js

@@ -1,5 +1,8 @@
 import { RulesError } from '../helpers.es6.js';
 
+function getArrayValues(values, format = (value => value)) {
+    return Array.isArray(values) ? values.map(format) : Object.keys(values).map(format);
+}
 function values(values) {
     return (value, data) => {
         if (!values.includes(value)) {
@@ -13,4 +16,4 @@ function values(values) {
     };
 }
 
-export { values };
+export { getArrayValues, values };

package/utils/rules/values/values.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helpers = require('../helpers.js');
 
+function getArrayValues(values, format = (value => value)) {
+    return Array.isArray(values) ? values.map(format) : Object.keys(values).map(format);
+}
 function values(values) {
     return (value, data) => {
         if (!values.includes(value)) {
@@ -17,4 +20,5 @@ function values(values) {
     };
 }
 
+exports.getArrayValues = getArrayValues;
 exports.values = values;