@yongdall/user-rbac 0.6.2 → 0.6.4

package/index.d.mts

@@ -9,9 +9,7 @@ declare const _default: _yongdall_model0.ModelTable<{
 }, string>;
 //#endregion
 //#region plugins/user-rbac/index.d.mts
-/** @type {(user?: string?) => Promise<string[]>} */
 declare const useRoleIds: (user?: string | null) => Promise<string[]>;
-/** @type {(user?: string?) => Promise<string[]>} */
 declare const usePermissions: (user?: string | null) => Promise<string[]>;
 //#endregion
 export { _default as UserRole, usePermissions, useRoleIds };

package/index.mjs

@@ -1,22 +1,3 @@
-import { t as UserRole_default } from "./models-C4PS3teD.mjs";
-import { Query, actions } from "@yongdall/model";
-import { RolePermission } from "@yongdall/role";
-import { useDatabase } from "@yongdall/connection";
-import { createKeyStore } from "@yongdall/context";
+import { n as useRoleIds, r as UserRole_default, t as usePermissions } from "./user-rbac-BV-Z5Hx1.mjs";
 
-//#region plugins/user-rbac/index.mjs
-/** @type {(user?: string?) => Promise<string[]>} */
-const useRoleIds = createKeyStore(async (user) => {
-	if (!user) return [];
-	return (await useDatabase().call(actions.select(new Query(UserRole_default).select("roleId").where("userId", user)))).map((v) => v.roleId);
-}, (user) => user || "");
-/** @type {(user?: string?) => Promise<string[]>} */
-const usePermissions = createKeyStore(async (user) => {
-	const roleIds = await useRoleIds(user);
-	if (!roleIds.length) return [];
-	return (await useDatabase().call(actions.select(new Query(RolePermission).select("permission").where("roleId", "in", roleIds)))).map((v) => v.permission);
-}, (user) => user || "");
-
-//#endregion
-export { UserRole_default as UserRole, usePermissions, useRoleIds };
-//# sourceMappingURL=index.mjs.map
+export { UserRole_default as UserRole, usePermissions, useRoleIds };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yongdall/user-rbac",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "type": "module",
   "main": "./index.mjs",
   "exports": {
@@ -11,18 +11,18 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@yongdall/connection": "^0.6.2",
-    "@yongdall/context": "^0.6.2",
-    "@yongdall/core": "^0.6.2",
-    "@yongdall/model": "^0.6.2",
-    "@yongdall/role": "^0.6.2"
+    "@yongdall/connection": "^0.6.4",
+    "@yongdall/context": "^0.6.4",
+    "@yongdall/core": "^0.6.4",
+    "@yongdall/model": "^0.6.4",
+    "@yongdall/role-permission": "^0.6.4"
   },
   "devDependencies": {
-    "@yongdall/migrate": "^0.6.2",
-    "@yongdall/types": "^0.6.2",
-    "@yongdall/web": "^0.6.2"
+    "@yongdall/migrate": "^0.6.4",
+    "@yongdall/types": "^0.6.4",
+    "@yongdall/web": "^0.6.4"
   },
   "peerDependencies": {
-    "@yongdall/web": "^0.6.2"
+    "@yongdall/web": "^0.6.4"
   }
 }

package/user-rbac-BV-Z5Hx1.mjs

@@ -0,0 +1,42 @@
+import { useDatabase } from "@yongdall/connection";
+import { createKeyStore } from "@yongdall/context";
+import { Query, actions, createField, createModel } from "@yongdall/model";
+import { findRolePermissions } from "@yongdall/role-permission";
+
+//#region plugins/user-rbac/models/UserRole.mjs
+var UserRole_default = createModel("user.role", {
+	userId: createField("uuid", {
+		nullable: false,
+		model: "user",
+		label: "用户",
+		renderer: "document",
+		primary: 1
+	}),
+	no: createField("i32", {
+		nullable: false,
+		default: 1,
+		primary: 2
+	}),
+	roleId: createField("uuid", {
+		nullable: false,
+		model: "role",
+		label: "角色",
+		renderer: "document"
+	})
+});
+
+//#endregion
+//#region plugins/user-rbac/index.mts
+const useRoleIds = createKeyStore(async (user) => {
+	if (!user) return [];
+	return (await useDatabase().call(actions.select(new Query(UserRole_default).select("roleId").where("userId", user)))).map((v) => v.roleId);
+}, (user) => user || "");
+const usePermissions = createKeyStore(async (user) => {
+	const roleIds = await useRoleIds(user);
+	if (!roleIds.length) return [];
+	return (await findRolePermissions(roleIds)).map((v) => v.permission);
+}, (user) => user || "");
+
+//#endregion
+export { useRoleIds as n, UserRole_default as r, usePermissions as t };
+//# sourceMappingURL=user-rbac-BV-Z5Hx1.mjs.map

package/user-rbac-BV-Z5Hx1.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-rbac-BV-Z5Hx1.mjs","names":["UserRole"],"sources":["../../plugins/user-rbac/models/UserRole.mjs","../../plugins/user-rbac/index.mts"],"sourcesContent":["import { createModel, createField } from '@yongdall/model';\n\nexport default createModel('user.role', {\n\tuserId: createField('uuid', { nullable: false, model: 'user', label: '用户', renderer: 'document', primary: 1 }),\n\tno: createField('i32', { nullable: false, default: 1, primary: 2 }),\n\troleId: createField('uuid', { nullable: false, model: 'role', label: '角色', renderer: 'document' }),\n});\n","import { useDatabase } from '@yongdall/connection';\nimport { createKeyStore } from '@yongdall/context';\nimport { actions, Query } from '@yongdall/model';\nimport { UserRole } from './models/index.mjs';\nimport { findRolePermissions } from '@yongdall/role-permission';\n\nexport * from './models/index.mjs';\n\n\nexport const useRoleIds = createKeyStore(async (user?: string | null) => {\n\tif (!user) { return []; }\n\tconst list: {roleId: string}[] = await useDatabase().call(actions.select(\n\t\tnew Query(UserRole).select('roleId').where('userId', user)\n\t));\n\treturn list.map(v => v.roleId);\n}, user => user || '');\n\nexport const usePermissions = createKeyStore(async (user?: string | null) => {\n\tconst roleIds = await useRoleIds(user);\n\tif (!roleIds.length) { return []; };\n\tconst list = await findRolePermissions(roleIds);\n\treturn list.map(v => v.permission);\n}, user => user || '');\n"],"mappings":";;;;;;AAEA,uBAAe,YAAY,aAAa;CACvC,QAAQ,YAAY,QAAQ;EAAE,UAAU;EAAO,OAAO;EAAQ,OAAO;EAAM,UAAU;EAAY,SAAS;EAAG,CAAC;CAC9G,IAAI,YAAY,OAAO;EAAE,UAAU;EAAO,SAAS;EAAG,SAAS;EAAG,CAAC;CACnE,QAAQ,YAAY,QAAQ;EAAE,UAAU;EAAO,OAAO;EAAQ,OAAO;EAAM,UAAU;EAAY,CAAC;CAClG,CAAC;;;;ACGF,MAAa,aAAa,eAAe,OAAO,SAAyB;AACxE,KAAI,CAAC,KAAQ,QAAO,EAAE;AAItB,SAHiC,MAAM,aAAa,CAAC,KAAK,QAAQ,OACjE,IAAI,MAAMA,iBAAS,CAAC,OAAO,SAAS,CAAC,MAAM,UAAU,KAAK,CAC1D,CAAC,EACU,KAAI,MAAK,EAAE,OAAO;IAC5B,SAAQ,QAAQ,GAAG;AAEtB,MAAa,iBAAiB,eAAe,OAAO,SAAyB;CAC5E,MAAM,UAAU,MAAM,WAAW,KAAK;AACtC,KAAI,CAAC,QAAQ,OAAU,QAAO,EAAE;AAEhC,SADa,MAAM,oBAAoB,QAAQ,EACnC,KAAI,MAAK,EAAE,WAAW;IAChC,SAAQ,QAAQ,GAAG"}

package/yongdall/migration.mjs

@@ -1,10 +1,9 @@
-import { t as UserRole_default } from "../models-C4PS3teD.mjs";
-import { Role } from "@yongdall/role";
+import { r as UserRole_default } from "../user-rbac-BV-Z5Hx1.mjs";
 
 //#region plugins/user-rbac/yongdall/migration.mjs
 /** @import { Profile } from '@yongdall/migrate' */
 /** @type {Profile['models']} */
-const models = [UserRole_default, Role];
+const models = [UserRole_default];
 
 //#endregion
 export { models };

package/yongdall/migration.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"migration.mjs","names":["UserRole"],"sources":["../../../plugins/user-rbac/yongdall/migration.mjs"],"sourcesContent":["/** @import { Profile } from '@yongdall/migrate' */\nimport { UserRole } from '../models/index.mjs';\nimport { Role } from '@yongdall/role';\n\n\n/** @type {Profile['models']} */\nexport const models = [\n\tUserRole,\n\tRole,\n];\n"],"mappings":";;;;;;AAMA,MAAa,SAAS,CACrBA,kBACA,KACA"}
+{"version":3,"file":"migration.mjs","names":["UserRole"],"sources":["../../../plugins/user-rbac/yongdall/migration.mjs"],"sourcesContent":["/** @import { Profile } from '@yongdall/migrate' */\nimport { UserRole } from '../index.mts';\n\n\n/** @type {Profile['models']} */\nexport const models = [\n\tUserRole,\n];\n"],"mappings":";;;;;AAKA,MAAa,SAAS,CACrBA,iBACA"}

package/yongdall/model.mjs

@@ -1,10 +1,9 @@
-import { t as UserRole_default } from "../models-C4PS3teD.mjs";
-import { Role } from "@yongdall/role";
+import { r as UserRole_default } from "../user-rbac-BV-Z5Hx1.mjs";
 
 //#region plugins/user-rbac/yongdall/model.mjs
 /** @import { ModelProfile } from '@yongdall/core' */
 /** @type {ModelProfile['models']} */
-const models = { role: Role };
+const models = {};
 /** @type {ModelProfile['modelExpands']} */
 const modelExpands = { user: { roles: {
 	label: "角色",

package/yongdall/model.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"model.mjs","names":["UserRole"],"sources":["../../../plugins/user-rbac/yongdall/model.mjs"],"sourcesContent":["/** @import { ModelProfile } from '@yongdall/core' */\nimport { UserRole } from '../models/index.mjs';\nimport { Role } from '@yongdall/role';\n\n/** @type {ModelProfile['models']} */\nexport const models = {\n\trole: Role,\n};\n\n/** @type {ModelProfile['modelExpands']} */\nexport const modelExpands = {\n\tuser: {\n\t\troles: {\n\t\t\tlabel: '角色',\n\t\t\tnullable: false,\n\t\t\ttype: UserRole,\n\t\t\tconstraints: {userId: {field: 'id'}, no: {noField: true}},\n\t\t\tarray: true,\n\t\t\tlayout: {\n\t\t\t\tcolumns: [{actions: ['add', 'remove'], width: 100}, {field: 'roleId'}]\n\t\t\t}\n\t\t}\n\t}\n}\n"],"mappings":";;;;;;AAKA,MAAa,SAAS,EACrB,MAAM,MACN;;AAGD,MAAa,eAAe,EAC3B,MAAM,EACL,OAAO;CACN,OAAO;CACP,UAAU;CACV,MAAMA;CACN,aAAa;EAAC,QAAQ,EAAC,OAAO,MAAK;EAAE,IAAI,EAAC,SAAS,MAAK;EAAC;CACzD,OAAO;CACP,QAAQ,EACP,SAAS,CAAC;EAAC,SAAS,CAAC,OAAO,SAAS;EAAE,OAAO;EAAI,EAAE,EAAC,OAAO,UAAS,CAAC,EACtE;CACD,EACD,EACD"}
+{"version":3,"file":"model.mjs","names":["UserRole"],"sources":["../../../plugins/user-rbac/yongdall/model.mjs"],"sourcesContent":["/** @import { ModelProfile } from '@yongdall/core' */\nimport { UserRole } from '../index.mts';\n\n/** @type {ModelProfile['models']} */\nexport const models = {\n};\n\n/** @type {ModelProfile['modelExpands']} */\nexport const modelExpands = {\n\tuser: {\n\t\troles: {\n\t\t\tlabel: '角色',\n\t\t\tnullable: false,\n\t\t\ttype: UserRole,\n\t\t\tconstraints: {userId: {field: 'id'}, no: {noField: true}},\n\t\t\tarray: true,\n\t\t\tlayout: {\n\t\t\t\tcolumns: [{actions: ['add', 'remove'], width: 100}, {field: 'roleId'}]\n\t\t\t}\n\t\t}\n\t}\n}\n"],"mappings":";;;;;AAIA,MAAa,SAAS,EACrB;;AAGD,MAAa,eAAe,EAC3B,MAAM,EACL,OAAO;CACN,OAAO;CACP,UAAU;CACV,MAAMA;CACN,aAAa;EAAC,QAAQ,EAAC,OAAO,MAAK;EAAE,IAAI,EAAC,SAAS,MAAK;EAAC;CACzD,OAAO;CACP,QAAQ,EACP,SAAS,CAAC;EAAC,SAAS,CAAC,OAAO,SAAS;EAAE,OAAO;EAAI,EAAE,EAAC,OAAO,UAAS,CAAC,EACtE;CACD,EACD,EACD"}

package/yongdall/user.mjs

@@ -1,5 +1,4 @@
-import "../models-C4PS3teD.mjs";
-import { usePermissions } from "../index.mjs";
+import { t as usePermissions } from "../user-rbac-BV-Z5Hx1.mjs";
 
 //#region plugins/user-rbac/yongdall/user.mjs
 /** @import { UserManager } from '@yongdall/core' */

package/yongdall/user.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"user.mjs","names":[],"sources":["../../../plugins/user-rbac/yongdall/user.mjs"],"sourcesContent":["/** @import { UserManager } from '@yongdall/core' */\nimport { usePermissions } from '../index.mjs';\n\n\n/** @type {UserManager['getPermissions']} */\nexport const getPermissions = user => usePermissions(user);\n"],"mappings":";;;;;;AAKA,MAAa,kBAAiB,SAAQ,eAAe,KAAK"}
+{"version":3,"file":"user.mjs","names":[],"sources":["../../../plugins/user-rbac/yongdall/user.mjs"],"sourcesContent":["/** @import { UserManager } from '@yongdall/core' */\nimport { usePermissions } from '../index.mts';\n\n\n/** @type {UserManager['getPermissions']} */\nexport const getPermissions = user => usePermissions(user);\n"],"mappings":";;;;;AAKA,MAAa,kBAAiB,SAAQ,eAAe,KAAK"}

package/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.mjs","names":["UserRole"],"sources":["../../plugins/user-rbac/index.mjs"],"sourcesContent":["import { useDatabase } from '@yongdall/connection';\nimport { createKeyStore } from '@yongdall/context';\nimport { actions, Query } from '@yongdall/model';\nimport { UserRole } from './models/index.mjs';\nimport { RolePermission } from '@yongdall/role';\n\nexport * from './models/index.mjs';\n\n\n/** @type {(user?: string?) => Promise<string[]>} */\nexport const useRoleIds = createKeyStore(async user => {\n\tif (!user) { return []; }\n\tconst list = await useDatabase().call(actions.select(\n\t\tnew Query(UserRole).select('roleId').where('userId', user)\n\t));\n\treturn list.map(v => v.roleId);\n}, user => user || '');\n\n/** @type {(user?: string?) => Promise<string[]>} */\nexport const usePermissions = createKeyStore(async user => {\n\tconst roleIds = await useRoleIds(user);\n\tif (!roleIds.length) { return []; };\n\tconst list = await useDatabase().call(actions.select(\n\t\tnew Query(RolePermission).select('permission').where('roleId', 'in', roleIds)\n\t));\n\treturn list.map(v => v.permission);\n}, user => user || '');\n"],"mappings":";;;;;;;;AAUA,MAAa,aAAa,eAAe,OAAM,SAAQ;AACtD,KAAI,CAAC,KAAQ,QAAO,EAAE;AAItB,SAHa,MAAM,aAAa,CAAC,KAAK,QAAQ,OAC7C,IAAI,MAAMA,iBAAS,CAAC,OAAO,SAAS,CAAC,MAAM,UAAU,KAAK,CAC1D,CAAC,EACU,KAAI,MAAK,EAAE,OAAO;IAC5B,SAAQ,QAAQ,GAAG;;AAGtB,MAAa,iBAAiB,eAAe,OAAM,SAAQ;CAC1D,MAAM,UAAU,MAAM,WAAW,KAAK;AACtC,KAAI,CAAC,QAAQ,OAAU,QAAO,EAAE;AAIhC,SAHa,MAAM,aAAa,CAAC,KAAK,QAAQ,OAC7C,IAAI,MAAM,eAAe,CAAC,OAAO,aAAa,CAAC,MAAM,UAAU,MAAM,QAAQ,CAC7E,CAAC,EACU,KAAI,MAAK,EAAE,WAAW;IAChC,SAAQ,QAAQ,GAAG"}

package/models-C4PS3teD.mjs

@@ -1,27 +0,0 @@
-import { createField, createModel } from "@yongdall/model";
-
-//#region plugins/user-rbac/models/UserRole.mjs
-var UserRole_default = createModel("user.role", {
-	userId: createField("uuid", {
-		nullable: false,
-		model: "user",
-		label: "用户",
-		renderer: "document",
-		primary: 1
-	}),
-	no: createField("i32", {
-		nullable: false,
-		default: 1,
-		primary: 2
-	}),
-	roleId: createField("uuid", {
-		nullable: false,
-		model: "role",
-		label: "角色",
-		renderer: "document"
-	})
-});
-
-//#endregion
-export { UserRole_default as t };
-//# sourceMappingURL=models-C4PS3teD.mjs.map

package/models-C4PS3teD.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"models-C4PS3teD.mjs","names":[],"sources":["../../plugins/user-rbac/models/UserRole.mjs"],"sourcesContent":["import { createModel, createField } from '@yongdall/model';\n\nexport default createModel('user.role', {\n\tuserId: createField('uuid', { nullable: false, model: 'user', label: '用户', renderer: 'document', primary: 1 }),\n\tno: createField('i32', { nullable: false, default: 1, primary: 2 }),\n\troleId: createField('uuid', { nullable: false, model: 'role', label: '角色', renderer: 'document' }),\n});\n"],"mappings":";;;AAEA,uBAAe,YAAY,aAAa;CACvC,QAAQ,YAAY,QAAQ;EAAE,UAAU;EAAO,OAAO;EAAQ,OAAO;EAAM,UAAU;EAAY,SAAS;EAAG,CAAC;CAC9G,IAAI,YAAY,OAAO;EAAE,UAAU;EAAO,SAAS;EAAG,SAAS;EAAG,CAAC;CACnE,QAAQ,YAAY,QAAQ;EAAE,UAAU;EAAO,OAAO;EAAQ,OAAO;EAAM,UAAU;EAAY,CAAC;CAClG,CAAC"}