You're Invited:Meet the Socket Team at BlackHat and DEF CON in Las Vegas, Aug 4-6.RSVP →
ember-resolver
Advanced tools
ember-resolver - npm Package Compare versions
Comparing version 3.0.0 to 3.0.1
@@ -1,1 +0,1 @@ | ||
| export { default } from './resolver'; | ||
| export { default } from './resolvers/classic'; |
@@ -1,418 +0,1 @@ | ||
| /*globals require */ | ||
| import Ember from 'ember'; | ||
| import ModuleRegistry from './utils/module-registry'; | ||
| import classFactory from './utils/class-factory'; | ||
| import makeDictionary from './utils/make-dictionary'; | ||
| /* | ||
| * This module defines a subclass of Ember.DefaultResolver that adds two | ||
| * important features: | ||
| * | ||
| * 1) The resolver makes the container aware of es6 modules via the AMD | ||
| * output. The loader's _moduleEntries is consulted so that classes can be | ||
| * resolved directly via the module loader, without needing a manual | ||
| * `import`. | ||
| * 2) is able to provide injections to classes that implement `extend` | ||
| * (as is typical with Ember). | ||
| */ | ||
| const { | ||
| underscore, | ||
| classify, | ||
| dasherize | ||
| } = Ember.String; | ||
| const { | ||
| get, | ||
| DefaultResolver | ||
| } = Ember; | ||
| function parseName(fullName) { | ||
| /*jshint validthis:true */ | ||
| if (fullName.parsedName === true) { return fullName; } | ||
| let prefix, type, name; | ||
| let fullNameParts = fullName.split('@'); | ||
| // HTMLBars uses helper:@content-helper which collides | ||
| // with ember-cli namespace detection. | ||
| // This will be removed in a future release of HTMLBars. | ||
| if (fullName !== 'helper:@content-helper' && | ||
| fullNameParts.length === 2) { | ||
| let prefixParts = fullNameParts[0].split(':'); | ||
| if (prefixParts.length === 2) { | ||
| prefix = prefixParts[1]; | ||
| type = prefixParts[0]; | ||
| name = fullNameParts[1]; | ||
| } else { | ||
| let nameParts = fullNameParts[1].split(':'); | ||
| prefix = fullNameParts[0]; | ||
| type = nameParts[0]; | ||
| name = nameParts[1]; | ||
| } | ||
| } else { | ||
| fullNameParts = fullName.split(':'); | ||
| type = fullNameParts[0]; | ||
| name = fullNameParts[1]; | ||
| } | ||
| let fullNameWithoutType = name; | ||
| let namespace = get(this, 'namespace'); | ||
| let root = namespace; | ||
| return { | ||
| parsedName: true, | ||
| fullName: fullName, | ||
| prefix: prefix || this.prefix({type: type}), | ||
| type: type, | ||
| fullNameWithoutType: fullNameWithoutType, | ||
| name: name, | ||
| root: root, | ||
| resolveMethodName: "resolve" + classify(type) | ||
| }; | ||
| } | ||
| function resolveOther(parsedName) { | ||
| /*jshint validthis:true */ | ||
| Ember.assert('`modulePrefix` must be defined', this.namespace.modulePrefix); | ||
| let normalizedModuleName = this.findModuleName(parsedName); | ||
| if (normalizedModuleName) { | ||
| let defaultExport = this._extractDefaultExport(normalizedModuleName, parsedName); | ||
| if (defaultExport === undefined) { | ||
| throw new Error(` Expected to find: '${parsedName.fullName}' within '${normalizedModuleName}' but got 'undefined'. Did you forget to 'export default' within '${normalizedModuleName}'?`); | ||
| } | ||
| if (this.shouldWrapInClassFactory(defaultExport, parsedName)) { | ||
| defaultExport = classFactory(defaultExport); | ||
| } | ||
| return defaultExport; | ||
| } else { | ||
| return this._super(parsedName); | ||
| } | ||
| } | ||
| // Ember.DefaultResolver docs: | ||
| // https://github.com/emberjs/ember.js/blob/master/packages/ember-application/lib/system/resolver.js | ||
| const Resolver = DefaultResolver.extend({ | ||
| resolveOther, | ||
| parseName, | ||
| resolveTemplate: resolveOther, | ||
| pluralizedTypes: null, | ||
| moduleRegistry: null, | ||
| makeToString(factory, fullName) { | ||
| return '' + this.namespace.modulePrefix + '@' + fullName + ':'; | ||
| }, | ||
| shouldWrapInClassFactory(/* module, parsedName */){ | ||
| return false; | ||
| }, | ||
| init() { | ||
| this._super(); | ||
| this.moduleBasedResolver = true; | ||
| if (!this._moduleRegistry) { | ||
| this._moduleRegistry = new ModuleRegistry(); | ||
| } | ||
| this._normalizeCache = makeDictionary(); | ||
| this.pluralizedTypes = this.pluralizedTypes || makeDictionary(); | ||
| if (!this.pluralizedTypes.config) { | ||
| this.pluralizedTypes.config = 'config'; | ||
| } | ||
| this._deprecatedPodModulePrefix = false; | ||
| }, | ||
| normalize(fullName) { | ||
| return this._normalizeCache[fullName] || (this._normalizeCache[fullName] = this._normalize(fullName)); | ||
| }, | ||
| _normalize(fullName) { | ||
| // A) Convert underscores to dashes | ||
| // B) Convert camelCase to dash-case, except for helpers where we want to avoid shadowing camelCase expressions | ||
| // C) replace `.` with `/` in order to make nested controllers work in the following cases | ||
| // 1. `needs: ['posts/post']` | ||
| // 2. `{{render "posts/post"}}` | ||
| // 3. `this.render('posts/post')` from Route | ||
| let split = fullName.split(':'); | ||
| if (split.length > 1) { | ||
| if (split[0] === 'helper') { | ||
| return split[0] + ':' + split[1].replace(/_/g, '-'); | ||
| } else { | ||
| return split[0] + ':' + dasherize(split[1].replace(/\./g, '/')); | ||
| } | ||
| } else { | ||
| return fullName; | ||
| } | ||
| }, | ||
| pluralize(type) { | ||
| return this.pluralizedTypes[type] || (this.pluralizedTypes[type] = type + 's'); | ||
| }, | ||
| podBasedLookupWithPrefix(podPrefix, parsedName) { | ||
| let fullNameWithoutType = parsedName.fullNameWithoutType; | ||
| if (parsedName.type === 'template') { | ||
| fullNameWithoutType = fullNameWithoutType.replace(/^components\//, ''); | ||
| } | ||
| return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type; | ||
| }, | ||
| podBasedModuleName(parsedName) { | ||
| let podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix; | ||
| return this.podBasedLookupWithPrefix(podPrefix, parsedName); | ||
| }, | ||
| podBasedComponentsInSubdir(parsedName) { | ||
| let podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix; | ||
| podPrefix = podPrefix + '/components'; | ||
| if (parsedName.type === 'component' || parsedName.fullNameWithoutType.match(/^components/)) { | ||
| return this.podBasedLookupWithPrefix(podPrefix, parsedName); | ||
| } | ||
| }, | ||
| resolveEngine(parsedName) { | ||
| let engineName = parsedName.fullNameWithoutType; | ||
| let engineModule = engineName + '/engine'; | ||
| if (this._moduleRegistry.has(engineModule)) { | ||
| return this._extractDefaultExport(engineModule); | ||
| } | ||
| }, | ||
| resolveRouteMap(parsedName) { | ||
| let engineName = parsedName.fullNameWithoutType; | ||
| let engineRoutesModule = engineName + '/routes'; | ||
| if (this._moduleRegistry.has(engineRoutesModule)) { | ||
| let routeMap = this._extractDefaultExport(engineRoutesModule); | ||
| Ember.assert(`The route map for ${engineName} should be wrapped by 'buildRoutes' before exporting.` , routeMap.isRouteMap); | ||
| return routeMap; | ||
| } | ||
| }, | ||
| mainModuleName(parsedName) { | ||
| // if router:main or adapter:main look for a module with just the type first | ||
| let tmpModuleName = parsedName.prefix + '/' + parsedName.type; | ||
| if (parsedName.fullNameWithoutType === 'main') { | ||
| return tmpModuleName; | ||
| } | ||
| }, | ||
| defaultModuleName(parsedName) { | ||
| return parsedName.prefix + '/' + this.pluralize(parsedName.type) + '/' + parsedName.fullNameWithoutType; | ||
| }, | ||
| prefix(parsedName) { | ||
| let tmpPrefix = this.namespace.modulePrefix; | ||
| if (this.namespace[parsedName.type + 'Prefix']) { | ||
| tmpPrefix = this.namespace[parsedName.type + 'Prefix']; | ||
| } | ||
| return tmpPrefix; | ||
| }, | ||
| /** | ||
| A listing of functions to test for moduleName's based on the provided | ||
| `parsedName`. This allows easy customization of additional module based | ||
| lookup patterns. | ||
| @property moduleNameLookupPatterns | ||
| @returns {Ember.Array} | ||
| */ | ||
| moduleNameLookupPatterns: Ember.computed(function(){ | ||
| return [ | ||
| this.podBasedModuleName, | ||
| this.podBasedComponentsInSubdir, | ||
| this.mainModuleName, | ||
| this.defaultModuleName | ||
| ]; | ||
| }).readOnly(), | ||
| findModuleName(parsedName, loggingDisabled){ | ||
| let moduleNameLookupPatterns = this.get('moduleNameLookupPatterns'); | ||
| let moduleName; | ||
| for (let index = 0, length = moduleNameLookupPatterns.length; index < length; index++) { | ||
| let item = moduleNameLookupPatterns[index]; | ||
| let tmpModuleName = item.call(this, parsedName); | ||
| // allow treat all dashed and all underscored as the same thing | ||
| // supports components with dashes and other stuff with underscores. | ||
| if (tmpModuleName) { | ||
| tmpModuleName = this.chooseModuleName(tmpModuleName, parsedName); | ||
| } | ||
| if (tmpModuleName && this._moduleRegistry.has(tmpModuleName)) { | ||
| moduleName = tmpModuleName; | ||
| } | ||
| if (!loggingDisabled) { | ||
| this._logLookup(moduleName, parsedName, tmpModuleName); | ||
| } | ||
| if (moduleName) { | ||
| return moduleName; | ||
| } | ||
| } | ||
| }, | ||
| chooseModuleName(moduleName, parsedName) { | ||
| let underscoredModuleName = underscore(moduleName); | ||
| if (moduleName !== underscoredModuleName && this._moduleRegistry.has(moduleName) && this._moduleRegistry.has(underscoredModuleName)) { | ||
| throw new TypeError(`Ambiguous module names: '${ moduleName}' and '${underscoredModuleName }'`); | ||
| } | ||
| if (this._moduleRegistry.has(moduleName)) { | ||
| return moduleName; | ||
| } else if (this._moduleRegistry.has(underscoredModuleName)) { | ||
| return underscoredModuleName; | ||
| } | ||
| // workaround for dasherized partials: | ||
| // something/something/-something => something/something/_something | ||
| let partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1'); | ||
| if (this._moduleRegistry.has(partializedModuleName)) { | ||
| Ember.deprecate('Modules should not contain underscores. ' + | ||
| 'Attempted to lookup "'+moduleName+'" which ' + | ||
| 'was not found. Please rename "'+partializedModuleName+'" '+ | ||
| 'to "'+moduleName+'" instead.', false, | ||
| { id: 'ember-resolver.underscored-modules', until: '3.0.0' }); | ||
| return partializedModuleName; | ||
| } | ||
| Ember.runInDebug(() => { | ||
| let isCamelCaseHelper = parsedName.type === 'helper' && !!moduleName.match(/[a-z]+[A-Z]+/); | ||
| if (isCamelCaseHelper) { | ||
| this._camelCaseHelperWarnedNames = this._camelCaseHelperWarnedNames || []; | ||
| let alreadyWarned = this._camelCaseHelperWarnedNames.indexOf(parsedName.fullName) > -1; | ||
| if (!alreadyWarned && this._moduleRegistry.has(dasherize(moduleName))) { | ||
| this._camelCaseHelperWarnedNames.push(parsedName.fullName); | ||
| Ember.warn('Attempted to lookup "' + parsedName.fullName + '" which ' + | ||
| 'was not found. In previous versions of ember-resolver, a bug would have ' + | ||
| 'caused the module at "' + dasherize(moduleName) + '" to be ' + | ||
| 'returned for this camel case helper name. This has been fixed. ' + | ||
| 'Use the dasherized name to resolve the module that would have been ' + | ||
| 'returned in previous versions.', | ||
| false, | ||
| { id: 'ember-resolver.camelcase-helper-names', until: '3.0.0' }); | ||
| } | ||
| } | ||
| }); | ||
| }, | ||
| // used by Ember.DefaultResolver.prototype._logLookup | ||
| lookupDescription(fullName) { | ||
| let parsedName = this.parseName(fullName); | ||
| let moduleName = this.findModuleName(parsedName, true); | ||
| return moduleName; | ||
| }, | ||
| // only needed until 1.6.0-beta.2 can be required | ||
| _logLookup(found, parsedName, description) { | ||
| if (!Ember.ENV.LOG_MODULE_RESOLVER && !parsedName.root.LOG_RESOLVER) { | ||
| return; | ||
| } | ||
| let symbol, padding; | ||
| if (found) { symbol = '[✓]'; } | ||
| else { symbol = '[ ]'; } | ||
| if (parsedName.fullName.length > 60) { | ||
| padding = '.'; | ||
| } else { | ||
| padding = new Array(60 - parsedName.fullName.length).join('.'); | ||
| } | ||
| if (!description) { | ||
| description = this.lookupDescription(parsedName); | ||
| } | ||
| Ember.Logger.info(symbol, parsedName.fullName, padding, description); | ||
| }, | ||
| knownForType(type) { | ||
| let moduleKeys = this._moduleRegistry.moduleNames(); | ||
| let items = makeDictionary(); | ||
| for (let index = 0, length = moduleKeys.length; index < length; index++) { | ||
| let moduleName = moduleKeys[index]; | ||
| let fullname = this.translateToContainerFullname(type, moduleName); | ||
| if (fullname) { | ||
| items[fullname] = true; | ||
| } | ||
| } | ||
| return items; | ||
| }, | ||
| translateToContainerFullname(type, moduleName) { | ||
| let prefix = this.prefix({ type }); | ||
| // Note: using string manipulation here rather than regexes for better performance. | ||
| // pod modules | ||
| // '^' + prefix + '/(.+)/' + type + '$' | ||
| let podPrefix = prefix + '/'; | ||
| let podSuffix = '/' + type; | ||
| let start = moduleName.indexOf(podPrefix); | ||
| let end = moduleName.indexOf(podSuffix); | ||
| if (start === 0 && end === (moduleName.length - podSuffix.length) && | ||
| moduleName.length > (podPrefix.length + podSuffix.length)) { | ||
| return type + ':' + moduleName.slice(start + podPrefix.length, end); | ||
| } | ||
| // non-pod modules | ||
| // '^' + prefix + '/' + pluralizedType + '/(.+)$' | ||
| let pluralizedType = this.pluralize(type); | ||
| let nonPodPrefix = prefix + '/' + pluralizedType + '/'; | ||
| if (moduleName.indexOf(nonPodPrefix) === 0 && moduleName.length > nonPodPrefix.length) { | ||
| return type + ':' + moduleName.slice(nonPodPrefix.length); | ||
| } | ||
| }, | ||
| _extractDefaultExport(normalizedModuleName) { | ||
| let module = require(normalizedModuleName, null, null, true /* force sync */); | ||
| if (module && module['default']) { | ||
| module = module['default']; | ||
| } | ||
| return module; | ||
| } | ||
| }); | ||
| Resolver.reopenClass({ | ||
| moduleBasedResolver: true | ||
| }); | ||
| export default Resolver; | ||
| export { default } from './resolvers/classic'; |
@@ -1,5 +0,3 @@ | ||
| import create from './create'; | ||
| export default function makeDictionary() { | ||
| let cache = create(null); | ||
| let cache = Object.create(null); | ||
| cache['_dict'] = null; | ||
@@ -6,0 +4,0 @@ delete cache['_dict']; |
| # Change Log | ||
| ## [Unreleased](https://github.com/ember-cli/ember-resolver/tree/HEAD) | ||
| ## [v3.0.1](https://github.com/ember-cli/ember-resolver/tree/v3.0.1) (2017-03-24) | ||
| [Full Changelog](https://github.com/ember-cli/ember-resolver/compare/v3.0.0...v3.0.1) | ||
| [Full Changelog](https://github.com/ember-cli/ember-resolver/compare/v2.0.3...HEAD) | ||
| **Closed issues:** | ||
| - 3 version break ember-inspector. [\#175](https://github.com/ember-cli/ember-resolver/issues/175) | ||
| - ContainerDebugAdapter.catalogEntriesByType returns objects of wrong type [\#120](https://github.com/ember-cli/ember-resolver/issues/120) | ||
| **Merged pull requests:** | ||
| - \[Fixes \#175\] restore ability to resolve from modules [\#178](https://github.com/ember-cli/ember-resolver/pull/178) ([stefanpenner](https://github.com/stefanpenner)) | ||
| - No longer need Ember.keys [\#177](https://github.com/ember-cli/ember-resolver/pull/177) ([mixonic](https://github.com/mixonic)) | ||
| - Restructure on disk [\#176](https://github.com/ember-cli/ember-resolver/pull/176) ([mixonic](https://github.com/mixonic)) | ||
| ## [v3.0.0](https://github.com/ember-cli/ember-resolver/tree/v3.0.0) (2017-03-11) | ||
| [Full Changelog](https://github.com/ember-cli/ember-resolver/compare/v2.1.1...v3.0.0) | ||
| **Closed issues:** | ||
| - Remove old / dead code [\#131](https://github.com/ember-cli/ember-resolver/issues/131) | ||
| - Re-register failing on `App.reset\(\)` [\#130](https://github.com/ember-cli/ember-resolver/issues/130) | ||
| - confirm @ember as npm scope works [\#114](https://github.com/ember-cli/ember-resolver/issues/114) | ||
| **Merged pull requests:** | ||
| - more cleanup [\#174](https://github.com/ember-cli/ember-resolver/pull/174) ([stefanpenner](https://github.com/stefanpenner)) | ||
| - cleanup [\#173](https://github.com/ember-cli/ember-resolver/pull/173) ([stefanpenner](https://github.com/stefanpenner)) | ||
| - cleanup deps [\#172](https://github.com/ember-cli/ember-resolver/pull/172) ([stefanpenner](https://github.com/stefanpenner)) | ||
| - Allow for lazy people like me to easy navigate to update example. [\#169](https://github.com/ember-cli/ember-resolver/pull/169) ([daniellawrence](https://github.com/daniellawrence)) | ||
| - Update ember-cli-app-version to version 2.0.1 🚀 [\#165](https://github.com/ember-cli/ember-resolver/pull/165) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot)) | ||
| - Update ember-cli to version 2.9.1 🚀 [\#164](https://github.com/ember-cli/ember-resolver/pull/164) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot)) | ||
| ## [v2.1.1](https://github.com/ember-cli/ember-resolver/tree/v2.1.1) (2016-12-30) | ||
| [Full Changelog](https://github.com/ember-cli/ember-resolver/compare/v2.1.0...v2.1.1) | ||
| **Merged pull requests:** | ||
| - Don't resolve camelCase helper names to dasherized modules [\#167](https://github.com/ember-cli/ember-resolver/pull/167) ([lukemelia](https://github.com/lukemelia)) | ||
| - 👻😱 Node.js 0.10 is unmaintained 😱👻 [\#166](https://github.com/ember-cli/ember-resolver/pull/166) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot)) | ||
| - Update `ember-cli` to `2.8.0`. Closes \#152. [\#156](https://github.com/ember-cli/ember-resolver/pull/156) ([btecu](https://github.com/btecu)) | ||
| ## [v2.1.0](https://github.com/ember-cli/ember-resolver/tree/v2.1.0) (2016-09-03) | ||
| [Full Changelog](https://github.com/ember-cli/ember-resolver/compare/v2.0.3...v2.1.0) | ||
| **Fixed bugs:** | ||
| - Pin "jquery" to v1.11.3 [\#145](https://github.com/ember-cli/ember-resolver/pull/145) ([Turbo87](https://github.com/Turbo87)) | ||
| **Closed issues:** | ||
| - Use Ember Inflector for pluralization? [\#147](https://github.com/ember-cli/ember-resolver/issues/147) | ||
| - Fix broken/hanging TravisCI builds [\#137](https://github.com/ember-cli/ember-resolver/issues/137) | ||
| - ember-data and pod format [\#128](https://github.com/ember-cli/ember-resolver/issues/128) | ||
@@ -17,2 +63,4 @@ - Deprecation warning in Ember 2.2 [\#124](https://github.com/ember-cli/ember-resolver/issues/124) | ||
| - Implement resolveEngine and resolveRouteMap [\#151](https://github.com/ember-cli/ember-resolver/pull/151) ([trentmwillis](https://github.com/trentmwillis)) | ||
| - Update CHANGELOG file [\#146](https://github.com/ember-cli/ember-resolver/pull/146) ([Turbo87](https://github.com/Turbo87)) | ||
| - Add options to deprecation [\#133](https://github.com/ember-cli/ember-resolver/pull/133) ([wagenet](https://github.com/wagenet)) | ||
@@ -19,0 +67,0 @@ - Updating semver comparison to handle pre-release versions. [\#126](https://github.com/ember-cli/ember-resolver/pull/126) ([gmurphey](https://github.com/gmurphey)) |
| { | ||
| "name": "ember-resolver", | ||
| "version": "3.0.0", | ||
| "version": "3.0.1", | ||
| "description": "The default modules based resolver for Ember CLI.", | ||
@@ -5,0 +5,0 @@ "directories": { |
New alerts
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Fixed alerts
New author
Supply chain riskA 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
URL strings
Supply chain riskPackage contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
214372
2.87%- Number of package files
20
5.26%- Lines of code
502
18.96%- Number of low supply chain risk alerts
2
-33.33%No dependency changes