@xlameiro/env-typegen 0.1.7 → 0.1.9

package/dist/index.d.cts

@@ -210,21 +210,21 @@ declare function generateEnvValidation(parsed: ParsedEnvFile): string;
  * import { z } from "zod";
  *
  * export const serverEnvSchema = z.object({
- *   DATABASE_URL: z.string().url(),
+ *   DATABASE_URL: z.url(),
  *   PORT: z.coerce.number(),
  * });
  *
  * export const clientEnvSchema = z.object({
- *   NEXT_PUBLIC_API_URL: z.string().url(),
+ *   NEXT_PUBLIC_API_URL: z.url(),
  * });
  *
- * export const envSchema = serverEnvSchema.merge(clientEnvSchema);
+ * export const envSchema = z.object({ ...serverEnvSchema.shape, ...clientEnvSchema.shape });
  * export type Env = z.infer<typeof envSchema>;
  * ```
  *
  * - Server-side vars (non-`NEXT_PUBLIC_`) go into `serverEnvSchema`
  * - Client-side vars (`NEXT_PUBLIC_` prefix) go into `clientEnvSchema`
- * - `envSchema` is the merged union of both, for full-stack validation
+ * - `envSchema` merges both shapes via object spread to avoid deprecated `.merge()`
  * - `annotatedType` takes precedence over `inferredType` when both are set
  * - Optional vars have `.optional()` appended to their Zod expression
  */
@@ -666,7 +666,7 @@ type EnvTypegenConfig = {
 declare function defineConfig(config: EnvTypegenConfig): EnvTypegenConfig;
 /**
  * Loads env-typegen config by searching for a config file in `cwd`.
- * Searches for env-typegen.config.ts → .mjs → .js in order.
+ * Searches for env-typegen.config.mjs → .js in order.
  * Returns `undefined` when no config file is found.
  */
 declare function loadConfig(cwd?: string): Promise<EnvTypegenConfig | undefined>;

package/dist/index.d.ts

@@ -210,21 +210,21 @@ declare function generateEnvValidation(parsed: ParsedEnvFile): string;
  * import { z } from "zod";
  *
  * export const serverEnvSchema = z.object({
- *   DATABASE_URL: z.string().url(),
+ *   DATABASE_URL: z.url(),
  *   PORT: z.coerce.number(),
  * });
  *
  * export const clientEnvSchema = z.object({
- *   NEXT_PUBLIC_API_URL: z.string().url(),
+ *   NEXT_PUBLIC_API_URL: z.url(),
  * });
  *
- * export const envSchema = serverEnvSchema.merge(clientEnvSchema);
+ * export const envSchema = z.object({ ...serverEnvSchema.shape, ...clientEnvSchema.shape });
  * export type Env = z.infer<typeof envSchema>;
  * ```
  *
  * - Server-side vars (non-`NEXT_PUBLIC_`) go into `serverEnvSchema`
  * - Client-side vars (`NEXT_PUBLIC_` prefix) go into `clientEnvSchema`
- * - `envSchema` is the merged union of both, for full-stack validation
+ * - `envSchema` merges both shapes via object spread to avoid deprecated `.merge()`
  * - `annotatedType` takes precedence over `inferredType` when both are set
  * - Optional vars have `.optional()` appended to their Zod expression
  */
@@ -666,7 +666,7 @@ type EnvTypegenConfig = {
 declare function defineConfig(config: EnvTypegenConfig): EnvTypegenConfig;
 /**
  * Loads env-typegen config by searching for a config file in `cwd`.
- * Searches for env-typegen.config.ts → .mjs → .js in order.
+ * Searches for env-typegen.config.mjs → .js in order.
  * Returns `undefined` when no config file is found.
  */
 declare function loadConfig(cwd?: string): Promise<EnvTypegenConfig | undefined>;

package/dist/index.js

@@ -400,8 +400,8 @@ function generateEnvValidation(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) {
@@ -428,7 +428,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";
@@ -467,8 +470,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) {
@@ -539,11 +542,7 @@ Rename it to ${filePath.replace(/\.ts$/, ".mjs")} and use ESM syntax (export def
   }
   return void 0;
 }
-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"];
 function defineConfig(config) {
   return config;
 }
@@ -551,19 +550,6 @@ async function loadConfig(cwd = process.cwd()) {
   for (const name of CONFIG_FILE_NAMES) {
     const filePath = path6.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;
@@ -1840,7 +1826,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)",
@@ -1864,7 +1850,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)",
@@ -1997,7 +1983,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 = path6.resolve(target);
+    if (existsSync(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);
@@ -2082,8 +2119,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);
   }
@@ -2137,8 +2179,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);
   }
@@ -2160,10 +2207,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 }