Merge branch 'v0.3'

lib/parser.js

@@ -252,12 +252,13 @@ parser = {
 		}
 		return this.resolveExternal(fromfile, dirname, scope, dep);
 	},
-	resolveLocal: function (fromfile, dirpath, scope, tree, dep, orgFn) {
+	resolveLocal: function (fromfile, dirpath, scope, tree, dep, orgFn, lScope) {
 		var filename = dep.localFilename || dep.value, extNames = this.extNames
 		  , resolveDirPath, resolvePath, resolveFirstTypePath, resolveExtTypePath
 		  , resolveSpecificPath, init;
 		// console.log("RL", filename, dirpath, fromfile, tree.length);
 
+		if (!lScope) lScope = scope;
 		if (!orgFn) orgFn = filename;
 
 		resolveDirPath = function (path) {
@@ -375,7 +376,7 @@ parser = {
 			if (!scope[name]) scope[name] = result;
 			return result(filename);
 		}.bind(this), function (error) {
-			if (isOptional(scope[basename(fromfile)], dep.point, dep.raw.length)) {
+			if (isOptional(lScope[basename(fromfile)], dep.point, dep.raw.length)) {
 				return;
 			}
 			throw error;
@@ -384,7 +385,7 @@ parser = {
 	resolveExternal: function (fromfile, dirname, scope, dep) {
 		// console.log("RE", dep.value);
 		var org = dep.value, filename = join(dep.value)
-		  , name, tree, require, main, path, cache, ext;
+		  , lScope = scope, name, tree, require, main, path, cache, ext;
 		name = filename.split(sep, 1)[0];
 		return deferred.promisifySync(function () {
 			// If already processed, return result
@@ -477,7 +478,7 @@ parser = {
 			// console.log("RE", name, scope, filename);
 			dep.localFilename = filename;
 			return this.resolveLocal(fromfile, this.packages[name], scope, tree,
-				dep, org);
+				dep, org, lScope);
 		}.bind(this));
 	},
 	toString: function () {

test/__playground/lib/program.js

@@ -49,3 +49,9 @@ exports.external = {
 	other: require('test/lib/other.js'),
 	noMain: require('no-main/lib/some-module')
 };
+
+try {
+	require('test/marko/optional-module-of-outer-package');
+} catch (e) {
+	if (e.code !== 'MODULE_NOT_FOUND') throw e;
+}