@thigasdevelopment/luam 0.11.1 → 0.13.0

package/lua/env.lua

@@ -1,18 +1,91 @@
-local ENVIRONMENT_FILE = '.env'
+local ENVIRONMENT_FILE = '__LUAM_ENV_FILE__'; -- Replaced at build time with the file the manifest selects. (.env, .env.development, ...)
 
-if localPlayer ~= nil then
-    return
+---@param str string
+---@return string
+local function trim (str)
+	return str:match ('^%s*(.-)%s*$');
 end
 
-if not fileExists(ENVIRONMENT_FILE) then
-    if type(process) ~= 'table' then
-        process = {}
-    end
+---@param path string
+---@return string
+local function load (path)
+	local pathType = type (path);
+	if (pathType ~= 'string') then
+		error ('bad argument #1 to \'load\' (\'string\' expected got \'' .. pathType .. '\').', 2);
+	end
 
-    process.env = {}
-    env = process.env
+	if (not fileExists (path)) then return end
 
-    return
+	local file = fileOpen (path, true);
+	if (not file) then
+		error ('Failed to open environment file.', 2);
+	end
+
+	local content = fileRead (file, fileGetSize (file));
+	fileClose (file);
+
+	return content;
+end
+
+---@param value string
+---@return boolean | number | string
+local function normalize (value)
+	local number = tonumber (value);
+	if (number) then
+		value = number;
+	elseif (value:lower () == 'true') then
+		value = true;
+	elseif (value:lower () == 'false') then
+		value = false;
+	end
+	return value;
+end
+
+---@param content string
+---@return table<string, any>
+local function parse (content)
+	local result = { };
+
+	local lines = content:gmatch ('[^\r\n]+');
+	for line in lines do
+		line = trim (line);
+		if (line ~= '') and (not line:find ('^#')) then
+			local key, value = line:match ('^([%w_]+)%s*=%s*(.*)$');
+			if (key and value) then
+				if (value:sub (1, 1) == '"' and value:sub (-1) == '"') or (value:sub (1, 1) == "'" and value:sub (-1) == "'") then
+					value = value:sub (2, -2);
+				end
+
+				local value = normalize (value);
+				result[key] = value;
+			end
+		end
+	end
+
+	return result;
 end
 
-Dotenv.new(ENVIRONMENT_FILE):apply()
+local content = load (ENVIRONMENT_FILE);
+if (not content) then return end
+content = parse (content);
+
+env = setmetatable ({ }, {
+	---@param _ string | number
+	---@param key string
+	---@return boolean | number | string
+	__index = function (_, key)
+		local value = content[key];
+		if (value == nil) then
+			error ('"' .. tostring(key) .. '" is not declared in "' .. ENVIRONMENT_FILE .. '".', 2);
+		end
+		return value;
+	end,
+
+	---@param _ string | number
+	---@param key string
+	__newindex = function (_, key)
+		error ('The environment is read-only and "' .. tostring(key) .. '" cannot be assigned.', 2);
+	end,
+
+	__metatable = false,
+});

package/luam.mjs

@@ -5279,15 +5279,7 @@ var RUNTIME_HELPERS = {
     injection: "automatic",
     features: ["class-declaration", "class-inheritance", "class-instantiation", "super-call", "enum-declaration"]
   },
-  dotenv: {
-    name: "dotenv",
-    file: "dotenv.lua",
-    injection: "reference",
-    features: [],
-    globals: ["Dotenv"],
-    environment: "server"
-  },
-  env: { name: "env", file: "env.lua", injection: "manual", features: [], requires: ["dotenv"], environment: "server" },
+  env: { name: "env", file: "env.lua", injection: "manual", features: [], environment: "server" },
   math: { name: "math", file: "math.lua", injection: "automatic", features: ["number-extension"] },
   string: { name: "string", file: "string.lua", injection: "automatic", features: ["string-extension", "template-string"] },
   table: { name: "table", file: "table.lua", injection: "automatic", features: ["table-extension"] },
@@ -6499,7 +6491,7 @@ import { tmpdir } from "node:os";
 import { join as join2 } from "node:path";
 
 // src/cli/version.ts
-var VERSION = true ? "0.11.1" : "0.0.0-dev";
+var VERSION = true ? "0.13.0" : "0.0.0-dev";
 var PROGRAM_NAME = "luam";
 var PROGRAM_DESCRIPTION = "luam \u2014 the Luam compiler for Multi Theft Auto resources.";
 
@@ -7085,85 +7077,6 @@ function addProjectOptions(command) {
   return command.addOption(cwdOption()).addOption(manifestOption()).addOption(colorOption());
 }
 
-// ../compiler/src/project/env-file.ts
-var ENTRY = /^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/;
-var SENSITIVE = /(password|secret|token|key|credential|dsn|private)/i;
-var EMPTY_ENV_FILE = { entries: [], errors: [] };
-function unquote(raw) {
-  const quote2 = raw.slice(0, 1);
-  if (quote2 !== '"' && quote2 !== "'") {
-    return null;
-  }
-  const closing = raw.lastIndexOf(quote2);
-  return closing > 0 ? raw.slice(1, closing) : null;
-}
-function stripComment(raw) {
-  return raw.replace(/\s+#.*$/, "").trim();
-}
-function classify(raw) {
-  const quoted = unquote(raw);
-  if (quoted !== null) {
-    return { value: quoted, kind: "string" };
-  }
-  const value = stripComment(raw);
-  if (value === "true" || value === "false") {
-    return { value, kind: "boolean" };
-  }
-  return { value, kind: value.length > 0 && Number.isFinite(Number(value)) ? "number" : "string" };
-}
-function parseEnvFile(source) {
-  const entries2 = [];
-  const errors = [];
-  source.split(/\r?\n/).forEach((raw, index) => {
-    const trimmed = raw.trim();
-    const line2 = index + 1;
-    if (trimmed.length === 0 || trimmed.startsWith("#")) {
-      return;
-    }
-    const match = ENTRY.exec(trimmed);
-    if (match === null || match[1] === void 0 || match[2] === void 0) {
-      errors.push({ line: line2, message: `Malformed entry on line ${line2}. Expected "KEY=value".` });
-      return;
-    }
-    const { value, kind } = classify(match[2]);
-    entries2.push({ key: match[1], value, kind, line: line2 });
-  });
-  return { entries: entries2, errors };
-}
-function isSensitiveKey(key) {
-  return SENSITIVE.test(key);
-}
-function mergeEnvFiles(base, overrides) {
-  const merged = new Map(base.entries.map((entry) => [entry.key, entry]));
-  for (const entry of overrides.entries) {
-    const declared = merged.get(entry.key);
-    if (declared !== void 0) {
-      merged.set(entry.key, { ...declared, value: entry.value });
-    }
-  }
-  return { entries: [...merged.values()], errors: [...base.errors, ...overrides.errors] };
-}
-
-// src/build/env-template.ts
-var HEADER = [
-  "# Deployment values for this resource.",
-  '# Generated once by "luam build" and owned by the server administrator.',
-  "# The compiler never overwrites this file, and it is never sent to clients.",
-  ""
-];
-function quote(entry) {
-  if (entry.kind !== "string" || /^[A-Za-z0-9._:/@-]*$/.test(entry.value)) {
-    return entry.value;
-  }
-  return `"${entry.value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
-}
-function line(entry) {
-  return `${entry.key}=${isSensitiveKey(entry.key) ? "" : quote(entry)}`;
-}
-function renderEnvironmentTemplate(file) {
-  return [...HEADER, ...file.entries.map(line), ""].join("\n");
-}
-
 // src/build/helper-files.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -7549,8 +7462,8 @@ var ENVIRONMENT_ORDER = { shared: 0, server: 1, client: 2 };
 function outputPath(sourcePath) {
   return normalizePath(sourcePath).replace(/^\.\//, "").replace(/\.luam$/, ".lua");
 }
-function libraryPath(environment, file) {
-  return `${LIBRARY_DIRECTORY}/${environment}/${file}`;
+function libraryPath(file) {
+  return `${LIBRARY_DIRECTORY}/${file}`;
 }
 function mergeEnvironment(current, environment) {
   if (current === void 0) {
@@ -7573,7 +7486,7 @@ function collectHelpers(modules, manual) {
   }
   return [...environments.entries()].map(([helper, environment]) => {
     const file = RUNTIME_HELPERS[helper].file;
-    return { helper, file, path: libraryPath(environment, file), environment };
+    return { helper, file, path: libraryPath(file), environment };
   }).sort((left, right) => helperDepth(left.helper) - helperDepth(right.helper) || left.path.localeCompare(right.path));
 }
 function collectDevelopmentLogHelpers(options) {
@@ -7588,7 +7501,7 @@ function collectDevelopmentLogHelpers(options) {
   return Object.values(DEVELOPMENT_RUNTIME_HELPERS).map((helper) => ({
     helper: helper.name,
     file: helper.file,
-    path: libraryPath(helper.environment, helper.file),
+    path: libraryPath(helper.file),
     environment: helper.environment,
     replacements
   }));
@@ -7676,14 +7589,102 @@ function findDuplicateOutputs(scripts, assets) {
   return diagnostics;
 }
 
+// ../compiler/src/project/env-file.ts
+var ENTRY = /^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/;
+var SENSITIVE = /(password|secret|token|key|credential|dsn|private)/i;
+var EMPTY_ENV_FILE = { entries: [], errors: [] };
+function unquote(raw) {
+  const quote2 = raw.slice(0, 1);
+  if (quote2 !== '"' && quote2 !== "'") {
+    return null;
+  }
+  const closing = raw.lastIndexOf(quote2);
+  return closing > 0 ? raw.slice(1, closing) : null;
+}
+function stripComment(raw) {
+  return raw.replace(/\s+#.*$/, "").trim();
+}
+function classify(raw) {
+  const quoted = unquote(raw);
+  if (quoted !== null) {
+    return { value: quoted, kind: "string" };
+  }
+  const value = stripComment(raw);
+  if (value === "true" || value === "false") {
+    return { value, kind: "boolean" };
+  }
+  return { value, kind: value.length > 0 && Number.isFinite(Number(value)) ? "number" : "string" };
+}
+function parseEnvFile(source) {
+  const entries2 = [];
+  const errors = [];
+  source.split(/\r?\n/).forEach((raw, index) => {
+    const trimmed = raw.trim();
+    const line2 = index + 1;
+    if (trimmed.length === 0 || trimmed.startsWith("#")) {
+      return;
+    }
+    const match = ENTRY.exec(trimmed);
+    if (match === null || match[1] === void 0 || match[2] === void 0) {
+      errors.push({ line: line2, message: `Malformed entry on line ${line2}. Expected "KEY=value".` });
+      return;
+    }
+    const { value, kind } = classify(match[2]);
+    entries2.push({ key: match[1], value, kind, line: line2 });
+  });
+  return { entries: entries2, errors };
+}
+function isSensitiveKey(key) {
+  return SENSITIVE.test(key);
+}
+function mergeEnvFiles(base, overrides) {
+  const merged = new Map(base.entries.map((entry) => [entry.key, entry]));
+  for (const entry of overrides.entries) {
+    const declared = merged.get(entry.key);
+    if (declared !== void 0) {
+      merged.set(entry.key, { ...declared, value: entry.value });
+    }
+  }
+  return { entries: [...merged.values()], errors: [...base.errors, ...overrides.errors] };
+}
+
+// ../compiler/src/project/env-template.ts
+var HEADER = [
+  "# Deployment values for this resource.",
+  '# Generated once by "luam build" and owned by the server administrator.',
+  "# The compiler never overwrites this file, and it is never sent to clients.",
+  "#",
+  "# Edit a value and restart the resource. A key left out falls back to nothing,",
+  "# so keep every key the project declares.",
+  ""
+];
+function quote(entry) {
+  if (entry.kind !== "string" || /^[A-Za-z0-9._:/@-]*$/.test(entry.value)) {
+    return entry.value;
+  }
+  return `"${entry.value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
+function line(entry) {
+  return `${entry.key}=${isSensitiveKey(entry.key) ? "" : quote(entry)}`;
+}
+function renderEnvironmentTemplate(file) {
+  return [...HEADER, ...file.entries.map(line), ""].join("\n");
+}
+
 // ../compiler/src/project/resource.ts
 var ENVIRONMENT_FILE = ".env";
+var ENVIRONMENT_FILE_PLACEHOLDER = "__LUAM_ENV_FILE__";
 function configurationScript(configuration) {
   if (configuration === null || configuration === void 0) {
     return null;
   }
   return { path: configuration.path, source: configuration.source, environment: "shared", content: configuration.content, lines: [] };
 }
+function withEnvironmentFile(helpers, file) {
+  return helpers.map(
+    (helper) => helper.helper === "env" ? { ...helper, replacements: { [ENVIRONMENT_FILE_PLACEHOLDER]: file ?? ENVIRONMENT_FILE } } : helper
+  );
+}
 function helperEntry(helper) {
   return { src: helper.path, environment: helper.environment, group: "library" };
 }
@@ -7759,18 +7760,16 @@ function assembleResource(project, options, onStep) {
   if (project.hasErrors) {
     return { build: null, diagnostics: project.diagnostics };
   }
-  const helpers = [...collectHelpers(project.modules, options.helpers ?? []), ...collectDevelopmentLogHelpers(options.developmentLogs)];
+  const collected = [...collectHelpers(project.modules, options.helpers ?? []), ...collectDevelopmentLogHelpers(options.developmentLogs)];
+  const helpers = withEnvironmentFile(collected, options.environmentFile);
   const scripts = collectScripts(project.modules);
   const configuration = configurationScript(options.configuration);
+  const deployment = configuration === null ? [] : [configuration];
   const sorted = [...options.assets ?? []].sort((left, right) => left.path.localeCompare(right.path));
   const order = resolveLoadOrder(options.loadOrder ?? [], scripts, sorted);
   const layout = options.layout ?? "tree";
   const bundles = layout === "bundle" ? collectBundles(helpers, scripts, order.scripts) : [];
-  const outputs = configuration === null ? scripts : [...scripts, configuration];
-  const duplicates = layout === "tree" ? findDuplicateOutputs(outputs, sorted) : [
-    ...findDuplicateOutputs(scripts, []),
-    ...findDuplicateOutputs(configuration === null ? [] : [configuration], sorted)
-  ];
+  const duplicates = layout === "tree" ? findDuplicateOutputs([...scripts, ...deployment], sorted) : [...findDuplicateOutputs(scripts, []), ...findDuplicateOutputs(deployment, sorted)];
   const collisions = layout === "bundle" ? bundleDiagnostics(project, bundles, scripts, sorted) : [];
   const diagnostics = sortFileDiagnostics([...project.diagnostics, ...duplicates, ...collisions, ...order.diagnostics]);
   if (duplicates.length > 0 || collisions.length > 0 || order.diagnostics.length > 0) {
@@ -8026,8 +8025,6 @@ function fn(parameters, returnType, minimumArguments2, isVariadic = false) {
 
 // ../compiler/src/checker/project-declarations.ts
 var EMPTY_PROJECT_DECLARATIONS = { globals: [] };
-var PROCESS_GLOBAL = "process";
-var PROCESS_ENV = "process.env";
 var ENV_GLOBAL = "env";
 var VALUE_TYPES = { boolean: BOOLEAN, number: NUMBER, string: STRING };
 function envMembers(entries2) {
@@ -8037,11 +8034,6 @@ function envMembers(entries2) {
   }
   return [...members.values()].sort((left, right) => left.name.localeCompare(right.name));
 }
-function environmentDeclaration(entries2, origin) {
-  const env = record(PROCESS_ENV, envMembers(entries2), origin);
-  const process2 = record(PROCESS_GLOBAL, [{ name: ENV_GLOBAL, type: env }], origin);
-  return { name: PROCESS_GLOBAL, environment: "server", source: "project", type: process2 };
-}
 function envDeclaration(entries2, origin) {
   const env = record(ENV_GLOBAL, envMembers(entries2), origin);
   return { name: ENV_GLOBAL, environment: "server", source: "project", type: env };
@@ -8050,7 +8042,7 @@ function projectDeclarations(entries2, origin) {
   if (entries2 === null) {
     return EMPTY_PROJECT_DECLARATIONS;
   }
-  return { globals: [environmentDeclaration(entries2, origin), envDeclaration(entries2, origin)] };
+  return { globals: [envDeclaration(entries2, origin)] };
 }
 
 // ../compiler/src/checker/ambient.ts
@@ -8313,16 +8305,7 @@ var ASYNC = record("Async", [
   { name: "getInterval", type: fn([], NUMBER, 0) },
   { name: "setInterval", type: fn([NUMBER], BOOLEAN, 1) }
 ]);
-var DOTENV = record("Dotenv", [
-  { name: "path", type: STRING },
-  { name: "get", type: fn([STRING, ANY], ANY, 1) },
-  { name: "has", type: fn([STRING], BOOLEAN, 1) },
-  { name: "all", type: fn([], TABLE, 0) },
-  { name: "apply", type: fn([], TABLE, 0) }
-]);
-var LUAM_RUNTIME_SERVER_GLOBALS = {
-  Dotenv: record("DotenvLibrary", [{ name: "new", type: fn([STRING], DOTENV, 0) }])
-};
+var LUAM_RUNTIME_SERVER_GLOBALS = {};
 var LUAM_RUNTIME_GLOBALS = {
   bind: fn([ANY, ANY], ANY, 2),
   getClass: fn([STRING], optionalOf(TABLE), 1),
@@ -15367,6 +15350,7 @@ function resourceOptions(config, inputs, minMtaVersion, developmentLogs, layout)
     helpers: helperList(config, inputs),
     assets: inputs.assets,
     configuration: inputs.configuration,
+    environmentFile: config.environment.file,
     loadOrder: config.loadOrder,
     minMtaVersion,
     developmentLogs,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@thigasdevelopment/luam",
-    "version": "0.11.1",
+    "version": "0.13.0",
     "description": "The Luam compiler for Multi Theft Auto resources.",
     "keywords": [
         "mta",

package/lua/dotenv.lua

@@ -1,160 +0,0 @@
-local DEFAULT_FILE = '.env'
-
-local KEYWORDS = {
-    ['true'] = true,
-    ['false'] = false,
-}
-
-local ESCAPES = {
-    ['n'] = '\n',
-    ['r'] = '\r',
-    ['t'] = '\t',
-    ['"'] = '"',
-    ["'"] = "'",
-    ['\\'] = '\\',
-}
-
-local function trim(value)
-    return value:match('^%s*(.-)%s*$') or ''
-end
-
-local function unescape(character)
-    return ESCAPES[character] or ('\\' .. character)
-end
-
-local function cast(raw)
-    local quote = raw:sub(1, 1)
-
-    if quote == '"' or quote == "'" then
-        local quoted = raw:match('^' .. quote .. '(.*)' .. quote)
-
-        if quoted then
-            return (quoted:gsub('\\(.)', unescape))
-        end
-    end
-
-    local value = trim((raw:gsub('%s+#.*$', '')))
-    local keyword = KEYWORDS[value]
-
-    if keyword ~= nil then
-        return keyword
-    end
-
-    return tonumber(value) or value
-end
-
-local function read(path)
-    local file = fileOpen(path, true)
-
-    if not file then
-        return nil
-    end
-
-    local content = fileRead(file, fileGetSize(file))
-
-    fileClose(file)
-
-    return content
-end
-
-local function parse(path, content)
-    local values = {}
-    local number = 0
-
-    for line in (content .. '\n'):gmatch('(.-)\r?\n') do
-        number = number + 1
-
-        local trimmed = trim(line)
-
-        if trimmed ~= '' and trimmed:sub(1, 1) ~= '#' then
-            local key, raw = trimmed:match('^([%a_][%w_]*)%s*=%s*(.*)$')
-
-            if not key then
-                error('Malformed entry in "' .. path .. '" on line ' .. number .. '. Expected "KEY=value".')
-            end
-
-            values[key] = cast(raw)
-        end
-    end
-
-    return values
-end
-
-local function seal(path, values)
-    return setmetatable({}, {
-        __index = function(_, key)
-            local value = values[key]
-
-            if value == nil then
-                error('"' .. tostring(key) .. '" is not declared in "' .. path .. '".', 2)
-            end
-
-            return value
-        end,
-
-        __newindex = function(_, key)
-            error('The environment is read-only and "' .. tostring(key) .. '" cannot be assigned.', 2)
-        end,
-
-        __metatable = false,
-    })
-end
-
-if localPlayer ~= nil then
-    return
-end
-
-Dotenv = {}
-Dotenv.__index = Dotenv
-
-function Dotenv.new(path)
-    path = path or DEFAULT_FILE
-
-    local content = read(path)
-
-    if not content then
-        error('Failed to read the environment file "' .. tostring(path) .. '".', 2)
-    end
-
-    local self = setmetatable({}, Dotenv)
-
-    self.path = path
-    self.values = parse(path, content)
-
-    return self
-end
-
-function Dotenv:get(key, default)
-    local value = self.values[key]
-
-    if value == nil then
-        return default
-    end
-
-    return value
-end
-
-function Dotenv:has(key)
-    return self.values[key] ~= nil
-end
-
-function Dotenv:all()
-    local copy = {}
-
-    for key, value in pairs(self.values) do
-        copy[key] = value
-    end
-
-    return copy
-end
-
-function Dotenv:apply()
-    if type(process) ~= 'table' then
-        process = {}
-    end
-
-    process.env = seal(self.path, self.values)
-    env = process.env
-
-    return process.env
-end