relq 1.0.8 → 1.0.10

package/dist/bin/relq.js

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
-import '../esm/cli/index.js';
+import { main } from '../esm/cli/index.js';
+main().catch(console.error);

package/dist/cjs/addon/pg/index.cjs

@@ -346,9 +346,10 @@ var require_postgres_interval = __commonJS((exports2, module2) => {
 
 // node_modules/postgres-bytea/index.js
 var require_postgres_bytea = __commonJS((exports2, module2) => {
+  var bufferFrom = Buffer.from || Buffer;
   module2.exports = function parseBytea(input) {
     if (/^\\x/.test(input)) {
-      return new Buffer(input.substr(2), "hex");
+      return bufferFrom(input.substr(2), "hex");
     }
     var output = "";
     var i = 0;
@@ -372,7 +373,7 @@ var require_postgres_bytea = __commonJS((exports2, module2) => {
         }
       }
     }
-    return new Buffer(output, "binary");
+    return bufferFrom(output, "binary");
   };
 });
 

package/dist/cjs/addon/pg-cursor/index.cjs

@@ -346,9 +346,10 @@ var require_postgres_interval = __commonJS((exports2, module2) => {
 
 // node_modules/postgres-bytea/index.js
 var require_postgres_bytea = __commonJS((exports2, module2) => {
+  var bufferFrom = Buffer.from || Buffer;
   module2.exports = function parseBytea(input) {
     if (/^\\x/.test(input)) {
-      return new Buffer(input.substr(2), "hex");
+      return bufferFrom(input.substr(2), "hex");
     }
     var output = "";
     var i = 0;
@@ -372,7 +373,7 @@ var require_postgres_bytea = __commonJS((exports2, module2) => {
         }
       }
     }
-    return new Buffer(output, "binary");
+    return bufferFrom(output, "binary");
   };
 });
 

package/dist/cjs/cli/commands/add.cjs

@@ -47,6 +47,7 @@ const path = __importStar(require("path"));
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 const change_tracker_1 = require("../utils/change-tracker.cjs");
 const schema_comparator_1 = require("../utils/schema-comparator.cjs");
+const config_loader_1 = require("../utils/config-loader.cjs");
 function parseSchemaFileForComparison(schemaPath) {
     if (!fs.existsSync(schemaPath)) {
         return null;
@@ -623,8 +624,10 @@ async function addCommand(context) {
     }
     const ignorePatterns = (0, relqignore_1.loadRelqignore)(projectRoot);
     const config = await (0, config_1.loadConfig)();
-    const schemaPathRaw = typeof config?.schema === 'string' ? config.schema : './db/schema.ts';
+    const schemaPathRaw = (0, config_loader_1.getSchemaPath)(config);
     const schemaPath = path.resolve(projectRoot, schemaPathRaw);
+    const { requireValidSchema } = await Promise.resolve().then(() => __importStar(require("../utils/config-loader.cjs")));
+    await requireValidSchema(schemaPath, context.flags);
     const injectedCount = injectTrackingIds(schemaPath);
     if (injectedCount > 0) {
         console.log(spinner_1.colors.muted(`Injected ${injectedCount} tracking ID(s) into schema.ts`));

package/dist/cjs/cli/commands/commit.cjs

@@ -38,6 +38,7 @@ const crypto = __importStar(require("crypto"));
 const cli_utils_1 = require("../utils/cli-utils.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 const config_1 = require("../../config/config.cjs");
+const config_loader_1 = require("../utils/config-loader.cjs");
 const change_tracker_1 = require("../utils/change-tracker.cjs");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -48,6 +49,9 @@ async function commitCommand(context) {
     if (!(0, repo_manager_1.isInitialized)(projectRoot)) {
         (0, cli_utils_1.fatal)('not a relq repository (or any parent directories): .relq', "run 'relq init' to initialize");
     }
+    const schemaPath = path.resolve(projectRoot, (0, config_loader_1.getSchemaPath)(config ?? undefined));
+    const { requireValidSchema } = await Promise.resolve().then(() => __importStar(require("../utils/config-loader.cjs")));
+    await requireValidSchema(schemaPath, flags);
     const staged = (0, repo_manager_1.getStagedChanges)(projectRoot);
     if (staged.length === 0) {
         console.log('nothing to commit, working tree clean');
@@ -122,7 +126,7 @@ async function commitCommand(context) {
         }
     }
     const commitConfig = await (0, config_1.loadConfig)();
-    const schemaPathRaw = typeof commitConfig?.schema === 'string' ? commitConfig.schema : './db/schema.ts';
+    const schemaPathRaw = (0, config_loader_1.getSchemaPath)(commitConfig);
     const schemaFilePath = path.resolve(projectRoot, schemaPathRaw);
     if (fs.existsSync(schemaFilePath)) {
         const currentContent = fs.readFileSync(schemaFilePath, 'utf-8');

package/dist/cjs/cli/commands/import.cjs

@@ -42,11 +42,13 @@ const ast_transformer_1 = require("../utils/ast-transformer.cjs");
 const repo_manager_1 = require("../utils/repo-manager.cjs");
 const schema_comparator_1 = require("../utils/schema-comparator.cjs");
 const change_tracker_1 = require("../utils/change-tracker.cjs");
+const config_loader_1 = require("../utils/config-loader.cjs");
 const relqignore_1 = require("../utils/relqignore.cjs");
 const git_utils_1 = require("../utils/git-utils.cjs");
 async function importCommand(sqlFilePath, options = {}, projectRoot = process.cwd()) {
     const { includeFunctions = false, includeTriggers = false, force = false, dryRun = false } = options;
     const spinner = (0, git_utils_1.createSpinner)();
+    const config = await (0, config_loader_1.loadConfigWithEnv)();
     console.log('');
     if (!sqlFilePath) {
         (0, git_utils_1.fatal)('No SQL file specified', 'usage: relq import <sql-file> [options]\n\n' +
@@ -396,7 +398,7 @@ async function importCommand(sqlFilePath, options = {}, projectRoot = process.cw
         console.log(`${git_utils_1.colors.yellow('Dry run mode')} - no files written`);
         console.log('');
         console.log('Would write:');
-        const dryRunOutputPath = options.output || './db/schema.ts';
+        const dryRunOutputPath = options.output || (0, config_loader_1.getSchemaPath)(config);
         const dryRunAbsPath = path.resolve(projectRoot, dryRunOutputPath);
         console.log(`  ${git_utils_1.colors.cyan(dryRunAbsPath)} ${git_utils_1.colors.gray(`(${(0, git_utils_1.formatBytes)(finalTypescriptContent.length)})`)}`);
         console.log(`  ${git_utils_1.colors.cyan(path.join(projectRoot, '.relq/snapshot.json'))}`);
@@ -406,7 +408,7 @@ async function importCommand(sqlFilePath, options = {}, projectRoot = process.cw
         console.log('');
         return;
     }
-    const outputPath = options.output || './db/schema.ts';
+    const outputPath = options.output || (0, config_loader_1.getSchemaPath)(config);
     const absoluteOutputPath = path.resolve(projectRoot, outputPath);
     const outputDir = path.dirname(absoluteOutputPath);
     if (!fs.existsSync(outputDir)) {

package/dist/cjs/cli/commands/pull.cjs

@@ -180,7 +180,7 @@ async function pullCommand(context) {
     const noCommit = flags['no-commit'] === true;
     const dryRun = flags['dry-run'] === true;
     const author = config.author || 'Relq CLI';
-    const schemaPathRaw = typeof config.schema === 'string' ? config.schema : './db/schema.ts';
+    const schemaPathRaw = (0, config_loader_1.getSchemaPath)(config);
     const schemaPath = path.resolve(projectRoot, schemaPathRaw);
     const includeFunctions = config.includeFunctions ?? true;
     const includeTriggers = config.includeTriggers ?? true;

package/dist/cjs/cli/commands/validate.cjs

@@ -0,0 +1,69 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateCommand = validateCommand;
+const path = __importStar(require("path"));
+const config_loader_1 = require("../utils/config-loader.cjs");
+const schema_validator_1 = require("../utils/schema-validator.cjs");
+const cli_utils_1 = require("../utils/cli-utils.cjs");
+async function validateCommand(context) {
+    const { config, args, projectRoot } = context;
+    console.log('');
+    let schemaPath;
+    if (args.length > 0) {
+        schemaPath = path.resolve(projectRoot, args[0]);
+    }
+    else {
+        schemaPath = path.resolve(projectRoot, (0, config_loader_1.getSchemaPath)(config ?? undefined));
+    }
+    const relativePath = path.relative(process.cwd(), schemaPath);
+    console.log(`Validating ${cli_utils_1.colors.cyan(relativePath)}...`);
+    console.log('');
+    const result = (0, schema_validator_1.validateSchemaFile)(schemaPath);
+    if (result.valid) {
+        (0, cli_utils_1.success)('Schema is valid');
+        console.log('');
+        console.log(`   No syntax errors found in ${relativePath}`);
+        console.log('');
+        return;
+    }
+    console.log(cli_utils_1.colors.red(`error: Schema has ${result.errors.length} syntax error(s)`));
+    console.log('');
+    console.log((0, schema_validator_1.formatValidationErrors)(result));
+    console.log(cli_utils_1.colors.yellow('hint:') + ' Fix the errors above before running other commands');
+    console.log('');
+    process.exit(1);
+}
+exports.default = validateCommand;

package/dist/cjs/cli/index.cjs

@@ -57,6 +57,7 @@ const merge_1 = require("./commands/merge.cjs");
 const tag_1 = require("./commands/tag.cjs");
 const cherry_pick_1 = require("./commands/cherry-pick.cjs");
 const remote_1 = require("./commands/remote.cjs");
+const validate_1 = require("./commands/validate.cjs");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 function loadEnvFile() {
@@ -161,6 +162,7 @@ Sync Commands:
   sync                Pull + push in one command
 
 Other Commands:
+  validate            Check schema for errors
   diff [--sql]        Show schema differences
   generate            Generate TypeScript types
   introspect          Parse database schema
@@ -193,7 +195,7 @@ function printVersion() {
     console.log(`relq v${VERSION}`);
 }
 function requiresConfig(command) {
-    return !['init', 'introspect', 'import', 'help', 'version'].includes(command);
+    return !['init', 'introspect', 'import', 'help', 'version', 'validate'].includes(command);
 }
 function requiresDbConnection(command, flags) {
     const alwaysNeedDb = ['pull', 'push', 'fetch', 'introspect'];
@@ -355,6 +357,9 @@ async function main() {
             case 'introspect':
                 await (0, introspect_1.introspectCommand)(context);
                 break;
+            case 'validate':
+                await (0, validate_1.validateCommand)(context);
+                break;
             case 'sync':
                 await (0, sync_1.syncCommand)(context);
                 break;

package/dist/cjs/cli/utils/config-loader.cjs

@@ -38,7 +38,9 @@ exports.findConfigFileRecursive = findConfigFileRecursive;
 exports.configExists = configExists;
 exports.loadConfigWithEnv = loadConfigWithEnv;
 exports.validateConfig = validateConfig;
+exports.getSchemaPath = getSchemaPath;
 exports.requireValidConfig = requireValidConfig;
+exports.requireValidSchema = requireValidSchema;
 const config_1 = require("../../config/config.cjs");
 const env_loader_1 = require("./env-loader.cjs");
 const fs = __importStar(require("fs"));
@@ -114,6 +116,23 @@ function validateConfig(config) {
     }
     return errors;
 }
+function getSchemaPath(config, defaultPath = './db/schema.ts') {
+    if (!config)
+        return defaultPath;
+    if (typeof config.schema === 'string' && config.schema.length > 0) {
+        return config.schema;
+    }
+    if (typeof config.schema === 'object' && config.schema?.directory) {
+        return `${config.schema.directory}/schema.ts`;
+    }
+    if (config.generate?.outDir) {
+        return `${config.generate.outDir}/schema.ts`;
+    }
+    if (config.typeGeneration?.output) {
+        return config.typeGeneration.output;
+    }
+    return defaultPath;
+}
 async function requireValidConfig(config, options) {
     const errors = validateConfig(config);
     if (errors.length === 0)
@@ -151,3 +170,25 @@ async function requireValidConfig(config, options) {
     console.error('');
     process.exit(1);
 }
+async function requireValidSchema(schemaPath, flags = {}) {
+    if (flags['skip-validation'] === true) {
+        return true;
+    }
+    const { validateSchemaFile, formatValidationErrors } = await Promise.resolve().then(() => __importStar(require("./schema-validator.cjs")));
+    const result = validateSchemaFile(schemaPath);
+    if (result.valid) {
+        return true;
+    }
+    const colors = {
+        red: (s) => `\x1b[31m${s}\x1b[0m`,
+        yellow: (s) => `\x1b[33m${s}\x1b[0m`,
+        cyan: (s) => `\x1b[36m${s}\x1b[0m`,
+    };
+    console.error('');
+    console.error(colors.red('error:') + ` Schema has ${result.errors.length} syntax error(s)`);
+    console.error('');
+    console.error(formatValidationErrors(result));
+    console.error(colors.yellow('hint:') + ` Fix the errors above, or use ${colors.cyan('--skip-validation')} to bypass`);
+    console.error('');
+    process.exit(1);
+}

package/dist/cjs/cli/utils/schema-validator.cjs

@@ -0,0 +1,147 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSchemaFile = validateSchemaFile;
+exports.formatValidationErrors = formatValidationErrors;
+const ts = __importStar(require("typescript"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+function validateSchemaFile(schemaPath) {
+    const absolutePath = path.resolve(schemaPath);
+    if (!fs.existsSync(absolutePath)) {
+        return {
+            valid: false,
+            errors: [{
+                    line: 0,
+                    column: 0,
+                    message: `Schema file not found: ${absolutePath}`,
+                    code: -1,
+                }],
+            filePath: absolutePath,
+        };
+    }
+    const content = fs.readFileSync(absolutePath, 'utf-8');
+    const sourceFile = ts.createSourceFile(absolutePath, content, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const errors = [];
+    const compilerOptions = {
+        target: ts.ScriptTarget.ESNext,
+        module: ts.ModuleKind.ESNext,
+        strict: false,
+        skipLibCheck: true,
+        noEmit: true,
+        moduleResolution: ts.ModuleResolutionKind.NodeNext,
+    };
+    const program = ts.createProgram([absolutePath], compilerOptions, {
+        getSourceFile: (fileName) => {
+            if (fileName === absolutePath)
+                return sourceFile;
+            return ts.createSourceFile(fileName, '', ts.ScriptTarget.Latest, true);
+        },
+        getDefaultLibFileName: () => 'lib.d.ts',
+        writeFile: () => { },
+        getCurrentDirectory: () => path.dirname(absolutePath),
+        getDirectories: () => [],
+        fileExists: (fileName) => fileName === absolutePath || fs.existsSync(fileName),
+        readFile: (fileName) => {
+            if (fileName === absolutePath)
+                return content;
+            try {
+                return fs.readFileSync(fileName, 'utf-8');
+            }
+            catch {
+                return undefined;
+            }
+        },
+        getCanonicalFileName: (fileName) => fileName,
+        useCaseSensitiveFileNames: () => true,
+        getNewLine: () => '\n',
+    });
+    const syntacticDiagnostics = program.getSyntacticDiagnostics(sourceFile);
+    for (const diagnostic of syntacticDiagnostics) {
+        if (diagnostic.file && diagnostic.start !== undefined) {
+            const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+            errors.push({
+                line: line + 1,
+                column: character + 1,
+                message: ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                code: diagnostic.code,
+            });
+        }
+        else {
+            errors.push({
+                line: 0,
+                column: 0,
+                message: ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                code: diagnostic.code,
+            });
+        }
+    }
+    return {
+        valid: errors.length === 0,
+        errors,
+        filePath: absolutePath,
+    };
+}
+function formatValidationErrors(result) {
+    if (result.valid) {
+        return '';
+    }
+    const lines = [];
+    const relativePath = path.relative(process.cwd(), result.filePath);
+    for (const error of result.errors) {
+        if (error.line > 0) {
+            lines.push(`   ${relativePath}:${error.line}:${error.column}`);
+            lines.push(`   │`);
+            try {
+                const content = fs.readFileSync(result.filePath, 'utf-8');
+                const fileLine = content.split('\n')[error.line - 1];
+                if (fileLine !== undefined) {
+                    const trimmedLine = fileLine.substring(0, 60);
+                    lines.push(`${error.line.toString().padStart(3)} │ ${trimmedLine}${fileLine.length > 60 ? '...' : ''}`);
+                    lines.push(`   │ ${' '.repeat(error.column - 1)}^`);
+                }
+            }
+            catch {
+            }
+            lines.push(`   │`);
+            lines.push(`   └─ ${error.message}`);
+        }
+        else {
+            lines.push(`   ${error.message}`);
+        }
+        lines.push('');
+    }
+    return lines.join('\n');
+}

package/dist/esm/addon/pg/index.js

@@ -333,9 +333,10 @@ var require_postgres_interval = __commonJS((exports, module) => {
 
 // node_modules/postgres-bytea/index.js
 var require_postgres_bytea = __commonJS((exports, module) => {
+  var bufferFrom = Buffer.from || Buffer;
   module.exports = function parseBytea(input) {
     if (/^\\x/.test(input)) {
-      return new Buffer(input.substr(2), "hex");
+      return bufferFrom(input.substr(2), "hex");
     }
     var output = "";
     var i = 0;
@@ -359,7 +360,7 @@ var require_postgres_bytea = __commonJS((exports, module) => {
         }
       }
     }
-    return new Buffer(output, "binary");
+    return bufferFrom(output, "binary");
   };
 });
 

package/dist/esm/addon/pg-cursor/index.js

@@ -324,9 +324,10 @@ var require_postgres_interval = __commonJS((exports, module) => {
 
 // node_modules/postgres-bytea/index.js
 var require_postgres_bytea = __commonJS((exports, module) => {
+  var bufferFrom = Buffer.from || Buffer;
   module.exports = function parseBytea(input) {
     if (/^\\x/.test(input)) {
-      return new Buffer(input.substr(2), "hex");
+      return bufferFrom(input.substr(2), "hex");
     }
     var output = "";
     var i = 0;
@@ -350,7 +351,7 @@ var require_postgres_bytea = __commonJS((exports, module) => {
         }
       }
     }
-    return new Buffer(output, "binary");
+    return bufferFrom(output, "binary");
   };
 });
 

package/dist/esm/cli/commands/add.js

@@ -7,6 +7,7 @@ import * as path from 'path';
 import { isInitialized, loadSnapshot, getUnstagedChanges, getStagedChanges, stageChanges, detectFileChanges, addUnstagedChanges, clearUnstagedChanges, cleanupStagedChanges, } from "../utils/repo-manager.js";
 import { getChangeDisplayName } from "../utils/change-tracker.js";
 import { compareSchemas } from "../utils/schema-comparator.js";
+import { getSchemaPath } from "../utils/config-loader.js";
 function parseSchemaFileForComparison(schemaPath) {
     if (!fs.existsSync(schemaPath)) {
         return null;
@@ -583,8 +584,10 @@ export async function addCommand(context) {
     }
     const ignorePatterns = loadRelqignore(projectRoot);
     const config = await loadConfig();
-    const schemaPathRaw = typeof config?.schema === 'string' ? config.schema : './db/schema.ts';
+    const schemaPathRaw = getSchemaPath(config);
     const schemaPath = path.resolve(projectRoot, schemaPathRaw);
+    const { requireValidSchema } = await import("../utils/config-loader.js");
+    await requireValidSchema(schemaPath, context.flags);
     const injectedCount = injectTrackingIds(schemaPath);
     if (injectedCount > 0) {
         console.log(colors.muted(`Injected ${injectedCount} tracking ID(s) into schema.ts`));

package/dist/esm/cli/commands/commit.js

@@ -2,6 +2,7 @@ import * as crypto from 'crypto';
 import { fatal, hint } from "../utils/cli-utils.js";
 import { isInitialized, getHead, getStagedChanges, getUnstagedChanges, shortHash, hashFileContent, saveFileHash, } from "../utils/repo-manager.js";
 import { loadConfig } from "../../config/config.js";
+import { getSchemaPath } from "../utils/config-loader.js";
 import { sortChangesByDependency, generateCombinedSQL, } from "../utils/change-tracker.js";
 import * as fs from 'fs';
 import * as path from 'path';
@@ -12,6 +13,9 @@ export async function commitCommand(context) {
     if (!isInitialized(projectRoot)) {
         fatal('not a relq repository (or any parent directories): .relq', "run 'relq init' to initialize");
     }
+    const schemaPath = path.resolve(projectRoot, getSchemaPath(config ?? undefined));
+    const { requireValidSchema } = await import("../utils/config-loader.js");
+    await requireValidSchema(schemaPath, flags);
     const staged = getStagedChanges(projectRoot);
     if (staged.length === 0) {
         console.log('nothing to commit, working tree clean');
@@ -86,7 +90,7 @@ export async function commitCommand(context) {
         }
     }
     const commitConfig = await loadConfig();
-    const schemaPathRaw = typeof commitConfig?.schema === 'string' ? commitConfig.schema : './db/schema.ts';
+    const schemaPathRaw = getSchemaPath(commitConfig);
     const schemaFilePath = path.resolve(projectRoot, schemaPathRaw);
     if (fs.existsSync(schemaFilePath)) {
         const currentContent = fs.readFileSync(schemaFilePath, 'utf-8');

package/dist/esm/cli/commands/import.js

@@ -6,11 +6,13 @@ import { parseSQL, normalizedToParsedSchema } from "../utils/ast-transformer.js"
 import { saveSnapshot, loadSnapshot, isInitialized, initRepository, stageChanges, addUnstagedChanges } from "../utils/repo-manager.js";
 import { compareSchemas } from "../utils/schema-comparator.js";
 import { getChangeDisplayName } from "../utils/change-tracker.js";
+import { getSchemaPath, loadConfigWithEnv } from "../utils/config-loader.js";
 import { loadRelqignore, validateIgnoreDependencies, isTableIgnored, isColumnIgnored, isIndexIgnored, isConstraintIgnored, isEnumIgnored, isDomainIgnored, isSequenceIgnored, isFunctionIgnored, } from "../utils/relqignore.js";
 import { colors, fatal, warning, hint, getWorkingTreeStatus, printDirtyWorkingTreeError, printMergeStrategyHelp, readSQLFile, createSpinner, formatBytes, } from "../utils/git-utils.js";
 export async function importCommand(sqlFilePath, options = {}, projectRoot = process.cwd()) {
     const { includeFunctions = false, includeTriggers = false, force = false, dryRun = false } = options;
     const spinner = createSpinner();
+    const config = await loadConfigWithEnv();
     console.log('');
     if (!sqlFilePath) {
         fatal('No SQL file specified', 'usage: relq import <sql-file> [options]\n\n' +
@@ -360,7 +362,7 @@ export async function importCommand(sqlFilePath, options = {}, projectRoot = pro
         console.log(`${colors.yellow('Dry run mode')} - no files written`);
         console.log('');
         console.log('Would write:');
-        const dryRunOutputPath = options.output || './db/schema.ts';
+        const dryRunOutputPath = options.output || getSchemaPath(config);
         const dryRunAbsPath = path.resolve(projectRoot, dryRunOutputPath);
         console.log(`  ${colors.cyan(dryRunAbsPath)} ${colors.gray(`(${formatBytes(finalTypescriptContent.length)})`)}`);
         console.log(`  ${colors.cyan(path.join(projectRoot, '.relq/snapshot.json'))}`);
@@ -370,7 +372,7 @@ export async function importCommand(sqlFilePath, options = {}, projectRoot = pro
         console.log('');
         return;
     }
-    const outputPath = options.output || './db/schema.ts';
+    const outputPath = options.output || getSchemaPath(config);
     const absoluteOutputPath = path.resolve(projectRoot, outputPath);
     const outputDir = path.dirname(absoluteOutputPath);
     if (!fs.existsSync(outputDir)) {

package/dist/esm/cli/commands/pull.js

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { requireValidConfig } from "../utils/config-loader.js";
+import { requireValidConfig, getSchemaPath } from "../utils/config-loader.js";
 import { fastIntrospectDatabase } from "../utils/fast-introspect.js";
 import { introspectedToParsedSchema } from "../utils/ast-transformer.js";
 import { generateTypeScriptFromAST } from "../utils/ast-codegen.js";
@@ -144,7 +144,7 @@ export async function pullCommand(context) {
     const noCommit = flags['no-commit'] === true;
     const dryRun = flags['dry-run'] === true;
     const author = config.author || 'Relq CLI';
-    const schemaPathRaw = typeof config.schema === 'string' ? config.schema : './db/schema.ts';
+    const schemaPathRaw = getSchemaPath(config);
     const schemaPath = path.resolve(projectRoot, schemaPathRaw);
     const includeFunctions = config.includeFunctions ?? true;
     const includeTriggers = config.includeTriggers ?? true;

package/dist/esm/cli/commands/validate.js

@@ -0,0 +1,33 @@
+import * as path from 'path';
+import { getSchemaPath } from "../utils/config-loader.js";
+import { validateSchemaFile, formatValidationErrors } from "../utils/schema-validator.js";
+import { colors, success } from "../utils/cli-utils.js";
+export async function validateCommand(context) {
+    const { config, args, projectRoot } = context;
+    console.log('');
+    let schemaPath;
+    if (args.length > 0) {
+        schemaPath = path.resolve(projectRoot, args[0]);
+    }
+    else {
+        schemaPath = path.resolve(projectRoot, getSchemaPath(config ?? undefined));
+    }
+    const relativePath = path.relative(process.cwd(), schemaPath);
+    console.log(`Validating ${colors.cyan(relativePath)}...`);
+    console.log('');
+    const result = validateSchemaFile(schemaPath);
+    if (result.valid) {
+        success('Schema is valid');
+        console.log('');
+        console.log(`   No syntax errors found in ${relativePath}`);
+        console.log('');
+        return;
+    }
+    console.log(colors.red(`error: Schema has ${result.errors.length} syntax error(s)`));
+    console.log('');
+    console.log(formatValidationErrors(result));
+    console.log(colors.yellow('hint:') + ' Fix the errors above before running other commands');
+    console.log('');
+    process.exit(1);
+}
+export default validateCommand;

package/dist/esm/cli/index.js

@@ -21,6 +21,7 @@ import { mergeCommand } from "./commands/merge.js";
 import { tagCommand } from "./commands/tag.js";
 import { cherryPickCommand } from "./commands/cherry-pick.js";
 import { remoteCommand } from "./commands/remote.js";
+import { validateCommand } from "./commands/validate.js";
 import * as fs from 'fs';
 import * as path from 'path';
 function loadEnvFile() {
@@ -125,6 +126,7 @@ Sync Commands:
   sync                Pull + push in one command
 
 Other Commands:
+  validate            Check schema for errors
   diff [--sql]        Show schema differences
   generate            Generate TypeScript types
   introspect          Parse database schema
@@ -157,7 +159,7 @@ function printVersion() {
     console.log(`relq v${VERSION}`);
 }
 function requiresConfig(command) {
-    return !['init', 'introspect', 'import', 'help', 'version'].includes(command);
+    return !['init', 'introspect', 'import', 'help', 'version', 'validate'].includes(command);
 }
 function requiresDbConnection(command, flags) {
     const alwaysNeedDb = ['pull', 'push', 'fetch', 'introspect'];
@@ -319,6 +321,9 @@ async function main() {
             case 'introspect':
                 await introspectCommand(context);
                 break;
+            case 'validate':
+                await validateCommand(context);
+                break;
             case 'sync':
                 await syncCommand(context);
                 break;

package/dist/esm/cli/utils/config-loader.js

@@ -73,6 +73,23 @@ export function validateConfig(config) {
     }
     return errors;
 }
+export function getSchemaPath(config, defaultPath = './db/schema.ts') {
+    if (!config)
+        return defaultPath;
+    if (typeof config.schema === 'string' && config.schema.length > 0) {
+        return config.schema;
+    }
+    if (typeof config.schema === 'object' && config.schema?.directory) {
+        return `${config.schema.directory}/schema.ts`;
+    }
+    if (config.generate?.outDir) {
+        return `${config.generate.outDir}/schema.ts`;
+    }
+    if (config.typeGeneration?.output) {
+        return config.typeGeneration.output;
+    }
+    return defaultPath;
+}
 export async function requireValidConfig(config, options) {
     const errors = validateConfig(config);
     if (errors.length === 0)
@@ -110,3 +127,25 @@ export async function requireValidConfig(config, options) {
     console.error('');
     process.exit(1);
 }
+export async function requireValidSchema(schemaPath, flags = {}) {
+    if (flags['skip-validation'] === true) {
+        return true;
+    }
+    const { validateSchemaFile, formatValidationErrors } = await import("./schema-validator.js");
+    const result = validateSchemaFile(schemaPath);
+    if (result.valid) {
+        return true;
+    }
+    const colors = {
+        red: (s) => `\x1b[31m${s}\x1b[0m`,
+        yellow: (s) => `\x1b[33m${s}\x1b[0m`,
+        cyan: (s) => `\x1b[36m${s}\x1b[0m`,
+    };
+    console.error('');
+    console.error(colors.red('error:') + ` Schema has ${result.errors.length} syntax error(s)`);
+    console.error('');
+    console.error(formatValidationErrors(result));
+    console.error(colors.yellow('hint:') + ` Fix the errors above, or use ${colors.cyan('--skip-validation')} to bypass`);
+    console.error('');
+    process.exit(1);
+}

package/dist/esm/cli/utils/schema-validator.js

@@ -0,0 +1,110 @@
+import * as ts from 'typescript';
+import * as fs from 'fs';
+import * as path from 'path';
+export function validateSchemaFile(schemaPath) {
+    const absolutePath = path.resolve(schemaPath);
+    if (!fs.existsSync(absolutePath)) {
+        return {
+            valid: false,
+            errors: [{
+                    line: 0,
+                    column: 0,
+                    message: `Schema file not found: ${absolutePath}`,
+                    code: -1,
+                }],
+            filePath: absolutePath,
+        };
+    }
+    const content = fs.readFileSync(absolutePath, 'utf-8');
+    const sourceFile = ts.createSourceFile(absolutePath, content, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const errors = [];
+    const compilerOptions = {
+        target: ts.ScriptTarget.ESNext,
+        module: ts.ModuleKind.ESNext,
+        strict: false,
+        skipLibCheck: true,
+        noEmit: true,
+        moduleResolution: ts.ModuleResolutionKind.NodeNext,
+    };
+    const program = ts.createProgram([absolutePath], compilerOptions, {
+        getSourceFile: (fileName) => {
+            if (fileName === absolutePath)
+                return sourceFile;
+            return ts.createSourceFile(fileName, '', ts.ScriptTarget.Latest, true);
+        },
+        getDefaultLibFileName: () => 'lib.d.ts',
+        writeFile: () => { },
+        getCurrentDirectory: () => path.dirname(absolutePath),
+        getDirectories: () => [],
+        fileExists: (fileName) => fileName === absolutePath || fs.existsSync(fileName),
+        readFile: (fileName) => {
+            if (fileName === absolutePath)
+                return content;
+            try {
+                return fs.readFileSync(fileName, 'utf-8');
+            }
+            catch {
+                return undefined;
+            }
+        },
+        getCanonicalFileName: (fileName) => fileName,
+        useCaseSensitiveFileNames: () => true,
+        getNewLine: () => '\n',
+    });
+    const syntacticDiagnostics = program.getSyntacticDiagnostics(sourceFile);
+    for (const diagnostic of syntacticDiagnostics) {
+        if (diagnostic.file && diagnostic.start !== undefined) {
+            const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+            errors.push({
+                line: line + 1,
+                column: character + 1,
+                message: ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                code: diagnostic.code,
+            });
+        }
+        else {
+            errors.push({
+                line: 0,
+                column: 0,
+                message: ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                code: diagnostic.code,
+            });
+        }
+    }
+    return {
+        valid: errors.length === 0,
+        errors,
+        filePath: absolutePath,
+    };
+}
+export function formatValidationErrors(result) {
+    if (result.valid) {
+        return '';
+    }
+    const lines = [];
+    const relativePath = path.relative(process.cwd(), result.filePath);
+    for (const error of result.errors) {
+        if (error.line > 0) {
+            lines.push(`   ${relativePath}:${error.line}:${error.column}`);
+            lines.push(`   │`);
+            try {
+                const content = fs.readFileSync(result.filePath, 'utf-8');
+                const fileLine = content.split('\n')[error.line - 1];
+                if (fileLine !== undefined) {
+                    const trimmedLine = fileLine.substring(0, 60);
+                    lines.push(`${error.line.toString().padStart(3)} │ ${trimmedLine}${fileLine.length > 60 ? '...' : ''}`);
+                    lines.push(`   │ ${' '.repeat(error.column - 1)}^`);
+                }
+            }
+            catch {
+            }
+            lines.push(`   │`);
+            lines.push(`   └─ ${error.message}`);
+        }
+        else {
+            lines.push(`   ${error.message}`);
+        }
+        lines.push('');
+    }
+    return lines.join('\n');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",