@innet/server 2.0.0-alpha.22 → 2.0.0-alpha.24

package/package.json

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

package/plugins/request/file/file.es6.js

@@ -28,11 +28,10 @@ function file() {
             }
             res.writeHead(200, headers);
             readStream.pipe(res);
+            return;
         }
     }
-    else {
-        innet(children, handler);
-    }
+    innet(children, handler);
 }
 
 export { file };

package/plugins/request/file/file.js

@@ -38,11 +38,10 @@ function file() {
             }
             res.writeHead(200, headers);
             readStream.pipe(res);
+            return;
         }
     }
-    else {
-        innet__default["default"](children, handler);
-    }
+    innet__default["default"](children, handler);
 }
 
 exports.file = file;

package/plugins/schema/string/string.es6.js

@@ -3,48 +3,62 @@ import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
+import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { values } from '../../../utils/rules/values/values.es6.js';
 import { minLength } from '../../../utils/rules/minLength/minLength.es6.js';
 import { maxLength } from '../../../utils/rules/maxLength/maxLength.es6.js';
 import { pattern } from '../../../utils/rules/pattern/pattern.es6.js';
-import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
+import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 
 const string = () => {
     const _a = useProps() || {}, { min, max, pattern: pattern$1, patternId } = _a, props = __rest(_a, ["min", "max", "pattern", "patternId"]);
+    const { refRules } = useApi();
     const schema = useSchemaType('string', props);
-    const rules = [];
-    if (props.default !== undefined) {
-        rules.push(defaultTo(props.default));
-    }
-    rules.push(String);
-    if (props.values) {
-        rules.push(values(props.values));
-    }
-    if (min !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.minimum = min;
-        rules.push(minLength(min));
-    }
-    if (max !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.maximum = max;
-        rules.push(maxLength(max));
-    }
-    if (pattern$1 !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.pattern = String(pattern$1);
-        rules.push(pattern(pattern$1, patternId));
-    }
-    if (props.default) {
-        useRule(pipe(...rules));
+    if (schema) {
+        const rules = [];
+        if (props.default !== undefined) {
+            rules.push(defaultTo(props.default));
+        }
+        rules.push(String);
+        if (props.values) {
+            rules.push(values(props.values));
+        }
+        if (min !== undefined) {
+            schema.minimum = min;
+            rules.push(minLength(min));
+        }
+        if (max !== undefined) {
+            schema.maximum = max;
+            rules.push(maxLength(max));
+        }
+        if (pattern$1 !== undefined) {
+            schema.pattern = String(pattern$1);
+            rules.push(pattern(pattern$1, patternId));
+        }
+        const rule = pipe(...rules);
+        if (props.ref) {
+            refRules[props.ref] = rule;
+        }
+        if (props.default) {
+            useRule(rule);
+        }
+        else {
+            const parentRule = useParentRule();
+            useRule(parentRule(rule));
+        }
     }
-    else {
-        const parentRule = useParentRule();
-        useRule(parentRule(pipe(...rules)));
+    else if (props.ref) {
+        if (props.default) {
+            useRule(refRules[props.ref]);
+        }
+        else {
+            const parentRule = useParentRule();
+            useRule(parentRule(refRules[props.ref]));
+        }
     }
 };
 

package/plugins/schema/string/string.js

@@ -7,48 +7,62 @@ var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
+var useApi = require('../../../hooks/useApi/useApi.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var values = require('../../../utils/rules/values/values.js');
 var minLength = require('../../../utils/rules/minLength/minLength.js');
 var maxLength = require('../../../utils/rules/maxLength/maxLength.js');
 var pattern = require('../../../utils/rules/pattern/pattern.js');
-var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
+var useRule = require('../../../hooks/useRule/useRule.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 
 const string = () => {
     const _a = jsx.useProps() || {}, { min, max, pattern: pattern$1, patternId } = _a, props = tslib.__rest(_a, ["min", "max", "pattern", "patternId"]);
+    const { refRules } = useApi.useApi();
     const schema = useSchemaType.useSchemaType('string', props);
-    const rules = [];
-    if (props.default !== undefined) {
-        rules.push(defaultTo.defaultTo(props.default));
-    }
-    rules.push(String);
-    if (props.values) {
-        rules.push(values.values(props.values));
-    }
-    if (min !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.minimum = min;
-        rules.push(minLength.minLength(min));
-    }
-    if (max !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.maximum = max;
-        rules.push(maxLength.maxLength(max));
-    }
-    if (pattern$1 !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.pattern = String(pattern$1);
-        rules.push(pattern.pattern(pattern$1, patternId));
-    }
-    if (props.default) {
-        useRule.useRule(pipe.pipe(...rules));
+    if (schema) {
+        const rules = [];
+        if (props.default !== undefined) {
+            rules.push(defaultTo.defaultTo(props.default));
+        }
+        rules.push(String);
+        if (props.values) {
+            rules.push(values.values(props.values));
+        }
+        if (min !== undefined) {
+            schema.minimum = min;
+            rules.push(minLength.minLength(min));
+        }
+        if (max !== undefined) {
+            schema.maximum = max;
+            rules.push(maxLength.maxLength(max));
+        }
+        if (pattern$1 !== undefined) {
+            schema.pattern = String(pattern$1);
+            rules.push(pattern.pattern(pattern$1, patternId));
+        }
+        const rule = pipe.pipe(...rules);
+        if (props.ref) {
+            refRules[props.ref] = rule;
+        }
+        if (props.default) {
+            useRule.useRule(rule);
+        }
+        else {
+            const parentRule = useParentRule.useParentRule();
+            useRule.useRule(parentRule(rule));
+        }
     }
-    else {
-        const parentRule = useParentRule.useParentRule();
-        useRule.useRule(parentRule(pipe.pipe(...rules)));
+    else if (props.ref) {
+        if (props.default) {
+            useRule.useRule(refRules[props.ref]);
+        }
+        else {
+            const parentRule = useParentRule.useParentRule();
+            useRule.useRule(parentRule(refRules[props.ref]));
+        }
     }
 };