alasql 4.18.0 → 4.19.0

package/dist/precompile/index.js

@@ -49,8 +49,11 @@ function compileToJS(sql, databaseid) {
 		const orderfn = ${orderfnStr};
 		const removeKeys = ${JSON.stringify(query.removeKeys || [])};
 		const distinct = ${JSON.stringify(query.distinct)};
-		const limit = ${JSON.stringify(query.limit)};
-		const offset = ${JSON.stringify(query.offset)};
+		const fixedLimit = ${JSON.stringify(query.limit)};
+		const fixedOffset = ${JSON.stringify(query.offset)};
+		const limitParam = ${JSON.stringify(query.limitParam)};
+		const offsetParam = ${JSON.stringify(query.offsetParam)};
+		const percent = ${JSON.stringify(query.percent)};
 		const alias = ${alias};
 		
 		// Get data from source (either params or database table)
@@ -67,6 +70,8 @@ function compileToJS(sql, databaseid) {
 		}
 		
 		// Execute query
+		const limit = typeof limitParam !== 'undefined' ? (params ? params[limitParam] : undefined) : fixedLimit;
+		const offset = typeof offsetParam !== 'undefined' ? (params ? params[offsetParam] : undefined) : fixedOffset;
 		let result = [];
 		for (let i = 0; i < data.length; i++) {
 			const p = {};
@@ -101,11 +106,15 @@ function compileToJS(sql, databaseid) {
 		}
 		
 		// Apply OFFSET and LIMIT
-		if (offset) {
-			result = result.slice(offset);
-		}
 		if (limit) {
-			result = result.slice(0, limit);
+			let start = offset | 0 || 0;
+			start = start < 0 ? 0 : start;
+			const end = percent ? (((result.length * limit) / 100) | 0) + start : (limit | 0) + start;
+			result = result.slice(start, end);
+		} else if (offset) {
+			let start = offset | 0 || 0;
+			start = start < 0 ? 0 : start;
+			result = result.slice(start);
 		}
 		
 		if (cb) cb(result);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alasql",
 	"description": "Use SQL to select and filter javascript data - including relational joins and search in nested objects (JSON). Export to and import from Excel and CSV",
-	"version": "4.18.0",
+	"version": "4.19.0",
 	"author": "Andrey Gershun <agershun@gmail.com>",
 	"contributors": [
 		"Mathias Wulff <m@rawu.dk>"
@@ -64,11 +64,11 @@
 		"blueimp-md5": "2.19.0",
 		"cmdmix": "2.2.2",
 		"dom-storage": "2.1.0",
-		"esbuild": "0.28.1",
+		"esbuild": "0.28.2",
 		"git-branch-is": "5.0.0",
 		"husky": "9.1.7",
 		"jison": "^0.4.18",
-		"open": "11.0.0",
+		"open": "11.0.1",
 		"prettier": "3.8.3",
 		"react-native-fetch-blob": "^0.10.8",
 		"rexreplace": "7.1.14",

package/types/alasql.d.ts

@@ -39,8 +39,67 @@ declare module 'alasql' {
 		<T = unknown>(params?: any, cb?: AlaSQLCallback<T>, scope?: unknown): T;
 	}
 
+	type AlaSQLDefaultColumns = {[columnName: string]: string};
+
+	/**
+	 * Base parsed expression node.
+	 * Node shapes below are part of the public parser AST surface and follow semver.
+	 */
+	interface AlaSQLExpression {
+		toJS(context: string, tableid: string | number, defcols: AlaSQLDefaultColumns | null): string;
+	}
+
+	interface Op extends AlaSQLExpression {
+		left: ExpressionNode;
+		op: string;
+		right?: ExpressionNode;
+		right1?: ExpressionNode;
+		right2?: ExpressionNode;
+	}
+
+	interface Column extends AlaSQLExpression {
+		columnid: string;
+		tableid?: string;
+		databaseid?: string;
+	}
+
+	interface ParamValue extends AlaSQLExpression {
+		param: string | number;
+	}
+
+	interface NumValue extends AlaSQLExpression {
+		value: number;
+	}
+
+	interface StringValue extends AlaSQLExpression {
+		value: string;
+	}
+
+	interface LogicValue extends AlaSQLExpression {
+		value: boolean;
+	}
+
+	interface UniOp extends AlaSQLExpression {
+		op: string | null;
+		right: ExpressionNode;
+	}
+
+	type ExpressionNode = Op | Column | ParamValue | NumValue | StringValue | LogicValue | UniOp;
+
+	interface ExpressionWrapper extends AlaSQLExpression {
+		expression: ExpressionNode;
+		reduced?: boolean;
+	}
+
+	interface Statement {
+		compile(databaseid: string): AlaSQLStatement;
+		where?: ExpressionWrapper;
+		[key: string]: unknown;
+	}
+
 	// abstract Syntax Tree
 	interface AlaSQLAST {
+		statements: Statement[];
 		compile(databaseid: string): AlaSQLStatement;
 	}