@innet/server 2.0.0-alpha.31 → 2.0.0-alpha.33

package/hooks/useNewSchema/useNewSchema.es6.js

@@ -14,7 +14,7 @@ function useNewSchema(schema = Object.create(null)) {
     else if (parentSchema.oneOf) {
         parentSchema.oneOf.push(schema);
     }
-    else if (parentSchema.type) {
+    else if (parentSchema.type || '$ref' in parentSchema) {
         const oldSchema = Object.assign({}, parentSchema);
         for (const key in parentSchema) {
             // @ts-expect-error: FIXME

package/hooks/useNewSchema/useNewSchema.js

@@ -18,7 +18,7 @@ function useNewSchema(schema = Object.create(null)) {
     else if (parentSchema.oneOf) {
         parentSchema.oneOf.push(schema);
     }
-    else if (parentSchema.type) {
+    else if (parentSchema.type || '$ref' in parentSchema) {
         const oldSchema = Object.assign({}, parentSchema);
         for (const key in parentSchema) {
             // @ts-expect-error: FIXME

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.33",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -44,7 +44,6 @@
     "cookie": "^0.5.0",
     "http-proxy": "^1.18.1",
     "innet": "^2.0.0-alpha.3",
-    "is-invalid-path": "^1.0.2",
     "mime": "^3.0.0",
     "multiparty": "^4.2.3",
     "openapi-types": "^12.1.3",

package/plugins/main/server/server.es6.js

@@ -14,8 +14,6 @@ import { Action } from '../../../utils/action/Action.es6.js';
 import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
 import { requestHandlerContext } from '../../../hooks/useRequestHandler/useRequestHandler.es6.js';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const isInvalidPath = require('is-invalid-path');
 const server = () => {
     var _a, _b, _c;
     const handler = useNewHandler();
@@ -23,10 +21,10 @@ const server = () => {
     const { env } = process;
     let { ssl: { cert = (_a = env.INNET_SSL_CRT) !== null && _a !== void 0 ? _a : 'localhost.crt', key = (_b = env.INNET_SSL_KEY) !== null && _b !== void 0 ? _b : 'localhost.key', } = {}, } = props;
     try {
-        if (!isInvalidPath(key)) {
+        if (!key.startsWith('-----BEGIN PRIVATE KEY-----')) {
             key = fs.readFileSync(key).toString();
         }
-        if (!isInvalidPath(cert)) {
+        if (!cert.startsWith('-----BEGIN CERTIFICATE-----')) {
             cert = fs.readFileSync(cert).toString();
         }
     }

package/plugins/main/server/server.js

@@ -25,8 +25,6 @@ var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const isInvalidPath = require('is-invalid-path');
 const server = () => {
     var _a, _b, _c;
     const handler = innet.useNewHandler();
@@ -34,10 +32,10 @@ const server = () => {
     const { env } = process;
     let { ssl: { cert = (_a = env.INNET_SSL_CRT) !== null && _a !== void 0 ? _a : 'localhost.crt', key = (_b = env.INNET_SSL_KEY) !== null && _b !== void 0 ? _b : 'localhost.key', } = {}, } = props;
     try {
-        if (!isInvalidPath(key)) {
+        if (!key.startsWith('-----BEGIN PRIVATE KEY-----')) {
             key = fs__default["default"].readFileSync(key).toString();
         }
-        if (!isInvalidPath(cert)) {
+        if (!cert.startsWith('-----BEGIN CERTIFICATE-----')) {
             cert = fs__default["default"].readFileSync(cert).toString();
         }
     }