From bc574ee1cbd34977e8d5dc51502df1259ab1344c Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Fri, 28 Jul 2023 01:58:50 +0200 Subject: [PATCH] Reorganise packages/lib Move the majority of the script files into a src directory to be consistent with the organisation of the other packages. --- packages/lib/browser.js | 28 +++++------ packages/lib/index.js | 50 +++++++++---------- packages/lib/{ => src}/ExponentialBackoff.js | 0 packages/lib/{ => src}/PlayerStats.js | 0 packages/lib/{ => src}/RateLimiter.js | 0 packages/lib/{ => src}/command.js | 0 packages/lib/{ => src}/config/classes.js | 0 packages/lib/{ => src}/config/definitions.js | 0 packages/lib/{ => src}/config/index.js | 0 packages/lib/{ => src}/data/ExportManifest.js | 0 packages/lib/{ => src}/data/ModInfo.js | 0 packages/lib/{ => src}/data/ModPack.js | 0 packages/lib/{ => src}/data/composites.js | 0 packages/lib/{ => src}/data/index.js | 0 .../lib/{ => src}/data/messages_controller.js | 0 packages/lib/{ => src}/data/messages_core.js | 0 packages/lib/{ => src}/data/messages_host.js | 0 .../lib/{ => src}/data/messages_instance.js | 0 packages/lib/{ => src}/data/messages_mod.js | 0 packages/lib/{ => src}/data/messages_user.js | 0 packages/lib/{ => src}/data/version.js | 0 packages/lib/{ => src}/database.js | 0 packages/lib/{ => src}/errors.js | 0 .../lib/{ => src}/factorio/exchange_string.js | 0 packages/lib/{ => src}/factorio/export.js | 4 +- packages/lib/{ => src}/factorio/index.js | 0 packages/lib/{ => src}/factorio/patch.js | 0 packages/lib/{ => src}/factorio/server.js | 0 packages/lib/{ => src}/file_ops.js | 0 packages/lib/{ => src}/hash.js | 0 packages/lib/{ => src}/helpers.js | 0 packages/lib/{ => src}/ini.js | 0 .../lib/{ => src}/is_deep_strict_equal.js | 0 packages/lib/{ => src}/link/connectors.js | 0 packages/lib/{ => src}/link/index.js | 0 packages/lib/{ => src}/link/link.js | 0 packages/lib/{ => src}/link/messages.js | 0 packages/lib/{ => src}/logging.js | 0 packages/lib/{ => src}/logging_utils.js | 0 packages/lib/{ => src}/lua_tools.js | 0 packages/lib/{ => src}/plugin.js | 0 packages/lib/{ => src}/plugin_loader.js | 0 packages/lib/{ => src}/prometheus.js | 0 packages/lib/{ => src}/schema.js | 0 packages/lib/{ => src}/shared_commands.js | 0 packages/lib/{ => src}/stream.js | 0 packages/lib/{ => src}/users.js | 0 packages/lib/{ => src}/zip_ops.js | 0 48 files changed, 41 insertions(+), 41 deletions(-) rename packages/lib/{ => src}/ExponentialBackoff.js (100%) rename packages/lib/{ => src}/PlayerStats.js (100%) rename packages/lib/{ => src}/RateLimiter.js (100%) rename packages/lib/{ => src}/command.js (100%) rename packages/lib/{ => src}/config/classes.js (100%) rename packages/lib/{ => src}/config/definitions.js (100%) rename packages/lib/{ => src}/config/index.js (100%) rename packages/lib/{ => src}/data/ExportManifest.js (100%) rename packages/lib/{ => src}/data/ModInfo.js (100%) rename packages/lib/{ => src}/data/ModPack.js (100%) rename packages/lib/{ => src}/data/composites.js (100%) rename packages/lib/{ => src}/data/index.js (100%) rename packages/lib/{ => src}/data/messages_controller.js (100%) rename packages/lib/{ => src}/data/messages_core.js (100%) rename packages/lib/{ => src}/data/messages_host.js (100%) rename packages/lib/{ => src}/data/messages_instance.js (100%) rename packages/lib/{ => src}/data/messages_mod.js (100%) rename packages/lib/{ => src}/data/messages_user.js (100%) rename packages/lib/{ => src}/data/version.js (100%) rename packages/lib/{ => src}/database.js (100%) rename packages/lib/{ => src}/errors.js (100%) rename packages/lib/{ => src}/factorio/exchange_string.js (100%) rename packages/lib/{ => src}/factorio/export.js (99%) rename packages/lib/{ => src}/factorio/index.js (100%) rename packages/lib/{ => src}/factorio/patch.js (100%) rename packages/lib/{ => src}/factorio/server.js (100%) rename packages/lib/{ => src}/file_ops.js (100%) rename packages/lib/{ => src}/hash.js (100%) rename packages/lib/{ => src}/helpers.js (100%) rename packages/lib/{ => src}/ini.js (100%) rename packages/lib/{ => src}/is_deep_strict_equal.js (100%) rename packages/lib/{ => src}/link/connectors.js (100%) rename packages/lib/{ => src}/link/index.js (100%) rename packages/lib/{ => src}/link/link.js (100%) rename packages/lib/{ => src}/link/messages.js (100%) rename packages/lib/{ => src}/logging.js (100%) rename packages/lib/{ => src}/logging_utils.js (100%) rename packages/lib/{ => src}/lua_tools.js (100%) rename packages/lib/{ => src}/plugin.js (100%) rename packages/lib/{ => src}/plugin_loader.js (100%) rename packages/lib/{ => src}/prometheus.js (100%) rename packages/lib/{ => src}/schema.js (100%) rename packages/lib/{ => src}/shared_commands.js (100%) rename packages/lib/{ => src}/stream.js (100%) rename packages/lib/{ => src}/users.js (100%) rename packages/lib/{ => src}/zip_ops.js (100%) diff --git a/packages/lib/browser.js b/packages/lib/browser.js index c5256437..29cce7f5 100644 --- a/packages/lib/browser.js +++ b/packages/lib/browser.js @@ -1,15 +1,15 @@ -export * from "./config"; -export * from "./data"; -export * from "./errors"; -export * from "./factorio/exchange_string"; -export * from "./helpers"; -export * from "./ini"; -export * from "./link"; -export * from "./logging"; -export * from "./plugin"; -export * from "./schema"; -export * from "./users"; +export * from "./src/config"; +export * from "./src/data"; +export * from "./src/errors"; +export * from "./src/factorio/exchange_string"; +export * from "./src/helpers"; +export * from "./src/ini"; +export * from "./src/link"; +export * from "./src/logging"; +export * from "./src/plugin"; +export * from "./src/schema"; +export * from "./src/users"; -export { default as ExponentialBackoff } from "./ExponentialBackoff"; -export { default as PlayerStats } from "./PlayerStats"; -export { default as RateLimiter } from "./RateLimiter"; +export { default as ExponentialBackoff } from "./src/ExponentialBackoff"; +export { default as PlayerStats } from "./src/PlayerStats"; +export { default as RateLimiter } from "./src/RateLimiter"; diff --git a/packages/lib/index.js b/packages/lib/index.js index 7e282a20..2fce1f00 100644 --- a/packages/lib/index.js +++ b/packages/lib/index.js @@ -4,32 +4,32 @@ */ "use strict"; const libBuildMod = require("./build_mod"); -const libCommand = require("./command"); -const libConfig = require("./config"); -const libData = require("./data"); -const libDatabase = require("./database"); -const libErrors = require("./errors"); -const libFactorio = require("./factorio"); -const libFileOps = require("./file_ops"); -const libHash = require("./hash"); -const libHelpers = require("./helpers"); -const libIni = require("./ini"); -const libLink = require("./link"); -const libLogging = require("./logging"); -const libLoggingUtils = require("./logging_utils"); -const libLuaTools = require("./lua_tools"); -const libPlugin = require("./plugin"); -const libPluginLoader = require("./plugin_loader"); -const libPrometheus = require("./prometheus"); -const libSchema = require("./schema"); -const libSharedCommands = require("./shared_commands"); -const libStream = require("./stream"); -const libUsers = require("./users"); -const libZipOps = require("./zip_ops"); +const libCommand = require("./src/command"); +const libConfig = require("./src/config"); +const libData = require("./src/data"); +const libDatabase = require("./src/database"); +const libErrors = require("./src/errors"); +const libFactorio = require("./src/factorio"); +const libFileOps = require("./src/file_ops"); +const libHash = require("./src/hash"); +const libHelpers = require("./src/helpers"); +const libIni = require("./src/ini"); +const libLink = require("./src/link"); +const libLogging = require("./src/logging"); +const libLoggingUtils = require("./src/logging_utils"); +const libLuaTools = require("./src/lua_tools"); +const libPlugin = require("./src/plugin"); +const libPluginLoader = require("./src/plugin_loader"); +const libPrometheus = require("./src/prometheus"); +const libSchema = require("./src/schema"); +const libSharedCommands = require("./src/shared_commands"); +const libStream = require("./src/stream"); +const libUsers = require("./src/users"); +const libZipOps = require("./src/zip_ops"); -const ExponentialBackoff = require("./ExponentialBackoff"); -const PlayerStats = require("./PlayerStats"); -const RateLimiter = require("./RateLimiter"); +const ExponentialBackoff = require("./src/ExponentialBackoff"); +const PlayerStats = require("./src/PlayerStats"); +const RateLimiter = require("./src/RateLimiter"); module.exports = { diff --git a/packages/lib/ExponentialBackoff.js b/packages/lib/src/ExponentialBackoff.js similarity index 100% rename from packages/lib/ExponentialBackoff.js rename to packages/lib/src/ExponentialBackoff.js diff --git a/packages/lib/PlayerStats.js b/packages/lib/src/PlayerStats.js similarity index 100% rename from packages/lib/PlayerStats.js rename to packages/lib/src/PlayerStats.js diff --git a/packages/lib/RateLimiter.js b/packages/lib/src/RateLimiter.js similarity index 100% rename from packages/lib/RateLimiter.js rename to packages/lib/src/RateLimiter.js diff --git a/packages/lib/command.js b/packages/lib/src/command.js similarity index 100% rename from packages/lib/command.js rename to packages/lib/src/command.js diff --git a/packages/lib/config/classes.js b/packages/lib/src/config/classes.js similarity index 100% rename from packages/lib/config/classes.js rename to packages/lib/src/config/classes.js diff --git a/packages/lib/config/definitions.js b/packages/lib/src/config/definitions.js similarity index 100% rename from packages/lib/config/definitions.js rename to packages/lib/src/config/definitions.js diff --git a/packages/lib/config/index.js b/packages/lib/src/config/index.js similarity index 100% rename from packages/lib/config/index.js rename to packages/lib/src/config/index.js diff --git a/packages/lib/data/ExportManifest.js b/packages/lib/src/data/ExportManifest.js similarity index 100% rename from packages/lib/data/ExportManifest.js rename to packages/lib/src/data/ExportManifest.js diff --git a/packages/lib/data/ModInfo.js b/packages/lib/src/data/ModInfo.js similarity index 100% rename from packages/lib/data/ModInfo.js rename to packages/lib/src/data/ModInfo.js diff --git a/packages/lib/data/ModPack.js b/packages/lib/src/data/ModPack.js similarity index 100% rename from packages/lib/data/ModPack.js rename to packages/lib/src/data/ModPack.js diff --git a/packages/lib/data/composites.js b/packages/lib/src/data/composites.js similarity index 100% rename from packages/lib/data/composites.js rename to packages/lib/src/data/composites.js diff --git a/packages/lib/data/index.js b/packages/lib/src/data/index.js similarity index 100% rename from packages/lib/data/index.js rename to packages/lib/src/data/index.js diff --git a/packages/lib/data/messages_controller.js b/packages/lib/src/data/messages_controller.js similarity index 100% rename from packages/lib/data/messages_controller.js rename to packages/lib/src/data/messages_controller.js diff --git a/packages/lib/data/messages_core.js b/packages/lib/src/data/messages_core.js similarity index 100% rename from packages/lib/data/messages_core.js rename to packages/lib/src/data/messages_core.js diff --git a/packages/lib/data/messages_host.js b/packages/lib/src/data/messages_host.js similarity index 100% rename from packages/lib/data/messages_host.js rename to packages/lib/src/data/messages_host.js diff --git a/packages/lib/data/messages_instance.js b/packages/lib/src/data/messages_instance.js similarity index 100% rename from packages/lib/data/messages_instance.js rename to packages/lib/src/data/messages_instance.js diff --git a/packages/lib/data/messages_mod.js b/packages/lib/src/data/messages_mod.js similarity index 100% rename from packages/lib/data/messages_mod.js rename to packages/lib/src/data/messages_mod.js diff --git a/packages/lib/data/messages_user.js b/packages/lib/src/data/messages_user.js similarity index 100% rename from packages/lib/data/messages_user.js rename to packages/lib/src/data/messages_user.js diff --git a/packages/lib/data/version.js b/packages/lib/src/data/version.js similarity index 100% rename from packages/lib/data/version.js rename to packages/lib/src/data/version.js diff --git a/packages/lib/database.js b/packages/lib/src/database.js similarity index 100% rename from packages/lib/database.js rename to packages/lib/src/database.js diff --git a/packages/lib/errors.js b/packages/lib/src/errors.js similarity index 100% rename from packages/lib/errors.js rename to packages/lib/src/errors.js diff --git a/packages/lib/factorio/exchange_string.js b/packages/lib/src/factorio/exchange_string.js similarity index 100% rename from packages/lib/factorio/exchange_string.js rename to packages/lib/src/factorio/exchange_string.js diff --git a/packages/lib/factorio/export.js b/packages/lib/src/factorio/export.js similarity index 99% rename from packages/lib/factorio/export.js rename to packages/lib/src/factorio/export.js index 9bd03b80..ba41f8d2 100644 --- a/packages/lib/factorio/export.js +++ b/packages/lib/src/factorio/export.js @@ -6,7 +6,7 @@ const Jimp = require("jimp"); const JSZip = require("jszip"); const libIni = require("../ini"); -const libBuildMod = require("../build_mod"); +const libBuildMod = require("../../build_mod"); const libZipOps = require("../zip_ops"); /** @@ -35,7 +35,7 @@ async function generateExportMod(server) { build: true, pack: true, // XXX fix path when moving lib/factorio to host - sourceDir: path.join(__dirname, "..", "..", "host", "lua", "export"), + sourceDir: path.join(__dirname, "..", "..", "..", "host", "lua", "export"), outputDir: server.writePath("mods"), bumpPatch: false, factorioVersion: server.version.replace(/\.\d+$/, ""), diff --git a/packages/lib/factorio/index.js b/packages/lib/src/factorio/index.js similarity index 100% rename from packages/lib/factorio/index.js rename to packages/lib/src/factorio/index.js diff --git a/packages/lib/factorio/patch.js b/packages/lib/src/factorio/patch.js similarity index 100% rename from packages/lib/factorio/patch.js rename to packages/lib/src/factorio/patch.js diff --git a/packages/lib/factorio/server.js b/packages/lib/src/factorio/server.js similarity index 100% rename from packages/lib/factorio/server.js rename to packages/lib/src/factorio/server.js diff --git a/packages/lib/file_ops.js b/packages/lib/src/file_ops.js similarity index 100% rename from packages/lib/file_ops.js rename to packages/lib/src/file_ops.js diff --git a/packages/lib/hash.js b/packages/lib/src/hash.js similarity index 100% rename from packages/lib/hash.js rename to packages/lib/src/hash.js diff --git a/packages/lib/helpers.js b/packages/lib/src/helpers.js similarity index 100% rename from packages/lib/helpers.js rename to packages/lib/src/helpers.js diff --git a/packages/lib/ini.js b/packages/lib/src/ini.js similarity index 100% rename from packages/lib/ini.js rename to packages/lib/src/ini.js diff --git a/packages/lib/is_deep_strict_equal.js b/packages/lib/src/is_deep_strict_equal.js similarity index 100% rename from packages/lib/is_deep_strict_equal.js rename to packages/lib/src/is_deep_strict_equal.js diff --git a/packages/lib/link/connectors.js b/packages/lib/src/link/connectors.js similarity index 100% rename from packages/lib/link/connectors.js rename to packages/lib/src/link/connectors.js diff --git a/packages/lib/link/index.js b/packages/lib/src/link/index.js similarity index 100% rename from packages/lib/link/index.js rename to packages/lib/src/link/index.js diff --git a/packages/lib/link/link.js b/packages/lib/src/link/link.js similarity index 100% rename from packages/lib/link/link.js rename to packages/lib/src/link/link.js diff --git a/packages/lib/link/messages.js b/packages/lib/src/link/messages.js similarity index 100% rename from packages/lib/link/messages.js rename to packages/lib/src/link/messages.js diff --git a/packages/lib/logging.js b/packages/lib/src/logging.js similarity index 100% rename from packages/lib/logging.js rename to packages/lib/src/logging.js diff --git a/packages/lib/logging_utils.js b/packages/lib/src/logging_utils.js similarity index 100% rename from packages/lib/logging_utils.js rename to packages/lib/src/logging_utils.js diff --git a/packages/lib/lua_tools.js b/packages/lib/src/lua_tools.js similarity index 100% rename from packages/lib/lua_tools.js rename to packages/lib/src/lua_tools.js diff --git a/packages/lib/plugin.js b/packages/lib/src/plugin.js similarity index 100% rename from packages/lib/plugin.js rename to packages/lib/src/plugin.js diff --git a/packages/lib/plugin_loader.js b/packages/lib/src/plugin_loader.js similarity index 100% rename from packages/lib/plugin_loader.js rename to packages/lib/src/plugin_loader.js diff --git a/packages/lib/prometheus.js b/packages/lib/src/prometheus.js similarity index 100% rename from packages/lib/prometheus.js rename to packages/lib/src/prometheus.js diff --git a/packages/lib/schema.js b/packages/lib/src/schema.js similarity index 100% rename from packages/lib/schema.js rename to packages/lib/src/schema.js diff --git a/packages/lib/shared_commands.js b/packages/lib/src/shared_commands.js similarity index 100% rename from packages/lib/shared_commands.js rename to packages/lib/src/shared_commands.js diff --git a/packages/lib/stream.js b/packages/lib/src/stream.js similarity index 100% rename from packages/lib/stream.js rename to packages/lib/src/stream.js diff --git a/packages/lib/users.js b/packages/lib/src/users.js similarity index 100% rename from packages/lib/users.js rename to packages/lib/src/users.js diff --git a/packages/lib/zip_ops.js b/packages/lib/src/zip_ops.js similarity index 100% rename from packages/lib/zip_ops.js rename to packages/lib/src/zip_ops.js