cabloy 5.1.141 → 5.1.143

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

@@ -5,6 +5,7 @@ import { acquireTestLock, app } from 'vona-mock';
 
 const activationConsumePath = '/home/user/account/activation/consume';
 const activationConsumerUrl = 'https://account.example.test/home/user/activation';
+const activationConsumerUrlAdmin = 'https://account.example.test/admin/home/user/activation';
 
 describe('accountActivation.test.ts', { concurrency: false, sequential: true }, () => {
   const releases: Array<() => void> = [];
@@ -73,6 +74,26 @@ describe('accountActivation.test.ts', { concurrency: false, sequential: true },
     }
   });
 
+  it('preserves an enabled SSR site public path in activation links', async () => {
+    let fixture: IFixture | undefined;
+    let restoreSites: (() => void) | undefined;
+    try {
+      fixture = await createFixture();
+      restoreSites = configureAdminSsrSite();
+      const issued = await issueActivationLink(fixture, activationConsumerUrlAdmin);
+      assert.equal(issued.path, '/admin/home/user/activation');
+      assert.deepEqual(await getActivationState(getDigest(issued.token)), {
+        purpose: 'account-activation',
+        userId: fixture.userId,
+        consumerPath: '/home/user/activation',
+        email: fixture.email,
+      });
+    } finally {
+      restoreSites?.();
+      if (fixture) await removeFixture(fixture);
+    }
+  });
+
   it('issues an activation link through registration and activates the registered user', async () => {
     let registration: IRegistration | undefined;
     try {
@@ -175,6 +196,17 @@ interface IRegistration extends IFixture {
   path: string;
 }
 
+function configureAdminSsrSite() {
+  const service = app.scope('a-ssr').service.ssr;
+  const getSitesEnabled = service.getSitesEnabled;
+  service.getSitesEnabled = (() => [
+    { beanOptions: { options: { publicPath: 'admin' } } },
+  ]) as typeof service.getSitesEnabled;
+  return () => {
+    service.getSitesEnabled = getSitesEnabled;
+  };
+}
+
 async function configureActivation() {
   return await app.bean.executor.mockCtx(async () => {
     const options =
@@ -288,7 +320,7 @@ async function removeFixture(fixture: IFixture) {
   });
 }
 
-async function issueActivationLink(fixture: IFixture) {
+async function issueActivationLink(fixture: IFixture, consumerUrl = activationConsumerUrl) {
   let text: unknown;
   const mail = app.bean.mail;
   const send = mail.send;
@@ -297,9 +329,7 @@ async function issueActivationLink(fixture: IFixture) {
   };
   try {
     await app.bean.executor.mockCtx(async () => {
-      await app
-        .scope('home-user')
-        .service.account.issueActivationLink(fixture.userId, activationConsumerUrl);
+      await app.scope('home-user').service.account.issueActivationLink(fixture.userId, consumerUrl);
     });
   } finally {
     mail.send = send;

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-markdown",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -58,6 +58,7 @@
   "title": "a-markdown",
   "vonaModule": {
     "dependencies": {
+      "a-image": "5.0.0",
       "a-vona": "5.0.0"
     }
   }

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

@@ -1,4 +1,30 @@
 // eslint-disable
+/** imageScene: begin */
+export * from '../bean/imageScene.markdown.ts';
+
+import { type IDecoratorImageSceneOptions } from 'vona-module-a-image';
+declare module 'vona-module-a-image' {
+
+    export interface IImageSceneRecord {
+      'a-markdown:markdown': IDecoratorImageSceneOptions;
+    }
+
+
+}
+declare module 'vona-module-a-markdown' {
+
+        export interface ImageSceneMarkdown {
+          /** @internal */
+          get scope(): ScopeModuleAMarkdown;
+        }
+
+          export interface ImageSceneMarkdown {
+            get $beanFullName(): 'a-markdown.imageScene.markdown';
+            get $onionName(): 'a-markdown:markdown';
+            get $onionOptions(): IDecoratorImageSceneOptions;
+          }
+}
+/** imageScene: end */
 /** bean: begin */
 export * from '../bean/bean.markdown.ts';
 

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

@@ -0,0 +1,13 @@
+import { BeanBase } from 'vona';
+import { ImageScene } from 'vona-module-a-image';
+
+@ImageScene({
+  public: true,
+  upload: {
+    maxSize: 5 * 1024 * 1024,
+    mimeTypes: ['image/jpeg', 'image/png', 'image/webp'],
+    extensions: ['.jpg', '.jpeg', '.png', '.webp'],
+    multiple: false,
+  },
+})
+export class ImageSceneMarkdown extends BeanBase {}

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

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

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

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

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/providerOperation.ts

@@ -302,6 +302,29 @@ export class ServiceProviderOperation extends BeanBase {
       operation.kind === 'refund' && operation.refundOperationId
         ? await this.scope.model.refundOperation.getByIdForUpdate(operation.refundOperationId)
         : undefined;
+    if (operation.kind === 'refund' && refund?.providerRefundId) {
+      const session = await this.scope.model.paymentSession.getById(operation.paymentSessionId);
+      if (!session) this.app.throw(404, 'payment session not found');
+      const { provider } = this.bean.payProvider.resolveByName(
+        session.providerName,
+        session.clientName,
+      );
+      if (!provider.queryRefund) {
+        if (operation.nextAttemptAt) {
+          await this.scope.model.providerOperation.updateById(operation.id, {
+            nextAttemptAt: undefined,
+          });
+        }
+        return undefined;
+      }
+    }
+    if (
+      operation.kind === 'refund' &&
+      refund &&
+      ['succeeded', 'failed', 'cancelled'].includes(refund.state)
+    ) {
+      return undefined;
+    }
     if (
       operation.kind === 'refund' &&
       operation.submittedAt &&

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/refundOperation.ts

@@ -203,6 +203,13 @@ export class ServiceRefundOperation extends BeanBase {
         amountMinor: refund.amountMinor,
         currency: refund.currency,
       });
+      const providerOperation = await this.scope.model.providerOperation.getForUpdate({
+        refundOperationId: refund.id,
+        kind: 'refund',
+      });
+      if (providerOperation) {
+        await this._completeProviderOperation(providerOperation, options.providerRefundId);
+      }
     }
     return {
       refund: {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-pay-mock",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "",
   "keywords": [
     "Vona Module"

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-pay-paypal",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "",
   "keywords": [
     "Vona Module"

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-pay-stripe",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "",
   "keywords": [
     "Vona Module"

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

@@ -1,15 +1,15 @@
 {
   "name": "vona-suite-a-pay",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "",
   "author": "",
   "files": [],
   "type": "module",
   "dependencies": {
-    "vona-module-a-pay": "^5.0.7",
-    "vona-module-pay-mock": "^5.0.7",
-    "vona-module-pay-paypal": "^5.0.7",
-    "vona-module-pay-stripe": "^5.0.7"
+    "vona-module-a-pay": "^5.0.8",
+    "vona-module-pay-mock": "^5.0.8",
+    "vona-module-pay-paypal": "^5.0.8",
+    "vona-module-pay-stripe": "^5.0.8"
   },
   "title": "a-pay"
 }

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.86",
+  "version": "1.1.87",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.86"
+    "zova-core": "^5.1.87"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.151",
+  "version": "5.1.152",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.86",
-    "zova-suite-a-zova": "^5.1.150"
+    "zova-core": "^5.1.87",
+    "zova-suite-a-zova": "^5.1.151"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.86",
+  "version": "5.1.87",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/bean/resource/locale/type.ts

@@ -1,4 +1,5 @@
 export const LocaleModuleNameSeparator = '::';
+export const LocalePattern = '[a-z]{2}-[a-z]{2}|[a-z]{2}';
 
 export interface IModuleLocale {
   (...args: any[]): string;

package/zova/pnpm-lock.yaml

@@ -136,7 +136,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.86
+        specifier: ^1.1.87
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -726,7 +726,7 @@ importers:
         specifier: ^3.5.38
         version: 3.5.38(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.86
+        specifier: ^5.1.87
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -867,10 +867,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.86
+        specifier: ^5.1.87
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.149
+        specifier: ^5.1.151
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -977,7 +977,7 @@ importers:
         specifier: ^5.0.1
         version: link:modules/a-rbac
       zova-module-rest-resource:
-        specifier: ^5.1.45
+        specifier: ^5.1.46
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/a-rbac:
@@ -1001,10 +1001,10 @@ importers:
   src/suite-vendor/a-pay:
     dependencies:
       zova-module-a-pay:
-        specifier: ^5.0.5
+        specifier: ^5.0.7
         version: link:modules/a-pay
       zova-module-pay-mock:
-        specifier: ^5.0.3
+        specifier: ^5.0.5
         version: link:modules/pay-mock
       zova-module-pay-paypal:
         specifier: ^5.0.2
@@ -1076,7 +1076,7 @@ importers:
         specifier: ^5.1.25
         version: link:modules/a-fetch
       zova-module-a-form:
-        specifier: ^5.1.47
+        specifier: ^5.1.48
         version: link:modules/a-form
       zova-module-a-icon:
         specifier: ^5.1.27
@@ -1112,7 +1112,7 @@ importers:
         specifier: ^5.1.23
         version: link:modules/a-ssrhmr
       zova-module-a-ssrserver:
-        specifier: ^5.1.25
+        specifier: ^5.1.26
         version: link:modules/a-ssrserver
       zova-module-a-style:
         specifier: ^5.1.35
@@ -1124,7 +1124,7 @@ importers:
         specifier: ^5.1.37
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.101
+        specifier: ^5.1.102
         version: link:modules/a-zova
 
   src/suite-vendor/a-zova/modules/a-api:
@@ -1466,7 +1466,7 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.86
+        specifier: ^1.1.87
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':
@@ -1999,6 +1999,9 @@ importers:
       '@tiptap/core':
         specifier: ^3.30.0
         version: 3.30.0(@tiptap/pm@3.30.0)
+      '@tiptap/extension-code-block-lowlight':
+        specifier: 3.30.0
+        version: 3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/extension-code-block@3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0)(highlight.js@11.11.2)(lowlight@3.3.0)
       '@tiptap/extension-highlight':
         specifier: ^3.30.0
         version: 3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))
@@ -2020,6 +2023,9 @@ importers:
       '@tiptap/vue-3':
         specifier: ^3.30.0
         version: 3.30.0(@floating-ui/dom@1.8.0)(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0)(vue@3.5.38(typescript@5.9.3))
+      lowlight:
+        specifier: ^3.3.0
+        version: 3.3.0
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -4368,6 +4374,15 @@ packages:
     peerDependencies:
       '@tiptap/extension-list': 3.30.0
 
+  '@tiptap/extension-code-block-lowlight@3.30.0':
+    resolution: {integrity: sha512-SDWMmqBe38o1ORmpx2rEzuxjbmUr50/XqMtwzaE/k6jHQ8tovIcTpAEbXEBj0hSDFdeZaFZnuOGVX85Y6SHQyQ==}
+    peerDependencies:
+      '@tiptap/core': 3.30.0
+      '@tiptap/extension-code-block': 3.30.0
+      '@tiptap/pm': 3.30.0
+      highlight.js: ^11
+      lowlight: ^2 || ^3
+
   '@tiptap/extension-code-block@3.30.0':
     resolution: {integrity: sha512-m0KcCiUijaHNqTQCw9ydKRAzOrWxL0MogQu2WnTrbSrtCBwSiRvbG3ocqv5L3OfkoqnezeZCSg9JRwN+QBLP4Q==}
     peerDependencies:
@@ -4568,6 +4583,9 @@ packages:
   '@types/har-format@1.2.16':
     resolution: {integrity: sha512-fluxdy7ryD3MV6h8pTfTYpy/xQzCFC7m89nOH9y94cNqJ1mDIDPut7MnRHI3F6qRmh/cT2fUjG1MLdCNb4hE9A==}
 
+  '@types/hast@3.0.5':
+    resolution: {integrity: sha512-rp/ezSWaD1m44dPKICGhiskI13nVr7qTloFwDa/IYkhhf5nzwP+zIQcIJh3WIFSBOy/H1PzB40jPjMDksN4F+g==}
+
   '@types/http-errors@2.0.5':
     resolution: {integrity: sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==}
 
@@ -6106,6 +6124,10 @@ packages:
   header-case@2.0.4:
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
 
+  highlight.js@11.11.2:
+    resolution: {integrity: sha512-oaXMACAU0kzOMXBjWpNcX+vlwSBCIAiZ9BHa7gA15NOTtT2L/l8OSZDuqS2XppOhZBPJ7hm4o8ep2kyuip2uEQ==}
+    engines: {node: '>=12.0.0'}
+
   hono@4.12.27:
     resolution: {integrity: sha512-1yrb/+w6HWQJrUCLkJ2IF5jNIPvvFkblV5RNOYl6bV+OA6p9GLcMpHFFGTosSvHvcAUibuUukRqhlYI4z32C7Q==}
     engines: {node: '>=16.9.0'}
@@ -6639,6 +6661,9 @@ packages:
   lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
 
+  lowlight@3.3.0:
+    resolution: {integrity: sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==}
+
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
@@ -10473,6 +10498,14 @@ snapshots:
     dependencies:
       '@tiptap/extension-list': 3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0)
 
+  '@tiptap/extension-code-block-lowlight@3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/extension-code-block@3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0)(highlight.js@11.11.2)(lowlight@3.3.0)':
+    dependencies:
+      '@tiptap/core': 3.30.0(@tiptap/pm@3.30.0)
+      '@tiptap/extension-code-block': 3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0)
+      '@tiptap/pm': 3.30.0
+      highlight.js: 11.11.2
+      lowlight: 3.3.0
+
   '@tiptap/extension-code-block@3.30.0(@tiptap/core@3.30.0(@tiptap/pm@3.30.0))(@tiptap/pm@3.30.0)':
     dependencies:
       '@tiptap/core': 3.30.0(@tiptap/pm@3.30.0)
@@ -10715,6 +10748,10 @@ snapshots:
 
   '@types/har-format@1.2.16': {}
 
+  '@types/hast@3.0.5':
+    dependencies:
+      '@types/unist': 3.0.3
+
   '@types/http-errors@2.0.5': {}
 
   '@types/js-cookie@3.0.6': {}
@@ -12529,6 +12566,8 @@ snapshots:
       capital-case: 1.0.4
       tslib: 2.8.1
 
+  highlight.js@11.11.2: {}
+
   hono@4.12.27: {}
 
   hookable@6.1.1: {}
@@ -12975,6 +13014,12 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  lowlight@3.3.0:
+    dependencies:
+      '@types/hast': 3.0.5
+      devlop: 1.1.0
+      highlight.js: 11.11.2
+
   lru-cache@10.4.3: {}
 
   lru-cache@11.5.1: {}

package/zova/src/front/config/config/config.cabloyBasicWeb.ts

@@ -1,5 +1,7 @@
 import type { ZovaConfigOptional, ZovaSys } from 'zova';
 
+import { LocalePattern } from 'zova';
+
 export default function (_sys: ZovaSys) {
   const config: ZovaConfigOptional = {};
 
@@ -9,7 +11,7 @@ export default function (_sys: ZovaSys) {
       '/home/indexadmin/dashboard': undefined,
     },
     name: {
-      'home-indexweb:home': { alias: '/:locale(zh-cn)?' },
+      'home-indexweb:home': { alias: `/:locale(${LocalePattern})?` },
     },
   };
 

package/zova/src/front/config/config/config.cabloyCommerce.ts

@@ -1,5 +1,7 @@
 import type { ZovaConfigOptional, ZovaSys } from 'zova';
 
+import { LocalePattern } from 'zova';
+
 export default function (_sys: ZovaSys) {
   const config: ZovaConfigOptional = {};
 
@@ -8,8 +10,8 @@ export default function (_sys: ZovaSys) {
       '/home/indexadmin/dashboard': undefined,
     },
     name: {
-      'commerce-catalog:catalogue': { alias: '/:locale(zh-cn)?' },
-      'commerce-catalog:product': { alias: '/:locale(zh-cn)?/product/:id' },
+      'commerce-catalog:catalogue': { alias: `/:locale(${LocalePattern})?` },
+      'commerce-catalog:product': { alias: `/:locale(${LocalePattern})?/product/:id` },
       'home-indexweb:home': undefined,
     },
   };