@aamini/lib 0.0.8 → 0.0.10

package/dist/env.d.mts

@@ -1,7 +1,8 @@
-import { z } from "zod";
-
 //#region src/env.d.ts
-declare function createEnv<T extends z.ZodTypeAny>(schema: T): z.infer<T>;
+type EnvSchema<T> = {
+  parse(input: unknown): T;
+};
+declare function createEnv<T>(schema: EnvSchema<T>): T;
 //#endregion
 export { createEnv };
 //# sourceMappingURL=env.d.mts.map

package/dist/env.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.mts","names":[],"sources":["../src/env.ts"],"mappings":";;;iBAGgB,SAAA,WAAoB,CAAA,CAAE,UAAA,CAAA,CAAY,MAAA,EAAQ,CAAA,GAAI,CAAA,CAAE,KAAA,CAAM,CAAA"}
+{"version":3,"file":"env.d.mts","names":[],"sources":["../src/env.ts"],"mappings":";KAEK,SAAA;EACJ,KAAA,CAAM,KAAA,YAAiB,CAAA;AAAA;AAAA,iBAGR,SAAA,GAAA,CAAa,MAAA,EAAQ,SAAA,CAAU,CAAA,IAAK,CAAA"}

package/dist/env.mjs

@@ -15,8 +15,9 @@ function createEnv(schema) {
 		override: true,
 		processEnv: fileEnvironment
 	});
-	for (const [key, value] of Object.entries(fileEnvironment)) process.env[key] ??= value;
-	return schema.parse(process.env);
+	const env = { ...fileEnvironment };
+	for (const [key, value] of Object.entries(process.env)) if (value !== void 0) env[key] = value;
+	return schema.parse(env);
 }
 //#endregion
 export { createEnv };

package/dist/env.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"env.mjs","names":[],"sources":["../src/env.ts"],"sourcesContent":["import { config } from 'dotenv'\nimport { z } from 'zod'\n\nexport function createEnv<T extends z.ZodTypeAny>(schema: T): z.infer<T> {\n\tconst raw =\n\t\tprocess.env.RAILWAY_ENVIRONMENT_NAME ??\n\t\t(process.env.NODE_ENV === 'production' ? 'production' : 'development')\n\tconst environmentName = /(?:^|-)pr-\\d+$/.test(raw) ? 'staging' : raw\n\tconst fileEnvironment: NodeJS.ProcessEnv = {}\n\n\tconfig({\n\t\tpath: [\n\t\t\t'.env',\n\t\t\t'.env.local',\n\t\t\t`.env.${environmentName}`,\n\t\t\t`.env.${environmentName}.local`,\n\t\t],\n\t\tquiet: true,\n\t\toverride: true,\n\t\tprocessEnv: fileEnvironment,\n\t})\n\n\tfor (const [key, value] of Object.entries(fileEnvironment)) {\n\t\tprocess.env[key] ??= value\n\t}\n\n\treturn schema.parse(process.env)\n}\n"],"mappings":";;AAGA,SAAgB,UAAkC,QAAuB;CACxE,MAAM,MACL,QAAQ,IAAI,6BACX,QAAQ,IAAI,aAAa,eAAe,eAAe;CACzD,MAAM,kBAAkB,iBAAiB,KAAK,IAAI,GAAG,YAAY;CACjE,MAAM,kBAAqC,EAAE;CAE7C,OAAO;EACN,MAAM;GACL;GACA;GACA,QAAQ;GACR,QAAQ,gBAAgB;GACxB;EACD,OAAO;EACP,UAAU;EACV,YAAY;EACZ,CAAC;CAEF,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,gBAAgB,EACzD,QAAQ,IAAI,SAAS;CAGtB,OAAO,OAAO,MAAM,QAAQ,IAAI"}
+{"version":3,"file":"env.mjs","names":[],"sources":["../src/env.ts"],"sourcesContent":["import { config } from 'dotenv'\n\ntype EnvSchema<T> = {\n\tparse(input: unknown): T\n}\n\nexport function createEnv<T>(schema: EnvSchema<T>): T {\n\tconst raw =\n\t\tprocess.env.RAILWAY_ENVIRONMENT_NAME ??\n\t\t(process.env.NODE_ENV === 'production' ? 'production' : 'development')\n\tconst environmentName = /(?:^|-)pr-\\d+$/.test(raw) ? 'staging' : raw\n\tconst fileEnvironment: NodeJS.ProcessEnv = {}\n\n\tconfig({\n\t\tpath: [\n\t\t\t'.env',\n\t\t\t'.env.local',\n\t\t\t`.env.${environmentName}`,\n\t\t\t`.env.${environmentName}.local`,\n\t\t],\n\t\tquiet: true,\n\t\toverride: true,\n\t\tprocessEnv: fileEnvironment,\n\t})\n\n\tconst env: NodeJS.ProcessEnv = { ...fileEnvironment }\n\n\tfor (const [key, value] of Object.entries(process.env)) {\n\t\tif (value !== undefined) env[key] = value\n\t}\n\n\treturn schema.parse(env)\n}\n"],"mappings":";;AAMA,SAAgB,UAAa,QAAyB;CACrD,MAAM,MACL,QAAQ,IAAI,6BACX,QAAQ,IAAI,aAAa,eAAe,eAAe;CACzD,MAAM,kBAAkB,iBAAiB,KAAK,IAAI,GAAG,YAAY;CACjE,MAAM,kBAAqC,EAAE;CAE7C,OAAO;EACN,MAAM;GACL;GACA;GACA,QAAQ;GACR,QAAQ,gBAAgB;GACxB;EACD,OAAO;EACP,UAAU;EACV,YAAY;EACZ,CAAC;CAEF,MAAM,MAAyB,EAAE,GAAG,iBAAiB;CAErD,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,QAAQ,IAAI,EACrD,IAAI,UAAU,KAAA,GAAW,IAAI,OAAO;CAGrC,OAAO,OAAO,MAAM,IAAI"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aamini/lib",
-	"version": "0.0.8",
+	"version": "0.0.10",
 	"private": false,
 	"type": "module",
 	"repository": {
@@ -30,6 +30,7 @@
 	},
 	"scripts": {
 		"build": "vp pack",
+		"bump": "npm version patch --no-git-tag-version",
 		"pack": "vp pack",
 		"prepare": "vp pack",
 		"prepublishOnly": "vp pack",
@@ -41,6 +42,7 @@
 	},
 	"devDependencies": {
 		"@aamini/config": "workspace:*",
+		"vitest": "catalog:",
 		"typescript": "6.0.2"
 	}
 }

package/src/env.test.ts

@@ -0,0 +1,43 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { z } from 'zod'
+import { createEnv } from './env.js'
+
+describe.sequential('createEnv', () => {
+	const cwd = process.cwd()
+	const originalDatabaseUrl = process.env.DATABASE_URL
+	const originalRailwayEnvironmentName = process.env.RAILWAY_ENVIRONMENT_NAME
+	let tempDir = ''
+
+	beforeEach(() => {
+		tempDir = mkdtempSync(join(tmpdir(), 'aamini-lib-env-'))
+		process.chdir(tempDir)
+		writeFileSync(join(tempDir, '.env'), 'DATABASE_URL=postgres://from-file\n')
+		process.env.RAILWAY_ENVIRONMENT_NAME = 'production'
+		process.env.DATABASE_URL = 'postgres://from-railway'
+	})
+
+	afterEach(() => {
+		process.chdir(cwd)
+		if (originalDatabaseUrl === undefined) delete process.env.DATABASE_URL
+		else process.env.DATABASE_URL = originalDatabaseUrl
+		if (originalRailwayEnvironmentName === undefined)
+			delete process.env.RAILWAY_ENVIRONMENT_NAME
+		else process.env.RAILWAY_ENVIRONMENT_NAME = originalRailwayEnvironmentName
+		if (tempDir) rmSync(tempDir, { recursive: true, force: true })
+	})
+
+	it('keeps injected env values ahead of dotenv files', () => {
+		const env = createEnv(
+			z.object({
+				DATABASE_URL: z.string(),
+			}),
+		)
+
+		expect(env.DATABASE_URL).toBe('postgres://from-railway')
+		expect(process.env.DATABASE_URL).toBe('postgres://from-railway')
+		expect(readFileSync(join(tempDir, '.env'), 'utf8')).toContain('from-file')
+	})
+})

package/src/env.ts

@@ -1,7 +1,10 @@
 import { config } from 'dotenv'
-import { z } from 'zod'
 
-export function createEnv<T extends z.ZodTypeAny>(schema: T): z.infer<T> {
+type EnvSchema<T> = {
+	parse(input: unknown): T
+}
+
+export function createEnv<T>(schema: EnvSchema<T>): T {
 	const raw =
 		process.env.RAILWAY_ENVIRONMENT_NAME ??
 		(process.env.NODE_ENV === 'production' ? 'production' : 'development')
@@ -20,9 +23,11 @@ export function createEnv<T extends z.ZodTypeAny>(schema: T): z.infer<T> {
 		processEnv: fileEnvironment,
 	})
 
-	for (const [key, value] of Object.entries(fileEnvironment)) {
-		process.env[key] ??= value
+	const env: NodeJS.ProcessEnv = { ...fileEnvironment }
+
+	for (const [key, value] of Object.entries(process.env)) {
+		if (value !== undefined) env[key] = value
 	}
 
-	return schema.parse(process.env)
+	return schema.parse(env)
 }