ng-alain 14.0.0-beta.1 → 14.0.0

package/application/files/src/app/core/net/default.interceptor.ts

@@ -10,7 +10,7 @@ import {
 import { Injectable, Injector } from '@angular/core';
 import { Router } from '@angular/router';
 import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
-import { ALAIN_I18N_TOKEN, _HttpClient } from '@delon/theme';
+import { ALAIN_I18N_TOKEN, IGNORE_BASE_URL, _HttpClient, CUSTOM_ERROR, RAW_BODY } from '@delon/theme';
 import { environment } from '@env/environment';
 import { NzNotificationService } from 'ng-zorro-antd/notification';
 import { BehaviorSubject, Observable, of, throwError, catchError, filter, mergeMap, switchMap, take } from 'rxjs';
@@ -88,7 +88,7 @@ export class DefaultInterceptor implements HttpInterceptor {
     // 1、若请求为刷新Token请求，表示来自刷新Token可以直接跳转登录页
     if ([`/api/auth/refresh`].some(url => req.url.includes(url))) {
       this.toLogin();
-      return throwError(ev);
+      return throwError(() => ev);
     }
     // 2、如果 `refreshToking` 为 `true` 表示已经在请求刷新 Token 中，后续所有请求转入等待状态，直至结果返回后再重新发起请求
     if (this.refreshToking) {
@@ -115,7 +115,7 @@ export class DefaultInterceptor implements HttpInterceptor {
       catchError(err => {
         this.refreshToking = false;
         this.toLogin();
-        return throwError(err);
+        return throwError(() => err);
       })
     );
   }
@@ -152,15 +152,15 @@ export class DefaultInterceptor implements HttpInterceptor {
           return this.refreshTokenRequest();
         })
       )
-      .subscribe(
-        res => {
+      .subscribe({
+        next: res => {
           // TODO: Mock expired value
           res.expired = +new Date() + 1000 * 60 * 5;
           this.refreshToking = false;
           this.tokenSrv.set(res);
         },
-        () => this.toLogin()
-      );
+        error: () => this.toLogin()
+      });
   }
 
   // #endregion
@@ -183,13 +183,14 @@ export class DefaultInterceptor implements HttpInterceptor {
         // if (ev instanceof HttpResponse) {
         //   const body = ev.body;
         //   if (body && body.status !== 0) {
-        //     this.injector.get(NzMessageService).error(body.msg);
-        //     // 注意：这里如果继续抛出错误会被行254的 catchError 二次拦截，导致外部实现的 Pipe、subscribe 操作被中断，例如：this.http.get('/').subscribe() 不会触发
-        //     // 如果你希望外部实现，需要手动移除行254
-        //     return throwError({});
+        //     const customError = req.context.get(CUSTOM_ERROR);
+        //     if (customError) this.injector.get(NzMessageService).error(body.msg);
+        //     // 注意：这里如果继续抛出错误会被行258的 catchError 二次拦截，导致外部实现的 Pipe、subscribe 操作被中断，例如：this.http.get('/').subscribe() 不会触发
+        //     // 如果你希望外部实现，需要手动移除行259
+        //     return if (customError) throwError({}) : of({});
         //   } else {
-        //     // 忽略 Blob 文件体
-        //     if (ev.body instanceof Blob) {
+        //     // 返回原始返回体
+        //     if (req.context.get(RAW_BODY) || ev.body instanceof Blob) {
         //        return of(ev);
         //     }
         //     // 重新修改 `body` 内容为 `response` 内容，对于绝大多数场景已经无须再关心业务状态码
@@ -220,7 +221,7 @@ export class DefaultInterceptor implements HttpInterceptor {
         break;
     }
     if (ev instanceof HttpErrorResponse) {
-      return throwError(ev);
+      return throwError(() => ev);
     } else {
       return of(ev);
     }
@@ -239,7 +240,7 @@ export class DefaultInterceptor implements HttpInterceptor {
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     // 统一加上服务端前缀
     let url = req.url;
-    if (!url.startsWith('https://') && !url.startsWith('http://')) {
+    if (!req.context.get(IGNORE_BASE_URL) && !url.startsWith('https://') && !url.startsWith('http://')) {
       const { baseUrl } = environment.api;
       url = baseUrl + (baseUrl.endsWith('/') && url.startsWith('/') ? url.substring(1) : url);
     }
@@ -253,8 +254,8 @@ export class DefaultInterceptor implements HttpInterceptor {
         }
         // 若一切都正常，则后续操作
         return of(ev);
-      }),
-      catchError((err: HttpErrorResponse) => this.handleData(err, newReq, next))
+      })
+      // catchError((err: HttpErrorResponse) => this.handleData(err, newReq, next))
     );
   }
 }

package/application/files/src/app/routes/exception/trigger.component.ts

@@ -25,11 +25,11 @@ export class ExceptionTriggerComponent {
   refresh(): void {
     this.tokenService.set({ token: 'invalid-token' });
     // 必须提供一个后端地址，无法通过 Mock 来模拟
-    this.http.post(`https://localhost:5001/auth`).subscribe(
-      res => console.warn('成功', res),
-      err => {
+    this.http.post(`https://localhost:5001/auth`).subscribe({
+      next: res => console.warn('成功', res),
+      error: err => {
         console.log('最后结果失败', err);
       }
-    );
+    });
   }
 }

package/ng-update/upgrade-rules/v14/index.js

@@ -36,7 +36,7 @@ function addEslintPluginDeprecation() {
         }
         tree.overwrite(path, content);
         // add deprecation
-        (0, utils_1.addPackage)(tree, `eslint-plugin-prettier@^2.7.1`, 'devDependencies');
+        (0, utils_1.addPackage)(tree, `eslint-plugin-prettier@~4.2.1`, 'devDependencies');
         (0, utils_1.logStart)(context, `Add deprecation warn of eslint`);
     };
 }

package/ng-update/upgrade-rules/v14/index.ts

@@ -37,7 +37,7 @@ function addEslintPluginDeprecation(): Rule {
 
     tree.overwrite(path, content);
     // add deprecation
-    addPackage(tree, `eslint-plugin-prettier@^2.7.1`, 'devDependencies');
+    addPackage(tree, `eslint-plugin-prettier@~4.2.1`, 'devDependencies');
     logStart(context, `Add deprecation warn of eslint`);
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-alain",
-  "version": "14.0.0-beta.1",
+  "version": "14.0.0",
   "description": "Schematics specific to ng-alain",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",

package/utils/lib-versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZORROVERSION = exports.VERSION = void 0;
-exports.VERSION = '^14.0.0-beta.1';
+exports.VERSION = '^14.0.0';
 exports.ZORROVERSION = '^14.0.0';
 //# sourceMappingURL=lib-versions.js.map

package/utils/lib-versions.ts

@@ -1,2 +1,2 @@
-export const VERSION = '^14.0.0-beta.1';
+export const VERSION = '^14.0.0';
 export const ZORROVERSION = '^14.0.0';

package/utils/versions.js

@@ -29,11 +29,11 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
         `@typescript-eslint/eslint-plugin@~5.35.1`,
         `@typescript-eslint/parser@~5.35.1`,
         `eslint@^8.23.0`,
-        `eslint-config-prettier@^2.7.1`,
+        `eslint-config-prettier@~8.5.0`,
         `eslint-plugin-import@~2.26.0`,
         `eslint-plugin-jsdoc@~39.3.6`,
         `eslint-plugin-prefer-arrow@~1.2.3`,
-        `eslint-plugin-prettier@^2.7.1`,
+        `eslint-plugin-prettier@~4.2.1`,
         `eslint-plugin-deprecation@~1.3.2`,
         `prettier@^2.7.1`,
         `husky@^7.0.4`,
@@ -41,10 +41,9 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
         `ng-alain-plugin-theme@^13.0.3`,
         `source-map-explorer@^2.5.2`,
         `@angular/language-service@^14.2.0`,
-        `rxjs@~7.5.0`,
         `@delon/testing@${version}`
     ], 'devDependencies');
-    (0, package_1.addPackage)(tree, [`ng-zorro-antd@^14.0.0`]);
+    (0, package_1.addPackage)(tree, [`rxjs@~7.5.0`, `ng-zorro-antd@^14.0.0`]);
 }
 exports.UpgradeMainVersions = UpgradeMainVersions;
 function addESLintRule(context, showLog = true) {

package/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../schematics/utils/versions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAwE;AAExE,iDAAyC;AACzC,+BAAgC;AAChC,uCAAuC;AACvC,2CAAgD;AAEhD;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,UAAkB,sBAAO;IACvE,IAAA,oBAAU,EACR,IAAI,EACJ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,OAAO,EAAE,CAAC,CACnH,CAAC;IACF,IAAA,oBAAU,EACR,IAAI,EACJ;QACE,+CAA+C;QAC/C,qDAAqD;QACrD,8DAA8D;QAC9D,kDAAkD;QAClD,uDAAuD;QACvD,wDAAwD;QACxD,iDAAiD;QACjD,8BAA8B;QAC9B,8CAA8C;QAC9C,4CAA4C;QAC5C,2CAA2C;QAC3C,kDAAkD;QAClD,8CAA8C;QAC9C,iDAAiD;QACjD,gCAAgC;QAChC,6BAA6B;QAC7B,YAAY,OAAO,EAAE;QACrB,6CAA6C;QAC7C,2CAA2C;QAC3C,iDAAiD;QACjD,4BAA4B;QAC5B,kBAAkB,OAAO,EAAE;KAC5B,EACD,iBAAiB,CAClB,CAAC;IACF,IAAA,oBAAU,EAAC,IAAI,EAAE,CAAC,qCAAqC,CAAC,CAAC,CAAC;AAC5D,CAAC;AAlCD,kDAkCC;AAED,SAAgB,aAAa,CAAC,OAAyB,EAAE,UAAmB,IAAI;IAC9E,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACnC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,CAAC,EAAE;gBAC1C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC;aAC3C;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,EAAE;gBACrC,OAAO,EAAE,8BAA8B;gBACvC,OAAO,EAAE;oBACP,gBAAgB,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;iBACnD;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,IAAA,aAAO,EAAC,OAAO,EAAE,oCAAoC,CAAC,CAAC;SACxD;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAjBD,sCAiBC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../schematics/utils/versions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAwE;AAExE,iDAAyC;AACzC,+BAAgC;AAChC,uCAAuC;AACvC,2CAAgD;AAEhD;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,UAAkB,sBAAO;IACvE,IAAA,oBAAU,EACR,IAAI,EACJ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,OAAO,EAAE,CAAC,CACnH,CAAC;IACF,IAAA,oBAAU,EACR,IAAI,EACJ;QACE,+CAA+C;QAC/C,qDAAqD;QACrD,8DAA8D;QAC9D,kDAAkD;QAClD,uDAAuD;QACvD,wDAAwD;QACxD,iDAAiD;QACjD,8BAA8B;QAC9B,8CAA8C;QAC9C,4CAA4C;QAC5C,2CAA2C;QAC3C,kDAAkD;QAClD,8CAA8C;QAC9C,iDAAiD;QACjD,gCAAgC;QAChC,6BAA6B;QAC7B,YAAY,OAAO,EAAE;QACrB,6CAA6C;QAC7C,2CAA2C;QAC3C,iDAAiD;QACjD,kBAAkB,OAAO,EAAE;KAC5B,EACD,iBAAiB,CAClB,CAAC;IACF,IAAA,oBAAU,EAAC,IAAI,EAAE,CAAC,4BAA4B,EAAE,qCAAqC,CAAC,CAAC,CAAC;AAC1F,CAAC;AAjCD,kDAiCC;AAED,SAAgB,aAAa,CAAC,OAAyB,EAAE,UAAmB,IAAI;IAC9E,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACnC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,CAAC,EAAE;gBAC1C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC;aAC3C;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,EAAE;gBACrC,OAAO,EAAE,8BAA8B;gBACvC,OAAO,EAAE;oBACP,gBAAgB,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;iBACnD;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,IAAA,aAAO,EAAC,OAAO,EAAE,oCAAoC,CAAC,CAAC;SACxD;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAjBD,sCAiBC"}

package/utils/versions.ts

@@ -25,11 +25,11 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
       `@typescript-eslint/eslint-plugin@~5.35.1`,
       `@typescript-eslint/parser@~5.35.1`,
       `eslint@^8.23.0`,
-      `eslint-config-prettier@^2.7.1`,
+      `eslint-config-prettier@~8.5.0`,
       `eslint-plugin-import@~2.26.0`,
       `eslint-plugin-jsdoc@~39.3.6`,
       `eslint-plugin-prefer-arrow@~1.2.3`,
-      `eslint-plugin-prettier@^2.7.1`,
+      `eslint-plugin-prettier@~4.2.1`,
       `eslint-plugin-deprecation@~1.3.2`,
       `prettier@^2.7.1`,
       `husky@^7.0.4`,
@@ -37,12 +37,11 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
       `ng-alain-plugin-theme@^13.0.3`,
       `source-map-explorer@^2.5.2`,
       `@angular/language-service@^14.2.0`,
-      `rxjs@~7.5.0`,
       `@delon/testing@${version}`
     ],
     'devDependencies'
   );
-  addPackage(tree, [`ng-zorro-antd@^14.0.0`]);
+  addPackage(tree, [`rxjs@~7.5.0`, `ng-zorro-antd@^14.0.0`]);
 }
 
 export function addESLintRule(context: SchematicContext, showLog: Boolean = true): Rule {