vona-cli-set-api 1.0.76 → 1.0.79

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -45,7 +45,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.40"
+    "vona": "^5.0.41"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-base/node_modules/.bin/clean-package

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/bin/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/bin/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../clean-package/bin/main.js" "$@"
+else
+  exec node  "$basedir/../clean-package/bin/main.js" "$@"
+fi

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-base/node_modules/.bin/rimraf

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/esm/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/esm/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../rimraf/dist/esm/bin.mjs" "$@"
+else
+  exec node  "$basedir/../rimraf/dist/esm/bin.mjs" "$@"
+fi

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/node_modules/.bin/clean-package

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/bin/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/bin/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../clean-package/bin/main.js" "$@"
+else
+  exec node  "$basedir/../clean-package/bin/main.js" "$@"
+fi

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/node_modules/.bin/rimraf

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/esm/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/esm/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../rimraf/dist/esm/bin.mjs" "$@"
+else
+  exec node  "$basedir/../rimraf/dist/esm/bin.mjs" "$@"
+fi

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/dist/.metadata/index.d.ts

@@ -87,13 +87,13 @@ declare module 'vona-module-home-user' {
         $columns: <K extends keyof Omit<EntityUserRole, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
     }
     interface IEntityOptionsRole {
-        fields?: TypeEntityOptionsFields<EntityRole, IEntityOptionsRole['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<EntityRole, IEntityOptionsRole['_fieldsMore_']>;
     }
     interface IEntityOptionsUser {
-        fields?: TypeEntityOptionsFields<EntityUser, IEntityOptionsUser['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<EntityUser, IEntityOptionsUser['_fieldsMore_']>;
     }
     interface IEntityOptionsUserRole {
-        fields?: TypeEntityOptionsFields<EntityUserRole, IEntityOptionsUserRole['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<EntityUserRole, IEntityOptionsUserRole['_fieldsMore_']>;
     }
 }
 /** service: end */
@@ -154,13 +154,13 @@ declare module 'vona-module-home-user' {
 }
 declare module 'vona-module-home-user' {
     interface IDtoOptionsAuth {
-        fields?: TypeEntityOptionsFields<DtoAuth, IDtoOptionsAuth['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<DtoAuth, IDtoOptionsAuth['_fieldsMore_']>;
     }
     interface IDtoOptionsPassport {
-        fields?: TypeEntityOptionsFields<DtoPassport, IDtoOptionsPassport['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<DtoPassport, IDtoOptionsPassport['_fieldsMore_']>;
     }
     interface IDtoOptionsPassportJwt {
-        fields?: TypeEntityOptionsFields<DtoPassportJwt, IDtoOptionsPassportJwt['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<DtoPassportJwt, IDtoOptionsPassportJwt['_fieldsMore_']>;
     }
 }
 export * from '../model/user.ts';

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/dist/service/passportAdapter.d.ts

@@ -1,9 +1,8 @@
 import type { IPassportAdapter, IPassportBase } from 'vona-module-a-user';
 import type { IPassport, IPayloadData } from '../types/passport.ts';
-import type { IUser } from '../types/user.ts';
 import { BeanBase } from 'vona';
 export declare class ServicePassportAdapter extends BeanBase implements IPassportAdapter {
-    isAdmin(user: IUser): Promise<boolean>;
+    isAdmin(passport: IPassport | undefined): Promise<boolean>;
     setCurrent(passport: IPassport | undefined): Promise<IPassport | undefined>;
     serialize(passport: IPassportBase): Promise<IPayloadData>;
     deserialize(payloadData: IPayloadData): Promise<IPassportBase | undefined>;

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './auth.ts';
 export * from './passport.ts';
-export * from './user.ts';
 export * from './role.ts';
+export * from './user.ts';

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/node_modules/.bin/clean-package

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/bin/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/bin/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules/clean-package/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/clean-package@2.2.0/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../clean-package/bin/main.js" "$@"
+else
+  exec node  "$basedir/../clean-package/bin/main.js" "$@"
+fi

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/node_modules/.bin/rimraf

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/esm/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/esm/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/dist/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules/rimraf/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/rimraf@6.0.1/node_modules:/Volumes/my-data/cabloy/vona/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../rimraf/dist/esm/bin.mjs" "$@"
+else
+  exec node  "$basedir/../rimraf/dist/esm/bin.mjs" "$@"
+fi

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/.metadata/index.ts

@@ -65,9 +65,9 @@ export * from '../config/config.ts';
 declare module 'vona-module-a-database' {
 
   export interface IEntityRecord {
-    'home-user:role': IEntityOptionsRole;
-    'home-user:user': IEntityOptionsUser;
-    'home-user:userRole': IEntityOptionsUserRole;
+    'home-user:role': Omit<IEntityOptionsRole, '_fieldsMore_'>;
+    'home-user:user': Omit<IEntityOptionsUser, '_fieldsMore_'>;
+    'home-user:userRole': Omit<IEntityOptionsUserRole, '_fieldsMore_'>;
   }
 
 }
@@ -102,15 +102,15 @@ declare module 'vona-module-home-user' {
   }
 
   export interface IEntityOptionsRole {
-    fields?: TypeEntityOptionsFields<EntityRole, IEntityOptionsRole['fieldsMore']>;
+    fields?: TypeEntityOptionsFields<EntityRole, IEntityOptionsRole['_fieldsMore_']>;
   }
 
   export interface IEntityOptionsUser {
-    fields?: TypeEntityOptionsFields<EntityUser, IEntityOptionsUser['fieldsMore']>;
+    fields?: TypeEntityOptionsFields<EntityUser, IEntityOptionsUser['_fieldsMore_']>;
   }
 
   export interface IEntityOptionsUserRole {
-    fields?: TypeEntityOptionsFields<EntityUserRole, IEntityOptionsUserRole['fieldsMore']>;
+    fields?: TypeEntityOptionsFields<EntityUserRole, IEntityOptionsUserRole['_fieldsMore_']>;
   }
 }
 /** service: end */
@@ -182,9 +182,9 @@ export * from '../model/role.ts';
 declare module 'vona-module-a-web' {
 
   export interface IDtoRecord {
-    'home-user:auth': IDtoOptionsAuth;
-    'home-user:passport': IDtoOptionsPassport;
-    'home-user:passportJwt': IDtoOptionsPassportJwt;
+    'home-user:auth': Omit<IDtoOptionsAuth, '_fieldsMore_'>;
+    'home-user:passport': Omit<IDtoOptionsPassport, '_fieldsMore_'>;
+    'home-user:passportJwt': Omit<IDtoOptionsPassportJwt, '_fieldsMore_'>;
   }
 
 }
@@ -194,15 +194,15 @@ declare module 'vona-module-home-user' {
 declare module 'vona-module-home-user' {
 
   export interface IDtoOptionsAuth {
-    fields?: TypeEntityOptionsFields<DtoAuth, IDtoOptionsAuth['fieldsMore']>;
+    fields?: TypeEntityOptionsFields<DtoAuth, IDtoOptionsAuth['_fieldsMore_']>;
   }
 
   export interface IDtoOptionsPassport {
-    fields?: TypeEntityOptionsFields<DtoPassport, IDtoOptionsPassport['fieldsMore']>;
+    fields?: TypeEntityOptionsFields<DtoPassport, IDtoOptionsPassport['_fieldsMore_']>;
   }
 
   export interface IDtoOptionsPassportJwt {
-    fields?: TypeEntityOptionsFields<DtoPassportJwt, IDtoOptionsPassportJwt['fieldsMore']>;
+    fields?: TypeEntityOptionsFields<DtoPassportJwt, IDtoOptionsPassportJwt['_fieldsMore_']>;
   }
 }
 export * from '../model/user.ts';

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/passportAdapter.ts

@@ -1,13 +1,14 @@
 import type { IPassportAdapter, IPassportBase } from 'vona-module-a-user';
 import type { IPassport, IPayloadData } from '../types/passport.ts';
-import type { IUser } from '../types/user.ts';
 import { BeanBase } from 'vona';
+import { $getRoleName } from 'vona-module-a-user';
 import { Service } from 'vona-module-a-web';
 
 @Service()
 export class ServicePassportAdapter extends BeanBase implements IPassportAdapter {
-  async isAdmin(user: IUser): Promise<boolean> {
-    return user.name === 'admin';
+  async isAdmin(passport: IPassport | undefined): Promise<boolean> {
+    if (!passport || !passport.roles) return false;
+    return passport.roles.some(item => $getRoleName(item) === 'admin');
   }
 
   async setCurrent(passport: IPassport | undefined): Promise<IPassport | undefined> {