@innet/server 2.0.0-beta.7 → 2.0.0-beta.9

package/index.es6.js

@@ -86,6 +86,7 @@ export { once } from './utils/decorators/once/once.es6.js';
 export { generateSchemaTypes, generateTypes } from './utils/generateTypes/generateTypes.es6.js';
 export { getEndpoint } from './utils/getEndpoint/getEndpoint.es6.js';
 export { getOrAdd } from './utils/getOrAdd/getOrAdd.es6.js';
+export { getSafeSchema } from './utils/getSafeSchema/getSafeSchema.es6.js';
 export { httpOnStart } from './utils/httpOnStart/httpOnStart.es6.js';
 export { parseBody } from './utils/parseBody/parseBody.es6.js';
 export { parseFormBody } from './utils/parseFormBody/parseFormBody.es6.js';

package/index.js

@@ -90,6 +90,7 @@ var once = require('./utils/decorators/once/once.js');
 var generateTypes = require('./utils/generateTypes/generateTypes.js');
 var getEndpoint = require('./utils/getEndpoint/getEndpoint.js');
 var getOrAdd = require('./utils/getOrAdd/getOrAdd.js');
+var getSafeSchema = require('./utils/getSafeSchema/getSafeSchema.js');
 var httpOnStart = require('./utils/httpOnStart/httpOnStart.js');
 var parseBody = require('./utils/parseBody/parseBody.js');
 var parseFormBody = require('./utils/parseFormBody/parseFormBody.js');
@@ -240,6 +241,7 @@ exports.generateSchemaTypes = generateTypes.generateSchemaTypes;
 exports.generateTypes = generateTypes.generateTypes;
 exports.getEndpoint = getEndpoint.getEndpoint;
 exports.getOrAdd = getOrAdd.getOrAdd;
+exports.getSafeSchema = getSafeSchema.getSafeSchema;
 exports.httpOnStart = httpOnStart.httpOnStart;
 exports.parseBody = parseBody.parseBody;
 exports.parseFormBody = parseFormBody.parseFormBody;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.9",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -53,7 +53,6 @@
     "string_decoder": "^1.3.0",
     "tslib": "^2.8.1",
     "uuid": "^13.0.0",
-    "watch-state": "^3.6.2",
-    "youch": "^4.1.0"
+    "watch-state": "^3.6.2"
   }
 }

package/plugins/schema/field/field.es6.js

@@ -2,6 +2,7 @@ import { useNewHandler, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
+import { getSafeSchema } from '../../../utils/getSafeSchema/getSafeSchema.es6.js';
 import { useObjectSchemaContext } from '../../../hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js';
 import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { useObjectRule, objectRuleContext } from '../../../hooks/useObjectRule/useObjectRule.es6.js';
@@ -11,7 +12,7 @@ import { required } from '../../../utils/rules/required/required.es6.js';
 const field = () => {
     const handler = useNewHandler();
     const { children, deprecated, key, optional, readOnly, writeOnly, } = useProps();
-    const schema = useObjectSchemaContext();
+    const schema = getSafeSchema(useObjectSchemaContext());
     if (!schema.properties) {
         schema.properties = {};
     }

package/plugins/schema/field/field.js

@@ -6,6 +6,7 @@ var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+var getSafeSchema = require('../../../utils/getSafeSchema/getSafeSchema.js');
 var useObjectSchemaContext = require('../../../hooks/useObjectSchemaContext/useObjectSchemaContext.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
 var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
@@ -15,7 +16,7 @@ var required = require('../../../utils/rules/required/required.js');
 const field = () => {
     const handler = innet.useNewHandler();
     const { children, deprecated, key, optional, readOnly, writeOnly, } = jsx.useProps();
-    const schema = useObjectSchemaContext.useObjectSchemaContext();
+    const schema = getSafeSchema.getSafeSchema(useObjectSchemaContext.useObjectSchemaContext());
     if (!schema.properties) {
         schema.properties = {};
     }

package/plugins/schema/object/object.es6.js

@@ -15,6 +15,7 @@ import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 import { useRule, ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 import { objectRuleContext } from '../../../hooks/useObjectRule/useObjectRule.es6.js';
 import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
+import { getSafeSchema } from '../../../utils/getSafeSchema/getSafeSchema.es6.js';
 
 const object = () => {
     useBlock('path');
@@ -53,8 +54,9 @@ const object = () => {
         parentRuleContext.reset(handler);
         innet(children, handler);
         useEffect(() => {
-            if (!Object.keys(schema.additionalProperties).length) {
-                delete schema.additionalProperties;
+            const safeSchema = getSafeSchema(schema);
+            if (!Object.keys(safeSchema.additionalProperties).length) {
+                delete safeSchema.additionalProperties;
             }
         });
     }

package/plugins/schema/object/object.js

@@ -19,6 +19,7 @@ var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
 var useEffect = require('../../../hooks/useEffect/useEffect.js');
+var getSafeSchema = require('../../../utils/getSafeSchema/getSafeSchema.js');
 
 const object = () => {
     useBlock.useBlock('path');
@@ -57,8 +58,9 @@ const object = () => {
         useParentRule.parentRuleContext.reset(handler);
         innet.innet(children, handler);
         useEffect.useEffect(() => {
-            if (!Object.keys(schema.additionalProperties).length) {
-                delete schema.additionalProperties;
+            const safeSchema = getSafeSchema.getSafeSchema(schema);
+            if (!Object.keys(safeSchema.additionalProperties).length) {
+                delete safeSchema.additionalProperties;
             }
         });
     }

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

@@ -5,6 +5,7 @@ export * from './decorators';
 export * from './generateTypes';
 export * from './getEndpoint';
 export * from './getOrAdd';
+export * from './getSafeSchema';
 export * from './httpOnStart';
 export * from './parseBody';
 export * from './parseFormBody';

package/utils/index.es6.js

@@ -5,6 +5,7 @@ import './decorators/index.es6.js';
 import './generateTypes/index.es6.js';
 import './getEndpoint/index.es6.js';
 import './getOrAdd/index.es6.js';
+import './getSafeSchema/index.es6.js';
 import './httpOnStart/index.es6.js';
 import './parseBody/index.es6.js';
 import './parseFormBody/index.es6.js';

package/utils/index.js

@@ -7,6 +7,7 @@ require('./decorators/index.js');
 require('./generateTypes/index.js');
 require('./getEndpoint/index.js');
 require('./getOrAdd/index.js');
+require('./getSafeSchema/index.js');
 require('./httpOnStart/index.js');
 require('./parseBody/index.js');
 require('./parseFormBody/index.js');