Merge pull request #352 from stesie/issue-349

Issue 349

Commandfile

@@ -26,7 +26,7 @@ command 'clean',
 command 'build',
   description: 'executes "make"',
   script: <<-eof
-    cd /data/build; `which gmake || which make`
+    cd /data/build; `which gmake || which make` -j4
     eof
 
 command 'test',

tests/issue_349_basic.phpt

@@ -0,0 +1,82 @@
+--TEST--
+Test V8Js::setModuleNormaliser : Custom normalisation #005
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--FILE--
+<?php
+
+$v8 = new V8Js();
+
+$v8->setModuleNormaliser(function ($base, $moduleName) {
+    var_dump($base, $moduleName);
+    if ($base == '' && $moduleName == './tags') {
+        return ['./tags', 'index.js'];
+    }
+    if ($base == './tags' && $moduleName == './if.js') {
+        return ['./tags', 'if.js'];
+    }
+    return [$base, $moduleName];
+});
+
+$v8->setModuleLoader(function ($moduleName) {
+    print("setModuleLoader called for ".$moduleName."\n");
+    switch ($moduleName) {
+        case './app.js':
+            return "require('./tags')";
+        case './tags/index.js':
+            return "require('./if.js')";
+    }
+});
+
+$v8->executeString("require('./app.js')");
+
+echo "------------------------------------------------\n";
+
+$v8 = new V8Js();
+
+$v8->setModuleNormaliser(function ($base, $moduleName) {
+    var_dump($base, $moduleName);
+    if ($base == '' && $moduleName == './tags') {
+        return ['./tags', 'index.js'];
+    }
+    if ($base == './tags' && $moduleName == './if.js') {
+        return ['./tags', 'if.js'];
+    }
+    return [$base, $moduleName];
+});
+
+$v8->setModuleLoader(function ($moduleName) {
+    print("setModuleLoader called for ".$moduleName."\n");
+    switch ($moduleName) {
+        case './app.js':
+            return "require('./tags')()"; // different
+        case './tags/index.js':
+            return "module.exports = function() {require('./if.js')}"; // different
+    }
+});
+
+$v8->executeString("require('./app.js')");
+
+?>
+===EOF===
+--EXPECT--
+string(0) ""
+string(8) "./app.js"
+setModuleLoader called for ./app.js
+string(0) ""
+string(6) "./tags"
+setModuleLoader called for ./tags/index.js
+string(6) "./tags"
+string(7) "./if.js"
+setModuleLoader called for ./tags/if.js
+------------------------------------------------
+string(0) ""
+string(8) "./app.js"
+setModuleLoader called for ./app.js
+string(0) ""
+string(6) "./tags"
+setModuleLoader called for ./tags/index.js
+string(6) "./tags"
+string(7) "./if.js"
+setModuleLoader called for ./tags/if.js
+===EOF===

v8js_class.cc

@@ -200,7 +200,6 @@ static void v8js_free_storage(zend_object *object) /* {{{ */
 	}
 
 	c->modules_stack.~vector();
-	c->modules_base.~vector();
 
 	zval_ptr_dtor(&c->zval_snapshot_blob);
 
@@ -226,7 +225,6 @@ static zend_object* v8js_new(zend_class_entry *ce) /* {{{ */
 	new(&c->array_tmpl) v8::Persistent<v8::FunctionTemplate>();
 
 	new(&c->modules_stack) std::vector<char*>();
-	new(&c->modules_base) std::vector<char*>();
 	new(&c->modules_loaded) std::map<char *, v8js_persistent_value_t, cmp_str>;
 
 	new(&c->template_cache) std::map<const zend_string *,v8js_function_tmpl_t>();

v8js_class.h

@@ -57,7 +57,6 @@ struct v8js_ctx {
   zval module_loader;
 
   std::vector<char *> modules_stack;
-  std::vector<char *> modules_base;
   std::map<char *, v8js_persistent_value_t, cmp_str> modules_loaded;
   std::map<const zend_string *,v8js_function_tmpl_t> template_cache;
 

v8js_methods.cc

@@ -205,10 +205,10 @@ V8JS_METHOD(var_dump) /* {{{ */
 V8JS_METHOD(require)
 {
 	v8::Isolate *isolate = info.GetIsolate();
+	v8js_ctx *c = (v8js_ctx *) isolate->GetData(0);
 
-	// Get the extension context
+	v8::String::Utf8Value module_base(info.Data());
-	v8::Local<v8::External> data = v8::Local<v8::External>::Cast(info.Data());
+	const char *module_base_cstr = ToCString(module_base);
-	v8js_ctx *c = static_cast<v8js_ctx*>(data->Value());
 
 	// Check that we have a module loader
 	if(Z_TYPE(c->module_loader) == IS_NULL) {
@@ -225,7 +225,7 @@ V8JS_METHOD(require)
 		normalised_path = (char *)emalloc(PATH_MAX);
 		module_name = (char *)emalloc(PATH_MAX);
 
-		v8js_commonjs_normalise_identifier(c->modules_base.back(), module_id, normalised_path, module_name);
+		v8js_commonjs_normalise_identifier(module_base_cstr, module_id, normalised_path, module_name);
 	}
 	else {
 		// Call custom normaliser
@@ -238,7 +238,7 @@ V8JS_METHOD(require)
 				isolate->Exit();
 				v8::Unlocker unlocker(isolate);
 
-				ZVAL_STRING(&params[0], c->modules_base.back());
+				ZVAL_STRING(&params[0], module_base_cstr);
 				ZVAL_STRING(&params[1], module_id);
 
 				call_result = call_user_function_ex(EG(function_table), NULL, &c->module_normaliser,
@@ -445,7 +445,7 @@ V8JS_METHOD(require)
 	v8::Local<v8::String> source = V8JS_ZSTR(Z_STR(module_code));
 	zval_ptr_dtor(&module_code);
 
-	source = v8::String::Concat(V8JS_SYM("(function (exports, module) {"), source);
+	source = v8::String::Concat(V8JS_SYM("(function (exports, module, require) {"), source);
 	source = v8::String::Concat(source, V8JS_SYM("\n});"));
 
 	// Create and compile script
@@ -459,9 +459,19 @@ V8JS_METHOD(require)
 		return;
 	}
 
+	v8::Local<v8::String> base_path = V8JS_STR(normalised_path);
+	v8::MaybeLocal<v8::Function> require_fn = v8::FunctionTemplate::New(isolate, V8JS_MN(require), base_path)->GetFunction();
+
+	if (require_fn.IsEmpty()) {
+		efree(normalised_path);
+		efree(normalised_module_id);
+		info.GetReturnValue().Set(isolate->ThrowException(V8JS_SYM("Failed to create require method")));
+		return;
+	}
+
+
 	// Add this module and path to the stack
 	c->modules_stack.push_back(normalised_module_id);
-	c->modules_base.push_back(normalised_path);
 
 	// Run script to evaluate closure
 	v8::Local<v8::Value> module_function = script->Run();
@@ -474,20 +484,22 @@ V8JS_METHOD(require)
 	module->Set(V8JS_SYM("exports"), exports);
 
 	if (module_function->IsFunction()) {
-		v8::Local<v8::Value> *jsArgv = static_cast<v8::Local<v8::Value> *>(alloca(2 * sizeof(v8::Local<v8::Value>)));
+		v8::Local<v8::Value> *jsArgv = static_cast<v8::Local<v8::Value> *>(alloca(3 * sizeof(v8::Local<v8::Value>)));
 		new(&jsArgv[0]) v8::Local<v8::Value>;
 		jsArgv[0] = exports;
 
 		new(&jsArgv[1]) v8::Local<v8::Value>;
 		jsArgv[1] = module;
 
+		new(&jsArgv[2]) v8::Local<v8::Value>;
+		jsArgv[2] = require_fn.ToLocalChecked();
+
 		// actually call the module
-		v8::Local<v8::Function>::Cast(module_function)->Call(exports, 2, jsArgv);
+		v8::Local<v8::Function>::Cast(module_function)->Call(exports, 3, jsArgv);
 	}
 
 	// Remove this module and path from the stack
 	c->modules_stack.pop_back();
-	c->modules_base.pop_back();
 
 	efree(normalised_path);
 
@@ -532,8 +544,8 @@ void v8js_register_methods(v8::Local<v8::ObjectTemplate> global, v8js_ctx *c) /*
 	global->Set(V8JS_SYM("print"), v8::FunctionTemplate::New(isolate, V8JS_MN(print)), v8::ReadOnly);
 	global->Set(V8JS_SYM("var_dump"), v8::FunctionTemplate::New(isolate, V8JS_MN(var_dump)), v8::ReadOnly);
 
-	c->modules_base.push_back("");
+	v8::Local<v8::String> base_path = V8JS_STRL("", 0);
-	global->Set(V8JS_SYM("require"), v8::FunctionTemplate::New(isolate, V8JS_MN(require), v8::External::New(isolate, c)), v8::ReadOnly);
+	global->Set(V8JS_SYM("require"), v8::FunctionTemplate::New(isolate, V8JS_MN(require), base_path), v8::ReadOnly);
 }
 /* }}} */