@midwayjs/core 3.17.0 → 3.18.0

package/dist/common/dataSourceManager.js

@@ -30,6 +30,7 @@ class DataSourceManager {
         this.dataSource = new Map();
         this.options = {};
         this.modelMapping = new WeakMap();
+        this.dataSourcePriority = {};
     }
     async initDataSource(dataSourceConfig, baseDirOrOptions) {
         var _a;

package/dist/interface.d.ts

@@ -1004,12 +1004,12 @@ export interface ServerSendEventMessage {
     id?: string;
     retry?: number;
 }
-export interface ServerStreamOptions {
-    tpl?: (data: unknown) => unknown;
+export interface ServerStreamOptions<CTX extends IMidwayContext> {
+    tpl?: (data: unknown, ctx: CTX) => unknown;
 }
-export interface ServerSendEventStreamOptions {
+export interface ServerSendEventStreamOptions<CTX extends IMidwayContext> {
     closeEvent?: string;
-    tpl?: (data: ServerSendEventMessage) => ServerSendEventMessage;
+    tpl?: (data: ServerSendEventMessage, ctx: CTX) => ServerSendEventMessage;
 }
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/response/base.d.ts

@@ -4,9 +4,9 @@ export declare class ServerResponse<CTX extends IMidwayContext = IMidwayContext>
     protected readonly ctx: any;
     protected isSuccess: boolean;
     constructor(ctx: CTX);
-    static TEXT_TPL: (data: string, isSuccess: boolean) => unknown;
-    static JSON_TPL: (data: Record<any, any>, isSuccess: boolean) => unknown;
-    static BLOB_TPL: (data: Buffer, isSuccess: boolean) => unknown;
+    static TEXT_TPL: <CTX_1 extends import("../interface").Context>(data: string, isSuccess: boolean, ctx: CTX_1) => unknown;
+    static JSON_TPL: <CTX_1 extends import("../interface").Context>(data: Record<any, any>, isSuccess: boolean, ctx: CTX_1) => unknown;
+    static BLOB_TPL: <CTX_1 extends import("../interface").Context>(data: Buffer, isSuccess: boolean, ctx: CTX_1) => unknown;
     json(data: Record<any, any>): any;
     text(data: string): any;
     blob(data: Buffer): any;

package/dist/response/base.js

@@ -7,13 +7,13 @@ class ServerResponse {
         this.ctx = ctx;
     }
     json(data) {
-        return Object.getPrototypeOf(this).constructor.JSON_TPL(data, this.isSuccess);
+        return Object.getPrototypeOf(this).constructor.JSON_TPL(data, this.isSuccess, this.ctx);
     }
     text(data) {
-        return Object.getPrototypeOf(this).constructor.TEXT_TPL(data, this.isSuccess);
+        return Object.getPrototypeOf(this).constructor.TEXT_TPL(data, this.isSuccess, this.ctx);
     }
     blob(data) {
-        return Object.getPrototypeOf(this).constructor.BLOB_TPL(data, this.isSuccess);
+        return Object.getPrototypeOf(this).constructor.BLOB_TPL(data, this.isSuccess, this.ctx);
     }
     success() {
         this.isSuccess = true;
@@ -25,10 +25,10 @@ class ServerResponse {
     }
 }
 exports.ServerResponse = ServerResponse;
-ServerResponse.TEXT_TPL = (data, isSuccess) => {
+ServerResponse.TEXT_TPL = (data, isSuccess, ctx) => {
     return data;
 };
-ServerResponse.JSON_TPL = (data, isSuccess) => {
+ServerResponse.JSON_TPL = (data, isSuccess, ctx) => {
     if (isSuccess) {
         return {
             success: 'true',
@@ -42,7 +42,7 @@ ServerResponse.JSON_TPL = (data, isSuccess) => {
         };
     }
 };
-ServerResponse.BLOB_TPL = (data, isSuccess) => {
+ServerResponse.BLOB_TPL = (data, isSuccess, ctx) => {
     return data;
 };
 //# sourceMappingURL=base.js.map

package/dist/response/http.d.ts

@@ -7,9 +7,10 @@ import { Readable } from 'stream';
 import { HttpStreamResponse } from './stream';
 export declare class HttpServerResponse<CTX extends IMidwayContext> extends ServerResponse<CTX> {
     constructor(ctx: CTX);
-    static FILE_TPL: (data: Readable, isSuccess: boolean) => Readable;
-    static SSE_TPL: (data: ServerSendEventMessage) => ServerSendEventMessage;
-    static STREAM_TPL: (data: unknown) => unknown;
+    static FILE_TPL: <CTX_1 extends import("../interface").Context>(data: Readable, isSuccess: boolean, ctx: CTX_1) => Readable;
+    static SSE_TPL: <CTX_1 extends import("../interface").Context>(data: ServerSendEventMessage, ctx: CTX_1) => ServerSendEventMessage;
+    static STREAM_TPL: <CTX_1 extends import("../interface").Context>(data: unknown, ctx: CTX_1) => unknown;
+    static HTML_TPL: <CTX_1 extends import("../interface").Context>(data: string, isSuccess: boolean, ctx: CTX_1) => unknown;
     status(code: number): this;
     header(key: string, value: string): this;
     headers(headers: Record<string, string>): this;
@@ -17,7 +18,9 @@ export declare class HttpServerResponse<CTX extends IMidwayContext> extends Serv
     text(data: string): any;
     file(filePath: string, mimeType?: string): any;
     blob(data: Buffer, mimeType?: string): any;
-    sse(options?: ServerSendEventStreamOptions): ServerSendEventStream;
-    stream(options?: ServerStreamOptions): HttpStreamResponse;
+    html(data: string): any;
+    redirect(url: string, status?: number): any;
+    sse(options?: ServerSendEventStreamOptions<CTX>): ServerSendEventStream<import("../interface").Context>;
+    stream(options?: ServerStreamOptions<CTX>): HttpStreamResponse<import("../interface").Context>;
 }
 //# sourceMappingURL=http.d.ts.map

package/dist/response/http.js

@@ -31,20 +31,36 @@ class HttpServerResponse extends base_1.ServerResponse {
     }
     json(data) {
         this.header('Content-Type', 'application/json');
-        return Object.getPrototypeOf(this).constructor.JSON_TPL(data, this.isSuccess);
+        return Object.getPrototypeOf(this).constructor.JSON_TPL(data, this.isSuccess, this.ctx);
     }
     text(data) {
         this.header('Content-Type', 'text/plain');
-        return Object.getPrototypeOf(this).constructor.TEXT_TPL(data, this.isSuccess);
+        return Object.getPrototypeOf(this).constructor.TEXT_TPL(data, this.isSuccess, this.ctx);
     }
     file(filePath, mimeType) {
         this.header('Content-Type', mimeType || 'application/octet-stream');
         this.header('Content-Disposition', `attachment; filename=${(0, path_1.basename)(filePath)}`);
-        return Object.getPrototypeOf(this).constructor.FILE_TPL(typeof filePath === 'string' ? (0, fs_1.createReadStream)(filePath) : filePath, this.isSuccess);
+        return Object.getPrototypeOf(this).constructor.FILE_TPL(typeof filePath === 'string' ? (0, fs_1.createReadStream)(filePath) : filePath, this.isSuccess, this.ctx);
     }
     blob(data, mimeType) {
         this.header('Content-Type', mimeType || 'application/octet-stream');
-        return Object.getPrototypeOf(this).constructor.BLOB_TPL(data, this.isSuccess);
+        return Object.getPrototypeOf(this).constructor.BLOB_TPL(data, this.isSuccess, this.ctx);
+    }
+    html(data) {
+        this.header('Content-Type', 'text/html');
+        return Object.getPrototypeOf(this).constructor.HTML_TPL(data, this.isSuccess, this.ctx);
+    }
+    redirect(url, status = 302) {
+        this.status(status);
+        if (this.ctx.redirect) {
+            return this.ctx.redirect(url);
+        }
+        else if (this.ctx.res.redirect) {
+            return this.ctx.res.redirect(url);
+        }
+        else {
+            this.header('Location', url);
+        }
     }
     sse(options = {}) {
         return new sse_1.ServerSendEventStream(this.ctx, {
@@ -60,13 +76,16 @@ class HttpServerResponse extends base_1.ServerResponse {
     }
 }
 exports.HttpServerResponse = HttpServerResponse;
-HttpServerResponse.FILE_TPL = (data, isSuccess) => {
+HttpServerResponse.FILE_TPL = (data, isSuccess, ctx) => {
+    return data;
+};
+HttpServerResponse.SSE_TPL = (data, ctx) => {
     return data;
 };
-HttpServerResponse.SSE_TPL = (data) => {
+HttpServerResponse.STREAM_TPL = (data, ctx) => {
     return data;
 };
-HttpServerResponse.STREAM_TPL = (data) => {
+HttpServerResponse.HTML_TPL = (data, isSuccess, ctx) => {
     return data;
 };
 //# sourceMappingURL=http.js.map

package/dist/response/sse.d.ts

@@ -1,18 +1,18 @@
 /// <reference types="node" />
 import { Transform } from 'stream';
-import { ServerSendEventStreamOptions } from '../interface';
+import { IMidwayContext, ServerSendEventStreamOptions } from '../interface';
 interface MessageEvent {
     data?: string | object;
     event?: string;
     id?: string;
     retry?: number;
 }
-export declare class ServerSendEventStream extends Transform {
+export declare class ServerSendEventStream<CTX extends IMidwayContext> extends Transform {
     private readonly ctx;
     private isActive;
     private readonly closeEvent;
     private options;
-    constructor(ctx: any, options?: ServerSendEventStreamOptions);
+    constructor(ctx: any, options?: ServerSendEventStreamOptions<CTX>);
     _transform(chunk: any, encoding: any, callback: any): void;
     sendError(error: Error): void;
     sendEnd(message?: MessageEvent): void;

package/dist/response/sse.js

@@ -95,7 +95,7 @@ class ServerSendEventStream extends stream_1.Transform {
         this.send(message);
     }
     send(message) {
-        super.write(this.options.tpl(message));
+        super.write(this.options.tpl(message, this.ctx));
     }
     handleClose() {
         this.end();

package/dist/response/stream.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="node" />
 import { Transform } from 'stream';
-import { ServerStreamOptions } from '../interface';
-export declare class HttpStreamResponse extends Transform {
+import { IMidwayContext, ServerStreamOptions } from '../interface';
+export declare class HttpStreamResponse<CTX extends IMidwayContext> extends Transform {
     private ctx;
     private isActive;
     private options;
-    constructor(ctx: any, options?: ServerStreamOptions);
+    constructor(ctx: any, options?: ServerStreamOptions<CTX>);
     _transform(chunk: any, encoding: any, callback: any): void;
     send(data: unknown): void;
     sendError(error: any): void;

package/dist/response/stream.js

@@ -41,7 +41,7 @@ class HttpStreamResponse extends stream_1.Transform {
         if (!this.writable) {
             return;
         }
-        this.write(this.options.tpl(data));
+        this.write(this.options.tpl(data, this.ctx));
     }
     sendError(error) {
         this.ctx.logger.error(error);

package/dist/util/httpclient.js

@@ -104,7 +104,7 @@ class HttpClient {
         this.defaultOptions = defaultOptions;
     }
     async request(url, options) {
-        return makeHttpRequest(url, Object.assign(this.defaultOptions, options));
+        return makeHttpRequest(url, Object.assign({}, this.defaultOptions, options));
     }
 }
 exports.HttpClient = HttpClient;

package/dist/util/webRouterParam.js

@@ -26,7 +26,12 @@ const extractKoaLikeValue = (key, data, paramType) => {
                     return ctx.getFileStream(data);
                 }
                 else if (ctx.files) {
-                    return ctx.files[0];
+                    if (Array.isArray(ctx.files)) {
+                        return ctx.files[0];
+                    }
+                    else {
+                        return ctx.files;
+                    }
                 }
                 else {
                     return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "description": "midway core",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -43,5 +43,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "21faf25ae7277f28d61f8416d1acd5a786a2c353"
+  "gitHead": "5e6180ba0fabe1acc6df112c68855129a534e941"
 }