alasql 4.18.0 → 4.19.1

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.1",
 	"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.2",
 		"prettier": "3.8.3",
 		"react-native-fetch-blob": "^0.10.8",
 		"rexreplace": "7.1.14",
@@ -82,7 +82,7 @@
 		"json5": "2",
 		"underscore": "1",
 		"glob-parent": "6",
-		"decode-uri-component": "0.4",
+		"decode-uri-component": "0.5",
 		"semver": "7",
 		"follow-redirects": "^1.16.0",
 		"js-yaml": "4",

package/types/alasql.d.ts

@@ -4,11 +4,11 @@ declare module 'alasql' {
 	import * as xlsx from 'xlsx';
 
 	// Callback with error-first convention and optional data
-	interface AlaSQLCallback<T = unknown> {
+	export interface AlaSQLCallback<T = unknown> {
 		(err: Error | null, data?: T): void;
 	}
 
-	interface AlaSQLOptions {
+	export interface AlaSQLOptions {
 		errorlog: boolean;
 		valueof: boolean;
 		dropifnotexists: boolean; // drop database in any case
@@ -35,34 +35,100 @@ declare module 'alasql' {
 	}
 
 	// compiled Statement
-	interface AlaSQLStatement {
+	export interface AlaSQLStatement {
 		<T = unknown>(params?: any, cb?: AlaSQLCallback<T>, scope?: unknown): T;
 	}
 
+	export type AlaSQLDefaultColumns = {[columnName: string]: string};
+
+	/**
+	 * Base parsed expression node.
+	 * Node shapes below are part of the public parser AST surface and follow semver.
+	 */
+	export interface AlaSQLExpression {
+		toJS(context: string, tableid: string | number, defcols: AlaSQLDefaultColumns | null): string;
+	}
+
+	export interface Op extends AlaSQLExpression {
+		left: ExpressionNode;
+		op: string;
+		right?: ExpressionNode;
+		right1?: ExpressionNode;
+		right2?: ExpressionNode;
+	}
+
+	export interface Column extends AlaSQLExpression {
+		columnid: string;
+		tableid?: string;
+		databaseid?: string;
+	}
+
+	export interface ParamValue extends AlaSQLExpression {
+		param: string | number;
+	}
+
+	export interface NumValue extends AlaSQLExpression {
+		value: number;
+	}
+
+	export interface StringValue extends AlaSQLExpression {
+		value: string;
+	}
+
+	export interface LogicValue extends AlaSQLExpression {
+		value: boolean;
+	}
+
+	export interface UniOp extends AlaSQLExpression {
+		op: string | null;
+		right: ExpressionNode;
+	}
+
+	export type ExpressionNode =
+		| Op
+		| Column
+		| ParamValue
+		| NumValue
+		| StringValue
+		| LogicValue
+		| UniOp;
+
+	export interface ExpressionWrapper extends AlaSQLExpression {
+		expression: ExpressionNode;
+		reduced?: boolean;
+	}
+
+	export interface Statement {
+		compile(databaseid: string): AlaSQLStatement;
+		where?: ExpressionWrapper;
+		[key: string]: unknown;
+	}
+
 	// abstract Syntax Tree
-	interface AlaSQLAST {
+	export interface AlaSQLAST {
+		statements: Statement[];
 		compile(databaseid: string): AlaSQLStatement;
 	}
 
 	// see https://github.com/alasql/alasql/wiki/User%20Defined%20Functions
-	interface userDefinedFunction {
+	export interface userDefinedFunction {
 		(...x: unknown[]): unknown;
 	}
 
-	interface userDefinedFunctionLookUp {
+	export interface userDefinedFunctionLookUp {
 		[x: string]: userDefinedFunction;
 	}
 
 	// see https://github.com/alasql/alasql/wiki/User%20Defined%20Functions
-	interface userAggregator {
+	export interface userAggregator {
 		(value: unknown, accumulator: unknown, stage: number): unknown;
 	}
 
-	interface userAggregatorLookUp {
+	export interface userAggregatorLookUp {
 		[x: string]: userAggregator;
 	}
 
-	interface userFromFunction {
+	export interface userFromFunction {
 		(
 			dataReference: unknown,
 			options: unknown,
@@ -72,7 +138,7 @@ declare module 'alasql' {
 		): void;
 	}
 
-	interface userFromFunctionLookUp {
+	export interface userFromFunctionLookUp {
 		[x: string]: userFromFunction;
 	}
 
@@ -81,7 +147,7 @@ declare module 'alasql' {
 	 *
 	 * @interface database
 	 */
-	interface database {
+	export interface database {
 		/**
 		 * The database ID.
 		 *
@@ -104,7 +170,7 @@ declare module 'alasql' {
 	 *
 	 * @interface table
 	 */
-	interface table {
+	export interface table {
 		/**
 		 * The array of data stored in the table which can be queried
 		 *
@@ -119,7 +185,7 @@ declare module 'alasql' {
 	 *
 	 * @interface databaseLookUp
 	 */
-	interface databaseLookUp {
+	export interface databaseLookUp {
 		[databaseName: string]: database;
 	}
 
@@ -128,11 +194,11 @@ declare module 'alasql' {
 	 *
 	 * @interface tableLookUp
 	 */
-	interface tableLookUp {
+	export interface tableLookUp {
 		[tableName: string]: table;
 	}
 
-	interface Database {
+	export interface Database {
 		new (databaseid?: string): Database;
 		databaseid: string;
 		dbversion: number;
@@ -150,7 +216,7 @@ declare module 'alasql' {
 		autoval(tablename: string, colname: string, getNext: boolean): unknown;
 	}
 
-	interface AlaSQL {
+	export interface AlaSQL {
 		options: AlaSQLOptions;
 		error: Error;
 		<T = unknown>(sql: string, params?: any, cb?: AlaSQLCallback<T>, scope?: unknown): T;