From 788a1731a70846d027a7b1345f094510776c248a Mon Sep 17 00:00:00 2001 From: Marine Dunstetter Date: Fri, 20 Jun 2025 16:22:35 +0200 Subject: [PATCH 1/4] remove old code that appears to be unused --- ember_debug/object-inspector.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js index 777f9d5f4b..eddf841205 100644 --- a/ember_debug/object-inspector.js +++ b/ember_debug/object-inspector.js @@ -899,18 +899,7 @@ function addProperties(properties, hash) { let options = { isMandatorySetter: isMandatorySetter(desc) }; if (typeof hash[prop] === 'object' && hash[prop] !== null) { - options.isService = - !('type' in hash[prop]) && hash[prop].type === 'service'; - - if (!options.isService) { - if (hash[prop].constructor) { - options.isService = hash[prop].constructor.isServiceFactory; - } - } - - if (!options.isService) { - options.isService = desc.value instanceof Service; - } + options.isService = desc.value instanceof Service; } if (options.isService) { replaceProperty(properties, prop, inspectValue(hash, prop), options); From 883237456ed110922d12094fb8b882b44411a662 Mon Sep 17 00:00:00 2001 From: Patrick Pircher Date: Tue, 24 Jun 2025 11:39:06 +0200 Subject: [PATCH 2/4] improve service detection --- ember_debug/object-inspector.js | 3 +++ tests/ember_debug/object-inspector-test.js | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js index eddf841205..bfa2df7e6d 100644 --- a/ember_debug/object-inspector.js +++ b/ember_debug/object-inspector.js @@ -1101,6 +1101,9 @@ function calculateCPs( item.code = ''; } } + if (value instanceof Service) { + item.isService = true; + } } } }); diff --git a/tests/ember_debug/object-inspector-test.js b/tests/ember_debug/object-inspector-test.js index 4ae1d4b0f5..a635e640e5 100644 --- a/tests/ember_debug/object-inspector-test.js +++ b/tests/ember_debug/object-inspector-test.js @@ -11,7 +11,7 @@ import EmberObject, { computed } from '@ember/object'; import MutableArray from '@ember/array/mutable'; import ArrayProxy from '@ember/array/proxy'; import ObjectProxy from '@ember/object/proxy'; -import Service from '@ember/service'; +import Service, { service } from '@ember/service'; import { VERSION } from '@ember/version'; import { tracked } from '@glimmer/tracking'; import { module, skip, test } from 'qunit'; @@ -902,17 +902,23 @@ module('Ember Debug - Object Inspector', function (hooks) { fooBoo() { return true; }, - }).create(); + }); + + this.owner.register('service:test-inspect-service', inspectedService); let inspected = EmberObject.extend({ - service: inspectedService, - }).create(); + service: inspectedService.create(), + service2: service('test-inspect-service'), + }).create(this); let message = await inspectObject(inspected); + console.log('mesg', message); let serializedServiceProperty = message.details[1].properties[0]; + let serializedService2Property = message.details[1].properties[1]; assert.true(serializedServiceProperty.isService); + assert.true(serializedService2Property.isService); }); test('Proxy Service should be successfully tagged as service on serialization', async function (assert) { From 0dac95596d243d871789f8072d62ca72f8b77a6e Mon Sep 17 00:00:00 2001 From: Patrick Pircher Date: Wed, 25 Jun 2025 14:56:26 +0200 Subject: [PATCH 3/4] fix lts --- tests/ember_debug/object-inspector-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ember_debug/object-inspector-test.js b/tests/ember_debug/object-inspector-test.js index a635e640e5..ac4f2cb6c9 100644 --- a/tests/ember_debug/object-inspector-test.js +++ b/tests/ember_debug/object-inspector-test.js @@ -11,7 +11,7 @@ import EmberObject, { computed } from '@ember/object'; import MutableArray from '@ember/array/mutable'; import ArrayProxy from '@ember/array/proxy'; import ObjectProxy from '@ember/object/proxy'; -import Service, { service } from '@ember/service'; +import Service, { inject as service } from '@ember/service'; import { VERSION } from '@ember/version'; import { tracked } from '@glimmer/tracking'; import { module, skip, test } from 'qunit'; From 7ff1f50600e9310625662c5853dde4aa2b3e7b38 Mon Sep 17 00:00:00 2001 From: Patrick Pircher Date: Wed, 25 Jun 2025 15:52:45 +0200 Subject: [PATCH 4/4] rm debug log Co-authored-by: Robbie Wagner --- tests/ember_debug/object-inspector-test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/ember_debug/object-inspector-test.js b/tests/ember_debug/object-inspector-test.js index ac4f2cb6c9..c5f42975a5 100644 --- a/tests/ember_debug/object-inspector-test.js +++ b/tests/ember_debug/object-inspector-test.js @@ -912,7 +912,6 @@ module('Ember Debug - Object Inspector', function (hooks) { }).create(this); let message = await inspectObject(inspected); - console.log('mesg', message); let serializedServiceProperty = message.details[1].properties[0]; let serializedService2Property = message.details[1].properties[1];