remult 0.26.18 → 0.26.19-next.0

package/esm/remult-knex/index.js

@@ -1,4 +1,4 @@
-import { CustomSqlFilterBuilder, } from '../src/filter/filter-consumer-bridge-to-sql-request.js';
+import { CustomSqlFilterBuilder, dbNamesOfWithForceSqlExpression, } from '../src/filter/filter-consumer-bridge-to-sql-request.js';
 import { dbNamesOf, isDbReadonly, shouldCreateEntity, shouldNotCreateField, } from '../src/filter/filter-consumer-bridge-to-sql-request.js';
 import { customDatabaseFilterToken, Filter, } from '../src/filter/filter-interfaces.js';
 import { remult as remultContext } from '../src/remult-proxy.js';
@@ -92,7 +92,7 @@ export class KnexDataProvider {
     }
     static async filterToRaw(entity, condition, wrapIdentifier) {
         const repo = getRepository(entity);
-        var b = new FilterConsumerBridgeToKnexRequest(await dbNamesOf(repo.metadata, (x) => x), wrapIdentifier);
+        var b = new FilterConsumerBridgeToKnexRequest(await dbNamesOfWithForceSqlExpression(repo.metadata, (x) => x), wrapIdentifier);
         b._addWhere = false;
         await (await getRepositoryInternals(repo)._translateWhereToFilter(condition)).__applyToConsumer(b);
         let r = await b.resolveWhere();
@@ -183,7 +183,7 @@ class KnexEntityDataProvider {
         });
     }
     async init() {
-        const r = (await dbNamesOf(this.entity, (x) => x));
+        const r = (await dbNamesOfWithForceSqlExpression(this.entity, (x) => x));
         return {
             $dbNameOf: (f) => {
                 let fm = f;

package/esm/remult-mongo.js

@@ -1,6 +1,6 @@
 import { ObjectId, } from 'mongodb';
 import { Filter } from './index.js';
-import { dbNamesOf } from './src/filter/filter-consumer-bridge-to-sql-request.js';
+import { dbNamesOf, dbNamesOfWithForceSqlExpression, } from './src/filter/filter-consumer-bridge-to-sql-request.js';
 import { remult as remultContext } from './src/remult-proxy.js';
 import { getRepository } from './src/remult3/RepositoryImplementation.js';
 import { getRepositoryInternals } from './src/remult3/repository-internals.js';
@@ -50,7 +50,7 @@ export class MongoDataProvider {
     }
     static async filterToRaw(entity, condition) {
         const repo = getRepository(entity);
-        var b = new FilterConsumerBridgeToMongo(await dbNamesOf(repo.metadata));
+        var b = new FilterConsumerBridgeToMongo(await dbNamesOfWithForceSqlExpression(repo.metadata));
         b._addWhere = false;
         await (await getRepositoryInternals(repo)._translateWhereToFilter(condition)).__applyToConsumer(b);
         let r = await b.resolveWhere();

package/esm/src/data-providers/sql-database.js

@@ -1,4 +1,4 @@
-import { FilterConsumerBridgeToSqlRequest, dbNamesOf, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request.js';
+import { FilterConsumerBridgeToSqlRequest, dbNamesOfWithForceSqlExpression, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import { Filter, customDatabaseFilterToken, } from '../filter/filter-interfaces.js';
 import { remult as defaultRemult } from '../remult-proxy.js';
 import { getRepository, isAutoIncrement, } from '../remult3/RepositoryImplementation.js';
@@ -6,9 +6,21 @@ import { Sort } from '../sort.js';
 import { ValueConverters } from '../valueConverters.js';
 import { getRepositoryInternals } from '../remult3/repository-internals.js';
 import { isOfType } from '../isOfType.js';
-// @dynamic
+/**
+ * A DataProvider for Sql Databases
+ * @example
+ * const db = new SqlDatabase(new PostgresDataProvider(pgPool))
+* @see [Connecting a Database](https://remult.dev/docs/quickstart#connecting-a-database)
+
+ */
 export class SqlDatabase {
     sql;
+    /**
+     * Gets the SQL database from the data provider.
+     * @param dataProvider - The data provider.
+     * @returns The SQL database.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     static getDb(dataProvider) {
         const r = (dataProvider || defaultRemult.dataProvider);
         if (isOfType(r, 'createCommand'))
@@ -16,12 +28,26 @@ export class SqlDatabase {
         else
             throw 'the data provider is not an SqlCommandFactory';
     }
+    /**
+     * Creates a new SQL command.
+     * @returns The SQL command.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     createCommand() {
         return new LogSQLCommand(this.sql.createCommand(), SqlDatabase.LogToConsole);
     }
+    /**
+     * Executes a SQL command.
+     * @param sql - The SQL command.
+     * @returns The SQL result.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     async execute(sql) {
         return await this.createCommand().execute(sql);
     }
+    /**
+     * Wraps an identifier with the database's identifier syntax.
+     */
     wrapIdentifier = (x) => x;
     /* @internal*/
     _getSourceSql() {
@@ -31,6 +57,11 @@ export class SqlDatabase {
         if (this.sql.ensureSchema)
             await this.sql.ensureSchema(entities);
     }
+    /**
+     * Gets the entity data provider.
+     * @param entity  - The entity metadata.
+     * @returns The entity data provider.
+     */
     getEntityDataProvider(entity) {
         if (!this.sql.supportsJsonColumnType) {
             for (const f of entity.fields.toArray()) {
@@ -44,13 +75,18 @@ export class SqlDatabase {
                 }
             }
         }
-        return new ActualSQLServerDataProvider(entity, this, async (dbName) => {
+        return new ActualSQLEntityDataProvider(entity, this, async (dbName) => {
             if (this.createdEntities.indexOf(dbName.$entityName) < 0) {
                 this.createdEntities.push(dbName.$entityName);
                 await this.sql.entityIsUsedForTheFirstTime(entity);
             }
         }, this.sql);
     }
+    /**
+     * Runs a transaction. Used internally by remult when transactions are required
+     * @param action - The action to run in the transaction.
+     * @returns The promise of the transaction.
+     */
     transaction(action) {
         return this.sql.transaction(async (x) => {
             let completed = false;
@@ -103,12 +139,18 @@ export class SqlDatabase {
             },
         };
     }
+    /**
+     *  Converts a filter to a raw SQL string.
+     *  @see [Leveraging Database Capabilities with Raw SQL in Custom Filters](https://remult.dev/docs/running-sql-on-the-server#leveraging-entityfilter-for-sql-databases)
+     
+     */
     static async filterToRaw(repo, condition, sqlCommand, dbNames, wrapIdentifier) {
         if (!sqlCommand) {
             sqlCommand = new myDummySQLCommand();
         }
         const r = getRepository(repo);
-        var b = new FilterConsumerBridgeToSqlRequest(sqlCommand, dbNames || (await dbNamesOf(r.metadata, wrapIdentifier)));
+        var b = new FilterConsumerBridgeToSqlRequest(sqlCommand, dbNames ||
+            (await dbNamesOfWithForceSqlExpression(r.metadata, wrapIdentifier)));
         b._addWhere = false;
         await (await getRepositoryInternals(r)._translateWhereToFilter(condition)).__applyToConsumer(b);
         return await b.resolveWhere();
@@ -121,12 +163,20 @@ export class SqlDatabase {
      * `oneLiner` - to log all queries to the console as one line
      *
      * a `function` - to log all queries to the console as a custom format
+     * @example
+     * SqlDatabase.LogToConsole = (duration, query, args) => { console.log("be crazy ;)") }
      */
     static LogToConsole = false;
     /**
      * Threshold in milliseconds for logging queries to the console.
      */
     static durationThreshold = 0;
+    /**
+     * Creates a new SQL database.
+     * @param sql - The SQL implementation.
+     * @example
+     * const db = new SqlDatabase(new PostgresDataProvider(pgPool))
+     */
     constructor(sql) {
         this.sql = sql;
         if (sql.wrapIdentifier)
@@ -206,7 +256,7 @@ class LogSQLCommand {
         }
     }
 }
-class ActualSQLServerDataProvider {
+class ActualSQLEntityDataProvider {
     entity;
     sql;
     iAmUsed;
@@ -219,7 +269,7 @@ class ActualSQLServerDataProvider {
         this.strategy = strategy;
     }
     async init() {
-        let dbNameProvider = await dbNamesOf(this.entity, (x) => this.sql.wrapIdentifier(x));
+        let dbNameProvider = await dbNamesOfWithForceSqlExpression(this.entity, (x) => this.sql.wrapIdentifier(x));
         await this.iAmUsed(dbNameProvider);
         return dbNameProvider;
     }

package/esm/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -190,6 +190,12 @@ export function shouldCreateEntity(entity, e) {
         e.$entityName.toLowerCase().indexOf('from ') < 0);
 }
 export async function dbNamesOf(repo, wrapIdentifierOrOptions) {
+    return internalDbNamesOf(repo, wrapIdentifierOrOptions);
+}
+export async function dbNamesOfWithForceSqlExpression(repo, wrapIdentifierOrOptions) {
+    return internalDbNamesOf(repo, wrapIdentifierOrOptions, true);
+}
+async function internalDbNamesOf(repo, wrapIdentifierOrOptions, forceSqlExpression = false) {
     let options = typeof wrapIdentifierOrOptions === 'function'
         ? { wrapIdentifier: wrapIdentifierOrOptions }
         : wrapIdentifierOrOptions || {};
@@ -213,7 +219,7 @@ export async function dbNamesOf(repo, wrapIdentifierOrOptions) {
         wrapIdentifier: options.wrapIdentifier,
     };
     for (const field of meta.fields) {
-        let r = await fieldDbName(field, meta, options.wrapIdentifier);
+        let r = await fieldDbName(field, meta, options.wrapIdentifier, forceSqlExpression);
         if (!field.options.sqlExpression)
             if (typeof options.tableName === 'string')
                 r = options.wrapIdentifier(options.tableName) + '.' + r;
@@ -242,19 +248,22 @@ export async function entityDbName(metadata, wrapIdentifier = (x) => x) {
     }
     return wrapIdentifier(metadata.dbName);
 }
-export async function fieldDbName(f, meta, wrapIdentifier = (x) => x) {
+const sqlExpressionInProgressKey = Symbol.for(`sqlExpressionInProgressKey`);
+export async function fieldDbName(f, meta, wrapIdentifier = (x) => x, forceSqlExpression = false) {
     try {
         if (f.options.sqlExpression) {
             let result;
             if (typeof f.options.sqlExpression === 'function') {
-                const prev = f.options.sqlExpression;
+                if (f[sqlExpressionInProgressKey] && !forceSqlExpression) {
+                    return "recursive sqlExpression call for field '" + f.key + "'. ";
+                }
                 try {
-                    f.options.sqlExpression =
-                        "recursive sqlExpression call for field '" + f.key + "'. ";
-                    result = await prev(meta);
+                    f[sqlExpressionInProgressKey] = true;
+                    result = await f.options.sqlExpression(meta);
                     f.options.sqlExpression = () => result;
                 }
                 finally {
+                    delete f[sqlExpressionInProgressKey];
                 }
             }
             else
@@ -269,7 +278,7 @@ export async function fieldDbName(f, meta, wrapIdentifier = (x) => x) {
         if (field) {
             let fInfo = meta.fields.find(field);
             if (fInfo)
-                return fieldDbName(fInfo, meta, wrapIdentifier);
+                return fieldDbName(fInfo, meta, wrapIdentifier, forceSqlExpression);
         }
         return wrapIdentifier(f.dbName);
     }

package/esm/src/remult3/remult3.js

@@ -1,6 +1,7 @@
 export const flags = {
     error500RetryCount: 4,
 };
+//p1 - fix query docs to also explain how it can be used for infinite scroll and pagination.
 //y1 - 'test expression columns without aliases'
 //p1 - see if I can fix the no alias problem in selects
 //p1 - add luid - it's cool for order by.
@@ -8,6 +9,7 @@ export const flags = {
 //p1 - add nanoid
 //p1 - add id and use luid by default, but allow changes with Fields.id.defaultIdProvider
 //p1 - explain the benefits of changing the default provider for testing in docs.
+//p1 - fix sqlite to  support alter table when adding a column with ensure schema = on
 //p1 - fix app custom filters example for multiple filters.
 //p1 - add not!!!!
 //p1 - add LifecycleEvent to documentation

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.26.18",
+    "version": "0.26.19-next.0",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/remult-knex/index.js

@@ -157,7 +157,7 @@ var KnexDataProvider = /** @class */ (function () {
                     case 0:
                         repo = (0, RepositoryImplementation_js_1.getRepository)(entity);
                         _a = FilterConsumerBridgeToKnexRequest.bind;
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(repo.metadata, function (x) { return x; })];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(repo.metadata, function (x) { return x; })];
                     case 1:
                         b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent(), wrapIdentifier]))();
                         b._addWhere = false;
@@ -310,7 +310,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(this.entity, function (x) { return x; })];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, function (x) { return x; })];
                     case 1:
                         r = (_a.sent());
                         return [2 /*return*/, {

package/remult-mongo.js

@@ -78,7 +78,7 @@ var MongoDataProvider = /** @class */ (function () {
                     case 0:
                         repo = (0, RepositoryImplementation_js_1.getRepository)(entity);
                         _a = FilterConsumerBridgeToMongo.bind;
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(repo.metadata)];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(repo.metadata)];
                     case 1:
                         b = new (_a.apply(FilterConsumerBridgeToMongo, [void 0, _b.sent()]))();
                         b._addWhere = false;

package/src/data-providers/sql-database.d.ts

@@ -4,14 +4,51 @@ import type { CustomSqlFilterBuilderFunction, EntityDbNamesBase } from '../filte
 import type { EntityFilter, EntityMetadata } from '../remult3/remult3.js';
 import type { RepositoryOverloads } from '../remult3/RepositoryImplementation.js';
 import type { CanBuildMigrations, MigrationBuilder, MigrationCode } from '../../migrations/migration-types.js';
+/**
+ * A DataProvider for Sql Databases
+ * @example
+ * const db = new SqlDatabase(new PostgresDataProvider(pgPool))
+* @see [Connecting a Database](https://remult.dev/docs/quickstart#connecting-a-database)
+
+ */
 export declare class SqlDatabase implements DataProvider, HasWrapIdentifier, CanBuildMigrations, SqlCommandFactory {
     private sql;
+    /**
+     * Gets the SQL database from the data provider.
+     * @param dataProvider - The data provider.
+     * @returns The SQL database.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     static getDb(dataProvider?: DataProvider): SqlDatabase;
+    /**
+     * Creates a new SQL command.
+     * @returns The SQL command.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     createCommand(): SqlCommand;
+    /**
+     * Executes a SQL command.
+     * @param sql - The SQL command.
+     * @returns The SQL result.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     execute(sql: string): Promise<SqlResult>;
+    /**
+     * Wraps an identifier with the database's identifier syntax.
+     */
     wrapIdentifier: (name: string) => string;
     ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
+    /**
+     * Gets the entity data provider.
+     * @param entity  - The entity metadata.
+     * @returns The entity data provider.
+     */
     getEntityDataProvider(entity: EntityMetadata): EntityDataProvider;
+    /**
+     * Runs a transaction. Used internally by remult when transactions are required
+     * @param action - The action to run in the transaction.
+     * @returns The promise of the transaction.
+     */
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
     /**
      * Creates a raw filter for entity filtering.
@@ -24,6 +61,11 @@ export declare class SqlDatabase implements DataProvider, HasWrapIdentifier, Can
      * @see [Leveraging Database Capabilities with Raw SQL in Custom Filters](https://remult.dev/docs/custom-filter.html#leveraging-database-capabilities-with-raw-sql-in-custom-filters)
      */
     static rawFilter(build: CustomSqlFilterBuilderFunction): EntityFilter<any>;
+    /**
+     *  Converts a filter to a raw SQL string.
+     *  @see [Leveraging Database Capabilities with Raw SQL in Custom Filters](https://remult.dev/docs/running-sql-on-the-server#leveraging-entityfilter-for-sql-databases)
+     
+     */
     static filterToRaw<entityType>(repo: RepositoryOverloads<entityType>, condition: EntityFilter<entityType>, sqlCommand?: SqlCommandWithParameters, dbNames?: EntityDbNamesBase, wrapIdentifier?: (name: string) => string): Promise<string>;
     /**
      * `false` _(default)_ - No logging
@@ -33,12 +75,20 @@ export declare class SqlDatabase implements DataProvider, HasWrapIdentifier, Can
      * `oneLiner` - to log all queries to the console as one line
      *
      * a `function` - to log all queries to the console as a custom format
+     * @example
+     * SqlDatabase.LogToConsole = (duration, query, args) => { console.log("be crazy ;)") }
      */
     static LogToConsole: boolean | 'oneLiner' | ((duration: number, query: string, args: Record<string, any>) => void);
     /**
      * Threshold in milliseconds for logging queries to the console.
      */
     static durationThreshold: number;
+    /**
+     * Creates a new SQL database.
+     * @param sql - The SQL implementation.
+     * @example
+     * const db = new SqlDatabase(new PostgresDataProvider(pgPool))
+     */
     constructor(sql: SqlImplementation);
     provideMigrationBuilder: (builder: MigrationCode) => MigrationBuilder;
     private createdEntities;

package/src/data-providers/sql-database.js

@@ -10,10 +10,25 @@ var sort_js_1 = require("../sort.js");
 var valueConverters_js_1 = require("../valueConverters.js");
 var repository_internals_js_1 = require("../remult3/repository-internals.js");
 var isOfType_js_1 = require("../isOfType.js");
-// @dynamic
+/**
+ * A DataProvider for Sql Databases
+ * @example
+ * const db = new SqlDatabase(new PostgresDataProvider(pgPool))
+* @see [Connecting a Database](https://remult.dev/docs/quickstart#connecting-a-database)
+
+ */
 var SqlDatabase = /** @class */ (function () {
+    /**
+     * Creates a new SQL database.
+     * @param sql - The SQL implementation.
+     * @example
+     * const db = new SqlDatabase(new PostgresDataProvider(pgPool))
+     */
     function SqlDatabase(sql) {
         this.sql = sql;
+        /**
+         * Wraps an identifier with the database's identifier syntax.
+         */
         this.wrapIdentifier = function (x) { return x; };
         this.createdEntities = [];
         if (sql.wrapIdentifier)
@@ -24,6 +39,12 @@ var SqlDatabase = /** @class */ (function () {
         if ((0, isOfType_js_1.isOfType)(sql, 'end'))
             this.end = function () { return sql.end(); };
     }
+    /**
+     * Gets the SQL database from the data provider.
+     * @param dataProvider - The data provider.
+     * @returns The SQL database.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     SqlDatabase.getDb = function (dataProvider) {
         var r = (dataProvider || remult_proxy_js_1.remult.dataProvider);
         if ((0, isOfType_js_1.isOfType)(r, 'createCommand'))
@@ -31,9 +52,20 @@ var SqlDatabase = /** @class */ (function () {
         else
             throw 'the data provider is not an SqlCommandFactory';
     };
+    /**
+     * Creates a new SQL command.
+     * @returns The SQL command.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     SqlDatabase.prototype.createCommand = function () {
         return new LogSQLCommand(this.sql.createCommand(), SqlDatabase.LogToConsole);
     };
+    /**
+     * Executes a SQL command.
+     * @param sql - The SQL command.
+     * @returns The SQL result.
+     * @see [Direct Database Access](https://remult.dev/docs/running-sql-on-the-server)
+     */
     SqlDatabase.prototype.execute = function (sql) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
@@ -63,6 +95,11 @@ var SqlDatabase = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Gets the entity data provider.
+     * @param entity  - The entity metadata.
+     * @returns The entity data provider.
+     */
     SqlDatabase.prototype.getEntityDataProvider = function (entity) {
         var e_1, _a;
         var _this = this;
@@ -84,7 +121,7 @@ var SqlDatabase = /** @class */ (function () {
                 finally { if (e_1) throw e_1.error; }
             }
         }
-        return new ActualSQLServerDataProvider(entity, this, function (dbName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        return new ActualSQLEntityDataProvider(entity, this, function (dbName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -99,6 +136,11 @@ var SqlDatabase = /** @class */ (function () {
             });
         }); }, this.sql);
     };
+    /**
+     * Runs a transaction. Used internally by remult when transactions are required
+     * @param action - The action to run in the transaction.
+     * @returns The promise of the transaction.
+     */
     SqlDatabase.prototype.transaction = function (action) {
         var _this = this;
         return this.sql.transaction(function (x) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -169,6 +211,11 @@ var SqlDatabase = /** @class */ (function () {
             },
             _a;
     };
+    /**
+     *  Converts a filter to a raw SQL string.
+     *  @see [Leveraging Database Capabilities with Raw SQL in Custom Filters](https://remult.dev/docs/running-sql-on-the-server#leveraging-entityfilter-for-sql-databases)
+     
+     */
     SqlDatabase.filterToRaw = function (repo, condition, sqlCommand, dbNames, wrapIdentifier) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var r, b, _a, _b, _c;
@@ -183,7 +230,7 @@ var SqlDatabase = /** @class */ (function () {
                         _b = [void 0, sqlCommand];
                         _c = dbNames;
                         if (_c) return [3 /*break*/, 2];
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(r.metadata, wrapIdentifier)];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(r.metadata, wrapIdentifier)];
                     case 1:
                         _c = (_d.sent());
                         _d.label = 2;
@@ -208,6 +255,8 @@ var SqlDatabase = /** @class */ (function () {
      * `oneLiner` - to log all queries to the console as one line
      *
      * a `function` - to log all queries to the console as a custom format
+     * @example
+     * SqlDatabase.LogToConsole = (duration, query, args) => { console.log("be crazy ;)") }
      */
     SqlDatabase.LogToConsole = false;
     /**
@@ -291,20 +340,20 @@ var LogSQLCommand = /** @class */ (function () {
     };
     return LogSQLCommand;
 }());
-var ActualSQLServerDataProvider = /** @class */ (function () {
-    function ActualSQLServerDataProvider(entity, sql, iAmUsed, strategy) {
+var ActualSQLEntityDataProvider = /** @class */ (function () {
+    function ActualSQLEntityDataProvider(entity, sql, iAmUsed, strategy) {
         this.entity = entity;
         this.sql = sql;
         this.iAmUsed = iAmUsed;
         this.strategy = strategy;
     }
-    ActualSQLServerDataProvider.prototype.init = function () {
+    ActualSQLEntityDataProvider.prototype.init = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var dbNameProvider;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(this.entity, function (x) {
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, function (x) {
                             return _this.sql.wrapIdentifier(x);
                         })];
                     case 1:
@@ -317,7 +366,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLServerDataProvider.prototype.count = function (where) {
+    ActualSQLEntityDataProvider.prototype.count = function (where) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, select, r, wc, _a;
             return tslib_1.__generator(this, function (_b) {
@@ -342,7 +391,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLServerDataProvider.prototype.find = function (options) {
+    ActualSQLEntityDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, _a, colKeys, select, r, where, _b, first, segs, _c, _d, s, segs_1, segs_1_1, c, page;
             var e_2, _e, e_3, _f;
@@ -436,7 +485,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLServerDataProvider.prototype.buildResultRow = function (colKeys, y, r) {
+    ActualSQLEntityDataProvider.prototype.buildResultRow = function (colKeys, y, r) {
         var result = {};
         for (var index = 0; index < colKeys.length; index++) {
             var col = colKeys[index];
@@ -449,7 +498,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
         }
         return result;
     };
-    ActualSQLServerDataProvider.prototype.buildSelect = function (e) {
+    ActualSQLEntityDataProvider.prototype.buildSelect = function (e) {
         var e_4, _a;
         var select = '';
         var colKeys = [];
@@ -477,7 +526,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
         }
         return { colKeys: colKeys, select: select };
     };
-    ActualSQLServerDataProvider.prototype.update = function (id, data) {
+    ActualSQLEntityDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, statement, added, _a, _b, x, v, idFilter, f, _c, _d, colKeys, select, returning;
             var e_5, _e;
@@ -547,7 +596,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLServerDataProvider.prototype.delete = function (id) {
+    ActualSQLEntityDataProvider.prototype.delete = function (id) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, f, statement, _a;
             var _this = this;
@@ -572,7 +621,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLServerDataProvider.prototype.insert = function (data) {
+    ActualSQLEntityDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, cols, vals, added, _a, _b, x, v, statement, _c, colKeys, select;
             var e_6, _d;
@@ -643,8 +692,8 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLServerDataProvider.LogToConsole = false;
-    return ActualSQLServerDataProvider;
+    ActualSQLEntityDataProvider.LogToConsole = false;
+    return ActualSQLEntityDataProvider;
 }());
 var myDummySQLCommand = /** @class */ (function () {
     function myDummySQLCommand() {

package/src/filter/filter-consumer-bridge-to-sql-request.d.ts

@@ -80,5 +80,6 @@ export interface dbNamesOfOptions {
     tableName?: boolean | string;
 }
 export declare function dbNamesOf<entityType>(repo: EntityMetadataOverloads<entityType>, wrapIdentifierOrOptions?: ((name: string) => string) | dbNamesOfOptions): Promise<EntityDbNames<entityType>>;
+export declare function dbNamesOfWithForceSqlExpression<entityType>(repo: EntityMetadataOverloads<entityType>, wrapIdentifierOrOptions?: ((name: string) => string) | dbNamesOfOptions): Promise<EntityDbNames<entityType>>;
 export declare function entityDbName(metadata: EntityMetadata, wrapIdentifier?: (name: string) => string): Promise<string>;
-export declare function fieldDbName(f: FieldMetadata, meta: EntityMetadata, wrapIdentifier?: (name: string) => string): Promise<string>;
+export declare function fieldDbName(f: FieldMetadata, meta: EntityMetadata, wrapIdentifier?: (name: string) => string, forceSqlExpression?: boolean): Promise<string>;

package/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fieldDbName = exports.entityDbName = exports.dbNamesOf = exports.shouldCreateEntity = exports.shouldNotCreateField = exports.isDbReadonly = exports.CustomSqlFilterBuilder = exports.FilterConsumerBridgeToSqlRequest = void 0;
+exports.fieldDbName = exports.entityDbName = exports.dbNamesOfWithForceSqlExpression = exports.dbNamesOf = exports.shouldCreateEntity = exports.shouldNotCreateField = exports.isDbReadonly = exports.CustomSqlFilterBuilder = exports.FilterConsumerBridgeToSqlRequest = void 0;
 var tslib_1 = require("tslib");
 var sql_database_js_1 = require("../data-providers/sql-database.js");
 var remult_proxy_js_1 = require("../remult-proxy.js");
@@ -297,6 +297,23 @@ function shouldCreateEntity(entity, e) {
 }
 exports.shouldCreateEntity = shouldCreateEntity;
 function dbNamesOf(repo, wrapIdentifierOrOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, internalDbNamesOf(repo, wrapIdentifierOrOptions)];
+        });
+    });
+}
+exports.dbNamesOf = dbNamesOf;
+function dbNamesOfWithForceSqlExpression(repo, wrapIdentifierOrOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, internalDbNamesOf(repo, wrapIdentifierOrOptions, true)];
+        });
+    });
+}
+exports.dbNamesOfWithForceSqlExpression = dbNamesOfWithForceSqlExpression;
+function internalDbNamesOf(repo, wrapIdentifierOrOptions, forceSqlExpression) {
+    if (forceSqlExpression === void 0) { forceSqlExpression = false; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var options, meta, result, _a, _b, field, r, e_3_1;
         var _c, e_3, _d;
@@ -335,7 +352,7 @@ function dbNamesOf(repo, wrapIdentifierOrOptions) {
                 case 3:
                     if (!!_b.done) return [3 /*break*/, 6];
                     field = _b.value;
-                    return [4 /*yield*/, fieldDbName(field, meta, options.wrapIdentifier)];
+                    return [4 /*yield*/, fieldDbName(field, meta, options.wrapIdentifier, forceSqlExpression)];
                 case 4:
                     r = _e.sent();
                     if (!field.options.sqlExpression)
@@ -365,7 +382,6 @@ function dbNamesOf(repo, wrapIdentifierOrOptions) {
         });
     });
 }
-exports.dbNamesOf = dbNamesOf;
 function entityDbName(metadata, wrapIdentifier) {
     if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -395,28 +411,33 @@ function entityDbName(metadata, wrapIdentifier) {
     });
 }
 exports.entityDbName = entityDbName;
-function fieldDbName(f, meta, wrapIdentifier) {
+var sqlExpressionInProgressKey = Symbol.for("sqlExpressionInProgressKey");
+function fieldDbName(f, meta, wrapIdentifier, forceSqlExpression) {
     if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
+    if (forceSqlExpression === void 0) { forceSqlExpression = false; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var result_1, prev, rel, field, fInfo;
+        var result_1, rel, field, fInfo;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, , 8, 9]);
                     if (!f.options.sqlExpression) return [3 /*break*/, 7];
                     if (!(typeof f.options.sqlExpression === 'function')) return [3 /*break*/, 5];
-                    prev = f.options.sqlExpression;
+                    if (f[sqlExpressionInProgressKey] && !forceSqlExpression) {
+                        return [2 /*return*/, "recursive sqlExpression call for field '" + f.key + "'. "];
+                    }
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, , 3, 4]);
-                    f.options.sqlExpression =
-                        "recursive sqlExpression call for field '" + f.key + "'. ";
-                    return [4 /*yield*/, prev(meta)];
+                    f[sqlExpressionInProgressKey] = true;
+                    return [4 /*yield*/, f.options.sqlExpression(meta)];
                 case 2:
                     result_1 = _a.sent();
                     f.options.sqlExpression = function () { return result_1; };
                     return [3 /*break*/, 4];
-                case 3: return [7 /*endfinally*/];
+                case 3:
+                    delete f[sqlExpressionInProgressKey];
+                    return [7 /*endfinally*/];
                 case 4: return [3 /*break*/, 6];
                 case 5:
                     result_1 = f.options.sqlExpression;
@@ -432,7 +453,7 @@ function fieldDbName(f, meta, wrapIdentifier) {
                     if (field) {
                         fInfo = meta.fields.find(field);
                         if (fInfo)
-                            return [2 /*return*/, fieldDbName(fInfo, meta, wrapIdentifier)];
+                            return [2 /*return*/, fieldDbName(fInfo, meta, wrapIdentifier, forceSqlExpression)];
                     }
                     return [2 /*return*/, wrapIdentifier(f.dbName)];
                 case 8: return [7 /*endfinally*/];

package/src/remult3/remult3.d.ts

@@ -285,6 +285,19 @@ export interface Repository<entityType> {
      * for await (const task of taskRepo.query()) {
      *   // do something.
      * }
+     * @example
+     * const query = taskRepo.query({
+     *   where: { completed: false },
+     *   pageSize: 100,
+     * })
+     * const count = await query.count()
+     * console.log('Paged: ' + count / 100)
+     * let paginator = await query.paginator()
+     * console.log(paginator.items.length)
+     * if (paginator.hasNextPage) {
+     *   paginator = await paginator.nextPage()
+     *   console.log(paginator.items.length)
+     * }
      * */
     query(options?: QueryOptions<entityType>): QueryResult<entityType>;
     /** Returns a count of the items matching the criteria.
@@ -596,7 +609,22 @@ export interface QueryResult<entityType> {
     /** Performs an operation on all the items matching the query criteria */
     forEach(what: (item: entityType) => Promise<any>): Promise<number>;
 }
-/** An interface used to paginating using the `query` method in the `Repository` object */
+/** An interface used to paginating using the `query` method in the `Repository` object
+ *  @example
+ * @example
+ * const query = taskRepo.query({
+ *   where: { completed: false },
+ *   pageSize: 100,
+ * })
+ * const count = await query.count()
+ * console.log('Paged: ' + count / 100)
+ * let paginator = await query.paginator()
+ * console.log(paginator.items.length)
+ * if (paginator.hasNextPage) {
+ *   paginator = await paginator.nextPage()
+ *   console.log(paginator.items.length)
+ * }
+ */
 export interface Paginator<entityType> {
     /** the items in the current page */
     items: entityType[];

package/src/remult3/remult3.js

@@ -4,6 +4,7 @@ exports.flags = void 0;
 exports.flags = {
     error500RetryCount: 4,
 };
+//p1 - fix query docs to also explain how it can be used for infinite scroll and pagination.
 //y1 - 'test expression columns without aliases'
 //p1 - see if I can fix the no alias problem in selects
 //p1 - add luid - it's cool for order by.
@@ -11,6 +12,7 @@ exports.flags = {
 //p1 - add nanoid
 //p1 - add id and use luid by default, but allow changes with Fields.id.defaultIdProvider
 //p1 - explain the benefits of changing the default provider for testing in docs.
+//p1 - fix sqlite to  support alter table when adding a column with ensure schema = on
 //p1 - fix app custom filters example for multiple filters.
 //p1 - add not!!!!
 //p1 - add LifecycleEvent to documentation