Change local config to js or ts files to support env variables

Author: eriicafes

cli/index.ts

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+import "dotenv/config"
+
 import { createProgram } from "commandstruct"
 import { Database } from "~/core/database"
 import { dbCmd } from "./db"

core/entrypoint.ts

@@ -2,7 +2,7 @@ import { glob } from "glob"
 import { createJiti } from "jiti"
 import { Database } from "monarch-orm"
 import path from "node:path"
-import { localProjectSchema, projectSchema, type Project } from "./models"
+import { projectSchema, type Project } from "./models/project"
 
 export type DirTree = { [k: string]: string | DirTree }
 
@@ -12,11 +12,19 @@ export class Entrypoint {
   public async getProject(
     projects: Record<string, Project> | undefined,
   ): Promise<Project | undefined> {
-    const configPath = path.resolve("monarch.config.json")
-    const config = await this.import(configPath).catch(() => undefined)
-    if (config) return localProjectSchema.safeParse(config).data
-    const project = projects?.[process.cwd()]
-    if (project) return projectSchema.safeParse(project).data
+    const localProject = await this.import(path.resolve("monarch.config"), {
+      default: true,
+    }).catch(() => undefined)
+    const project = localProject ?? projects?.[process.cwd()]
+    const parsed = projectSchema.safeParse(project).data
+    // @ts-expect-error local is an internal option
+    if (parsed && localProject) parsed.local = true
+    return parsed
+  }
+
+  public isLocalProject(project: Project) {
+    // @ts-expect-error local is an internal option
+    return !!project.local
   }
 
   public async getDatabaseExport(relpath: string, identifier: string) {

core/models.ts

@@ -0,0 +1,15 @@
+import { z, ZodType } from "zod"
+
+export interface Project {
+  file: string
+  export: string
+  dbname: string
+  dbs: Record<string, string>
+}
+
+export const projectSchema = z.object({
+  file: z.string(),
+  export: z.string(),
+  dbname: z.string(),
+  dbs: z.record(z.string()),
+}) satisfies ZodType<Project>

core/models/project.ts

@@ -0,0 +1,20 @@
+import type { Project } from "~/core/models/project"
+
+type ConfigOptions = {
+  file: string
+  export: string
+  dbname?: string
+  dburl: string
+}
+
+export function defineConfig(config: ConfigOptions): Project {
+  const dbname = config.dbname ?? "Local"
+  return {
+    file: config.file,
+    export: config.export,
+    dbname,
+    dbs: { [dbname]: config.dburl },
+  }
+}
+
+export type { Project }

lib/config.ts

@@ -2,17 +2,25 @@
   "name": "monarch-kit",
   "version": "0.1.0",
   "description": "Development kit for Monarch ORM",
+  "private": false,
   "type": "module",
   "bin": {
     "monarch": "./dist/index.js"
   },
+  "exports": {
+    "./config": {
+      "types": "./dist/config.d.ts",
+      "default": "./dist/config.js"
+    }
+  },
   "scripts": {
     "cli:build": "tsup cli/index.ts --clean --format esm",
     "cli:dev": "tsx cli/index.ts",
+    "lib:build": "tsup lib/config.ts --dts --format esm",
     "ui:build": "react-router build",
     "ui:dev": "react-router dev --port 6543",
     "ui:preview": "react-router-serve ./dist/ui/server/index.js",
-    "build": "npm run cli:build && npm run ui:build",
+    "build": "npm run cli:build && npm run lib:build && npm run ui:build",
     "start": "node dist/index.js",
     "release": "npm run build && changeset publish",
     "check": "npm run lint && npm run format && react-router typegen && tsc",
@@ -47,6 +55,7 @@
   "dependencies": {
     "@clack/prompts": "^0.10.0",
     "@radix-ui/react-checkbox": "^1.1.4",
+    "@radix-ui/react-collapsible": "^1.1.3",
     "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-dropdown-menu": "^2.1.6",
     "@radix-ui/react-menubar": "^1.1.6",
@@ -56,11 +65,13 @@
     "@react-router/express": "^7.2.0",
     "@react-router/node": "^7.2.0",
     "@react-router/serve": "^7.2.0",
+    "@tanstack/react-table": "^8.21.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "1.0.0",
     "commandstruct": "^0.3.1",
     "compression": "^1.8.0",
+    "dotenv": "^16.4.7",
     "express": "^4.21.2",
     "glob": "^11.0.1",
     "hollywood-di": "^0.6.1",