Structure update + Error tracking fixes

scarletquasar · Aug 5, 2023 · 907134b · 907134b
1 parent 109038b
commit 907134b
Show file tree

Hide file tree

Showing 61 changed files with 55 additions and 44 deletions.
diff --git a/...e/logic/partials/constructors/_Version.ts → ...s/core/logic/api/constructors/_Version.ts b/...e/logic/partials/constructors/_Version.ts → ...s/core/logic/api/constructors/_Version.ts
diff --git a/...c/partials/errors/InvalidArgumentError.ts → .../logic/api/errors/InvalidArgumentError.ts b/...c/partials/errors/InvalidArgumentError.ts → .../logic/api/errors/InvalidArgumentError.ts
diff --git a/.../partials/modules/console/console-core.ts → ...logic/api/modules/console/console-core.ts b/.../partials/modules/console/console-core.ts → ...logic/api/modules/console/console-core.ts
@@ -1,5 +1,5 @@
 import { interopCache } from "logic/runtime/interop-cache-core";
-import { Result } from "logic/partials/modules/std/functional/Result";
+import { Result } from "logic/api/modules/std/functional/Result";
 import { TableLike } from "types/internal/generic-types";
 import { ConsoleColor } from "types/internal/console-types"
 
@@ -284,21 +284,31 @@ function timeEnd(
 }
 
 function write(target: string, color: ConsoleColor): Result<Error, []> {
-    if(typeof target != "string") {
-        interopCache.clinet.write(toLoggableOutput(target), color);
-        return Result.right([]);
+    try {
+        if (typeof target != "string") {
+            interopCache.clinet.write(toLoggableOutput(target), color);
+            return Result.right([]);
+        }
+
+        return Result.left(new Error("Invalid write value"));
+    }
+    catch (e) {
+        return Result.left(e);
     }
-
-    return Result.left(new Error("Invalid write value"));
 }
 
 function writeLine(target: string, color: ConsoleColor): Result<Error, []> {
-    if(typeof target != "string") {
-        interopCache.clinet.writeLine(toLoggableOutput(target), color);
-        return Result.right([]);
+    try {
+        if (typeof target != "string") {
+            interopCache.clinet.writeLine(toLoggableOutput(target), color);
+            return Result.right([]);
+        }
+
+        return Result.left(new Error("Invalid write value"));
+    }
+    catch (e) {
+        return Result.left(e);
     }
-
-    return Result.left(new Error("Invalid write value"));
 }
 
 export { 

diff --git a/...logic/partials/modules/console/console.ts → ...core/logic/api/modules/console/console.ts b/...logic/partials/modules/console/console.ts → ...core/logic/api/modules/console/console.ts
@@ -1,4 +1,4 @@
-import { clear, error, log, table, time, timeEnd, warn, write, writeLine } from "logic/partials/modules/console/console-core";
+import { clear, error, log, table, time, timeEnd, warn, write, writeLine } from "logic/api/modules/console/console-core";
 
 const console = {
     time,

diff --git a/...ore/logic/partials/modules/data/_clone.ts → ...cts/core/logic/api/modules/data/_clone.ts b/...ore/logic/partials/modules/data/_clone.ts → ...cts/core/logic/api/modules/data/_clone.ts
diff --git a/...e/logic/partials/modules/data/_compare.ts → ...s/core/logic/api/modules/data/_compare.ts b/...e/logic/partials/modules/data/_compare.ts → ...s/core/logic/api/modules/data/_compare.ts
diff --git a/...core/logic/partials/modules/data/_data.ts → ...ects/core/logic/api/modules/data/_data.ts b/...core/logic/partials/modules/data/_data.ts → ...ects/core/logic/api/modules/data/_data.ts
diff --git a/...modules/data/constructors/_MySqlClient.ts → ...modules/data/constructors/_MySqlClient.ts b/...modules/data/constructors/_MySqlClient.ts → ...modules/data/constructors/_MySqlClient.ts
diff --git a/...ls/modules/data/constructors/_PgClient.ts → ...pi/modules/data/constructors/_PgClient.ts b/...ls/modules/data/constructors/_PgClient.ts → ...pi/modules/data/constructors/_PgClient.ts
diff --git a/...es/data/constructors/_PgDocumentClient.ts → ...es/data/constructors/_PgDocumentClient.ts b/...es/data/constructors/_PgDocumentClient.ts → ...es/data/constructors/_PgDocumentClient.ts
diff --git a/...les/data/constructors/_SqlServerClient.ts → ...les/data/constructors/_SqlServerClient.ts b/...les/data/constructors/_SqlServerClient.ts → ...les/data/constructors/_SqlServerClient.ts
diff --git a/...als/modules/dotnet/dotnet-interop-core.ts → ...api/modules/dotnet/dotnet-interop-core.ts b/...als/modules/dotnet/dotnet-interop-core.ts → ...api/modules/dotnet/dotnet-interop-core.ts
diff --git a/...tials/modules/dotnet/dotnet-realm-core.ts → ...c/api/modules/dotnet/dotnet-realm-core.ts b/...tials/modules/dotnet/dotnet-realm-core.ts → ...c/api/modules/dotnet/dotnet-realm-core.ts
diff --git a/...s/modules/dotnet/dotnet-threading-core.ts → ...i/modules/dotnet/dotnet-threading-core.ts b/...s/modules/dotnet/dotnet-threading-core.ts → ...i/modules/dotnet/dotnet-threading-core.ts
@@ -1,6 +1,6 @@
-import { _crypto } from "logic/partials/statics/_Crypto";
-import { error } from "logic/partials/modules/console/console-core";
-import { _nextTick } from "logic/partials/modules/std/async/_nextTick";
+import { _crypto } from "logic/api/statics/_Crypto";
+import { error } from "logic/api/modules/console/console-core";
+import { _nextTick } from "logic/api/modules/std/async/_nextTick";
 import { getStaticProperty } from "./dotnet-interop-core";
 import { InteropMethod } from "types/internal/dotnet-interop-types";
 

diff --git a/...e/logic/partials/modules/dotnet/dotnet.ts → ...s/core/logic/api/modules/dotnet/dotnet.ts b/...e/logic/partials/modules/dotnet/dotnet.ts → ...s/core/logic/api/modules/dotnet/dotnet.ts
diff --git a/.../partials/modules/fs/fs-default-errors.ts → ...logic/api/modules/fs/fs-default-errors.ts b/.../partials/modules/fs/fs-default-errors.ts → ...logic/api/modules/fs/fs-default-errors.ts
diff --git a/...ials/modules/fs/fs-raw-file-management.ts → .../api/modules/fs/fs-raw-file-management.ts b/...ials/modules/fs/fs-raw-file-management.ts → .../api/modules/fs/fs-raw-file-management.ts
diff --git a/...ects/core/logic/partials/modules/fs/fs.ts → projects/core/logic/api/modules/fs/fs.ts b/...ects/core/logic/partials/modules/fs/fs.ts → projects/core/logic/api/modules/fs/fs.ts
diff --git a/.../logic/partials/modules/guards/_guards.ts → .../core/logic/api/modules/guards/_guards.ts b/.../logic/partials/modules/guards/_guards.ts → .../core/logic/api/modules/guards/_guards.ts
diff --git a/.../partials/modules/http/http-basic-core.ts → ...logic/api/modules/http/http-basic-core.ts b/.../partials/modules/http/http-basic-core.ts → ...logic/api/modules/http/http-basic-core.ts
@@ -8,12 +8,12 @@ import {
 } from "types/internal/http-types";
 
 //Logic imports
-import { getStaticMethod } from "logic/partials/modules/dotnet/dotnet-interop-core";
-import { _tryStringify } from "logic/partials/modules/std/json/_tryStringify";
-import { _tryParse } from "logic/partials/modules/std/json/_tryParse";
-import { _nextTick } from "logic/partials/modules/std/async/_nextTick";
+import { getStaticMethod } from "logic/api/modules/dotnet/dotnet-interop-core";
+import { _tryStringify } from "logic/api/modules/std/json/_tryStringify";
+import { _tryParse } from "logic/api/modules/std/json/_tryParse";
+import { _nextTick } from "logic/api/modules/std/async/_nextTick";
 import { Melon } from "logic/index";
-import { http } from "logic/partials/modules/http/http";
+import { http } from "logic/api/modules/http/http";
 
 function $static(response: any, type: `${string}/${string}`, headers: Record<string, any> = {}) {
     const serialize = getStaticMethod("Newtonsoft.Json:JsonConvert:SerializeObject");

diff --git a/.../core/logic/partials/modules/http/http.ts → projects/core/logic/api/modules/http/http.ts b/.../core/logic/partials/modules/http/http.ts → projects/core/logic/api/modules/http/http.ts
@@ -1,5 +1,5 @@
 //Logic imports
-import { request, requestAsync, fetch, app, $static, result } from "logic/partials/modules/http/http-basic-core"
+import { request, requestAsync, fetch, app, $static, result } from "logic/api/modules/http/http-basic-core"
 
 const http = {
     _apps: {},

diff --git a/...modules/internalConsts/_internalConsts.ts → ...modules/internalConsts/_internalConsts.ts b/...modules/internalConsts/_internalConsts.ts → ...modules/internalConsts/_internalConsts.ts
diff --git a/...partials/modules/runtime/runtime-event.ts → ...ogic/api/modules/runtime/runtime-event.ts b/...partials/modules/runtime/runtime-event.ts → ...ogic/api/modules/runtime/runtime-event.ts
@@ -3,8 +3,8 @@ import type { OutputFriendly } from "types/internal/generic-types";
 import type { EventType, EventCaller, EventAction } from "types/internal/runtime-types";
 
 //Logic Imports
-import { _crypto } from "logic/partials/statics/_Crypto";
-import { _log } from "logic/partials/modules/console/_log";
+import { _crypto } from "logic/api/statics/_Crypto";
+import { _log } from "logic/api/modules/console/_log";
 
 class Event implements OutputFriendly {
     public name: string;

diff --git a/...logic/partials/modules/runtime/runtime.ts → ...core/logic/api/modules/runtime/runtime.ts b/...logic/partials/modules/runtime/runtime.ts → ...core/logic/api/modules/runtime/runtime.ts
@@ -1,5 +1,5 @@
 //Logic Imports
-import { EventChain, Event } from "logic/partials/modules/runtime/runtime-event";
+import { EventChain, Event } from "logic/api/modules/runtime/runtime-event";
 
 const eventChain = new EventChain();
 

diff --git a/...e/logic/partials/modules/std/SharedBag.ts → ...s/core/logic/api/modules/std/SharedBag.ts b/...e/logic/partials/modules/std/SharedBag.ts → ...s/core/logic/api/modules/std/SharedBag.ts
diff --git a/...logic/partials/modules/std/TextDecoder.ts → ...core/logic/api/modules/std/TextDecoder.ts b/...logic/partials/modules/std/TextDecoder.ts → ...core/logic/api/modules/std/TextDecoder.ts
diff --git a/...logic/partials/modules/std/TextEncoder.ts → ...core/logic/api/modules/std/TextEncoder.ts b/...logic/partials/modules/std/TextEncoder.ts → ...core/logic/api/modules/std/TextEncoder.ts
diff --git a/...s/core/logic/partials/modules/std/_std.ts → projects/core/logic/api/modules/std/_std.ts b/...s/core/logic/partials/modules/std/_std.ts → projects/core/logic/api/modules/std/_std.ts
diff --git a/...c/partials/modules/std/async/_nextTick.ts → .../logic/api/modules/std/async/_nextTick.ts b/...c/partials/modules/std/async/_nextTick.ts → .../logic/api/modules/std/async/_nextTick.ts
diff --git a/...partials/modules/std/boolean/_checkAll.ts → ...ogic/api/modules/std/boolean/_checkAll.ts b/...partials/modules/std/boolean/_checkAll.ts → ...ogic/api/modules/std/boolean/_checkAll.ts
diff --git a/...partials/modules/std/boolean/_checkOne.ts → ...ogic/api/modules/std/boolean/_checkOne.ts b/...partials/modules/std/boolean/_checkOne.ts → ...ogic/api/modules/std/boolean/_checkOne.ts
diff --git a/...modules/std/environment/_baseDirectory.ts → ...modules/std/environment/_baseDirectory.ts b/...modules/std/environment/_baseDirectory.ts → ...modules/std/environment/_baseDirectory.ts
diff --git a/...onment/_clearLocalEnvironmentVariables.ts → ...onment/_clearLocalEnvironmentVariables.ts b/...onment/_clearLocalEnvironmentVariables.ts → ...onment/_clearLocalEnvironmentVariables.ts
diff --git a/...d/environment/_getEnvironmentVariables.ts → ...d/environment/_getEnvironmentVariables.ts b/...d/environment/_getEnvironmentVariables.ts → ...d/environment/_getEnvironmentVariables.ts
diff --git a/...td/environment/_setEnvironmentVariable.ts → ...td/environment/_setEnvironmentVariable.ts b/...td/environment/_setEnvironmentVariable.ts → ...td/environment/_setEnvironmentVariable.ts
diff --git a/...partials/modules/std/functional/Result.ts → ...ogic/api/modules/std/functional/Result.ts b/...partials/modules/std/functional/Result.ts → ...ogic/api/modules/std/functional/Result.ts
diff --git a/...ic/partials/modules/std/json/_tryParse.ts → ...e/logic/api/modules/std/json/_tryParse.ts b/...ic/partials/modules/std/json/_tryParse.ts → ...e/logic/api/modules/std/json/_tryParse.ts
diff --git a/...artials/modules/std/json/_tryStringify.ts → ...gic/api/modules/std/json/_tryStringify.ts b/...artials/modules/std/json/_tryStringify.ts → ...gic/api/modules/std/json/_tryStringify.ts
diff --git a/.../partials/modules/std/json/deserialize.ts → ...logic/api/modules/std/json/deserialize.ts b/.../partials/modules/std/json/deserialize.ts → ...logic/api/modules/std/json/deserialize.ts
diff --git a/...ic/partials/modules/std/json/serialize.ts → ...e/logic/api/modules/std/json/serialize.ts b/...ic/partials/modules/std/json/serialize.ts → ...e/logic/api/modules/std/json/serialize.ts
diff --git a/...rtials/modules/std/json/tryDeserialize.ts → ...ic/api/modules/std/json/tryDeserialize.ts b/...rtials/modules/std/json/tryDeserialize.ts → ...ic/api/modules/std/json/tryDeserialize.ts
diff --git a/...partials/modules/std/json/trySerialize.ts → ...ogic/api/modules/std/json/trySerialize.ts b/...partials/modules/std/json/trySerialize.ts → ...ogic/api/modules/std/json/trySerialize.ts
diff --git a/...gic/partials/modules/std/process/_argv.ts → ...re/logic/api/modules/std/process/_argv.ts b/...gic/partials/modules/std/process/_argv.ts → ...re/logic/api/modules/std/process/_argv.ts
diff --git a/...ogic/partials/modules/std/process/_env.ts → ...ore/logic/api/modules/std/process/_env.ts b/...ogic/partials/modules/std/process/_env.ts → ...ore/logic/api/modules/std/process/_env.ts
diff --git a/...gic/partials/modules/std/process/_exit.ts → ...re/logic/api/modules/std/process/_exit.ts b/...gic/partials/modules/std/process/_exit.ts → ...re/logic/api/modules/std/process/_exit.ts
diff --git a/.../core/logic/partials/modules/std/shift.ts → projects/core/logic/api/modules/std/shift.ts b/.../core/logic/partials/modules/std/shift.ts → projects/core/logic/api/modules/std/shift.ts
diff --git a/...gic/partials/modules/std/std-time-core.ts → ...re/logic/api/modules/std/std-time-core.ts b/...gic/partials/modules/std/std-time-core.ts → ...re/logic/api/modules/std/std-time-core.ts
diff --git a/...tials/modules/std/system/osInformation.ts → ...c/api/modules/std/system/osInformation.ts b/...tials/modules/std/system/osInformation.ts → ...c/api/modules/std/system/osInformation.ts
diff --git a/.../logic/partials/modules/std/time/Timer.ts → .../core/logic/api/modules/std/time/Timer.ts b/.../logic/partials/modules/std/time/Timer.ts → .../core/logic/api/modules/std/time/Timer.ts
diff --git a/...rtials/modules/std/time/_clearInterval.ts → ...ic/api/modules/std/time/_clearInterval.ts b/...rtials/modules/std/time/_clearInterval.ts → ...ic/api/modules/std/time/_clearInterval.ts
diff --git a/...artials/modules/std/time/_clearTimeout.ts → ...gic/api/modules/std/time/_clearTimeout.ts b/...artials/modules/std/time/_clearTimeout.ts → ...gic/api/modules/std/time/_clearTimeout.ts
diff --git a/...partials/modules/std/time/_setInterval.ts → ...ogic/api/modules/std/time/_setInterval.ts b/...partials/modules/std/time/_setInterval.ts → ...ogic/api/modules/std/time/_setInterval.ts
diff --git a/.../logic/partials/modules/testing/Assert.ts → .../core/logic/api/modules/testing/Assert.ts b/.../logic/partials/modules/testing/Assert.ts → .../core/logic/api/modules/testing/Assert.ts
@@ -1,4 +1,4 @@
-import { _compare } from "logic/partials/modules/data/_compare";
+import { _compare } from "logic/api/modules/data/_compare";
 
 class AssertHandler {
     static getProblems(assert: Assert) {

diff --git a/...re/logic/partials/modules/testing/test.ts → ...ts/core/logic/api/modules/testing/test.ts b/...re/logic/partials/modules/testing/test.ts → ...ts/core/logic/api/modules/testing/test.ts
@@ -1,4 +1,4 @@
-import { write, writeLine } from "logic/partials/modules/console/console-core";
+import { write, writeLine } from "logic/api/modules/console/console-core";
 import { Assert, AssertHandler } from "./Assert";
 
 function test(description: string, handler: (assert: Assert) => void) {

diff --git a/...logic/partials/modules/testing/testing.ts → ...core/logic/api/modules/testing/testing.ts b/...logic/partials/modules/testing/testing.ts → ...core/logic/api/modules/testing/testing.ts
diff --git a/...ts/core/logic/partials/statics/_Crypto.ts → projects/core/logic/api/statics/_Crypto.ts b/...ts/core/logic/partials/statics/_Crypto.ts → projects/core/logic/api/statics/_Crypto.ts
diff --git a/projects/core/logic/index.ts b/projects/core/logic/index.ts
@@ -1,23 +1,22 @@
 // Utilitary imports
 import { setupEnvironmentVariables } from "logic/runtime/global-environment-core";
-import { addPrototypeExtension } from "./partials/utils/generic/addPrototypeExtension";
+import { addPrototypeExtension } from "./runtime/injections-core";
 import { and } from "logic/runtime/global-extensions";
 
 // Isolated imports
-import { _Version } from "./partials/constructors/_Version"
+import { _Version } from "./api/constructors/_Version"
 
 // Module imports
-import { console as _console } from "logic/partials/modules/console/console"
-import { dotnet } from "./partials/modules/dotnet/dotnet"
-import { _crypto } from "./partials/statics/_Crypto"
-import { _fs } from "./partials/modules/fs/fs"
-import { _guards } from "./partials/modules/guards/_guards"
-import { http } from "./partials/modules/http/http"
-import { _std } from "./partials/modules/std/_std"
-import { _data } from "./partials/modules/data/_data"
-import { testing } from "./partials/modules/testing/testing"
-import { runtime } from "./partials/modules/runtime/runtime"
-import { interopCache } from "./runtime/interop-cache-core";
+import { console as _console } from "logic/api/modules/console/console"
+import { dotnet } from "./api/modules/dotnet/dotnet"
+import { _crypto } from "./api/statics/_Crypto"
+import { _fs } from "./api/modules/fs/fs"
+import { _guards } from "./api/modules/guards/_guards"
+import { http } from "./api/modules/http/http"
+import { _std } from "./api/modules/std/_std"
+import { _data } from "./api/modules/data/_data"
+import { testing } from "./api/modules/testing/testing"
+import { runtime } from "./api/modules/runtime/runtime"
 
 setupEnvironmentVariables();
 addPrototypeExtension(Object, "and", and);

diff --git a/projects/core/logic/runtime/global-environment-core.ts b/projects/core/logic/runtime/global-environment-core.ts
@@ -1,7 +1,7 @@
-import { readText } from "logic/partials/modules/fs/fs-raw-file-management";
-import { _setEnvironmentVariable } from "logic/partials/modules/std/environment/_setEnvironmentVariable";
+import { readText } from "logic/api/modules/fs/fs-raw-file-management";
+import { _setEnvironmentVariable } from "logic/api/modules/std/environment/_setEnvironmentVariable";
 import { interopCache } from "logic/runtime/interop-cache-core";
-import { _guards } from "logic/partials/modules/guards/_guards";
+import { _guards } from "logic/api/modules/guards/_guards";
 import { Primitive } from "types/internal/generic-types";
 
 function setupEnvironmentVariables() {

diff --git a/...ls/utils/generic/addPrototypeExtension.ts → ...cts/core/logic/runtime/injections-core.ts b/...ls/utils/generic/addPrototypeExtension.ts → ...cts/core/logic/runtime/injections-core.ts
@@ -1,3 +1,5 @@
+// Unsafe: Can allow prototype pollution; Should not be exposed
+
 function addPrototypeExtension(base: any, name: string, value: any) {
     base["prototype"][name] = value;
 }

diff --git a/projects/core/logic/runtime/interop-cache-core.ts b/projects/core/logic/runtime/interop-cache-core.ts
@@ -1,4 +1,4 @@
-import { getStaticMethod } from "logic/partials/modules/dotnet/dotnet-interop-core";
+import { getStaticMethod } from "logic/api/modules/dotnet/dotnet-interop-core";
 
 const interopCache = {
     serialization: {

diff --git a/projects/native/MelonRuntime.Core/Scripts/core.js b/projects/native/MelonRuntime.Core/Scripts/core.js