cabloy 5.1.20 → 5.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.20",
+  "version": "5.1.21",
   "description": "A Node.js fullstack framework",
   "keywords": [
     "cabloy",

package/scripts/upgrade.ts

@@ -37,9 +37,13 @@ const WHITELIST_DIRS: string[] = [
   'zova/scripts',
 ];
 
+const BLACKLIST_DIRS: string[] = [
+  // vona
+  'vona/src/suite-vendor/a-test',
+];
+
 const WHITELIST_FILES: string[] = [
   // root
-  'package.json',
   'tsconfig.json',
   'tsconfig.base.json',
   'tsconfig.base.esm.json',
@@ -56,9 +60,6 @@ const WHITELIST_FILES: string[] = [
   'vona/tsconfig.base.esm.json',
   'vona/oxfmt.config.ts',
   'vona/oxlint.config.ts',
-  'vona/nginx.conf',
-  'vona/docker-compose.original.yml',
-  'vona/docker-compose-dockerfile-app',
   'vona/codecov.yml',
   // zova
   'zova/package.original.json',
@@ -168,6 +169,14 @@ function selectiveOverwrite(dryRun?: boolean): void {
     cpSync(src, dest, { recursive: true, filter: src => !src.includes('.DS_Store') });
   }
 
+  // Delete directories
+  for (const dir of BLACKLIST_DIRS) {
+    const dest = resolve(ROOT_DIR, dir);
+    if (existsSync(dest)) {
+      rmSync(dest, { recursive: true, force: true });
+    }
+  }
+
   // Overwrite files
   for (const file of WHITELIST_FILES) {
     const src = resolve(TEMP_DIR, file);

package/vona/pnpm-lock.yaml

@@ -319,22 +319,22 @@ importers:
         version: link:src/suite/a-home/modules/home-user
       vona-module-test-auth:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-auth/modules/test-auth
+        version: link:src/suite-vendor/a-test/modules/test-auth
       vona-module-test-cabloy:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-cabloy/modules/test-cabloy
+        version: link:src/suite-vendor/a-test/modules/test-cabloy
       vona-module-test-captcha:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-captcha/modules/test-captcha
+        version: link:src/suite-vendor/a-test/modules/test-captcha
       vona-module-test-rest:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-cabloy/modules/test-rest
+        version: link:src/suite-vendor/a-test/modules/test-rest
       vona-module-test-ssr:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-cabloy/modules/test-ssr
+        version: link:src/suite-vendor/a-test/modules/test-ssr
       vona-module-test-vona:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-vona/modules/test-vona
+        version: link:src/suite-vendor/a-test/modules/test-vona
       vona-shared:
         specifier: workspace:^
         version: link:packages-vona/vona-shared
@@ -1196,15 +1196,6 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-auth/modules/test-auth:
-    devDependencies:
-      clean-package:
-        specifier: ^2.2.0
-        version: 2.2.0
-      rimraf:
-        specifier: ^6.1.3
-        version: 6.1.3
-
   src/suite-vendor/a-cabloy:
     dependencies:
       vona-module-a-cabloy:
@@ -1303,7 +1294,16 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-cabloy/modules/test-cabloy:
+  src/suite-vendor/a-captcha:
+    dependencies:
+      vona-module-a-captcha:
+        specifier: workspace:^
+        version: link:modules/a-captcha
+      vona-module-captcha-simple:
+        specifier: workspace:^
+        version: link:modules/captcha-simple
+
+  src/suite-vendor/a-captcha/modules/a-captcha:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1312,11 +1312,17 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-cabloy/modules/test-rest:
+  src/suite-vendor/a-captcha/modules/captcha-simple:
     dependencies:
-      '@faker-js/faker':
-        specifier: ^10.4.0
-        version: 10.4.0
+      '@zhennann/svg-captcha':
+        specifier: ^1.5.2
+        version: 1.5.2
+      opentype.js:
+        specifier: ^2.0.0
+        version: 2.0.0
+      svg64:
+        specifier: ^2.0.0
+        version: 2.0.0
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1325,7 +1331,17 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-cabloy/modules/test-ssr:
+  src/suite-vendor/a-paypal:
+    dependencies:
+      vona-module-a-paypal:
+        specifier: workspace:^
+        version: link:modules/a-paypal
+
+  src/suite-vendor/a-paypal/modules/a-paypal:
+    dependencies:
+      '@cabloy/paypal-server-sdk':
+        specifier: ^2.2.0
+        version: 2.2.0
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1334,16 +1350,9 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-captcha:
-    dependencies:
-      vona-module-a-captcha:
-        specifier: workspace:^
-        version: link:modules/a-captcha
-      vona-module-captcha-simple:
-        specifier: workspace:^
-        version: link:modules/captcha-simple
+  src/suite-vendor/a-test: {}
 
-  src/suite-vendor/a-captcha/modules/a-captcha:
+  src/suite-vendor/a-test/modules/test-auth:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1352,17 +1361,7 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-captcha/modules/captcha-simple:
-    dependencies:
-      '@zhennann/svg-captcha':
-        specifier: ^1.5.2
-        version: 1.5.2
-      opentype.js:
-        specifier: ^2.0.0
-        version: 2.0.0
-      svg64:
-        specifier: ^2.0.0
-        version: 2.0.0
+  src/suite-vendor/a-test/modules/test-cabloy:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1371,7 +1370,7 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-captcha/modules/test-captcha:
+  src/suite-vendor/a-test/modules/test-captcha:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1380,17 +1379,29 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-paypal:
+  src/suite-vendor/a-test/modules/test-rest:
     dependencies:
-      vona-module-a-paypal:
-        specifier: workspace:^
-        version: link:modules/a-paypal
+      '@faker-js/faker':
+        specifier: ^10.4.0
+        version: 10.4.0
+    devDependencies:
+      clean-package:
+        specifier: ^2.2.0
+        version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
 
-  src/suite-vendor/a-paypal/modules/a-paypal:
-    dependencies:
-      '@cabloy/paypal-server-sdk':
+  src/suite-vendor/a-test/modules/test-ssr:
+    devDependencies:
+      clean-package:
         specifier: ^2.2.0
         version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
+
+  src/suite-vendor/a-test/modules/test-vona:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -2323,15 +2334,6 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-vona/modules/test-vona:
-    devDependencies:
-      clean-package:
-        specifier: ^2.2.0
-        version: 2.2.0
-      rimraf:
-        specifier: ^6.1.3
-        version: 6.1.3
-
   src/suite/a-home:
     dependencies:
       vona-module-home-base:

package/vona/src/suite-vendor/a-auth/tsconfig.json

@@ -8,9 +8,6 @@
     {
       "path": "modules/auth-simple/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-auth/tsconfig.build.json"
-    },
     {
       "path": "modules/auth-oauth/tsconfig.build.json"
     }

package/vona/src/suite-vendor/a-cabloy/tsconfig.json

@@ -20,15 +20,6 @@
     {
       "path": "modules/a-datasharding/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-cabloy/tsconfig.build.json"
-    },
-    {
-      "path": "modules/test-ssr/tsconfig.build.json"
-    },
-    {
-      "path": "modules/test-rest/tsconfig.build.json"
-    },
     {
       "path": "modules/a-ssrhmr/tsconfig.build.json"
     }

package/vona/src/suite-vendor/a-captcha/tsconfig.json

@@ -5,9 +5,6 @@
     {
       "path": "modules/a-captcha/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-captcha/tsconfig.build.json"
-    },
     {
       "path": "modules/captcha-simple/tsconfig.build.json"
     }

package/vona/src/suite-vendor/a-vona/tsconfig.json

@@ -128,9 +128,6 @@
     {
       "path": "modules/a-openapiutils/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-vona/tsconfig.build.json"
-    },
     {
       "path": "modules/a-mail/tsconfig.build.json"
     },

package/vona/src/suite-vendor/a-auth/modules/test-auth/package.json

@@ -1,52 +0,0 @@
-{
-  "name": "vona-module-test-auth",
-  "version": "5.1.7",
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
-  "description": "",
-  "keywords": [
-    "Vona Module"
-  ],
-  "author": "",
-  "files": [
-    "assets",
-    "dist",
-    "src"
-  ],
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": [
-        "./src/index.ts",
-        "./dist/index.d.ts"
-      ],
-      "import": "./src/index.ts",
-      "default": "./dist/index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "scripts": {
-    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
-    "prepublishOnly": "npm run tsc:publish",
-    "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
-  },
-  "devDependencies": {
-    "clean-package": "^2.2.0",
-    "rimraf": "^6.1.3"
-  },
-  "clean-package": {
-    "indent": 2,
-    "remove": [
-      "clean-package",
-      "devDependencies",
-      "exports.\\..import"
-    ]
-  },
-  "title": "test-auth",
-  "vonaModule": {
-    "dependencies": {
-      "a-vona": "5.0.0"
-    }
-  }
-}

package/vona/src/suite-vendor/a-auth/modules/test-auth/src/.metadata/index.ts

@@ -1,74 +0,0 @@
-// eslint-disable
-import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
-/** controller: begin */
-export * from '../controller/passport.ts';
-import type { IControllerOptionsPassport } from '../controller/passport.ts';
-import 'vona-module-a-web';
-declare module 'vona-module-a-web' {
-  
-    export interface IControllerRecord {
-      'test-auth:passport': IControllerOptionsPassport;
-    }
-
-  
-}
-declare module 'vona-module-test-auth' {
-  
-        export interface ControllerPassport {
-          /** @internal */
-          get scope(): ScopeModuleTestAuth;
-        }
-
-          export interface ControllerPassport {
-            get $beanFullName(): 'test-auth.controller.passport';
-            get $onionName(): 'test-auth:passport';
-            get $onionOptions(): IControllerOptionsPassport;
-          } 
-}
-/** controller: end */
-/** controller: begin */
-// @ts-ignore ignore
-import type { ControllerPassport } from '../controller/passport.ts';
-declare module 'vona-module-test-auth' {
-  
-    export interface IControllerOptionsPassport {
-      actions?: TypeControllerOptionsActions<ControllerPassport>;
-    }
-}
-declare module 'vona-module-a-web' {
-  export interface IApiPathGetRecord{
-        '/test/auth/passport/isAuthenticated': undefined;
-'/test/auth/passport/current': undefined;
-    }
-
-}
-
-/** controller: end */
-/** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil } from 'vona';
-import { Scope } from 'vona-module-a-bean';
-
-@Scope()
-export class ScopeModuleTestAuth extends BeanScopeBase {}
-
-export interface ScopeModuleTestAuth {
-  util: BeanScopeUtil;
-}
-
-import 'vona';
-declare module 'vona' {
-  export interface IBeanScopeRecord {
-    'test-auth': ScopeModuleTestAuth;
-  }
-
-  export interface IBeanScopeContainer {
-    testAuth: ScopeModuleTestAuth;
-  }
-  
-  
-
-  
-
-  
-}
-/** scope: end */

package/vona/src/suite-vendor/a-auth/modules/test-auth/src/.metadata/this.ts

@@ -1,2 +0,0 @@
-export const __ThisModule__ = 'test-auth';
-export { ScopeModuleTestAuth as ScopeModule } from './index.ts';

package/vona/src/suite-vendor/a-auth/modules/test-auth/src/controller/passport.ts

@@ -1,19 +0,0 @@
-import type { IDecoratorControllerOptions } from 'vona-module-a-web';
-
-import { BeanBase } from 'vona';
-import { Controller, Web } from 'vona-module-a-web';
-
-export interface IControllerOptionsPassport extends IDecoratorControllerOptions {}
-
-@Controller<IControllerOptionsPassport>('passport')
-export class ControllerPassport extends BeanBase {
-  @Web.get('isAuthenticated')
-  isAuthenticated(): boolean {
-    return this.bean.passport.isAuthenticated;
-  }
-
-  @Web.get('current')
-  current() {
-    return this.bean.passport.current;
-  }
-}

package/vona/src/suite-vendor/a-auth/modules/test-auth/src/index.ts

@@ -1 +0,0 @@
-export * from './.metadata/index.ts';

package/vona/src/suite-vendor/a-auth/modules/test-auth/test/authOauth.test.ts

@@ -1,55 +0,0 @@
-import type { IPassport } from 'vona-module-a-user';
-
-import { catchError } from '@cabloy/utils';
-import assert from 'node:assert';
-import { describe, it } from 'node:test';
-import { app } from 'vona-mock';
-
-describe('authOauth.test.ts', () => {
-  it('action:authOauth', async () => {
-    await app.bean.executor.mockCtx(
-      async () => {
-        // login
-        const jwt = await app.bean.auth.authenticate('auth-oauth:oauth', {
-          // state: { redirect: 'xxxxx' },
-          clientName: 'github',
-          clientOptions: {
-            mockUsername: 'mock-user',
-          },
-        });
-        assert.equal(!!jwt?.accessToken, true);
-        // isAuthenticated: isolate
-        const [isAuthenticated2, _err] = await catchError(async () => {
-          return await app.bean.executor.newCtxIsolate(async () => {
-            return await app.bean.executor.performAction(
-              'get',
-              '/test/auth/passport/isAuthenticated',
-            );
-          });
-        });
-        assert.equal(isAuthenticated2, undefined);
-        // isAuthenticated: isolate + header
-        const isAuthenticated = await app.bean.executor.newCtxIsolate(async () => {
-          return await app.bean.executor.performAction(
-            'get',
-            '/test/auth/passport/isAuthenticated',
-            { authToken: jwt?.accessToken },
-          );
-        });
-        assert.equal(isAuthenticated, true);
-        // current
-        const current: IPassport = await app.bean.executor.newCtxIsolate(async () => {
-          return await app.bean.executor.performAction('get', '/test/auth/passport/current', {
-            authToken: jwt?.accessToken,
-          });
-        });
-        assert.equal(current.user?.locale, 'zh-cn');
-        assert.equal(current.user?.tz, 'America/New_York');
-      },
-      {
-        locale: 'zh-cn',
-        tz: 'America/New_York',
-      },
-    );
-  });
-});

package/vona/src/suite-vendor/a-auth/modules/test-auth/test/authSimple.test.ts

@@ -1,52 +0,0 @@
-import { catchError } from '@cabloy/utils';
-import assert from 'node:assert';
-import { describe, it } from 'node:test';
-import { app } from 'vona-mock';
-
-describe('authSimple.test.ts', () => {
-  it('action:passwordHash', async () => {
-    const scope = app.scope('auth-simple');
-    const password = '12344##1xxaasDFQ,.$';
-    const hash = await scope.service.authSimple.calcPasswordHash(password);
-    let verified = await scope.service.authSimple.verifyPasswordHash(password, hash);
-    assert.equal(verified, true);
-    verified = await scope.service.authSimple.verifyPasswordHash(`${password}failed`, hash);
-    assert.equal(verified, false);
-  });
-
-  it('action:authSimple', async () => {
-    await app.bean.executor.mockCtx(async () => {
-      const password = app.scope('home-user').config.passwordDefault.admin;
-      // login
-      const jwt = await app.bean.auth.authenticate('auth-simple:simple', {
-        clientName: 'default',
-        clientOptions: { username: 'admin', password },
-      });
-      assert.equal(!!jwt?.accessToken, true);
-      // isAuthenticated: isolate
-      const [isAuthenticated2, _err] = await catchError(async () => {
-        return await app.bean.executor.newCtxIsolate(async () => {
-          return await app.bean.executor.performAction(
-            'get',
-            '/test/auth/passport/isAuthenticated',
-          );
-        });
-      });
-      assert.equal(isAuthenticated2, undefined);
-      // isAuthenticated: isolate + header
-      const isAuthenticated = await app.bean.executor.newCtxIsolate(async () => {
-        return await app.bean.executor.performAction('get', '/test/auth/passport/isAuthenticated', {
-          authToken: jwt?.accessToken,
-        });
-      });
-      assert.equal(isAuthenticated, true);
-      // login again
-      const jwt2 = await app.bean.auth.authenticate('auth-simple:simple', {
-        clientOptions: { username: 'admin', password },
-        state: { intention: 'login' },
-        clientName: 'default',
-      });
-      assert.equal(!!jwt2?.accessToken, true);
-    });
-  });
-});

package/vona/src/suite-vendor/a-auth/modules/test-auth/tsconfig.build.json

@@ -1,11 +0,0 @@
-{
-  "extends": "../../tsconfig.base",
-  "compilerOptions": {
-    "rootDir": "src",
-    "declaration": true,
-    "declarationMap": true,
-    "emitDeclarationOnly": true,
-    "outDir": "dist"
-  },
-  "include": ["src", "src/.metadata/*.ts", "src/**/*.json"]
-}

package/vona/src/suite-vendor/a-auth/modules/test-auth/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.base",
-  "compilerOptions": {
-    "noEmit": true
-  },
-  "include": ["src", "src/.metadata/*.ts", "src/**/*.json", "test"]
-}

package/vona/src/suite-vendor/a-cabloy/modules/test-cabloy/package.json

@@ -1,60 +0,0 @@
-{
-  "name": "vona-module-test-cabloy",
-  "version": "5.1.5",
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
-  "description": "",
-  "keywords": [
-    "Vona Module"
-  ],
-  "author": "",
-  "files": [
-    "assets",
-    "dist",
-    "src"
-  ],
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": [
-        "./src/index.ts",
-        "./dist/index.d.ts"
-      ],
-      "import": "./src/index.ts",
-      "default": "./dist/index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "scripts": {
-    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
-    "prepublishOnly": "npm run tsc:publish",
-    "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
-  },
-  "devDependencies": {
-    "clean-package": "^2.2.0",
-    "rimraf": "^6.1.3"
-  },
-  "clean-package": {
-    "indent": 2,
-    "remove": [
-      "clean-package",
-      "exports.\\..import"
-    ]
-  },
-  "title": "test-cabloy",
-  "vonaModule": {
-    "dependencies": {
-      "a-vona": "5.0.0",
-      "a-cabloy": "5.0.0"
-    },
-    "capabilities": {
-      "meta": {
-        "mode": [
-          "dev",
-          "test"
-        ]
-      }
-    }
-  }
-}