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

package/README.md

@@ -396,22 +396,29 @@ export default (
 )
 ```
 
-> You MUST add some [endpoint](#endpoint) with some schema otherwise you get the `Error: There is no schema in the input contents`.
-
+You do not need to import types, use `Api` namespace everywhere.
 Here is an example of generated types usage.
 
-*src/GetPartner.tsx*
 ```typescript jsx
 import { useParams } from '@innet/server'
 
-export function GetPartner () {
-  const { id } = useParams<Paths.Partners$Id.Get.PathParameters>()
-  return <success>{{ id }}</success>
+import { todos } from '../todos'
+
+export function DeleteTodo () {
+  const { todoId } = useParams<Api.Endpoints['DELETE:/todos/{todoId}']['Params']>()
+
+  const todoIndex = todos.findIndex(({ id }) => id === todoId)
+
+  if (todoIndex === -1) {
+    return <error code='todoNotFound' status={404} />
+  }
+
+  todos.splice(todoIndex, 1)
+
+  return <success />
 }
 ```
 
-You do not need to import types, they generate as namespaces.
-
 ## API Info
 
 The API information elements are here.

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

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

package/package.json

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

package/plugins/schema/boolean/boolean.es6.js

@@ -1,10 +1,9 @@
-import { useProps, useContext } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
-import { paramContext } from '../../../hooks/useParam/useParam.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 import { useRule } from '../../../hooks/useRule/useRule.es6.js';
@@ -14,12 +13,11 @@ const boolean = () => {
     useBlock('path');
     const props = useProps();
     useSchemaType('boolean', props);
-    const param = useContext(paramContext);
     const rules = [];
     if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
         rules.push(defaultTo(props.default));
     }
-    rules.push(param ? val => val === 'true' || (val === 'false' ? false : Boolean(val)) : Boolean);
+    rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
     if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
         const parentRule = useParentRule();
         useRule(parentRule(pipe(...rules)));

package/plugins/schema/boolean/boolean.js

@@ -8,7 +8,6 @@ require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
 var useBlock = require('../../../hooks/useBlock/useBlock.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
-var useParam = require('../../../hooks/useParam/useParam.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
@@ -18,12 +17,11 @@ const boolean = () => {
     useBlock.useBlock('path');
     const props = jsx.useProps();
     useSchemaType.useSchemaType('boolean', props);
-    const param = jsx.useContext(useParam.paramContext);
     const rules = [];
     if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
         rules.push(defaultTo.defaultTo(props.default));
     }
-    rules.push(param ? val => val === 'true' || (val === 'false' ? false : Boolean(val)) : Boolean);
+    rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
     if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
         const parentRule = useParentRule.useParentRule();
         useRule.useRule(parentRule(pipe.pipe(...rules)));

package/utils/generateTypes/generateTypes.es6.js

@@ -9,7 +9,16 @@ function generateSchemaTypes(schema, spaces = 2) {
     if (schema.type === 'integer') {
         return `${schema.format === 'int64' ? 'bigint' : 'number'}\n`;
     }
-    if (['string', 'boolean', 'number', 'null'].includes(schema.type)) {
+    if (schema.type === 'string') {
+        if (schema.format === 'date-time') {
+            return 'Date\n';
+        }
+        if (schema.format === 'binary') {
+            return 'Bin\n';
+        }
+        return 'string\n';
+    }
+    if (['boolean', 'number', 'null'].includes(schema.type)) {
         return `${schema.type}\n`;
     }
     if (schema.type === 'array') {
@@ -34,7 +43,7 @@ function generateSchemaTypes(schema, spaces = 2) {
 }
 function generateTypes(docs) {
     var _a;
-    let result = 'declare namespace Api {\n';
+    let result = 'declare namespace Api {\n  export interface Bin {\n    filename: string\n    fieldName: string\n    originalFilename: string\n    path: string\n    type: string\n    disposition: string\n    size: number\n    extension?: string\n  }\n';
     const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
     const paths = docs.paths;
     if (schemas) {

package/utils/generateTypes/generateTypes.js

@@ -13,7 +13,16 @@ function generateSchemaTypes(schema, spaces = 2) {
     if (schema.type === 'integer') {
         return `${schema.format === 'int64' ? 'bigint' : 'number'}\n`;
     }
-    if (['string', 'boolean', 'number', 'null'].includes(schema.type)) {
+    if (schema.type === 'string') {
+        if (schema.format === 'date-time') {
+            return 'Date\n';
+        }
+        if (schema.format === 'binary') {
+            return 'Bin\n';
+        }
+        return 'string\n';
+    }
+    if (['boolean', 'number', 'null'].includes(schema.type)) {
         return `${schema.type}\n`;
     }
     if (schema.type === 'array') {
@@ -38,7 +47,7 @@ function generateSchemaTypes(schema, spaces = 2) {
 }
 function generateTypes(docs) {
     var _a;
-    let result = 'declare namespace Api {\n';
+    let result = 'declare namespace Api {\n  export interface Bin {\n    filename: string\n    fieldName: string\n    originalFilename: string\n    path: string\n    type: string\n    disposition: string\n    size: number\n    extension?: string\n  }\n';
     const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
     const paths = docs.paths;
     if (schemas) {

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

@@ -7,7 +7,10 @@ function objectOf(map) {
         }
         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;
+            }
         }
         return result;
     };

package/utils/rules/objectOf/objectOf.js

@@ -11,7 +11,10 @@ function objectOf(map) {
         }
         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;
+            }
         }
         return result;
     };