@danielfgray/pg-sourcerer 0.3.0 → 0.4.0

package/dist/index.js

@@ -4,13 +4,23 @@
  * Main entry point
  */
 // Config
-export { Config, TypeHint, TypeHintMatch } from "./config.js";
+export { Config, TypeHint, TypeHintMatch, } from "./config.js";
 // Config Loader Service
 export { ConfigLoaderService, ConfigLoaderLive, createConfigLoader, defineConfig, } from "./services/config-loader.js";
 // Config Service (Effect DI)
-export { ConfigService, ConfigFromFile, ConfigWithInit, ConfigTest, getConfigSearchPaths, } from "./services/config.js";
+export { 
+// Service tag
+ConfigService, FileConfigProvider, InMemoryConfigProvider, withFallback, 
+// Layer constructors
+ConfigFromFile, ConfigFromMemory, ConfigTest, ConfigWithFallback, 
+// Utilities
+getConfigSearchPaths, } from "./services/config.js";
 // Errors
 export * from "./errors.js";
+// User Module References
+export { userModule, isUserModuleRef } from "./user-module.js";
+// User Module Parser Service
+export { UserModuleParserService, UserModuleParserLive, createUserModuleParser, } from "./services/user-module-parser.js";
 // IR
 export { createIRBuilder, freezeIR, 
 // Type guards
@@ -20,58 +30,37 @@ getTableEntities, getEnumEntities, getDomainEntities, getCompositeEntities, getF
 export { SmartTags, ShapeKind } from "./ir/index.js";
 // IR Extensions - Contracts between providers
 export { EntityQueriesExtension as EntityQueriesExtensionSchema, FunctionsExtension as FunctionsExtensionSchema, } from "./ir/extensions/queries.js";
+// IR Extensions - Schema Builder Contract
+export { SCHEMA_BUILDER_KIND, } from "./ir/extensions/schema-builder.js";
 // Services - IR
 export { IR } from "./services/ir.js";
-// Services - Artifact Store
-export { ArtifactStore, createArtifactStore, ArtifactStoreLive } from "./services/artifact-store.js";
-// Services - Plugin Meta
-export { PluginMeta } from "./services/plugin-meta.js";
-// Services - Plugin Types (new plugin API)
-export { PluginNotFound, PluginCycle, PluginExecutionFailed, ResourceNotResolved, Plugins, PluginsLive, definePlugin, createPluginRegistry, } from "./services/plugin.js";
 // Services - Inflection
 export { Inflection, inflect, defaultInflection, defaultTransforms, createInflection, makeInflectionLayer, composeInflectionConfigs, composeInflection, InflectionLive, } from "./services/inflection.js";
 // Services - Type Hints
 export { TypeHints, createTypeHintRegistry, emptyTypeHintRegistry, TypeHintsLive, } from "./services/type-hints.js";
 // Services - PostgreSQL Type Mapping
 export { PgTypeOid, TsType, ExtensionTypeMap, defaultPgToTs, getExtensionTypeMapping, composeMappers, wrapArrayType, wrapNullable, findEnumByPgName, findCompositeByPgName, } from "./services/pg-types.js";
-// Services - Symbols
-export { Symbols, createSymbolRegistry, SymbolsLive, } from "./services/symbols.js";
-// Services - Service Registry (plugin-to-plugin communication)
-export { Services, createServiceRegistry, ServicesLive, } from "./services/service-registry.js";
-// Services - Emissions
-export { Emissions, createEmissionBuffer, EmissionsLive, } from "./services/emissions.js";
-// Services - Plugin Runner
-export { runPlugins, } from "./services/plugin-runner.js";
-// Services - File Writer
-export { FileWriterSvc, createFileWriter, FileWriterLive, } from "./services/file-writer.js";
-// Services - Smart Tags Parser
-export { parseSmartTags, } from "./services/smart-tags-parser.js";
-// Services - IR Builder
-export { IRBuilderSvc, IRBuilderLive, createIRBuilderService, } from "./services/ir-builder.js";
-// Testing utilities
-export { PluginTestLayers, createPluginTestLayer, } from "./testing.js";
-// Conjure - AST builder DSL
-export { conjure, cast, } from "./lib/conjure.js";
-// Hex - SQL query building primitives
-export { hex, buildTemplateLiteral, buildAwaitSqlTag, buildAwaitSqlString, buildQuery, buildFirstRowDecl, buildAllRowsDecl, buildReturnQuery, } from "./lib/hex.js";
-// Plugins (new API)
-export { typesPlugin, types } from "./plugins/types.js";
+// Services - File Assignment
+export { parseCapabilityInfo, } from "./runtime/file-assignment.js";
+// Runtime Emit
+export { emitFiles, } from "./runtime/emit.js";
+// =============================================================================
+// Plugins
+// =============================================================================
+export { typesPlugin } from "./plugins/types.js";
 export { zod } from "./plugins/zod.js";
 export { arktype } from "./plugins/arktype.js";
 export { valibot } from "./plugins/valibot.js";
-export { sqlQueries, sqlQueries as sqlQueriesPlugin } from "./plugins/sql-queries.js";
-// Effect plugin (unified model + repository + http)
-export { effect, effectPlugin } from "./plugins/effect.js";
-// Kysely plugin
+export { effect } from "./plugins/effect/index.js";
+export { express } from "./plugins/http-express.js";
+export { elysia } from "./plugins/http-elysia.js";
+export { hono } from "./plugins/http-hono.js";
 export { kysely } from "./plugins/kysely.js";
-// HTTP plugins (new API)
-export { httpElysia } from "./plugins/http-elysia.js";
-export { httpExpress } from "./plugins/http-express.js";
-export { httpHono } from "./plugins/http-hono.js";
-export { httpTrpc } from "./plugins/http-trpc.js";
-export { httpOrpc } from "./plugins/http-orpc.js";
-// Generate orchestration
-export { generate, runGenerate, GenerateLive, } from "./generate.js";
-// Database introspection
-export { DatabaseIntrospectionService, DatabaseIntrospectionLive, createDatabaseIntrospection, introspectDatabase, } from "./services/introspection.js";
+export { sqlQueries } from "./plugins/sql-queries.js";
+export { orpc } from "./plugins/http-orpc.js";
+export { trpc } from "./plugins/http-trpc.js";
+// =============================================================================
+// Testing Utilities
+// =============================================================================
+export { testIR, testIRWithEntities, testIRFromFixture, testConfig, testPlugin, testPluginEmit, } from "./testing.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAkB,MAAM,EAAkC,MAAM,QAAQ,CAAC;AAghBhF,eAAO,MAAM,OAAO;;qGA0DlB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAkB,MAAM,EAAkC,MAAM,QAAQ,CAAC;AA0chF,eAAO,MAAM,OAAO;;qGAoDlB,CAAC"}

package/dist/init.js

@@ -2,92 +2,72 @@
  * pg-sourcerer init command
  *
  * Interactive config generator using @effect/cli Prompt.
- * Uses conjure AST builder to generate the config file.
  */
 import { Prompt } from "@effect/cli";
 import { FileSystem } from "@effect/platform";
 import { Array, Console, Effect, HashMap, HashSet, Option, pipe } from "effect";
 import postgres from "postgres";
-import { conjure } from "./lib/conjure.js";
-import recast from "recast";
 import { introspectDatabase } from "./services/introspection.js";
-/** Maps plugin value to import name for config generation */
+import { conjure } from "./conjure/index.js";
+/** Maps plugin selection values to their import names from pg-sourcerer */
 const pluginImportNames = {
-    types: "types",
+    // Type generators
+    types: "typesPlugin",
     zod: "zod",
-    arktype: "arktypePlugin",
+    arktype: "arktype",
     effect: "effect",
+    valibot: "valibot",
+    // Kysely
+    "kysely-types": "kysely",
+    "kysely-queries": "kysely",
+    // SQL queries
     "sql-queries": "sqlQueries",
-    "kysely-types": "kyselyTypesPlugin",
-    "kysely-queries": "kyselyQueriesPlugin",
-    "http-elysia": "httpElysiaPlugin",
-    "http-trpc": "httpTrpcPlugin",
-    "http-orpc": "httpOrpcPlugin",
+    // HTTP frameworks
+    "http-elysia": "elysia",
+    "http-express": "express",
+    "http-hono": "hono",
+    "http-trpc": "trpc",
+    "http-orpc": "orpc",
 };
-/** Get plugin info by value */
 const getPluginInfo = (value) => {
     const importName = pluginImportNames[value];
     return importName ? { value, importName } : undefined;
 };
 const POSTGRES_URL_REGEX = /^postgres(ql)?:\/\//i;
-/**
- * Parse .env content into HashMap<string, string>
- * Handles: KEY=value, KEY="value", KEY='value', comments, empty lines
- */
-const parseDotEnv = (content) => pipe(content.split("\n"), Array.map(line => line.trim()), Array.filter(line => line.length > 0 && !line.startsWith("#")), Array.filterMap(line => {
+const parseDotEnv = (content) => pipe(content.split("\n"), Array.map((line) => line.trim()), Array.filter((line) => line.length > 0 && !line.startsWith("#")), Array.filterMap((line) => {
     const eqIndex = line.indexOf("=");
     if (eqIndex === -1)
         return Option.none();
     const key = line.slice(0, eqIndex).trim();
     let value = line.slice(eqIndex + 1).trim();
-    // Remove surrounding quotes
-    if ((value.startsWith('"') && value.endsWith('"')) ||
-        (value.startsWith("'") && value.endsWith("'"))) {
+    if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
         value = value.slice(1, -1);
     }
     return Option.some([key, value]);
 }), HashMap.fromIterable);
-/**
- * Filter entries matching postgres URL pattern
- */
-const filterPostgresUrls = (entries, source) => pipe(entries, HashMap.filter(value => POSTGRES_URL_REGEX.test(value)), HashMap.toEntries, Array.map(([key, value]) => ({ key, value, source })));
-/**
- * Get process.env as HashMap, excluding specified keys
- */
+const filterPostgresUrls = (entries, source) => pipe(entries, HashMap.filter((value) => POSTGRES_URL_REGEX.test(value)), HashMap.toEntries, Array.map(([key, value]) => ({ key, value, source })));
 const processEnvExcluding = (exclude) => pipe(Object.entries(process.env), Array.filter(([key, value]) => value != null && !HashSet.has(exclude, key)), Array.map(([key, value]) => [key, value]), HashMap.fromIterable);
-/**
- * Scan .env file and process.env for postgres connection strings.
- */
 const scanEnvForConnectionStrings = Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const envPath = `${process.cwd()}/.env`;
-    // Try to read .env file
-    const dotEnvMatches = yield* fs.readFileString(envPath).pipe(Effect.map(content => filterPostgresUrls(parseDotEnv(content), ".env")), Effect.catchAll(() => Effect.succeed([])));
-    // Scan process.env, excluding keys already found in .env
-    const dotEnvKeys = pipe(dotEnvMatches, Array.map(m => m.key), HashSet.fromIterable);
+    const dotEnvMatches = yield* fs.readFileString(envPath).pipe(Effect.map((content) => filterPostgresUrls(parseDotEnv(content), ".env")), Effect.catchAll(() => Effect.succeed([])));
+    const dotEnvKeys = pipe(dotEnvMatches, Array.map((m) => m.key), HashSet.fromIterable);
     const processEnvMatches = filterPostgresUrls(processEnvExcluding(dotEnvKeys), "process.env");
     return [...dotEnvMatches, ...processEnvMatches];
 });
-// ============================================================================
-// Prompts
-// ============================================================================
 const connectionStringPrompt = Prompt.text({
     message: "Database connection string",
-    validate: value => value.trim().length === 0
+    validate: (value) => value.trim().length === 0
         ? Effect.fail("Connection string is required")
         : Effect.succeed(value.trim()),
 });
-/**
- * Prompt for connection string and immediately test it.
- * Re-prompts on failure until successful.
- */
 const promptAndTestConnection = (defaultValue) => Effect.gen(function* () {
     const prompt = defaultValue
         ? Prompt.text({ message: "Database connection string", default: defaultValue })
         : connectionStringPrompt;
     const connStr = yield* prompt;
     yield* Console.log("Testing connection...");
-    const result = yield* testConnection(connStr).pipe(Effect.map(version => ({ success: true, version })), Effect.catchAll(e => Effect.succeed({ success: false, error: e.message })));
+    const result = yield* testConnection(connStr).pipe(Effect.map((version) => ({ success: true, version })), Effect.catchAll((e) => Effect.succeed({ success: false, error: e.message })));
     if (result.success) {
         yield* Console.log(`✓ Connected to ${result.version}\n`);
         return connStr;
@@ -95,22 +75,17 @@ const promptAndTestConnection = (defaultValue) => Effect.gen(function* () {
     else {
         yield* Console.error(`✗ ${result.error}`);
         yield* Console.log("Please try again.\n");
-        // On retry, use the failed value as the new default so user can edit it
         return yield* promptAndTestConnection(connStr);
     }
 });
-/**
- * Get connection string - either from detected env var or manual entry.
- */
 const getConnectionString = Effect.gen(function* () {
     const envMatches = yield* scanEnvForConnectionStrings;
-    // No matches → manual entry
     if (Array.isEmptyReadonlyArray(envMatches)) {
         const connectionString = yield* promptAndTestConnection();
         return { connectionString, configValue: connectionString, isEnvRef: false };
     }
     yield* Console.log(`Found ${envMatches.length} potential connection string${envMatches.length === 1 ? "" : "s"} in environment:\n`);
-    const choices = pipe(envMatches, Array.map(m => ({
+    const choices = pipe(envMatches, Array.map((m) => ({
         title: `${m.key} (${m.source})`,
         value: m.key,
     })), Array.append({ title: "Enter manually", value: "__manual__" }));
@@ -122,10 +97,9 @@ const getConnectionString = Effect.gen(function* () {
         const connectionString = yield* promptAndTestConnection();
         return { connectionString, configValue: connectionString, isEnvRef: false };
     }
-    // Find selected match and test connection
-    const match = pipe(envMatches, Array.findFirst(m => m.key === selected), Option.getOrThrow);
+    const match = pipe(envMatches, Array.findFirst((m) => m.key === selected), Option.getOrThrow);
     yield* Console.log(`\nTesting ${match.key}...`);
-    const testResult = yield* testConnection(match.value).pipe(Effect.map(version => ({ success: true, version })), Effect.catchAll(e => Effect.succeed({ success: false, error: e.message })));
+    const testResult = yield* testConnection(match.value).pipe(Effect.map((version) => ({ success: true, version })), Effect.catchAll((e) => Effect.succeed({ success: false, error: e.message })));
     if (testResult.success) {
         yield* Console.log(`✓ Connected to ${testResult.version}\n`);
         return {
@@ -134,25 +108,16 @@ const getConnectionString = Effect.gen(function* () {
             isEnvRef: true,
         };
     }
-    // Failed → fall back to manual with value as default
     yield* Console.error(`✗ ${testResult.error}`);
     yield* Console.log("Connection failed. Please enter manually.\n");
     const connectionString = yield* promptAndTestConnection(match.value);
     return { connectionString, configValue: connectionString, isEnvRef: false };
 });
-/**
- * Role prompt with explanation of when to use it.
- *
- * If using Row Level Security (RLS), set this to the role your app connects as.
- * This ensures generated types only include columns/tables visible to that role.
- * Leave empty if not using RLS or connecting as a superuser.
- */
 const makeRolePrompt = () => Prompt.text({
     message: "PostgreSQL role (for RLS - leave empty if not using RLS)",
     default: "",
-}).pipe(Prompt.map(s => s.trim() || undefined));
+}).pipe(Prompt.map((s) => s.trim() || undefined));
 const makeSchemasPrompt = (introspection) => {
-    // Group classes by schema and count tables/views
     const schemaCounts = new Map();
     for (const c of introspection.classes) {
         if (c.relkind !== "r" && c.relkind !== "v" && c.relkind !== "m")
@@ -162,7 +127,6 @@ const makeSchemasPrompt = (introspection) => {
             continue;
         schemaCounts.set(schema, (schemaCounts.get(schema) ?? 0) + 1);
     }
-    // Sort: public first, then by count desc
     const schemas = [...schemaCounts.entries()].sort((a, b) => {
         if (a[0] === "public")
             return -1;
@@ -171,16 +135,14 @@ const makeSchemasPrompt = (introspection) => {
         return b[1] - a[1];
     });
     if (schemas.length === 0) {
-        // Fallback to text prompt if no schemas found
         return Prompt.text({
             message: "Schemas to introspect (comma-separated)",
             default: "public",
-        }).pipe(Prompt.map(s => s
+        }).pipe(Prompt.map((s) => s
             .split(",")
-            .map(x => x.trim())
-            .filter(x => x.length > 0)));
+            .map((x) => x.trim())
+            .filter((x) => x.length > 0)));
     }
-    // Multi-select with table counts
     return Prompt.multiSelect({
         message: "Select schemas to introspect",
         choices: schemas.map(([name, count]) => ({
@@ -192,26 +154,14 @@ const makeSchemasPrompt = (introspection) => {
 };
 const makeOutputDirPrompt = () => Prompt.text({
     message: "Output directory",
-    default: "./generated",
+    default: "./src/generated",
 });
-/**
- * Plugin selection with Kysely-aware branching.
- *
- * Flow:
- * 1. Kysely? → yes: checkboxes for types + kysely-queries → HTTP plugins → exit
- * 2. No Kysely → raw types or schema-driven?
- * 3. If schema-driven → select schema lib (zod/arktype/effect)
- * 4. Query plugins (optional multiselect, currently just sql-queries)
- * 5. HTTP/RPC framework (optional)
- */
 const makePluginsPrompt = () => Effect.gen(function* () {
-    // Step 1: Kysely gateway
     const usesKysely = yield* Prompt.confirm({
         message: "Do you use Kysely?",
         initial: false,
     });
     if (usesKysely) {
-        // Kysely path: checkboxes, both pre-selected
         const kyselyPlugins = yield* Prompt.multiSelect({
             message: "Select Kysely plugins",
             choices: [
@@ -219,22 +169,25 @@ const makePluginsPrompt = () => Effect.gen(function* () {
                 { title: "kysely-queries - Query builders", value: "kysely-queries", selected: true },
             ],
         });
-        // Step 5: HTTP/RPC framework (only show if queries selected)
         const hasQueries = kyselyPlugins.includes("kysely-queries");
         if (hasQueries) {
-            const httpPlugins = yield* Prompt.multiSelect({
+            const httpPlugin = yield* Prompt.select({
                 message: "HTTP/RPC framework (optional, requires query plugin)",
                 choices: [
-                    { title: "Elysia routes", value: "http-elysia", selected: false },
-                    { title: "tRPC routers", value: "http-trpc", selected: false },
-                    { title: "oRPC routers", value: "http-orpc", selected: false },
+                    { title: "None", value: "" },
+                    { title: "Elysia routes", value: "http-elysia" },
+                    { title: "Express routes", value: "http-express" },
+                    { title: "Hono routes", value: "http-hono" },
+                    { title: "tRPC router", value: "http-trpc" },
+                    { title: "oRPC router", value: "http-orpc" },
                 ],
             });
-            return [...kyselyPlugins, ...httpPlugins];
+            return httpPlugin
+                ? [...kyselyPlugins, httpPlugin]
+                : kyselyPlugins;
         }
         return kyselyPlugins;
     }
-    // Step 2: Raw vs schema-driven
     const typeApproach = yield* Prompt.select({
         message: "How do you want your types generated?",
         choices: [
@@ -247,34 +200,36 @@ const makePluginsPrompt = () => Effect.gen(function* () {
         typePlugin = "types";
     }
     else {
-        // Step 3: Schema library selection
         typePlugin = yield* Prompt.select({
             message: "Select schema library",
             choices: [
                 { title: "Zod", value: "zod" },
                 { title: "ArkType", value: "arktype" },
-                { title: "Effect Schema (@effect/sql)", value: "effect" },
+                { title: "Effect Schema", value: "effect" },
             ],
         });
     }
-    // Step 4: Query plugins (optional multiselect, future-proof)
     const queryPlugins = yield* Prompt.multiSelect({
         message: "Query generation (optional)",
         choices: [
             { title: "sql-queries - Raw SQL query functions", value: "sql-queries", selected: false },
         ],
     });
-    // Step 5: HTTP/RPC framework (only show if queries selected)
     if (queryPlugins.length > 0) {
-        const httpPlugins = yield* Prompt.multiSelect({
+        const httpPlugin = yield* Prompt.select({
             message: "HTTP/RPC framework (optional)",
             choices: [
-                { title: "Elysia routes", value: "http-elysia", selected: false },
-                { title: "tRPC routers", value: "http-trpc", selected: false },
-                { title: "oRPC routers", value: "http-orpc", selected: false },
+                { title: "None", value: "" },
+                { title: "Elysia routes", value: "http-elysia" },
+                { title: "Express routes", value: "http-express" },
+                { title: "Hono routes", value: "http-hono" },
+                { title: "tRPC router", value: "http-trpc" },
+                { title: "oRPC router", value: "http-orpc" },
             ],
         });
-        return [typePlugin, ...queryPlugins, ...httpPlugins];
+        return httpPlugin
+            ? [typePlugin, ...queryPlugins, httpPlugin]
+            : [typePlugin, ...queryPlugins];
     }
     return [typePlugin, ...queryPlugins];
 });
@@ -282,16 +237,12 @@ const makeFormatterPrompt = () => Prompt.text({
     message: "Formatter command (optional, leave empty to skip)",
     default: "",
 });
-// ============================================================================
-// Connection Test
-// ============================================================================
 const testConnection = (connectionString) => Effect.tryPromise({
     try: async () => {
         const sql = postgres(connectionString, { max: 1 });
         try {
             const result = await sql `SELECT version()`;
             const version = result[0]?.["version"];
-            // Extract just the version number (e.g., "PostgreSQL 15.2")
             const match = version.match(/PostgreSQL [\d.]+/);
             return match?.[0] ?? "PostgreSQL";
         }
@@ -299,68 +250,60 @@ const testConnection = (connectionString) => Effect.tryPromise({
             await sql.end();
         }
     },
-    catch: error => new Error(`Connection failed: ${error instanceof Error ? error.message : String(error)}`),
+    catch: (error) => new Error(`Connection failed: ${error instanceof Error ? error.message : String(error)}`),
 });
 const generateConfigContent = (answers) => {
-    // Look up import names for selected plugins
-    const selectedPlugins = pipe(answers.plugins, Array.filterMap(value => {
+    // Get unique plugin imports (dedupe e.g., kysely-types + kysely-queries -> single kysely import)
+    const selectedPlugins = pipe(answers.plugins, Array.filterMap((value) => {
         const info = getPluginInfo(value);
         return info ? Option.some(info) : Option.none();
     }));
-    // Build import specifiers
-    const coreImports = ["defineConfig"];
-    const allImports = [...coreImports, ...selectedPlugins.map(p => p.importName)];
-    // Build the import statement
-    const importDecl = conjure.b.importDeclaration(allImports.map(name => conjure.b.importSpecifier(conjure.b.identifier(name))), conjure.str("@danielfgray/pg-sourcerer"));
-    // Build the config object - handle env ref vs literal
+    // Deduplicate by import name (keep first occurrence)
+    const uniqueImports = pipe(selectedPlugins, Array.dedupeWith((a, b) => a.importName === b.importName));
+    const allImportNames = ["defineConfig", ...uniqueImports.map((p) => p.importName)];
+    // Build import declaration: import { defineConfig, plugin1, plugin2 } from "@danielfgray/pg-sourcerer"
+    const importDecl = conjure.import.named("@danielfgray/pg-sourcerer", ...allImportNames);
+    // Build config object
     let configObj = conjure.obj();
+    // connectionString - either env ref or literal
     if (answers.isEnvRef) {
-        // Generate: connectionString: process.env.DATABASE_URL!
         const envKey = answers.connectionConfigValue.replace("process.env.", "");
-        const envAccess = conjure.b.memberExpression(conjure.b.memberExpression(conjure.b.identifier("process"), conjure.b.identifier("env")), conjure.b.identifier(envKey));
-        // Add non-null assertion (!)
-        const envAccessWithAssertion = conjure.b.tsNonNullExpression(envAccess);
-        configObj = configObj.prop("connectionString", envAccessWithAssertion);
+        // process.env.VAR!
+        configObj = configObj.prop("connectionString", conjure.nonNull(conjure.id("process").prop("env").prop(envKey).build()));
     }
     else {
         configObj = configObj.prop("connectionString", conjure.str(answers.connectionConfigValue));
     }
-    // Role (only if set)
+    // role (optional)
     if (answers.role) {
         configObj = configObj.prop("role", conjure.str(answers.role));
     }
-    // Schemas (only if not just ["public"])
+    // schemas (only if not default ["public"])
     if (answers.schemas.length !== 1 || answers.schemas[0] !== "public") {
-        const schemasArr = conjure.arr(...answers.schemas.map(s => conjure.str(s)));
-        configObj = configObj.prop("schemas", schemasArr.build());
+        configObj = configObj.prop("schemas", conjure.arr(...answers.schemas.map((s) => conjure.str(s))).build());
     }
-    // Output directory (only if not default)
+    // outputDir (only if not default)
     if (answers.outputDir !== "src/generated") {
         configObj = configObj.prop("outputDir", conjure.str(answers.outputDir));
     }
-    // Formatter (only if set)
+    // formatter (optional)
     if (answers.formatter.trim()) {
         configObj = configObj.prop("formatter", conjure.str(answers.formatter.trim()));
     }
-    // Plugins array - no config needed, all plugins have sensible defaults
-    const pluginCalls = selectedPlugins.map(p => conjure.id(p.importName).call([]).build());
-    const pluginsArr = conjure.arr(...pluginCalls);
-    configObj = configObj.prop("plugins", pluginsArr.build());
-    // Build the export default statement
+    // plugins array: [plugin1(), plugin2(), ...]
+    const pluginCalls = uniqueImports.map((p) => conjure.id(p.importName).call().build());
+    configObj = configObj.prop("plugins", conjure.arr(...pluginCalls).build());
+    // Build: export default defineConfig({ ... })
     const defineConfigCall = conjure.id("defineConfig").call([configObj.build()]).build();
     const exportDefault = conjure.export.default(defineConfigCall);
-    // Build the program and print with 2-space indentation
+    // Create program and print
     const program = conjure.program(importDecl, exportDefault);
-    return recast.print(program, { tabWidth: 2 }).code + "\n";
+    return conjure.print(program) + "\n";
 };
-// ============================================================================
-// Main Init Effect
-// ============================================================================
 const CONFIG_FILENAME = "pgsourcerer.config.ts";
 export const runInit = Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const configPath = `${process.cwd()}/${CONFIG_FILENAME}`;
-    // Check if config already exists
     const exists = yield* fs.exists(configPath);
     if (exists) {
         yield* Console.error(`\n✗ ${CONFIG_FILENAME} already exists`);
@@ -368,20 +311,14 @@ export const runInit = Effect.gen(function* () {
         return yield* Effect.fail(new Error("Config already exists"));
     }
     yield* Console.log("\n🔧 pg-sourcerer config generator\n");
-    // Collect answers - connection string may be detected from env
     const { connectionString, configValue, isEnvRef } = yield* getConnectionString;
-    // Introspect to discover schemas
     yield* Console.log("Introspecting database...");
-    const introspection = yield* introspectDatabase({ connectionString }).pipe(Effect.catchAll(e => {
-        // Log error but continue with empty introspection for fallback text prompt
-        return Console.error(`Warning: ${e.message}`).pipe(Effect.andThen(Effect.succeed({ classes: [] })));
-    }));
+    const introspection = yield* introspectDatabase({ connectionString }).pipe(Effect.catchAll((e) => Console.error(`Warning: ${e.message}`).pipe(Effect.andThen(Effect.succeed({ classes: [] })))));
     const role = yield* makeRolePrompt();
     const schemas = yield* makeSchemasPrompt(introspection);
     const outputDir = yield* makeOutputDirPrompt();
     const plugins = yield* makePluginsPrompt();
     const formatter = yield* makeFormatterPrompt();
-    // Validate at least one plugin selected
     if (plugins.length === 0) {
         yield* Console.error("✗ At least one plugin must be selected");
         return yield* Effect.fail(new Error("No plugins selected"));
@@ -396,7 +333,6 @@ export const runInit = Effect.gen(function* () {
         plugins,
         formatter,
     };
-    // Generate and write config
     const configContent = generateConfigContent(answers);
     yield* fs.writeFileString(configPath, configContent);
     yield* Console.log(`\n✓ Created ${CONFIG_FILENAME}`);