Revert "refactor(core): add debug name to resource (angular#64172)" (angular#64418)

This reverts commit 6318006.

PR Close angular#64418

Author: AndrewKushnir

goldens/public-api/common/http/index.api.md

@@ -3021,7 +3021,6 @@ export interface HttpResourceFn {
 
 // @public
 export interface HttpResourceOptions<TResult, TRaw> {
-    debugName?: string;
     defaultValue?: NoInfer<TResult>;
     equal?: ValueEqualityFn<NoInfer<TResult>>;
     injector?: Injector;

goldens/public-api/core/index.api.md

@@ -1640,9 +1640,7 @@ export interface ResourceLoaderParams<R> {
 }
 
 // @public (undocumented)
-export type ResourceOptions<T, R> = (PromiseResourceOptions<T, R> | StreamingResourceOptions<T, R>) & {
-    debugName?: string;
-};
+export type ResourceOptions<T, R> = PromiseResourceOptions<T, R> | StreamingResourceOptions<T, R>;
 
 // @public
 export interface ResourceRef<T> extends WritableResource<T> {

packages/common/http/src/resource.ts

@@ -238,7 +238,6 @@ function makeHttpResourceFn<TRaw>(responseType: ResponseType) {
       injector,
       () => normalizeRequest(request, responseType),
       options?.defaultValue,
-      options?.debugName,
       options?.parse as (value: unknown) => TResult,
       options?.equal as ValueEqualityFn<unknown>,
     ) as HttpResourceRef<TResult>;
@@ -323,7 +322,6 @@ class HttpResourceImpl<T>
     injector: Injector,
     request: () => HttpRequest<T> | undefined,
     defaultValue: T,
-    debugName?: string,
     parse?: (value: unknown) => T,
     equal?: ValueEqualityFn<unknown>,
   ) {
@@ -391,7 +389,6 @@ class HttpResourceImpl<T>
       },
       defaultValue,
       equal,
-      debugName,
       injector,
     );
     this.client = injector.get(HttpClient);

packages/common/http/src/resource_api.ts

@@ -171,11 +171,6 @@ export interface HttpResourceOptions<TResult, TRaw> {
    * A comparison function which defines equality for the response value.
    */
   equal?: ValueEqualityFn<NoInfer<TResult>>;
-
-  /**
-   * A debug name for the reactive node. Used in Angular DevTools to identify the node.
-   */
-  debugName?: string;
 }
 
 /**

packages/core/src/resource/api.ts

@@ -227,15 +227,7 @@ export interface StreamingResourceOptions<T, R> extends BaseResourceOptions<T, R
 /**
  * @experimental
  */
-export type ResourceOptions<T, R> = (
-  | PromiseResourceOptions<T, R>
-  | StreamingResourceOptions<T, R>
-) & {
-  /**
-   * A debug name for the reactive node. Used in Angular DevTools to identify the node.
-   */
-  debugName?: string;
-};
+export type ResourceOptions<T, R> = PromiseResourceOptions<T, R> | StreamingResourceOptions<T, R>;
 
 /**
  * @experimental

packages/core/src/resource/resource.ts

@@ -71,13 +71,11 @@ export function resource<T, R>(options: ResourceOptions<T, R>): ResourceRef<T |
     options as ResourceOptions<T, R> & {request: ResourceOptions<T, R>['params']}
   ).request;
   const params = (options.params ?? oldNameForParams ?? (() => null)) as () => R;
-
   return new ResourceImpl<T | undefined, R>(
     params,
     getLoader(options),
     options.defaultValue,
     options.equal ? wrapEqualityFn(options.equal) : undefined,
-    options.debugName,
     options.injector ?? inject(Injector),
     RESOURCE_VALUE_THROWS_ERRORS_DEFAULT,
   );
@@ -113,18 +111,11 @@ abstract class BaseWritableResource<T> implements WritableResource<T> {
 
   abstract reload(): boolean;
 
-  readonly isLoading: Signal<boolean>;
-
-  constructor(value: Signal<T>, debugName: string | undefined) {
+  constructor(value: Signal<T>) {
     this.value = value as WritableSignal<T>;
     this.value.set = this.set.bind(this);
     this.value.update = this.update.bind(this);
     this.value.asReadonly = signalAsReadonlyFn;
-
-    this.isLoading = computed(
-      () => this.status() === 'loading' || this.status() === 'reloading',
-      ngDevMode ? createDebugNameObject(debugName, 'isLoading') : undefined,
-    );
   }
 
   abstract set(value: T): void;
@@ -135,6 +126,8 @@ abstract class BaseWritableResource<T> implements WritableResource<T> {
     this.set(updateFn(untracked(this.value)));
   }
 
+  readonly isLoading = computed(() => this.status() === 'loading' || this.status() === 'reloading');
+
   // Use a computed here to avoid triggering reactive consumers if the value changes while staying
   // either defined or undefined.
   private readonly isValueDefined = computed(() => {
@@ -178,15 +171,11 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
   private destroyed = false;
   private unregisterOnDestroy: () => void;
 
-  override readonly status: Signal<ResourceStatus>;
-  override readonly error: Signal<Error | undefined>;
-
   constructor(
     request: () => R,
     private readonly loaderFn: ResourceStreamingLoader<T, R>,
     defaultValue: T,
     private readonly equal: ValueEqualityFn<T> | undefined,
-    private readonly debugName: string | undefined,
     injector: Injector,
     throwErrorsFromValue: boolean = RESOURCE_VALUE_THROWS_ERRORS_DEFAULT,
   ) {
@@ -216,16 +205,14 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
 
           return streamValue.value;
         },
-        {equal, ...(ngDevMode ? createDebugNameObject(debugName, 'value') : undefined)},
+        {equal},
       ),
-      debugName,
     );
 
     // Extend `request()` to include a writable reload signal.
     this.extRequest = linkedSignal({
       source: request,
       computation: (request) => ({request, reload: 0}),
-      ...(ngDevMode ? createDebugNameObject(debugName, 'extRequest') : undefined),
     });
 
     // The main resource state is managed in a `linkedSignal`, which allows the resource to change
@@ -256,33 +243,25 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
           };
         }
       },
-      ...(ngDevMode ? createDebugNameObject(debugName, 'state') : undefined),
     });
 
     this.effectRef = effect(this.loadEffect.bind(this), {
       injector,
       manualCleanup: true,
-      ...(ngDevMode ? createDebugNameObject(debugName, 'loadEffect') : undefined),
     });
 
     this.pendingTasks = injector.get(PendingTasks);
 
     // Cancel any pending request when the resource itself is destroyed.
     this.unregisterOnDestroy = injector.get(DestroyRef).onDestroy(() => this.destroy());
+  }
 
-    this.status = computed(
-      () => projectStatusOfState(this.state()),
-      ngDevMode ? createDebugNameObject(debugName, 'status') : undefined,
-    );
+  override readonly status = computed(() => projectStatusOfState(this.state()));
 
-    this.error = computed(
-      () => {
-        const stream = this.state().stream?.();
-        return stream && !isResolved(stream) ? stream.error : undefined;
-      },
-      ngDevMode ? createDebugNameObject(debugName, 'error') : undefined,
-    );
-  }
+  override readonly error = computed(() => {
+    const stream = this.state().stream?.();
+    return stream && !isResolved(stream) ? stream.error : undefined;
+  });
 
   /**
    * Called either directly via `WritableResource.set` or via `.value.set()`.
@@ -310,10 +289,7 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
       extRequest: state.extRequest,
       status: 'local',
       previousStatus: 'local',
-      stream: signal(
-        {value},
-        ngDevMode ? createDebugNameObject(this.debugName, 'stream') : undefined,
-      ),
+      stream: signal({value}),
     });
 
     // We're departing from whatever state the resource was in previously, so cancel any in-progress
@@ -417,10 +393,7 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
         extRequest,
         status: 'resolved',
         previousStatus: 'error',
-        stream: signal(
-          {error: encapsulateResourceError(err)},
-          ngDevMode ? createDebugNameObject(this.debugName, 'stream') : undefined,
-        ),
+        stream: signal({error: encapsulateResourceError(err)}),
       });
     } finally {
       // Resolve the pending task now that the resource has a value.
@@ -453,15 +426,9 @@ function getLoader<T, R>(options: ResourceOptions<T, R>): ResourceStreamingLoade
 
   return async (params) => {
     try {
-      return signal(
-        {value: await options.loader(params)},
-        ngDevMode ? createDebugNameObject(options.debugName, 'stream') : undefined,
-      );
+      return signal({value: await options.loader(params)});
     } catch (err) {
-      return signal(
-        {error: encapsulateResourceError(err)},
-        ngDevMode ? createDebugNameObject(options.debugName, 'stream') : undefined,
-      );
+      return signal({error: encapsulateResourceError(err)});
     }
   };
 }
@@ -490,18 +457,6 @@ function isResolved<T>(state: ResourceStreamItem<T>): state is {value: T} {
   return (state as {error: unknown}).error === undefined;
 }
 
-/**
- * Creates a debug name object for an internal signal.
- */
-function createDebugNameObject(
-  resourceDebugName: string | undefined,
-  internalSignalDebugName: string,
-): {debugName?: string} {
-  return {
-    debugName: `Resource${resourceDebugName ? '#' + resourceDebugName : ''}.${internalSignalDebugName}`,
-  };
-}
-
 export function encapsulateResourceError(error: unknown): Error {
   if (error instanceof Error) {
     return error;