molex-env 0.3.1 → 0.3.3

package/src/lib/errors.js

@@ -1,98 +1,66 @@
-'use strict';
-
-/**
- * Base error type for molex-env.
- */
-class MenvError extends Error
-{
-    constructor(message, details)
-    {
-        super(message);
-        this.name = 'MenvError';
-        if (details)
-        {
-            this.details = details;
-        }
-    }
-}
-
-/**
- * Format a file/line suffix for error messages.
- * @param {string} file
- * @param {number} line
- * @returns {string}
- */
-function formatLocation(file, line)
-{
-    if (!file) return '';
-    if (!line) return ` (${file})`;
-    return ` (${file}:${line})`;
-}
-
-/**
- * Create an invalid line error.
- * @param {number} line
- * @param {string} rawLine
- * @param {string} file
- * @returns {MenvError}
- */
-function invalidLineError(line, rawLine, file)
-{
-    return new MenvError(`Invalid line ${line}: ${rawLine}${formatLocation(file)}`);
-}
-
-/**
- * Create an unknown key error.
- * @param {string} key
- * @param {string} file
- * @param {number} line
- * @returns {MenvError}
- */
-function unknownKeyError(key, file, line)
-{
-    return new MenvError(`Unknown key: ${key}${formatLocation(file, line)}`);
-}
-
-/**
- * Create a duplicate key error.
- * @param {string} key
- * @param {string} file
- * @param {number} line
- * @returns {MenvError}
- */
-function duplicateKeyError(key, file, line)
-{
-    return new MenvError(`Duplicate key: ${key}${formatLocation(file, line)}`);
-}
-
-/**
- * Create a missing required key error.
- * @param {string} key
- * @returns {MenvError}
- */
-function missingRequiredError(key)
-{
-    return new MenvError(`Missing required key: ${key}`);
-}
-
-/**
- * Create an invalid type error.
- * @param {string} type
- * @param {string} raw
- * @param {string} file
- * @param {number} line
- * @returns {MenvError}
- */
-function invalidTypeError(type, raw, file, line)
-{
-    return new MenvError(`Invalid ${type}: ${raw}${formatLocation(file, line)}`);
-}
-
-module.exports = {
-    MenvError,
-    invalidLineError,
-    unknownKeyError,
-    duplicateKeyError,
-    missingRequiredError,
-    invalidTypeError
-};
+'use strict';
+
+/**
+ * Base error type for molex-env.
+ */
+class MenvError extends Error
+{
+    constructor(message, details)
+    {
+        super(message);
+        this.name = 'MenvError';
+        if (details) this.details = details;
+    }
+}
+
+/**
+ * Format a file/line suffix for error messages.
+ * @param {string} file
+ * @param {number} line
+ * @returns {string}
+ */
+function formatLocation(file, line)
+{
+    if (!file) return '';
+    if (!line) return ` (${file})`;
+    return ` (${file}:${line})`;
+}
+
+/** @returns {MenvError} */
+function invalidLineError(line, rawLine, file)
+{
+    return new MenvError(`Invalid line ${line}: ${rawLine}${formatLocation(file)}`);
+}
+
+/** @returns {MenvError} */
+function unknownKeyError(key, file, line)
+{
+    return new MenvError(`Unknown key: ${key}${formatLocation(file, line)}`);
+}
+
+/** @returns {MenvError} */
+function duplicateKeyError(key, file, line)
+{
+    return new MenvError(`Duplicate key: ${key}${formatLocation(file, line)}`);
+}
+
+/** @returns {MenvError} */
+function missingRequiredError(key)
+{
+    return new MenvError(`Missing required key: ${key}`);
+}
+
+/** @returns {MenvError} */
+function invalidTypeError(type, raw, file, line)
+{
+    return new MenvError(`Invalid ${type}: ${raw}${formatLocation(file, line)}`);
+}
+
+module.exports = {
+    MenvError,
+    invalidLineError,
+    unknownKeyError,
+    duplicateKeyError,
+    missingRequiredError,
+    invalidTypeError,
+};

package/src/lib/files.js

@@ -1,36 +1,35 @@
-'use strict';
-
-const path = require('path');
-
-/**
- * Resolve .menv file paths based on options.
- * @param {{cwd?: string, files?: string[], profile?: string}} options
- * @returns {string[]}
- */
-function resolveFiles(options)
-{
-    const cwd = options.cwd || process.cwd();
-    if (Array.isArray(options.files) && options.files.length > 0)
-    {
-        return options.files.map((file) => (path.isAbsolute(file) ? file : path.join(cwd, file)));
-    }
-
-    const files = [
-        path.join(cwd, '.menv'),
-        path.join(cwd, '.menv.local')
-    ];
-
-    if (options.profile)
-    {
-        files.push(
-            path.join(cwd, `.menv.${options.profile}`),
-            path.join(cwd, `.menv.${options.profile}.local`)
-        );
-    }
-
-    return files;
-}
-
-module.exports = {
-    resolveFiles
-};
+'use strict';
+
+const path = require('path');
+
+/**
+ * Resolve .menv file paths based on options.
+ * @param {{cwd?: string, files?: string[], profile?: string}} options
+ * @returns {string[]}
+ */
+function resolveFiles(options = {})
+{
+    const cwd = options.cwd || process.cwd();
+
+    if (Array.isArray(options.files) && options.files.length > 0)
+    {
+        return options.files.map((f) => (path.isAbsolute(f) ? f : path.join(cwd, f)));
+    }
+
+    const files = [
+        path.join(cwd, '.menv'),
+        path.join(cwd, '.menv.local'),
+    ];
+
+    if (options.profile)
+    {
+        files.push(
+            path.join(cwd, `.menv.${options.profile}`),
+            path.join(cwd, `.menv.${options.profile}.local`),
+        );
+    }
+
+    return files;
+}
+
+module.exports = { resolveFiles };

package/src/lib/parser.js

@@ -1,115 +1,96 @@
-'use strict';
-
-const { invalidLineError } = require('./errors');
-
-/**
- * Strip inline comments while preserving quoted values.
- * @param {string} line
- * @returns {string}
- */
-function stripInlineComment(line)
-{
-    let inSingle = false;
-    let inDouble = false;
-    let escaped = false;
-    for (let i = 0; i < line.length; i += 1)
-    {
-        const ch = line[i];
-        if (escaped)
-        {
-            escaped = false;
-            continue;
-        }
-        if (ch === '\\')
-        {
-            escaped = true;
-            continue;
-        }
-        if (ch === '"' && !inSingle)
-        {
-            inDouble = !inDouble;
-            continue;
-        }
-        if (ch === "'" && !inDouble)
-        {
-            inSingle = !inSingle;
-            continue;
-        }
-        if (ch === '#' && !inSingle && !inDouble)
-        {
-            return line.slice(0, i);
-        }
-    }
-    return line;
-}
-
-/**
- * Remove wrapping quotes and unescape common sequences.
- * @param {string} value
- * @returns {string}
- */
-function stripQuotes(value)
-{
-    const trimmed = value.trim();
-    if (trimmed.length >= 2)
-    {
-        const first = trimmed[0];
-        const last = trimmed[trimmed.length - 1];
-        if ((first === '"' && last === '"') || (first === "'" && last === "'"))
-        {
-            return trimmed
-                .slice(1, -1)
-                .replace(/\\n/g, '\n')
-                .replace(/\\r/g, '\r')
-                .replace(/\\t/g, '\t')
-                .replace(/\\\\/g, '\\');
-        }
-    }
-    return trimmed;
-}
-
-/**
- * Parse raw text into key/value entries.
- * @param {string} text
- * @param {{strict?: boolean, filePath?: string}} options
- * @returns {{key: string, raw: string, line: number}[]}
- */
-function parseEntries(text, options)
-{
-    const strict = Boolean(options.strict);
-    const filePath = options.filePath;
-    const lines = text.split(/\r?\n/);
-    const entries = [];
-
-    for (let i = 0; i < lines.length; i += 1)
-    {
-        const rawLine = lines[i];
-        const cleaned = stripInlineComment(rawLine);
-        if (!cleaned.trim()) continue;
-
-        const match = cleaned.match(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)\s*$/);
-        if (!match)
-        {
-            if (strict)
-            {
-                throw invalidLineError(i + 1, rawLine, filePath);
-            }
-            continue;
-        }
-
-        const key = match[1];
-        const rawValue = stripQuotes(match[2] || '');
-
-        entries.push({
-            key,
-            raw: rawValue,
-            line: i + 1
-        });
-    }
-
-    return entries;
-}
-
-module.exports = {
-    parseEntries
-};
+'use strict';
+
+const { invalidLineError } = require('./errors');
+
+const KEY_VALUE_RE = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)\s*$/;
+
+/**
+ * Strip inline comments while preserving quoted values.
+ * @param {string} line
+ * @returns {string}
+ */
+function stripInlineComment(line)
+{
+    let inSingle = false;
+    let inDouble = false;
+    let escaped = false;
+
+    for (let i = 0; i < line.length; i += 1)
+    {
+        const ch = line[i];
+        if (escaped) { escaped = false; continue; }
+        if (ch === '\\') { escaped = true; continue; }
+        if (ch === '"' && !inSingle) { inDouble = !inDouble; continue; }
+        if (ch === "'" && !inDouble) { inSingle = !inSingle; continue; }
+        if (ch === '#' && !inSingle && !inDouble) return line.slice(0, i);
+    }
+
+    return line;
+}
+
+/**
+ * Remove wrapping quotes and unescape common sequences.
+ * @param {string} value
+ * @returns {string}
+ */
+function stripQuotes(value)
+{
+    const trimmed = value.trim();
+    if (trimmed.length < 2) return trimmed;
+
+    const first = trimmed[0];
+    const last = trimmed[trimmed.length - 1];
+    if ((first === '"' && last === '"') || (first === "'" && last === "'"))
+    {
+        return trimmed.slice(1, -1).replace(/\\(.)/g, (_, ch) =>
+        {
+            switch (ch)
+            {
+                case 'n': return '\n';
+                case 'r': return '\r';
+                case 't': return '\t';
+                case '\\': return '\\';
+                default: return ch;
+            }
+        });
+    }
+
+    return trimmed;
+}
+
+/**
+ * Parse raw text into key/value entries.
+ * @param {string} text
+ * @param {{strict?: boolean, filePath?: string}} options
+ * @returns {{key: string, raw: string, line: number}[]}
+ */
+function parseEntries(text, options = {})
+{
+    const { strict, filePath } = options;
+    const lines = text.split(/\r?\n/);
+    const entries = [];
+
+    for (let i = 0; i < lines.length; i += 1)
+    {
+        const rawLine = lines[i];
+        const cleaned = stripInlineComment(rawLine).trim();
+        if (!cleaned) continue;
+
+        const match = cleaned.match(KEY_VALUE_RE);
+        if (!match)
+        {
+            if (strict) throw invalidLineError(i + 1, rawLine, filePath);
+            continue;
+        }
+
+        entries.push({
+            key: match[1],
+            raw: stripQuotes(match[2] || ''),
+            line: i + 1,
+        });
+    }
+
+    return entries;
+}
+
+module.exports = { parseEntries };

package/src/lib/schema.js

@@ -1,59 +1,48 @@
-'use strict';
-
-const { missingRequiredError } = require('./errors');
-
-/**
- * Normalize schema definitions into objects.
- * @param {object} schema
- * @returns {object|null}
- */
-function normalizeSchema(schema)
-{
-    if (!schema) return null;
-    const normalized = {};
-    for (const key of Object.keys(schema))
-    {
-        const def = schema[key];
-        if (typeof def === 'string')
-        {
-            normalized[key] = { type: def };
-        } else if (def && typeof def === 'object')
-        {
-            normalized[key] = { ...def };
-        }
-    }
-    return normalized;
-}
-
-/**
- * Apply defaults and required checks from schema.
- * @param {object} values
- * @param {object} origins
- * @param {object|null} schema
- * @param {boolean} strict
- * @returns {void}
- */
-function applySchemaDefaults(values, origins, schema, strict)
-{
-    if (!schema) return;
-    for (const key of Object.keys(schema))
-    {
-        const def = schema[key];
-        if (values[key] === undefined)
-        {
-            if (def && Object.prototype.hasOwnProperty.call(def, 'default'))
-            {
-                values[key] = def.default;
-                origins[key] = { file: '<default>', line: 0, raw: undefined };
-            } else if (strict && def && def.required)
-            {
-                throw missingRequiredError(key);
-            }
-        }
-    }
-}
-
-module.exports = {
-    normalizeSchema,
-    applySchemaDefaults
-};
+'use strict';
+
+const { missingRequiredError } = require('./errors');
+
+/**
+ * Normalize schema definitions into consistent objects.
+ * @param {object} schema
+ * @returns {object|null}
+ */
+function normalizeSchema(schema)
+{
+    if (!schema) return null;
+    const normalized = {};
+    for (const key of Object.keys(schema))
+    {
+        const def = schema[key];
+        normalized[key] = typeof def === 'string' ? { type: def } : { ...def };
+    }
+    return normalized;
+}
+
+/**
+ * Apply defaults and enforce required keys from schema.
+ * @param {object} values
+ * @param {object} origins
+ * @param {object|null} schema
+ * @param {boolean} strict
+ */
+function applySchemaDefaults(values, origins, schema, strict)
+{
+    if (!schema) return;
+    for (const key of Object.keys(schema))
+    {
+        const def = schema[key];
+        if (values[key] !== undefined) continue;
+
+        if (def && Object.prototype.hasOwnProperty.call(def, 'default'))
+        {
+            values[key] = def.default;
+            origins[key] = { file: '<default>', line: 0, raw: undefined };
+        } else if (strict && def && def.required)
+        {
+            throw missingRequiredError(key);
+        }
+    }
+}
+
+module.exports = { normalizeSchema, applySchemaDefaults };

package/src/lib/utils.js

@@ -1,21 +1,19 @@
-'use strict';
-
-/**
- * Recursively freeze an object graph.
- * @param {object} obj
- * @returns {object}
- */
-function deepFreeze(obj)
-{
-    if (!obj || typeof obj !== 'object' || Object.isFrozen(obj)) return obj;
-    Object.freeze(obj);
-    for (const key of Object.keys(obj))
-    {
-        deepFreeze(obj[key]);
-    }
-    return obj;
-}
-
-module.exports = {
-    deepFreeze
-};
+'use strict';
+
+/**
+ * Recursively freeze an object graph.
+ * @param {object} obj
+ * @returns {object}
+ */
+function deepFreeze(obj)
+{
+    if (!obj || typeof obj !== 'object' || Object.isFrozen(obj)) return obj;
+    Object.freeze(obj);
+    for (const key of Object.keys(obj))
+    {
+        deepFreeze(obj[key]);
+    }
+    return obj;
+}
+
+module.exports = { deepFreeze };