cabloy 5.1.127 → 5.1.129

package/.cabloy-version

@@ -1 +1 @@
-5.1.127
+5.1.129

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 5.1.129
+
+### Improvements
+
+- Refresh the Zova lockfile after compensation rerun preparation.
+- Update the Vona Zova Core patch to v5.1.82.
+
+## 5.1.128
+
+### Features
+
+- Add payment session support.
+- Combine resource name components.
+- Add a PayPal Commerce runbook.
+- Implement the product semantic presentation contract.
+- Complete the PayPal Commerce payment flow.
+
+### Bug Fixes
+
+- Preserve changes when resolving main branch conflicts.
+- Enforce payment provider availability.
+- Harden PayPal Commerce reconciliation.
+
 ## 5.1.127
 
 ### Features

package/cabloy-docs/backend/i18n-guide.md

@@ -127,17 +127,96 @@ declare module 'vona' {
 
 In the VSCode workflow, the `recordlocale` snippet can generate the augmentation skeleton.
 
-## Plural support
+## Formatting locale text
 
-Locale resources can express plural-aware strings through naming conventions such as:
+Locale values use printf-style placeholders. Pass formatting values after the locale key:
 
-- `TestApples_`
-- `TestApples_0`
-- `TestApples_1`
+```typescript
+// en-us.ts
+export default {
+  Apples_: '%d apples',
+  Greeting: '%s has %d apples',
+};
+```
+
+```typescript
+this.scope.locale.Apples_.locale('en-us', 2);
+// 2 apples
+
+this.scope.locale.Greeting.locale('en-us', 'Mike', 2);
+// Mike has 2 apples
+```
+
+Common placeholders include:
+
+- `%s`: string
+- `%d`: number
+- `%i`: integer
+- `%f`: floating-point number
+- `%j`: JSON
+- `%%`: literal percent sign
+
+## Plural and value-specific support
+
+Locale resources can express special messages for exact numeric values through key suffixes:
+
+```typescript
+export default {
+  Apples_: '%d apples',
+  Apples_0: 'no apples',
+  Apples_1: 'one apple',
+};
+```
+
+The suffix selects a special message based on the first formatting argument:
+
+```typescript
+this.scope.locale.Apples_.locale('en-us', 0);
+// no apples
+
+this.scope.locale.Apples_.locale('en-us', 1);
+// one apple
 
-Multiple-parameter variants are also supported through ordinal-aware suffix conventions.
+this.scope.locale.Apples_.locale('en-us', 2);
+// 2 apples
+```
+
+The base key is used when no value-specific key matches. Therefore, it is not necessary to define a special key for every possible number.
+
+For a numeric value that is not the first formatting argument, use this naming convention:
+
+```text
+<baseKey>_<matchedValue>_<argumentIndex>
+```
+
+The argument index is zero-based. For example:
+
+```typescript
+export default {
+  NameApples_: '%s has %d apples',
+  NameApples_0_1: '%s has no apples',
+  NameApples_1_1: '%s has one apple',
+};
+```
+
+Here:
+
+- `NameApples_0_1` matches `args[1] === 0`, the second formatting argument;
+- `NameApples_1_1` matches `args[1] === 1`, the second formatting argument;
+- `NameApples_` is used for other values.
+
+```typescript
+this.scope.locale.NameApples_.locale('en-us', 'Mike', 0);
+// Mike has no apples
+
+this.scope.locale.NameApples_.locale('en-us', 'Mike', 1);
+// Mike has one apple
+
+this.scope.locale.NameApples_.locale('en-us', 'Mike', 2);
+// Mike has 2 apples
+```
 
-This makes plural handling part of the localization model instead of forcing each project to invent its own formatting layer.
+This is exact numeric-value selection, not automatic `Intl.PluralRules` or CLDR plural-category resolution. It makes common plural handling part of the localization model while allowing each locale to define its own wording.
 
 ## Timezone support
 

package/e2e/specs/a-commerce/commerce.spec.ts

@@ -415,7 +415,7 @@ test(
       const startResponse = waitForApiResponse(
         page,
         'POST',
-        new RegExp(`/api/payment-session/${checkout.paymentSessionId}/start$`),
+        new RegExp(`/api/pay/payment-session/${checkout.paymentSessionId}/start$`),
       );
       await page.getByRole('button', { name: 'Start payment', exact: true }).click();
       expect((await startResponse).ok()).toBeTruthy();
@@ -535,9 +535,7 @@ test(
       await orderCard.getByRole('button', { name: 'View', exact: true }).click();
       await expect(page).toHaveURL(new RegExp(`/commerce/order/${checkout.orderId}(?:/|$)`));
       await historyDetailResponse;
-      await expect(
-        page.getByRole('heading', { name: `Order #${checkout.orderId}`, level: 1 }),
-      ).toBeVisible();
+      await expect(page.getByRole('heading', { name: `Order #${checkout.orderId}` })).toBeVisible();
       await expect(page.getByText('1 × $45.99 = $45.99')).toBeVisible();
       await expect(page.getByRole('alert')).toHaveCount(0);
       expect(pageErrors).toEqual([]);
@@ -586,7 +584,7 @@ test(
       const startResponse = waitForApiResponse(
         page,
         'POST',
-        new RegExp(`/api/payment-session/${checkout.paymentSessionId}/start$`),
+        new RegExp(`/api/pay/payment-session/${checkout.paymentSessionId}/start$`),
       );
       await page.getByRole('button', { name: 'Start payment', exact: true }).click();
       expect((await startResponse).ok()).toBeTruthy();
@@ -654,7 +652,7 @@ test(
       const startResponse = waitForApiResponse(
         page,
         'POST',
-        new RegExp(`/api/payment-session/${checkout.paymentSessionId}/start$`),
+        new RegExp(`/api/pay/payment-session/${checkout.paymentSessionId}/start$`),
       );
       await page.getByRole('button', { name: 'Start payment', exact: true }).click();
       expect((await startResponse).ok()).toBeTruthy();
@@ -738,8 +736,7 @@ test(
             { timeout: 40_000 },
           )
           .toContain('refunded');
-        const refundedOrderRow = await getAdminOrderRow(adminPage, checkout.orderId);
-        await expect(refundedOrderRow).toContainText('refunded');
+        await expect(await getAdminOrderRow(adminPage, checkout.orderId)).toContainText('refunded');
         expect(adminPageErrors).toEqual([]);
       } finally {
         await adminContext.close().catch(() => {});
@@ -1016,6 +1013,94 @@ test(
   },
 );
 
+test(
+  'ATP-SPC-02: Product renders semantic Admin relation and publication controls',
+  { tag: ['@admin', '@flow', '@product'] },
+  async ({ browser }, testInfo) => {
+    test.setTimeout(60_000);
+    const suffix = `${testInfo.workerIndex}-${testInfo.parallelIndex ?? testInfo.retry}-${Date.now()}`;
+    const categoryName = `E2E Product Category ${suffix}`;
+    const productTitle = `E2E Product ${suffix}`;
+    const adminContext = await browser.newContext();
+    const adminPage = await adminContext.newPage();
+    const adminPageErrors = collectPageErrors(adminPage);
+    const productCreatePath = '/commerce-admin/rest/resource/commerce-catalog%3Aproduct/create';
+    const productListPath = '/commerce-admin/rest/resource/commerce-catalog%3Aproduct';
+    const categoryActionPath = '/api/commerce/catalog/category';
+    const productActionPath = '/api/commerce/catalog/product';
+    let categoryId: number | string | undefined;
+    let productId: number | string | undefined;
+    let headers: { Authorization: string } | undefined;
+    try {
+      await adminPage.setViewportSize({ width: 1440, height: 900 });
+      await login(adminPage, '/commerce-admin/', 'admin', '123456', 'commerceAdmin');
+      const accessToken = (await adminContext.cookies()).find(
+        cookie => cookie.name === 'token',
+      )?.value;
+      expect(accessToken).toBeTruthy();
+      headers = { Authorization: `Bearer ${accessToken}` };
+
+      const categoryResponse = await adminPage.request.post(categoryActionPath, {
+        data: { name: categoryName, published: true },
+        headers,
+      });
+      expect(categoryResponse.ok()).toBeTruthy();
+      categoryId = (await categoryResponse.json()).data;
+      expectTableIdentity(categoryId);
+
+      await adminPage.goto(productCreatePath, { waitUntil: 'load' });
+      const categoryPicker = adminPage
+        .getByRole('group', { name: 'Category' })
+        .getByRole('combobox');
+      await expect(categoryPicker).toBeVisible();
+      await categoryPicker.selectOption({ label: categoryName });
+      await expect(categoryPicker).toHaveValue(String(categoryId));
+      const publication = adminPage.getByRole('group', { name: 'Published' }).getByRole('combobox');
+      await expect(publication).toBeVisible();
+      await publication.selectOption({ label: 'Unpublished' });
+      await expect(publication).toHaveValue('false');
+
+      const productResponse = await adminPage.request.post(productActionPath, {
+        data: { categoryId, title: productTitle, published: false },
+        headers,
+      });
+      expect(productResponse.ok()).toBeTruthy();
+      productId = (await productResponse.json()).data;
+      expectTableIdentity(productId);
+
+      await adminPage.goto(productListPath, { waitUntil: 'load' });
+      const productRow = adminPage.getByRole('row', { name: new RegExp(productTitle) });
+      await expect(productRow).toBeVisible();
+      await expect(productRow.getByText(categoryName, { exact: true })).toBeVisible();
+      await expect(productRow.getByText('Unpublished', { exact: true })).toBeVisible();
+
+      await adminPage.goto(`${productListPath}/${productId}`, { waitUntil: 'load' });
+      await expect(
+        adminPage.getByRole('group', { name: 'Category' }).getByRole('textbox'),
+      ).toHaveValue(categoryName);
+      await expect(
+        adminPage.getByRole('group', { name: 'Published' }).getByRole('textbox'),
+      ).toHaveValue('Unpublished');
+      await expect(adminPage.getByRole('button', { name: 'Submit', exact: true })).toHaveCount(0);
+      expect(adminPageErrors).toEqual([]);
+    } finally {
+      if (productId && headers) {
+        const response = await adminPage.request.delete(`${productActionPath}/${productId}`, {
+          headers,
+        });
+        expect(response.ok()).toBeTruthy();
+      }
+      if (categoryId && headers) {
+        const response = await adminPage.request.delete(`${categoryActionPath}/${categoryId}`, {
+          headers,
+        });
+        expect(response.ok()).toBeTruthy();
+      }
+      await adminContext.close().catch(() => {});
+    }
+  },
+);
+
 test(
   'Commerce Cart: anonymous browser is redirected to login',
   { tag: ['@web', '@cart'] },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.127",
+  "version": "5.1.129",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/vona/env/.env

@@ -91,6 +91,8 @@ PAY_MOCK_SECONDARY_WEBHOOK = pay-mock-dev-secondary-webhook
 PAYPAL_CLIENT_ID =
 PAYPAL_CLIENT_SECRET =
 PAYPAL_WEBHOOK_ID =
+PAYPAL_MERCHANT_REFERENCE =
+PAYPAL_ENVIRONMENT = sandbox
 STRIPE_SECRET_KEY =
 STRIPE_WEBHOOK_SECRET =
 

package/vona/env/.env.prod

@@ -24,5 +24,9 @@ DATABASE_CLIENT_MYSQL_DATABASE = xxx
 
 REDIS_DEFAULT_HOST = 127.0.0.1
 REDIS_DEFAULT_PORT = 6379
-REDIS_DEFAULT_PASSWORD = 
-REDIS_DEFAULT_DB = 0
+REDIS_DEFAULT_PASSWORD =
+REDIS_DEFAULT_DB = 0
+
+# payment
+
+PAYPAL_ENVIRONMENT = live

package/vona/packages-cli/cabloy-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/cli",
-  "version": "3.1.28",
+  "version": "3.1.29",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "@cabloy/cli",
   "keywords": [

package/vona/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.137",
+  "version": "1.1.138",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.135",
+  "version": "1.1.136",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

package/vona/packages-utils/module-glob/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.3.17",
+  "version": "5.3.18",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "cabloy module-glob",
   "keywords": [

package/vona/packages-utils/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/utils",
-  "version": "2.1.26",
+  "version": "2.1.27",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "cabloy utils",
   "keywords": [

package/vona/packages-utils/utils/src/vona.ts

@@ -17,7 +17,14 @@ export function combineResourceNameParts(
   // path
   const res: string[] = [];
   if (!simplifyProviderId || parts[0] !== 'a') res.push(parts[0]);
-  if (!simplify || !resourceName.startsWith(parts[1])) res.push(parts[1]);
+  if (
+    !simplify ||
+    (resourceName !== parts[1] &&
+      !resourceName.startsWith(`${parts[1]}-`) &&
+      !resourceName.startsWith(`${parts[1]}/`))
+  ) {
+    res.push(parts[1]);
+  }
   if (resourceName) res.push(resourceName);
   return res;
 }

package/vona/packages-vona/vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.84",
+  "version": "5.1.85",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/packages-vona/vona-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-core",
-  "version": "5.1.36",
+  "version": "5.1.37",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona",
   "keywords": [

package/vona/packages-vona/vona-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-mock",
-  "version": "6.1.36",
+  "version": "6.1.37",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona mock",
   "keywords": [