Skip to content

Commit

Permalink
Merge pull request #338 from ppcano/fix-mu-empty-normalize-call
Browse files Browse the repository at this point in the history
Fix MU `GlimmerResolver.normalize` when `fullName` is not present
  • Loading branch information
rwjblue committed Feb 22, 2019
2 parents 302c3ef + 61cd597 commit 89b3583
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 6 deletions.
13 changes: 7 additions & 6 deletions mu-trees/addon/resolvers/glimmer-wrapper/index.js
Expand Up @@ -63,15 +63,16 @@ function cleanupEmberSpecifier(specifier, source, _namespace) {

return [specifier, source];
}

const normalize = !DEBUG ? null : function(specifier) {
const normalize = !DEBUG ? null : function(fullName) {
// This method is called by `Registry#validateInjections` in dev mode.
// https://github.com/ember-cli/ember-resolver/issues/299
const [type, name] = specifier.split(':', 2);
if (name && (type === 'service' || type === 'controller')) {
return `${type}:${dasherize(name)}`;
if (fullName) {
const [type, name] = fullName.split(':', 2);
if (name && (type === 'service' || type === 'controller')) {
return `${type}:${dasherize(name)}`;
}
}
return specifier;
return fullName;
};

/*
Expand Down
30 changes: 30 additions & 0 deletions mu-trees/tests/unit/resolvers/glimmer-wrapper/normalize-test.js
@@ -0,0 +1,30 @@
import { module, test } from 'qunit';
import Resolver from 'ember-resolver/resolvers/glimmer-wrapper';
import BasicRegistry from '@glimmer/resolver/module-registries/basic-registry';

let resolver;
module('ember-resolver/resolvers/glimmer-wrapper#normalize', {
beforeEach() {

let glimmerModuleRegistry = new BasicRegistry();

resolver = Resolver.create({
config: {
app: {
name: 'example-app'
}
},
glimmerModuleRegistry
});
}
});

test('normalization', function(assert) {
assert.ok(resolver.normalize, 'resolver#normalize is present');

assert.equal(resolver.normalize('service:myService'), 'service:my-service');

// `expandLocalLookup` calls this.normalize(options.source) with `source` empty with MU addon
assert.equal(resolver.normalize(), undefined);

});

0 comments on commit 89b3583

Please sign in to comment.