rename class, TJSContext -> TJSModule.

Author: aoym

include/TJSContext

@@ -6,8 +6,8 @@ HEADER_FILES = tabstractmodel.h tabstractuser.h tactioncontext.h tactioncontroll
 greaterThan(QT_MAJOR_VERSION, 4) {
   HEADER_CLASSES += ../include/TJSLoader
   HEADER_FILES   += tjsloader.h
-  HEADER_CLASSES += ../include/TJSContext
-  HEADER_FILES   += tjscontext.h
+  HEADER_CLASSES += ../include/TJSModule
+  HEADER_FILES   += tjsmodule.h
   HEADER_CLASSES += ../include/TJSInstance
   HEADER_FILES   += tjsinstance.h
   HEADER_CLASSES += ../include/TReactComponent

include/headers.pri

@@ -326,8 +326,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
   SOURCES += tjsonutil.cpp
   HEADERS += tjsloader.h
   SOURCES += tjsloader.cpp
-  HEADERS += tjscontext.h
-  SOURCES += tjscontext.cpp
+  HEADERS += tjsmodule.h
+  SOURCES += tjsmodule.cpp
   HEADERS += tjsinstance.h
   SOURCES += tjsinstance.cpp
   HEADERS += treactcomponent.h

include/tjscontext.h

@@ -18,7 +18,7 @@
 // #define tSystemError(fmt, ...)  printf(fmt "\n", ## __VA_ARGS__)
 // #define tSystemDebug(fmt, ...)  printf(fmt "\n", ## __VA_ARGS__)
 
-static QMap<QString, TJSContext*> jsContexts;
+static QMap<QString, TJSModule*> jsContexts;
 static QStringList defaultSearchPaths;
 static QMutex gMutex(QMutex::Recursive);
 
@@ -120,15 +120,15 @@ TJSLoader::TJSLoader(const QString &defaultMember, const QString &moduleName, Al
   if successful; otherwise returns null pointer.
   i.e. var \a defaultMember = require( \a moduleName );
 */
-TJSContext *TJSLoader::load(bool reload)
+TJSModule *TJSLoader::load(bool reload)
 {
     if (module.isEmpty()) {
         return nullptr;
     }
 
     QMutexLocker lock(&gMutex);
     QString key = member + QLatin1Char(';') + module;
-    TJSContext *context = jsContexts.value(key);
+    TJSModule *context = jsContexts.value(key);
 
     if (reload && context) {
         jsContexts.remove(key);
@@ -137,7 +137,7 @@ TJSContext *TJSLoader::load(bool reload)
     }
 
     if (!context) {
-        context = new TJSContext();
+        context = new TJSModule();
 
         for (auto &p : importFiles) {
             // Imports as JavaScript
@@ -243,7 +243,7 @@ void TJSLoader::import(const QString &defaultMember, const QString &moduleName)
 }
 
 
-QJSValue TJSLoader::importTo(TJSContext *context, bool isMain) const
+QJSValue TJSLoader::importTo(TJSModule *context, bool isMain) const
 {
     if (!context) {
         return false;
@@ -324,7 +324,7 @@ void TJSLoader::setDefaultSearchPaths(const QStringList &paths)
 }
 
 
-void TJSLoader::replaceRequire(TJSContext *context, QString &content, const QDir &dir) const
+void TJSLoader::replaceRequire(TJSModule *context, QString &content, const QDir &dir) const
 {
     const QRegExp rx("require\\s*\\(\\s*[\"']([^\\(\\)\"' ,]+)[\"']\\s*\\)");
 

src/corelib.pro

@@ -3,7 +3,7 @@
 
 #include <QJSValue>
 #include <TGlobal>
-#include <TJSContext>
+#include <TJSModule>
 #include <TJSInstance>
 
 
@@ -18,7 +18,7 @@ class T_CORE_EXPORT TJSLoader
     TJSLoader(const QString &moduleName, AltJS alt = Default);
     TJSLoader(const QString &defaultMember, const QString &moduleName, AltJS alt = Default);
 
-    TJSContext *load(bool reload = false);
+    TJSModule *load(bool reload = false);
     void import(const QString &moduleName);
     void import(const QString &defaultMember, const QString &moduleName);
     TJSInstance loadAsConstructor(const QJSValue &arg) const;
@@ -29,10 +29,10 @@ class T_CORE_EXPORT TJSLoader
     static QString compileJsx(const QString &jsx);
 
 protected:
-    QJSValue importTo(TJSContext *context, bool isMain) const;
+    QJSValue importTo(TJSModule *context, bool isMain) const;
     QString search(const QString &moduleName, AltJS alt) const;
     QString absolutePath(const QString &moduleName, const QDir &dir, AltJS alt) const;
-    void replaceRequire(TJSContext *context, QString &content, const QDir &dir) const;
+    void replaceRequire(TJSModule *context, QString &content, const QDir &dir) const;
 
 private:
     QString module;
@@ -41,7 +41,7 @@ class T_CORE_EXPORT TJSLoader
     QStringList searchPaths;
     QList<QPair<QString, QString>> importFiles;
 
-    friend class TJSContext;
+    friend class TJSModule;
 };
 
 #endif // TJSLOADER_H

src/tjsloader.cpp

@@ -7,8 +7,8 @@
 
 #include <QJSEngine>
 #include <QJSValue>
+#include <TJSModule>
 #include <TJSLoader>
-#include <TJSContext>
 #include <TJSInstance>
 #include "tsystemglobal.h"
 
@@ -24,15 +24,15 @@ inline const char *prop(const QJSValue &val, const QString &name = QString())
 }
 
 
-TJSContext::TJSContext(QObject *parent)
+TJSModule::TJSModule(QObject *parent)
     : QObject(parent), jsEngine(new QJSEngine()), loadedFiles(), funcObj(nullptr),
       lastFunc(), mutex(QMutex::Recursive)
 {
     jsEngine->evaluate("exports={};module={};module.exports={};");
 }
 
 
-TJSContext::~TJSContext()
+TJSModule::~TJSModule()
 {
     if (funcObj) {
         delete funcObj;
@@ -41,7 +41,7 @@ TJSContext::~TJSContext()
 }
 
 
-QJSValue TJSContext::evaluate(const QString &program, const QString &fileName, int lineNumber)
+QJSValue TJSModule::evaluate(const QString &program, const QString &fileName, int lineNumber)
 {
     QMutexLocker locker(&mutex);
 
@@ -54,14 +54,14 @@ QJSValue TJSContext::evaluate(const QString &program, const QString &fileName, i
 }
 
 
-QJSValue TJSContext::call(const QString &func, const QJSValue &arg)
+QJSValue TJSModule::call(const QString &func, const QJSValue &arg)
 {
     QJSValueList args = { arg };
     return call(func, args);
 }
 
 
-QJSValue TJSContext::call(const QString &func, const QJSValueList &args)
+QJSValue TJSModule::call(const QString &func, const QJSValueList &args)
 {
     QMutexLocker locker(&mutex);
     QJSValue ret;
@@ -104,14 +104,14 @@ QJSValue TJSContext::call(const QString &func, const QJSValueList &args)
 }
 
 
-TJSInstance TJSContext::callAsConstructor(const QString &constructorName, const QJSValue &arg)
+TJSInstance TJSModule::callAsConstructor(const QString &constructorName, const QJSValue &arg)
 {
     QJSValueList args = { arg };
     return callAsConstructor(constructorName, args);
 }
 
 
-TJSInstance TJSContext::callAsConstructor(const QString &constructorName, const QJSValueList &args)
+TJSInstance TJSModule::callAsConstructor(const QString &constructorName, const QJSValueList &args)
 {
     QMutexLocker locker(&mutex);
 
@@ -126,14 +126,14 @@ TJSInstance TJSContext::callAsConstructor(const QString &constructorName, const
 }
 
 
-QJSValue TJSContext::import(const QString &moduleName)
+QJSValue TJSModule::import(const QString &moduleName)
 {
     TJSLoader loader(moduleName);
     return loader.importTo(this, false);
 }
 
 
-QJSValue TJSContext::import(const QString &defaultMember, const QString &moduleName)
+QJSValue TJSModule::import(const QString &defaultMember, const QString &moduleName)
 {
     TJSLoader loader(defaultMember, moduleName);
     return loader.importTo(this, false);

src/tjsloader.h

@@ -1,5 +1,5 @@
-#ifndef TJSCONTEXT_H
-#define TJSCONTEXT_H
+#ifndef TJSMODULE_H
+#define TJSMODULE_H
 
 #include <QString>
 #include <QObject>
@@ -14,11 +14,11 @@ class QJSEngine;
 class TJSInstance;
 
 
-class T_CORE_EXPORT TJSContext : public QObject
+class T_CORE_EXPORT TJSModule : public QObject
 {
 public:
-    TJSContext(QObject *parent = nullptr);
-    virtual ~TJSContext();
+    TJSModule(QObject *parent = nullptr);
+    virtual ~TJSModule();
 
     QJSValue evaluate(const QString &program, const QString &fileName = QString(), int lineNumber = 1);
     QJSValue call(const QString &func, const QJSValue &arg);
@@ -38,10 +38,10 @@ class T_CORE_EXPORT TJSContext : public QObject
     QString moduleFilePath;
     QMutex mutex;
 
-    Q_DISABLE_COPY(TJSContext);
+    Q_DISABLE_COPY(TJSModule);
 
     friend class TJSLoader;
     friend class TReactComponent;
 };
 
-#endif // TJSCONTEXT_H
+#endif // TJSMODULE_H

src/tjsmodule.cpp

@@ -11,7 +11,7 @@
 #include <QDir>
 #include <QTextStream>
 #include <TWebApplication>
-#include <TJSContext>
+#include <TJSModule>
 #include <TJSLoader>
 #include <TReactComponent>
 #include "tsystemglobal.h"