scripting: add main module

src/CMakeLists.txt

@@ -84,8 +84,9 @@ set(libinputactions_SRCS
     libinputactions/interfaces/WindowProvider.cpp
     libinputactions/scripting/modules/core/Config.cpp
     libinputactions/scripting/modules/core/CoreModule.cpp
-    libinputactions/scripting/modules/core/Script.cpp
     libinputactions/scripting/modules/fs/File.cpp
+    libinputactions/scripting/modules/main/MainModule.cpp
+    libinputactions/scripting/modules/main/Script.cpp
     libinputactions/scripting/FunctionWrapper.cpp
     libinputactions/scripting/JSFunctionAction.cpp
     libinputactions/scripting/JSFunctionCondition.cpp

src/libinputactions/config/ConfigLoader.cpp

@@ -39,7 +39,7 @@
 #include <libinputactions/scripting/ScriptingEngine.h>
 #include <libinputactions/scripting/modules/core/Config.h>
 #include <libinputactions/scripting/modules/core/CoreModule.h>
-#include <libinputactions/scripting/modules/core/Script.h>
+#include <libinputactions/scripting/modules/main/Script.h>
 
 namespace InputActions
 {

src/libinputactions/scripting/ScriptingEngine.cpp

@@ -20,6 +20,7 @@
 #include "Promise.h"
 #include "modules/core/CoreModule.h"
 #include "modules/fs/File.h"
+#include "modules/main/MainModule.h"
 #include <libinputactions/InputActionsMain.h>
 #include <libinputactions/PointF.h>
 #include <libinputactions/config/ConfigIssue.h>
@@ -67,10 +68,9 @@ void ScriptingEngine::initialize()
         }
     )");
 
-    m_coreModule = std::make_unique<CoreModule>(this);
+    m_coreModule = std::make_unique<CoreModule>();
     QJSEngine::setObjectOwnership(m_coreModule.get(), QJSEngine::CppOwnership);
     auto coreModule = m_engine->newQObject(m_coreModule.get());
-    coreModule.setProperty("Point", m_engine->newQMetaObject(&PointF::staticMetaObject));
     registerBuiltinModule("inputactions/core", coreModule);
 
     auto fsModule = m_engine->newObject();
@@ -80,6 +80,10 @@ void ScriptingEngine::initialize()
     file.setProperty("writeAllText", newFunction<QJSValue, QString, QString>(&File::writeAllText));
     registerBuiltinModule("inputactions/fs", fsModule);
 
+    auto mainModule = m_engine->newQObject(new MainModule(*this));
+    mainModule.setProperty("Point", m_engine->newQMetaObject(&PointF::staticMetaObject));
+    registerBuiltinModule("inputactions", mainModule);
+
     auto globalObject = m_engine->globalObject();
     globalObject.setProperty("require", newFunction<QJSValue, QString>([this](QString module) {
                                  if (m_builtinModules.contains(module)) {

src/libinputactions/scripting/modules/core/CoreModule.cpp

@@ -20,37 +20,20 @@
 #include "Config.h"
 #include <QJSEngine>
 #include <libinputactions/input/backends/InputBackend.h>
-#include <libinputactions/scripting/Promise.h>
 #include <libinputactions/scripting/ScriptingEngine.h>
 #include <libinputactions/variables/VariableRegistry.h>
 
 namespace InputActions
 {
 
-CoreModule::CoreModule(ScriptingEngine *engine)
-    : m_engine(engine)
-    , m_config(std::make_unique<Config>())
-    , m_globalObject(engine->ensureEngine().globalObject())
+CoreModule::CoreModule()
+    : m_config(std::make_unique<Config>())
 {
     QJSEngine::setObjectOwnership(m_config.get(), QJSEngine::CppOwnership);
 }
 
 CoreModule::~CoreModule() = default;
 
-QJSValue CoreModule::delay(double duration)
-{
-    auto promise = g_scriptingEngine->newPromise();
-    if (duration < 1 || duration > INT32_MAX) {
-        promise.reject(m_engine->ensureEngine().newErrorObject(QJSValue::RangeError, QString("Value %1 is out of range.").arg(QString::number(duration))));
-        return promise.promise();
-    }
-
-    QTimer::singleShot(std::floor(duration), Qt::PreciseTimer, this, [promise]() {
-        promise.fulfill();
-    });
-    return promise.promise();
-}
-
 Config *CoreModule::config() const
 {
     return m_config.get();

src/libinputactions/scripting/modules/core/CoreModule.h

@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include <QJSValue>
 #include <QObject>
 
 namespace InputActions
@@ -34,25 +33,20 @@ class CoreModule : public QObject
     Q_OBJECT
 
     Q_PROPERTY(Config *config READ config)
-    Q_PROPERTY(QJSValue globalThis READ globalThis)
     Q_PROPERTY(InputBackend *input READ input)
     Q_PROPERTY(VariableRegistry *variableRegistry READ variableRegistry)
 
 public:
-    CoreModule(ScriptingEngine *engine);
+    CoreModule();
     ~CoreModule() override;
 
     Config *config() const;
-    QJSValue globalThis() const { return m_globalObject; }
     InputBackend *input() const;
     VariableRegistry *variableRegistry() const;
 
-    Q_INVOKABLE QJSValue delay(double duration);
-
 private:
     ScriptingEngine *m_engine;
     std::unique_ptr<Config> m_config;
-    QJSValue m_globalObject;
 };
 
 }

src/libinputactions/scripting/modules/main/MainModule.cpp

@@ -0,0 +1,45 @@
+/*
+    Input Actions - Input handler that executes user-defined actions
+    Copyright (C) 2024-2026 Marcin Woźniak
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "MainModule.h"
+#include <libinputactions/scripting/Promise.h>
+
+namespace InputActions
+{
+
+MainModule::MainModule(ScriptingEngine &engine)
+    : m_engine(engine)
+    , m_globalObject(engine.ensureEngine().globalObject())
+{
+}
+
+QJSValue MainModule::delay(double duration)
+{
+    auto promise = g_scriptingEngine->newPromise();
+    if (duration < 1 || duration > INT32_MAX) {
+        promise.reject(m_engine.ensureEngine().newErrorObject(QJSValue::RangeError, QString("Value %1 is out of range.").arg(QString::number(duration))));
+        return promise.promise();
+    }
+
+    QTimer::singleShot(std::floor(duration), Qt::PreciseTimer, this, [promise]() {
+        promise.fulfill();
+    });
+    return promise.promise();
+}
+
+}

src/libinputactions/scripting/modules/main/MainModule.h

@@ -0,0 +1,47 @@
+/*
+    Input Actions - Input handler that executes user-defined actions
+    Copyright (C) 2024-2026 Marcin Woźniak
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <QJSValue>
+#include <QObject>
+
+namespace InputActions
+{
+
+class ScriptingEngine;
+
+class MainModule : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QJSValue globalThis READ globalThis)
+
+public:
+    MainModule(ScriptingEngine &engine);
+
+    QJSValue globalThis() const { return m_globalObject; }
+
+    Q_INVOKABLE QJSValue delay(double duration);
+
+private:
+    ScriptingEngine &m_engine;
+    QJSValue m_globalObject;
+};
+
+}