remult 0.26.4 → 0.26.5-exp.1

package/README.md

@@ -84,7 +84,9 @@ export class Product {
   unitPrice = 0
 }
 ```
-
+> [!NOTE] 
+> Don't like decorators? we have full support for [Working without decorators](https://remult.dev/docs/working-without-decorators)
+> 
 ### Add backend API with a [single line of code](https://remult.dev/docs/quickstart#server-side-initialization)
 
 _Example:_

package/esm/postgres/schema-builder.js

@@ -155,10 +155,11 @@ export class PostgresSchemaBuilder {
                 else {
                     result += postgresColumnSyntax(x, e.$dbNameOf(x));
                 }
-                if (x == entity.idMetadata.field)
-                    result += ' primary key';
             }
         }
+        result += `,\r\n   primary key (${entity.idMetadata.fields
+            .map((f) => e.$dbNameOf(f))
+            .join(',')})`;
         let sql = `CREATE SCHEMA IF NOT EXISTS ${this.schemaOnly(e)};
 CREATE table ${this.schemaAndName(e)} (${result}\r\n)`;
         return sql;

package/esm/remult-knex/index.js

@@ -1,12 +1,10 @@
 import { CustomSqlFilterBuilder, } 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 { CompoundIdField } from '../src/CompoundIdField.js';
 import { remult as remultContext } from '../src/remult-proxy.js';
 import { getRepository, isAutoIncrement, } from '../src/remult3/RepositoryImplementation.js';
 import { Sort } from '../src/sort.js';
 import { ValueConverters } from '../src/valueConverters.js';
-import { resultCompoundIdFilter as resultCompoundIdFilter } from '../src/resultCompoundIdFilter.js';
 import { getRepositoryInternals } from '../src/remult3/repository-internals.js';
 import { remultStatic } from '../src/remult-static.js';
 export class KnexDataProvider {
@@ -233,10 +231,7 @@ class KnexEntityDataProvider {
     async insert(data) {
         const e = await this.init();
         let resultFilter;
-        if (this.entity.idMetadata.field instanceof CompoundIdField)
-            resultFilter = resultCompoundIdFilter(this.entity.idMetadata.field, undefined, data);
-        else
-            resultFilter = Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
+        resultFilter = Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
         let insertObject = {};
         for (const x of this.entity.fields) {
             if (isDbReadonly(x, e)) {
@@ -426,11 +421,10 @@ export class KnexSchemaBuilder {
                         b.increments(cols.get(x).name);
                     else {
                         buildColumn(x, cols.get(x).name, b, supportsJsonDataStorage(this.knex));
-                        if (x == entity.idMetadata.field)
-                            b.primary([cols.get(x).name]);
                     }
                 }
             }
+            b.primary(entity.idMetadata.fields.map((f) => e.$dbNameOf(f)));
         });
     }
     async addColumnIfNotExist(entity, c) {

package/esm/remult-mongo.js

@@ -1,9 +1,8 @@
 import { ObjectId, } from 'mongodb';
-import { CompoundIdField, Filter } from './index.js';
+import { Filter } from './index.js';
 import { dbNamesOf } 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 { resultCompoundIdFilter } from './src/resultCompoundIdFilter.js';
 import { getRepositoryInternals } from './src/remult3/repository-internals.js';
 export class MongoDataProvider {
     db;
@@ -130,11 +129,6 @@ class MongoEntityDataProvider {
         let resultFilter = this.entity.idMetadata.getIdFilter(id);
         if (data.id != undefined)
             resultFilter = this.entity.idMetadata.getIdFilter(data.id);
-        for (const x of this.entity.fields) {
-            if (x instanceof CompoundIdField) {
-                resultFilter = resultCompoundIdFilter(x, id, data);
-            }
-        }
         let newR = {};
         let keys = Object.keys(data);
         for (const f of this.entity.fields) {

package/esm/remult-sqlite-core.js

@@ -84,7 +84,7 @@ export class SqliteCoreDataProvider {
                 result += '\r\n  ';
                 if (isAutoIncrement(x)) {
                     if (x.key != entity.idMetadata.field.key)
-                        throw 'in web sql, autoincrement is only allowed for primary key';
+                        throw 'in sqlite, autoincrement is only allowed for primary key';
                     result += e.$dbNameOf(x) + ' integer primary key autoincrement';
                 }
                 else {

package/esm/server/remult-admin.js

@@ -1,4 +1,3 @@
-import { CompoundIdField } from '../src/CompoundIdField.js';
 import { getRelationFieldInfo, } from '../src/remult3/relationInfoMember.js';
 import { Filter } from '../src/filter/filter-interfaces.js';
 import { getHtml } from './get-remult-admin-html.js';
@@ -17,13 +16,9 @@ export function buildEntityInfo(options) {
         let fields = [];
         let relations = [];
         let ids = {};
-        if (metadata.idMetadata.field instanceof CompoundIdField) {
-            for (const field of metadata.idMetadata.field.fields) {
-                ids[field.key] = true;
-            }
+        for (const f of metadata.idMetadata.fields) {
+            ids[f.key] = true;
         }
-        else
-            ids[metadata.idMetadata.field.key] = true;
         for (const x of metadata.fields.toArray()) {
             if (!x.includedInApi(undefined))
                 continue;

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

@@ -1,4 +1,3 @@
-import { CompoundIdField } from '../CompoundIdField.js';
 import { FilterConsumerBridgeToSqlRequest, dbNamesOf, 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';
@@ -256,14 +255,7 @@ class ActualSQLServerDataProvider {
                 let first = true;
                 let segs = [];
                 for (const s of options.orderBy.Segments) {
-                    if (s.field instanceof CompoundIdField) {
-                        segs.push(...s.field.fields.map((c) => ({
-                            field: c,
-                            isDescending: s.isDescending,
-                        })));
-                    }
-                    else
-                        segs.push(s);
+                    segs.push(s);
                 }
                 for (const c of segs) {
                     if (first) {
@@ -336,8 +328,6 @@ class ActualSQLServerDataProvider {
         let statement = 'update ' + e.$entityName + ' set ';
         let added = false;
         for (const x of this.entity.fields) {
-            if (x instanceof CompoundIdField) {
-            }
             if (isDbReadonly(x, e)) {
             }
             else if (data[x.key] !== undefined) {

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

@@ -229,7 +229,15 @@ export async function entityDbName(metadata, wrapIdentifier = (x) => x) {
         if (typeof metadata.options.sqlExpression === 'string')
             return metadata.options.sqlExpression;
         else if (typeof metadata.options.sqlExpression === 'function') {
-            return await metadata.options.sqlExpression(metadata);
+            const prev = metadata.options.sqlExpression;
+            try {
+                metadata.options.sqlExpression =
+                    "recursive sqlExpression call for entity '" + metadata.key + "'. ";
+                return await prev(metadata);
+            }
+            finally {
+                metadata.options.sqlExpression = prev;
+            }
         }
     }
     return wrapIdentifier(metadata.dbName);

package/esm/src/remult3/RepositoryImplementation.js

@@ -272,7 +272,7 @@ export class RepositoryImplementation {
             }
         }
     }
-    async updateMany({ where }, set) {
+    async updateMany({ where, set, }) {
         Filter.throwErrorIfFilterIsEmpty(where, 'updateMany');
         if (this._dataProvider.isProxy) {
             return this._edp.updateMany(await this._translateWhereToFilter(where), set);
@@ -1928,6 +1928,11 @@ class EntityFullInfo {
                 return item[this.idMetadata.field.key];
         },
         field: undefined,
+        get fields() {
+            return this.field instanceof CompoundIdField
+                ? this.field.fields
+                : [this.field];
+        },
         createIdInFilter: (items) => {
             if (items.length > 0)
                 return {

package/esm/src/remult3/remult3.js

@@ -1,21 +1,26 @@
 export {};
 //y1 - https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //y1 - fix async hooks - was it fixed?
-//p1 - consider upsert (where,set)
-//p1 - consider id to also support keyof (id:['company','index'])
-//p1 - wait a second to close stream
+//y1 - repo batch - for multiple operations:
+/*
+  const result = await repo.batch(x=>({
+    data:x.find(),
+    count:x.count()
+  }))
+*/
+//p1 - adjust react tutorial to esm
 //p1 - add solid tutorial to the getting started page
 //p1 - update the examples section
-//p1 - support dbnamesof in sqlexpression of entity
-//p1 - adjust sql expression of entity docs to include a union example
-//p1 - reconsider update many, maybe the second parameter should be in a set option - break existing
 //p1 - add documentation for bun sqlite
+//p1 - consider upsert (where,set)
+//p1 - wait a second to close stream
+//y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
 //p1 - describe entity
 //p1 - prepare the createEntity discussion
 //p1 - write active record article
-//p1 - maybe add decorator comment in the readme as well (I heard you've lost me in decorators) - and improve the describeClass function
 //p1 - return error on connection error
 //p1 - consider including the admin in the tutorial - and maybe even in the demo when we setup the api
+//p1 - reconsider key typing to be keyof & string
 //p2 -fix remult admin not to load the html into memory until used
 //y2 - JY suggestion of having generate as part of the ensure schema - not sure
 //y2 - currently for string fields we default for 255 in knex (which is their default) why not just use text (varchar max) - and only use exact length when one is provided?
@@ -92,4 +97,3 @@ export {};
 //y2 - add some api testing framework for user unit tests (will help with codesandbox based discussions)
 //[ ] V2 - what to do about for relations count?
 //[ ] V2 - condition? not to fetch if null etc....
-//p1 - adjust react tutorial to esm

package/esm/src/validators.js

@@ -26,10 +26,15 @@ export class Validators {
     static regex = createValueValidatorWithArgs((val, regex) => regex.test(val));
     static email = createValueValidator((val) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(val), 'Invalid Email');
     static url = createValueValidator((val) => !!new URL(val), 'Invalid Url');
-    static in = createValueValidatorWithArgs((val, values) => values.includes(val), (values) => `Value must be one of ${values.map(y => typeof y === "object" ? y['id'] !== undefined ? y['id'] : y.toString() : y).join(', ')}`);
-    static notNull = createValueValidator((val) => val != null, 'Should not be null');
-    static enum = createValueValidatorWithArgs((value, enumObj) => Object.values(enumObj).includes(value), (enumObj) => `Value must be one of ${getEnumValues(enumObj)
+    static in = createValueValidatorWithArgs((val, values) => values.includes(val), (values) => `Value must be one of: ${values
+        .map((y) => typeof y === 'object'
+        ? y['id'] !== undefined
+            ? y['id']
+            : y.toString()
+        : y)
         .join(', ')}`);
+    static notNull = createValueValidator((val) => val != null, 'Should not be null');
+    static enum = createValueValidatorWithArgs((value, enumObj) => Object.values(enumObj).includes(value), (enumObj) => `Value must be one of ${getEnumValues(enumObj).join(', ')}`);
     static relationExists = createValidator(async (_, e) => {
         if (e.valueIsNull())
             return true;
@@ -134,6 +139,5 @@ function createValidatorWithArgsInternal(validate, defaultMessage, isValueValida
     });
 }
 export function getEnumValues(enumObj) {
-    return Object.values(enumObj)
-        .filter((x) => typeof enumObj[x] !== 'number');
+    return Object.values(enumObj).filter((x) => typeof enumObj[x] !== 'number');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.26.4",
+    "version": "0.26.5-exp.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/postgres/schema-builder.js

@@ -287,8 +287,6 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                                     else {
                                         result += postgresColumnSyntax(x, e.$dbNameOf(x));
                                     }
-                                    if (x == entity.idMetadata.field)
-                                        result += ' primary key';
                                 }
                             }
                         }
@@ -299,6 +297,9 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                             }
                             finally { if (e_3) throw e_3.error; }
                         }
+                        result += ",\r\n   primary key (".concat(entity.idMetadata.fields
+                            .map(function (f) { return e.$dbNameOf(f); })
+                            .join(','), ")");
                         sql = "CREATE SCHEMA IF NOT EXISTS ".concat(this.schemaOnly(e), ";\nCREATE table ").concat(this.schemaAndName(e), " (").concat(result, "\r\n)");
                         return [2 /*return*/, sql];
                 }

package/remult-knex/index.js

@@ -5,12 +5,10 @@ var tslib_1 = require("tslib");
 var filter_consumer_bridge_to_sql_request_js_1 = require("../src/filter/filter-consumer-bridge-to-sql-request.js");
 var filter_consumer_bridge_to_sql_request_js_2 = require("../src/filter/filter-consumer-bridge-to-sql-request.js");
 var filter_interfaces_js_1 = require("../src/filter/filter-interfaces.js");
-var CompoundIdField_js_1 = require("../src/CompoundIdField.js");
 var remult_proxy_js_1 = require("../src/remult-proxy.js");
 var RepositoryImplementation_js_1 = require("../src/remult3/RepositoryImplementation.js");
 var sort_js_1 = require("../src/sort.js");
 var valueConverters_js_1 = require("../src/valueConverters.js");
-var resultCompoundIdFilter_js_1 = require("../src/resultCompoundIdFilter.js");
 var repository_internals_js_1 = require("../src/remult3/repository-internals.js");
 var remult_static_js_1 = require("../src/remult-static.js");
 var KnexDataProvider = /** @class */ (function () {
@@ -422,10 +420,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _d.sent();
-                        if (this.entity.idMetadata.field instanceof CompoundIdField_js_1.CompoundIdField)
-                            resultFilter = (0, resultCompoundIdFilter_js_1.resultCompoundIdFilter)(this.entity.idMetadata.field, undefined, data);
-                        else
-                            resultFilter = filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
+                        resultFilter = filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
                         insertObject = {};
                         _d.label = 2;
                     case 2:
@@ -838,8 +833,6 @@ var KnexSchemaBuilder = /** @class */ (function () {
                             b.increments(cols.get(x).name);
                         else {
                             buildColumn(x, cols.get(x).name, b, supportsJsonDataStorage(_this.knex));
-                            if (x == entity.idMetadata.field)
-                                b.primary([cols.get(x).name]);
                         }
                     }
                 }
@@ -851,6 +844,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                 }
                 finally { if (e_10) throw e_10.error; }
             }
+            b.primary(entity.idMetadata.fields.map(function (f) { return e.$dbNameOf(f); }));
         });
     };
     KnexSchemaBuilder.prototype.addColumnIfNotExist = function (entity, c) {

package/remult-mongo.js

@@ -7,7 +7,6 @@ var index_js_1 = require("./index.js");
 var filter_consumer_bridge_to_sql_request_js_1 = require("./src/filter/filter-consumer-bridge-to-sql-request.js");
 var remult_proxy_js_1 = require("./src/remult-proxy.js");
 var RepositoryImplementation_js_1 = require("./src/remult3/RepositoryImplementation.js");
-var resultCompoundIdFilter_js_1 = require("./src/resultCompoundIdFilter.js");
 var repository_internals_js_1 = require("./src/remult3/repository-internals.js");
 var MongoDataProvider = /** @class */ (function () {
     function MongoDataProvider(db, client, options) {
@@ -222,38 +221,23 @@ var MongoEntityDataProvider = /** @class */ (function () {
     };
     MongoEntityDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, collection, e, f, resultFilter, _b, _c, x, newR, keys, _d, _e, f_1, r, _f, _g;
-            var e_4, _h, e_5, _j;
-            return tslib_1.__generator(this, function (_k) {
-                switch (_k.label) {
+            var _a, collection, e, f, resultFilter, newR, keys, _b, _c, f_1, r, _d, _e;
+            var e_4, _f;
+            return tslib_1.__generator(this, function (_g) {
+                switch (_g.label) {
                     case 0: return [4 /*yield*/, this.collection()];
                     case 1:
-                        _a = _k.sent(), collection = _a.collection, e = _a.e;
+                        _a = _g.sent(), collection = _a.collection, e = _a.e;
                         f = new FilterConsumerBridgeToMongo(e);
                         index_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         resultFilter = this.entity.idMetadata.getIdFilter(id);
                         if (data.id != undefined)
                             resultFilter = this.entity.idMetadata.getIdFilter(data.id);
-                        try {
-                            for (_b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                x = _c.value;
-                                if (x instanceof index_js_1.CompoundIdField) {
-                                    resultFilter = (0, resultCompoundIdFilter_js_1.resultCompoundIdFilter)(x, id, data);
-                                }
-                            }
-                        }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                        finally {
-                            try {
-                                if (_c && !_c.done && (_h = _b.return)) _h.call(_b);
-                            }
-                            finally { if (e_4) throw e_4.error; }
-                        }
                         newR = {};
                         keys = Object.keys(data);
                         try {
-                            for (_d = tslib_1.__values(this.entity.fields), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                f_1 = _e.value;
+                            for (_b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                f_1 = _c.value;
                                 if (!f_1.dbReadOnly && !f_1.isServerExpression) {
                                     if (keys.includes(f_1.key)) {
                                         newR[f_1.key] = toDb(f_1, data[f_1.key]);
@@ -261,21 +245,21 @@ var MongoEntityDataProvider = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
                         finally {
                             try {
-                                if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
+                                if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
                             }
-                            finally { if (e_5) throw e_5.error; }
+                            finally { if (e_4) throw e_4.error; }
                         }
-                        _g = (_f = collection).updateOne;
+                        _e = (_d = collection).updateOne;
                         return [4 /*yield*/, f.resolveWhere()];
-                    case 2: return [4 /*yield*/, _g.apply(_f, [_k.sent(), {
+                    case 2: return [4 /*yield*/, _e.apply(_d, [_g.sent(), {
                                 $set: newR,
                             },
                             { session: this.session }])];
                     case 3:
-                        r = _k.sent();
+                        r = _g.sent();
                         return [2 /*return*/, this.find({
                                 where: index_js_1.Filter.fromEntityFilter(this.entity, resultFilter),
                             }).then(function (y) { return y[0]; })];
@@ -350,8 +334,8 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
     }
     FilterConsumerBridgeToMongo.prototype.resolveWhere = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var p, p_1, p_1_1, pr, e_6_1;
-            var e_6, _a;
+            var p, p_1, p_1_1, pr, e_5_1;
+            var e_5, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -361,7 +345,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 6, 7, 8]);
-                        p_1 = (e_6 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
+                        p_1 = (e_5 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
                         _b.label = 2;
                     case 2:
                         if (!!p_1_1.done) return [3 /*break*/, 5];
@@ -375,14 +359,14 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_6_1 = _b.sent();
-                        e_6 = { error: e_6_1 };
+                        e_5_1 = _b.sent();
+                        e_5 = { error: e_5_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (p_1_1 && !p_1_1.done && (_a = p_1.return)) _a.call(p_1);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 0];
                     case 9:
@@ -401,8 +385,8 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
     FilterConsumerBridgeToMongo.prototype.or = function (orElements) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var result, orElements_1, orElements_1_1, element, f, where, e_7_1;
-            var e_7, _a;
+            var result, orElements_1, orElements_1_1, element, f, where, e_6_1;
+            var e_6, _a;
             var _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -433,14 +417,14 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_7_1 = _c.sent();
-                        e_7 = { error: e_7_1 };
+                        e_6_1 = _c.sent();
+                        e_6 = { error: e_6_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (orElements_1_1 && !orElements_1_1.done && (_a = orElements_1.return)) _a.call(orElements_1);
                         }
-                        finally { if (e_7) throw e_7.error; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         this.result.push(function () { return ({

package/remult-sqlite-core.js

@@ -184,7 +184,7 @@ var SqliteCoreDataProvider = /** @class */ (function () {
                                     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';
+                                            throw 'in sqlite, autoincrement is only allowed for primary key';
                                         result += e.$dbNameOf(x) + ' integer primary key autoincrement';
                                     }
                                     else {

package/server/remult-admin.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildEntityInfo = void 0;
 var tslib_1 = require("tslib");
-var CompoundIdField_js_1 = require("../src/CompoundIdField.js");
 var relationInfoMember_js_1 = require("../src/remult3/relationInfoMember.js");
 var filter_interfaces_js_1 = require("../src/filter/filter-interfaces.js");
 var get_remult_admin_html_js_1 = require("./get-remult-admin-html.js");
@@ -24,23 +23,19 @@ function buildEntityInfo(options) {
             var fields = [];
             var relations = [];
             var ids = {};
-            if (metadata.idMetadata.field instanceof CompoundIdField_js_1.CompoundIdField) {
-                try {
-                    for (var _g = (e_2 = void 0, tslib_1.__values(metadata.idMetadata.field.fields)), _h = _g.next(); !_h.done; _h = _g.next()) {
-                        var field = _h.value;
-                        ids[field.key] = true;
-                    }
+            try {
+                for (var _g = (e_2 = void 0, tslib_1.__values(metadata.idMetadata.fields)), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    var f = _h.value;
+                    ids[f.key] = true;
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
-                    }
-                    finally { if (e_2) throw e_2.error; }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
                 }
+                finally { if (e_2) throw e_2.error; }
             }
-            else
-                ids[metadata.idMetadata.field.key] = true;
             var _loop_1 = function (x) {
                 if (!x.includedInApi(undefined))
                     return "continue";

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDatabase = void 0;
 var tslib_1 = require("tslib");
-var CompoundIdField_js_1 = require("../CompoundIdField.js");
 var filter_consumer_bridge_to_sql_request_js_1 = require("../filter/filter-consumer-bridge-to-sql-request.js");
 var filter_interfaces_js_1 = require("../filter/filter-interfaces.js");
 var remult_proxy_js_1 = require("../remult-proxy.js");
@@ -343,7 +342,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
     };
     ActualSQLServerDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _a, colKeys, select, r, where, _b, first, segs, _loop_1, _c, _d, s, segs_1, segs_1_1, c, page;
+            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;
             var _this = this;
             return tslib_1.__generator(this, function (_g) {
@@ -374,20 +373,10 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                         if (options.orderBy) {
                             first = true;
                             segs = [];
-                            _loop_1 = function (s) {
-                                if (s.field instanceof CompoundIdField_js_1.CompoundIdField) {
-                                    segs.push.apply(segs, tslib_1.__spreadArray([], tslib_1.__read(s.field.fields.map(function (c) { return ({
-                                        field: c,
-                                        isDescending: s.isDescending,
-                                    }); })), false));
-                                }
-                                else
-                                    segs.push(s);
-                            };
                             try {
                                 for (_c = tslib_1.__values(options.orderBy.Segments), _d = _c.next(); !_d.done; _d = _c.next()) {
                                     s = _d.value;
-                                    _loop_1(s);
+                                    segs.push(s);
                                 }
                             }
                             catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -502,8 +491,6 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                         try {
                             for (_a = tslib_1.__values(this.entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 x = _b.value;
-                                if (x instanceof CompoundIdField_js_1.CompoundIdField) {
-                                }
                                 if ((0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e)) {
                                 }
                                 else if (data[x.key] !== undefined) {
@@ -652,14 +639,14 @@ var myDummySQLCommand = /** @class */ (function () {
 }());
 function bulkInsert(array, db) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var chunkSize, _loop_2, i;
+        var chunkSize, _loop_1, i;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (array.length == 0)
                         return [2 /*return*/];
                     chunkSize = 250;
-                    _loop_2 = function (i) {
+                    _loop_1 = function (i) {
                         var items, c, sql, _b, _c;
                         return tslib_1.__generator(this, function (_d) {
                             switch (_d.label) {
@@ -697,7 +684,7 @@ function bulkInsert(array, db) {
                     _a.label = 1;
                 case 1:
                     if (!(i < array.length)) return [3 /*break*/, 4];
-                    return [5 /*yield**/, _loop_2(i)];
+                    return [5 /*yield**/, _loop_1(i)];
                 case 2:
                     _a.sent();
                     _a.label = 3;

package/src/entity.d.ts

@@ -150,7 +150,19 @@ export interface EntityOptions<entityType = any> {
      * dbName:'public."myProducts"'
      */
     dbName?: string;
-    /** For entities that are based on SQL expressions instead of a physical table or view*/
+    /** For entities that are based on SQL expressions instead of a physical table or view
+     * @example
+     * .@Entity('people',{
+     * sqlExpression:`select id,name from employees
+     *      union all select id,name from contractors`,
+     * })
+     * export class Person{
+     * .@Fields.string()
+     * id=''
+     * .@Fields.string()
+     * name=''
+     * }
+     */
     sqlExpression?: string | ((entity: EntityMetadata<entityType>) => string | Promise<string>);
     /** An arrow function that identifies the `id` column to use for this entity
      * @example

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

@@ -369,17 +369,27 @@ 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 () {
+        var prev;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!metadata.options.sqlExpression) return [3 /*break*/, 3];
+                    if (!metadata.options.sqlExpression) return [3 /*break*/, 5];
                     if (!(typeof metadata.options.sqlExpression === 'string')) return [3 /*break*/, 1];
                     return [2 /*return*/, metadata.options.sqlExpression];
                 case 1:
-                    if (!(typeof metadata.options.sqlExpression === 'function')) return [3 /*break*/, 3];
-                    return [4 /*yield*/, metadata.options.sqlExpression(metadata)];
-                case 2: return [2 /*return*/, _a.sent()];
-                case 3: return [2 /*return*/, wrapIdentifier(metadata.dbName)];
+                    if (!(typeof metadata.options.sqlExpression === 'function')) return [3 /*break*/, 5];
+                    prev = metadata.options.sqlExpression;
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, , 4, 5]);
+                    metadata.options.sqlExpression =
+                        "recursive sqlExpression call for entity '" + metadata.key + "'. ";
+                    return [4 /*yield*/, prev(metadata)];
+                case 3: return [2 /*return*/, _a.sent()];
+                case 4:
+                    metadata.options.sqlExpression = prev;
+                    return [7 /*endfinally*/];
+                case 5: return [2 /*return*/, wrapIdentifier(metadata.dbName)];
             }
         });
     });

package/src/remult3/RepositoryImplementation.d.ts

@@ -47,9 +47,10 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     insert(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     get fields(): FieldsMetadata<entityType>;
     validate(entity: Partial<MembersOnly<entityType>>, ...fields: Extract<keyof MembersOnly<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
-    updateMany({ where }: {
+    updateMany({ where, set, }: {
         where: EntityFilter<entityType>;
-    }, set: Partial<MembersOnly<entityType>>): Promise<number>;
+        set: Partial<MembersOnly<entityType>>;
+    }): Promise<number>;
     update(id: idType<entityType>, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     update(originalItem: Partial<MembersOnly<entityType>>, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     private _getRefForExistingRow;

package/src/remult3/RepositoryImplementation.js

@@ -438,9 +438,9 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
-    RepositoryImplementation.prototype.updateMany = function (_a, set) {
+    RepositoryImplementation.prototype.updateMany = function (_a) {
         var _b, e_7, _c, _d;
-        var where = _a.where;
+        var where = _a.where, set = _a.set;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _e, _f, updated, _g, _h, _j, item, e_7_1;
             return tslib_1.__generator(this, function (_k) {
@@ -3101,6 +3101,11 @@ var EntityFullInfo = /** @class */ (function () {
                     return item[_this.idMetadata.field.key];
             },
             field: undefined,
+            get fields() {
+                return this.field instanceof CompoundIdField_js_1.CompoundIdField
+                    ? this.field.fields
+                    : [this.field];
+            },
             createIdInFilter: function (items) {
                 if (items.length > 0)
                     return {

package/src/remult3/remult3.d.ts

@@ -174,6 +174,7 @@ export interface IdMetadata<entityType = any> {
      */
     getId(item: Partial<MembersOnly<entityType>>): any;
     field: FieldMetadata<any>;
+    fields: FieldMetadata<unknown>[];
     getIdFilter(...ids: any[]): EntityFilter<entityType>;
     isIdField(col: FieldMetadata): boolean;
     createIdInFilter(items: Partial<MembersOnly<entityType>>[]): EntityFilter<entityType>;
@@ -317,7 +318,8 @@ export interface Repository<entityType> {
      */
     updateMany(options: {
         where: EntityFilter<entityType>;
-    }, item: Partial<MembersOnly<entityType>>): Promise<number>;
+        set: Partial<MembersOnly<entityType>>;
+    }): Promise<number>;
     /** Deletes an Item*/
     delete(id: idType<entityType>): Promise<void>;
     delete(item: Partial<MembersOnly<entityType>>): Promise<void>;

package/src/remult3/remult3.js

@@ -2,21 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 //y1 - https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //y1 - fix async hooks - was it fixed?
-//p1 - consider upsert (where,set)
-//p1 - consider id to also support keyof (id:['company','index'])
-//p1 - wait a second to close stream
+//y1 - repo batch - for multiple operations:
+/*
+  const result = await repo.batch(x=>({
+    data:x.find(),
+    count:x.count()
+  }))
+*/
+//p1 - adjust react tutorial to esm
 //p1 - add solid tutorial to the getting started page
 //p1 - update the examples section
-//p1 - support dbnamesof in sqlexpression of entity
-//p1 - adjust sql expression of entity docs to include a union example
-//p1 - reconsider update many, maybe the second parameter should be in a set option - break existing
 //p1 - add documentation for bun sqlite
+//p1 - consider upsert (where,set)
+//p1 - wait a second to close stream
+//y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
 //p1 - describe entity
 //p1 - prepare the createEntity discussion
 //p1 - write active record article
-//p1 - maybe add decorator comment in the readme as well (I heard you've lost me in decorators) - and improve the describeClass function
 //p1 - return error on connection error
 //p1 - consider including the admin in the tutorial - and maybe even in the demo when we setup the api
+//p1 - reconsider key typing to be keyof & string
 //p2 -fix remult admin not to load the html into memory until used
 //y2 - JY suggestion of having generate as part of the ensure schema - not sure
 //y2 - currently for string fields we default for 255 in knex (which is their default) why not just use text (varchar max) - and only use exact length when one is provided?
@@ -93,4 +98,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //y2 - add some api testing framework for user unit tests (will help with codesandbox based discussions)
 //[ ] V2 - what to do about for relations count?
 //[ ] V2 - condition? not to fetch if null etc....
-//p1 - adjust react tutorial to esm

package/src/validators.js

@@ -48,14 +48,19 @@ var Validators = /** @class */ (function () {
     });
     Validators.email = createValueValidator(function (val) { return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(val); }, 'Invalid Email');
     Validators.url = createValueValidator(function (val) { return !!new URL(val); }, 'Invalid Url');
-    Validators.in = createValueValidatorWithArgs(function (val, values) { return values.includes(val); }, function (values) { return "Value must be one of ".concat(values.map(function (y) {
-        return typeof y === "object" ? y['id'] !== undefined ? y['id'] : y.toString() : y;
-    }).join(', ')); });
-    Validators.notNull = createValueValidator(function (val) { return val != null; }, 'Should not be null');
-    Validators.enum = createValueValidatorWithArgs(function (value, enumObj) { return Object.values(enumObj).includes(value); }, function (enumObj) {
-        return "Value must be one of ".concat(getEnumValues(enumObj)
+    Validators.in = createValueValidatorWithArgs(function (val, values) { return values.includes(val); }, function (values) {
+        return "Value must be one of: ".concat(values
+            .map(function (y) {
+            return typeof y === 'object'
+                ? y['id'] !== undefined
+                    ? y['id']
+                    : y.toString()
+                : y;
+        })
             .join(', '));
     });
+    Validators.notNull = createValueValidator(function (val) { return val != null; }, 'Should not be null');
+    Validators.enum = createValueValidatorWithArgs(function (value, enumObj) { return Object.values(enumObj).includes(value); }, function (enumObj) { return "Value must be one of ".concat(getEnumValues(enumObj).join(', ')); });
     Validators.relationExists = createValidator(function (_, e) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var _b;
         return tslib_1.__generator(_a, function (_c) {
@@ -209,7 +214,6 @@ function createValidatorWithArgsInternal(validate, defaultMessage, isValueValida
     });
 }
 function getEnumValues(enumObj) {
-    return Object.values(enumObj)
-        .filter(function (x) { return typeof enumObj[x] !== 'number'; });
+    return Object.values(enumObj).filter(function (x) { return typeof enumObj[x] !== 'number'; });
 }
 exports.getEnumValues = getEnumValues;

package/esm/src/resultCompoundIdFilter.js

@@ -1,16 +0,0 @@
-import { Filter } from './filter/filter-interfaces.js';
-export function resultCompoundIdFilter(idField, id, data) {
-    return new Filter((add) => {
-        let idParts = [];
-        if (id != undefined)
-            idParts = id.split(',');
-        idField.fields.forEach((c, i) => {
-            let val = undefined;
-            if (i < idParts.length)
-                val = idParts[i];
-            if (data[c.key] != undefined)
-                val = data[c.key];
-            add.isEqualTo(c, val);
-        });
-    });
-}

package/src/resultCompoundIdFilter.d.ts

@@ -1,3 +0,0 @@
-import type { CompoundIdField } from './CompoundIdField.js';
-import { Filter } from './filter/filter-interfaces.js';
-export declare function resultCompoundIdFilter(idField: CompoundIdField, id: string | undefined, data: any): Filter;

package/src/resultCompoundIdFilter.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resultCompoundIdFilter = void 0;
-var filter_interfaces_js_1 = require("./filter/filter-interfaces.js");
-function resultCompoundIdFilter(idField, id, data) {
-    return new filter_interfaces_js_1.Filter(function (add) {
-        var idParts = [];
-        if (id != undefined)
-            idParts = id.split(',');
-        idField.fields.forEach(function (c, i) {
-            var val = undefined;
-            if (i < idParts.length)
-                val = idParts[i];
-            if (data[c.key] != undefined)
-                val = data[c.key];
-            add.isEqualTo(c, val);
-        });
-    });
-}
-exports.resultCompoundIdFilter = resultCompoundIdFilter;