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

package/utils/httpOnStart/httpOnStart.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function httpOnStart({ port, https }) {
+function httpOnStart({ https, port, }) {
     console.log(`http${https ? 's' : ''}://localhost:${port}`);
 }
 

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/utils/rules/binaryAccept/binaryAccept.es6.js

@@ -24,8 +24,8 @@ function binaryAccept(accept) {
                 continue;
             return value;
         }
-        throw new RulesError('binaryAccept', Object.assign({ value,
-            accept }, data));
+        throw new RulesError('binaryAccept', Object.assign({ accept,
+            value }, data));
     };
 }
 

package/utils/rules/binaryAccept/binaryAccept.js

@@ -28,8 +28,8 @@ function binaryAccept(accept) {
                 continue;
             return value;
         }
-        throw new helpers.RulesError('binaryAccept', Object.assign({ value,
-            accept }, data));
+        throw new helpers.RulesError('binaryAccept', Object.assign({ accept,
+            value }, data));
     };
 }
 

package/utils/rules/dateTo/dateTo.d.ts

@@ -1,2 +1,2 @@
-export type DateFormat = 'now' | string | number | Date;
+export type DateFormat = 'now' | Date | number | string;
 export declare function dateTo(value: any, data?: object): Date;

package/utils/rules/helpers.d.ts

@@ -5,4 +5,4 @@ export declare class RulesError extends Error {
     } & object;
     constructor(error: RulesErrors, data?: object);
 }
-export declare function addKey(key: string | number, data?: any): string | number;
+export declare function addKey(key: number | string, data?: any): string | number;

package/utils/rules/index.d.ts

@@ -22,7 +22,6 @@ export * from './minLength';
 export * from './max';
 export * from './min';
 export * from './defaultTo';
-export * from './any';
 export * from './bin';
 export * from './minBin';
 export * from './maxBin';

package/utils/rules/index.es6.js

@@ -22,7 +22,6 @@ import './minLength/index.es6.js';
 import './max/index.es6.js';
 import './min/index.es6.js';
 import './defaultTo/index.es6.js';
-import './any/index.es6.js';
 import './bin/index.es6.js';
 import './minBin/index.es6.js';
 import './maxBin/index.es6.js';

package/utils/rules/index.js

@@ -26,7 +26,6 @@ require('./minLength/index.js');
 require('./max/index.js');
 require('./min/index.js');
 require('./defaultTo/index.js');
-require('./any/index.js');
 require('./bin/index.js');
 require('./minBin/index.js');
 require('./maxBin/index.js');

package/utils/rules/int/int.es6.js

@@ -24,10 +24,10 @@ function int(format) {
                 value }, data));
         }
         if (result > sizes[format]) {
-            throw new RulesError('integer', Object.assign({ format, value: result, max: sizes[format] }, data));
+            throw new RulesError('integer', Object.assign({ format, max: sizes[format], value: result }, data));
         }
         if (result < -sizes[format]) {
-            throw new RulesError('integer', Object.assign({ format, value: result, min: -sizes[format] }, data));
+            throw new RulesError('integer', Object.assign({ format, min: -sizes[format], value: result }, data));
         }
         return result;
     };

package/utils/rules/int/int.js

@@ -28,10 +28,10 @@ function int(format) {
                 value }, data));
         }
         if (result > sizes[format]) {
-            throw new helpers.RulesError('integer', Object.assign({ format, value: result, max: sizes[format] }, data));
+            throw new helpers.RulesError('integer', Object.assign({ format, max: sizes[format], value: result }, data));
         }
         if (result < -sizes[format]) {
-            throw new helpers.RulesError('integer', Object.assign({ format, value: result, min: -sizes[format] }, data));
+            throw new helpers.RulesError('integer', Object.assign({ format, min: -sizes[format], value: result }, data));
         }
         return result;
     };

package/utils/rules/max/max.d.ts

@@ -1 +1 @@
-export declare function max(max: number | bigint): (value: any, data?: object) => any;
+export declare function max(max: bigint | number): (value: any, data?: object) => any;

package/utils/rules/max/max.es6.js

@@ -2,12 +2,12 @@ import { RulesError } from '../helpers.es6.js';
 
 function max(max) {
     return (value, data) => {
-        if (!['number', 'bigint'].includes(typeof value)) {
+        if (!['bigint', 'number'].includes(typeof value)) {
             throw new RulesError('number', Object.assign(Object.assign({}, data), { value }));
         }
         if (value > max) {
-            throw new RulesError('maximum', Object.assign(Object.assign({}, data), { value,
-                max }));
+            throw new RulesError('maximum', Object.assign(Object.assign({}, data), { max,
+                value }));
         }
         return value;
     };

package/utils/rules/max/max.js

@@ -6,12 +6,12 @@ var helpers = require('../helpers.js');
 
 function max(max) {
     return (value, data) => {
-        if (!['number', 'bigint'].includes(typeof value)) {
+        if (!['bigint', 'number'].includes(typeof value)) {
             throw new helpers.RulesError('number', Object.assign(Object.assign({}, data), { value }));
         }
         if (value > max) {
-            throw new helpers.RulesError('maximum', Object.assign(Object.assign({}, data), { value,
-                max }));
+            throw new helpers.RulesError('maximum', Object.assign(Object.assign({}, data), { max,
+                value }));
         }
         return value;
     };

package/utils/rules/maxBin/maxBin.es6.js

@@ -3,8 +3,8 @@ import { RulesError } from '../helpers.es6.js';
 function maxBin(max) {
     return (value, data) => {
         if (value.size > max) {
-            throw new RulesError('maxBin', Object.assign({ value,
-                max }, data));
+            throw new RulesError('maxBin', Object.assign({ max,
+                value }, data));
         }
         return value;
     };

package/utils/rules/maxBin/maxBin.js

@@ -7,8 +7,8 @@ var helpers = require('../helpers.js');
 function maxBin(max) {
     return (value, data) => {
         if (value.size > max) {
-            throw new helpers.RulesError('maxBin', Object.assign({ value,
-                max }, data));
+            throw new helpers.RulesError('maxBin', Object.assign({ max,
+                value }, data));
         }
         return value;
     };

package/utils/rules/maxDate/maxDate.es6.js

@@ -6,7 +6,7 @@ function maxDate(max) {
             throw new RulesError('date', data);
         }
         if (value > max) {
-            throw new RulesError('maxDate', Object.assign(Object.assign({}, data), { value, max: max.toISOString() }));
+            throw new RulesError('maxDate', Object.assign(Object.assign({}, data), { max: max.toISOString(), value }));
         }
         return value;
     };

package/utils/rules/maxDate/maxDate.js

@@ -10,7 +10,7 @@ function maxDate(max) {
             throw new helpers.RulesError('date', data);
         }
         if (value > max) {
-            throw new helpers.RulesError('maxDate', Object.assign(Object.assign({}, data), { value, max: max.toISOString() }));
+            throw new helpers.RulesError('maxDate', Object.assign(Object.assign({}, data), { max: max.toISOString(), value }));
         }
         return value;
     };

package/utils/rules/maxLength/maxLength.es6.js

@@ -6,8 +6,8 @@ function maxLength(max) {
             throw new RulesError('string', data);
         }
         if (value.length > max) {
-            throw new RulesError('maxLength', Object.assign(Object.assign({}, data), { value,
-                max }));
+            throw new RulesError('maxLength', Object.assign(Object.assign({}, data), { max,
+                value }));
         }
         return value;
     };

package/utils/rules/maxLength/maxLength.js

@@ -10,8 +10,8 @@ function maxLength(max) {
             throw new helpers.RulesError('string', data);
         }
         if (value.length > max) {
-            throw new helpers.RulesError('maxLength', Object.assign(Object.assign({}, data), { value,
-                max }));
+            throw new helpers.RulesError('maxLength', Object.assign(Object.assign({}, data), { max,
+                value }));
         }
         return value;
     };

package/utils/rules/min/min.d.ts

@@ -1 +1 @@
-export declare function min(min: number | bigint): (value: any, data?: object) => any;
+export declare function min(min: bigint | number): (value: any, data?: object) => any;

package/utils/rules/min/min.es6.js

@@ -2,12 +2,12 @@ import { RulesError } from '../helpers.es6.js';
 
 function min(min) {
     return (value, data) => {
-        if (!['number', 'bigint'].includes(typeof value)) {
+        if (!['bigint', 'number'].includes(typeof value)) {
             throw new RulesError('number', Object.assign(Object.assign({}, data), { value }));
         }
         if (value < min) {
-            throw new RulesError('minimum', Object.assign(Object.assign({}, data), { value,
-                min }));
+            throw new RulesError('minimum', Object.assign(Object.assign({}, data), { min,
+                value }));
         }
         return value;
     };

package/utils/rules/min/min.js

@@ -6,12 +6,12 @@ var helpers = require('../helpers.js');
 
 function min(min) {
     return (value, data) => {
-        if (!['number', 'bigint'].includes(typeof value)) {
+        if (!['bigint', 'number'].includes(typeof value)) {
             throw new helpers.RulesError('number', Object.assign(Object.assign({}, data), { value }));
         }
         if (value < min) {
-            throw new helpers.RulesError('minimum', Object.assign(Object.assign({}, data), { value,
-                min }));
+            throw new helpers.RulesError('minimum', Object.assign(Object.assign({}, data), { min,
+                value }));
         }
         return value;
     };

package/utils/rules/minBin/minBin.es6.js

@@ -3,8 +3,8 @@ import { RulesError } from '../helpers.es6.js';
 function minBin(min) {
     return (value, data) => {
         if (value.size < min) {
-            throw new RulesError('minBin', Object.assign({ value,
-                min }, data));
+            throw new RulesError('minBin', Object.assign({ min,
+                value }, data));
         }
         return value;
     };

package/utils/rules/minBin/minBin.js

@@ -7,8 +7,8 @@ var helpers = require('../helpers.js');
 function minBin(min) {
     return (value, data) => {
         if (value.size < min) {
-            throw new helpers.RulesError('minBin', Object.assign({ value,
-                min }, data));
+            throw new helpers.RulesError('minBin', Object.assign({ min,
+                value }, data));
         }
         return value;
     };

package/utils/rules/minDate/minDate.es6.js

@@ -6,7 +6,7 @@ function minDate(min) {
             throw new RulesError('date', data);
         }
         if (value < min) {
-            throw new RulesError('minDate', Object.assign(Object.assign({}, data), { value, min: min.toISOString() }));
+            throw new RulesError('minDate', Object.assign(Object.assign({}, data), { min: min.toISOString(), value }));
         }
         return value;
     };

package/utils/rules/minDate/minDate.js

@@ -10,7 +10,7 @@ function minDate(min) {
             throw new helpers.RulesError('date', data);
         }
         if (value < min) {
-            throw new helpers.RulesError('minDate', Object.assign(Object.assign({}, data), { value, min: min.toISOString() }));
+            throw new helpers.RulesError('minDate', Object.assign(Object.assign({}, data), { min: min.toISOString(), value }));
         }
         return value;
     };

package/utils/rules/minLength/minLength.es6.js

@@ -6,8 +6,8 @@ function minLength(min) {
             throw new RulesError('string', data);
         }
         if (value.length < min) {
-            throw new RulesError('minLength', Object.assign(Object.assign({}, data), { value,
-                min }));
+            throw new RulesError('minLength', Object.assign(Object.assign({}, data), { min,
+                value }));
         }
         return value;
     };

package/utils/rules/minLength/minLength.js

@@ -10,8 +10,8 @@ function minLength(min) {
             throw new helpers.RulesError('string', data);
         }
         if (value.length < min) {
-            throw new helpers.RulesError('minLength', Object.assign(Object.assign({}, data), { value,
-                min }));
+            throw new helpers.RulesError('minLength', Object.assign(Object.assign({}, data), { min,
+                value }));
         }
         return value;
     };

package/utils/rules/objectOf/objectOf.d.ts

@@ -1,3 +1,3 @@
 import { type Rule } from '../types';
 export type ObjectOf = Record<string, Rule>;
-export declare function objectOf(map: ObjectOf): (value: any, data?: Record<string, any>) => any;
+export declare function objectOf(map: ObjectOf, rest?: Rule): (value: any, data?: Record<string, any>) => any;

package/utils/rules/objectOf/objectOf.es6.js

@@ -1,13 +1,26 @@
 import { RulesError, addKey } from '../helpers.es6.js';
 
-function objectOf(map) {
+function objectOf(map, rest) {
     return (value, data) => {
         if (value === null || typeof value !== 'object') {
             throw new RulesError('object', Object.assign({ value }, data));
         }
         const result = {};
         for (const key in map) {
-            result[key] = map[key](value[key], Object.assign(Object.assign({}, data), { key: addKey(key, data) }));
+            const val = map[key](value[key], Object.assign(Object.assign({}, data), { key: addKey(key, data) }));
+            if (val !== undefined) {
+                result[key] = val;
+            }
+        }
+        if (rest) {
+            for (const key in value) {
+                if (key in map)
+                    continue;
+                const val = rest(value[key], Object.assign(Object.assign({}, data), { key: addKey(key, data) }));
+                if (val !== undefined) {
+                    result[key] = val;
+                }
+            }
         }
         return result;
     };

package/utils/rules/objectOf/objectOf.js

@@ -4,14 +4,27 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helpers = require('../helpers.js');
 
-function objectOf(map) {
+function objectOf(map, rest) {
     return (value, data) => {
         if (value === null || typeof value !== 'object') {
             throw new helpers.RulesError('object', Object.assign({ value }, data));
         }
         const result = {};
         for (const key in map) {
-            result[key] = map[key](value[key], Object.assign(Object.assign({}, data), { key: helpers.addKey(key, data) }));
+            const val = map[key](value[key], Object.assign(Object.assign({}, data), { key: helpers.addKey(key, data) }));
+            if (val !== undefined) {
+                result[key] = val;
+            }
+        }
+        if (rest) {
+            for (const key in value) {
+                if (key in map)
+                    continue;
+                const val = rest(value[key], Object.assign(Object.assign({}, data), { key: helpers.addKey(key, data) }));
+                if (val !== undefined) {
+                    result[key] = val;
+                }
+            }
         }
         return result;
     };

package/utils/rules/pattern/pattern.d.ts

@@ -1 +1 @@
-export declare function pattern(pattern: string | RegExp, patternId?: string): (value: any, data?: object) => any;
+export declare function pattern(pattern: RegExp | string, patternId?: string): (value: any, data?: object) => any;

package/utils/rules/pattern/pattern.es6.js

@@ -4,7 +4,8 @@ function pattern(pattern, patternId = String(pattern)) {
     const normPattern = typeof pattern === 'string' ? new RegExp(pattern) : pattern;
     return (value, data) => {
         if (!normPattern.test(value)) {
-            throw new RulesError('pattern', Object.assign({ value, pattern: String(normPattern), patternId }, data));
+            throw new RulesError('pattern', Object.assign({ pattern: String(normPattern), patternId,
+                value }, data));
         }
         return value;
     };

package/utils/rules/pattern/pattern.js

@@ -8,7 +8,8 @@ function pattern(pattern, patternId = String(pattern)) {
     const normPattern = typeof pattern === 'string' ? new RegExp(pattern) : pattern;
     return (value, data) => {
         if (!normPattern.test(value)) {
-            throw new helpers.RulesError('pattern', Object.assign({ value, pattern: String(normPattern), patternId }, data));
+            throw new helpers.RulesError('pattern', Object.assign({ pattern: String(normPattern), patternId,
+                value }, data));
         }
         return value;
     };

package/example/app/App/App.d.ts

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

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

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

package/example/index.d.ts

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

package/example/requests/index.d.ts

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

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/app/ListSchema/ListSchema.d.ts

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

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

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

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

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

package/example/schemas/index.d.ts

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

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';

package/example/tags/index.d.ts

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

package/openApi.test.d.ts

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

package/plugins/main/fallback/fallback.d.ts

@@ -1,4 +0,0 @@
-import { type HandlerPlugin } from 'innet';
-export interface FallbackProps {
-}
-export declare const fallback: HandlerPlugin;

package/plugins/main/fallback/fallback.es6.js

@@ -1,19 +0,0 @@
-import { useHandler } from 'innet';
-import { useChildren } from '@innet/jsx';
-import '../../../hooks/index.es6.js';
-import { useApi } from '../../../hooks/useApi/useApi.es6.js';
-
-const fallback = () => {
-    const api = useApi();
-    if (!api) {
-        throw Error('Use <fallback> inside <api>');
-    }
-    if (api.fallback) {
-        throw Error('<fallback> MUST be used once on an <api>');
-    }
-    const children = useChildren();
-    const handler = useHandler();
-    api.fallback = { children, handler };
-};
-
-export { fallback };

package/plugins/main/fallback/fallback.js

@@ -1,23 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var innet = require('innet');
-var jsx = require('@innet/jsx');
-require('../../../hooks/index.js');
-var useApi = require('../../../hooks/useApi/useApi.js');
-
-const fallback = () => {
-    const api = useApi.useApi();
-    if (!api) {
-        throw Error('Use <fallback> inside <api>');
-    }
-    if (api.fallback) {
-        throw Error('<fallback> MUST be used once on an <api>');
-    }
-    const children = jsx.useChildren();
-    const handler = innet.useHandler();
-    api.fallback = { children, handler };
-};
-
-exports.fallback = fallback;

package/plugins/main/fallback/index.d.ts

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

package/plugins/main/fallback/index.es6.js

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

package/plugins/main/fallback/index.js

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

package/plugins/main/request/index.d.ts

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

package/plugins/main/request/index.es6.js

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