cabloy 5.1.136 → 5.1.138

package/zova/src/suite/cabloy-basic/modules/basic-text/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../component/formFieldTextarea/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-text' {
-  
+
         export interface ControllerFormFieldTextarea {
           /** @internal */
           get scope(): ScopeModuleBasicText;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -48,16 +48,16 @@ import { ITableCellOptionsText } from '../bean/tableCell.text.jsx';
 import { ITableCellOptionsTextarea } from '../bean/tableCell.textarea.jsx';
 import 'zova-module-a-table';
 declare module 'zova-module-a-table' {
-  
+
     export interface ITableCellRecord {
       'basic-text:text': ITableCellOptionsText;
 'basic-text:textarea': ITableCellOptionsTextarea;
     }
 
-  
+
 }
 declare module 'zova-module-basic-text' {
-  
+
         export interface TableCellText {
           /** @internal */
           get scope(): ScopeModuleBasicText;
@@ -78,7 +78,7 @@ declare module 'zova-module-basic-text' {
           get $beanFullName(): 'basic-text.tableCell.textarea';
           get $onionName(): 'basic-text:textarea';
           get $onionOptions(): ITableCellOptionsTextarea;
-        } 
+        }
 }
 /** tableCell: end */
 /** tableCell: begin */
@@ -108,12 +108,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-text': ScopeModuleBasicText;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

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

@@ -0,0 +1,52 @@
+{
+  "name": "zova-module-a-rbac",
+  "version": "5.0.1",
+  "description": "",
+  "keywords": [
+    "Zova Module"
+  ],
+  "author": "",
+  "files": [
+    "mock",
+    "dist",
+    "src",
+    "icons",
+    "assets"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./*": "./*"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/zova.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.1.3"
+  },
+  "clean-package": {
+    "indent": 2,
+    "replace": {
+      "exports.\\..types": "./dist/index.d.ts"
+    },
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "a-rbac"
+}

package/zova/src/suite-vendor/a-cabloy/modules/a-rbac/src/.metadata/index.ts

@@ -0,0 +1,26 @@
+// eslint-disable
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil } from 'zova';
+import { Scope } from 'zova-module-a-bean';
+
+@Scope()
+export class ScopeModuleARbac extends BeanScopeBase {}
+
+export interface ScopeModuleARbac {
+  util: BeanScopeUtil;
+}
+
+import 'zova';
+declare module 'zova' {
+  export interface IBeanScopeRecord {
+    'a-rbac': ScopeModuleARbac;
+  }
+
+
+
+
+
+
+}
+
+/** scope: end */

package/zova/src/suite-vendor/a-cabloy/modules/a-rbac/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'a-rbac';
+export { ScopeModuleARbac as ScopeModule } from './index.js';

package/zova/src/suite-vendor/a-cabloy/modules/a-rbac/src/index.ts

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

package/zova/src/suite-vendor/a-cabloy/modules/a-rbac/tsconfig.build.json

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

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

@@ -0,0 +1,5 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {},
+  "include": ["src", "src/.metadata/**/*"]
+}

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-rest-resource",
-  "version": "5.1.44",
+  "version": "5.1.45",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../model/resource.js';
 import { IModelOptionsResource } from '../model/resource.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'rest-resource:resource': IModelOptionsResource;
     }
 
-  
+
 }
 declare module 'zova-module-rest-resource' {
-  
+
         export interface ModelResource {
           /** @internal */
           get scope(): ScopeModuleRestResource;
@@ -22,7 +22,7 @@ declare module 'zova-module-rest-resource' {
           get $beanFullName(): 'rest-resource.model.resource';
           get $onionName(): 'rest-resource:resource';
           get $onionOptions(): IModelOptionsResource;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -41,11 +41,11 @@ export * from '../page/resource/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-rest-resource' {
-  
+
         export interface ControllerPageEntry {
           /** @internal */
           get scope(): ScopeModuleRestResource;
@@ -54,7 +54,7 @@ declare module 'zova-module-rest-resource' {
         export interface ControllerPageResource {
           /** @internal */
           get scope(): ScopeModuleRestResource;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -98,15 +98,15 @@ export const pagePathSchemas = {
 export const pageNameSchemas = {
 'rest-resource:entry': {
           params: NSControllerPageEntry.paramsSchema,
-          
+
         },
 'rest-resource:entryCreate': {
           params: NSControllerPageEntryCreate.paramsSchema,
-          
+
         },
 'rest-resource:resource': {
           params: NSControllerPageResource.paramsSchema,
-          
+
         },
 };
 declare module 'zova-module-rest-resource' {
@@ -138,12 +138,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'rest-resource': ScopeModuleRestResource;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 
 /** scope: end */

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/lib/deleteRequest.ts

@@ -0,0 +1,12 @@
+import type { AxiosRequestConfig } from 'axios';
+
+export function prepareDeleteRequestConfig<TBody>(
+  config: AxiosRequestConfig<TBody>,
+  body: TBody,
+): AxiosRequestConfig<TBody> {
+  if (body === undefined) return config;
+  return {
+    ...config,
+    data: body,
+  };
+}

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/model/resource.ts

@@ -16,6 +16,8 @@ import { formSceneFromFormMeta } from 'zova-module-a-form';
 import { $QueryEnsureLoaded, BeanModelBase, Model } from 'zova-module-a-model';
 import { ScopeModuleAOpenapi, SymbolOpenapiSchemaName } from 'zova-module-a-openapi';
 
+import { prepareDeleteRequestConfig } from '../lib/deleteRequest.js';
+
 export interface IModelOptionsResource extends IDecoratorModelOptions {}
 
 interface IModelResourceQueryItemOptions<TData> {
@@ -42,6 +44,7 @@ export class ModelResource<
   Entity = any,
   EntityCreate = Partial<Entity>,
   EntityUpdate = Partial<Entity>,
+  EntityDelete = void,
 > extends BeanModelBase {
   public resource: string;
   public resourceApi: string;
@@ -188,14 +191,13 @@ export class ModelResource<
   }
 
   delete(id: TableIdentity) {
-    return this.mutationItem<void, void>({
+    return this.mutationItem<void, EntityDelete>({
       id,
       action: 'delete',
-      mutationFn: async () => {
-        return this.$fetch.delete<any, void, void>(
-          this.sys.util.apiActionPathTranslate(`${this.resourceApi}/:id`, { id }),
-          this.sys.util.apiActionConfigPrepare(),
-        );
+      mutationFn: async body => {
+        const apiPath = this.sys.util.apiActionPathTranslate(`${this.resourceApi}/:id`, { id });
+        const apiConfig = prepareDeleteRequestConfig(this.sys.util.apiActionConfigPrepare(), body);
+        return this.$fetch.delete<any, void, EntityDelete>(apiPath, apiConfig);
       },
     });
   }
@@ -216,6 +218,10 @@ export class ModelResource<
     return this.$sdk.createApiSchemas(`${this.resourceApi}/:id`, 'patch');
   }
 
+  public get apiSchemasDelete() {
+    return this.$sdk.createApiSchemas(`${this.resourceApi}/:id`, 'delete');
+  }
+
   public getFormSchema(formMeta: IFormMeta) {
     const formScene = formMeta.formScene ?? formSceneFromFormMeta(formMeta);
     if (formScene === 'view') return this.schemaView;

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/test/lib/deleteRequest.test.ts

@@ -0,0 +1,37 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { prepareDeleteRequestConfig } from '../../src/lib/deleteRequest.ts';
+
+test('DELETE without a body preserves the prepared config', () => {
+  const config = {
+    baseURL: '/api',
+    headers: { Authorization: 'Bearer token' },
+  };
+
+  const actual = prepareDeleteRequestConfig(config, undefined);
+
+  assert.equal(actual, config);
+  assert.equal('data' in actual, false);
+});
+
+test('DELETE forwards a supplied body through config.data', () => {
+  const config = { baseURL: '/api' };
+  const body = { reason: 'duplicate' };
+
+  const actual = prepareDeleteRequestConfig(config, body);
+
+  assert.deepEqual(actual, {
+    ...config,
+    data: body,
+  });
+});
+
+test('DELETE preserves null as an intentional body', () => {
+  const actual = prepareDeleteRequestConfig({ baseURL: '/api' }, null);
+
+  assert.deepEqual(actual, {
+    baseURL: '/api',
+    data: null,
+  });
+});

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/test/model/resource.types.ts

@@ -0,0 +1,24 @@
+import type { TableIdentity } from 'table-identity';
+
+import type { ModelResource } from '../../src/model/resource.ts';
+
+type Entity = { id: number };
+type EntityCreate = Pick<Entity, 'id'>;
+type EntityUpdate = Partial<Entity>;
+type DeleteReason = { reason: string };
+
+declare const id: TableIdentity;
+declare const standard: ModelResource<Entity, EntityCreate, EntityUpdate>;
+declare const requiredBody: ModelResource<Entity, EntityCreate, EntityUpdate, DeleteReason>;
+declare const optionalBody: ModelResource<Entity, EntityCreate, EntityUpdate, DeleteReason | void>;
+
+void standard.delete(id).mutateAsync();
+void requiredBody.delete(id).mutateAsync({ reason: 'duplicate' });
+void optionalBody.delete(id).mutateAsync();
+void optionalBody.delete(id).mutateAsync({ reason: 'duplicate' });
+
+// @ts-expect-error required DELETE bodies cannot be omitted
+void requiredBody.delete(id).mutateAsync();
+
+// @ts-expect-error DELETE body shape must match the resource contract
+void requiredBody.delete(id).mutateAsync({ reason: 1 });

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

@@ -1,13 +1,14 @@
 {
   "name": "zova-suite-a-cabloy",
-  "version": "5.1.45",
+  "version": "5.1.46",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "author": "",
   "files": [],
   "type": "module",
   "dependencies": {
-    "zova-module-rest-resource": "^5.1.44"
+    "zova-module-a-rbac": "^5.0.1",
+    "zova-module-rest-resource": "^5.1.45"
   },
   "title": "a-cabloy"
 }

package/zova/src/suite-vendor/a-pay/modules/a-pay/cli/openapi.config.ts

@@ -3,7 +3,7 @@ import type { ZovaOpenapiConfigModule } from 'zova-openapi';
 export default function (): ZovaOpenapiConfigModule {
   return {
     operations: {
-      match: ['PaymentSession_start', 'PaymentSession_reconcile', 'PaymentSession_view'],
+      match: ['PayPaymentSession_start', 'PayPaymentSession_reconcile', 'PayPaymentSession_view'],
     },
   };
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-pay",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "",
   "keywords": [
     "Zova Module"

package/zova/src/suite-vendor/a-pay/modules/a-pay/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../model/paymentSession.js';
 import { IModelOptionsPaymentSession } from '../model/paymentSession.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'a-pay:paymentSession': IModelOptionsPaymentSession;
     }
 
-  
+
 }
 declare module 'zova-module-a-pay' {
-  
+
         export interface ModelPaymentSession {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -22,7 +22,7 @@ declare module 'zova-module-a-pay' {
           get $beanFullName(): 'a-pay.model.paymentSession';
           get $onionName(): 'a-pay:paymentSession';
           get $onionOptions(): IModelOptionsPaymentSession;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -35,31 +35,31 @@ declare module 'zova' {
 }
 /** model: end */
 /** api: begin */
-export * from '../api/paymentSession.js';
+export * from '../api/payPaymentSession.js';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-pay' {
-  
-        export interface ApiPaymentSession {
+
+        export interface ApiPayPaymentSession {
           /** @internal */
           get scope(): ScopeModuleAPay;
         }
 
-        export interface ApiPaymentSession {
-          get $beanFullName(): 'a-pay.api.paymentSession';
-          get $onionName(): 'a-pay:paymentSession';
-          
-        } 
+        export interface ApiPayPaymentSession {
+          get $beanFullName(): 'a-pay.api.payPaymentSession';
+          get $onionName(): 'a-pay:payPaymentSession';
+
+        }
 }
 /** api: end */
 /** api: begin */
-import { ApiPaymentSession } from '../api/paymentSession.js';
+import { ApiPayPaymentSession } from '../api/payPaymentSession.js';
 export interface IModuleApi {
-  'paymentSession': ApiPaymentSession;
+  'payPaymentSession': ApiPayPaymentSession;
 }
 /** api: end */
 /** api: begin */
@@ -67,7 +67,7 @@ export interface IModuleApi {
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
-    'a-pay.api.paymentSession': ApiPaymentSession;
+    'a-pay.api.payPaymentSession': ApiPayPaymentSession;
   }
 }
 /** api: end */
@@ -75,31 +75,31 @@ declare module 'zova' {
 export * from '../api/openapi/index.js';
 /** openapi: end */
 /** apiSchema: begin */
-export * from '../apiSchema/paymentSession.js';
+export * from '../apiSchema/payPaymentSession.js';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-pay' {
-  
-        export interface ApiSchemaPaymentSession {
+
+        export interface ApiSchemaPayPaymentSession {
           /** @internal */
           get scope(): ScopeModuleAPay;
         }
 
-        export interface ApiSchemaPaymentSession {
-          get $beanFullName(): 'a-pay.apiSchema.paymentSession';
-          get $onionName(): 'a-pay:paymentSession';
-          
-        } 
+        export interface ApiSchemaPayPaymentSession {
+          get $beanFullName(): 'a-pay.apiSchema.payPaymentSession';
+          get $onionName(): 'a-pay:payPaymentSession';
+
+        }
 }
 /** apiSchema: end */
 /** apiSchema: begin */
-import { ApiSchemaPaymentSession } from '../apiSchema/paymentSession.js';
+import { ApiSchemaPayPaymentSession } from '../apiSchema/payPaymentSession.js';
 export interface IModuleApiSchema {
-  'paymentSession': ApiSchemaPaymentSession;
+  'payPaymentSession': ApiSchemaPayPaymentSession;
 }
 /** apiSchema: end */
 /** apiSchema: begin */
@@ -107,7 +107,7 @@ export interface IModuleApiSchema {
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
-    'a-pay.apiSchema.paymentSession': ApiSchemaPaymentSession;
+    'a-pay.apiSchema.payPaymentSession': ApiSchemaPayPaymentSession;
   }
 }
 /** apiSchema: end */
@@ -116,15 +116,15 @@ export * from '../service/paymentCoordinator.js';
 
 import 'zova-module-a-bean';
 declare module 'zova-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-pay:paymentCoordinator': never;
     }
 
-  
+
 }
 declare module 'zova-module-a-pay' {
-  
+
         export interface ServicePaymentCoordinator {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -133,8 +133,8 @@ declare module 'zova-module-a-pay' {
         export interface ServicePaymentCoordinator {
           get $beanFullName(): 'a-pay.service.paymentCoordinator';
           get $onionName(): 'a-pay:paymentCoordinator';
-          
-        } 
+
+        }
 }
 /** service: end */
 /** service: begin */
@@ -151,15 +151,15 @@ export * from '../component/paymentNextAction/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-pay' {
-  
+
         export interface ControllerPaymentNextAction {
           /** @internal */
           get scope(): ScopeModuleAPay;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -206,12 +206,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'a-pay': ScopeModuleAPay;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 
 /** scope: end */