@quereus/quereus 0.2.0 → 0.4.0

package/src/func/builtins/json-helpers.ts

@@ -1,5 +1,5 @@
 import { createLogger } from '../../common/logger.js';
-import type { SqlValue } from '../../common/types.js';
+import type { SqlValue, JSONValue } from '../../common/types.js';
 
 const log = createLogger('func:builtins:json-helpers');
 
@@ -9,12 +9,12 @@ const log = createLogger('func:builtins:json-helpers');
  * @param jsonString The string to parse as JSON
  * @returns The parsed value or null if parsing failed
  */
-export function safeJsonParse(jsonString: SqlValue): any | null {
+export function safeJsonParse(jsonString: SqlValue): JSONValue | null {
 	if (typeof jsonString !== 'string') {
 		return null;
 	}
 	try {
-		return JSON.parse(jsonString);
+		return JSON.parse(jsonString) as JSONValue;
 	} catch {
 		return null;
 	}
@@ -32,14 +32,14 @@ export function safeJsonParse(jsonString: SqlValue): any | null {
  * @returns Path resolution information or null if the path is invalid
  */
 export function resolveJsonPathForModify(
-	data: any,
+	data: JSONValue,
 	path: string,
 	createParents: boolean = false
-): { parent: any; key: string | number; value: any; exists: boolean } | null {
+): { parent: JSONValue | null; key: string | number; value: JSONValue | undefined; exists: boolean } | null {
 	if (!path || typeof path !== 'string') return null;
 
-	let current = data;
-	let parent: any = null;
+	let current: JSONValue | undefined = data;
+	let parent: JSONValue | null = null;
 	let finalKey: string | number | null = null;
 	let remainingPath = path.startsWith('$') ? path.substring(1) : path;
 
@@ -48,7 +48,7 @@ export function resolveJsonPathForModify(
 	}
 
 	while (remainingPath.length > 0) {
-		parent = current;
+		parent = current as JSONValue;
 		finalKey = null;
 
 		if (current === undefined || current === null) return null;
@@ -67,19 +67,19 @@ export function resolveJsonPathForModify(
 				keyStr = match[1];
 				remainingPath = remainingPath.substring(keyStr.length);
 			}
-			if (typeof current !== 'object' || Array.isArray(current)) {
+			if (typeof current !== 'object' || current === null || Array.isArray(current)) {
 				if (!createParents || typeof parent !== 'object' || parent === null || Array.isArray(parent) || typeof finalKey !== 'string') {
 					return { parent, key: keyStr, value: undefined, exists: false };
 				}
 				log(`JSON Path: Creating intermediate object for key "%s"`, finalKey);
-				parent[finalKey] = {};
-				current = parent[finalKey];
+				(parent as Record<string, JSONValue>)[finalKey] = {};
+				current = (parent as Record<string, JSONValue>)[finalKey];
 				parent = current;
 				finalKey = keyStr;
-				current = current[keyStr];
+				current = (current as Record<string, JSONValue>)[keyStr];
 			} else {
 				finalKey = keyStr;
-				current = current[keyStr];
+				current = (current as Record<string, JSONValue>)[keyStr];
 			}
 
 		} else if (remainingPath.startsWith('[')) {
@@ -95,13 +95,13 @@ export function resolveJsonPathForModify(
 				if (!createParents || parent === null || finalKey === null) {
 					return { parent, key: index, value: undefined, exists: false };
 				}
-				const newParentArray: any[] = [];
+				const newParentArray: JSONValue[] = [];
 				if (Array.isArray(parent) && typeof finalKey === 'number') {
 					log(`JSON Path: Creating intermediate array for index %d`, finalKey);
 					parent[finalKey] = newParentArray;
-				} else if (typeof parent === 'object' && !Array.isArray(parent) && typeof finalKey === 'string') {
+				} else if (typeof parent === 'object' && parent !== null && !Array.isArray(parent) && typeof finalKey === 'string') {
 					log(`JSON Path: Creating intermediate array for key "%s"`, finalKey);
-					parent[finalKey] = newParentArray;
+					(parent as Record<string, JSONValue>)[finalKey] = newParentArray;
 				} else {
 					return { parent, key: index, value: undefined, exists: false };
 				}
@@ -134,7 +134,7 @@ export function resolveJsonPathForModify(
  * @param value The SQL value to convert
  * @returns A JSON-compatible value
  */
-export function prepareJsonValue(value: SqlValue): any {
+export function prepareJsonValue(value: SqlValue): JSONValue {
 	if (typeof value === 'bigint') {
 		if (value >= Number.MIN_SAFE_INTEGER && value <= Number.MAX_SAFE_INTEGER) {
 			return Number(value);
@@ -185,7 +185,7 @@ export function deepCopyJson(data: any): any {
  * @param value The value to check
  * @returns The SQLite JSON type name ('null', 'true', 'false', 'integer', 'real', 'text', 'array', 'object')
  */
-export function getJsonType(value: any): string {
+export function getJsonType(value: JSONValue): string {
 	if (value === null) return 'null';
 	switch (typeof value) {
 		case 'boolean': return value ? 'true' : 'false';
@@ -208,7 +208,7 @@ export function getJsonType(value: any): string {
  * @param path The path to evaluate
  * @returns The value at the path or undefined if not found
  */
-export function evaluateJsonPathBasic(data: any, path: string): any | undefined {
+export function evaluateJsonPathBasic(data: JSONValue, path: string): JSONValue | undefined {
 	if (!path || path === '$') return data;
 
 	const parts = path.startsWith('$.') ? path.substring(2).split('.') :
@@ -227,8 +227,8 @@ export function evaluateJsonPathBasic(data: any, path: string): any | undefined
 			} else {
 				return undefined;
 			}
-		} else if (typeof current === 'object' && current !== null && Object.prototype.hasOwnProperty.call(current, part)) {
-			current = current[part];
+		} else if (typeof current === 'object' && current !== null && !Array.isArray(current) && Object.prototype.hasOwnProperty.call(current, part)) {
+			current = (current as Record<string, JSONValue>)[part];
 		} else {
 			return undefined;
 		}

package/src/func/builtins/json-tvf.ts

@@ -1,5 +1,4 @@
-import type { Row } from "../../common/types.js";
-import type { SqlValue } from "../../common/types.js";
+import type { Row, SqlValue, JSONValue } from "../../common/types.js";
 import { SqlDataType } from "../../common/types.js";
 import { createTableValuedFunction } from "../registration.js";
 import { QuereusError } from "../../common/errors.js";
@@ -42,13 +41,13 @@ export const jsonEachFunc = createTableValuedFunction(
 		}
 
 		const rootPathStr = (typeof rootPath === 'string' && rootPath) ? rootPath : null;
-		let startNode = parsedJson;
+		let startNode: JSONValue | undefined = parsedJson;
 
 		if (rootPathStr) {
 			startNode = evaluateJsonPathBasic(startNode, rootPathStr);
 		}
 
-		const localStack: { value: any; parentPath: string; parentKey: string | number | null; parentId: number; }[] = [];
+		const localStack: { value: JSONValue; parentPath: string; parentKey: string | number | null; parentId: number; }[] = [];
 		let localElementIdCounter = 0;
 
 		if (startNode !== undefined) {
@@ -70,8 +69,8 @@ export const jsonEachFunc = createTableValuedFunction(
 			const path = currentState.parentPath;
 			const fullkey = key !== null ? `${path}${typeof key === 'number' ? `[${key}]` : `.${key}`}` : path;
 			const type = getJsonType(currentValue);
-			const atom = (type === 'object' || type === 'array') ? null : currentValue;
-			const valueForColumn = (type === 'object' || type === 'array') ? jsonStringify(currentValue) : currentValue;
+			const atom: SqlValue = (type === 'object' || type === 'array') ? null : currentValue as SqlValue;
+			const valueForColumn: SqlValue = (type === 'object' || type === 'array') ? jsonStringify(currentValue) : currentValue as SqlValue;
 
 			const row: Row = [
 				key,
@@ -93,11 +92,11 @@ export const jsonEachFunc = createTableValuedFunction(
 						parentId: id,
 					});
 				}
-			} else if (typeof currentValue === 'object' && currentValue !== null) {
+			} else if (typeof currentValue === 'object' && currentValue !== null && !Array.isArray(currentValue)) {
 				const keys = Object.keys(currentValue).sort().reverse();
 				for (const objKey of keys) {
 					localStack.push({
-						value: currentValue[objKey],
+						value: (currentValue as Record<string, JSONValue>)[objKey],
 						parentPath: fullkey,
 						parentKey: objKey,
 						parentId: id,
@@ -144,7 +143,7 @@ export const jsonTreeFunc = createTableValuedFunction(
 		}
 
 		const rootPathStr = (typeof rootPath === 'string' && rootPath) ? rootPath : null;
-		let startNode = parsedJson;
+		let startNode: JSONValue | undefined = parsedJson;
 
 		if (rootPathStr) {
 			startNode = evaluateJsonPathBasic(startNode, rootPathStr);

package/src/func/builtins/json.ts

@@ -3,7 +3,7 @@ import type { Operation } from 'fast-json-patch';
 const { applyPatch } = fastJsonPatch;
 
 import { createLogger } from '../../common/logger.js';
-import type { SqlValue } from '../../common/types.js';
+import type { SqlValue, JSONValue } from '../../common/types.js';
 import { createScalarFunction, createAggregateFunction } from '../registration.js';
 import { safeJsonParse, resolveJsonPathForModify, prepareJsonValue, deepCopyJson, getJsonType } from './json-helpers.js';
 
@@ -27,7 +27,7 @@ export const jsonTypeFunc = createScalarFunction(
 		const data = safeJsonParse(json);
 		if (data === null && typeof json === 'string') return null; // Invalid JSON input
 
-		let targetValue = data;
+		let targetValue: JSONValue | undefined = data;
 		if (path !== undefined && path !== null) {
 			if (typeof path !== 'string') return 'null'; // Invalid path
 			const resolved = resolveJsonPathForModify(data, path);
@@ -35,7 +35,7 @@ export const jsonTypeFunc = createScalarFunction(
 			// If path evaluation leads nowhere, SQLite returns NULL type
 			if (targetValue === undefined) return null;
 		}
-		return getJsonType(targetValue);
+		return getJsonType(targetValue as JSONValue);
 	}
 );
 
@@ -174,7 +174,7 @@ export const jsonArrayLengthFunc = createScalarFunction(
 		const data = safeJsonParse(json);
 		if (data === null && typeof json === 'string') return null;
 
-		let targetValue = data;
+		let targetValue: JSONValue | undefined = data;
 		if (path !== undefined && path !== null) {
 			if (typeof path !== 'string') return 0; // Invalid path -> 0 length
 			const resolved = resolveJsonPathForModify(data, path);
@@ -204,7 +204,7 @@ export const jsonPatchFunc = createScalarFunction(
 		if (!Array.isArray(patchData)) return null; // Invalid patch JSON (must be array)
 
 		// Ensure patch operations have the correct structure (basic check)
-		const patch = patchData as Operation[];
+		const patch = patchData as unknown as Operation[];
 		if (!patch.every(op => typeof op === 'object' && op !== null && 'op' in op && 'path' in op)) {
 			return null; // Invalid operation structure
 		}
@@ -215,6 +215,7 @@ export const jsonPatchFunc = createScalarFunction(
 			// If data came from elsewhere, we might need deepCopyJson first.
 			const result = applyPatch(data, patch, true /* validate operations */).newDocument;
 			return JSON.stringify(result);
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		} catch (e: any) {
 			errorLog('json_patch failed: %s, %O', e?.message, e);
 			return null; // Return NULL on patch failure
@@ -258,8 +259,8 @@ export const jsonInsertFunc = createScalarFunction(
 						parent.splice(key, 0, preparedValue); // Insert *before* existing element
 					}
 					// Ignore if key > parent.length?
-				} else if (typeof parent === 'object' && typeof key === 'string') {
-					parent[key] = preparedValue;
+				} else if (typeof parent === 'object' && parent !== null && !Array.isArray(parent) && typeof key === 'string') {
+					(parent as Record<string, JSONValue>)[key] = preparedValue;
 				}
 				// else: Cannot insert into non-container or invalid key type - ignore
 			}
@@ -404,9 +405,9 @@ export const jsonRemoveFunc = createScalarFunction(
 				if (key >= 0 && key < parent.length) {
 					parent.splice(key, 1); // Remove array element
 				}
-			} else if (typeof parent === 'object' && typeof key === 'string') {
+			} else if (typeof parent === 'object' && parent !== null && !Array.isArray(parent) && typeof key === 'string') {
 				if (Object.prototype.hasOwnProperty.call(parent, key)) {
-					delete parent[key]; // Remove object property
+					delete (parent as Record<string, JSONValue>)[key]; // Remove object property
 				}
 			}
 			// else: Cannot remove from non-container or invalid key type - ignore

package/src/func/builtins/schema.ts

@@ -6,6 +6,9 @@ import { QuereusError } from "../../common/errors.js";
 import { StatusCode } from "../../common/types.js";
 import type { Database } from "../../core/database.js";
 import type { FunctionSchema } from "../../schema/function.js";
+import { isScalarFunctionSchema, isTableValuedFunctionSchema, isAggregateFunctionSchema, isWindowFunctionSchema } from "../../schema/function.js";
+import { Schema } from "../../schema/schema.js";
+import { ColumnSchema } from "../../schema/column.js";
 
 /**
  * Generates a function signature string for display
@@ -41,12 +44,12 @@ export const schemaFunc = createIntegratedTableValuedFunction(
 		try {
 			const schemaManager = db.schemaManager;
 
-			const processSchemaInstance = function* (schemaInstance: any) {
+			const processSchemaInstance = function* (schemaInstance: Schema) {
 				// Process Tables
 				for (const tableSchema of schemaInstance.getAllTables()) {
 					let createSql: string | null = null;
 					try {
-						const columnsStr = tableSchema.columns.map((c: any) => `"${c.name}" ${c.affinity ?? SqlDataType.TEXT}`).join(', ');
+						const columnsStr = tableSchema.columns.map((c: ColumnSchema) => `"${c.name}" ${c.affinity ?? SqlDataType.TEXT}`).join(', ');
 						const argsStr = Object.entries(tableSchema.vtabArgs ?? {}).map(([key, value]) => `${key}=${value}`).join(', ');
 						createSql = `create table "${tableSchema.name}" (${columnsStr}) using ${tableSchema.vtabModuleName}(${argsStr})`;
 					} catch {
@@ -78,6 +81,7 @@ export const schemaFunc = createIntegratedTableValuedFunction(
 			// Process temp schema
 			yield* processSchemaInstance(schemaManager.getTempSchema());
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		} catch (error: any) {
 			// If schema introspection fails, yield an error row
 			yield ['error', 'schema_error', 'schema_error', `Failed to introspect schema: ${error.message}`];
@@ -131,6 +135,7 @@ export const tableInfoFunc = createIntegratedTableValuedFunction(
 					isPrimaryKey ? 1 : 0                // pk
 				];
 			}
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		} catch (error: any) {
 			// If table info fails, yield an error row
 			yield [0, 'error', 'error', 1, `Failed to get table info: ${error.message}`, 0];
@@ -164,14 +169,28 @@ export const functionInfoFunc = createIntegratedTableValuedFunction(
 		try {
 			const schemaManager = db.schemaManager;
 
-			const processFunctions = function* (schemaInstance: any) {
+			const processFunctions = function* (schemaInstance: Schema) {
 				for (const funcSchema of schemaInstance._getAllFunctions()) {
 					const isDeterministic = (funcSchema.flags & 0x800) !== 0; // FunctionFlags.DETERMINISTIC
 
+					// Determine function type based on schema type guards
+					let functionType: string;
+					if (isScalarFunctionSchema(funcSchema)) {
+						functionType = 'scalar';
+					} else if (isTableValuedFunctionSchema(funcSchema)) {
+						functionType = 'table';
+					} else if (isAggregateFunctionSchema(funcSchema)) {
+						functionType = 'aggregate';
+					} else if (isWindowFunctionSchema(funcSchema)) {
+						functionType = 'window';
+					} else {
+						functionType = 'unknown';
+					}
+
 					yield [
 						funcSchema.name,                           // name
 						funcSchema.numArgs,                       // num_args
-						funcSchema.type,                          // type
+						functionType,                             // type
 						isDeterministic ? 1 : 0,                 // deterministic
 						funcSchema.flags,                         // flags
 						stringifyCreateFunction(funcSchema)       // signature
@@ -185,6 +204,7 @@ export const functionInfoFunc = createIntegratedTableValuedFunction(
 			// Process temp schema functions
 			yield* processFunctions(schemaManager.getTempSchema());
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		} catch (error: any) {
 			// If function info fails, yield an error row
 			yield ['error', -1, 'error', 0, 0, `Failed to get function info: ${error.message}`];

package/src/func/context.ts

@@ -109,12 +109,14 @@ export interface QuereusContext {
 	 * @param createIfNotFound If true and no context exists, creates a new empty object
 	 * @returns The aggregate context for the current group, or undefined
 	 */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	getAggregateContext<T = any>(createIfNotFound?: boolean): T | undefined;
 
 	/**
 	 * Sets the context (accumulator) for an aggregate function.
 	 * @param context The new state for the aggregate context
 	 */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	setAggregateContext<T = any>(context: T): void;
 }
 
@@ -133,6 +135,7 @@ export class FunctionContext implements QuereusContext {
 	private userData: unknown;
 	private db: Database;
 	private auxData: Map<number, { data: unknown, destructor?: (data: unknown) => void }> = new Map();
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	private _aggregateContext: any | undefined = undefined;
 
 	constructor(db: Database, userData?: unknown) {
@@ -171,6 +174,7 @@ export class FunctionContext implements QuereusContext {
 	/**
 	 * @internal Sets the aggregate context reference from VDBE
 	 */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	_setAggregateContextRef(contextRef: any | undefined): void {
 		this._aggregateContext = contextRef;
 	}
@@ -178,6 +182,7 @@ export class FunctionContext implements QuereusContext {
 	/**
 	 * @internal Gets the potentially modified aggregate context
 	 */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	_getAggregateContextRef(): any | undefined {
 		return this._aggregateContext;
 	}
@@ -224,6 +229,7 @@ export class FunctionContext implements QuereusContext {
 		}
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	getAggregateContext<T = any>(createIfNotFound: boolean = false): T | undefined {
 		if (this._aggregateContext === undefined && createIfNotFound) {
 			return {} as T;
@@ -231,6 +237,7 @@ export class FunctionContext implements QuereusContext {
 		return this._aggregateContext as T | undefined;
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	setAggregateContext<T = any>(context: T): void {
 		this._aggregateContext = context;
 	}

package/src/func/registration.ts

@@ -36,6 +36,10 @@ interface TableValuedFuncOptions {
 	returnType?: RelationType;
 }
 
+/* Interim values for aggregate functions don't have to be SqlValue; they can be anything */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type AggValue = any;
+
 /**
  * Configuration options for aggregate functions
  */
@@ -49,7 +53,7 @@ interface AggregateFuncOptions {
 	/** Whether the function is deterministic (affects caching) */
 	deterministic?: boolean;
 	/** Initial accumulator value */
-	initialValue?: any;
+	initialValue?: AggValue;
 	/** Return type information */
 	returnType?: ScalarType;
 }

package/src/index.ts

@@ -11,7 +11,7 @@ export { Statement } from './core/statement.js';
 
 // Common data types and constants
 export { StatusCode, SqlDataType } from './common/types.js';
-export type { SqlValue, SqlParameters, Row, MaybePromise } from './common/types.js';
+export type { SqlValue, SqlParameters, Row, MaybePromise, RowOp } from './common/types.js';
 export { ConflictResolution, IndexConstraintOp, VTabConfig, FunctionFlags } from './common/constants.js';
 export { QuereusError, MisuseError, ConstraintError, unwrapError, formatErrorChain, getPrimaryError } from './common/errors.js';
 export type { ErrorInfo } from './common/errors.js';
@@ -49,7 +49,7 @@ export {
 
 // SQL Parser and Compiler
 export { Parser } from './parser/parser.js';
-export { Lexer, TokenType } from './parser/lexer.js';
+export { Lexer, TokenType, KEYWORDS } from './parser/lexer.js';
 export { ParseError } from './parser/parser.js';
 
 // Schema management
@@ -82,7 +82,7 @@ export { Latches } from './util/latches.js';
 import './runtime/register.js';
 
 // Re-export plugin system
-export { dynamicLoadModule, validatePluginUrl } from './util/plugin-loader.js';
+export { dynamicLoadModule, validatePluginUrl, loadPlugin } from './util/plugin-loader.js';
 export type {
 	PluginManifest,
 	PluginRecord,