Merge DB Names into ResourceNameLike

Author: CarsonF

src/common/id-field.ts

@@ -2,11 +2,7 @@ import { applyDecorators } from '@nestjs/common';
 import { Field, FieldOptions, ID as IDType } from '@nestjs/graphql';
 import { ValidationOptions } from 'class-validator';
 import { IsAny, IsNever, Tagged } from 'type-fest';
-import type {
-  AllResourceDBNames,
-  ResourceName,
-  ResourceNameLike,
-} from '~/core';
+import type { ResourceName, ResourceNameLike } from '~/core';
 import { IsId } from './validators';
 
 export const IdField = ({
@@ -40,4 +36,4 @@ type IDTag<Kind> = IsAny<Kind> extends true
     : Kind
   : never;
 
-type IDKindLike = ResourceNameLike | AllResourceDBNames | object;
+type IDKindLike = ResourceNameLike | object;

src/core/resources/resource-name.types.ts

@@ -2,8 +2,9 @@ import { ConditionalKeys, IsAny, LiteralUnion, ValueOf } from 'type-fest';
 import { DBName, ResourceShape } from '~/common';
 import { ResourceDBMap, ResourceMap } from './map';
 
-export type AllResourceNames = keyof ResourceMap;
+export type AllResourceAppNames = keyof ResourceMap;
 export type AllResourceDBNames = DBName<ValueOf<ResourceDBMap>>;
+export type AllResourceNames = AllResourceAppNames | AllResourceDBNames;
 export type ResourceNameLike = LiteralUnion<AllResourceNames, string>;
 
 //region ResourceName
@@ -32,13 +33,13 @@ export type ResourceName<
   T,
   IncludeSubclasses extends boolean = false,
 > = IsAny<T> extends true
-  ? AllResourceNames // short-circuit and prevent many seemly random circular definitions
+  ? AllResourceAppNames // short-circuit and prevent many seemly random circular definitions
   : T extends AllResourceDBNames
   ? ResourceNameFromStatic<
       ResourceMap[ResourceNameFromDBName<T>],
       IncludeSubclasses
     >
-  : T extends AllResourceNames
+  : T extends AllResourceAppNames
   ? ResourceNameFromStatic<ResourceMap[T], IncludeSubclasses>
   : T extends ResourceShape<any>
   ? ResourceNameFromStatic<T, IncludeSubclasses>

src/core/resources/resources.host.ts

@@ -14,7 +14,6 @@ import {
 import { ResourceMap } from './map';
 import { __privateDontUseThis } from './resource-map-holder';
 import {
-  AllResourceDBNames,
   ResourceName,
   ResourceNameLike,
   ResourceStaticFromName,
@@ -70,7 +69,7 @@ export class ResourcesHost {
     return this.getByName(name as any);
   }
 
-  getByEdgeDB<Name extends ResourceNameLike | AllResourceDBNames>(
+  getByEdgeDB<Name extends ResourceNameLike>(
     name: Name,
   ): EnhancedResource<
     string extends Name