@xlameiro/env-typegen 0.1.5 → 0.1.7

package/dist/index.cjs

@@ -164,7 +164,9 @@ var inferenceRules = [
   {
     id: "P10_url_scheme",
     priority: 10,
-    match: (_key, value) => /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(value),
+    // BUG-02: comma-separated URL lists (e.g. ALLOWED_ORIGINS) must NOT be inferred as
+    // a single URL — they don't pass z.string().url() or new URL() validation at runtime.
+    match: (_key, value) => !value.includes(",") && /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(value),
     type: "url"
   },
   {
@@ -250,6 +252,27 @@ function buildParsedVar(params, commentBlock, options) {
   }
   return parsedVar;
 }
+function deduplicateVars(vars) {
+  const seenKeys = /* @__PURE__ */ new Set();
+  const deduped = [];
+  const warnings = [];
+  for (let i = vars.length - 1; i >= 0; i--) {
+    const variable = vars[i];
+    if (variable === void 0) continue;
+    if (seenKeys.has(variable.key)) {
+      warnings.push({
+        code: "ENV_DUPLICATE_KEY",
+        message: `Duplicate key "${variable.key}" at line ${variable.lineNumber} \u2014 last occurrence wins.`,
+        line: variable.lineNumber,
+        key: variable.key
+      });
+    } else {
+      seenKeys.add(variable.key);
+      deduped.unshift(variable);
+    }
+  }
+  return { deduped, warnings };
+}
 function parseEnvFileContent(content, filePath, options) {
   const lines = content.split("\n");
   const vars = [];
@@ -292,7 +315,13 @@ function parseEnvFileContent(content, filePath, options) {
     );
     commentBlock = [];
   }
-  return { filePath, vars, groups };
+  const { deduped, warnings } = deduplicateVars(vars);
+  return {
+    filePath,
+    vars: deduped,
+    groups,
+    ...warnings.length > 0 && { warnings }
+  };
 }
 function parseEnvFile(filePath) {
   const content = fs.readFileSync(filePath, "utf8");
@@ -493,9 +522,9 @@ function generateT3Env(parsed) {
   return lines.join("\n") + "\n";
 }
 var CONTRACT_FILE_NAMES = [
-  "env.contract.ts",
   "env.contract.mjs",
-  "env.contract.js"
+  "env.contract.js",
+  "env.contract.ts"
 ];
 function defineContract(contract) {
   return contract;
@@ -504,6 +533,12 @@ async function loadContract(cwd = process.cwd()) {
   for (const name of CONTRACT_FILE_NAMES) {
     const filePath = path6__default.default.resolve(cwd, name);
     if (fs.existsSync(filePath)) {
+      if (filePath.endsWith(".ts")) {
+        throw new Error(
+          `Contract file ${filePath} is a TypeScript file and cannot be loaded at runtime by Node.js.
+Rename it to ${filePath.replace(/\.ts$/, ".mjs")} and use ESM syntax (export default ...), or run via \`tsx\` / \`ts-node\` as a loader.`
+        );
+      }
       const fileUrl = url.pathToFileURL(filePath).href;
       const mod = await import(fileUrl);
       return mod.default;
@@ -549,7 +584,8 @@ async function readEnvFile(filePath) {
     return await promises.readFile(resolved, "utf8");
   } catch (err) {
     if (err instanceof Error && err.code === "ENOENT") {
-      throw new Error(`File not found: ${filePath}`);
+      const displayPath = path6__default.default.isAbsolute(filePath) ? filePath : `${filePath} (resolved: ${resolved})`;
+      throw new Error(`File not found: ${displayPath}`);
     }
     throw err;
   }
@@ -586,7 +622,14 @@ function success(message) {
 
 // src/pipeline.ts
 function deriveOutputPath(base, generator, isSingle) {
-  if (isSingle) return base;
+  if (isSingle) {
+    if (generator === "declaration" && !base.endsWith(".d.ts")) {
+      const ext2 = path6__default.default.extname(base);
+      const noExt2 = ext2.length > 0 ? base.slice(0, -ext2.length) : base;
+      return `${noExt2}.d.ts`;
+    }
+    return base;
+  }
   const ext = path6__default.default.extname(base);
   const noExt = ext.length > 0 ? base.slice(0, -ext.length) : base;
   const baseExt = ext.length > 0 ? ext : ".ts";
@@ -596,7 +639,8 @@ function deriveOutputPath(base, generator, isSingle) {
 function deriveOutputBaseForInput(output, inputPath) {
   const dir = path6__default.default.dirname(output);
   const ext = path6__default.default.extname(output);
-  const stem = path6__default.default.basename(inputPath, path6__default.default.extname(inputPath));
+  const rawBasename = path6__default.default.basename(inputPath);
+  const stem = rawBasename.startsWith(".") ? rawBasename.slice(1).replaceAll(".", "-") : path6__default.default.basename(inputPath, path6__default.default.extname(inputPath));
   return path6__default.default.join(dir, `${stem}${ext}`);
 }
 function buildOutput(generator, parsed) {
@@ -633,6 +677,12 @@ async function persistOutput(params) {
     success(`Generated ${outputPath}`);
   }
 }
+function emitParserWarnings(parsed) {
+  if (parsed.warnings === void 0) return;
+  for (const w of parsed.warnings) {
+    warn(`[${w.code}] ${w.message}`);
+  }
+}
 async function runGenerate(options) {
   const {
     input,
@@ -655,6 +705,7 @@ async function runGenerate(options) {
       inputPath,
       inferenceRules2 === void 0 ? void 0 : { inferenceRules: inferenceRules2 }
     );
+    emitParserWarnings(parsed);
     for (const generator of generators) {
       let generated = buildOutput(generator, parsed);
       if (shouldFormat && !dryRun) {
@@ -731,7 +782,8 @@ function checkInvalidType(variable, entry, environment) {
       break;
     }
     case "boolean": {
-      if (value !== "true" && value !== "false") {
+      const lower = value.toLowerCase();
+      if (!["true", "false", "1", "0", "yes", "no"].includes(lower)) {
         return {
           code: "ENV_INVALID_TYPE",
           key: variable.key,
@@ -854,7 +906,8 @@ function validateContract(parsed, contract, opts = {}) {
   const parsedByKey = new Map(parsed.vars.map((v) => [v.key, v]));
   for (const entry of contract.vars) {
     if (!entry.required) continue;
-    if (parsedByKey.has(entry.name)) continue;
+    const existing = parsedByKey.get(entry.name);
+    if (existing !== void 0 && existing.rawValue !== "") continue;
     issues.push({
       code: "ENV_MISSING",
       key: entry.name,
@@ -956,6 +1009,11 @@ function outputHuman(result) {
 async function runCheck(opts) {
   const contract = await resolveContract(opts.contract, opts.cwd);
   const parsed = parseEnvFile(opts.input);
+  if (parsed.warnings !== void 0) {
+    for (const w of parsed.warnings) {
+      warn(`[${w.code}] ${w.message}`);
+    }
+  }
   const validatorOpts = {};
   if (opts.environment !== void 0) validatorOpts.environment = opts.environment;
   if (opts.strict !== void 0) validatorOpts.strict = opts.strict;
@@ -1040,7 +1098,8 @@ async function loadCloudSource(options) {
     raw = await promises.readFile(resolvedPath, "utf8");
   } catch (err) {
     if (err instanceof Error && err.code === "ENOENT") {
-      throw new Error(`File not found: ${options.filePath}`);
+      const displayPath = path6__default.default.isAbsolute(options.filePath) ? options.filePath : `${options.filePath} (resolved: ${resolvedPath})`;
+      throw new Error(`File not found: ${displayPath}`);
     }
     throw err;
   }
@@ -1048,7 +1107,7 @@ async function loadCloudSource(options) {
   return parseProviderPayload(options.provider, parsed);
 }
 var SECRET_KEY_RE = /(SECRET|TOKEN|PASSWORD|PRIVATE|API_KEY|ACCESS_KEY|CLIENT_SECRET)/i;
-var CONTRACT_FILE_NAMES2 = ["env.contract.ts", "env.contract.mjs", "env.contract.js"];
+var CONTRACT_FILE_NAMES2 = ["env.contract.mjs", "env.contract.js", "env.contract.ts"];
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1172,6 +1231,12 @@ async function loadValidationContract(options) {
   const discoveredContractPath = findDefaultContractPath(cwd);
   const resolvedContractPath = contractPath === void 0 ? discoveredContractPath : path6__default.default.resolve(cwd, contractPath);
   if (resolvedContractPath !== void 0 && fs.existsSync(resolvedContractPath)) {
+    if (resolvedContractPath.endsWith(".ts")) {
+      throw new Error(
+        `Contract file ${resolvedContractPath} is a TypeScript file and cannot be loaded at runtime by Node.js.
+Rename it to ${resolvedContractPath.replace(/\.ts$/, ".mjs")} and use ESM syntax (export default ...), or run via \`tsx\` / \`ts-node\` as a loader.`
+      );
+    }
     const moduleUrl = url.pathToFileURL(resolvedContractPath).href;
     const moduleValue = await import(moduleUrl);
     const candidate = moduleValue.default ?? moduleValue.contract;
@@ -1425,7 +1490,7 @@ function isClientSecret(variable, key) {
 function checkContractVariable(key, variable, context) {
   const { options, issues } = context;
   const value = options.values[key];
-  const hasValue = value !== void 0;
+  const hasValue = value !== void 0 && (value !== "" || !variable.required);
   if (variable.required && !hasValue) {
     issues.push(
       createIssue({
@@ -1527,7 +1592,11 @@ function diffTypeConflicts(key, present, context) {
   for (const entry of present) {
     typeBySource.set(entry.sourceName, detectReceivedType(entry.value ?? ""));
   }
-  if (new Set(typeBySource.values()).size <= 1) return;
+  const knownTypes = /* @__PURE__ */ new Set();
+  for (const t of typeBySource.values()) {
+    if (t !== "unknown") knownTypes.add(t);
+  }
+  if (knownTypes.size <= 1) return;
   for (const [sourceName, detectedType] of typeBySource.entries()) {
     issues.push(
       createIssue({
@@ -1694,6 +1763,7 @@ async function loadEnvSource(options) {
     return parseEnvSourceContent(content);
   } catch (error_) {
     if (options.allowMissing === true && error_ instanceof Error && "code" in error_ && error_.code === "ENOENT") {
+      warn(`Target file not found: ${options.filePath} \u2014 treating as empty`);
       return {};
     }
     throw error_;
@@ -1861,7 +1931,8 @@ async function loadCommandConfig(configPath) {
   }
   const resolvedPath = path6__default.default.resolve(configPath);
   if (!fs.existsSync(resolvedPath)) {
-    throw new Error(`Config file not found: ${configPath}`);
+    const displayPath = path6__default.default.isAbsolute(configPath) ? configPath : `${configPath} (resolved: ${resolvedPath})`;
+    throw new Error(`Config file not found: ${displayPath}`);
   }
   const configDir = path6__default.default.dirname(resolvedPath);
   const moduleValue = await import(url.pathToFileURL(resolvedPath).href);