Re: #59 - Pass both the post normalized and pre normalized module nam…

…es to the prefixTransform option

README.md

@@ -548,7 +548,7 @@ amdclean.clean({
   'prefixMode': 'standard',
   // A hook that allows you add your own custom logic to how each moduleName is
   // prefixed/normalized
-  'prefixTransform': function(moduleName) { return moduleName; },
+  'prefixTransform': function(postNormalizedModuleName, preNormalizedModuleName) { return postNormalizedModuleName; },
   // Wrap any build bundle in a start and end text specified by wrap
   // This should only be used when using the onModuleBundleComplete RequireJS
   // Optimizer build hook

build/amdclean.js

@@ -1,4 +1,4 @@
-/*! amdclean - v2.2.7 - 2014-10-02
+/*! amdclean - v2.2.8 - 2014-10-02
 * http://gregfranko.com/amdclean
 * Copyright (c) 2014 Greg Franko */
 
@@ -85,8 +85,8 @@ _defaultOptions_ = {
   // 'camelCase' example: 'utils/example' -> 'utilsExample'
   'prefixMode': 'standard',
   // A function hook that allows you add your own custom logic to how each module name is prefixed/normalized
-  'prefixTransform': function (moduleName) {
-    return moduleName;
+  'prefixTransform': function (postNormalizedModuleName, preNormalizedModuleName) {
+    return postNormalizedModuleName;
   },
   // Wrap any build bundle in a start and end text specified by wrap
   // This should only be used when using the onModuleBundleComplete RequireJS Optimizer build hook
@@ -546,7 +546,7 @@ normalizeModuleName = function normalizeModuleName(name, moduleId) {
     amdclean.storedModules[postNormalized] = true;
   }
   if (_.isFunction(prefixTransform)) {
-    prefixTransformValue = prefixTransform(postNormalized, moduleId);
+    prefixTransformValue = prefixTransform(postNormalized, name);
     if (_.isString(prefixTransformValue) && prefixTransformValue.length) {
       return prefixTransformValue;
     }
@@ -1570,7 +1570,7 @@ clean = function clean() {
       // The object that is publicly accessible
       publicAPI = {
         // Current project version number
-        'VERSION': '2.2.7',
+        'VERSION': '2.2.8',
         'clean': function (options, overloadedOptions) {
           // Creates a new AMDclean instance
           var amdclean = new AMDclean(options, overloadedOptions), cleanedCode = amdclean.clean();

gulpfile.js

@@ -103,6 +103,11 @@ gulp.task('test', ['build', 'lint'], function() {
     .pipe(jasmine());
 });
 
+gulp.task('test-only', function() {
+  gulp.src('test/specs/convert.js')
+    .pipe(jasmine());
+});
+
 gulp.task('minify', ['build', 'lint', 'test'], function() {
   gulp.src(['src/amdclean.js'])
     .pipe(gulp.dest('build/'))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "amdclean",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "A build tool that converts AMD code to standard JavaScript",
   "main": "./src/amdclean",
   "repository": {

src/amdclean.js

@@ -1,4 +1,4 @@
-/*! amdclean - v2.2.7 - 2014-10-02
+/*! amdclean - v2.2.8 - 2014-10-02
 * http://gregfranko.com/amdclean
 * Copyright (c) 2014 Greg Franko */
 
@@ -85,8 +85,8 @@ _defaultOptions_ = {
   // 'camelCase' example: 'utils/example' -> 'utilsExample'
   'prefixMode': 'standard',
   // A function hook that allows you add your own custom logic to how each module name is prefixed/normalized
-  'prefixTransform': function (moduleName) {
-    return moduleName;
+  'prefixTransform': function (postNormalizedModuleName, preNormalizedModuleName) {
+    return postNormalizedModuleName;
   },
   // Wrap any build bundle in a start and end text specified by wrap
   // This should only be used when using the onModuleBundleComplete RequireJS Optimizer build hook
@@ -546,7 +546,7 @@ normalizeModuleName = function normalizeModuleName(name, moduleId) {
     amdclean.storedModules[postNormalized] = true;
   }
   if (_.isFunction(prefixTransform)) {
-    prefixTransformValue = prefixTransform(postNormalized, moduleId);
+    prefixTransformValue = prefixTransform(postNormalized, name);
     if (_.isString(prefixTransformValue) && prefixTransformValue.length) {
       return prefixTransformValue;
     }
@@ -1570,7 +1570,7 @@ clean = function clean() {
       // The object that is publicly accessible
       publicAPI = {
         // Current project version number
-        'VERSION': '2.2.7',
+        'VERSION': '2.2.8',
         'clean': function (options, overloadedOptions) {
           // Creates a new AMDclean instance
           var amdclean = new AMDclean(options, overloadedOptions), cleanedCode = amdclean.clean();

src/modules/defaultOptions.js

@@ -54,8 +54,8 @@ define({
   // 'camelCase' example: 'utils/example' -> 'utilsExample'
   'prefixMode': 'standard',
   // A function hook that allows you add your own custom logic to how each module name is prefixed/normalized
-  'prefixTransform': function(moduleName) {
-    return moduleName;
+  'prefixTransform': function(postNormalizedModuleName, preNormalizedModuleName) {
+    return postNormalizedModuleName;
   },
   // Wrap any build bundle in a start and end text specified by wrap
   // This should only be used when using the onModuleBundleComplete RequireJS Optimizer build hook

src/modules/index.js

@@ -147,7 +147,7 @@ require([
       // The object that is publicly accessible
       publicAPI = {
         // Current project version number
-        'VERSION': '2.2.7',
+        'VERSION': '2.2.8',
         'clean': function(options, overloadedOptions) {
           // Creates a new AMDclean instance
           var amdclean = new AMDclean(options, overloadedOptions),

src/modules/normalizeModuleName.js

@@ -46,7 +46,7 @@ define([
     }
 
     if (_.isFunction(prefixTransform)) {
-      prefixTransformValue = prefixTransform(postNormalized, moduleId);
+      prefixTransformValue = prefixTransform(postNormalized, name);
       if (_.isString(prefixTransformValue) && prefixTransformValue.length) {
         return prefixTransformValue;
       }