@nu-art/permissions-shared 0.401.9 → 0.500.0

package/_entity/permission-access-level/db-def.d.ts

@@ -1,3 +1,5 @@
-import { DBDef_V3 } from '@nu-art/ts-common';
-import { DBProto_PermissionAccessLevel } from './types.js';
-export declare const DBDef_PermissionAccessLevel: DBDef_V3<DBProto_PermissionAccessLevel>;
+import { Database } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionAccessLevel } from './types.js';
+export declare const DBDef_PermissionAccessLevel: Database<DatabaseDef_PermissionAccessLevel>;
+/** Brand a string as DatabaseDef_PermissionAccessLevel['id']. Use for literal ids (e.g. default levels). */
+export declare const toPermissionAccessLevelId: (id: string) => import("@nu-art/db-api-shared").DB_UniqueId<"permissions--level">;

package/_entity/permission-access-level/db-def.js

@@ -1,4 +1,6 @@
+import { stringToUniqueId } from '@nu-art/db-api-shared';
 import { tsValidateIsInRange, tsValidateString, tsValidateStringWithDashes, tsValidateUniqueId } from '@nu-art/ts-common';
+import { PermissionAccessLevel_DbKey } from './types.js';
 import { PermissionDBGroup } from '../../consts.js';
 const Validator_ModifiableProps = {
     domainId: tsValidateUniqueId,
@@ -9,11 +11,13 @@ const Validator_ModifiableProps = {
 const Validator_GeneratedProps = {
     _auditorId: tsValidateString()
 };
+const GeneratedProps = ['_auditorId'];
 export const DBDef_PermissionAccessLevel = {
     modifiablePropsValidator: Validator_ModifiableProps,
     generatedPropsValidator: Validator_GeneratedProps,
+    generatedProps: GeneratedProps,
     versions: ['1.0.1', '1.0.0'],
-    dbKey: 'permissions--level',
+    dbKey: PermissionAccessLevel_DbKey,
     entityName: 'PermissionAccessLevel',
     frontend: {
         group: PermissionDBGroup,
@@ -29,3 +33,5 @@ export const DBDef_PermissionAccessLevel = {
         }
     }
 };
+/** Brand a string as DatabaseDef_PermissionAccessLevel['id']. Use for literal ids (e.g. default levels). */
+export const toPermissionAccessLevelId = (id) => stringToUniqueId(id);

package/_entity/permission-access-level/types.d.ts

@@ -1,27 +1,30 @@
-import { AuditableV2, DB_Object, DBProto, Proto_DB_Object, VersionsDeclaration } from '@nu-art/ts-common';
-import { DBProto_PermissionDomain } from '../permission-domain/types.js';
+import { DB_Object, DB_ProtoSeed, DB_Prototype, VersionsDeclaration } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionDomain } from '../permission-domain/types.js';
+export declare const PermissionAccessLevel_DbKey = "permissions--level";
+type DBKey = typeof PermissionAccessLevel_DbKey;
 type VersionTypes_PermissionAccessLevel = {
     '1.0.0': DB_PermissionAccessLevel;
     '1.0.1': DB_PermissionAccessLevel;
 };
 type Versions = VersionsDeclaration<['1.0.1', '1.0.0'], VersionTypes_PermissionAccessLevel>;
-type Dependencies = {
-    domainId: DBProto_PermissionDomain;
-};
 type UniqueKeys = '_id';
 type GeneratedProps = '_auditorId';
-type Proto = Proto_DB_Object<DB_PermissionAccessLevel, 'permissions--level', GeneratedProps, Versions, UniqueKeys, Dependencies>;
-export type DBProto_PermissionAccessLevel = DBProto<Proto>;
-export type UI_PermissionAccessLevel = DBProto_PermissionAccessLevel['uiType'];
+type Dependencies = {
+    domainId: DatabaseDef_PermissionDomain;
+};
+type Proto = DB_ProtoSeed<DB_PermissionAccessLevel, DBKey, GeneratedProps, Versions, UniqueKeys, Dependencies>;
+export type DatabaseDef_PermissionAccessLevel = DB_Prototype<Proto>;
+export type UI_PermissionAccessLevel = DatabaseDef_PermissionAccessLevel['uiType'];
 export type Base_AccessLevel = {
-    domainId: string;
+    domainId: DatabaseDef_PermissionDomain['id'];
     value: number;
 };
-export type DB_PermissionAccessLevel = DB_Object & Base_AccessLevel & AuditableV2 & {
+export type DB_PermissionAccessLevel = DB_Object<DBKey> & Base_AccessLevel & {
     name: string;
     uiLabel: string;
+    _auditorId?: string;
 };
-export type DB_PermissionAccessLevel_1_0_0 = DB_Object & Base_AccessLevel & AuditableV2 & {
+export type DB_PermissionAccessLevel_1_0_0 = DB_Object<DBKey> & Base_AccessLevel & {
     name: string;
 };
 export {};

package/_entity/permission-access-level/types.js

@@ -1 +1 @@
-export {};
+export const PermissionAccessLevel_DbKey = 'permissions--level';

package/_entity/permission-api/db-def.d.ts

@@ -1,3 +1,3 @@
-import { DBDef_V3 } from '@nu-art/ts-common';
-import { DBProto_PermissionAPI } from './types.js';
-export declare const DBDef_PermissionAPI: DBDef_V3<DBProto_PermissionAPI>;
+import { Database } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionAPI } from './types.js';
+export declare const DBDef_PermissionAPI: Database<DatabaseDef_PermissionAPI>;

package/_entity/permission-api/db-def.js

@@ -1,6 +1,8 @@
 import { tsValidateArray, tsValidateBoolean, tsValidateDynamicObject, tsValidateNumber, tsValidateString, tsValidateUniqueId } from '@nu-art/ts-common';
+import { PermissionAPI_DbKey } from './types.js';
 import { PermissionDBGroup } from '../../consts.js';
 import { tsValidateStringWithDashesAndSlash, validateProjectId } from '../../validators.js';
+import { tsValidator_AuditableV2 } from '@nu-art/user-account-shared';
 const Validator_ModifiableProps = {
     projectId: validateProjectId,
     path: tsValidateStringWithDashesAndSlash,
@@ -9,14 +11,15 @@ const Validator_ModifiableProps = {
     onlyForApplication: tsValidateBoolean(false),
 };
 const Validator_GeneratedProps = {
-    _auditorId: tsValidateString(),
+    ...tsValidator_AuditableV2,
     _accessLevels: tsValidateDynamicObject(tsValidateNumber(), tsValidateString(), false),
 };
 export const DBDef_PermissionAPI = {
     modifiablePropsValidator: Validator_ModifiableProps,
     generatedPropsValidator: Validator_GeneratedProps,
+    generatedProps: ['_auditorId', '_accessLevels'],
     versions: ['1.0.1', '1.0.0'],
-    dbKey: 'permissions--api',
+    dbKey: PermissionAPI_DbKey,
     frontend: {
         group: PermissionDBGroup,
         name: 'api',

package/_entity/permission-api/types.d.ts

@@ -1,29 +1,34 @@
-import { AuditableV2, DB_Object, DBProto, Proto_DB_Object, UniqueId, VersionsDeclaration } from '@nu-art/ts-common';
-import { DBProto_PermissionProject } from '../permission-project/index.js';
-import { DBProto_PermissionAccessLevel } from '../permission-access-level/index.js';
+import { DB_Object, DB_ProtoSeed, DB_Prototype, VersionsDeclaration } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionAccessLevel } from '../permission-access-level/types.js';
+import { DatabaseDef_PermissionDomain } from '../permission-domain/types.js';
+import { DatabaseDef_PermissionProject } from '../permission-project/types.js';
+import { AuditableV2 } from '@nu-art/user-account-shared';
+export declare const PermissionAPI_DbKey = "permissions--api";
+type DBKey = typeof PermissionAPI_DbKey;
 type VersionTypes_PermissionAPI = {
     '1.0.0': DB_PermissionAPI;
     '1.0.1': DB_PermissionAPI;
 };
 type Versions = VersionsDeclaration<['1.0.1', '1.0.0'], VersionTypes_PermissionAPI>;
-type Dependencies = {
-    projectId: DBProto_PermissionProject;
-    accessLevelIds: DBProto_PermissionAccessLevel;
-};
 type UniqueKeys = 'projectId' | 'path';
 type GeneratedProps = '_auditorId' | '_accessLevels';
-type Proto = Proto_DB_Object<DB_PermissionAPI, 'permissions--api', GeneratedProps, Versions, UniqueKeys, Dependencies>;
-export type DBProto_PermissionAPI = DBProto<Proto>;
-export type UI_PermissionAPI = DBProto_PermissionAPI['uiType'];
-export type DB_PermissionAPI = DB_Object & AuditableV2 & {
-    projectId: string;
+type Dependencies = {
+    projectId: DatabaseDef_PermissionProject;
+    accessLevelIds: DatabaseDef_PermissionAccessLevel;
+};
+type Proto = DB_ProtoSeed<DB_PermissionAPI, DBKey, GeneratedProps, Versions, UniqueKeys, Dependencies>;
+export type DatabaseDef_PermissionAPI = DB_Prototype<Proto>;
+export type UI_PermissionAPI = DatabaseDef_PermissionAPI['uiType'];
+/** @deprecated API collection deprecated; use function-based permissions and @RequirePermission. */
+export type DB_PermissionAPI = DB_Object<DBKey> & AuditableV2 & {
+    projectId: DatabaseDef_PermissionProject['id'];
     path: string;
-    accessLevelIds?: string[];
+    accessLevelIds?: DatabaseDef_PermissionAccessLevel['id'][];
     deprecated?: boolean;
     onlyForApplication?: boolean;
     _accessLevels?: DomainToLevelValueMap;
 };
 export type DomainToLevelValueMap = {
-    [domainId: UniqueId]: number;
+    [domainId: DatabaseDef_PermissionDomain['id']]: number;
 };
 export {};

package/_entity/permission-api/types.js

@@ -1 +1 @@
-export {};
+export const PermissionAPI_DbKey = 'permissions--api';

package/_entity/permission-domain/db-def.d.ts

@@ -1,3 +1,5 @@
-import { DBDef_V3 } from '@nu-art/ts-common';
-import { DBProto_PermissionDomain } from './types.js';
-export declare const DBDef_PermissionDomain: DBDef_V3<DBProto_PermissionDomain>;
+import { Database } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionDomain } from './types.js';
+export declare const DBDef_PermissionDomain: Database<DatabaseDef_PermissionDomain>;
+/** Brand a string as DatabaseDef_PermissionDomain['id']. Use for literal ids (e.g. default domains). */
+export declare const toPermissionDomainId: (id: string) => import("@nu-art/db-api-shared").DB_UniqueId<"permissions--domain">;

package/_entity/permission-domain/db-def.js

@@ -1,4 +1,6 @@
+import { stringToUniqueId } from '@nu-art/db-api-shared';
 import { tsValidateString } from '@nu-art/ts-common';
+import { PermissionDomain_DbKey } from './types.js';
 import { validateProjectId } from '../../validators.js';
 import { PermissionDBGroup } from '../../consts.js';
 const Validator_ModifiableProps = {
@@ -11,8 +13,9 @@ const Validator_GeneratedProps = {
 export const DBDef_PermissionDomain = {
     modifiablePropsValidator: Validator_ModifiableProps,
     generatedPropsValidator: Validator_GeneratedProps,
+    generatedProps: ['_auditorId'],
     versions: ['1.0.0'],
-    dbKey: 'permissions--domain',
+    dbKey: PermissionDomain_DbKey,
     frontend: {
         group: PermissionDBGroup,
         name: 'domain',
@@ -29,3 +32,5 @@ export const DBDef_PermissionDomain = {
         }
     }
 };
+/** Brand a string as DatabaseDef_PermissionDomain['id']. Use for literal ids (e.g. default domains). */
+export const toPermissionDomainId = (id) => stringToUniqueId(id);

package/_entity/permission-domain/types.d.ts

@@ -1,19 +1,22 @@
-import { AuditableV2, DB_Object, DBProto, Proto_DB_Object, VersionsDeclaration } from '@nu-art/ts-common';
-import { DBProto_PermissionProject } from '../permission-project/index.js';
+import { DB_Object, DB_ProtoSeed, DB_Prototype, VersionsDeclaration } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionProject } from '../permission-project/types.js';
+import { AuditableV2 } from '@nu-art/user-account-shared';
+export declare const PermissionDomain_DbKey = "permissions--domain";
+type DBKey = typeof PermissionDomain_DbKey;
 type VersionTypes_PermissionDomain = {
     '1.0.0': DB_PermissionDomain;
 };
 type Versions = VersionsDeclaration<['1.0.0'], VersionTypes_PermissionDomain>;
-type Dependencies = {
-    projectId: DBProto_PermissionProject;
-};
 type UniqueKeys = '_id';
 type GeneratedProps = '_auditorId';
-type Proto = Proto_DB_Object<DB_PermissionDomain, 'permissions--domain', GeneratedProps, Versions, UniqueKeys, Dependencies>;
-export type DBProto_PermissionDomain = DBProto<Proto>;
-export type UI_PermissionDomain = DBProto_PermissionDomain['uiType'];
-export type DB_PermissionDomain = DB_Object & AuditableV2 & {
-    projectId: string;
+type Dependencies = {
+    projectId: DatabaseDef_PermissionProject;
+};
+type Proto = DB_ProtoSeed<DB_PermissionDomain, DBKey, GeneratedProps, Versions, UniqueKeys, Dependencies>;
+export type DatabaseDef_PermissionDomain = DB_Prototype<Proto>;
+export type UI_PermissionDomain = DatabaseDef_PermissionDomain['uiType'];
+export type DB_PermissionDomain = DB_Object<DBKey> & AuditableV2 & {
+    projectId: DatabaseDef_PermissionProject['id'];
     namespace: string;
 };
 export {};

package/_entity/permission-domain/types.js

@@ -1 +1 @@
-export {};
+export const PermissionDomain_DbKey = 'permissions--domain';

package/_entity/permission-group/db-def.d.ts

@@ -1,3 +1,5 @@
-import { DBDef_V3 } from '@nu-art/ts-common';
-import { DBProto_PermissionGroup } from './types.js';
-export declare const DBDef_PermissionGroup: DBDef_V3<DBProto_PermissionGroup>;
+import { Database } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionGroup } from './types.js';
+export declare const DBDef_PermissionGroup: Database<DatabaseDef_PermissionGroup>;
+/** Brand a string as DatabaseDef_PermissionGroup['id']. Use for literal ids (e.g. default groups). */
+export declare const toPermissionGroupId: (id: string) => import("@nu-art/db-api-shared").DB_UniqueId<"permissions--group">;

package/_entity/permission-group/db-def.js

@@ -1,6 +1,9 @@
-import { tsValidateArray, tsValidateDynamicObject, tsValidateNumber, tsValidateOptionalId, tsValidateString, tsValidateUniqueId } from '@nu-art/ts-common';
+import { tsValidateArray, tsValidateDynamicObject, tsValidateNumber, tsValidateOptionalId, tsValidateString, tsValidateUniqueId, } from '@nu-art/ts-common';
+import { stringToUniqueId } from '@nu-art/db-api-shared';
+import { PermissionGroup_DbKey } from './types.js';
 import { PermissionDBGroup } from '../../consts.js';
 import { validateGroupLabel } from '../../validators.js';
+import { tsValidator_AuditableV2 } from '@nu-art/user-account-shared';
 const Validator_ModifiableProps = {
     label: validateGroupLabel,
     uiLabel: tsValidateString(),
@@ -8,14 +11,15 @@ const Validator_ModifiableProps = {
     accessLevelIds: tsValidateArray(tsValidateUniqueId, false),
 };
 const Validator_GeneratedProps = {
+    ...tsValidator_AuditableV2,
     _levelsMap: tsValidateDynamicObject(tsValidateNumber(), tsValidateString(), false),
-    _auditorId: tsValidateString(),
 };
 export const DBDef_PermissionGroup = {
     modifiablePropsValidator: Validator_ModifiableProps,
     generatedPropsValidator: Validator_GeneratedProps,
+    generatedProps: ['_levelsMap'],
     versions: ['1.0.1', '1.0.0'],
-    dbKey: 'permissions--group',
+    dbKey: PermissionGroup_DbKey,
     entityName: 'PermissionGroup',
     frontend: {
         group: PermissionDBGroup,
@@ -35,3 +39,5 @@ export const DBDef_PermissionGroup = {
         }
     }
 };
+/** Brand a string as DatabaseDef_PermissionGroup['id']. Use for literal ids (e.g. default groups). */
+export const toPermissionGroupId = (id) => stringToUniqueId(id);

package/_entity/permission-group/types.d.ts

@@ -1,31 +1,35 @@
-import { AuditableV2, DB_Object, DBProto, Proto_DB_Object, TypedMap, VersionsDeclaration } from '@nu-art/ts-common';
-import { DBProto_PermissionProject } from '../permission-project/index.js';
-import { DBProto_PermissionAccessLevel } from '../permission-access-level/index.js';
+import { TypedMap } from '@nu-art/ts-common';
+import { DB_Object, DB_ProtoSeed, DB_Prototype, VersionsDeclaration } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionProject } from '../permission-project/types.js';
+import { DatabaseDef_PermissionAccessLevel } from '../permission-access-level/types.js';
+import { AuditableV2 } from '@nu-art/user-account-shared';
+export declare const PermissionGroup_DbKey = "permissions--group";
+type DBKey = typeof PermissionGroup_DbKey;
 type VersionTypes_PermissionGroup = {
     '1.0.0': DB_PermissionGroup;
     '1.0.1': DB_PermissionGroup;
 };
 type Versions = VersionsDeclaration<['1.0.1', '1.0.0'], VersionTypes_PermissionGroup>;
+type UniqueKeys = '_id';
+type GeneratedProps = '_levelsMap' | keyof AuditableV2;
 type Dependencies = {
-    projectId: DBProto_PermissionProject;
-    accessLevelIds: DBProto_PermissionAccessLevel;
+    projectId: DatabaseDef_PermissionProject;
+    accessLevelIds: DatabaseDef_PermissionAccessLevel;
 };
-type UniqueKeys = '_id';
-type GeneratedProps = '_levelsMap' | '_auditorId';
-type Proto = Proto_DB_Object<DB_PermissionGroup, 'permissions--group', GeneratedProps, Versions, UniqueKeys, Dependencies>;
-export type DBProto_PermissionGroup = DBProto<Proto>;
-export type UI_PermissionGroup = DBProto_PermissionGroup['uiType'];
-export type DB_PermissionGroup = DB_Object & AuditableV2 & {
-    projectId?: string;
+type Proto = DB_ProtoSeed<DB_PermissionGroup, DBKey, GeneratedProps, Versions, UniqueKeys, Dependencies>;
+export type DatabaseDef_PermissionGroup = DB_Prototype<Proto>;
+export type UI_PermissionGroup = DatabaseDef_PermissionGroup['uiType'];
+export type DB_PermissionGroup = DB_Object<DBKey> & AuditableV2 & {
+    projectId?: DatabaseDef_PermissionProject['id'];
     label: string;
     uiLabel: string;
-    accessLevelIds: string[];
+    accessLevelIds: DatabaseDef_PermissionAccessLevel['id'][];
     _levelsMap?: TypedMap<number>;
 };
-export type DB_PermissionGroup_1_0_0 = DB_Object & AuditableV2 & {
-    projectId?: string;
+export type DB_PermissionGroup_1_0_0 = DB_Object<DBKey> & AuditableV2 & {
+    projectId?: DatabaseDef_PermissionProject['id'];
     label: string;
-    accessLevelIds: string[];
+    accessLevelIds: DatabaseDef_PermissionAccessLevel['id'][];
     _levelsMap?: TypedMap<number>;
 };
 export {};

package/_entity/permission-group/types.js

@@ -1 +1 @@
-export {};
+export const PermissionGroup_DbKey = 'permissions--group';

package/_entity/permission-project/db-def.d.ts

@@ -1,3 +1,5 @@
-import { DBDef_V3 } from '@nu-art/ts-common';
-import { DBProto_PermissionProject } from './types.js';
-export declare const DBDef_PermissionProject: DBDef_V3<DBProto_PermissionProject>;
+import { Database } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionProject } from './types.js';
+export declare const DBDef_PermissionProject: Database<DatabaseDef_PermissionProject>;
+/** Brand a string as DatabaseDef_PermissionProject['id']. Use for literal ids (e.g. default projects). */
+export declare const toPermissionProjectId: (id: string) => import("@nu-art/db-api-shared").DB_UniqueId<"permissions--project">;

package/_entity/permission-project/db-def.js

@@ -1,4 +1,6 @@
+import { stringToUniqueId } from '@nu-art/db-api-shared';
 import { tsValidateString } from '@nu-art/ts-common';
+import { PermissionProject_DbKey } from './types.js';
 import { PermissionDBGroup } from '../../consts.js';
 import { validateProjectName } from '../../validators.js';
 const Validator_ModifiableProps = {
@@ -10,8 +12,9 @@ const Validator_GeneratedProps = {
 export const DBDef_PermissionProject = {
     modifiablePropsValidator: Validator_ModifiableProps,
     generatedPropsValidator: Validator_GeneratedProps,
+    generatedProps: ['_auditorId'],
     versions: ['1.0.0'],
-    dbKey: 'permissions--project',
+    dbKey: PermissionProject_DbKey,
     entityName: 'PermissionsProject',
     frontend: {
         group: PermissionDBGroup,
@@ -21,3 +24,5 @@ export const DBDef_PermissionProject = {
         name: 'permissions--project'
     }
 };
+/** Brand a string as DatabaseDef_PermissionProject['id']. Use for literal ids (e.g. default projects). */
+export const toPermissionProjectId = (id) => stringToUniqueId(id);

package/_entity/permission-project/types.d.ts

@@ -1,15 +1,18 @@
-import { AuditableV2, DB_Object, DBProto, Proto_DB_Object, VersionsDeclaration } from '@nu-art/ts-common';
+import { DB_Object, DB_ProtoSeed, DB_Prototype, VersionsDeclaration } from '@nu-art/db-api-shared';
+import { AuditableV2 } from '@nu-art/user-account-shared';
+export declare const PermissionProject_DbKey = "permissions--project";
+type DBKey = typeof PermissionProject_DbKey;
 type VersionTypes_PermissionProject = {
     '1.0.0': DB_PermissionProject;
 };
 type Versions = VersionsDeclaration<['1.0.0'], VersionTypes_PermissionProject>;
-type Dependencies = {};
 type UniqueKeys = '_id';
 type GeneratedProps = '_auditorId';
-type Proto = Proto_DB_Object<DB_PermissionProject, 'permissions--project', GeneratedProps, Versions, UniqueKeys, Dependencies>;
-export type DBProto_PermissionProject = DBProto<Proto>;
-export type UI_PermissionProject = DBProto_PermissionProject['uiType'];
-export type DB_PermissionProject = DB_Object & AuditableV2 & {
+type Dependencies = {};
+type Proto = DB_ProtoSeed<DB_PermissionProject, DBKey, GeneratedProps, Versions, UniqueKeys, Dependencies>;
+export type DatabaseDef_PermissionProject = DB_Prototype<Proto>;
+export type UI_PermissionProject = DatabaseDef_PermissionProject['uiType'];
+export type DB_PermissionProject = DB_Object<DBKey> & AuditableV2 & {
     name: string;
 };
 export {};

package/_entity/permission-project/types.js

@@ -1 +1 @@
-export {};
+export const PermissionProject_DbKey = 'permissions--project';

package/_entity/permission-user/api-def.d.ts

@@ -1,12 +1,13 @@
-import { ApiDefResolver, BodyApi } from '@nu-art/thunderstorm-shared';
+import { ApiDefResolver, BodyApi } from '@nu-art/api-types';
+import { DatabaseDef_Account } from '@nu-art/user-account-shared';
+import { DatabaseDef_PermissionGroup } from '../permission-group/types.js';
+import { DatabaseDef_PermissionProject } from '../permission-project/types.js';
 export type Request_AssignPermissions = {
-    projectId?: string;
-    permissionGroupIds: string[];
-    targetAccountIds: string[];
+    projectId?: DatabaseDef_PermissionProject['id'];
+    permissionGroupIds: DatabaseDef_PermissionGroup['id'][];
+    targetAccountIds: DatabaseDef_Account['id'][];
 };
-export type ApiStruct_PermissionUser = {
-    _v1: {
-        assignPermissions: BodyApi<void, Request_AssignPermissions>;
-    };
+export type API_PermissionUser = {
+    assignPermissions: BodyApi<void, Request_AssignPermissions>;
 };
-export declare const ApiDef_PermissionUser: ApiDefResolver<ApiStruct_PermissionUser>;
+export declare const ApiDef_PermissionUser: ApiDefResolver<API_PermissionUser>;

package/_entity/permission-user/api-def.js

@@ -1,6 +1,4 @@
-import { HttpMethod } from '@nu-art/thunderstorm-shared';
+import { HttpMethod } from '@nu-art/api-types';
 export const ApiDef_PermissionUser = {
-    _v1: {
-        assignPermissions: { method: HttpMethod.POST, path: '/pah/permissions/assign/app-permissions' }
-    }
+    assignPermissions: { method: HttpMethod.POST, path: '/pah/permissions/assign/app-permissions' }
 };

package/_entity/permission-user/db-def.d.ts

@@ -1,3 +1,3 @@
-import { DBDef_V3 } from '@nu-art/ts-common';
-import { DBProto_PermissionUser } from './types.js';
-export declare const DBDef_PermissionUser: DBDef_V3<DBProto_PermissionUser>;
+import { Database } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionUser } from './types.js';
+export declare const DBDef_PermissionUser: Database<DatabaseDef_PermissionUser>;

package/_entity/permission-user/db-def.js

@@ -1,19 +1,22 @@
-import { tsValidateArray, tsValidateString, tsValidateStringAndNumbersWithDashes } from '@nu-art/ts-common';
+import { tsValidateArray, tsValidateStringAndNumbersWithDashes } from '@nu-art/ts-common';
+import { PermissionUser_DbKey } from './types.js';
 import { PermissionDBGroup } from '../../consts.js';
+import { tsValidator_AuditableV2 } from '@nu-art/user-account-shared';
 const Validator_ModifiableProps = {
     groups: tsValidateArray({
         groupId: tsValidateStringAndNumbersWithDashes,
     }, false),
 };
 const Validator_GeneratedProps = {
+    ...tsValidator_AuditableV2,
     __groupIds: tsValidateArray(tsValidateStringAndNumbersWithDashes, false),
-    _auditorId: tsValidateString()
 };
 export const DBDef_PermissionUser = {
     modifiablePropsValidator: Validator_ModifiableProps,
     generatedPropsValidator: Validator_GeneratedProps,
+    generatedProps: ['__groupIds', '_auditorId'],
     versions: ['1.0.0'],
-    dbKey: 'permissions--user',
+    dbKey: PermissionUser_DbKey,
     entityName: 'PermissionUser',
     frontend: {
         group: PermissionDBGroup,

package/_entity/permission-user/types.d.ts

@@ -1,22 +1,25 @@
-import { AuditableV2, DB_Object, DBProto, Proto_DB_Object, VersionsDeclaration } from '@nu-art/ts-common';
-import { DBProto_PermissionGroup } from '../permission-group/index.js';
+import { DB_Object, DB_ProtoSeed, DB_Prototype, VersionsDeclaration } from '@nu-art/db-api-shared';
+import { DatabaseDef_PermissionGroup } from '../permission-group/types.js';
+import { AuditableV2 } from '@nu-art/user-account-shared';
+export declare const PermissionUser_DbKey = "permissions--user";
+type DBKey = typeof PermissionUser_DbKey;
 type VersionTypes_PermissionUser = {
     '1.0.0': DB_PermissionUser;
 };
 type Versions = VersionsDeclaration<['1.0.0'], VersionTypes_PermissionUser>;
-type Dependencies = {
-    '__groupIds': DBProto_PermissionGroup;
-};
 type UniqueKeys = '_id';
 type GeneratedProps = '__groupIds' | '_auditorId';
-type Proto = Proto_DB_Object<DB_PermissionUser, 'permissions--user', GeneratedProps, Versions, UniqueKeys, Dependencies>;
-export type DBProto_PermissionUser = DBProto<Proto>;
-export type UI_PermissionUser = DBProto_PermissionUser['uiType'];
+type Dependencies = {
+    '__groupIds': DatabaseDef_PermissionGroup;
+};
+type Proto = DB_ProtoSeed<DB_PermissionUser, DBKey, GeneratedProps, Versions, UniqueKeys, Dependencies>;
+export type DatabaseDef_PermissionUser = DB_Prototype<Proto>;
+export type UI_PermissionUser = DatabaseDef_PermissionUser['uiType'];
 export type User_Group = {
-    groupId: string;
+    groupId: DatabaseDef_PermissionGroup['id'];
 };
-export type DB_PermissionUser = DB_Object & AuditableV2 & {
+export type DB_PermissionUser = DB_Object<DBKey> & AuditableV2 & {
     groups: User_Group[];
-    __groupIds?: string[];
+    __groupIds?: DatabaseDef_PermissionGroup['id'][];
 };
 export {};

package/_entity/permission-user/types.js

@@ -1 +1 @@
-export {};
+export const PermissionUser_DbKey = 'permissions--user';

package/_entity.d.ts

@@ -1,6 +1,13 @@
-export * from './_entity/permission-access-level/index.js';
-export * from './_entity/permission-api/index.js';
-export * from './_entity/permission-project/index.js';
-export * from './_entity/permission-domain/index.js';
-export * from './_entity/permission-group/index.js';
-export * from './_entity/permission-user/index.js';
+export * from './_entity/permission-access-level/types.js';
+export * from './_entity/permission-access-level/db-def.js';
+export * from './_entity/permission-api/types.js';
+export * from './_entity/permission-api/db-def.js';
+export * from './_entity/permission-project/types.js';
+export * from './_entity/permission-project/db-def.js';
+export * from './_entity/permission-domain/types.js';
+export * from './_entity/permission-domain/db-def.js';
+export * from './_entity/permission-group/types.js';
+export * from './_entity/permission-group/db-def.js';
+export * from './_entity/permission-user/types.js';
+export * from './_entity/permission-user/db-def.js';
+export * from './_entity/permission-user/api-def.js';

package/_entity.js

@@ -1,6 +1,13 @@
-export * from './_entity/permission-access-level/index.js';
-export * from './_entity/permission-api/index.js';
-export * from './_entity/permission-project/index.js';
-export * from './_entity/permission-domain/index.js';
-export * from './_entity/permission-group/index.js';
-export * from './_entity/permission-user/index.js';
+export * from './_entity/permission-access-level/types.js';
+export * from './_entity/permission-access-level/db-def.js';
+export * from './_entity/permission-api/types.js';
+export * from './_entity/permission-api/db-def.js';
+export * from './_entity/permission-project/types.js';
+export * from './_entity/permission-project/db-def.js';
+export * from './_entity/permission-domain/types.js';
+export * from './_entity/permission-domain/db-def.js';
+export * from './_entity/permission-group/types.js';
+export * from './_entity/permission-group/db-def.js';
+export * from './_entity/permission-user/types.js';
+export * from './_entity/permission-user/db-def.js';
+export * from './_entity/permission-user/api-def.js';

package/apis.d.ts

@@ -1,19 +1,20 @@
-import { ApiDefResolver, BodyApi, QueryApi } from '@nu-art/thunderstorm-shared';
+import { ApiDefResolver, BodyApi, QueryApi } from '@nu-art/api-types';
 import { PreDB, StringMap } from '@nu-art/ts-common';
-import { DB_PermissionProject } from './_entity.js';
+import { DatabaseDef_Account } from '@nu-art/user-account-shared';
+import { DatabaseDef_PermissionGroup, DatabaseDef_PermissionProject, DatabaseDef_PermissionUser, DB_PermissionProject } from './_entity.js';
 export type UserUrlsPermissions = {
     [url: string]: boolean;
 };
 export type Request_AssertApiForUser = {
-    projectId: string;
+    projectId: DatabaseDef_PermissionProject['id'];
     path: string;
 };
 export type Request_UserUrlsPermissions = {
-    projectId: string;
+    projectId: DatabaseDef_PermissionProject['id'];
     urls: UserUrlsPermissions;
 };
 export type Request_UserCFsByShareGroups = {
-    groupsIds: string[];
+    groupsIds: DatabaseDef_PermissionGroup['id'][];
 };
 export type Request_UsersCFsByShareGroups = Request_UserCFsByShareGroups & {
     usersEmails: string[];
@@ -22,7 +23,7 @@ export type Response_UsersCFsByShareGroups = {
     [userEmail: string]: StringMap[];
 };
 export type Request_AssignAppPermissions<T extends StringMap = StringMap> = {
-    projectId: string;
+    projectId: DatabaseDef_PermissionProject['id'];
     groupsToRemove: PredefinedGroup[];
     group: PredefinedGroup;
     customField: T;
@@ -32,17 +33,17 @@ export type Request_AssignAppPermissions<T extends StringMap = StringMap> = {
     appAccountId?: string;
 };
 export type AssignAppPermissions = Request_AssignAppPermissions & {
-    granterUserId: string;
+    granterUserId: DatabaseDef_Account['id'];
 };
 export type PredefinedGroup = {
-    _id: string;
+    _id: DatabaseDef_PermissionGroup['id'];
     key: string;
     label: string;
     customKeys?: string[];
 };
 export type PredefinedUser = {
-    accountId: string;
-    _id: string;
+    accountId: DatabaseDef_Account['id'];
+    _id: DatabaseDef_PermissionUser['id'];
     groups: PredefinedGroup[];
 };
 export type Request_RegisterProject = {
@@ -52,24 +53,14 @@ export type Request_RegisterProject = {
     predefinedUser?: PredefinedUser;
 };
 export type Response_User = {
-    userId: string;
+    userId: DatabaseDef_Account['id'];
 };
-export type _ApiStruct_PermissionsUser = {
-    pah: {
-        assignAppPermissions: BodyApi<void, Request_AssignAppPermissions>;
-    };
+export type API_PermissionsAssert = {
+    assertUserPermissions: BodyApi<Response_User, Request_AssertApiForUser>;
 };
-export declare const _ApiDef_PermissionUser: ApiDefResolver<_ApiStruct_PermissionsUser>;
-export type ApiStruct_PermissionsAssert = {
-    vv1: {
-        assertUserPermissions: BodyApi<Response_User, Request_AssertApiForUser>;
-    };
+export declare const ApiDef_PermissionsAssert: ApiDefResolver<API_PermissionsAssert>;
+export type API_Permissions = {
+    toggleStrictMode: QueryApi<void>;
+    createProject: QueryApi<void>;
 };
-export declare const ApiDef_PermissionsAssert: ApiDefResolver<ApiStruct_PermissionsAssert>;
-export type ApiStruct_Permissions = {
-    v1: {
-        toggleStrictMode: QueryApi<void>;
-        createProject: QueryApi<void>;
-    };
-};
-export declare const ApiDef_Permissions: ApiDefResolver<ApiStruct_Permissions>;
+export declare const ApiDef_Permissions: ApiDefResolver<API_Permissions>;

package/apis.js

@@ -16,27 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { HttpMethod } from '@nu-art/thunderstorm-shared';
+import { HttpMethod } from '@nu-art/api-types';
 import { Minute } from '@nu-art/ts-common';
-export const _ApiDef_PermissionUser = {
-    pah: {
-        assignAppPermissions: { method: HttpMethod.POST, path: '/v1/permissions/assign/app-permissions' }
-    }
-};
 export const ApiDef_PermissionsAssert = {
-    vv1: {
-        assertUserPermissions: { method: HttpMethod.POST, path: 'v1/permissions/assert-user-access' }
-    }
+    assertUserPermissions: { method: HttpMethod.POST, path: 'v1/permissions/assert-user-access' }
 };
 export const ApiDef_Permissions = {
-    v1: {
-        // getUserUrlsPermissions: {method: HttpMethod.POST, path: 'v1/permissions/user-urls-permissions'},
-        // getUserCFsByShareGroups: {method: HttpMethod.POST, path: 'v1/user-custom-fields/user-cf-by-share-groups'},
-        // getUsersCFsByShareGroups: {method: HttpMethod.POST, path: 'v1/user-custom-fields/users-cf-by-share-groups'},
-        // registerExternalProject: {method: HttpMethod.POST, path: 'v1/register/register-external-project'},
-        // registerProject: {method: HttpMethod.GET, path: 'v1/register/register-project'},
-        toggleStrictMode: { method: HttpMethod.GET, path: 'v1/permissions/toggle-strict-mode', timeout: Minute },
-        createProject: { method: HttpMethod.GET, path: 'v1/permissions/create-first-project', timeout: Minute },
-        // connectDomainToRoutes: {method: HttpMethod.POST, path: 'v1/permissions/connect-domain-to-routes'},
-    }
+    toggleStrictMode: { method: HttpMethod.GET, path: 'v1/permissions/toggle-strict-mode', timeout: Minute },
+    createProject: { method: HttpMethod.GET, path: 'v1/permissions/create-first-project', timeout: Minute },
 };

package/consts.d.ts

@@ -62,19 +62,20 @@ export declare const defaultAccessLevels: (Readonly<{
     value: 1000;
 }>)[];
 export declare const DuplicateDefaultAccessLevels: (seed: string) => {
-    _id: string;
+    _id: import("@nu-art/db-api-shared").DB_UniqueId<"permissions--level">;
     uiLabel: string;
     name: string;
     value: number;
 }[];
 export declare const CreateDefaultAccessLevels: (seed: string, accessLevels: PreDBAccessLevel[]) => {
-    _id: string;
+    _id: import("@nu-art/db-api-shared").DB_UniqueId<"permissions--level">;
     uiLabel: string;
     name: string;
     value: number;
 }[];
 export declare const generateKeyNamesByAccessLevel: <AccessLevel extends PreDBAccessLevel>(namespace: string, accessLevels: AccessLevel[]) => { [key in AccessLevel["name"]]: string; };
 export declare const defaultPermissionKeySuffix = "permission-key";
+/** @deprecated Path-based API permission; use function-based permissions and @RequirePermission. API collection deprecated. */
 export declare const defaultLevelsRouteLookupWords: {
     [k: string]: string;
 };

package/consts.js

@@ -1,4 +1,5 @@
 import { md5 } from '@nu-art/ts-common';
+import { asBrandedId } from '@nu-art/db-api-shared';
 export const PermissionDBGroup = 'permission';
 export const Prefix_PermissionKey = 'permission-key--';
 export const DomainNamespace_PermissionAssignment = 'Permissions Assignment';
@@ -37,7 +38,11 @@ const generateDefaultKeyName = (namespace, accessLevelName) => {
     return `${defaultPermissionKeySuffix}--${namespace}--${accessLevelName}`;
 };
 export const CreateDefaultAccessLevels = (seed, accessLevels) => {
-    return accessLevels.map(level => ({ ...level, _id: md5(`${seed}${level.name}`), uiLabel: level.name }));
+    return accessLevels.map(level => ({
+        ...level,
+        _id: asBrandedId(md5(`${seed}${level.name}`)),
+        uiLabel: level.name
+    }));
 };
 export const generateKeyNamesByAccessLevel = (namespace, accessLevels) => {
     return accessLevels.reduce((keyMapper, currentAccessLevel) => {
@@ -47,6 +52,7 @@ export const generateKeyNamesByAccessLevel = (namespace, accessLevels) => {
     }, {});
 };
 export const defaultPermissionKeySuffix = 'permission-key';
+/** @deprecated Path-based API permission; use function-based permissions and @RequirePermission. API collection deprecated. */
 export const defaultLevelsRouteLookupWords = {
     'query': 'Read',
     'query-unique': 'Read',

package/index.d.ts

@@ -1,10 +1,21 @@
-export * from './_entity/permission-access-level/index.js';
-export * from './_entity/permission-api/index.js';
-export * from './_entity/permission-domain/index.js';
-export * from './_entity/permission-group/index.js';
-export * from './_entity/permission-project/index.js';
-export * from './_entity/permission-user/index.js';
+export * from './_entity/permission-access-level/types.js';
+export * from './_entity/permission-access-level/db-def.js';
+export * from './_entity/permission-api/types.js';
+export * from './_entity/permission-api/db-def.js';
+export * from './_entity/permission-domain/types.js';
+export * from './_entity/permission-domain/db-def.js';
+export * from './_entity/permission-group/types.js';
+export * from './_entity/permission-group/db-def.js';
+export * from './_entity/permission-project/types.js';
+export * from './_entity/permission-project/db-def.js';
+export * from './_entity/permission-user/types.js';
+export * from './_entity/permission-user/db-def.js';
+export * from './_entity/permission-user/api-def.js';
 export * from './apis.js';
 export * from './consts.js';
 export * from './types.js';
 export * from './permission-keys.js';
+export * from './permission-scope.js';
+export * from './path-utils.js';
+export * from './project-setup.js';
+export * from './service-account-def.js';

package/index.js

@@ -16,13 +16,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './_entity/permission-access-level/index.js';
-export * from './_entity/permission-api/index.js';
-export * from './_entity/permission-domain/index.js';
-export * from './_entity/permission-group/index.js';
-export * from './_entity/permission-project/index.js';
-export * from './_entity/permission-user/index.js';
+export * from './_entity/permission-access-level/types.js';
+export * from './_entity/permission-access-level/db-def.js';
+export * from './_entity/permission-api/types.js';
+export * from './_entity/permission-api/db-def.js';
+export * from './_entity/permission-domain/types.js';
+export * from './_entity/permission-domain/db-def.js';
+export * from './_entity/permission-group/types.js';
+export * from './_entity/permission-group/db-def.js';
+export * from './_entity/permission-project/types.js';
+export * from './_entity/permission-project/db-def.js';
+export * from './_entity/permission-user/types.js';
+export * from './_entity/permission-user/db-def.js';
+export * from './_entity/permission-user/api-def.js';
 export * from './apis.js';
 export * from './consts.js';
 export * from './types.js';
 export * from './permission-keys.js';
+export * from './permission-scope.js';
+export * from './path-utils.js';
+export * from './project-setup.js';
+export * from './service-account-def.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/permissions-shared",
-  "version": "0.401.9",
+  "version": "0.500.0",
   "description": "Permissions Shared",
   "keywords": [
     "TacB0sS",
@@ -11,7 +11,6 @@
     "nu-art",
     "permissions",
     "saml",
-    "thunderstorm",
     "typescript",
     "user-account"
   ],
@@ -35,11 +34,10 @@
     "test": "ts-mocha -w -p src/test/tsconfig.json --timeout 0 --inspect=8107 --watch-files '**/*.ts' src/test/__all-tests.ts"
   },
   "dependencies": {
-    "@nu-art/ts-common": "0.401.9",
-    "@nu-art/firebase-shared": "0.401.9",
-    "@nu-art/thunderstorm-shared": "0.401.9",
-    "@nu-art/user-account-shared": "0.401.9",
-    "@nu-art/ts-styles": "0.401.9",
+    "@nu-art/ts-common": "0.500.0",
+    "@nu-art/firebase-shared": "0.500.0",
+    "@nu-art/user-account-shared": "0.500.0",
+    "@nu-art/ts-styles": "0.500.0",
     "firebase": "^11.9.0",
     "firebase-admin": "13.4.0",
     "firebase-functions": "6.3.2",
@@ -48,7 +46,9 @@
     "react-router-dom": "^6.9.0",
     "moment": "^2.29.4",
     "saml2-js": "^4.0.1",
-    "express": "^4.18.2"
+    "express": "^4.18.2",
+    "@nu-art/api-types": "{{THUNDERSTORM_VERSION}}",
+    "@nu-art/db-api-shared": "0.500.0"
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
@@ -59,6 +59,7 @@
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",
     "@types/history": "^4.7.2",
+    "@types/request": "^2.48.1",
     "@types/saml2-js": "^1.6.8"
   },
   "unitConfig": {

package/path-utils.d.ts

@@ -0,0 +1,2 @@
+/** Removes a leading '/' from path if present. Used for normalizing API paths. */
+export declare const trimStartingForwardSlash: (path: string) => string;

package/path-utils.js

@@ -0,0 +1,7 @@
+/*
+ * Permissions management system
+ * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
+/** Removes a leading '/' from path if present. Used for normalizing API paths. */
+export const trimStartingForwardSlash = (path) => path.startsWith('/') ? path.substring(1) : path;

package/permission-keys.d.ts

@@ -1,4 +1,3 @@
 export declare const PermissionKey_DeveloperViewer = "permission-key--developer-viewer";
 export declare const PermissionKey_DeveloperWriter = "permission-key--developer-editor";
 export declare const PermissionKey_DeveloperAdmin = "permission-key--developer-admin";
-export declare const PermissionKey_AccountManagementAdmin = "permission-key--account-management-admin";

package/permission-keys.js

@@ -1,4 +1,3 @@
 export const PermissionKey_DeveloperViewer = 'permission-key--developer-viewer';
 export const PermissionKey_DeveloperWriter = 'permission-key--developer-editor';
 export const PermissionKey_DeveloperAdmin = 'permission-key--developer-admin';
-export const PermissionKey_AccountManagementAdmin = 'permission-key--account-management-admin';

package/permission-scope.d.ts

@@ -0,0 +1,20 @@
+/** Type-only brand for PermissionScope; use definePermissionScope() to create valid instances. */
+declare const PermissionScopeBrand: unique symbol;
+/**
+ * Branded permission scope for function-based permissions.
+ * Only instances created via definePermissionScope() are valid.
+ */
+export type PermissionScope = {
+    readonly key: string;
+    readonly values: readonly string[];
+    readonly [PermissionScopeBrand]: true;
+};
+/**
+ * Creates a frozen, branded permission scope. Use this to define scopes
+ * for the @RequirePermission decorator (e.g. pathway: read, write, delete, admin).
+ */
+export declare function definePermissionScope<K extends string, V extends readonly string[]>(key: K, values: V): PermissionScope & {
+    key: K;
+    values: V;
+};
+export {};

package/permission-scope.js

@@ -0,0 +1,25 @@
+/*
+ * Permissions management system, define access level for each of
+ * your server apis, and restrict users by giving them access levels
+ *
+ * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Creates a frozen, branded permission scope. Use this to define scopes
+ * for the @RequirePermission decorator (e.g. pathway: read, write, delete, admin).
+ */
+export function definePermissionScope(key, values) {
+    return Object.freeze({ key, values });
+}

package/project-setup.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Interface for modules that participate in project setup (e.g. create default projects, domains, keys).
+ * The app wires implementations to its action-processor or calls __performProjectSetup() when needed.
+ */
+export interface PerformProjectSetup {
+    __performProjectSetup(): {
+        priority: number;
+        processor: () => Promise<void>;
+    };
+}

package/project-setup.js

@@ -0,0 +1,6 @@
+/*
+ * Permissions management system
+ * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
+export {};

package/service-account-def.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Definition for a service account to be created during project setup.
+ * The app provides a list via setServiceAccountsProvider; permissions uses it to create permission users and wire tokens.
+ */
+export type ServiceAccountDef = {
+    email: string;
+    description: string;
+    groupIds?: string[];
+    moduleName: string;
+    ttl?: number;
+};

package/service-account-def.js

@@ -0,0 +1,6 @@
+/*
+ * Permissions management system
+ * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
+export {};

package/types.d.ts

@@ -1,12 +1,15 @@
-import { TypedKeyValue, TypedMap, UniqueId } from '@nu-art/ts-common';
-import { DomainToLevelValueMap } from './_entity/permission-api/index.js';
+import { TypedKeyValue, TypedMap } from '@nu-art/ts-common';
+import { DatabaseDef_PermissionAccessLevel } from './_entity/permission-access-level/types.js';
+import { DatabaseDef_PermissionDomain } from './_entity/permission-domain/types.js';
+import { DatabaseDef_PermissionGroup } from './_entity/permission-group/types.js';
+import { DomainToLevelValueMap } from './_entity/permission-api/types.js';
 export type PermissionKey = string;
 export declare const Const_PermissionKeyType = "permission-key";
 export type PermissionKeyType = typeof Const_PermissionKeyType;
 export type DefaultDef_Api = {
     path: string;
     accessLevel: string;
-    domainId?: string;
+    domainId?: DatabaseDef_PermissionDomain['id'];
 };
 export type DefaultDef_GeneratedApi = {
     domain: string;
@@ -14,7 +17,7 @@ export type DefaultDef_GeneratedApi = {
 };
 export type DB_PermissionKeyData = {
     type: PermissionKeyType;
-    accessLevelIds: UniqueId[];
+    accessLevelIds: DatabaseDef_PermissionAccessLevel['id'][];
     _accessLevels: DomainToLevelValueMap;
 };
 export type PreDBAccessLevel = {
@@ -22,13 +25,13 @@ export type PreDBAccessLevel = {
     value: number;
 };
 export type DefaultDef_AccessLevel = {
-    _id: string;
+    _id: DatabaseDef_PermissionAccessLevel['id'];
     name: string;
     uiLabel: string;
     value: number;
 };
 export type DefaultDef_Group = {
-    _id: string;
+    _id: DatabaseDef_PermissionGroup['id'];
     name: string;
     uiLabel: string;
     accessLevels: {

package/_entity/permission-access-level/api-def.d.ts

@@ -1,5 +0,0 @@
-import { ApiDefResolver } from '@nu-art/thunderstorm-shared';
-export type ApiStruct_PermissionAccessLevel = {
-    _v1: {};
-};
-export declare const ApiDef_PermissionAccessLevel: ApiDefResolver<ApiStruct_PermissionAccessLevel>;

package/_entity/permission-access-level/api-def.js

@@ -1,3 +0,0 @@
-export const ApiDef_PermissionAccessLevel = {
-    _v1: {}
-};

package/_entity/permission-access-level/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-access-level/index.js

@@ -1,4 +0,0 @@
-// Generated DB Item type: PermissionAccessLevel
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-api/api-def.d.ts

@@ -1,5 +0,0 @@
-import { ApiDefResolver } from '@nu-art/thunderstorm-shared';
-export type ApiStruct_PermissionAPI = {
-    _v1: {};
-};
-export declare const ApiDef_PermissionAPI: ApiDefResolver<ApiStruct_PermissionAPI>;

package/_entity/permission-api/api-def.js

@@ -1,3 +0,0 @@
-export const ApiDef_PermissionAPI = {
-    _v1: {}
-};

package/_entity/permission-api/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-api/index.js

@@ -1,4 +0,0 @@
-// Generated DB Item type: PermissionAPI
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-domain/api-def.d.ts

@@ -1,5 +0,0 @@
-import { ApiDefResolver } from '@nu-art/thunderstorm-shared';
-export type ApiStruct_PermissionDomain = {
-    _v1: {};
-};
-export declare const ApiDef_PermissionDomain: ApiDefResolver<ApiStruct_PermissionDomain>;

package/_entity/permission-domain/api-def.js

@@ -1,3 +0,0 @@
-export const ApiDef_PermissionDomain = {
-    _v1: {}
-};

package/_entity/permission-domain/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-domain/index.js

@@ -1,4 +0,0 @@
-// Generated DB Item type: PermissionDomain
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-group/api-def.d.ts

@@ -1,5 +0,0 @@
-import { ApiDefResolver } from '@nu-art/thunderstorm-shared';
-export type ApiStruct_PermissionGroup = {
-    _v1: {};
-};
-export declare const ApiDef_PermissionGroup: ApiDefResolver<ApiStruct_PermissionGroup>;

package/_entity/permission-group/api-def.js

@@ -1,3 +0,0 @@
-export const ApiDef_PermissionGroup = {
-    _v1: {}
-};

package/_entity/permission-group/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-group/index.js

@@ -1,4 +0,0 @@
-// Generated DB Item type: PermissionGroup
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-project/api-def.d.ts

@@ -1,5 +0,0 @@
-import { ApiDefResolver } from '@nu-art/thunderstorm-shared';
-export type ApiStruct_PermissionProject = {
-    _v1: {};
-};
-export declare const ApiDef_PermissionProject: ApiDefResolver<ApiStruct_PermissionProject>;

package/_entity/permission-project/api-def.js

@@ -1,3 +0,0 @@
-export const ApiDef_PermissionProject = {
-    _v1: {}
-};

package/_entity/permission-project/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-project/index.js

@@ -1,4 +0,0 @@
-// Generated DB Item type: PermissionProject
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-user/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';

package/_entity/permission-user/index.js

@@ -1,4 +0,0 @@
-// Generated DB Item type: PermissionUser
-export * from './types.js';
-export * from './db-def.js';
-export * from './api-def.js';