remult 0.27.11 → 0.27.13

package/src/remult3/remult3.d.ts

@@ -446,7 +446,6 @@ export interface Repository<entityType> {
     /**
      * Performs an aggregation on the repository's entity type based on the specified options.
      * @template entityType The type of the entity being aggregated.
-     * @template groupByFields The fields to group by, provided as an array of keys from the entity type.
      * @template sumFields The fields to sum, provided as an array of numeric keys from the entity type.
      * @template averageFields The fields to average, provided as an array of numeric keys from the entity type.
      *
@@ -461,7 +460,7 @@ export interface Repository<entityType> {
      * console.log(totalSalary.salary.sum); // Outputs the total sum of salaries
   
      */
-    aggregate<sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: Omit<GroupByOptions<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>, 'orderBy' | 'limit' | 'page'>): Promise<GroupByResult<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>>;
+    aggregate<sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: Omit<GroupByOptions<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>, 'orderBy' | 'limit' | 'page' | 'group'>): Promise<GroupByResult<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>>;
     /**  An alternative form of fetching data from the API server, which is intended for operating on large numbers of entity objects.
      *
      * It also has it's own paging mechanism that can be used n paging scenarios.
@@ -725,6 +724,22 @@ export type ValueFilter<valueType> = valueType | valueType[] | {
      *   status: { $ne: [1, 2, 3] }
      * };
      */
+    $not?: valueType | valueType[];
+    /**
+     * Represents a 'NOT EQUAL' filter condition where the value must not match the specified value or values.
+     *
+     * @example
+     * // Matches entities where the status is not 1
+     * const filter = {
+     *   status: { $not: 1 }
+     * };
+     *
+     * @example
+     * // Matches entities where the status is not 1, 2, or 3
+     * const filter = {
+     *   status: { $not: [1, 2, 3] }
+     * };
+     */
     $ne?: valueType | valueType[];
     /**
      * Represents a 'NOT EQUAL' filter condition using the '!=' operator where the value must not match the specified value or values.

package/src/remult3/remult3.js

@@ -22,7 +22,6 @@ exports.flags = {
 };
 //p1 - add parameter all to deleteMany, and updateMany
 //p1  filter.apply ApiPreFilter
-//p1 - add not as an overload to not equal
 /*p1 - add id and use uuid by default, but allow changes with Fields.id.defaultIdProvider NO but defaultProvider yes???
   //p1 - replace uuid with crypto.randomUUID and allow custom fallback NO
   //p1 - Add example for luid
@@ -30,7 +29,6 @@ exports.flags = {
   //p1 - explain the benefits of changing the default provider for testing in docs.
 */
 //p1 - consider upsert (where,set)
-//p1 TODO - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
 //p2 - add some kind of options handler that will help with translation etc... like in hagai - something that runs at the stage where options are being built
 /*y1 - https://github.com/remult/remult/discussions/438
      - https://github.com/remult/remult/blob/query-argumets/projects/tests/dbs/test-sql-database.spec.ts#L100-L128
@@ -44,7 +42,6 @@ exports.flags = {
 //p1 - tutorial about controller - and mutable controller
 //p1 - docs abount subscription channel
 //p1 - Consider enforcing serial operations on JSON database to prevent data loss
-//p1 - fix sqlite to  support alter table when adding a column with ensure schema = on
 //p1 - add LifecycleEvent to documentation
 //p1 - fix chaining of saving and saved in multiple entity options args
 //p1 - review starter and examples and separate remult * auth from the routes

package/esm/src/data-providers/web-sql-data-provider.js

@@ -1,140 +0,0 @@
-import { dbNamesOf, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request.js';
-import { isAutoIncrement } from '../remult3/RepositoryImplementation.js';
-import { SqlDatabase } from './sql-database.js';
-//SqlDatabase.LogToConsole = true;
-export class WebSqlDataProvider {
-    databaseName;
-    rows;
-    /** @internal */
-    //@ts-ignore
-    db;
-    constructor(databaseName, databaseSize = 2 * 1024 * 1024) {
-        this.databaseName = databaseName;
-        //@ts-ignore
-        this.db = window.openDatabase(databaseName, '1.0', databaseName, databaseSize);
-    }
-    async end() { }
-    getLimitSqlSyntax(limit, offset) {
-        return ' limit ' + limit + ' offset ' + offset;
-    }
-    async entityIsUsedForTheFirstTime(entity) {
-        await this.createTable(entity);
-    }
-    async ensureSchema(entities) {
-        for (const entity of entities) {
-            await this.createTable(entity);
-        }
-    }
-    async dropTable(entity) {
-        let e = await dbNamesOf(entity);
-        let sql = 'drop  table if exists ' + e.$entityName;
-        if (SqlDatabase.LogToConsole)
-            console.info(sql);
-        await this.createCommand().execute(sql);
-    }
-    async createTable(entity) {
-        let result = '';
-        let e = await dbNamesOf(entity);
-        for (const x of entity.fields) {
-            if (!isDbReadonly(x, e) || isAutoIncrement(x)) {
-                if (result.length != 0)
-                    result += ',';
-                result += '\r\n  ';
-                if (isAutoIncrement(x)) {
-                    if (x.key != entity.idMetadata.field.key)
-                        throw 'in web sql, autoincrement is only allowed for primary key';
-                    result += e.$dbNameOf(x) + ' integer primary key autoincrement';
-                }
-                else {
-                    result += this.addColumnSqlSyntax(x, e.$dbNameOf(x));
-                    if (x.key == entity.idMetadata.field.key) {
-                        result += ' primary key';
-                    }
-                }
-            }
-        }
-        let sql = 'create table if not exists ' + e.$entityName + ' (' + result + '\r\n)';
-        if (SqlDatabase.LogToConsole)
-            console.log(sql);
-        await this.createCommand().execute(sql);
-    }
-    createCommand() {
-        return new WebSqlBridgeToSQLCommand(this.db);
-    }
-    async transaction(action) {
-        throw new Error('Method not implemented.');
-    }
-    addColumnSqlSyntax(x, dbName) {
-        let result = dbName;
-        const nullNumber = x.allowNull ? '' : ' default 0 not null';
-        if (x.valueType == Date)
-            result += ' integer';
-        else if (x.valueType == Boolean)
-            result += ' integer ' + nullNumber;
-        else if (x.valueType == Number) {
-            if (!x.valueConverter.fieldTypeInDb)
-                result += ' real ' + nullNumber;
-            else
-                result += ' ' + x.valueConverter.fieldTypeInDb + ' ' + nullNumber;
-        }
-        else
-            result += ' text' + (x.allowNull ? ' ' : " default '' not null ");
-        return result;
-    }
-    toString() {
-        return 'WebSqlDataProvider';
-    }
-}
-class WebSqlBridgeToSQLCommand {
-    source;
-    //@ts-ignore
-    constructor(source) {
-        this.source = source;
-    }
-    values = [];
-    addParameterAndReturnSqlToken(val) {
-        return this.param(val);
-    }
-    param(val) {
-        this.values.push(val);
-        return '~' + this.values.length + '~';
-    }
-    execute(sql) {
-        return new Promise((resolve, reject) => this.source.transaction((t) => {
-            let s = sql;
-            let v = [];
-            var m = s.match(/~\d+~/g);
-            if (m != null)
-                m.forEach((mr) => {
-                    s = s.replace(mr, '?');
-                    v.push(this.values[Number.parseInt(mr.substring(1, mr.length - 1)) - 1]);
-                });
-            t.executeSql(s, v, (t1, r) => resolve(new WebSqlBridgeToSQLQueryResult(r)), (t2, err) => {
-                reject(err.message);
-                return false;
-            });
-        }));
-    }
-}
-class WebSqlBridgeToSQLQueryResult {
-    r;
-    getColumnKeyInResultForIndexInSelect(index) {
-        if (this.rows.length == 0)
-            throw Error('No rows');
-        let i = 0;
-        for (let m in this.rows[0]) {
-            if (i++ == index)
-                return m;
-        }
-        throw Error('index not found');
-    }
-    //@ts-ignore
-    constructor(r) {
-        this.r = r;
-        this.rows = [];
-        for (let i = 0; i < r.rows.length; i++) {
-            this.rows.push(r.rows.item(i));
-        }
-    }
-    rows;
-}

package/src/data-providers/web-sql-data-provider.d.ts

@@ -1,20 +0,0 @@
-import type { __RowsOfDataForTesting } from '../__RowsOfDataForTesting.js';
-import type { SqlCommand, SqlImplementation } from '../sql-command.js';
-import type { EntityMetadata } from '../remult3/remult3.js';
-export declare class WebSqlDataProvider implements SqlImplementation, __RowsOfDataForTesting {
-    private databaseName;
-    rows: {
-        [tableName: string]: any;
-    };
-    constructor(databaseName: string, databaseSize?: number);
-    end(): Promise<void>;
-    getLimitSqlSyntax(limit: number, offset: number): string;
-    entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
-    ensureSchema(entities: EntityMetadata[]): Promise<void>;
-    dropTable(entity: EntityMetadata): Promise<void>;
-    createTable(entity: EntityMetadata): Promise<void>;
-    createCommand(): SqlCommand;
-    transaction(action: (dataProvider: SqlImplementation) => Promise<void>): Promise<void>;
-    private addColumnSqlSyntax;
-    toString(): string;
-}

package/src/data-providers/web-sql-data-provider.js

@@ -1,228 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSqlDataProvider = void 0;
-var tslib_1 = require("tslib");
-var filter_consumer_bridge_to_sql_request_js_1 = require("../filter/filter-consumer-bridge-to-sql-request.js");
-var RepositoryImplementation_js_1 = require("../remult3/RepositoryImplementation.js");
-var sql_database_js_1 = require("./sql-database.js");
-//SqlDatabase.LogToConsole = true;
-var WebSqlDataProvider = /** @class */ (function () {
-    function WebSqlDataProvider(databaseName, databaseSize) {
-        if (databaseSize === void 0) { databaseSize = 2 * 1024 * 1024; }
-        this.databaseName = databaseName;
-        //@ts-ignore
-        this.db = window.openDatabase(databaseName, '1.0', databaseName, databaseSize);
-    }
-    WebSqlDataProvider.prototype.end = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/];
-        }); });
-    };
-    WebSqlDataProvider.prototype.getLimitSqlSyntax = function (limit, offset) {
-        return ' limit ' + limit + ' offset ' + offset;
-    };
-    WebSqlDataProvider.prototype.entityIsUsedForTheFirstTime = function (entity) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.createTable(entity)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    WebSqlDataProvider.prototype.ensureSchema = function (entities) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var entities_1, entities_1_1, entity, e_1_1;
-            var e_1, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 5, 6, 7]);
-                        entities_1 = tslib_1.__values(entities), entities_1_1 = entities_1.next();
-                        _b.label = 1;
-                    case 1:
-                        if (!!entities_1_1.done) return [3 /*break*/, 4];
-                        entity = entities_1_1.value;
-                        return [4 /*yield*/, this.createTable(entity)];
-                    case 2:
-                        _b.sent();
-                        _b.label = 3;
-                    case 3:
-                        entities_1_1 = entities_1.next();
-                        return [3 /*break*/, 1];
-                    case 4: return [3 /*break*/, 7];
-                    case 5:
-                        e_1_1 = _b.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 7];
-                    case 6:
-                        try {
-                            if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                        return [7 /*endfinally*/];
-                    case 7: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    WebSqlDataProvider.prototype.dropTable = function (entity) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, sql;
-            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)(entity)];
-                    case 1:
-                        e = _a.sent();
-                        sql = 'drop  table if exists ' + e.$entityName;
-                        if (sql_database_js_1.SqlDatabase.LogToConsole)
-                            console.info(sql);
-                        return [4 /*yield*/, this.createCommand().execute(sql)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    WebSqlDataProvider.prototype.createTable = function (entity) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var result, e, _a, _b, x, sql;
-            var e_2, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        result = '';
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
-                    case 1:
-                        e = _d.sent();
-                        try {
-                            for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                x = _b.value;
-                                if (!(0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e) || (0, RepositoryImplementation_js_1.isAutoIncrement)(x)) {
-                                    if (result.length != 0)
-                                        result += ',';
-                                    result += '\r\n  ';
-                                    if ((0, RepositoryImplementation_js_1.isAutoIncrement)(x)) {
-                                        if (x.key != entity.idMetadata.field.key)
-                                            throw 'in web sql, autoincrement is only allowed for primary key';
-                                        result += e.$dbNameOf(x) + ' integer primary key autoincrement';
-                                    }
-                                    else {
-                                        result += this.addColumnSqlSyntax(x, e.$dbNameOf(x));
-                                        if (x.key == entity.idMetadata.field.key) {
-                                            result += ' primary key';
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                        finally {
-                            try {
-                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                            }
-                            finally { if (e_2) throw e_2.error; }
-                        }
-                        sql = 'create table if not exists ' + e.$entityName + ' (' + result + '\r\n)';
-                        if (sql_database_js_1.SqlDatabase.LogToConsole)
-                            console.log(sql);
-                        return [4 /*yield*/, this.createCommand().execute(sql)];
-                    case 2:
-                        _d.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    WebSqlDataProvider.prototype.createCommand = function () {
-        return new WebSqlBridgeToSQLCommand(this.db);
-    };
-    WebSqlDataProvider.prototype.transaction = function (action) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                throw new Error('Method not implemented.');
-            });
-        });
-    };
-    WebSqlDataProvider.prototype.addColumnSqlSyntax = function (x, dbName) {
-        var result = dbName;
-        var nullNumber = x.allowNull ? '' : ' default 0 not null';
-        if (x.valueType == Date)
-            result += ' integer';
-        else if (x.valueType == Boolean)
-            result += ' integer ' + nullNumber;
-        else if (x.valueType == Number) {
-            if (!x.valueConverter.fieldTypeInDb)
-                result += ' real ' + nullNumber;
-            else
-                result += ' ' + x.valueConverter.fieldTypeInDb + ' ' + nullNumber;
-        }
-        else
-            result += ' text' + (x.allowNull ? ' ' : " default '' not null ");
-        return result;
-    };
-    WebSqlDataProvider.prototype.toString = function () {
-        return 'WebSqlDataProvider';
-    };
-    return WebSqlDataProvider;
-}());
-exports.WebSqlDataProvider = WebSqlDataProvider;
-var WebSqlBridgeToSQLCommand = /** @class */ (function () {
-    //@ts-ignore
-    function WebSqlBridgeToSQLCommand(source) {
-        this.source = source;
-        this.values = [];
-    }
-    WebSqlBridgeToSQLCommand.prototype.addParameterAndReturnSqlToken = function (val) {
-        return this.param(val);
-    };
-    WebSqlBridgeToSQLCommand.prototype.param = function (val) {
-        this.values.push(val);
-        return '~' + this.values.length + '~';
-    };
-    WebSqlBridgeToSQLCommand.prototype.execute = function (sql) {
-        var _this = this;
-        return new Promise(function (resolve, reject) {
-            return _this.source.transaction(function (t) {
-                var s = sql;
-                var v = [];
-                var m = s.match(/~\d+~/g);
-                if (m != null)
-                    m.forEach(function (mr) {
-                        s = s.replace(mr, '?');
-                        v.push(_this.values[Number.parseInt(mr.substring(1, mr.length - 1)) - 1]);
-                    });
-                t.executeSql(s, v, function (t1, r) { return resolve(new WebSqlBridgeToSQLQueryResult(r)); }, function (t2, err) {
-                    reject(err.message);
-                    return false;
-                });
-            });
-        });
-    };
-    return WebSqlBridgeToSQLCommand;
-}());
-var WebSqlBridgeToSQLQueryResult = /** @class */ (function () {
-    //@ts-ignore
-    function WebSqlBridgeToSQLQueryResult(r) {
-        this.r = r;
-        this.rows = [];
-        for (var i = 0; i < r.rows.length; i++) {
-            this.rows.push(r.rows.item(i));
-        }
-    }
-    WebSqlBridgeToSQLQueryResult.prototype.getColumnKeyInResultForIndexInSelect = function (index) {
-        if (this.rows.length == 0)
-            throw Error('No rows');
-        var i = 0;
-        for (var m in this.rows[0]) {
-            if (i++ == index)
-                return m;
-        }
-        throw Error('index not found');
-    };
-    return WebSqlBridgeToSQLQueryResult;
-}());