Huge refactoring

Author: clmath

i18n.js

@@ -2,49 +2,13 @@
  * Plugin based on requirejs i18n
  * see: http://github.com/requirejs/i18n for details
  */
-define(['./i18n/common', "module", "require"], function (common, module, requirejs) {
-
-	// regexp for reconstructing the master bundle name from parts of the regexp match
-	// nlsRegExp.exec("foo/bar/baz/nls/en-ca/foo") gives:
-	// ["foo/bar/baz/nls/en-ca/foo", "foo/bar/baz/nls/", "/", "/", "en-ca", "foo"]
-	// nlsRegExp.exec("foo/bar/baz/nls/foo") gives:
-	// ["foo/bar/baz/nls/foo", "foo/bar/baz/nls/", "/", "/", "foo", ""]
-	// so, if match[5] is blank, it means this is the top bundle definition.
-	var nlsRegExp = /(^.*(^|\/)nls(\/|$))([^\/]*)\/?([^\/]*)/,
-
-
-		// Build variables
-		bundlesList = [],
-		confLocalesList,
-		pluginMid,
-
-		// Simple function to mix in properties from source into target,
-		// but only if target does not already have a property of the same name.
-		// This is not robust in IE for transferring methods that match
-		// Object.prototype names, but the uses of mixin here seem unlikely to
-		// trigger a problem related to that.
-		mixin = function (target, source, force) {
-			var prop;
-			for (prop in source) {
-				if (source.hasOwnProperty(prop) && (!target.hasOwnProperty(prop) || force)) {
-					target[prop] = source[prop];
-				} else if (typeof source[prop] === 'object') {
-					if (!target[prop] && source[prop]) {
-						target[prop] = {};
-					}
-					mixin(target[prop], source[prop], force);
-				}
-			}
-		},
+define(["./i18n/common", "./i18n/build", "module"], function (common, build, module) {
 
-		eachProp = function (obj, func) {
-			var prop;
-			for (prop in obj) {
-				if (obj.hasOwnProperty(prop)) {
-					func(prop, obj[prop]);
-				}
-			}
-		},
+	var localesList,
+		mixin = common.mixin,
+		eachProp = common.eachProp,
+		parseName = common.parseName,
+		getMasterMid = common.getMasterMid,
 
 		normalizeBundlesMap = function (bundlesMap) {
 			var result = {};
@@ -56,26 +20,6 @@ define(['./i18n/common', "module", "require"], function (common, module, require
 			return result;
 		},
 
-		// Use nlsRegExp to parse the resource mid and return a usable object.	
-		parseName = function (name) {
-			var match = nlsRegExp.exec(name);
-
-			// If match[5] is blank, it means this is the top bundle definition,
-			// hence suffix is match[4] and locale is null.
-			return {
-				prefix: match[1],
-				masterLocale: "root",
-				requestedLocale: match[5] ? match[4] : null,
-				suffix: match[5] || match[4]
-			};
-		},
-
-		getMasterMid = function (name) {
-			return name.masterLocale === "root" ? name.prefix + name.suffix :
-				name.prefix + name.masterLocale + "/" + name.suffix;
-		},
-
-
 		// Transform a bundle from a language layer to a root bundle.
 		rootify = function (bundle, locale) {
 			var result = {};
@@ -189,7 +133,7 @@ define(['./i18n/common', "module", "require"], function (common, module, require
 			mixin(moduleConfig, typeof module.config === "function" ? module.config() || {} : {});
 
 			if (config.isBuild) {
-				confLocalesList = config.localesList;
+				localesList = config.localesList;
 				onLoad();
 				return;
 			}
@@ -236,141 +180,34 @@ define(['./i18n/common', "module", "require"], function (common, module, require
 		},
 		/* jshint +W074 */
 
-		write: function (pluginName, moduleName) {
-			pluginMid = pluginMid || pluginName;
-			bundlesList.push(moduleName);
-		},
-
-		onLayerEnd: function (write, data) {
-			var i18nConf,
-				layersContent = {},
-				localesList,
-				pseudoRoots,
-				match = data.name.match(/^(.*\/)(.*)$/),
-				layerMid = match[1] + "nls/" + match[2],
-
-				// Get the list of locales to process and calculate the pseudoRoots
-				init = function () {
-					localesList = confLocalesList || [];
-					pseudoRoots = {};
-					bundlesList.forEach(function (bundle) {
-						var root = requirejs(bundle);
-						pseudoRoots[bundle] = pseudoRoots[bundle] || {};
-
-						eachProp(root, function (loc) {
-							// Calculate the pseudoRoots
-							var parent = common.getParentLocale(loc);
-							while (parent && parent !== "root") {
-								pseudoRoots[bundle][parent] = pseudoRoots[parent] || {};
-								pseudoRoots[bundle][parent][loc] = true;
-								parent = common.getParentLocale(parent);
-							}
-							// List all available locales if no list provided
-							if (!confLocalesList && localesList.indexOf(loc) < 0) {
-								localesList.push(loc);
-							}
-						});
-					});
-				},
+		write: function (pluginName, moduleName, write) {
+			var name = parseName(moduleName),
+				bundle;
 
-				resetPlugin = function () {
-					bundlesList = [];
-					confLocalesList = undefined;
-					pluginMid = undefined;
-				};
-
-			if (!data.name) {
-				resetPlugin();
-				return;
+			if (name.requestedLocale) {
+				bundle = build.resolveSync(name.requestedLocale, name);
+				if (name.requestedLocale !== "root") {
+					bundle._pseudoRoot = {};
+					bundle._flattened = true;
+				}
+				write.asModule(moduleName, "define(" + JSON.stringify(bundle) + ")");
+			} else {
+				build.addBundleToNlsLayer(name);
 			}
+		},
 
-			// Run through every bundles to know which locales are available for each module.
-			init();
-
-			// calculate the nls layer for each locale
-			bundlesList.forEach(function (bundle) {
-				var name = parseName(bundle),
-					normalizeRoot = function (bundle, name) {
-						bundle.root = (bundle.root === true || bundle.root === 1) ?
-							requirejs(name.prefix + "root/" + name.suffix) : bundle.root;
-						return bundle;
-					},
-					root = normalizeRoot(requirejs(bundle), name);
-				// TODO: if name.requestedLocale a different optimization is possible
-
-				localesList.forEach(function (loc) {
-					var result = {},
-						localizedBundle,
-						locale = loc;
-
-					layersContent[loc] = layersContent[loc] || "";
-
-					if (loc !== "root") {
-						while (locale && locale !== "root") {
-							if (root[locale]) {
-								localizedBundle = requirejs(name.prefix + locale + "/" + name.suffix);
-								mixin(result, localizedBundle);
-							}
-							locale = common.getParentLocale(locale);
-						}
-						localizedBundle = root.root;
-						mixin(result, localizedBundle);
-
-						result._flattened = true;
-						result._pseudoRoot = pseudoRoots[bundle][loc] || {};
-					} else {
-						mixin(result, root);
-					}
-
-					layersContent[loc] += 'define("' + name.prefix + loc + "/" +
-						name.suffix + '",' + JSON.stringify(result) + ");";
-				});
-			});
-
-			// This assumes nodejs
-			eachProp(layersContent, function (loc, content) {
-				var fs = require("fs"),
-					createPath = function (path) {
-						var parts = path.split("/"),
-							tmp = [];
-
-						while (!fs.existsSync(parts.join("/") + "/")) {
-							tmp.push(parts.pop());
-						}
-						while (tmp.length) {
-							parts.push(tmp.pop());
-							fs.mkdirSync(parts.join("/"));
-						}
-					},
-
-					match = data.path.match(/^(.*\/)(.*)(\.js)$/),
-					dir = match[1] + "nls/",
-					filename = match[2] + "_" + loc + ".js",
-					mid = layerMid + "_" + loc;
-
-				content += "define('" + mid + "', true);";
-
-				// Create path
-				createPath(dir);
-				fs.writeFileSync(dir + filename, content);
-			});
-
+		onLayerEnd: function (write, data) {
+			if (data.name && data.path) {
+				var layersContent;
 
-			// Init config structure
-			i18nConf = {
-				config: {}
-			};
-			i18nConf.config[pluginMid] = {
-				bundlesMap: {},
-				localesMap: {}
-			};
-			i18nConf.config[pluginMid].bundlesMap[layerMid] = bundlesList;
-			i18nConf.config[pluginMid].localesMap[layerMid] = localesList;
+				build.setLocalesList(localesList);
 
-			// write i18n config on the layer
-			write("require.config(" + JSON.stringify(i18nConf) + ")");
+				layersContent = build.getLayersContent();
 
-			resetPlugin();
+				build.writeLayers(layersContent, data);
+				build.writeConfig(module.id, data, write);
+			}
+			build.reset();
 		}
 	};
 });