turbine-orm 0.4.0 → 0.7.0

package/dist/generate.js

@@ -8,9 +8,9 @@
  *
  * Output goes to the specified directory (default: ./generated/turbine/).
  */
-import { writeFileSync, mkdirSync } from 'node:fs';
-import { join } from 'node:path';
-import { snakeToPascal, singularize, } from './schema.js';
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { join, relative, resolve } from 'node:path';
+import { singularize, snakeToPascal } from './schema.js';
 /** Get the TypeScript type name for a table (singularized PascalCase) */
 function entityName(tableName) {
     return snakeToPascal(singularize(tableName));
@@ -24,6 +24,12 @@ function escSQ(value) {
 // ---------------------------------------------------------------------------
 export function generate(options) {
     const outDir = options.outDir ?? './generated/turbine';
+    // Path traversal protection — ensure output stays within project root
+    const resolved = resolve(outDir);
+    const rel = relative(process.cwd(), resolved);
+    if (rel.startsWith('..') || resolve(rel) !== resolved) {
+        throw new Error(`Output directory must be within the project root. Got: ${outDir}`);
+    }
     mkdirSync(outDir, { recursive: true });
     const files = [];
     // Generate types.ts
@@ -49,15 +55,13 @@ function generatedFileHeader() {
         ' * Auto-generated by turbine-orm — DO NOT EDIT',
         ' *',
         ` * Generated at: ${new Date().toISOString()}`,
-        ' * @see https://github.com/zvndev/turbine-orm',
+        ' * @see https://turbineorm.dev',
         ' */',
         '',
     ];
 }
 function generateTypes(schema) {
-    const lines = [
-        ...generatedFileHeader(),
-    ];
+    const lines = [...generatedFileHeader()];
     // Generate enum types
     for (const [enumName, labels] of Object.entries(schema.enums)) {
         const typeName = snakeToPascal(enumName);
@@ -107,9 +111,23 @@ function generateTypes(schema) {
         }
         lines.push('};');
         lines.push('');
-        // --- Relation types ---
+        // --- Relations map (for type-safe `with` clauses) ---
         const hasRelations = Object.keys(table.relations).length > 0;
         if (hasRelations) {
+            lines.push(`/** Available relations for the \`${table.name}\` table */`);
+            lines.push(`export interface ${typeName}Relations {`);
+            for (const [relName, rel] of Object.entries(table.relations)) {
+                const targetType = entityName(rel.to);
+                if (rel.type === 'hasMany') {
+                    lines.push(`  ${relName}: ${targetType}[];`);
+                }
+                else {
+                    lines.push(`  ${relName}: ${targetType} | null;`);
+                }
+            }
+            lines.push('}');
+            lines.push('');
+            // --- Legacy per-relation interfaces (kept for backward compatibility) ---
             for (const [relName, rel] of Object.entries(table.relations)) {
                 const targetType = entityName(rel.to);
                 if (rel.type === 'hasMany') {
@@ -213,8 +231,14 @@ function generateIndex(schema) {
         "import type { TurbineConfig } from 'turbine-orm';",
         "import { SCHEMA } from './metadata.js';",
     ];
-    // Import all entity types
-    const typeImports = tableEntries.map((t) => entityName(t.name));
+    // Import all entity types and relations maps
+    const typeImports = [];
+    for (const t of tableEntries) {
+        typeImports.push(entityName(t.name));
+        if (Object.keys(t.relations).length > 0) {
+            typeImports.push(`${entityName(t.name)}Relations`);
+        }
+    }
     lines.push(`import type { ${typeImports.join(', ')} } from './types.js';`);
     lines.push('');
     // Generate the client class with JSDoc
@@ -240,8 +264,10 @@ function generateIndex(schema) {
     for (const table of tableEntries) {
         const typeName = entityName(table.name);
         const accessor = snakeToCamelStr(table.name);
+        const hasRelations = Object.keys(table.relations).length > 0;
+        const genericArgs = hasRelations ? `${typeName}, ${typeName}Relations` : typeName;
         lines.push(`  /** Query interface for the \`${table.name}\` table */`);
-        lines.push(`  declare readonly ${accessor}: QueryInterface<${typeName}>;`);
+        lines.push(`  declare readonly ${accessor}: QueryInterface<${genericArgs}>;`);
     }
     lines.push('');
     lines.push('  constructor(config?: TurbineConfig) {');

package/dist/index.d.ts

@@ -32,13 +32,15 @@
  * await db.disconnect();
  * ```
  */
-export { TurbineClient, TransactionClient, type TurbineConfig, type TransactionOptions, type Middleware, type MiddlewareParams, type MiddlewareNext, } from './client.js';
-export { QueryInterface, type DeferredQuery, type FindUniqueArgs, type FindManyArgs, type CreateArgs, type CreateManyArgs, type UpdateArgs, type UpdateManyArgs, type DeleteArgs, type DeleteManyArgs, type UpsertArgs, type CountArgs, type GroupByArgs, type AggregateArgs, type AggregateResult, type RelationFilter, type JsonFilter, type ArrayFilter, type WithClause, type WithOptions, type OrderDirection, } from './query.js';
+export { type Middleware, type MiddlewareNext, type MiddlewareParams, type PgCompatPool, type PgCompatPoolClient, type PgCompatQueryResult, TransactionClient, type TransactionOptions, TurbineClient, type TurbineConfig, } from './client.js';
+export { CheckConstraintError, CircularRelationError, ConnectionError, ForeignKeyError, MigrationError, NotFoundError, NotNullViolationError, RelationError, TimeoutError, TurbineError, TurbineErrorCode, UniqueConstraintError, ValidationError, wrapPgError, } from './errors.js';
+export { type GenerateOptions, generate } from './generate.js';
+export { type IntrospectOptions, introspect } from './introspect.js';
 export { executePipeline, type PipelineResults } from './pipeline.js';
-export type { SchemaMetadata, TableMetadata, ColumnMetadata, RelationDef, IndexMetadata, } from './schema.js';
-export { snakeToCamel, camelToSnake, snakeToPascal, singularize, pgTypeToTs, isDateType, pgArrayType, } from './schema.js';
-export { introspect, type IntrospectOptions } from './introspect.js';
-export { generate, type GenerateOptions } from './generate.js';
-export { defineSchema, table, column, ColumnBuilder, type ColumnDef, type ColumnTypeName, type ColumnConfig, type ColumnType, type TableDef, type SchemaDef, } from './schema-builder.js';
-export { schemaToSQL, schemaToSQLString, schemaDiff, schemaPush, type DiffResult, type AlterDef, type AlterColumnDef, type PushResult, } from './schema-sql.js';
+export { type AggregateArgs, type AggregateResult, type ArrayFilter, type CountArgs, type CreateArgs, type CreateManyArgs, type DeferredQuery, type DeleteArgs, type DeleteManyArgs, type FindManyArgs, type FindManyStreamArgs, type FindUniqueArgs, type GroupByArgs, type JsonFilter, type OrderDirection, QueryInterface, type RelationFilter, type TypedWithClause, type UpdateArgs, type UpdateInput, type UpdateManyArgs, type UpdateOperatorInput, type UpsertArgs, type WithClause, type WithOptions, type WithResult, } from './query.js';
+export type { ColumnMetadata, IndexMetadata, RelationDef, SchemaMetadata, TableMetadata, } from './schema.js';
+export { camelToSnake, isDateType, pgArrayType, pgTypeToTs, singularize, snakeToCamel, snakeToPascal, } from './schema.js';
+export { ColumnBuilder, type ColumnConfig, type ColumnDef, type ColumnType, type ColumnTypeName, column, defineSchema, type SchemaDef, type TableDef, table, } from './schema-builder.js';
+export { type AlterColumnDef, type AlterDef, type DiffResult, type PushResult, schemaDiff, schemaPush, schemaToSQL, schemaToSQLString, } from './schema-sql.js';
+export { type TurbineHttpOptions, turbineHttp } from './serverless.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -33,21 +33,25 @@
  * ```
  */
 // Client
-export { TurbineClient, TransactionClient, } from './client.js';
-// Query builder
-export { QueryInterface, } from './query.js';
+export { TransactionClient, TurbineClient, } from './client.js';
+// Error types
+export { CheckConstraintError, CircularRelationError, ConnectionError, ForeignKeyError, MigrationError, NotFoundError, NotNullViolationError, RelationError, TimeoutError, TurbineError, TurbineErrorCode, UniqueConstraintError, ValidationError, wrapPgError, } from './errors.js';
+// Code generation
+export { generate } from './generate.js';
+// Introspection
+export { introspect } from './introspect.js';
 // Pipeline
 export { executePipeline } from './pipeline.js';
+// Query builder
+export { QueryInterface, } from './query.js';
 // Schema utilities
-export { snakeToCamel, camelToSnake, snakeToPascal, singularize, pgTypeToTs, isDateType, pgArrayType, } from './schema.js';
-// Introspection
-export { introspect } from './introspect.js';
-// Code generation
-export { generate } from './generate.js';
+export { camelToSnake, isDateType, pgArrayType, pgTypeToTs, singularize, snakeToCamel, snakeToPascal, } from './schema.js';
 // Schema builder — define schemas in TypeScript
-export { defineSchema, 
+export { ColumnBuilder, column, defineSchema, 
 // Legacy compat (deprecated — use object format with defineSchema)
-table, column, ColumnBuilder, } from './schema-builder.js';
+table, } from './schema-builder.js';
 // Schema SQL — generate DDL, diff, and push
-export { schemaToSQL, schemaToSQLString, schemaDiff, schemaPush, } from './schema-sql.js';
+export { schemaDiff, schemaPush, schemaToSQL, schemaToSQLString, } from './schema-sql.js';
+// Serverless / edge factory
+export { turbineHttp } from './serverless.js';
 //# sourceMappingURL=index.js.map

package/dist/introspect.js

@@ -8,7 +8,7 @@
  * This is the foundation of `npx turbine generate`.
  */
 import pg from 'pg';
-import { pgTypeToTs, isDateType, pgArrayType, snakeToCamel, singularize, } from './schema.js';
+import { isDateType, pgArrayType, pgTypeToTs, singularize, snakeToCamel, } from './schema.js';
 // ---------------------------------------------------------------------------
 // SQL queries (all parameterized, no interpolation)
 // ---------------------------------------------------------------------------
@@ -99,7 +99,7 @@ export async function introspect(options) {
     });
     try {
         // Run all information_schema queries in parallel
-        const [tablesResult, columnsResult, pkResult, fkResult, uniqueResult, indexResult, enumResult,] = await Promise.all([
+        const [tablesResult, columnsResult, pkResult, fkResult, uniqueResult, indexResult, enumResult] = await Promise.all([
             pool.query(SQL_TABLES, [schema]),
             pool.query(SQL_COLUMNS, [schema]),
             pool.query(SQL_PRIMARY_KEYS, [schema]),
@@ -172,9 +172,7 @@ export async function introspect(options) {
             const isUnique = row.indexdef.includes('UNIQUE');
             // Extract column names from indexdef (e.g. "CREATE INDEX idx ON tbl USING btree (col1, col2)")
             const colMatch = row.indexdef.match(/\((.+)\)/);
-            const columns = colMatch
-                ? colMatch[1].split(',').map((c) => c.trim().replace(/ (ASC|DESC)/i, ''))
-                : [];
+            const columns = colMatch ? colMatch[1].split(',').map((c) => c.trim().replace(/ (ASC|DESC)/i, '')) : [];
             indexesByTable.get(row.tablename).push({
                 name: row.indexname,
                 columns,

package/dist/pipeline.js

@@ -15,6 +15,7 @@
  * we simulate it by running queries concurrently on a single connection or via
  * a multi-statement batch.
  */
+import { wrapPgError } from './errors.js';
 // ---------------------------------------------------------------------------
 // Pipeline executor
 // ---------------------------------------------------------------------------
@@ -52,7 +53,13 @@ export async function executePipeline(pool, queries) {
         // Future: use actual Postgres pipeline protocol for true pipelining.
         const results = [];
         for (const q of queries) {
-            const raw = await client.query(q.sql, q.params);
+            let raw;
+            try {
+                raw = await client.query(q.sql, q.params);
+            }
+            catch (err) {
+                throw wrapPgError(err);
+            }
             results.push(q.transform(raw));
         }
         await client.query('COMMIT');