@danielfgray/pg-sourcerer 0.3.0 → 0.4.0

package/dist/cli.d.ts

@@ -1,3 +1,2 @@
-#!/usr/bin/env bun
 export {};
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.js

@@ -1,24 +1,13 @@
-#!/usr/bin/env bun
 /**
  * pg-sourcerer CLI
- *
- * Command-line interface for code generation from PostgreSQL schema.
- *
- * Log verbosity is controlled via the built-in --log-level flag:
- *   --log-level debug   Show detailed output (table names, file paths)
- *   --log-level info    Default - show progress messages
- *   --log-level none    Suppress all output except errors
  */
 import { Command, Options } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
 import { Console, Effect, Option } from "effect";
 import { runGenerate } from "./generate.js";
 import { runInit } from "./init.js";
-import { ConfigWithInit } from "./services/config.js";
+import { ConfigWithFallback, FileConfigProvider } from "./services/config.js";
 import packageJson from "../package.json" with { type: "json" };
-// ============================================================================
-// Options
-// ============================================================================
 const configPath = Options.file("config").pipe(Options.withAlias("c"), Options.withDescription("Path to config file"), Options.optional);
 const outputDir = Options.directory("output").pipe(Options.withAlias("o"), Options.withDescription("Override output directory"), Options.optional);
 const dryRun = Options.boolean("dry-run").pipe(Options.withAlias("n"), Options.withDescription("Show what would be generated without writing files"), Options.withDefault(false));
@@ -33,49 +22,21 @@ const runGenerateCommand = (args) => {
         const suffix = args.dryRun ? " (dry run)" : "";
         return Console.log(`\n✓ Generated ${args.dryRun ? total : written} files${suffix}`);
     };
-    // Build config layer based on whether explicit path was provided
     const configOpts = {
         configPath: Option.getOrUndefined(args.configPath),
     };
-    // Use ConfigWithInit - if no config found, it runs interactive prompts
-    const configLayer = ConfigWithInit(configOpts);
-    return runGenerate(opts).pipe(Effect.provide(configLayer), Effect.tap(logSuccess), 
-    // Handle errors with extra details
-    Effect.catchTags({
-        ConfigInvalid: (error) => logErrorWithDetails(error, error.errors),
-        PluginCycle: (error) => Console.error(`\n✗ Error: ${error._tag}`).pipe(Effect.andThen(Console.error(`  ${error.message}`)), Effect.andThen(Console.error(`  Cycle: ${error.cycle.join(" → ")}`)), Effect.andThen(Effect.fail(error))),
-    }), 
-    // Generic fallback for remaining tagged errors (GenerateError types)
-    Effect.catchAll((error) => {
-        // Handle tagged errors with _tag property
-        if (error && typeof error === "object" && "_tag" in error) {
-            const taggedError = error;
-            return Console.error(`\n✗ Error: ${taggedError._tag}`).pipe(Effect.andThen(Console.error(`  ${taggedError.message ?? String(error)}`)), Effect.andThen(Effect.fail(error)));
-        }
-        // Plain errors (e.g., from init prompts)
-        return Console.error(`\n✗ Error: ${error instanceof Error ? error.message : String(error)}`).pipe(Effect.andThen(Effect.fail(error)));
+    const configLayer = ConfigWithFallback(FileConfigProvider(configOpts), () => FileConfigProvider(configOpts));
+    return runGenerate(opts).pipe(Effect.provide(configLayer), Effect.tap(logSuccess), Effect.catchTags({
+        ConfigNotFound: () => Console.log("No config file found. Running init...").pipe(Effect.zipRight(runInit), Effect.tap(() => Console.log("\nRun 'pgsourcerer' again to generate code."))),
+        ConfigInvalid: error => Effect.forEach(error.errors, e => Console.error(`  - ${e}`)),
     }));
 };
-/** Log an error with a list of detail messages */
-const logErrorWithDetails = (error, details) => Console.error(`\n✗ Error: ${error._tag}`).pipe(Effect.andThen(Console.error(`  ${error.message}`)), Effect.andThen(Effect.forEach(details, e => Console.error(`    - ${e}`))), Effect.andThen(Effect.fail(error)));
-// ============================================================================
-// Commands
-// ============================================================================
 const generateCommand = Command.make("generate", { configPath, outputDir, dryRun }, runGenerateCommand);
-/**
- * Init command - just runs prompts and writes config file.
- * Does NOT run generate afterwards (user runs that separately).
- */
-const initCommand = Command.make("init", {}, () => runInit.pipe(Effect.tap(() => Console.log("\nRun 'pgsourcerer' to generate code.")), Effect.asVoid));
-// Root command runs generate by default (which triggers init if no config)
+const initCommand = Command.make("init", {}, () => runInit.pipe(Effect.tap(() => Console.log("\nRun 'pgsourcerer' to generate code."))));
 const rootCommand = Command.make("pgsourcerer", { configPath, outputDir, dryRun }, runGenerateCommand).pipe(Command.withSubcommands([generateCommand, initCommand]));
-// ============================================================================
-// CLI App
-// ============================================================================
 const cli = Command.run(rootCommand, {
     name: "pgsourcerer",
     version: packageJson.version,
 });
-// Run with Node.js platform
-cli(process.argv).pipe(Effect.provide(NodeContext.layer), NodeRuntime.runMain);
+NodeRuntime.runMain(cli(process.argv).pipe(Effect.provide(NodeContext.layer)));
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map

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

package/dist/config.d.ts

@@ -3,6 +3,7 @@
  */
 import { Schema as S } from "effect";
 import type { InflectionConfig } from "./services/inflection.js";
+import type { Plugin } from "./runtime/types.js";
 /**
  * Type hint match criteria
  */
@@ -36,7 +37,7 @@ export type TypeHint = S.Schema.Type<typeof TypeHint>;
  */
 export declare const Config: S.Struct<{
     /** Database connection string */
-    connectionString: typeof S.String;
+    connectionString: S.propertySignature<S.SchemaClass<string, string, never>>;
     /** PostgreSQL role to assume during introspection (for RLS-aware generation) */
     role: S.optional<typeof S.String>;
     /** PostgreSQL schemas to introspect */
@@ -62,9 +63,14 @@ export declare const Config: S.Struct<{
     /** Inflection configuration (validated as Any, properly typed in ConfigInput) */
     inflection: S.optional<typeof S.Any>;
     /** Plugins to run */
-    plugins: S.Array$<typeof S.Any>;
+    plugins: S.propertySignature<S.Array$<typeof S.Any>>;
     /** Formatter callback to transform generated code before writing (validated as Any, properly typed in ConfigInput) */
     formatter: S.optional<typeof S.String>;
+    /**
+     * Default file name for symbols that don't match any rule.
+     * Relative to outputDir. Default: "index.ts"
+     */
+    defaultFile: S.optional<typeof S.String>;
 }>;
 export type Config = S.Schema.Type<typeof Config>;
 /**
@@ -101,8 +107,23 @@ export interface ConfigInput {
      * ```
      */
     readonly inflection?: InflectionConfig;
-    /** Plugins to run */
-    readonly plugins: readonly unknown[];
+    /**
+     * Plugins to run.
+     *
+     * Accepts individual plugins or arrays of plugins (presets).
+     * Arrays are flattened at runtime, allowing plugin functions to return
+     * multiple sub-plugins that work together.
+     *
+     * @example
+     * ```typescript
+     * plugins: [
+     *   types(),           // Single plugin
+     *   effect(),          // Preset returning multiple plugins
+     *   [zod(), kysely()], // Explicit array
+     * ]
+     * ```
+     */
+    readonly plugins: readonly (Plugin | readonly Plugin[])[];
     /**
      * Formatter command to run on generated files after writing.
      * The command will be run with the output directory as the argument.
@@ -116,6 +137,11 @@ export interface ConfigInput {
      * ```
      */
     readonly formatter?: string;
+    /**
+     * Default file name for symbols that don't match any rule.
+     * Relative to outputDir. Default: "index.ts"
+     */
+    readonly defaultFile?: string;
 }
 /**
  * Resolved configuration with all defaults applied
@@ -127,7 +153,14 @@ export interface ResolvedConfig {
     readonly outputDir: string;
     readonly typeHints: readonly TypeHint[];
     readonly inflection?: InflectionConfig;
-    readonly plugins: readonly unknown[];
+    /** Plugins after flattening presets */
+    readonly plugins: readonly Plugin[];
     readonly formatter?: string;
+    readonly defaultFile?: string;
+    /**
+     * Directory containing the config file.
+     * Used to resolve relative paths in userModule() references.
+     */
+    readonly configDir?: string;
 }
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAEhE;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;EAKxB,CAAA;AACF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAA;AAE/D;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;;;;EAGnB,CAAA;AACF,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC,CAAA;AAErD;;;;;;;GAOG;AACH,eAAO,MAAM,MAAM;IACjB,iCAAiC;;IAGjC,gFAAgF;;IAGhF,uCAAuC;;;;IAGvC,4BAA4B;;;;IAG5B,yCAAyC;;;;;;;;;;;;IAGzC,iFAAiF;;IAGjF,qBAAqB;;IAGrB,sHAAsH;;EAEtH,CAAA;AAEF,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,CAAA;AAEjD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,iCAAiC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;IAEjC,gFAAgF;IAChF,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IAEtB,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAEpC,uDAAuD;IACvD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAE3B,yCAAyC;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAA;IAExC;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAA;IAEtC,qBAAqB;IACrB,QAAQ,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,CAAA;IAEpC;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,CAAA;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAA;IACtC,QAAQ,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,CAAA;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAC5B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;EAKxB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhE;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;;;;EAGnB,CAAC;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC,CAAC;AAEtD;;;;;;;GAOG;AACH,eAAO,MAAM,MAAM;IACjB,iCAAiC;;IASjC,gFAAgF;;IAGhF,uCAAuC;;;;IAGvC,4BAA4B;;;;IAG5B,yCAAyC;;;;;;;;;;;;IAGzC,iFAAiF;;IAGjF,qBAAqB;;IAKrB,sHAAsH;;IAGtH;;;OAGG;;EAEH,CAAC;AAEH,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,iCAAiC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAElC,gFAAgF;IAChF,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEvB,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAErC,uDAAuD;IACvD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B,yCAAyC;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAC;IAEzC;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAEvC;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;IAE1D;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,CAAC;IACxC,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IACvC,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;;;OAGG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B"}

package/dist/config.js

@@ -28,7 +28,11 @@ export const TypeHint = S.Struct({
  */
 export const Config = S.Struct({
     /** Database connection string */
-    connectionString: S.String,
+    connectionString: S.propertySignature(S.String.annotations({
+        message: () => "must be a string - set DATABASE_URL env var or add connectionString to config",
+    })).annotations({
+        missingMessage: () => "is required - set DATABASE_URL env var or add connectionString to config",
+    }),
     /** PostgreSQL role to assume during introspection (for RLS-aware generation) */
     role: S.optional(S.String),
     /** PostgreSQL schemas to introspect */
@@ -40,8 +44,15 @@ export const Config = S.Struct({
     /** Inflection configuration (validated as Any, properly typed in ConfigInput) */
     inflection: S.optional(S.Any),
     /** Plugins to run */
-    plugins: S.Array(S.Any),
+    plugins: S.propertySignature(S.Array(S.Any)).annotations({
+        missingMessage: () => "is required - add at least one plugin to your config",
+    }),
     /** Formatter callback to transform generated code before writing (validated as Any, properly typed in ConfigInput) */
     formatter: S.optional(S.String),
+    /**
+     * Default file name for symbols that don't match any rule.
+     * Relative to outputDir. Default: "index.ts"
+     */
+    defaultFile: S.optional(S.String),
 });
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAGpC;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5B,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAC3B,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;CAC7B,CAAC,CAAA;AAGF;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,aAAa;IACpB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;CACrD,CAAC,CAAA;AAGF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,iCAAiC;IACjC,gBAAgB,EAAE,CAAC,CAAC,MAAM;IAE1B,gFAAgF;IAChF,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAE1B,uCAAuC;IACvC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;IAEzE,4BAA4B;IAC5B,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC;IAEvE,yCAAyC;IACzC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAEnE,iFAAiF;IACjF,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAE7B,qBAAqB;IACrB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;IAEvB,sHAAsH;IACtH,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;CAChC,CAAC,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAIrC;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5B,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAC3B,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;CAC7B,CAAC,CAAC;AAGH;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,aAAa;IACpB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;CACrD,CAAC,CAAC;AAGH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,iCAAiC;IACjC,gBAAgB,EAAE,CAAC,CAAC,iBAAiB,CACnC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;QACnB,OAAO,EAAE,GAAG,EAAE,CAAC,+EAA+E;KAC/F,CAAC,CACH,CAAC,WAAW,CAAC;QACZ,cAAc,EAAE,GAAG,EAAE,CAAC,0EAA0E;KACjG,CAAC;IAEF,gFAAgF;IAChF,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAE1B,uCAAuC;IACvC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;IAEzE,4BAA4B;IAC5B,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC;IAEvE,yCAAyC;IACzC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAEnE,iFAAiF;IACjF,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAE7B,qBAAqB;IACrB,OAAO,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;QACvD,cAAc,EAAE,GAAG,EAAE,CAAC,sDAAsD;KAC7E,CAAC;IAEF,sHAAsH;IACtH,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAE/B;;;OAGG;IACH,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;CAClC,CAAC,CAAC"}

package/dist/{lib/conjure.d.ts → conjure/index.d.ts}

@@ -6,7 +6,7 @@
  *
  * @example
  * ```typescript
- * import { conjure, cast } from "../lib/conjure.js"
+ * import { conjure, cast } from "./index.js"
  *
  * // Method chains
  * const schema = conjure.id("z")
@@ -35,7 +35,7 @@
  */
 import recast from "recast";
 import type { namedTypes as n } from "ast-types";
-import type { ExpressionKind, StatementKind, TSTypeKind, SpreadElementKind, RestElementKind } from "ast-types/lib/gen/kinds.js";
+import type { ExpressionKind, StatementKind, PatternKind, TSTypeKind, SpreadElementKind, RestElementKind } from "ast-types/lib/gen/kinds.js";
 /**
  * The ast-types library uses "Kind" union types that are incompatible with
  * exactOptionalPropertyTypes. We define explicit cast functions that convert
@@ -139,6 +139,8 @@ export interface ObjBuilder {
     spread(expr: n.Expression): ObjBuilder;
     /** Add a shorthand property: `key` (where key is also the value identifier) */
     shorthand(key: string): ObjBuilder;
+    /** Add properties from entries: `{ key: value, ... }` */
+    fromEntries(entries: Array<[string, n.Expression]>): ObjBuilder;
     /** Finalize and return the object expression */
     build(): n.ObjectExpression;
 }
@@ -165,6 +167,8 @@ export interface FnBuilder {
     restParam(name: string, type?: n.TSType): FnBuilder;
     /** Add a parameter with a default value */
     defaultParam(name: string, defaultValue: n.Expression, type?: n.TSType): FnBuilder;
+    /** Add a raw pattern parameter (e.g., destructured object from param.destructured()) */
+    rawParam(pattern: PatternKind): FnBuilder;
     /** Set the return type annotation */
     returns(type: n.TSType): FnBuilder;
     /** Set the function body */
@@ -268,6 +272,8 @@ export declare const conjure: {
     readonly obj: () => ObjBuilder;
     /** Start an array literal builder */
     readonly arr: (...elements: n.Expression[]) => ArrBuilder;
+    /** Create an array expression directly (handles type casting) */
+    readonly arrExpr: (...elements: n.Expression[]) => recast.types.namedTypes.ArrayExpression;
     /** Start a function builder */
     readonly fn: () => FnBuilder;
     /** String literal */
@@ -282,6 +288,22 @@ export declare const conjure: {
     readonly undefined: () => recast.types.namedTypes.Identifier;
     /** Template literal */
     readonly template: (quasis: string[], ...expressions: n.Expression[]) => recast.types.namedTypes.TemplateLiteral;
+    /**
+     * Tagged template literal: tag`...${expr}...`
+     *
+     * @param tag - The tag identifier (string or expression)
+     * @param quasis - The string parts of the template
+     * @param expressions - The interpolated expressions
+     * @param typeParams - Optional type parameters for the tag: tag<T>`...`
+     *
+     * @example
+     * // sql`SELECT * FROM users WHERE id = ${id}`
+     * conjure.taggedTemplate("sql", ["SELECT * FROM users WHERE id = ", ""], [idExpr])
+     *
+     * // sql<User>`SELECT * FROM users`
+     * conjure.taggedTemplate("sql", ["SELECT * FROM users"], [], [conjure.ts.ref("User")])
+     */
+    readonly taggedTemplate: (tag: string | n.Expression, quasis: readonly string[], expressions: readonly n.Expression[], typeParams?: readonly n.TSType[]) => n.TaggedTemplateExpression;
     readonly op: {
         /** Generic binary expression */
         readonly binary: (left: n.Expression, operator: BinaryOp, right: n.Expression) => recast.types.namedTypes.BinaryExpression;
@@ -330,6 +352,28 @@ export declare const conjure: {
         /** Async function declaration */
         readonly asyncFn: (name: string, params: (n.Identifier | n.ObjectPattern)[], body: n.Statement[]) => n.FunctionDeclaration;
     };
+    readonly import: {
+        /**
+         * Named imports: `import { a, b, c } from "source"`
+         * Also supports renaming: `import { a as b } from "source"`
+         */
+        readonly named: (source: string, ...names: (string | {
+            imported: string;
+            local: string;
+        })[]) => n.ImportDeclaration;
+        /**
+         * Default import: `import name from "source"`
+         */
+        readonly default: (source: string, name: string) => n.ImportDeclaration;
+        /**
+         * Namespace import: `import * as name from "source"`
+         */
+        readonly namespace: (source: string, name: string) => n.ImportDeclaration;
+        /**
+         * Side-effect import: `import "source"`
+         */
+        readonly sideEffect: (source: string) => n.ImportDeclaration;
+    };
     readonly export: {
         /**
          * Export const declaration: `export const name = init`
@@ -494,6 +538,19 @@ export declare const conjure: {
          * // { limit = 50, offset = 0 }: { limit?: number; offset?: number }
          */
         readonly destructured: (fields: readonly DestructuredField[]) => n.ObjectPattern;
+        /**
+         * Create a destructured parameter with a rest element and intersection type.
+         * Useful for functions like: `({ id, ...data }: { id: string } & Updateable<Comment>)`
+         *
+         * @example
+         * param.withRest(
+         *   [{ name: "id", type: ts.string() }],
+         *   "data",
+         *   ts.ref("Updateable", [ts.ref("Comment")])
+         * )
+         * // { id, ...data }: { id: string } & Updateable<Comment>
+         */
+        readonly withRest: (fields: readonly DestructuredField[], restName: string, restType: n.TSType) => n.ObjectPattern;
     };
     readonly exp: {
         /**
@@ -526,6 +583,8 @@ export declare const conjure: {
     };
     /** Await expression */
     readonly await: (expr: n.Expression) => recast.types.namedTypes.AwaitExpression;
+    /** Non-null assertion: `expr!` */
+    readonly nonNull: (expr: n.Expression) => recast.types.namedTypes.TSNonNullExpression;
     /** Spread expression (for use in arrays/calls) */
     readonly spread: (expr: n.Expression) => recast.types.namedTypes.SpreadElement;
     /** Print AST node to code string */
@@ -542,4 +601,4 @@ export declare const conjure: {
     readonly b: import("ast-types/lib/gen/builders").builders;
 };
 export default conjure;
-//# sourceMappingURL=conjure.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist/conjure/index.d.ts.map

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

package/dist/{lib/conjure.js → conjure/index.js}

@@ -6,7 +6,7 @@
  *
  * @example
  * ```typescript
- * import { conjure, cast } from "../lib/conjure.js"
+ * import { conjure, cast } from "./index.js"
  *
  * // Method chains
  * const schema = conjure.id("z")
@@ -123,6 +123,10 @@ function createObj(props = []) {
             prop.shorthand = true;
             return createObj([...props, prop]);
         },
+        fromEntries(entries) {
+            const newProps = entries.map(([key, value]) => b.objectProperty(b.identifier(key), toExpr(value)));
+            return createObj([...props, ...newProps]);
+        },
         build() {
             return b.objectExpression(props);
         },
@@ -144,6 +148,9 @@ function createArr(elems = []) {
         },
     };
 }
+function isFnRawParam(p) {
+    return "pattern" in p;
+}
 const defaultParam = (name, type) => ({
     name,
     type,
@@ -153,6 +160,10 @@ const defaultParam = (name, type) => ({
 });
 function createFn(config) {
     const buildParams = () => config.params.map((p) => {
+        // Raw pattern params (e.g., destructured objects)
+        if (isFnRawParam(p)) {
+            return p.pattern;
+        }
         if (p.rest) {
             const restId = b.identifier(p.name);
             if (p.type) {
@@ -204,6 +215,12 @@ function createFn(config) {
                 params: [...config.params, { ...defaultParam(name, type), defaultValue }],
             });
         },
+        rawParam(pattern) {
+            return createFn({
+                ...config,
+                params: [...config.params, { pattern }],
+            });
+        },
         returns(type) {
             return createFn({ ...config, returnType: type });
         },
@@ -605,10 +622,81 @@ const param = {
             return prop;
         }));
         // Build the type annotation: { name: type; name?: type; }
-        const typeAnnotation = ts.objectType(fields.map(f => ({ name: f.name, type: f.type, optional: f.optional })));
+        const typeAnnotation = ts.objectType(fields.map(f => ({ name: f.name, type: toTSType(f.type), optional: f.optional })));
         pattern.typeAnnotation = b.tsTypeAnnotation(toTSType(typeAnnotation));
         return pattern;
     },
+    /**
+     * Create a destructured parameter with a rest element and intersection type.
+     * Useful for functions like: `({ id, ...data }: { id: string } & Updateable<Comment>)`
+     *
+     * @example
+     * param.withRest(
+     *   [{ name: "id", type: ts.string() }],
+     *   "data",
+     *   ts.ref("Updateable", [ts.ref("Comment")])
+     * )
+     * // { id, ...data }: { id: string } & Updateable<Comment>
+     */
+    withRest: (fields, restName, restType) => {
+        const properties = fields.map(f => {
+            const id = b.identifier(f.name);
+            const value = f.defaultValue ? b.assignmentPattern(id, toExpr(f.defaultValue)) : id;
+            const prop = b.objectProperty(b.identifier(f.name), value);
+            prop.shorthand = true;
+            return prop;
+        });
+        // Add rest element: ...data
+        const restId = b.identifier(restName);
+        properties.push(b.restElement(restId));
+        const pattern = b.objectPattern(properties);
+        // Build intersection type: { id: string } & RestType
+        const objType = ts.objectType(fields.map(f => ({ name: f.name, type: toTSType(f.type), optional: f.optional })));
+        const intersectionType = b.tsIntersectionType([toTSType(objType), toTSType(restType)]);
+        pattern.typeAnnotation = b.tsTypeAnnotation(intersectionType);
+        return pattern;
+    },
+};
+// =============================================================================
+// Import Statement Helpers (conjure.import.*)
+// =============================================================================
+/**
+ * Import statement builders for generating import declarations.
+ */
+const importHelpers = {
+    /**
+     * Named imports: `import { a, b, c } from "source"`
+     * Also supports renaming: `import { a as b } from "source"`
+     */
+    named: (source, ...names) => {
+        const specifiers = names.map(n => {
+            if (typeof n === "string") {
+                return b.importSpecifier(b.identifier(n), b.identifier(n));
+            }
+            else {
+                return b.importSpecifier(b.identifier(n.imported), b.identifier(n.local));
+            }
+        });
+        return b.importDeclaration(specifiers, b.stringLiteral(source));
+    },
+    /**
+     * Default import: `import name from "source"`
+     */
+    default: (source, name) => {
+        return b.importDeclaration([b.importDefaultSpecifier(b.identifier(name))], b.stringLiteral(source));
+    },
+    /**
+     * Namespace import: `import * as name from "source"`
+     */
+    namespace: (source, name) => {
+        return b.importDeclaration([b.importNamespaceSpecifier(b.identifier(name))], b.stringLiteral(source));
+    },
+    /**
+     * Side-effect import: `import "source"`
+     */
+    sideEffect: (source) => {
+        return b.importDeclaration([], b.stringLiteral(source));
+    },
 };
 // =============================================================================
 // Export Statement Helpers (conjure.export.*)
@@ -846,6 +934,8 @@ export const conjure = {
     obj: () => createObj(),
     /** Start an array literal builder */
     arr: (...elements) => createArr(elements.map(e => toExpr(e))),
+    /** Create an array expression directly (handles type casting) */
+    arrExpr: (...elements) => b.arrayExpression(elements.map(e => toExpr(e))),
     /** Start a function builder */
     fn: () => createFn({
         params: [],
@@ -871,10 +961,39 @@ export const conjure = {
         const templateElements = quasis.map((raw, i) => b.templateElement({ raw, cooked: raw }, i === quasis.length - 1));
         return b.templateLiteral(templateElements, expressions.map(toExpr));
     },
+    /**
+     * Tagged template literal: tag`...${expr}...`
+     *
+     * @param tag - The tag identifier (string or expression)
+     * @param quasis - The string parts of the template
+     * @param expressions - The interpolated expressions
+     * @param typeParams - Optional type parameters for the tag: tag<T>`...`
+     *
+     * @example
+     * // sql`SELECT * FROM users WHERE id = ${id}`
+     * conjure.taggedTemplate("sql", ["SELECT * FROM users WHERE id = ", ""], [idExpr])
+     *
+     * // sql<User>`SELECT * FROM users`
+     * conjure.taggedTemplate("sql", ["SELECT * FROM users"], [], [conjure.ts.ref("User")])
+     */
+    taggedTemplate: (tag, quasis, expressions, typeParams) => {
+        const templateElements = quasis.map((raw, i) => b.templateElement({ raw, cooked: raw }, i === quasis.length - 1));
+        const templateLiteral = b.templateLiteral(templateElements, expressions.map(toExpr));
+        const tagExpr = typeof tag === "string" ? b.identifier(tag) : toExpr(tag);
+        const tagged = b.taggedTemplateExpression(tagExpr, templateLiteral);
+        // Add type parameters if provided: sql<User>`...`
+        if (typeParams && typeParams.length > 0) {
+            tagged.typeParameters =
+                b.tsTypeParameterInstantiation(typeParams.map(toTSType));
+        }
+        return tagged;
+    },
     // === Operators ===
     op,
     // === Statements ===
     stmt,
+    // === Import statements ===
+    import: importHelpers,
     // === Export statements ===
     export: exportHelpers,
     /** Async function declaration */
@@ -896,6 +1015,8 @@ export const conjure = {
     // === Helpers ===
     /** Await expression */
     await: (expr) => b.awaitExpression(toExpr(expr)),
+    /** Non-null assertion: `expr!` */
+    nonNull: (expr) => b.tsNonNullExpression(toExpr(expr)),
     /** Spread expression (for use in arrays/calls) */
     spread: (expr) => b.spreadElement(toExpr(expr)),
     /** Print AST node to code string */
@@ -913,4 +1034,4 @@ export const conjure = {
     b,
 };
 export default conjure;
-//# sourceMappingURL=conjure.js.map
+//# sourceMappingURL=index.js.map