cabloy 5.1.134 → 5.1.136

package/vona/src/suite/a-home/modules/home-user/src/config/locale/zh-cn.ts

@@ -11,7 +11,10 @@ export default {
   UserAvatar: '头像',
   UserEmail: '电子邮件',
   UserMobile: '手机号',
-  UserActivated: '已激活',
+  UserActivated: '身份已激活',
+  UserAccountStatus: '账户状态',
+  UserAccountStatusActive: '启用',
+  UserAccountStatusDisabled: '停用',
   UserLocale: '语言',
   UserTz: '时区',
   UsernameExists: '用户名已存在',

package/vona/src/suite/a-home/modules/home-user/src/config/roles.ts

@@ -1,22 +1,22 @@
-import type { ILocaleRecord } from 'vona';
+import type { LocalizedTextMap } from 'vona-module-a-user';
 
 export interface IRoleConfig {
   title: string;
-  locales?: Partial<Record<keyof ILocaleRecord, string>>;
+  titleLocales?: LocalizedTextMap;
   siteIds: string[];
 }
 
 export const builtinRoles: Record<string, IRoleConfig> = {
   registeredUser: {
     title: 'Registered User',
-    locales: {
+    titleLocales: {
       'zh-cn': '注册用户',
     },
     siteIds: ['web'],
   },
   systemAdmin: {
     title: 'System Administrator',
-    locales: {
+    titleLocales: {
       'zh-cn': '系统管理员',
     },
     siteIds: ['web', 'admin'],

package/vona/src/suite/a-home/modules/home-user/src/entity/role.ts

@@ -1,5 +1,5 @@
-import type { ILocaleRecord } from 'vona';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+import type { LocalizedTextMap } from 'vona-module-a-user';
 import type { IRole } from 'vona-module-a-user';
 
 import { Api, v } from 'vona-module-a-openapiutils';
@@ -19,7 +19,7 @@ export class EntityRole extends EntityBase implements IRole {
   title: string;
 
   @Api.field(v.title($locale('RoleLocales')), v.optional(), z.record(z.string(), z.string()))
-  locales?: Partial<Record<keyof ILocaleRecord, string>>;
+  titleLocales?: LocalizedTextMap;
 
   @Api.field(v.array(z.string()))
   siteIds: string[];

package/vona/src/suite/a-home/modules/home-user/src/entity/user.ts

@@ -1,6 +1,6 @@
 import type { ILocaleRecord } from 'vona';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import type { IUser } from 'vona-module-a-user';
+import type { IUser, TypeAccountStatus } from 'vona-module-a-user';
 
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
@@ -27,6 +27,13 @@ export class EntityUser extends EntityBase implements IUser {
   @Api.field(v.title($locale('UserActivated')), v.default(false))
   activated?: boolean;
 
+  @Api.field(
+    v.title($locale('UserAccountStatus')),
+    v.default('active'),
+    z.enum(['active', 'disabled']),
+  )
+  accountStatus: TypeAccountStatus;
+
   @Api.field(v.title($locale('UserLocale')), z.string().optional())
   locale?: keyof ILocaleRecord | undefined;
 

package/vona/src/suite/a-home/modules/home-user/src/service/userAdapter.ts

@@ -1,5 +1,5 @@
 import type { TableIdentity } from 'table-identity';
-import type { IAuthUserProfile, IUser, IUserAdapter } from 'vona-module-a-user';
+import type { IAuthUserProfile, IUser, IUserAdapter, TypeAccountStatus } from 'vona-module-a-user';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
@@ -7,7 +7,7 @@ import { Service } from 'vona-module-a-bean';
 @Service()
 export class ServiceUserAdapter extends BeanBase implements IUserAdapter {
   async create(user: Partial<IUser>): Promise<IUser> {
-    return await this.scope.model.user.insert(user);
+    return await this.scope.model.user.insert({ accountStatus: 'active', ...user });
   }
 
   async userOfProfile(profile: IAuthUserProfile): Promise<Partial<IUser>> {
@@ -43,4 +43,8 @@ export class ServiceUserAdapter extends BeanBase implements IUserAdapter {
   async setActivated(id: TableIdentity, activated: boolean): Promise<void> {
     await this.scope.model.user.update({ id, activated });
   }
+
+  async setAccountStatus(id: TableIdentity, accountStatus: TypeAccountStatus): Promise<void> {
+    await this.scope.model.user.update({ id, accountStatus });
+  }
 }

package/vona/src/suite/a-home/modules/home-user/test/passportTest.test.ts

@@ -15,6 +15,7 @@ describe('passportTest.test.ts', () => {
         });
         userId = user.id as string;
         assert.equal(user.activated, false);
+        assert.equal(user.accountStatus, 'active');
 
         const [_, error] = await catchError(() => {
           return app.bean.executor.performAction('post', activateCurrentPath, {

package/vona/src/suite/a-home/modules/home-user/test/role.test.ts

@@ -8,12 +8,12 @@ describe('role.test.ts', () => {
       const scope = app.scope('home-user');
       const roleRegisteredUser = await scope.model.role.getByName('registeredUser');
       assert.equal(roleRegisteredUser?.title, 'Registered User');
-      assert.deepEqual(roleRegisteredUser?.locales, { 'zh-cn': '注册用户' });
+      assert.deepEqual(roleRegisteredUser?.titleLocales, { 'zh-cn': '注册用户' });
       assert.ok(roleRegisteredUser?.siteIds.includes('web'));
 
       const roleSystemAdmin = await scope.model.role.getByName('systemAdmin');
       assert.equal(roleSystemAdmin?.title, 'System Administrator');
-      assert.deepEqual(roleSystemAdmin?.locales, { 'zh-cn': '系统管理员' });
+      assert.deepEqual(roleSystemAdmin?.titleLocales, { 'zh-cn': '系统管理员' });
       assert.ok(roleSystemAdmin?.siteIds.includes('web'));
       assert.ok(roleSystemAdmin?.siteIds.includes('admin'));
 
@@ -23,12 +23,12 @@ describe('role.test.ts', () => {
         (role: any) => role.name === 'registeredUser',
       );
       assert.equal(passportRegisteredUser?.title, 'Registered User');
-      assert.deepEqual(passportRegisteredUser?.locales, { 'zh-cn': '注册用户' });
+      assert.deepEqual(passportRegisteredUser?.titleLocales, { 'zh-cn': '注册用户' });
       assert.ok(passportRegisteredUser?.siteIds.includes('web'));
 
       const passportSystemAdmin = passport.roles.find((role: any) => role.name === 'systemAdmin');
       assert.equal(passportSystemAdmin?.title, 'System Administrator');
-      assert.deepEqual(passportSystemAdmin?.locales, { 'zh-cn': '系统管理员' });
+      assert.deepEqual(passportSystemAdmin?.titleLocales, { 'zh-cn': '系统管理员' });
       assert.ok(passportSystemAdmin?.siteIds.includes('web'));
       assert.ok(passportSystemAdmin?.siteIds.includes('admin'));
     });

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

@@ -0,0 +1,64 @@
+{
+  "name": "vona-module-a-markdown",
+  "version": "5.0.1",
+  "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 && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
+  "dependencies": {
+    "@tiptap/core": "^3.30.0",
+    "@tiptap/extension-highlight": "^3.30.0",
+    "@tiptap/extension-image": "^3.30.0",
+    "@tiptap/extension-list": "^3.30.0",
+    "@tiptap/extension-table": "^3.30.0",
+    "@tiptap/extension-youtube": "^3.30.0",
+    "@tiptap/markdown": "^3.30.0",
+    "@tiptap/starter-kit": "^3.30.0",
+    "@tiptap/static-renderer": "^3.30.0",
+    "sanitize-html": "^2.17.6"
+  },
+  "devDependencies": {
+    "@types/sanitize-html": "^2.16.1",
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.1.3"
+  },
+  "clean-package": {
+    "indent": 2,
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "a-markdown",
+  "vonaModule": {
+    "dependencies": {
+      "a-vona": "5.0.0"
+    }
+  }
+}

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/src/.metadata/index.ts

@@ -0,0 +1,54 @@
+// eslint-disable
+/** bean: begin */
+export * from '../bean/bean.markdown.ts';
+
+import 'vona';
+declare module 'vona' {
+
+
+}
+declare module 'vona-module-a-markdown' {
+
+        export interface BeanMarkdown {
+          /** @internal */
+          get scope(): ScopeModuleAMarkdown;
+        }
+}
+/** bean: end */
+/** bean: begin */
+import type { BeanMarkdown } from '../bean/bean.markdown.ts';
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGlobal {
+    'markdown': BeanMarkdown;
+  }
+}
+/** bean: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil } from 'vona';
+import { Scope } from 'vona-module-a-bean';
+
+@Scope()
+export class ScopeModuleAMarkdown extends BeanScopeBase {}
+
+export interface ScopeModuleAMarkdown {
+  util: BeanScopeUtil;
+}
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanScopeRecord {
+    'a-markdown': ScopeModuleAMarkdown;
+  }
+
+  export interface IBeanScopeContainer {
+    markdown: ScopeModuleAMarkdown;
+  }
+
+
+
+
+
+
+}
+/** scope: end */

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'a-markdown';
+export { ScopeModuleAMarkdown as ScopeModule } from './index.ts';

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/src/bean/bean.markdown.ts

@@ -0,0 +1,137 @@
+import type { AnyExtension } from '@tiptap/core';
+
+import { Highlight } from '@tiptap/extension-highlight';
+import { Image } from '@tiptap/extension-image';
+import { TaskItem, TaskList } from '@tiptap/extension-list';
+import { TableKit } from '@tiptap/extension-table';
+import Youtube from '@tiptap/extension-youtube';
+import { Markdown, MarkdownManager } from '@tiptap/markdown';
+import StarterKit from '@tiptap/starter-kit';
+import { renderToHTMLString } from '@tiptap/static-renderer';
+import sanitizeHtml from 'sanitize-html';
+import { BeanBase } from 'vona';
+import { Bean } from 'vona-module-a-bean';
+
+const extensions: AnyExtension[] = [
+  Markdown,
+  StarterKit,
+  TaskList,
+  TaskItem.configure({ nested: true }),
+  Image,
+  TableKit,
+  Highlight,
+  Youtube.configure({
+    addPasteHandler: false,
+    nocookie: true,
+  }),
+];
+
+const markdownManager = new MarkdownManager({
+  extensions,
+  markedOptions: { gfm: true },
+  indentation: { style: 'space', size: 2 },
+});
+
+const sanitizeOptions: sanitizeHtml.IOptions = {
+  allowedTags: [
+    'a',
+    'blockquote',
+    'br',
+    'code',
+    'del',
+    'div',
+    'em',
+    'iframe',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'hr',
+    'img',
+    'input',
+    'label',
+    'li',
+    'ol',
+    'p',
+    'pre',
+    's',
+    'span',
+    'strong',
+    'table',
+    'tbody',
+    'td',
+    'th',
+    'thead',
+    'tr',
+    'ul',
+  ],
+  allowedAttributes: {
+    a: ['href', 'rel', 'target', 'title'],
+    code: ['class'],
+    div: ['data-youtube-video'],
+    iframe: ['allowfullscreen', 'height', 'src', 'width'],
+    img: ['alt', 'height', 'src', 'title', 'width'],
+    input: ['checked', 'disabled', 'type'],
+    li: ['data-checked', 'data-type'],
+    span: ['class'],
+    ul: ['data-type'],
+  },
+  allowedClasses: {
+    code: ['language-*'],
+    span: ['hljs-*'],
+  },
+  allowedSchemes: ['http', 'https', 'mailto'],
+  allowedSchemesByTag: {
+    iframe: ['https'],
+    img: ['http', 'https'],
+  },
+  allowedIframeHostnames: ['www.youtube-nocookie.com'],
+  allowedSchemesAppliedToAttributes: ['href', 'src'],
+  allowProtocolRelative: false,
+  exclusiveFilter: frame => frame.tag === 'iframe' && !frame.attribs.src,
+  transformTags: {
+    a: sanitizeHtml.simpleTransform('a', { rel: 'noopener noreferrer' }),
+    input: (_tagName, attribs) => {
+      if (attribs.type !== 'checkbox') {
+        return { tagName: 'span', attribs: {} };
+      }
+      return {
+        tagName: 'input',
+        attribs: {
+          type: 'checkbox',
+          ...(attribs.checked !== undefined ? { checked: 'checked' } : {}),
+          disabled: 'disabled',
+        },
+      };
+    },
+    li: (_tagName, attribs) => {
+      const taskAttribs: sanitizeHtml.Attributes = {};
+      if (attribs['data-type'] === 'taskItem') {
+        taskAttribs['data-type'] = 'taskItem';
+        if (attribs['data-checked'] === 'true' || attribs['data-checked'] === 'false') {
+          taskAttribs['data-checked'] = attribs['data-checked'];
+        }
+      }
+      return { tagName: 'li', attribs: taskAttribs };
+    },
+    ul: (_tagName, attribs) => {
+      const taskAttribs: sanitizeHtml.Attributes = {};
+      if (attribs['data-type'] === 'taskList') {
+        taskAttribs['data-type'] = 'taskList';
+      }
+      return { tagName: 'ul', attribs: taskAttribs };
+    },
+  },
+};
+
+@Bean()
+export class BeanMarkdown extends BeanBase {
+  renderHtml(markdown?: string): string {
+    if (!markdown?.trim()) return '';
+    const json = markdownManager.parse(markdown);
+    const html = renderToHTMLString({ content: json, extensions });
+    return sanitizeHtml(html, sanitizeOptions);
+  }
+}

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/src/index.ts

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

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

@@ -0,0 +1,11 @@
+{
+  "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-cabloy/modules/a-markdown/tsconfig.json

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

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.28",
+  "version": "5.1.29",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/bean/bean.ssr.ts

@@ -1,3 +1,4 @@
+import type { IParamsAndQuery } from '@cabloy/utils';
 import type { IMenus } from 'vona-module-a-menu';
 import type { TypeEventResolvePathResult } from 'vona-module-a-static';
 
@@ -13,6 +14,22 @@ import type {
 
 @Bean()
 export class BeanSsr extends BeanBase {
+  getPagePath<
+    SITE extends keyof ISsrSiteRecord,
+    PAGEPATH extends keyof ISsrSiteRecord[SITE]['pages'],
+    PAGEOPTIONS extends Omit<ISsrSiteRecord[SITE]['pages'][PAGEPATH], 'data'>,
+  >(site: SITE, pagePath: PAGEPATH, pageOptions?: PAGEOPTIONS): string | undefined;
+  getPagePath(site: string, pagePath: string, pageOptions?: IParamsAndQuery): string | undefined;
+  getPagePath(site: string, pagePath: string, pageOptions?: IParamsAndQuery): string | undefined {
+    // site bean
+    const beanInstance = this.bean._getBean(
+      beanFullNameFromOnionName(site as any, 'ssrSite'),
+    ) as BeanSsrSiteBase;
+    if (!beanInstance) return;
+    // page path
+    return beanInstance.getPagePath(pagePath as any, pageOptions as any);
+  }
+
   async redirect<
     SITE extends keyof ISsrSiteRecord,
     PAGEPATH extends keyof ISsrSiteRecord[SITE]['pages'],

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/lib/beanSsrSiteBase.ts

@@ -66,10 +66,10 @@ export class BeanSsrSiteBase<
     return await this.render(undefined, undefined, { req, res });
   }
 
-  async redirect<
+  getPagePath<
     PAGEPATH extends keyof SsrSiteOptions['pages'],
     PAGEOPTIONS extends Omit<SsrSiteOptions['pages'][PAGEPATH], 'data'>,
-  >(pagePath?: PAGEPATH, pageOptions?: PAGEOPTIONS): Promise<undefined | never> {
+  >(pagePath?: PAGEPATH, pageOptions?: PAGEOPTIONS): string {
     // pagePath
     pagePath = this.$scope.ssr.service.ssr.prepareMenuLink(pagePath as any) as any;
     // pagePathFull
@@ -77,11 +77,19 @@ export class BeanSsrSiteBase<
     if (this.siteOptions.publicPath) {
       pagePathFull = `/${this.siteOptions.publicPath}${pagePathFull as string}`;
     }
+    return pagePathFull as string;
+  }
+
+  async redirect<
+    PAGEPATH extends keyof SsrSiteOptions['pages'],
+    PAGEOPTIONS extends Omit<SsrSiteOptions['pages'][PAGEPATH], 'data'>,
+  >(pagePath?: PAGEPATH, pageOptions?: PAGEOPTIONS): Promise<undefined | never> {
+    const pagePathFull = this.getPagePath(pagePath, pageOptions);
     if (this.siteOptions.apiType === 'dev') {
       const url = `${this.siteOptions.dev.host}${pagePathFull}`;
       this.ctx.redirect(url);
     } else {
-      this.ctx.redirect(pagePathFull as string);
+      this.ctx.redirect(pagePathFull);
     }
   }
 

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.43",
+  "version": "5.1.44",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -8,6 +8,7 @@
   "type": "module",
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
+    "vona-module-a-markdown": "^5.0.1",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

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

@@ -22,6 +22,9 @@
     },
     {
       "path": "modules/a-ssrhmr/tsconfig.build.json"
+    },
+    {
+      "path": "modules/a-markdown/tsconfig.build.json"
     }
   ],
   "exclude": ["modules"]

package/vona/src/suite-vendor/a-pay/modules/a-pay/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-pay",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/meta.version.ts

@@ -40,6 +40,7 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
       table.string(providerOperation.state, 32);
       table.string(providerOperation.idempotencyKey, 100);
       table.string(providerOperation.correlationId, 100);
+      table.json(providerOperation.startInputSnapshot);
       table.string(providerOperation.providerRequestId, 255);
       table.string(providerOperation.providerResourceId, 255);
       table.integer(providerOperation.attemptCount);

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/entity/providerOperation.tsx

@@ -5,7 +5,11 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { z } from 'zod';
 
-import type { TypeProviderOperationKind, TypeProviderOperationState } from '../types/payment.ts';
+import type {
+  IPayProviderOperationStartInputSnapshot,
+  TypeProviderOperationKind,
+  TypeProviderOperationState,
+} from '../types/payment.ts';
 
 export interface IEntityOptionsProviderOperation extends IDecoratorEntityOptions {}
 
@@ -31,6 +35,9 @@ export class EntityProviderOperation extends EntityBase {
   @Api.field(v.required(), v.min(1), v.max(100))
   correlationId: string;
 
+  @Api.field(v.optional())
+  startInputSnapshot?: IPayProviderOperationStartInputSnapshot;
+
   @Api.field(v.optional(), v.max(255))
   providerRequestId?: string;
 

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/lib/index.ts

@@ -1,2 +1,3 @@
 export * from './payProvider.ts';
 export * from './payScene.ts';
+export * from './providerOperationFailure.ts';

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/lib/providerOperationFailure.ts

@@ -0,0 +1,8 @@
+export class ProviderOperationFailure extends Error {
+  constructor(
+    readonly failureCode: string,
+    readonly summary: string,
+  ) {
+    super(summary);
+  }
+}