Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-05 17:19:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix require behavior for modules

Browse source
This commit is contained in:
ksuprynowicz 2024-03-05 23:24:34 +01:00
parent 22faf211bf
commit 931b222098
5 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/script-engine/src/v8/ScriptEngineV8.cpp
View file

@ -664,6 +664,11 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure,
}
// "Script" API is context-dependent, so it needs to be recreated for each new context
registerGlobalObject("Script", new ScriptManagerScriptingInterface(_manager), ScriptEngine::ScriptOwnership);
auto Script = globalObject().property("Script");
auto require = Script.property("require");
auto resolve = Script.property("_requireResolve");
require.setProperty("resolve", resolve, ScriptValue::ReadOnly | ScriptValue::Undeletable);
globalObject().setProperty("require", require, ScriptValue::ReadOnly | ScriptValue::Undeletable);
// Script.require properties need to be copied, since that's where the Script.require cache is
// Get source and destination Script.require objects

34
tests/script-engine/src/ScriptEngineNetworkedTests.cpp
View file

@ -120,7 +120,7 @@ ScriptManagerPointer ScriptEngineNetworkedTests::makeManager(const QString &scri
return sm;
}
void ScriptEngineNetworkedTests::testRequire() {
void ScriptEngineNetworkedTests::testScriptRequire() {
auto sm = makeManager(
"print(\"Starting\");"
"Script.require('./tests/c.js');"
@ -153,6 +153,38 @@ void ScriptEngineNetworkedTests::testRequire() {
}
}
void ScriptEngineNetworkedTests::testRequire() {
auto sm = makeManager(
"print(\"Starting\");"
"require('./tests/c_require.js');"
"print(\"Done\");"
"Script.stop(true);", "testRequire.js");
QStringList printed;
QStringList expected {"Starting", "Value from A: 6", "Value from B: 6", "Done"};
QVERIFY(!sm->isRunning());
QVERIFY(!sm->isStopped());
QVERIFY(!sm->isFinished());
connect(sm.get(), &ScriptManager::printedMessage, [&printed](const QString& message, const QString& engineName){
printed.append(message);
});
qInfo() << "About to run script";
sm->run();
QVERIFY(!sm->isRunning());
QVERIFY(!sm->isStopped());
QVERIFY(sm->isFinished());
QVERIFY(printed.length() == expected.length());
for(int i=0;i<printed.length();i++) {
QString nomatch = QString("Result '%1' didn't match expected '%2'").arg(printed[i]).arg(expected[i]);
QVERIFY2(printed[i] == expected[i], qPrintable(nomatch));
}
}
void ScriptEngineNetworkedTests::testRequireInfinite() {

1
tests/script-engine/src/ScriptEngineNetworkedTests.h
View file

@ -27,6 +27,7 @@ class ScriptEngineNetworkedTests : public QObject {
private slots:
void initTestCase();
void testRequire();
void testScriptRequire();
void testRequireInfinite();

6
tests/script-engine/src/tests/b_require.js Normal file
View file

@ -0,0 +1,6 @@
// b.js
var a = require('./a.js');
a.value += 1;
console.log('message from b');
module.exports = a.value;

6
tests/script-engine/src/tests/c_require.js Normal file
View file

@ -0,0 +1,6 @@
// c.js
var a = require('./a.js');
var b = require('./b_require.js');
print("Value from A: " + a.value);
print("Value from B: " + b);