@glimmer/resolver - npm Package Compare versions

Comparing version 0.3.1 to 0.4.0

dist/amd/es5/glimmer-resolver.js

@@ -29,18 +29,27 @@ define('@glimmer/resolver', ['exports', '@glimmer/di'], function (exports, _glimmer_di) { 'use strict';
                 assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);
-                // Look locally in the referrer's namespace
                 s.rootName = r.rootName;
                 s.collection = r.collection;
-                if (s.name) {
-                    s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
-                } else {
+                var definitiveCollection = this._definitiveCollection(s.type);
+                if (!s.name) {
+                    /*
+                     * For specifiers without a name use the referrer's name and
+                     * do not fallback to any other resolution rules.
+                     */
                     s.namespace = r.namespace;
                     s.name = r.name;
+                    return this._serializeAndVerify(s);
                 }
-                if (result = this._serializeAndVerify(s)) {
-                    return result;
+                s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
+                if (s.collection === definitiveCollection) {
+                    /*
+                     * For specifiers with a name, try local resolution. Based on
+                     * the referrer.
+                     */
+                    if (result = this._serializeAndVerify(s)) {
+                        return result;
+                    }
                 }
                 // Look for a private collection in the referrer's namespace
-                var privateCollection = this._definitiveCollection(s.type);
-                if (privateCollection) {
-                    s.namespace += '/-' + privateCollection;
+                if (definitiveCollection) {
+                    s.namespace += '/-' + definitiveCollection;
                     if (result = this._serializeAndVerify(s)) {
@@ -47,0 +56,0 @@ return result;

dist/commonjs/es2017/resolver.js

@@ -26,18 +26,27 @@ 'use strict';
                 (0, _debug.assert)('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);
-                // Look locally in the referrer's namespace
                 s.rootName = r.rootName;
                 s.collection = r.collection;
-                if (s.name) {
-                    s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
-                } else {
+                let definitiveCollection = this._definitiveCollection(s.type);
+                if (!s.name) {
+                    /*
+                     * For specifiers without a name use the referrer's name and
+                     * do not fallback to any other resolution rules.
+                     */
                     s.namespace = r.namespace;
                     s.name = r.name;
+                    return this._serializeAndVerify(s);
                 }
-                if (result = this._serializeAndVerify(s)) {
-                    return result;
+                s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
+                if (s.collection === definitiveCollection) {
+                    /*
+                     * For specifiers with a name, try local resolution. Based on
+                     * the referrer.
+                     */
+                    if (result = this._serializeAndVerify(s)) {
+                        return result;
+                    }
                 }
                 // Look for a private collection in the referrer's namespace
-                let privateCollection = this._definitiveCollection(s.type);
-                if (privateCollection) {
-                    s.namespace += '/-' + privateCollection;
+                if (definitiveCollection) {
+                    s.namespace += '/-' + definitiveCollection;
                     if (result = this._serializeAndVerify(s)) {
@@ -106,2 +115,2 @@ return result;
 exports.default = Resolver;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        // Look locally in the referrer's namespace\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        if (s.name) {\n          s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        } else {\n          s.namespace = r.namespace;\n          s.name = r.name;\n        }\n        if (result = this._serializeAndVerify(s)) { return result; }\n\n        // Look for a private collection in the referrer's namespace\n        let privateCollection = this._definitiveCollection(s.type);\n        if (privateCollection) {\n          s.namespace += '/-' + privateCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        let definitiveCollection = this._definitiveCollection(s.type);\n\n        if (!s.name) {\n          /*\n           * For specifiers without a name use the referrer's name and\n           * do not fallback to any other resolution rules.\n           */\n          s.namespace = r.namespace;\n          s.name = r.name;\n          return this._serializeAndVerify(s);\n        }\n\n        s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        if (s.collection === definitiveCollection) {\n          /*\n           * For specifiers with a name, try local resolution. Based on\n           * the referrer.\n           */\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Look for a private collection in the referrer's namespace\n        if (definitiveCollection) {\n          s.namespace += '/-' + definitiveCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}

dist/commonjs/es5/resolver.js

@@ -35,18 +35,27 @@ 'use strict';
                 (0, _debug.assert)('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);
-                // Look locally in the referrer's namespace
                 s.rootName = r.rootName;
                 s.collection = r.collection;
-                if (s.name) {
-                    s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
-                } else {
+                var definitiveCollection = this._definitiveCollection(s.type);
+                if (!s.name) {
+                    /*
+                     * For specifiers without a name use the referrer's name and
+                     * do not fallback to any other resolution rules.
+                     */
                     s.namespace = r.namespace;
                     s.name = r.name;
+                    return this._serializeAndVerify(s);
                 }
-                if (result = this._serializeAndVerify(s)) {
-                    return result;
+                s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
+                if (s.collection === definitiveCollection) {
+                    /*
+                     * For specifiers with a name, try local resolution. Based on
+                     * the referrer.
+                     */
+                    if (result = this._serializeAndVerify(s)) {
+                        return result;
+                    }
                 }
                 // Look for a private collection in the referrer's namespace
-                var privateCollection = this._definitiveCollection(s.type);
-                if (privateCollection) {
-                    s.namespace += '/-' + privateCollection;
+                if (definitiveCollection) {
+                    s.namespace += '/-' + definitiveCollection;
                     if (result = this._serializeAndVerify(s)) {
@@ -122,2 +131,2 @@ return result;
 exports.default = Resolver;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":";;;;;;AAAA,AAAO,AAGL,AAAyB,AACzB,AAAyB,AACzB,AAAoB,AACpB,AAAkB,AACnB,AAAM,AAAa,AAAC;;AACrB,AAAO,AAAE,AAAM,AAAE,AAAM,AAAe,AAAC,AAIvC,AAAM,AAAC,AAAO;;;;;;;;2BAIZ;sBAAY,AAA6B,QAAE,AAAwB;8BACjE,AAAI;;aAAC,AAAM,SAAG,AAAM,AAAC,AACrB,AAAI;aAAC,AAAQ,WAAG,AAAQ,AAAC,AAC3B,AAAC;;;uBAED,AAAQ,6BAAC,AAAiB,WAAE,AAAiB,UAC3C,AAAE,AAAC;YAAC,AAAyB,mCAAC,AAAS,AAAC,AAAC,YAAC,AAAC,AACzC,AAAM;mBAAC,AAAS,AAAC,AACnB,AAAC;AAED;YAAI,AAAC,IAAG,AAAoB,8BAAC,AAAS,AAAC,AAAC,AACxC;YAAI,AAAc,AAAC,cAEnB,AAAE,AAAC;YAAC,AAAQ,AAAC,UAAC,AAAC,AACb;gBAAI,AAAC,IAAG,AAAoB,8BAAC,AAAQ,AAAC,AAAC,AAEvC,AAAE,AAAC;gBAAC,AAAyB,mCAAC,AAAC,AAAC,AAAC,IAAC,AAAC,AACjC,AAAM;mCAAC,AAAyG,2GAAE,AAAC,EAAC,AAAQ,aAAK,AAAS,aAAI,AAAC,EAAC,AAAU,eAAK,AAAS,aAAI,AAAC,EAAC,AAAS,cAAK,AAAS,AAAC,AAAC,AAEvM,AAA2C;AAC3C,AAAC;kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAQ,AAAC,AACxB,AAAC;kBAAC,AAAU,aAAG,AAAC,EAAC,AAAU,AAAC,AAC5B,AAAE,AAAC;oBAAC,AAAC,EAAC,AAAI,AAAC,MAAC,AAAC,AACX,AAAC;sBAAC,AAAS,YAAG,AAAC,EAAC,AAAS,YAAG,AAAC,EAAC,AAAS,YAAG,AAAG,MAAG,AAAC,EAAC,AAAI,OAAG,AAAC,EAAC,AAAI,AAAC,AAClE,AAAC,AAAC,AAAI;uBAAC,AAAC,AACN,AAAC;sBAAC,AAAS,YAAG,AAAC,EAAC,AAAS,AAAC,AAC1B,AAAC;sBAAC,AAAI,OAAG,AAAC,EAAC,AAAI,AAAC,AAClB,AAAC;AACD,AAAE,AAAC;oBAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC,AAAC,AAAM;2BAAC,AAAM,AAAC,AAAC,AAAC;AAE5D,AAA4D;AAC5D;oBAAI,AAAiB,oBAAG,AAAI,KAAC,AAAqB,sBAAC,AAAC,EAAC,AAAI,AAAC,AAAC,AAC3D,AAAE,AAAC;oBAAC,AAAiB,AAAC,mBAAC,AAAC,AACtB,AAAC;sBAAC,AAAS,aAAI,AAAI,OAAG,AAAiB,AAAC,AACxC,AAAE,AAAC;wBAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC,AAAC,AAAM;+BAAC,AAAM,AAAC,AAAC,AAAC,AAC9D;AAAC;AAED,AAAmF;AACnF,AAAuC;AACvC,AAAC;kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAU,aAAG,AAAC,EAAC,AAAS,YAAG,AAAS,AAAC,AACtD,AAAC,AAAC,AAAI;mBAAC,AAAC,AACN,AAAM;mCAAC,AAAyF,2FAAE,AAAC,EAAC,AAAI,AAAC,AAAC,AAE1G,AAA4D;AAC5D,AAAC;kBAAC,AAAU,aAAG,AAAI,KAAC,AAAqB,sBAAC,AAAC,EAAC,AAAI,AAAC,AAAC,AAClD,AAAM,AAAC;0CAAI,AAAC,EAAC,AAAI,AAAyC,mDAAE,AAAC,EAAC,AAAU,AAAC,AAAC,AAC5E,AAAC,AACH;AAAC;AAED,AAAiF;AACjF,AAAE,AAAC;YAAC,CAAC,AAAC,EAAC,AAAU,AAAC,YAAC,AAAC,AAClB,AAAC;cAAC,AAAU,aAAG,AAAI,KAAC,AAAqB,sBAAC,AAAC,EAAC,AAAI,AAAC,AAAC,AAClD,AAAM,AAAC;sCAAI,AAAC,EAAC,AAAI,AAAyC,mDAAE,AAAC,EAAC,AAAU,AAAC,AAAC,AAC5E,AAAC;AAED,AAAE,AAAC;YAAC,CAAC,AAAC,EAAC,AAAQ,AAAC,UAAC,AAAC,AAChB,AAAkE;AAClE,AAAC;cAAC,AAAQ,WAAG,AAAI,KAAC,AAAM,OAAC,AAAG,IAAC,AAAQ,YAAI,AAAK,AAAC,AAC/C,AAAE,AAAC;gBAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC,AAAC,AAAM;uBAAC,AAAM,AAAC,AAAC,AAAC;AAE5D,AAAoD;AACpD;gBAAI,AAAQ,AAAC,gBACb,AAAE,AAAC;gBAAC,AAAC,EAAC,AAAS,AAAC,WAAC,AAAC,AAChB,AAAQ;2BAAG,AAAI,KAAC,AAAM,OAAC,AAAM,UAAI,AAAI,KAAC,AAAM,OAAC,AAAM,OAAC,AAAC,EAAC,AAAS,AAAC,AAAC,AACjE,AAAC;kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAS,AAAC,AACzB,AAAC;kBAAC,AAAS,YAAG,AAAS,AAAC,AAE1B,AAAC,AAAC,AAAI;mBAAC,AAAC,AACN,AAAQ;2BAAG,AAAI,KAAC,AAAM,OAAC,AAAM,UAAI,AAAI,KAAC,AAAM,OAAC,AAAM,OAAC,AAAC,EAAC,AAAI,AAAC,AAAC,AAC5D,AAAC;kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAI,AAAC,AACpB,AAAC;kBAAC,AAAI,OAAG,AAAM,AAAC,AAClB,AAAC,AACH;AAAC;AAED,AAAE,AAAC;YAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC,AAAC,AAAM;mBAAC,AAAM,AAAC,AAAC,AAAC,AAC9D;AAAC;;;uBAED,AAAQ,6BAAC,AAAiB,WACxB,AAAM;eAAC,AAAI,KAAC,AAAQ,SAAC,AAAG,IAAC,AAAS,AAAC,AAAC,AACtC,AAAC;;;uBAED,AAAO,2BAAC,AAAiB,WAAE,AAAiB,UAC1C;YAAI,AAAE,KAAG,AAAI,KAAC,AAAQ,SAAC,AAAS,WAAE,AAAQ,AAAC,AAAC,AAC5C,AAAE,AAAC;YAAC,AAAE,AAAC,IAAC,AAAC,AACP,AAAM;mBAAC,AAAI,KAAC,AAAQ,SAAC,AAAE,AAAC,AAAC,AAC3B,AAAC,AACH;AAAC;;;uBAEO,AAAqB,uDAAC,AAAY,MACxC;YAAI,AAAO,UAAG,AAAI,KAAC,AAAM,OAAC,AAAK,MAAC,AAAI,AAAC,AAAC,AACtC,AAAM,AAAC;kCAAI,AAAI,AAA4B,sCAAE,AAAO,AAAC,AAAC,AACtD,AAAM;eAAC,AAAO,QAAC,AAAoB,AAAC,AACtC,AAAC;;;uBAEO,AAAmB,mDAAC,AAAoB,WAC9C;YAAI,AAAU,aAAG,AAAkB,4BAAC,AAAS,AAAC,AAAC,AAC/C,AAAE,AAAC;YAAC,AAAI,KAAC,AAAQ,SAAC,AAAG,IAAC,AAAU,AAAC,AAAC,aAAC,AAAC,AAClC,AAAM;mBAAC,AAAU,AAAC,AACpB,AAAC,AACH;AAAC,AACF","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        // Look locally in the referrer's namespace\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        if (s.name) {\n          s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        } else {\n          s.namespace = r.namespace;\n          s.name = r.name;\n        }\n        if (result = this._serializeAndVerify(s)) { return result; }\n\n        // Look for a private collection in the referrer's namespace\n        let privateCollection = this._definitiveCollection(s.type);\n        if (privateCollection) {\n          s.namespace += '/-' + privateCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        let definitiveCollection = this._definitiveCollection(s.type);\n\n        if (!s.name) {\n          /*\n           * For specifiers without a name use the referrer's name and\n           * do not fallback to any other resolution rules.\n           */\n          s.namespace = r.namespace;\n          s.name = r.name;\n          return this._serializeAndVerify(s);\n        }\n\n        s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        if (s.collection === definitiveCollection) {\n          /*\n           * For specifiers with a name, try local resolution. Based on\n           * the referrer.\n           */\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Look for a private collection in the referrer's namespace\n        if (definitiveCollection) {\n          s.namespace += '/-' + definitiveCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}

dist/modules/es2017/resolver.js

@@ -18,19 +18,27 @@ import { isSpecifierStringAbsolute, isSpecifierObjectAbsolute, deserializeSpecifier, serializeSpecifier } from '@glimmer/di';
                 assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);
-                // Look locally in the referrer's namespace
                 s.rootName = r.rootName;
                 s.collection = r.collection;
-                if (s.name) {
-                    s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
-                }
-                else {
+                let definitiveCollection = this._definitiveCollection(s.type);
+                if (!s.name) {
+                    /*
+                     * For specifiers without a name use the referrer's name and
+                     * do not fallback to any other resolution rules.
+                     */
                     s.namespace = r.namespace;
                     s.name = r.name;
+                    return this._serializeAndVerify(s);
                 }
-                if (result = this._serializeAndVerify(s)) {
-                    return result;
+                s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
+                if (s.collection === definitiveCollection) {
+                    /*
+                     * For specifiers with a name, try local resolution. Based on
+                     * the referrer.
+                     */
+                    if (result = this._serializeAndVerify(s)) {
+                        return result;
+                    }
                 }
                 // Look for a private collection in the referrer's namespace
-                let privateCollection = this._definitiveCollection(s.type);
-                if (privateCollection) {
-                    s.namespace += '/-' + privateCollection;
+                if (definitiveCollection) {
+                    s.namespace += '/-' + definitiveCollection;
                     if (result = this._serializeAndVerify(s)) {
@@ -100,2 +108,2 @@ return result;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        // Look locally in the referrer's namespace\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        if (s.name) {\n          s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        } else {\n          s.namespace = r.namespace;\n          s.name = r.name;\n        }\n        if (result = this._serializeAndVerify(s)) { return result; }\n\n        // Look for a private collection in the referrer's namespace\n        let privateCollection = this._definitiveCollection(s.type);\n        if (privateCollection) {\n          s.namespace += '/-' + privateCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        let definitiveCollection = this._definitiveCollection(s.type);\n\n        if (!s.name) {\n          /*\n           * For specifiers without a name use the referrer's name and\n           * do not fallback to any other resolution rules.\n           */\n          s.namespace = r.namespace;\n          s.name = r.name;\n          return this._serializeAndVerify(s);\n        }\n\n        s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        if (s.collection === definitiveCollection) {\n          /*\n           * For specifiers with a name, try local resolution. Based on\n           * the referrer.\n           */\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Look for a private collection in the referrer's namespace\n        if (definitiveCollection) {\n          s.namespace += '/-' + definitiveCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}

dist/modules/es5/resolver.js

@@ -24,18 +24,27 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
                 assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);
-                // Look locally in the referrer's namespace
                 s.rootName = r.rootName;
                 s.collection = r.collection;
-                if (s.name) {
-                    s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
-                } else {
+                var definitiveCollection = this._definitiveCollection(s.type);
+                if (!s.name) {
+                    /*
+                     * For specifiers without a name use the referrer's name and
+                     * do not fallback to any other resolution rules.
+                     */
                     s.namespace = r.namespace;
                     s.name = r.name;
+                    return this._serializeAndVerify(s);
                 }
-                if (result = this._serializeAndVerify(s)) {
-                    return result;
+                s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
+                if (s.collection === definitiveCollection) {
+                    /*
+                     * For specifiers with a name, try local resolution. Based on
+                     * the referrer.
+                     */
+                    if (result = this._serializeAndVerify(s)) {
+                        return result;
+                    }
                 }
                 // Look for a private collection in the referrer's namespace
-                var privateCollection = this._definitiveCollection(s.type);
-                if (privateCollection) {
-                    s.namespace += '/-' + privateCollection;
+                if (definitiveCollection) {
+                    s.namespace += '/-' + definitiveCollection;
                     if (result = this._serializeAndVerify(s)) {
@@ -111,2 +120,2 @@ return result;
 export default Resolver;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":";;AAAA,AAAO,SAGL,AAAyB,2BACzB,AAAyB,2BACzB,AAAoB,sBACpB,AAAkB,AACnB,0BAAM,AAAa,AAAC;AACrB,AAAO,SAAE,AAAM,AAAE,cAAM,AAAe,AAAC,AAIvC,AAAM,AAAC,AAAO;;;AAIZ,sBAAY,AAA6B,QAAE,AAAwB;;;AACjE,AAAI,aAAC,AAAM,SAAG,AAAM,AAAC;AACrB,AAAI,aAAC,AAAQ,WAAG,AAAQ,AAAC,AAC3B;AAAC;;uBAED,AAAQ,6BAAC,AAAiB,WAAE,AAAiB;AAC3C,AAAE,AAAC,YAAC,AAAyB,0BAAC,AAAS,AAAC,AAAC,YAAC,AAAC;AACzC,AAAM,mBAAC,AAAS,AAAC,AACnB;AAAC;AAED,YAAI,AAAC,IAAG,AAAoB,qBAAC,AAAS,AAAC,AAAC;AACxC,YAAI,AAAc,AAAC;AAEnB,AAAE,AAAC,YAAC,AAAQ,AAAC,UAAC,AAAC;AACb,gBAAI,AAAC,IAAG,AAAoB,qBAAC,AAAQ,AAAC,AAAC;AAEvC,AAAE,AAAC,gBAAC,AAAyB,0BAAC,AAAC,AAAC,AAAC,IAAC,AAAC;AACjC,AAAM,uBAAC,AAAyG,2GAAE,AAAC,EAAC,AAAQ,aAAK,AAAS,aAAI,AAAC,EAAC,AAAU,eAAK,AAAS,aAAI,AAAC,EAAC,AAAS,cAAK,AAAS,AAAC,AAAC;AAEvM,AAA2C;AAC3C,AAAC,kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAQ,AAAC;AACxB,AAAC,kBAAC,AAAU,aAAG,AAAC,EAAC,AAAU,AAAC;AAC5B,AAAE,AAAC,oBAAC,AAAC,EAAC,AAAI,AAAC,MAAC,AAAC;AACX,AAAC,sBAAC,AAAS,YAAG,AAAC,EAAC,AAAS,YAAG,AAAC,EAAC,AAAS,YAAG,AAAG,MAAG,AAAC,EAAC,AAAI,OAAG,AAAC,EAAC,AAAI,AAAC,AAClE;AAAC,AAAC,AAAI,uBAAC,AAAC;AACN,AAAC,sBAAC,AAAS,YAAG,AAAC,EAAC,AAAS,AAAC;AAC1B,AAAC,sBAAC,AAAI,OAAG,AAAC,EAAC,AAAI,AAAC,AAClB;AAAC;AACD,AAAE,AAAC,oBAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC;AAAC,AAAM,2BAAC,AAAM,AAAC,AAAC;AAAC;AAE5D,AAA4D;AAC5D,oBAAI,AAAiB,oBAAG,AAAI,KAAC,AAAqB,sBAAC,AAAC,EAAC,AAAI,AAAC,AAAC;AAC3D,AAAE,AAAC,oBAAC,AAAiB,AAAC,mBAAC,AAAC;AACtB,AAAC,sBAAC,AAAS,aAAI,AAAI,OAAG,AAAiB,AAAC;AACxC,AAAE,AAAC,wBAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC;AAAC,AAAM,+BAAC,AAAM,AAAC,AAAC;AAAC,AAC9D;AAAC;AAED,AAAmF;AACnF,AAAuC;AACvC,AAAC,kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAU,aAAG,AAAC,EAAC,AAAS,YAAG,AAAS,AAAC,AACtD;AAAC,AAAC,AAAI,mBAAC,AAAC;AACN,AAAM,uBAAC,AAAyF,2FAAE,AAAC,EAAC,AAAI,AAAC,AAAC;AAE1G,AAA4D;AAC5D,AAAC,kBAAC,AAAU,aAAG,AAAI,KAAC,AAAqB,sBAAC,AAAC,EAAC,AAAI,AAAC,AAAC;AAClD,AAAM,AAAC,8BAAI,AAAC,EAAC,AAAI,AAAyC,mDAAE,AAAC,EAAC,AAAU,AAAC,AAAC,AAC5E;AAAC,AACH;AAAC;AAED,AAAiF;AACjF,AAAE,AAAC,YAAC,CAAC,AAAC,EAAC,AAAU,AAAC,YAAC,AAAC;AAClB,AAAC,cAAC,AAAU,aAAG,AAAI,KAAC,AAAqB,sBAAC,AAAC,EAAC,AAAI,AAAC,AAAC;AAClD,AAAM,AAAC,0BAAI,AAAC,EAAC,AAAI,AAAyC,mDAAE,AAAC,EAAC,AAAU,AAAC,AAAC,AAC5E;AAAC;AAED,AAAE,AAAC,YAAC,CAAC,AAAC,EAAC,AAAQ,AAAC,UAAC,AAAC;AAChB,AAAkE;AAClE,AAAC,cAAC,AAAQ,WAAG,AAAI,KAAC,AAAM,OAAC,AAAG,IAAC,AAAQ,YAAI,AAAK,AAAC;AAC/C,AAAE,AAAC,gBAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC;AAAC,AAAM,uBAAC,AAAM,AAAC,AAAC;AAAC;AAE5D,AAAoD;AACpD,gBAAI,AAAQ,AAAC;AACb,AAAE,AAAC,gBAAC,AAAC,EAAC,AAAS,AAAC,WAAC,AAAC;AAChB,AAAQ,2BAAG,AAAI,KAAC,AAAM,OAAC,AAAM,UAAI,AAAI,KAAC,AAAM,OAAC,AAAM,OAAC,AAAC,EAAC,AAAS,AAAC,AAAC;AACjE,AAAC,kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAS,AAAC;AACzB,AAAC,kBAAC,AAAS,YAAG,AAAS,AAAC,AAE1B;AAAC,AAAC,AAAI,mBAAC,AAAC;AACN,AAAQ,2BAAG,AAAI,KAAC,AAAM,OAAC,AAAM,UAAI,AAAI,KAAC,AAAM,OAAC,AAAM,OAAC,AAAC,EAAC,AAAI,AAAC,AAAC;AAC5D,AAAC,kBAAC,AAAQ,WAAG,AAAC,EAAC,AAAI,AAAC;AACpB,AAAC,kBAAC,AAAI,OAAG,AAAM,AAAC,AAClB;AAAC,AACH;AAAC;AAED,AAAE,AAAC,YAAC,AAAM,SAAG,AAAI,KAAC,AAAmB,oBAAC,AAAC,AAAC,AAAC,IAAC,AAAC;AAAC,AAAM,mBAAC,AAAM,AAAC,AAAC;AAAC,AAC9D;AAAC;;uBAED,AAAQ,6BAAC,AAAiB;AACxB,AAAM,eAAC,AAAI,KAAC,AAAQ,SAAC,AAAG,IAAC,AAAS,AAAC,AAAC,AACtC;AAAC;;uBAED,AAAO,2BAAC,AAAiB,WAAE,AAAiB;AAC1C,YAAI,AAAE,KAAG,AAAI,KAAC,AAAQ,SAAC,AAAS,WAAE,AAAQ,AAAC,AAAC;AAC5C,AAAE,AAAC,YAAC,AAAE,AAAC,IAAC,AAAC;AACP,AAAM,mBAAC,AAAI,KAAC,AAAQ,SAAC,AAAE,AAAC,AAAC,AAC3B;AAAC,AACH;AAAC;;uBAEO,AAAqB,uDAAC,AAAY;AACxC,YAAI,AAAO,UAAG,AAAI,KAAC,AAAM,OAAC,AAAK,MAAC,AAAI,AAAC,AAAC;AACtC,AAAM,AAAC,sBAAI,AAAI,AAA4B,sCAAE,AAAO,AAAC,AAAC;AACtD,AAAM,eAAC,AAAO,QAAC,AAAoB,AAAC,AACtC;AAAC;;uBAEO,AAAmB,mDAAC,AAAoB;AAC9C,YAAI,AAAU,aAAG,AAAkB,mBAAC,AAAS,AAAC,AAAC;AAC/C,AAAE,AAAC,YAAC,AAAI,KAAC,AAAQ,SAAC,AAAG,IAAC,AAAU,AAAC,AAAC,aAAC,AAAC;AAClC,AAAM,mBAAC,AAAU,AAAC,AACpB;AAAC,AACH;AAAC,AACF","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        // Look locally in the referrer's namespace\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        if (s.name) {\n          s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        } else {\n          s.namespace = r.namespace;\n          s.name = r.name;\n        }\n        if (result = this._serializeAndVerify(s)) { return result; }\n\n        // Look for a private collection in the referrer's namespace\n        let privateCollection = this._definitiveCollection(s.type);\n        if (privateCollection) {\n          s.namespace += '/-' + privateCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"resolver.js","sourceRoot":"","sources":["src/resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Resolver as IResolver,\n  Specifier,\n  isSpecifierStringAbsolute,\n  isSpecifierObjectAbsolute,\n  deserializeSpecifier,\n  serializeSpecifier\n} from '@glimmer/di';\nimport { assert } from './utils/debug';\nimport { ModuleRegistry } from './module-registry';\nimport { ResolverConfiguration } from './resolver-configuration';\n\nexport default class Resolver implements IResolver {\n  public config: ResolverConfiguration;\n  public registry: ModuleRegistry;\n\n  constructor(config: ResolverConfiguration, registry: ModuleRegistry) {\n    this.config = config;\n    this.registry = registry;\n  }\n\n  identify(specifier: string, referrer?: string): string {\n    if (isSpecifierStringAbsolute(specifier)) {\n      return specifier;\n    }\n\n    let s = deserializeSpecifier(specifier);\n    let result: string;\n\n    if (referrer) {\n      let r = deserializeSpecifier(referrer);\n\n      if (isSpecifierObjectAbsolute(r)) {\n        assert('Specifier must not include a rootName, collection, or namespace when combined with an absolute referrer', s.rootName === undefined && s.collection === undefined && s.namespace === undefined);\n\n        s.rootName = r.rootName;\n        s.collection = r.collection;\n        let definitiveCollection = this._definitiveCollection(s.type);\n\n        if (!s.name) {\n          /*\n           * For specifiers without a name use the referrer's name and\n           * do not fallback to any other resolution rules.\n           */\n          s.namespace = r.namespace;\n          s.name = r.name;\n          return this._serializeAndVerify(s);\n        }\n\n        s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;\n        if (s.collection === definitiveCollection) {\n          /*\n           * For specifiers with a name, try local resolution. Based on\n           * the referrer.\n           */\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Look for a private collection in the referrer's namespace\n        if (definitiveCollection) {\n          s.namespace += '/-' + definitiveCollection;\n          if (result = this._serializeAndVerify(s)) { return result; }\n        }\n\n        // Because local and private resolution has failed, clear all but `name` and `type`\n        // to proceed with top-level resolution\n        s.rootName = s.collection = s.namespace = undefined;\n      } else {\n        assert('Referrer must either be \"absolute\" or include a `type` to determine the associated type', r.type);\n\n        // Look in the definitive collection for the associated type\n        s.collection = this._definitiveCollection(r.type);\n        assert(`'${r.type}' does not have a definitive collection`, s.collection);\n      }\n    }\n\n    // If the collection is unspecified, use the definitive collection for the `type`\n    if (!s.collection) {\n      s.collection = this._definitiveCollection(s.type);\n      assert(`'${s.type}' does not have a definitive collection`, s.collection);\n    }\n\n    if (!s.rootName) {\n      // If the root name is unspecified, try the app's `rootName` first\n      s.rootName = this.config.app.rootName || 'app';\n      if (result = this._serializeAndVerify(s)) { return result; }\n\n      // Then look for an addon with a matching `rootName`\n      let addonDef;\n      if (s.namespace) {\n        addonDef = this.config.addons && this.config.addons[s.namespace];\n        s.rootName = s.namespace;\n        s.namespace = undefined;\n\n      } else {\n        addonDef = this.config.addons && this.config.addons[s.name];\n        s.rootName = s.name;\n        s.name = 'main';\n      }\n    }\n\n    if (result = this._serializeAndVerify(s)) { return result; }\n  }\n\n  retrieve(specifier: string): any {\n    return this.registry.get(specifier);\n  }\n\n  resolve(specifier: string, referrer?: string): any {\n    let id = this.identify(specifier, referrer);\n    if (id) {\n      return this.retrieve(id);\n    }\n  }\n\n  private _definitiveCollection(type: string): string {\n    let typeDef = this.config.types[type];\n    assert(`'${type}' is not a recognized type`, typeDef);\n    return typeDef.definitiveCollection;\n  }\n\n  private _serializeAndVerify(specifier: Specifier): string {\n    let serialized = serializeSpecifier(specifier);\n    if (this.registry.has(serialized)) {\n      return serialized;\n    }\n  }\n}\n"]}

package.json

 {
   "name": "@glimmer/resolver",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Resolver for Glimmer apps.",
@@ -33,3 +33,6 @@ "contributors": [
     "testem": "^1.13.0"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

src/resolver.ts

@@ -36,17 +36,28 @@ import {
 
-        // Look locally in the referrer's namespace
         s.rootName = r.rootName;
         s.collection = r.collection;
-        if (s.name) {
-          s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
-        } else {
+        let definitiveCollection = this._definitiveCollection(s.type);
+
+        if (!s.name) {
+          /*
+           * For specifiers without a name use the referrer's name and
+           * do not fallback to any other resolution rules.
+           */
           s.namespace = r.namespace;
           s.name = r.name;
+          return this._serializeAndVerify(s);
         }
-        if (result = this._serializeAndVerify(s)) { return result; }
 
+        s.namespace = r.namespace ? r.namespace + '/' + r.name : r.name;
+        if (s.collection === definitiveCollection) {
+          /*
+           * For specifiers with a name, try local resolution. Based on
+           * the referrer.
+           */
+          if (result = this._serializeAndVerify(s)) { return result; }
+        }
+
         // Look for a private collection in the referrer's namespace
-        let privateCollection = this._definitiveCollection(s.type);
-        if (privateCollection) {
-          s.namespace += '/-' + privateCollection;
+        if (definitiveCollection) {
+          s.namespace += '/-' + definitiveCollection;
           if (result = this._serializeAndVerify(s)) { return result; }
@@ -53,0 +64,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

214348

increased by2.39%

Lines of code

974

increased by5.75%

Number of medium supply chain risk alerts

0

decreased by-100%

No dependency changes