@xlameiro/env-typegen 0.1.7 → 0.1.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.1.9
+
+### Patch Changes
+
+- ddf2ea1: ## Fuzzy Dancers Find — env-typegen QA deficiency fixes (D1-D12)
+
+## 0.1.8
+
+### Patch Changes
+
+- c339449: ## Fuzzy Dancers Find — env-typegen QA deficiency fixes (D1-D12)
+
 ## 0.1.7
 
 ### Patch Changes

package/dist/cli.js

@@ -109,28 +109,11 @@ import { inspect, parseArgs as parseArgs2 } from "util";
 import { existsSync } from "fs";
 import path from "path";
 import { pathToFileURL } from "url";
-var CONFIG_FILE_NAMES = [
-  "env-typegen.config.mjs",
-  "env-typegen.config.js",
-  "env-typegen.config.ts"
-];
+var CONFIG_FILE_NAMES = ["env-typegen.config.mjs", "env-typegen.config.js"];
 async function loadConfig(cwd = process.cwd()) {
   for (const name of CONFIG_FILE_NAMES) {
     const filePath = path.resolve(cwd, name);
     if (existsSync(filePath)) {
-      if (filePath.endsWith(".ts")) {
-        throw new Error(
-          `Config file "${name}" was found but TypeScript files cannot be loaded directly at runtime.
-Rename it to "env-typegen.config.mjs" and use ESM export syntax:
-
-  // env-typegen.config.mjs
-  import { defineConfig } from "@xlameiro/env-typegen";
-  export default defineConfig({ input: ".env.example" });
-
-Tip: keep env-typegen.config.ts for IDE autocompletion and create a sibling
-env-typegen.config.mjs for runtime loading.`
-        );
-      }
       const fileUrl = pathToFileURL(filePath).href;
       const mod = await import(fileUrl);
       return mod.default;
@@ -178,8 +161,8 @@ function escapeJsStringLiteral(value) {
 function toT3ZodType(envVarType) {
   if (envVarType === "number") return "z.coerce.number()";
   if (envVarType === "boolean") return "z.coerce.boolean()";
-  if (envVarType === "url") return "z.string().url()";
-  if (envVarType === "email") return "z.string().email()";
+  if (envVarType === "url") return "z.url()";
+  if (envVarType === "email") return "z.email()";
   return "z.string()";
 }
 function buildZodExpr(variable) {
@@ -284,8 +267,8 @@ function generateTypeScriptTypes(parsed) {
 function toZodType(envVarType) {
   if (envVarType === "number") return "z.coerce.number()";
   if (envVarType === "boolean") return "z.coerce.boolean()";
-  if (envVarType === "url") return "z.string().url()";
-  if (envVarType === "email") return "z.string().email()";
+  if (envVarType === "url") return "z.url()";
+  if (envVarType === "email") return "z.email()";
   return "z.string()";
 }
 function generateZodSchema(parsed) {
@@ -312,7 +295,10 @@ function generateZodSchema(parsed) {
   lines.push(
     "});",
     "",
-    "export const envSchema = serverEnvSchema.merge(clientEnvSchema);",
+    "export const envSchema = z.object({",
+    "  ...serverEnvSchema.shape,",
+    "  ...clientEnvSchema.shape,",
+    "});",
     "export type Env = z.infer<typeof envSchema>;"
   );
   return lines.join("\n") + "\n";
@@ -1636,7 +1622,7 @@ var HELP_TEXT = {
     "Usage: env-typegen diff [options]",
     "",
     "Options:",
-    "  --targets <list>          Comma-separated targets (default: .env,.env.example,.env.production)",
+    "  --targets <list>          Comma-separated targets (default: .env,.env.production)",
     "  --contract <path>         Contract file path (default: env.contract.ts)",
     "  --example <path>          Fallback .env.example used to bootstrap contract",
     "  --strict                  Validate extras as errors (default: true)",
@@ -1660,7 +1646,7 @@ var HELP_TEXT = {
     "",
     "Options:",
     "  --env <path>              Environment file to validate (default: .env)",
-    "  --targets <list>          Comma-separated targets for drift analysis",
+    "  --targets <list>          Comma-separated targets for drift analysis (default: .env,.env.production)",
     "  --contract <path>         Contract file path (default: env.contract.ts)",
     "  --example <path>          Fallback .env.example used to bootstrap contract",
     "  --strict                  Validate extras as errors (default: true)",
@@ -1793,7 +1779,58 @@ function parseTargets(values, fileConfig) {
   if (fileConfig?.diffTargets !== void 0 && fileConfig.diffTargets.length > 0) {
     return fileConfig.diffTargets;
   }
-  return [".env", ".env.example", ".env.production"];
+  return [".env", ".env.production"];
+}
+function splitExistingAndMissingTargets(targets) {
+  const existingTargets = [];
+  const missingTargets = [];
+  for (const target of targets) {
+    const resolvedTarget = path11.resolve(target);
+    if (existsSync4(resolvedTarget)) {
+      existingTargets.push(target);
+      continue;
+    }
+    missingTargets.push(target);
+  }
+  return { existingTargets, missingTargets };
+}
+function buildMissingTargetIssue(target, missingCount) {
+  const suffix = missingCount === 1 ? "" : "s";
+  return {
+    code: "ENV_MISSING",
+    type: "missing",
+    severity: "error",
+    key: "*",
+    environment: target,
+    message: `Target file ${target} was not found; treating as empty (${missingCount} missing variable${suffix}).`,
+    value: null
+  };
+}
+function summarizeDoctorMissingTargetIssues(report, missingTargets) {
+  if (missingTargets.length === 0) return report;
+  const missingTargetSet = new Set(missingTargets);
+  const retainedIssues = report.issues.filter(
+    (issue) => !(issue.code === "ENV_MISSING" && missingTargetSet.has(issue.environment))
+  );
+  const groupedIssues = missingTargets.map((target) => {
+    const missingCount = report.issues.filter(
+      (issue) => issue.code === "ENV_MISSING" && issue.environment === target
+    ).length;
+    return buildMissingTargetIssue(target, missingCount);
+  });
+  const issues = [...retainedIssues, ...groupedIssues];
+  const errors = issues.filter((issue) => issue.severity === "error").length;
+  const warnings = issues.filter((issue) => issue.severity === "warning").length;
+  return {
+    ...report,
+    status: errors > 0 ? "fail" : "ok",
+    issues,
+    summary: {
+      errors,
+      warnings,
+      total: issues.length
+    }
+  };
 }
 async function prepareCommonContext(values) {
   const fileConfig = await loadCommandConfig(values.config);
@@ -1878,8 +1915,13 @@ async function runDiffCommand(args) {
     await loadValidationContract(loadContractOptions),
     context.plugins
   );
+  const targets = parseTargets(args.values, context.fileConfig);
+  const { existingTargets, missingTargets } = splitExistingAndMissingTargets(targets);
+  for (const missingTarget of missingTargets) {
+    warn(`Target file not found: ${missingTarget} \u2014 treating as empty`);
+  }
   const sources = {};
-  for (const target of parseTargets(args.values, context.fileConfig)) {
+  for (const target of existingTargets) {
     const values = await loadEnvSource({ filePath: target, allowMissing: true });
     sources[target] = applySourcePlugins({ environment: target, values }, context.plugins);
   }
@@ -1933,8 +1975,13 @@ async function runDoctorCommand(args) {
     strict: context.strict,
     debugValues: context.debugValues
   });
+  const targets = parseTargets(args.values, context.fileConfig);
+  const { existingTargets, missingTargets } = splitExistingAndMissingTargets(targets);
+  for (const missingTarget of missingTargets) {
+    warn(`Target file not found: ${missingTarget} \u2014 treating as empty`);
+  }
   const sources = {};
-  for (const target of parseTargets(args.values, context.fileConfig)) {
+  for (const target of existingTargets) {
     const values = await loadEnvSource({ filePath: target, allowMissing: true });
     sources[target] = applySourcePlugins({ environment: target, values }, context.plugins);
   }
@@ -1956,10 +2003,9 @@ async function runDoctorCommand(args) {
     strict: context.strict,
     debugValues: context.debugValues
   });
-  const report = applyReportPlugins(
-    buildDoctorReport({ checkReport, diffReport }),
-    context.plugins
-  );
+  const rawReport = buildDoctorReport({ checkReport, diffReport });
+  const summarizedReport = summarizeDoctorMissingTargetIssues(rawReport, missingTargets);
+  const report = applyReportPlugins(summarizedReport, context.plugins);
   return emitAndReturnExitCode(report, {
     jsonMode: args.jsonMode,
     ...context.outputFile !== void 0 && { outputFile: context.outputFile }
@@ -2085,9 +2131,11 @@ var HELP_TEXT2 = [
   "  -h, --help                 Show this help",
   "",
   "Config file:",
-  "  Auto-discovered in order: env-typegen.config.mjs \u2192 .js \u2192 .ts (in cwd)",
+  "  Auto-discovered in order: env-typegen.config.mjs \u2192 .js (in cwd)",
   "  CLI flags always override config file values.",
   "  Use defineConfig() from @xlameiro/env-typegen for IDE autocompletion.",
+  "  Note: with multiple --input values, --output basename is ignored;",
+  "        outputs are named from each input file stem.",
   "",
   "Exit codes:",
   "  0  Success \u2014 files generated without errors",
@@ -2157,17 +2205,50 @@ async function loadExplicitConfig(configPath, userPath) {
   const rawConfig = mod.default;
   return rawConfig ? applyConfigPaths2(rawConfig, configDir) : void 0;
 }
-async function runCli(argv = process.argv.slice(2)) {
+function findAutoDiscoveredConfigPath(cwd) {
+  for (const configName of CONFIG_FILE_NAMES) {
+    const resolvedPath = path13.resolve(cwd, configName);
+    if (existsSync6(resolvedPath)) {
+      return resolvedPath;
+    }
+  }
+  return void 0;
+}
+function parseGenerateAlias(argv) {
   if (argv[0] === "generate") {
-    argv = argv.slice(1);
+    return argv.slice(1);
   }
+  return argv;
+}
+async function maybeRunValidationSubcommand(argv) {
   const maybeSubcommand = argv[0];
-  if (maybeSubcommand !== void 0 && VALIDATION_SUBCOMMANDS.has(maybeSubcommand)) {
-    await runValidationSubcommand(maybeSubcommand, argv.slice(1));
+  if (maybeSubcommand === void 0 || !VALIDATION_SUBCOMMANDS.has(maybeSubcommand)) {
+    return false;
+  }
+  await runValidationSubcommand(maybeSubcommand, argv.slice(1));
+  return true;
+}
+async function loadCliConfig(values) {
+  if (values.config !== void 0) {
+    return loadExplicitConfig(path13.resolve(values.config), values.config);
+  }
+  const cwd = process.cwd();
+  const fileConfig = await loadConfig(cwd);
+  if (fileConfig !== void 0) {
+    const autoConfigPath = findAutoDiscoveredConfigPath(cwd);
+    if (autoConfigPath !== void 0) {
+      log(`Using config: ${autoConfigPath}`);
+    }
+  }
+  return fileConfig;
+}
+async function runCli(argv = process.argv.slice(2)) {
+  const normalizedArgv = parseGenerateAlias(argv);
+  if (await maybeRunValidationSubcommand(normalizedArgv)) {
     return;
   }
   const { values } = parseArgs2({
-    args: argv,
+    args: normalizedArgv,
     options: {
       input: { type: "string", short: "i", multiple: true },
       output: { type: "string", short: "o" },
@@ -2191,16 +2272,11 @@ async function runCli(argv = process.argv.slice(2)) {
     console.log(HELP_TEXT2);
     return;
   }
-  let fileConfig;
-  if (values.config === void 0) {
-    fileConfig = await loadConfig(process.cwd());
-  } else {
-    fileConfig = await loadExplicitConfig(path13.resolve(values.config), values.config);
-  }
+  const fileConfig = await loadCliConfig(values);
   const cliInput = values.input?.length ? values.input : void 0;
   const input = cliInput ?? fileConfig?.input;
   if (input === void 0) {
-    error("No input file specified. Use -i <path> or set input in env-typegen.config.ts");
+    error("No input file specified. Use -i <path> or set input in env-typegen.config.mjs");
     process.exit(1);
   }
   const output = values.output ?? fileConfig?.output ?? "env.generated.ts";