Skip to content

Commit 208d697

Browse files
committed
Fix telemetry consumption: new components from @ember namespace
1 parent 37c3bce commit 208d697

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

transforms/angle-brackets/telemetry/invokable.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,23 @@ const HELPER = 'Helper';
44
const COMPONENT = 'Component';
55

66
function invokableName(name, type) {
7-
let invokePath = type === HELPER ? '/helpers/' : '/components/';
7+
let invokePath;
8+
9+
if (name.startsWith('@ember/component/')) {
10+
invokePath = '@ember/component/';
11+
} else if (name.startsWith('@ember/routing/')) {
12+
invokePath = '@ember/routing/';
13+
} else if (type === HELPER) {
14+
invokePath = '/helpers/';
15+
} else {
16+
invokePath = '/components/';
17+
}
18+
19+
console.log({
20+
name,
21+
invokePath,
22+
result: name.substring(name.lastIndexOf(invokePath) + invokePath.length, name.length),
23+
});
824
return name.substring(name.lastIndexOf(invokePath) + invokePath.length, name.length);
925
}
1026

transforms/angle-brackets/transform.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,13 @@ function isKnownHelper(fullName, config, invokableData) {
349349
if (isComponent) {
350350
return false;
351351
}
352+
} else {
353+
let mergedHelpers = [...KNOWN_HELPERS, ...(helpers || [])];
354+
let isHelper = mergedHelpers.includes(name) || config.helpers.includes(name);
355+
let isComponent = [...(components || []), ...BUILT_IN_COMPONENTS].includes(name);
356+
let strName = `${name}`; // coerce boolean and number to string
357+
return (isHelper || !isComponent) && !strName.includes('.');
352358
}
353-
354-
let mergedHelpers = [...KNOWN_HELPERS, ...(helpers || [])];
355-
let isHelper = mergedHelpers.includes(name) || config.helpers.includes(name);
356-
let isComponent = [...(components || []), ...BUILT_IN_COMPONENTS].includes(name);
357-
let strName = `${name}`; // coerce boolean and number to string
358-
return (isHelper || (!config.unambiguousHelpers && !isComponent)) && !strName.includes('.');
359359
} else {
360360
return KNOWN_HELPERS.includes(name) || config.helpers.includes(name);
361361
}
@@ -483,10 +483,7 @@ function transformToAngleBracket(fileInfo, config, invokableData) {
483483
const isTagKnownHelper = isKnownHelper(tagName, config, invokableData);
484484

485485
// Don't change attribute statements
486-
const isValidMustacheComponent = config.unambiguousHelpers
487-
? node.loc.source !== '(synthetic)' && !isTagKnownHelper
488-
: node.loc.source !== '(synthetic)' && !isKnownHelper(tagName, config, invokableData);
489-
486+
const isValidMustacheComponent = node.loc.source !== '(synthetic)' && !isTagKnownHelper;
490487
const isNestedComponent = isNestedComponentTagName(tagName);
491488

492489
if (

0 commit comments

Comments
 (0)