jax-hono 1.0.19 → 1.0.21

package/build/generated-path.ts

@@ -1,20 +1,20 @@
-import { mkdirSync } from 'node:fs'
-import { cwd } from 'node:process'
-import { join, resolve } from 'node:path'
-
-export const packageDir = join(import.meta.dir, '..')
-export const projectDir = cwd()
-
-export function getGeneratedDir() {
-  const configuredDir = Bun.env.JAX_HONO_GENERATED_DIR
-
-  return configuredDir
-    ? resolve(projectDir, configuredDir)
-    : join(projectDir, '.jax-hono')
-}
-
-export const generatedDir = getGeneratedDir()
-
-export function ensureGeneratedDir() {
-  mkdirSync(generatedDir, { recursive: true })
-}
+import { mkdirSync } from 'node:fs'
+import { cwd } from 'node:process'
+import { join, resolve } from 'node:path'
+
+export const packageDir = join(import.meta.dir, '..')
+export const projectDir = cwd()
+
+export function getGeneratedDir() {
+  const configuredDir = Bun.env.JAX_HONO_GENERATED_DIR
+
+  return configuredDir
+    ? resolve(projectDir, configuredDir)
+    : join(projectDir, '.jax-hono')
+}
+
+export const generatedDir = getGeneratedDir()
+
+export function ensureGeneratedDir() {
+  mkdirSync(generatedDir, { recursive: true })
+}

package/config.ts

@@ -1,83 +1,86 @@
-import { existsSync } from 'node:fs';
-import { cwd } from 'node:process';
-import merge from 'deepmerge';
-import { config as loadDotenv } from 'dotenv';
-import minimist from 'minimist';
-import { requireGeneratedModule, type GeneratedProjectConfig } from './core/generated';
-import type { JaxConfig } from './types/config';
-
-type PlainConfig = Record<string, unknown>;
-type ProjectConfig = GeneratedProjectConfig;
-type ConfigModuleItem = {
-  name: string;
-  stage: string;
-  config: unknown;
-};
-export type { JaxConfig } from './types/config';
-export type Config = JaxConfig & ProjectConfig;
-
-const { configModules } = requireGeneratedModule<{ configModules: readonly ConfigModuleItem[] }>('config.ts');
-
-loadDotenvFile('.env');
-
-const argv = minimist(Bun.argv.slice(2), {
-  string: ['env'],
-  alias: {
-    env: 'e'
-  }
-});
-
-const env = argv.env || Bun.env.APP_ENV || Bun.env.NODE_ENV || 'prod';
-
-console.log('env', env);
-
-loadDotenvFile(`.env.${env}`);
-
-function loadDotenvFile(file: string) {
-  if (existsSync(file)) {
-    loadDotenv({ path: file, override: true });
-  }
-}
-
-function isPlainConfig(value: unknown): value is PlainConfig {
-  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
-}
-
-function shouldUseConfigStage(stage: string) {
-  return stage === 'base' || stage === 'default' || stage === env;
-}
-
-function parsePort(value: string | undefined) {
-  const port = Number(value);
-
-  return Number.isInteger(port) && port > 0 ? port : 3000;
-}
-
-export function loadConfig(): Config {
-  const jaxConfig: JaxConfig = {
-    rootDir: cwd(),
-    port: parsePort(Bun.env.PORT),
-    env
-  };
-
-  const configs = configModules
-    .filter((item) => shouldUseConfigStage(item.stage))
-    .map((item) => {
-      if (!isPlainConfig(item.config)) {
-        throw new TypeError(`Config file ${item.name} must export a plain object.`);
-      }
-
-      return item.config;
-    });
-
-  return merge.all<PlainConfig>([jaxConfig, ...configs], {
-    arrayMerge: (_destination, source) => source
-  }) as Config;
-}
-
-const config = loadConfig();
-
-console.log('port', config.port);
-
-export { env };
-export default config;
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import merge from 'deepmerge';
+import { config as loadDotenv } from 'dotenv';
+import minimist from 'minimist';
+import { getProjectDir, requireGeneratedModule, type GeneratedProjectConfig } from './core/generated';
+import type { JaxConfig } from './types/config';
+
+type PlainConfig = Record<string, unknown>;
+type ProjectConfig = GeneratedProjectConfig;
+type ConfigModuleItem = {
+  name: string;
+  stage: string;
+  config: unknown;
+};
+export type { JaxConfig } from './types/config';
+export type Config = JaxConfig & ProjectConfig;
+
+const { configModules } = requireGeneratedModule<{ configModules: readonly ConfigModuleItem[] }>('config.ts');
+const projectDir = getProjectDir();
+
+loadDotenvFile('.env');
+
+const argv = minimist(Bun.argv.slice(2), {
+  string: ['env'],
+  alias: {
+    env: 'e'
+  }
+});
+
+const env = argv.env || Bun.env.APP_ENV || Bun.env.NODE_ENV || 'prod';
+
+console.log('env', env);
+
+loadDotenvFile(`.env.${env}`);
+
+function loadDotenvFile(file: string) {
+  const path = join(projectDir, file);
+
+  if (existsSync(path)) {
+    loadDotenv({ path, override: true });
+  }
+}
+
+function isPlainConfig(value: unknown): value is PlainConfig {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+
+function shouldUseConfigStage(stage: string) {
+  return stage === 'base' || stage === 'default' || stage === env;
+}
+
+function parsePort(value: string | undefined) {
+  const port = Number(value);
+
+  return Number.isInteger(port) && port > 0 ? port : 3000;
+}
+
+export function loadConfig(): Config {
+  const jaxConfig: JaxConfig = {
+    rootDir: projectDir,
+    port: parsePort(Bun.env.PORT),
+    env
+  };
+
+  const configs = configModules
+    .filter((item) => shouldUseConfigStage(item.stage))
+    .map((item) => {
+      if (!isPlainConfig(item.config)) {
+        throw new TypeError(`Config file ${item.name} must export a plain object.`);
+      }
+
+      return item.config;
+    });
+
+  return merge.all<PlainConfig>([jaxConfig, ...configs], {
+    arrayMerge: (_destination, source) => source
+  }) as Config;
+}
+
+const config = loadConfig();
+
+console.log('port', config.port);
+
+export { env };
+export default config;