Add hasProperty for checking whether a property exists

libraries/script-engine/src/ScriptValue.cpp

@@ -44,6 +44,7 @@ public:
     virtual ScriptValue property(quint32 arrayIndex,
                                  const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override;
     virtual void setData(const ScriptValue& val) override;
+    virtual bool hasProperty(const QString &name) const override;
     virtual void setProperty(const QString& name,
                              const ScriptValue& value,
                              const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override;
@@ -178,6 +179,13 @@ void ScriptValueProxyNull::setData(const ScriptValue& val) {
     qCWarning(scriptengine_script, "ScriptValue::setData called on empty value");
 }
 
+bool ScriptValueProxyNull::hasProperty(const QString& name) const {
+    Q_ASSERT(false);
+    qCWarning(scriptengine_script, "ScriptValue::hasProperty called on empty value");
+    return false;
+}
+
+
 void ScriptValueProxyNull::setProperty(const QString& name,
                          const ScriptValue& value, const ScriptValue::PropertyFlags& flags) {
     Q_ASSERT(false);

libraries/script-engine/src/ScriptValue.h

@@ -88,6 +88,7 @@ public:
     inline ScriptValue property(const QString& name, const ResolveFlags& mode = ResolvePrototype) const;
     inline ScriptValue property(quint32 arrayIndex, const ResolveFlags& mode = ResolvePrototype) const;
     inline void setData(const ScriptValue& val);
+    inline bool hasProperty(const QString &name) const;
     inline void setProperty(const QString& name,
                              const ScriptValue& value,
                              const PropertyFlags& flags = KeepExistingFlags);
@@ -152,6 +153,7 @@ public:
     virtual ScriptValue property(quint32 arrayIndex,
                                  const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const = 0;
     virtual void setData(const ScriptValue& val) = 0;
+    virtual bool hasProperty(const QString &name) const = 0;
     virtual void setProperty(const QString& name,
                              const ScriptValue& value,
                              const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) = 0;
@@ -318,6 +320,12 @@ void ScriptValue::setData(const ScriptValue& val) {
     return _proxy->setData(val);
 }
 
+
+bool ScriptValue::hasProperty(const QString& name) const {
+    Q_ASSERT(_proxy != nullptr);
+    return _proxy->hasProperty(name);
+}
+
 void ScriptValue::setProperty(const QString& name, const ScriptValue& value, const PropertyFlags& flags) {
     Q_ASSERT(_proxy != nullptr);
     return _proxy->setProperty(name, value, flags);

libraries/script-engine/src/ScriptValueUtils.cpp

@@ -140,7 +140,7 @@ bool vec2FromScriptValue(const ScriptValue& object, glm::vec2& vec2) {
 
 ScriptValue vec3ToScriptValue(ScriptEngine* engine, const glm::vec3& vec3) {
     auto prototype = engine->globalObject().property("__hifi_vec3__");
-    if (!prototype.property("defined").toBool()) {
+    if (!prototype.hasProperty("defined") || !prototype.property("defined").toBool()) {
         prototype = engine->evaluate(
             "__hifi_vec3__ = Object.defineProperties({}, { "
             "defined: { value: true },"

libraries/script-engine/src/v8/ScriptValueV8Wrapper.cpp

@@ -172,6 +172,28 @@ ScriptValueIteratorPointer ScriptValueV8Wrapper::newIterator() const {
     return std::make_shared<ScriptValueIteratorV8Wrapper>(_engine, _value);
 }
 
+bool ScriptValueV8Wrapper::hasProperty(const QString& name) const {
+    auto isolate = _engine->getIsolate();
+    v8::Locker locker(_engine->getIsolate());
+    v8::Isolate::Scope isolateScope(_engine->getIsolate());
+    v8::HandleScope handleScope(isolate);
+    v8::Context::Scope contextScope(_engine->getContext());
+    if (_value.constGet()->IsObject()) {
+    //V8TODO: what about flags?
+        v8::Local<v8::Value> resultLocal;
+        v8::Local<v8::String> key = v8::String::NewFromUtf8(_engine->getIsolate(), name.toStdString().c_str(),v8::NewStringType::kNormal).ToLocalChecked();
+        const v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(_value.constGet());
+        if (object->Get(_value.constGetContext(), key).ToLocal(&resultLocal)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    return false;
+}
+
+
+
 ScriptValue ScriptValueV8Wrapper::property(const QString& name, const ScriptValue::ResolveFlags &mode) const {
     auto isolate = _engine->getIsolate();
     v8::Locker locker(_engine->getIsolate());

libraries/script-engine/src/v8/ScriptValueV8Wrapper.h

@@ -54,6 +54,9 @@ public:  // ScriptValue implementation
     virtual ScriptValue property(quint32 arrayIndex,
                                  const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override;
     virtual void setData(const ScriptValue& val) override;
+
+    virtual bool hasProperty(const QString &name) const;
+
     virtual void setProperty(const QString& name,
                              const ScriptValue& value,
                              const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override;

tests/script-engine/src/ScriptEngineTests.cpp

@@ -87,7 +87,8 @@ void ScriptEngineTests::scriptTest() {
         qInfo() << "Running test script: " << script;
         ac->loadOneScript(script);
     }*/
-    ac->loadOneScript("tests/script-engine/tests/003_vector_math.js");
+    ac->loadOneScript("tests/003_vector_math.js");
+    ac->loadOneScript("tests/004_require.js");
 
     qDebug() << ac->getRunning();