@aamini/lib 0.0.11 → 0.0.13

package/dist/env.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.mts","names":[],"sources":["../src/env.ts"],"mappings":";KAEK,SAAA;EACJ,KAAA,CAAM,KAAA,YAAiB,CAAA;AAAA;AAAA,iBAGR,SAAA,kBAAA,CAA4B,MAAA,EAAQ,SAAA,CAAU,CAAA,IAAK,CAAA"}
+{"version":3,"file":"env.d.mts","names":[],"sources":["../src/env.ts"],"mappings":";KAEK,SAAA;EACJ,KAAA,CAAM,KAAA,YAAiB,CAAA;AAAA;AAAA,iBAOR,SAAA,kBAAA,CAA4B,MAAA,EAAQ,SAAA,CAAU,CAAA,IAAK,CAAA"}

package/dist/env.mjs

@@ -1,5 +1,8 @@
 import { config } from "dotenv";
 //#region src/env.ts
+function isUsableEnvValue(value) {
+	return value !== void 0 && value.trim() !== "";
+}
 function createEnv(schema) {
 	const raw = process.env.RAILWAY_ENVIRONMENT_NAME ?? (process.env.NODE_ENV === "production" ? "production" : "development");
 	const environmentName = /(?:^|-)pr-\d+$/.test(raw) ? "staging" : raw;
@@ -18,8 +21,9 @@ function createEnv(schema) {
 	let parsed;
 	function parseEnv() {
 		if (parsed !== void 0) return parsed;
-		const env = { ...fileEnvironment };
-		for (const [key, value] of Object.entries(process.env)) if (value !== void 0) env[key] = value;
+		const env = {};
+		for (const [key, value] of Object.entries(fileEnvironment)) if (isUsableEnvValue(value)) env[key] = value;
+		for (const [key, value] of Object.entries(process.env)) if (isUsableEnvValue(value)) env[key] = value;
 		parsed = schema.parse(env);
 		return parsed;
 	}

package/dist/env.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"env.mjs","names":[],"sources":["../src/env.ts"],"sourcesContent":["import { config } from 'dotenv'\n\ntype EnvSchema<T extends object> = {\n\tparse(input: unknown): T\n}\n\nexport function createEnv<T extends object>(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\tlet parsed: T | undefined\n\n\tfunction parseEnv() {\n\t\tif (parsed !== undefined) return parsed\n\n\t\tconst env: NodeJS.ProcessEnv = { ...fileEnvironment }\n\n\t\tfor (const [key, value] of Object.entries(process.env)) {\n\t\t\tif (value !== undefined) env[key] = value\n\t\t}\n\n\t\tparsed = schema.parse(env)\n\t\treturn parsed\n\t}\n\n\treturn new Proxy({} as Record<PropertyKey, unknown>, {\n\t\tget(_target, property, receiver) {\n\t\t\treturn Reflect.get(parseEnv() as object, property, receiver)\n\t\t},\n\t\thas(_target, property) {\n\t\t\treturn property in (parseEnv() as object)\n\t\t},\n\t\townKeys() {\n\t\t\treturn Reflect.ownKeys(parseEnv() as object)\n\t\t},\n\t\tgetOwnPropertyDescriptor(_target, property) {\n\t\t\treturn Object.getOwnPropertyDescriptor(parseEnv() as object, property)\n\t\t},\n\t}) as T\n}\n"],"mappings":";;AAMA,SAAgB,UAA4B,QAAyB;CACpE,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,IAAI;CAEJ,SAAS,WAAW;EACnB,IAAI,WAAW,KAAA,GAAW,OAAO;EAEjC,MAAM,MAAyB,EAAE,GAAG,iBAAiB;EAErD,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,QAAQ,IAAI,EACrD,IAAI,UAAU,KAAA,GAAW,IAAI,OAAO;EAGrC,SAAS,OAAO,MAAM,IAAI;EAC1B,OAAO;;CAGR,OAAO,IAAI,MAAM,EAAE,EAAkC;EACpD,IAAI,SAAS,UAAU,UAAU;GAChC,OAAO,QAAQ,IAAI,UAAU,EAAY,UAAU,SAAS;;EAE7D,IAAI,SAAS,UAAU;GACtB,OAAO,YAAa,UAAU;;EAE/B,UAAU;GACT,OAAO,QAAQ,QAAQ,UAAU,CAAW;;EAE7C,yBAAyB,SAAS,UAAU;GAC3C,OAAO,OAAO,yBAAyB,UAAU,EAAY,SAAS;;EAEvE,CAAC"}
+{"version":3,"file":"env.mjs","names":[],"sources":["../src/env.ts"],"sourcesContent":["import { config } from 'dotenv'\n\ntype EnvSchema<T extends object> = {\n\tparse(input: unknown): T\n}\n\nfunction isUsableEnvValue(value: string | undefined): value is string {\n\treturn value !== undefined && value.trim() !== ''\n}\n\nexport function createEnv<T extends object>(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\tlet parsed: T | undefined\n\n\tfunction parseEnv() {\n\t\tif (parsed !== undefined) return parsed\n\n\t\tconst env: NodeJS.ProcessEnv = {}\n\n\t\tfor (const [key, value] of Object.entries(fileEnvironment)) {\n\t\t\tif (isUsableEnvValue(value)) env[key] = value\n\t\t}\n\n\t\tfor (const [key, value] of Object.entries(process.env)) {\n\t\t\tif (isUsableEnvValue(value)) env[key] = value\n\t\t}\n\n\t\tparsed = schema.parse(env)\n\t\treturn parsed\n\t}\n\n\treturn new Proxy({} as Record<PropertyKey, unknown>, {\n\t\tget(_target, property, receiver) {\n\t\t\treturn Reflect.get(parseEnv() as object, property, receiver)\n\t\t},\n\t\thas(_target, property) {\n\t\t\treturn property in (parseEnv() as object)\n\t\t},\n\t\townKeys() {\n\t\t\treturn Reflect.ownKeys(parseEnv() as object)\n\t\t},\n\t\tgetOwnPropertyDescriptor(_target, property) {\n\t\t\treturn Object.getOwnPropertyDescriptor(parseEnv() as object, property)\n\t\t},\n\t}) as T\n}\n"],"mappings":";;AAMA,SAAS,iBAAiB,OAA4C;CACrE,OAAO,UAAU,KAAA,KAAa,MAAM,MAAM,KAAK;;AAGhD,SAAgB,UAA4B,QAAyB;CACpE,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,IAAI;CAEJ,SAAS,WAAW;EACnB,IAAI,WAAW,KAAA,GAAW,OAAO;EAEjC,MAAM,MAAyB,EAAE;EAEjC,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,gBAAgB,EACzD,IAAI,iBAAiB,MAAM,EAAE,IAAI,OAAO;EAGzC,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,QAAQ,IAAI,EACrD,IAAI,iBAAiB,MAAM,EAAE,IAAI,OAAO;EAGzC,SAAS,OAAO,MAAM,IAAI;EAC1B,OAAO;;CAGR,OAAO,IAAI,MAAM,EAAE,EAAkC;EACpD,IAAI,SAAS,UAAU,UAAU;GAChC,OAAO,QAAQ,IAAI,UAAU,EAAY,UAAU,SAAS;;EAE7D,IAAI,SAAS,UAAU;GACtB,OAAO,YAAa,UAAU;;EAE/B,UAAU;GACT,OAAO,QAAQ,QAAQ,UAAU,CAAW;;EAE7C,yBAAyB,SAAS,UAAU;GAC3C,OAAO,OAAO,yBAAyB,UAAU,EAAY,SAAS;;EAEvE,CAAC"}

package/package.json

@@ -1,14 +1,17 @@
 {
 	"name": "@aamini/lib",
-	"version": "0.0.11",
+	"version": "0.0.13",
 	"private": false,
 	"type": "module",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/aamini11/toolkit",
+		"url": "https://github.com/aria-amini/toolkit",
 		"directory": "packages/lib"
 	},
-	"homepage": "https://github.com/aamini11/toolkit/tree/main/packages/lib#readme",
+	"bugs": {
+		"url": "https://github.com/aria-amini/toolkit/issues"
+	},
+	"homepage": "https://github.com/aria-amini/toolkit/tree/main/packages/lib#readme",
 	"publishConfig": {
 		"access": "public"
 	},

package/src/env.test.ts

@@ -79,4 +79,17 @@ describe.sequential('createEnv', () => {
 		expect(() => env).not.toThrow()
 		expect(() => env.DATABASE_URL).toThrow(/expected string/)
 	})
+
+	it('ignores empty dotenv values', () => {
+		delete process.env.DATABASE_URL
+		writeFileSync(join(tempDir, '.env.production'), 'DATABASE_URL=\n')
+
+		const env = createEnv(
+			z.object({
+				DATABASE_URL: z.string(),
+			}),
+		)
+
+		expect(() => env.DATABASE_URL).toThrow(/expected string/)
+	})
 })

package/src/env.ts

@@ -4,6 +4,10 @@ type EnvSchema<T extends object> = {
 	parse(input: unknown): T
 }
 
+function isUsableEnvValue(value: string | undefined): value is string {
+	return value !== undefined && value.trim() !== ''
+}
+
 export function createEnv<T extends object>(schema: EnvSchema<T>): T {
 	const raw =
 		process.env.RAILWAY_ENVIRONMENT_NAME ??
@@ -28,10 +32,14 @@ export function createEnv<T extends object>(schema: EnvSchema<T>): T {
 	function parseEnv() {
 		if (parsed !== undefined) return parsed
 
-		const env: NodeJS.ProcessEnv = { ...fileEnvironment }
+		const env: NodeJS.ProcessEnv = {}
+
+		for (const [key, value] of Object.entries(fileEnvironment)) {
+			if (isUsableEnvValue(value)) env[key] = value
+		}
 
 		for (const [key, value] of Object.entries(process.env)) {
-			if (value !== undefined) env[key] = value
+			if (isUsableEnvValue(value)) env[key] = value
 		}
 
 		parsed = schema.parse(env)