cabloy 5.1.158 → 5.1.160

package/vona/src/suite/a-training/modules/training-student/src/dto/studentView.tsx

@@ -22,6 +22,7 @@ const studentContentField = $makeSchema(
 export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'_descriptionMarkdown'> {}
 
 @Dto<IDtoOptionsStudentView>({
+  openapi: { title: $locale('ViewStudent') },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [

package/vona/src/suite/a-training/modules/training-student/src/entity/student.tsx

@@ -19,11 +19,12 @@ export interface IEntityOptionsStudent extends IDecoratorEntityOptions {}
 @Entity<IEntityOptionsStudent>('trainingStudent', {
   openapi: { title: $locale('Student') },
   fields: {
-    id: $makeMetadata(ZovaRender.order(1, 'core')),
+    id: $makeMetadata(ZovaRender.order(1, 'core'), ZovaRender.column({ width: 50, fixed: 'left' })),
     iid: $makeMetadata(ZovaRender.visible(false)),
     deleted: $makeMetadata(ZovaRender.visible(false)),
     createdAt: $makeMetadata(
       ZovaRender.order(-2, 'max'),
+      ZovaRender.column({ align: 'center', width: 180, enableSorting: true }),
       ZovaRender.field('basic-date:formFieldDate'),
       ZovaRender.cell('basic-date:date'),
     ),
@@ -40,6 +41,13 @@ export class EntityStudent extends EntityBase {
     v.required(),
     v.min(2),
     ZovaRender.order(1),
+    ZovaRender.column({
+      align: 'left',
+      width: 240,
+      fixed: 'left',
+      enableSorting: true,
+      sortDescFirst: true,
+    }),
     ZovaRender.cell('basic-table:actionView'),
   )
   name: string;
@@ -82,6 +90,7 @@ export class EntityStudent extends EntityBase {
     v.title($locale('Level')),
     v.required(),
     ZovaRender.order(5),
+    ZovaRender.column({ align: 'center', width: 140, enableSorting: true }),
     // Tutorial 3 built-in form renderer example. Keep it commented here for side-by-side comparison.
     // ZovaRender.field('basic-select:formFieldSelect', {
     //   items: studentLevelItems,

package/vona/src/suite/a-training/modules/training-student/test/student.test.ts

@@ -13,7 +13,7 @@ import {
 import { DtoDetailRecordResItem } from '../src/dto/detailRecordResItem.tsx';
 import { DtoStudentSummary } from '../src/dto/studentSummary.tsx';
 
-describe('student.test.ts', () => {
+describe('student.test.ts', { concurrency: false }, () => {
   it('action:student:formLayoutMetadata', async () => {
     await app.bean.executor.mockCtx(async () => {
       for (const DtoClass of [DtoStudentCreate, DtoStudentUpdate, DtoStudentView]) {
@@ -95,6 +95,104 @@ describe('student.test.ts', () => {
     });
   });
 
+  it('action:student:tableColumnMetadata', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const apiJson = await app.bean.openapi.generateJsonOfClass(DtoStudentSelectResItem);
+      const component = Object.values(apiJson.components!.schemas as any).find(item => {
+        return (item as any).properties?._operationsRow;
+      }) as any;
+      assert.deepEqual(
+        {
+          align: component.properties.name.rest.table.align,
+          width: component.properties.name.rest.table.width,
+          fixed: component.properties.name.rest.table.fixed,
+          enableSorting: component.properties.name.rest.table.enableSorting,
+        },
+        { align: 'left', width: 240, fixed: 'left', enableSorting: true },
+      );
+      assert.deepEqual(
+        {
+          align: component.properties.level.rest.table.align,
+          width: component.properties.level.rest.table.width,
+          enableSorting: component.properties.level.rest.table.enableSorting,
+        },
+        { align: 'center', width: 140, enableSorting: true },
+      );
+      assert.deepEqual(
+        {
+          align: component.properties.createdAt.rest.table.align,
+          width: component.properties.createdAt.rest.table.width,
+          enableSorting: component.properties.createdAt.rest.table.enableSorting,
+        },
+        { align: 'center', width: 180, enableSorting: true },
+      );
+      assert.deepEqual(
+        {
+          align: component.properties._operationsRow.rest.table.align,
+          width: component.properties._operationsRow.rest.table.width,
+          fixed: component.properties._operationsRow.rest.table.fixed,
+        },
+        { align: 'center', width: 360, fixed: 'right' },
+      );
+    });
+  });
+
+  it('action:student:serverSorting', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      const studentIds: string[] = [];
+      const names = ['__StudentSortA__', '__StudentSortZ__'];
+      try {
+        for (const [index, name] of names.entries()) {
+          const studentId = await app.bean.executor.performAction('post', '/training/student', {
+            body: {
+              name,
+              mobile: `13812345${678 + index}`,
+              level: 1,
+            },
+          });
+          studentIds.push(studentId);
+        }
+        const ascending: DtoStudentSelectRes = await app.bean.executor.performAction(
+          'get',
+          '/training/student',
+          { query: { orders: [['name', 'asc']] } },
+        );
+        const descending: DtoStudentSelectRes = await app.bean.executor.performAction(
+          'get',
+          '/training/student',
+          { query: { orders: [['name', 'desc']] } },
+        );
+        const ascendingIndexes = names.map(name =>
+          ascending.list.findIndex(item => item.name === name),
+        );
+        const descendingIndexes = names.map(name =>
+          descending.list.findIndex(item => item.name === name),
+        );
+        assert.equal(
+          ascendingIndexes.every(index => index >= 0),
+          true,
+        );
+        assert.equal(
+          descendingIndexes.every(index => index >= 0),
+          true,
+        );
+        assert.equal(ascendingIndexes[0] < ascendingIndexes[1], true);
+        assert.equal(descendingIndexes[0] > descendingIndexes[1], true);
+      } finally {
+        for (const studentId of studentIds.reverse()) {
+          await app
+            .scope('training-student')
+            .model.studentContent.delete({ studentId }, { disableDeleted: true });
+          await app
+            .scope('training-student')
+            .model.student.deleteById(studentId, { disableDeleted: true });
+        }
+        await app.bean.passport.signout();
+      }
+    });
+  });
+
   it('action:student:emittedDtoSchemas', async () => {
     await app.bean.executor.mockCtx(async () => {
       const summaryApiJson = await app.bean.openapi.generateJsonOfClass(DtoStudentSummary);

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.50",
+  "version": "5.1.51",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -9,7 +9,7 @@
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.4",
+    "vona-module-a-rbac": "^5.0.5",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.20",
+  "version": "5.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-web",
-  "version": "5.1.22",
+  "version": "5.1.23",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-web/src/bean/pipe.filter.ts

@@ -25,6 +25,7 @@ import type {
 export type TypePipeFilterData = ITableQuery;
 
 export type TypePipeFilterResult = TypeQueryParamsPatch;
+type TypeQueryJoin = NonNullable<TypeQueryParamsPatch['joins']>[number];
 
 export interface IPipeOptionsFilter
   extends IDecoratorPipeOptions, IDecoratorPipeOptionsArgument, ValidatorOptions {}
@@ -68,10 +69,13 @@ export class PipeFilter
   private async _transform(value: TypePipeFilterData, options: IPipeOptionsFilter) {
     // 1. system: columns/where/orders/pageNo/pageSize
     const params = this._transformSystem(value);
+    const rootOpenapi = ZodMetadata.getOpenapiMetadata(options.schema!) as
+      | ISchemaObjectExtensionField
+      | undefined;
     // 2. fields
-    await this._transformFields(params, value, options);
+    await this._transformFields(params, value, options, rootOpenapi);
     // 3. system: orders
-    this._transformOrders(params, options);
+    this._transformOrders(params, options, rootOpenapi);
     // ok
     return params;
   }
@@ -104,32 +108,75 @@ export class PipeFilter
     return params;
   }
 
-  private _transformOrders(params: TypeQueryParamsPatch, options: IPipeOptionsFilter) {
+  private _transformOrders(
+    params: TypeQueryParamsPatch,
+    options: IPipeOptionsFilter,
+    rootOpenapi: ISchemaObjectExtensionField | undefined,
+  ) {
     if (!params.orders) return;
-    // openapi
-    const openapi: ISchemaObjectExtensionField | undefined = ZodMetadata.getOpenapiMetadata(
-      options.schema!,
-    ) as ISchemaObjectExtensionField | undefined;
-    const table = openapi?.filter?.table;
-    // loop
     for (const order of params.orders) {
-      const field = order[0] as string;
-      if (field.includes('.')) continue;
-      let tableCurrent = table;
-      let fieldCurrent = field;
-      const fieldSchema = ZodMetadata.getFieldSchema(options.schema, field);
-      if (fieldSchema) {
-        const openapi: ISchemaObjectExtensionField | undefined = ZodMetadata.getOpenapiMetadata(
-          fieldSchema,
-        ) as ISchemaObjectExtensionField | undefined;
-        if (openapi?.filter?.table) {
-          tableCurrent = openapi?.filter?.table;
-        }
-        if (openapi?.filter?.originalName) {
-          fieldCurrent = openapi?.filter?.originalName;
-        }
+      if (!Array.isArray(order) || order.length !== 2) {
+        throw new Error('invalid order');
+      }
+      const [key, direction] = order;
+      if (typeof key !== 'string' || (direction !== 'asc' && direction !== 'desc')) {
+        throw new Error('invalid order');
+      }
+      const info = this._resolveField(key, options, rootOpenapi);
+      if (!info || info.openapi?.filter?.capabilities?.order === false) {
+        throw new Error(`invalid order field: ${key}`);
       }
-      cast(order)[0] = tableCurrent ? `${tableCurrent}.${fieldCurrent}` : fieldCurrent;
+      cast(order)[0] = info.orderFullName;
+      this._addJoin(params, info.joinInfo);
+    }
+  }
+
+  private _resolveField(
+    key: string,
+    options: IPipeOptionsFilter,
+    rootOpenapi: ISchemaObjectExtensionField | undefined,
+  ) {
+    const fieldSchema = ZodMetadata.getFieldSchema(options.schema!, key);
+    if (!fieldSchema) {
+      if (!rootOpenapi?.filter?.table) {
+        return { orderFullName: key };
+      }
+      const keyParts = key.split('.');
+      const [table, field] = keyParts;
+      if (!table || !field || keyParts.length !== 2) return;
+      const resolved = this._resolveField(field, options, rootOpenapi);
+      if (!resolved || resolved.orderFullName !== key) return;
+      return resolved;
+    }
+    const fieldSchemaInner = ZodMetadata.unwrapChained(fieldSchema);
+    const openapi: ISchemaObjectExtensionField | undefined = ZodMetadata.getOpenapiMetadata(
+      fieldSchema,
+    ) as ISchemaObjectExtensionField | undefined;
+    const originalName = openapi?.filter?.originalName ?? key;
+    const table = openapi?.filter?.table ?? rootOpenapi?.filter?.table;
+    const joinInfo = openapi?.filter?.joinOn
+      ? ([
+          openapi.filter.joinType ?? 'innerJoin',
+          openapi.filter.table,
+          openapi.filter.joinOn,
+        ] as TypeQueryJoin)
+      : undefined;
+    return {
+      fieldSchema,
+      fieldSchemaInner,
+      openapi,
+      originalName,
+      fullName: joinInfo ? `${openapi?.filter?.table}.${originalName}` : originalName,
+      orderFullName: table ? `${table}.${originalName}` : originalName,
+      joinInfo,
+    };
+  }
+
+  private _addJoin(params: TypeQueryParamsPatch, joinInfo: TypeQueryJoin | undefined) {
+    if (!joinInfo) return;
+    if (!params.joins) params.joins = [];
+    if (params.joins.findIndex(item => item[1] === joinInfo[1]) === -1) {
+      params.joins.push(joinInfo);
     }
   }
 
@@ -139,36 +186,21 @@ export class PipeFilter
     params: TypeQueryParamsPatch,
     value: any,
     options: IPipeOptionsFilter,
+    rootOpenapi: ISchemaObjectExtensionField | undefined,
   ) {
     if (__FieldsSystem.includes(key)) return;
-    const fieldSchema = ZodMetadata.getFieldSchema(options.schema, key);
-    if (!fieldSchema) return;
-    const fieldSchemaInner = ZodMetadata.unwrapChained(fieldSchema);
-    // openapi
-    const openapi: ISchemaObjectExtensionField | undefined = ZodMetadata.getOpenapiMetadata(
-      fieldSchema,
-    ) as ISchemaObjectExtensionField | undefined;
-    const [transformName] = openapi?.filter?.transform ?? ['a-web:base', undefined];
+    const info = this._resolveField(key, options, rootOpenapi);
+    if (!info) return;
+    const { fieldSchema, fieldSchemaInner, openapi, originalName, fullName, joinInfo } = info;
+    const [transformName, transformOptions] = openapi?.filter?.transform ?? [
+      'a-web:base',
+      undefined,
+    ];
     const fieldNullable = fieldValue === null && isNullableSchema(fieldSchema);
     if (isNilOrEmptyString(fieldValue) && !fieldNullable) return;
-    // name
-    const originalName = openapi?.filter?.originalName ?? key;
-    let fullName: string;
-    // joins
-    let joinInfo;
-    if (openapi?.filter?.joinOn) {
-      const joinType = openapi.filter.joinType ?? 'innerJoin';
-      const joinTable = openapi.filter.table;
-      const joinOn = openapi.filter.joinOn;
-      joinInfo = [joinType, joinTable, joinOn];
-      fullName = `${joinTable}.${originalName}`;
-    } else {
-      fullName = originalName;
-    }
     // check where
     if (Object.prototype.hasOwnProperty.call(params.where, fullName)) return;
     // filter transform
-    const [, transformOptions] = openapi?.filter?.transform ?? ['a-web:base', undefined];
     const transformOptions2 = this.bean.onion.filterTransform.getOnionOptionsDynamic(
       transformName as keyof IFilterTransformRecord,
       transformOptions,
@@ -182,7 +214,7 @@ export class PipeFilter
     if (!beanInstance.where) {
       throw new Error(`filterTransform.where not found: ${beanFullName}`);
     }
-    const info = {
+    const transformInfo = {
       params,
       query: value,
       options,
@@ -194,17 +226,12 @@ export class PipeFilter
       schema: fieldSchema,
       openapi,
     };
-    const resTransform = await beanInstance.where(info, transformOptions2);
+    const resTransform = await beanInstance.where(transformInfo, transformOptions2);
     if (resTransform !== undefined) {
       // where
       params.where[fullName] = resTransform;
       // join
-      if (joinInfo) {
-        if (!params.joins) params.joins = [];
-        if (params.joins.findIndex(item => item[1] === joinInfo.joinTable) === -1) {
-          params.joins.push(joinInfo);
-        }
-      }
+      this._addJoin(params, joinInfo);
     }
   }
 
@@ -212,10 +239,11 @@ export class PipeFilter
     params: TypeQueryParamsPatch,
     value: any,
     options: IPipeOptionsFilter,
+    rootOpenapi: ISchemaObjectExtensionField | undefined,
   ) {
     // loop
     for (const key in value) {
-      await this._transformField(key, value[key], params, value, options);
+      await this._transformField(key, value[key], params, value, options, rootOpenapi);
     }
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.84",
+  "version": "5.1.85",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.105",
+  "version": "1.2.106",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.103"
+    "zova-cli-set-front": "^1.2.104"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/cli/templates/rest/render.ts

@@ -17,6 +17,7 @@ import {
   schemaRenderTableActionRowJsx,
 } from './component.ts';
 import {
+  schemaRenderColumn,
   schemaRenderDisableNotifyChanged,
   schemaRenderFieldSource,
   schemaRenderLayout,
@@ -35,6 +36,7 @@ export const ZovaRender = {
   disableNotifyChanged: schemaRenderDisableNotifyChanged,
   onEffect: schemaRenderOnEffect,
   fieldSource: schemaRenderFieldSource,
+  column: schemaRenderColumn,
   // component
   field: schemaRenderField,
   fieldJsx: schemaRenderFieldJsx,

package/zova/packages-cli/cli-set-front/cli/templates/rest/rest.ts

@@ -1,8 +1,12 @@
 import type z from 'zod';
 
-import type { TypeFormSchemaScene, TypeFormFieldOnEffect } from 'zova-module-a-openapi';
-import type { IResourceFormFieldLayoutOptions } from 'zova-module-a-openapi';
-import type { TypeSchemaScene } from 'zova-module-a-openapi';
+import type {
+  IResourceFormFieldLayoutOptions,
+  ITableColumnOptions,
+  TypeFormFieldOnEffect,
+  TypeFormSchemaScene,
+  TypeSchemaScene,
+} from 'zova-module-a-openapi';
 import type { TypeSchemaOrderLevel } from 'zova-module-a-openapi';
 
 import { _generalSchemaRest, _order } from './inner.ts';
@@ -78,3 +82,9 @@ export function schemaRenderOrder<T extends z.ZodType>(
     return _generalSchemaRest(schema, options, scene);
   };
 }
+
+export function schemaRenderColumn<T extends z.ZodType>(options: ITableColumnOptions) {
+  return function (schema: T): T {
+    return schema.openapi({ rest: { table: options } });
+  };
+}

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.103",
+  "version": "1.2.104",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.155",
+  "version": "5.1.156",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.88",
-    "zova-suite-a-zova": "^5.1.154"
+    "zova-suite-a-zova": "^5.1.155"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/pnpm-lock.yaml

@@ -449,7 +449,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.5
       zova-cli-set-front:
-        specifier: ^1.2.102
+        specifier: ^1.2.104
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -558,7 +558,7 @@ importers:
         specifier: ^1.1.17
         version: link:../../packages-utils/zova-openapi
       zova-vite:
-        specifier: ^1.1.44
+        specifier: ^1.1.45
         version: link:../../packages-utils/zova-vite
     devDependencies:
       clean-package:
@@ -761,8 +761,8 @@ importers:
         specifier: ^7.28.6
         version: 7.29.7(@babel/core@7.29.7)
       '@cabloy/dotenv':
-        specifier: ^1.2.8
-        version: 1.2.8
+        specifier: ^1.2.9
+        version: 1.2.9
       '@cabloy/extend':
         specifier: ^3.2.8
         version: 3.2.8
@@ -870,7 +870,7 @@ importers:
         specifier: ^5.1.88
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.154
+        specifier: ^5.1.155
         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.49
+        specifier: ^5.1.50
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/a-rbac:
@@ -1076,7 +1076,7 @@ importers:
         specifier: ^5.1.25
         version: link:modules/a-fetch
       zova-module-a-form:
-        specifier: ^5.1.50
+        specifier: ^5.1.51
         version: link:modules/a-form
       zova-module-a-icon:
         specifier: ^5.1.27
@@ -1094,7 +1094,7 @@ importers:
         specifier: ^5.1.36
         version: link:modules/a-model
       zova-module-a-openapi:
-        specifier: ^5.1.51
+        specifier: ^5.1.52
         version: link:modules/a-openapi
       zova-module-a-router:
         specifier: ^5.1.34
@@ -1118,7 +1118,7 @@ importers:
         specifier: ^5.1.35
         version: link:modules/a-style
       zova-module-a-table:
-        specifier: ^5.1.38
+        specifier: ^5.1.39
         version: link:modules/a-table
       zova-module-a-zod:
         specifier: ^5.1.37
@@ -2311,8 +2311,8 @@ packages:
   '@cabloy/deps@1.1.8':
     resolution: {integrity: sha512-CWaVGSwPI5qLSuRF+WmB+1CwbRe9+PR+nkUmKc9/Dj7sB75qPXLTYACn23T/jIylbDbWCL82LoOa455Vgseyeg==}
 
-  '@cabloy/dotenv@1.2.8':
-    resolution: {integrity: sha512-1Xn0IsfMVWSZW0Gi7MBGbW6JL8kD7GN/B199RbDlIIy3PbSTdbKF2Gh/NIR2FNCChD1kQaG0FW/mR1tKgMNxbg==}
+  '@cabloy/dotenv@1.2.9':
+    resolution: {integrity: sha512-iR7KWj1YI2SiTjlcSMnZ/wYw/PMcgAJRvOHdWDrwehY8YOuG6uKPTez1hTCR4kfrhiBnZwM/acZvmqjflx18GA==}
 
   '@cabloy/extend@3.2.8':
     resolution: {integrity: sha512-BrXYUtlC1kFY33hNxL/hEaS7wW8TsOuu22k0VCEtzg2iw+USkb4BqONth5Uv2pJcIlDMeWx8A8aUIRF3WQ2ckQ==}
@@ -5138,8 +5138,8 @@ packages:
   capital-case@1.0.4:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
 
-  cascade-extend@2.2.8:
-    resolution: {integrity: sha512-cs8DkxDoYv0YSFnbZyn/xaaodKgp+iV9xv8IeAWpYRyM5vxIXGKS8Ej0jLwneFFYTaF7juIjOlktOjEidDZURA==}
+  cascade-extend@2.2.9:
+    resolution: {integrity: sha512-YevoTZSywFhLNnHWh9GSzHgrwAJmsDzR0sQeOZ8BG5NlwF8MyH0457ocLVyGgB/m9rTHmRXJkzzvPuDcjpTtfQ==}
 
   ccount@1.1.0:
     resolution: {integrity: sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==}
@@ -8834,9 +8834,9 @@ snapshots:
 
   '@cabloy/deps@1.1.8': {}
 
-  '@cabloy/dotenv@1.2.8':
+  '@cabloy/dotenv@1.2.9':
     dependencies:
-      cascade-extend: 2.2.8
+      cascade-extend: 2.2.9
       dotenv: 16.6.1
       dotenv-expand: 11.0.7
       globby: 16.2.0
@@ -11389,7 +11389,7 @@ snapshots:
       tslib: 2.8.1
       upper-case-first: 2.0.2
 
-  cascade-extend@2.2.8:
+  cascade-extend@2.2.9:
     dependencies:
       '@cabloy/extend': 3.2.8