@innet/server 2.0.0-alpha.17 → 2.0.0-alpha.18

package/README.md

@@ -247,8 +247,8 @@ export default (
 
 [← back](#main)
 
-`<api>` element MUST be placed in `<server>` element.  
 This element defines a REST API on the server.
+This element MUST be placed in [\<server>](#server) element.
 
 #### title
 
@@ -329,7 +329,7 @@ export default (
 )
 ```
 
-*default: 0.0.0*
+*default: `INNET_API_VERSION` || `'0.0.0'`*
 
 #### prefix
 
@@ -3380,7 +3380,7 @@ export default (
 
 #### dir
 
-By default, it looks at project folder.
+By default, it equals `INNET_CMS_DIR` node env variable or the project folder.
 If you try the previous example on [http://localhost/package.json](http://localhost/package.json)
 you get the project `package.json` file.
 
@@ -3403,6 +3403,7 @@ you get the index file in `src` folder.
 #### prefix
 
 `<cms>` matches full `path`, you should take it into account if you add `prefix` on `<api>`.
+By default, it equals `INNET_CMS_PREFIX` node env variable or `/`.
 
 *src/app.tsx*
 ```typescript jsx

package/package.json

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

package/plugins/main/api/api.es6.js

@@ -12,11 +12,10 @@ import { RulesError } from '../../../utils/rules/helpers.es6.js';
 import { paramsContext } from '../../../hooks/useParams/useParams.es6.js';
 
 const api = () => {
-    var _a;
     const handler = useNewHandler();
     const { props = {}, children } = useApp();
-    const { prefix = '', title = '', include, exclude } = props, rest = __rest(props, ["prefix", "title", "include", "exclude"]);
-    const info = Object.assign(Object.assign({}, rest), { version: (_a = rest.version) !== null && _a !== void 0 ? _a : '0.0.0', title });
+    const { prefix = '', title = '', include, exclude, version = process.env.INNET_API_VERSION || '0.0.0' } = props, rest = __rest(props, ["prefix", "title", "include", "exclude", "version"]);
+    const info = Object.assign(Object.assign({}, rest), { version, title });
     const endpoints = {};
     const docs = {
         openapi: '3.1.0',
@@ -39,7 +38,7 @@ const api = () => {
     serverPlugins.set(handler, plugins);
     apiContext.set(handler, context);
     useServerPlugin(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const action = useAction();
         if (!condition(action))
             return;
@@ -53,7 +52,7 @@ const api = () => {
             res.end();
             return null;
         }
-        const method = ((_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'get');
+        const method = ((_b = (_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : 'get');
         const rawSplitPath = url.slice(prefix.length).split('/').slice(1);
         const splitPath = rawSplitPath.at(-1) ? rawSplitPath : rawSplitPath.slice(0, -1);
         const endpoint = endpoints[method];
@@ -138,8 +137,8 @@ const api = () => {
                         return true;
                     });
                 }
-                if ((_e = (_d = currentEndpoint.static) === null || _d === void 0 ? void 0 : _d[key]) === null || _e === void 0 ? void 0 : _e.plugins) {
-                    if (!(yield run((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key], params)))
+                if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
+                    if (!(yield run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params)))
                         continue;
                     return null;
                 }
@@ -154,7 +153,7 @@ const api = () => {
                 }
                 break;
             }
-            if ((_g = currentEndpoint.static) === null || _g === void 0 ? void 0 : _g[key]) {
+            if ((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key]) {
                 endpointQueue.push([deep + 1, currentEndpoint.static[key], params]);
             }
             if (currentEndpoint.dynamic) {

package/plugins/main/api/api.js

@@ -20,11 +20,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const api = () => {
-    var _a;
     const handler = innet.useNewHandler();
     const { props = {}, children } = innet.useApp();
-    const { prefix = '', title = '', include, exclude } = props, rest = tslib.__rest(props, ["prefix", "title", "include", "exclude"]);
-    const info = Object.assign(Object.assign({}, rest), { version: (_a = rest.version) !== null && _a !== void 0 ? _a : '0.0.0', title });
+    const { prefix = '', title = '', include, exclude, version = process.env.INNET_API_VERSION || '0.0.0' } = props, rest = tslib.__rest(props, ["prefix", "title", "include", "exclude", "version"]);
+    const info = Object.assign(Object.assign({}, rest), { version, title });
     const endpoints = {};
     const docs = {
         openapi: '3.1.0',
@@ -47,7 +46,7 @@ const api = () => {
     useServerPlugins.serverPlugins.set(handler, plugins);
     useApi.apiContext.set(handler, context);
     useServerPlugin.useServerPlugin(() => tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const action = useAction.useAction();
         if (!condition(action))
             return;
@@ -61,7 +60,7 @@ const api = () => {
             res.end();
             return null;
         }
-        const method = ((_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'get');
+        const method = ((_b = (_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : 'get');
         const rawSplitPath = url.slice(prefix.length).split('/').slice(1);
         const splitPath = rawSplitPath.at(-1) ? rawSplitPath : rawSplitPath.slice(0, -1);
         const endpoint = endpoints[method];
@@ -146,8 +145,8 @@ const api = () => {
                         return true;
                     });
                 }
-                if ((_e = (_d = currentEndpoint.static) === null || _d === void 0 ? void 0 : _d[key]) === null || _e === void 0 ? void 0 : _e.plugins) {
-                    if (!(yield run((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key], params)))
+                if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
+                    if (!(yield run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params)))
                         continue;
                     return null;
                 }
@@ -162,7 +161,7 @@ const api = () => {
                 }
                 break;
             }
-            if ((_g = currentEndpoint.static) === null || _g === void 0 ? void 0 : _g[key]) {
+            if ((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key]) {
                 endpointQueue.push([deep + 1, currentEndpoint.static[key], params]);
             }
             if (currentEndpoint.dynamic) {

package/plugins/request/cms/cms.es6.js

@@ -7,7 +7,7 @@ import { usePath } from '../../../hooks/usePath/usePath.es6.js';
 import { file } from '../file/file.es6.js';
 
 function cms() {
-    const { prefix = '/', dir = '.' } = useProps() || {};
+    const { prefix = process.env.INNET_CMS_PREFIX || '/', dir = process.env.INNET_CMS_DIR || '.', } = useProps() || {};
     const children = useChildren();
     const handler = useHandler();
     let url = usePath();

package/plugins/request/cms/cms.js

@@ -16,7 +16,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 function cms() {
-    const { prefix = '/', dir = '.' } = jsx.useProps() || {};
+    const { prefix = process.env.INNET_CMS_PREFIX || '/', dir = process.env.INNET_CMS_DIR || '.', } = jsx.useProps() || {};
     const children = jsx.useChildren();
     const handler = innet.useHandler();
     let url = usePath.usePath();

package/utils/generateTypes/generateTypes.es6.js

@@ -21,6 +21,16 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     if (['boolean', 'number', 'null'].includes(schema.type)) {
         return `${schema.type}${lastChar}`;
     }
+    if (schema.oneOf) {
+        let result = '';
+        for (const item of schema.oneOf) {
+            if (result) {
+                result += ' | ';
+            }
+            result += generateSchemaTypes(item, spaces + 2, '');
+        }
+        return result + lastChar;
+    }
     if (schema.type === 'array') {
         if (!schema.items)
             return `any[]${lastChar}`;
@@ -32,15 +42,23 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     }
     let result = '{\n';
     const required = schema.required || [];
-    for (const key in schema.properties) {
-        const prop = schema.properties[key];
-        const splitter = required.includes(key) || hasDefault(prop)
-            ? ':'
-            : '?:';
-        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    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)
+                ? ':'
+                : '?:';
+            result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+        }
     }
-    if (typeof schema.additionalProperties === 'object' && Object.keys(schema.additionalProperties).length) {
-        result += `${space}[key: string]: any\n`;
+    if (hasRestProps) {
+        const value = hasProps
+            ? 'any\n'
+            : generateSchemaTypes(schema.additionalProperties, spaces + 2);
+        result += `${space}[key: string]: ${value}`;
     }
     return `${result}${space.slice(0, -2)}}${lastChar}`;
 }

package/utils/generateTypes/generateTypes.js

@@ -25,6 +25,16 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     if (['boolean', 'number', 'null'].includes(schema.type)) {
         return `${schema.type}${lastChar}`;
     }
+    if (schema.oneOf) {
+        let result = '';
+        for (const item of schema.oneOf) {
+            if (result) {
+                result += ' | ';
+            }
+            result += generateSchemaTypes(item, spaces + 2, '');
+        }
+        return result + lastChar;
+    }
     if (schema.type === 'array') {
         if (!schema.items)
             return `any[]${lastChar}`;
@@ -36,15 +46,23 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     }
     let result = '{\n';
     const required = schema.required || [];
-    for (const key in schema.properties) {
-        const prop = schema.properties[key];
-        const splitter = required.includes(key) || hasDefault(prop)
-            ? ':'
-            : '?:';
-        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    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)
+                ? ':'
+                : '?:';
+            result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+        }
     }
-    if (typeof schema.additionalProperties === 'object' && Object.keys(schema.additionalProperties).length) {
-        result += `${space}[key: string]: any\n`;
+    if (hasRestProps) {
+        const value = hasProps
+            ? 'any\n'
+            : generateSchemaTypes(schema.additionalProperties, spaces + 2);
+        result += `${space}[key: string]: ${value}`;
     }
     return `${result}${space.slice(0, -2)}}${lastChar}`;
 }