@innet/server 1.0.4 → 1.1.0

package/README.md

@@ -414,6 +414,47 @@ export default (
 In this case, if you have a file in cms folder then the file will return
 else makes request to the `site.com`.
 
+## redirect
+You can redirect users to another resource.
+
+```typescript jsx
+export default (
+  <server>
+    <switch>
+      <cms dir='cms' />
+      <redirect to='https://site.com' />
+    </switch>
+  </server>
+)
+```
+
+### status
+By default, status is `301`, you can change it with `status` prop.
+
+```typescript jsx
+export default (
+  <server>
+    <switch>
+      <cms dir='cms' />
+      <redirect to='https://site.com' status={302} />
+    </switch>
+  </server>
+)
+```
+
+Also, you can use string key of status.
+
+```typescript jsx
+export default (
+  <server>
+    <switch>
+      <cms dir='cms' />
+      <redirect to='https://site.com' status='found'/>
+    </switch>
+  </server>
+)
+```
+
 ## Templates
 
 Any template is just a function which returns content that should be run.

package/action/Action/Action.d.ts

@@ -23,7 +23,7 @@ export interface File {
     size: number;
 }
 export declare const URL_PARSER: RegExp;
-export default class Action<O extends ActionOptions = ActionOptions> {
+export declare class Action<O extends ActionOptions = ActionOptions> {
     readonly req: Request;
     readonly res: Response;
     constructor(req: Request, res: Response);

package/action/Action/Action.es6.js

@@ -94,4 +94,4 @@ __decorate([
     once
 ], Action.prototype, "parsedUrl", null);
 
-export { ACTION, URL_PARSER, Action as default };
+export { ACTION, Action, URL_PARSER };

package/action/Action/Action.js

@@ -133,5 +133,5 @@ var Action = /** @class */ (function () {
 }());
 
 exports.ACTION = ACTION;
+exports.Action = Action;
 exports.URL_PARSER = URL_PARSER;
-exports["default"] = Action;

package/action/Action/index.d.ts

@@ -1,2 +1 @@
-export { default } from './Action';
 export * from './Action';

package/action/Action/index.es6.js

@@ -1 +1 @@
-export { ACTION, URL_PARSER, default } from './Action.es6.js';
+export { ACTION, Action, URL_PARSER } from './Action.es6.js';

package/action/Action/index.js

@@ -7,5 +7,5 @@ var Action = require('./Action.js');
 
 
 exports.ACTION = Action.ACTION;
+exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
-exports["default"] = Action["default"];

package/action/index.d.ts

@@ -1,4 +1,2 @@
-export { default } from './Action';
 export * from './Action';
-export { default as withAction } from './withAction';
 export * from './withAction';

package/action/index.es6.js

@@ -1,2 +1,2 @@
-export { ACTION, URL_PARSER, default } from './Action/Action.es6.js';
-export { default as withAction } from './withAction/withAction.es6.js';
+export { ACTION, Action, URL_PARSER } from './Action/Action.es6.js';
+export { withAction } from './withAction/withAction.es6.js';

package/action/index.js

@@ -8,6 +8,6 @@ var withAction = require('./withAction/withAction.js');
 
 
 exports.ACTION = Action.ACTION;
+exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
-exports["default"] = Action["default"];
-exports.withAction = withAction;
+exports.withAction = withAction.withAction;

package/action/withAction/index.d.ts

@@ -1,2 +1 @@
-export { default } from './withAction';
 export * from './withAction';

package/action/withAction/index.es6.js

@@ -1 +1 @@
-export { default } from './withAction.es6.js';
+export { withAction } from './withAction.es6.js';

package/action/withAction/index.js

@@ -1,7 +1,9 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var withAction = require('./withAction.js');
 
 
 
-module.exports = withAction;
+exports.withAction = withAction.withAction;

package/action/withAction/withAction.d.ts

@@ -1,6 +1,6 @@
 import { Children, Component, Props } from '@innet/jsx';
 import { Handler } from 'innet';
-import Action, { Body } from '../Action';
+import { Action, Body } from '../Action';
 export interface ActionComponent<B extends Body> extends Component {
     action: Action<B>;
 }
@@ -8,4 +8,4 @@ export interface RequestComponentConstructor<B extends Body> {
     new (props?: Props, children?: Children, handler?: Handler): ActionComponent<B>;
     [key: string]: any;
 }
-export default function withAction<B extends Body, T extends RequestComponentConstructor<B>>(target: T): T;
+export declare function withAction<B extends Body, T extends RequestComponentConstructor<B>>(target: T): T;

package/action/withAction/withAction.es6.js

@@ -9,4 +9,4 @@ function withAction(target) {
     return target;
 }
 
-export { withAction as default };
+export { withAction };

package/action/withAction/withAction.js

@@ -1,5 +1,7 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var Action = require('../Action/Action.js');
 
 function withAction(target) {
@@ -15,4 +17,4 @@ function withAction(target) {
     return target;
 }
 
-module.exports = withAction;
+exports.withAction = withAction;

package/handler/handler.d.ts

@@ -1,7 +1,7 @@
 import html from '@innet/html';
 import { switchAsync, SwitchProps } from '@innet/switch';
 import { arrayAsync } from '@innet/utils';
-import { cms, CmsProps, cookie, CookieProps, error, ErrorProps, file, FileProps, header, HeaderProps, proxy, ProxyProps, router, RouterProps, success, SuccessProps } from '../plugins';
+import { cms, CmsProps, cookie, CookieProps, error, ErrorProps, file, FileProps, header, HeaderProps, proxy, ProxyProps, router, RouterProps, success, SuccessProps, redirect, RedirectProps } from '../plugins';
 import { server, ServerProps } from '../server';
 export declare const arrayPlugins: (typeof arrayAsync)[];
 export declare const JSXPlugins: {
@@ -16,6 +16,7 @@ export declare const JSXPlugins: {
     cms: typeof cms;
     file: typeof file;
     proxy: typeof proxy;
+    redirect: typeof redirect;
 };
 export declare const objectPlugins: ((handler: any) => import("innet").PluginHandler)[];
 declare const _default: import("innet").Handler;
@@ -25,6 +26,7 @@ declare global {
         interface IntrinsicElements {
             server: ServerProps;
             router: RouterProps;
+            redirect: RedirectProps;
             cookie: CookieProps;
             success: SuccessProps;
             error: ErrorProps;

package/handler/handler.es6.js

@@ -11,6 +11,7 @@ import { error } from '../plugins/error/error.es6.js';
 import { cms } from '../plugins/cms/cms.es6.js';
 import { file } from '../plugins/file/file.es6.js';
 import { proxy } from '../plugins/proxy/proxy.es6.js';
+import { redirect } from '../plugins/redirect/redirect.es6.js';
 import { server } from '../server/server.es6.js';
 
 const arrayPlugins = [
@@ -30,6 +31,7 @@ const JSXPlugins = {
     cms,
     file,
     proxy,
+    redirect,
 };
 const objectPlugins = [
     jsxPlugins(JSXPlugins),

package/handler/handler.js

@@ -15,6 +15,7 @@ var error = require('../plugins/error/error.js');
 var cms = require('../plugins/cms/cms.js');
 var file = require('../plugins/file/file.js');
 var proxy = require('../plugins/proxy/proxy.js');
+var redirect = require('../plugins/redirect/redirect.js');
 var server = require('../server/server.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -38,6 +39,7 @@ var JSXPlugins = {
     cms: cms.cms,
     file: file.file,
     proxy: proxy.proxy,
+    redirect: redirect.redirect,
 };
 var objectPlugins = [
     jsx.jsxPlugins(JSXPlugins),

package/index.d.ts

@@ -2,5 +2,4 @@ export { default } from './handler';
 export * from './server';
 export * from './plugins';
 export * from './handler';
-export { default as Action } from './action';
 export * from './action';

package/index.es6.js

@@ -8,5 +8,6 @@ export { error, errorStatuses } from './plugins/error/error.es6.js';
 export { cms } from './plugins/cms/cms.es6.js';
 export { file } from './plugins/file/file.es6.js';
 export { proxy } from './plugins/proxy/proxy.es6.js';
-export { ACTION, default as Action, URL_PARSER } from './action/Action/Action.es6.js';
-export { default as withAction } from './action/withAction/withAction.es6.js';
+export { redirect, redirectStatuses } from './plugins/redirect/redirect.es6.js';
+export { ACTION, Action, URL_PARSER } from './action/Action/Action.es6.js';
+export { withAction } from './action/withAction/withAction.es6.js';

package/index.js

@@ -12,6 +12,7 @@ var error = require('./plugins/error/error.js');
 var cms = require('./plugins/cms/cms.js');
 var file = require('./plugins/file/file.js');
 var proxy = require('./plugins/proxy/proxy.js');
+var redirect = require('./plugins/redirect/redirect.js');
 var Action = require('./action/Action/Action.js');
 var withAction = require('./action/withAction/withAction.js');
 
@@ -35,7 +36,9 @@ exports.errorStatuses = error.errorStatuses;
 exports.cms = cms.cms;
 exports.file = file.file;
 exports.proxy = proxy.proxy;
+exports.redirect = redirect.redirect;
+exports.redirectStatuses = redirect.redirectStatuses;
 exports.ACTION = Action.ACTION;
-exports.Action = Action["default"];
+exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
-exports.withAction = withAction;
+exports.withAction = withAction.withAction;

package/package.json

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

package/plugins/index.d.ts

@@ -6,3 +6,4 @@ export * from './error';
 export * from './cms';
 export * from './file';
 export * from './proxy';
+export * from './redirect';

package/plugins/index.es6.js

@@ -6,3 +6,4 @@ export { error, errorStatuses } from './error/error.es6.js';
 export { cms } from './cms/cms.es6.js';
 export { file } from './file/file.es6.js';
 export { proxy } from './proxy/proxy.es6.js';
+export { redirect, redirectStatuses } from './redirect/redirect.es6.js';

package/plugins/index.js

@@ -10,6 +10,7 @@ var error = require('./error/error.js');
 var cms = require('./cms/cms.js');
 var file = require('./file/file.js');
 var proxy = require('./proxy/proxy.js');
+var redirect = require('./redirect/redirect.js');
 
 
 
@@ -26,3 +27,5 @@ exports.errorStatuses = error.errorStatuses;
 exports.cms = cms.cms;
 exports.file = file.file;
 exports.proxy = proxy.proxy;
+exports.redirect = redirect.redirect;
+exports.redirectStatuses = redirect.redirectStatuses;

package/plugins/redirect/index.d.ts

@@ -0,0 +1 @@
+export * from './redirect';

package/plugins/redirect/index.es6.js

@@ -0,0 +1 @@
+export { redirect, redirectStatuses } from './redirect.es6.js';

package/plugins/redirect/index.js

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var redirect = require('./redirect.js');
+
+
+
+exports.redirect = redirect.redirect;
+exports.redirectStatuses = redirect.redirectStatuses;

package/plugins/redirect/redirect.d.ts

@@ -0,0 +1,18 @@
+export interface RedirectProps {
+    to: string;
+    status?: number | keyof typeof redirectStatuses;
+}
+export declare const redirectStatuses: {
+    multipleChoices: number;
+    movedPermanently: number;
+    found: number;
+    seeOther: number;
+    notModified: number;
+    useProxy: number;
+    temporaryRedirect: number;
+    permanentRedirect: number;
+};
+export declare function redirect({ props, children }: {
+    props: any;
+    children: any;
+}, handler: any): any;

package/plugins/redirect/redirect.es6.js

@@ -0,0 +1,27 @@
+import { ACTION } from '../../action/Action/Action.es6.js';
+
+const redirectStatuses = {
+    multipleChoices: 300,
+    movedPermanently: 301,
+    found: 302,
+    seeOther: 303,
+    notModified: 304,
+    useProxy: 305,
+    temporaryRedirect: 307,
+    permanentRedirect: 308,
+};
+function getStatus(status) {
+    if (typeof status === 'number')
+        return status;
+    return redirectStatuses[status] || 301;
+}
+function redirect({ props, children }, handler) {
+    const { res } = handler[ACTION];
+    const { to, status = 301 } = props;
+    res.writeHead(getStatus(status), {
+        location: to,
+    });
+    return null;
+}
+
+export { redirect, redirectStatuses };

package/plugins/redirect/redirect.js

@@ -0,0 +1,33 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var Action = require('../../action/Action/Action.js');
+
+var redirectStatuses = {
+    multipleChoices: 300,
+    movedPermanently: 301,
+    found: 302,
+    seeOther: 303,
+    notModified: 304,
+    useProxy: 305,
+    temporaryRedirect: 307,
+    permanentRedirect: 308,
+};
+function getStatus(status) {
+    if (typeof status === 'number')
+        return status;
+    return redirectStatuses[status] || 301;
+}
+function redirect(_a, handler) {
+    var props = _a.props; _a.children;
+    var res = handler[Action.ACTION].res;
+    var to = props.to, _b = props.status, status = _b === void 0 ? 301 : _b;
+    res.writeHead(getStatus(status), {
+        location: to,
+    });
+    return null;
+}
+
+exports.redirect = redirect;
+exports.redirectStatuses = redirectStatuses;

package/plugins/router/router.d.ts

@@ -1,6 +1,6 @@
 import { Children, Component, Props } from '@innet/jsx';
 import { Handler } from 'innet';
-import Action from '../../action';
+import { Action } from '../../action';
 export declare type Methods = 'GET' | 'HEAD' | 'POST' | 'DELETE' | 'PUT' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
 export interface RouterProps {
     method?: Methods;

package/server/index.d.ts

@@ -1,2 +1 @@
-export { default } from './server';
 export * from './server';

package/server/index.es6.js

@@ -1 +1 @@
-export { server as default, server } from './server.es6.js';
+export { server } from './server.es6.js';

package/server/index.js

@@ -6,5 +6,4 @@ var server = require('./server.js');
 
 
 
-exports["default"] = server.server;
 exports.server = server.server;

package/server/server.d.ts

@@ -1,5 +1,5 @@
 import { Handler } from 'innet';
-import Action from '../action';
+import { Action } from '../action';
 export interface SSL {
     cert: string;
     key: string;
@@ -16,4 +16,3 @@ export declare function server({ props, children }: {
     props?: ServerProps;
     children: any;
 }, handler: Handler): Promise<unknown>;
-export default server;

package/server/server.es6.js

@@ -3,7 +3,7 @@ import fs from 'fs';
 import http from 'http';
 import http2 from 'https';
 import innet from 'innet';
-import Action, { ACTION } from '../action/Action/Action.es6.js';
+import { ACTION, Action } from '../action/Action/Action.es6.js';
 import { CONTINUE } from '../constants.es6.js';
 
 const isInvalidPath = require('is-invalid-path');
@@ -60,4 +60,4 @@ function server({ props = {}, children }, handler) {
     return promise;
 }
 
-export { server as default, server };
+export { server };

package/server/server.js

@@ -38,7 +38,7 @@ function server(_a, handler) {
             switch (_a.label) {
                 case 0:
                     childHandler = Object.create(handler);
-                    childHandler[Action.ACTION] = new Action["default"](req, res);
+                    childHandler[Action.ACTION] = new Action.Action(req, res);
                     if (!onRequest) return [3 /*break*/, 2];
                     return [4 /*yield*/, onRequest(childHandler[Action.ACTION])];
                 case 1:
@@ -88,5 +88,4 @@ function server(_a, handler) {
     return promise;
 }
 
-exports["default"] = server;
 exports.server = server;