@sqg/sqg 0.3.0 → 0.4.0

package/dist/sqg.mjs

@@ -26,7 +26,7 @@ import estree from "prettier/plugins/estree";
 * This file enables self-documenting CLI help and validation.
 */
 /** Supported database engines */
-const SUPPORTED_ENGINES = [
+const DB_ENGINES = [
 	"sqlite",
 	"duckdb",
 	"postgres"
@@ -114,7 +114,7 @@ function formatGeneratorsHelp() {
 * Format engines for CLI help output
 */
 function formatEnginesHelp() {
-	return SUPPORTED_ENGINES.map((e) => `  ${e}`).join("\n");
+	return DB_ENGINES.map((e) => `  ${e}`).join("\n");
 }
 
 //#endregion
@@ -406,11 +406,15 @@ function parseSQLQueries(filePath, extraVariables) {
 	const queries = [];
 	const tables = [];
 	const cursor = parser.parse(content).cursor();
+	function getLineNumber(position) {
+		return content.slice(0, position).split("\n").length;
+	}
 	function getStr(nodeName, optional = false) {
 		const node = cursor.node.getChild(nodeName);
 		if (!node) {
 			if (optional) return;
-			throw new Error(`${nodeName} not found`);
+			const lineNumber = getLineNumber(cursor.node.from);
+			throw new Error(`Node '${nodeName}' not found at line ${lineNumber}`);
 		}
 		return nodeStr(node);
 	}
@@ -1328,6 +1332,9 @@ var BaseGenerator = class {
 	isCompatibleWith(_engine) {
 		return true;
 	}
+	supportsAppenders(_engine) {
+		return false;
+	}
 	functionReturnType(query) {
 		if (query.isOne) return this.rowType(query);
 		return this.typeMapper.formatListType(this.rowType(query));
@@ -1351,6 +1358,9 @@ var JavaGenerator = class extends BaseGenerator {
 		super(template, new JavaTypeMapper());
 		this.template = template;
 	}
+	supportsAppenders(engine) {
+		return engine === "duckdb";
+	}
 	getFunctionName(id) {
 		return camelCase$1(id);
 	}
@@ -1450,11 +1460,14 @@ var JavaDuckDBArrowGenerator = class extends BaseGenerator {
 			generator: "java/jdbc",
 			output: gen.output,
 			config: gen.config
-		}, this.javaGenerator, name, q, tables);
+		}, this.javaGenerator, name, q, tables, "duckdb");
 	}
 	isCompatibleWith(engine) {
 		return engine === "duckdb";
 	}
+	supportsAppenders(_engine) {
+		return true;
+	}
 	getFilename(sqlFileName) {
 		return this.javaGenerator.getFilename(sqlFileName);
 	}
@@ -1462,25 +1475,28 @@ var JavaDuckDBArrowGenerator = class extends BaseGenerator {
 		return this.javaGenerator.getClassName(name);
 	}
 	mapType(column) {
-		const { type, nullable } = column;
+		const { type } = column;
 		if (typeof type === "string") {
 			const mappedType = {
 				INTEGER: "IntVector",
+				BIGINT: "BigIntVector",
 				BOOLEAN: "BitVector",
 				DOUBLE: "Float8Vector",
 				FLOAT: "Float4Vector",
 				VARCHAR: "VarCharVector",
-				TEXT: "VarCharVector"
+				TEXT: "VarCharVector",
+				TIMESTAMP: "TimeStampVector",
+				DATE: "DateDayVector",
+				TIME: "TimeMicroVector"
 			}[type.toUpperCase()];
 			if (!mappedType) consola.warn("(duckdb-arrow) Mapped type is unknown:", type);
 			return mappedType ?? "Object";
 		}
-		const mockColumn = {
-			name: "",
-			type,
-			nullable
-		};
-		return this.typeMapper.getTypeName(mockColumn);
+		if (type instanceof ListType) return "ListVector";
+		if (type instanceof StructType) return "StructVector";
+		if (type instanceof MapType) return "MapVector";
+		consola.warn("(duckdb-arrow) Unknown complex type:", type);
+		return "Object";
 	}
 	mapParameterType(type, nullable) {
 		return this.typeMapper.getTypeName({
@@ -1688,6 +1704,9 @@ var TsDuckDBGenerator = class extends TsGenerator {
 	constructor(template) {
 		super(template);
 	}
+	supportsAppenders(_engine) {
+		return true;
+	}
 	async beforeGenerate(projectDir, gen, queries, tables) {
 		await super.beforeGenerate(projectDir, gen, queries, tables);
 		Handlebars.registerHelper("tsType", (column) => {
@@ -1750,7 +1769,7 @@ function getGenerator(generator) {
 
 //#endregion
 //#region src/sqltool.ts
-const GENERATED_FILE_COMMENT = "This file is generated by SQG. Do not edit manually.";
+const GENERATED_FILE_COMMENT = "This file is generated by SQG (https://sqg.dev). Do not edit manually.";
 const configSchema = z.object({ result: z.record(z.string(), z.string()).optional() });
 var Config = class Config {
 	constructor(result) {
@@ -1894,13 +1913,13 @@ var TableHelper = class {
 		return this.generator.typeMapper;
 	}
 };
-function generateSourceFile(name, queries, tables, templatePath, generator, config) {
+function generateSourceFile(name, queries, tables, templatePath, generator, engine, config) {
 	const templateSrc = readFileSync(templatePath, "utf-8");
 	const template = Handlebars.compile(templateSrc);
 	Handlebars.registerHelper("mapType", (column) => generator.mapType(column));
 	Handlebars.registerHelper("plusOne", (value) => value + 1);
 	const migrations = queries.filter((q) => q.isMigrate).map((q) => new SqlQueryHelper(q, generator, generator.getStatement(q)));
-	const tableHelpers = tables.filter((t) => !t.skipGenerateFunction).map((t) => new TableHelper(t, generator));
+	const tableHelpers = generator.supportsAppenders(engine) ? tables.filter((t) => !t.skipGenerateFunction).map((t) => new TableHelper(t, generator)) : [];
 	return template({
 		generatedComment: GENERATED_FILE_COMMENT,
 		migrations,
@@ -1920,7 +1939,7 @@ const ProjectSchema = z.object({
 	version: z.number().describe("Configuration version (currently 1)"),
 	name: z.string().min(1, "Project name is required").describe("Project name used for generated class names"),
 	sql: z.array(z.object({
-		engine: z.enum(SUPPORTED_ENGINES).describe(`Database engine: ${SUPPORTED_ENGINES.join(", ")}`),
+		engine: z.enum(DB_ENGINES).describe(`Database engine: ${DB_ENGINES.join(", ")}`),
 		files: z.array(z.string().min(1)).min(1, "At least one SQL file is required").describe("SQL files to process"),
 		gen: z.array(z.object({
 			generator: z.enum(GENERATOR_NAMES).describe(`Code generator: ${GENERATOR_NAMES.join(", ")}`),
@@ -1971,7 +1990,7 @@ function parseProjectConfig(filePath) {
 		const obj = parsed;
 		if (obj.sql && Array.isArray(obj.sql)) for (let i = 0; i < obj.sql.length; i++) {
 			const sqlConfig = obj.sql[i];
-			if (sqlConfig.engine && !SUPPORTED_ENGINES.includes(sqlConfig.engine)) throw new InvalidEngineError(String(sqlConfig.engine), [...SUPPORTED_ENGINES]);
+			if (sqlConfig.engine && !DB_ENGINES.includes(sqlConfig.engine)) throw new InvalidEngineError(String(sqlConfig.engine), [...DB_ENGINES]);
 			if (sqlConfig.gen && Array.isArray(sqlConfig.gen)) for (let j = 0; j < sqlConfig.gen.length; j++) {
 				const genConfig = sqlConfig.gen[j];
 				if (genConfig.generator && !GENERATOR_NAMES.includes(genConfig.generator)) {
@@ -2020,11 +2039,11 @@ function validateQueries(queries) {
 		};
 	}
 }
-async function writeGeneratedFile(projectDir, gen, generator, file, queries, tables = []) {
+async function writeGeneratedFile(projectDir, gen, generator, file, queries, tables, engine) {
 	await generator.beforeGenerate(projectDir, gen, queries, tables);
 	const templatePath = join(dirname(new URL(import.meta.url).pathname), gen.template ?? generator.template);
 	const name = gen.name ?? basename(file, extname(file));
-	const sourceFile = generateSourceFile(name, queries, tables, templatePath, generator, gen.config);
+	const sourceFile = generateSourceFile(name, queries, tables, templatePath, generator, engine, gen.config);
 	const outputPath = getOutputPath(projectDir, name, gen, generator);
 	writeFileSync(outputPath, sourceFile);
 	consola.success(`Generated ${outputPath}`);
@@ -2136,7 +2155,7 @@ async function processProject(projectPath) {
 				});
 			}
 			for (const gen of sql.gen) {
-				const outputPath = await writeGeneratedFile(projectDir, gen, getGenerator(gen.generator), sqlFile, queries, tables);
+				const outputPath = await writeGeneratedFile(projectDir, gen, getGenerator(gen.generator), sqlFile, queries, tables, sql.engine);
 				files.push(outputPath);
 			}
 		}
@@ -2394,7 +2413,7 @@ sql:
 async function initProject(options) {
 	const engine = options.engine || "sqlite";
 	const output = options.output || "./generated";
-	if (!SUPPORTED_ENGINES.includes(engine)) throw new InvalidEngineError(engine, [...SUPPORTED_ENGINES]);
+	if (!DB_ENGINES.includes(engine)) throw new InvalidEngineError(engine, [...DB_ENGINES]);
 	let generator;
 	if (options.generator) {
 		if (!(options.generator in SUPPORTED_GENERATORS)) {
@@ -2436,7 +2455,7 @@ Documentation: https://sqg.dev
 
 //#endregion
 //#region src/sqg.ts
-const version = process.env.npm_package_version ?? "0.3.0";
+const version = process.env.npm_package_version ?? "0.4.0";
 const description = process.env.npm_package_description ?? "SQG - SQL Query Generator - Type-safe code generation from SQL (https://sqg.dev)";
 consola.level = LogLevels.info;
 const program = new Command().name("sqg").description(`${description}
@@ -2486,7 +2505,7 @@ program.argument("<project>", "Path to the project YAML config (sqg.yaml)").hook
 		exit(1);
 	}
 });
-program.command("init").description("Initialize a new SQG project with example configuration").option("-e, --engine <engine>", `Database engine (${SUPPORTED_ENGINES.join(", ")})`, "sqlite").option("-g, --generator <generator>", `Code generator (${GENERATOR_NAMES.join(", ")})`).option("-o, --output <dir>", "Output directory for generated files", "./generated").option("-f, --force", "Overwrite existing files").action(async (options) => {
+program.command("init").description("Initialize a new SQG project with example configuration").option("-e, --engine <engine>", `Database engine (${DB_ENGINES.join(", ")})`, "sqlite").option("-g, --generator <generator>", `Code generator (${GENERATOR_NAMES.join(", ")})`).option("-o, --output <dir>", "Output directory for generated files", "./generated").option("-f, --force", "Overwrite existing files").action(async (options) => {
 	const parentOpts = program.opts();
 	try {
 		await initProject(options);

package/dist/templates/java-duckdb-arrow.hbs

@@ -69,7 +69,7 @@ public class {{className}} {
 public record {{rowType}}({{#each columns}}{{type}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) {}
 {{else}}
 public record {{rowType}}(PreparedStatement statement, RootAllocator allocator, ArrowReader reader,
-{{#each columns}}{{mapType this}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) implements AutoCloseable {
+{{#each columns}}{{{mapType this}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) implements AutoCloseable {
     public boolean loadNextBatch() throws IOException {
         return reader.loadNextBatch();
     }
@@ -99,7 +99,7 @@ int
 {{#*inline "readVectors"}}
 var root = reader.getVectorSchemaRoot();
 
-return new {{rowType}}(stmt, allocator, reader, {{#each columns}}({{mapType this}})root.getVector("{{name}}"){{#unless @last}}, {{/unless}}{{/each}});
+return new {{rowType}}(stmt, allocator, reader, {{#each columns}}({{{mapType this}}})root.getVector("{{name}}"){{#unless @last}}, {{/unless}}{{/each}});
 
 {{/inline~}}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqg/sqg",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "SQG - SQL Query Generator - Type-safe code generation from SQL (https://sqg.dev)",
   "type": "module",
   "bin": {