remult 0.26.8 → 0.26.10

package/esm/src/remult3/remult3.js

@@ -1,12 +1,8 @@
 export {};
-//p1 - remove controller and instance backend methods from the regular backend method article
-//p1 - describe entity
-//p1 - fix includeInApi documentation - figure out why we can't see the see?
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //y1 - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
-//y1 - talk about insert with relations
 //y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
-//y1 - change exp version to preview?
+//y2 - readonly key: keyof MembersOnly<entityType> & string
 //y1 - talk about insert / update / delete with relations
 /*
   repo(Order).insert({},{
@@ -22,14 +18,12 @@ export {};
     count:x.count()
   }))
 */
-//p1 - add documentation for bun sqlite
 //p1 - consider upsert (where,set)
 //p1 - wait a second to close stream
 //p1 - prepare the createEntity discussion
-//p1 - write active record article
 //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
+//p1 - article on displayValue including it's definition for entities that is used in relations
 //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?

package/esm/src/sort.js

@@ -1,4 +1,3 @@
-import { CompoundIdField } from './CompoundIdField.js';
 import { getRelationFieldInfo } from './remult3/relationInfoMember.js';
 /**
  * The `Sort` class is used to describe sorting criteria for queries. It is mainly used internally,
@@ -140,17 +139,12 @@ export class Sort {
             entityMetadata.options.defaultOrderBy)
             orderBy = Sort.translateOrderByToSort(entityMetadata, entityMetadata.options.defaultOrderBy);
         if (!orderBy)
-            orderBy = new Sort({ field: entityMetadata.idMetadata.field });
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField) {
-            for (const field of entityMetadata.idMetadata.field.fields) {
-                if (!orderBy.Segments.find((x) => x.field == field)) {
-                    orderBy.Segments.push({ field: field });
-                }
+            orderBy = new Sort();
+        for (const field of entityMetadata.idMetadata.fields) {
+            if (!orderBy.Segments.find((x) => x.field == field)) {
+                orderBy.Segments.push({ field: field });
             }
         }
-        else if (!orderBy.Segments.find((x) => x.field == entityMetadata.idMetadata.field)) {
-            orderBy.Segments.push({ field: entityMetadata.idMetadata.field });
-        }
         return orderBy;
     }
     /**
@@ -166,21 +160,14 @@ export class Sort {
         if (!orderBy || Object.keys(orderBy).length === 0)
             orderBy = entityMetadata.options.defaultOrderBy;
         if (!orderBy)
-            orderBy = {
-                [entityMetadata.idMetadata.field.key]: 'asc',
-            };
+            orderBy = {};
         else
             orderBy = { ...orderBy };
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField) {
-            for (const field of entityMetadata.idMetadata.field.fields) {
-                if (!orderBy[field.key]) {
-                    orderBy[field.key] = 'asc';
-                }
+        for (const field of entityMetadata.idMetadata.fields) {
+            if (!orderBy[field.key]) {
+                orderBy[field.key] = 'asc';
             }
         }
-        else if (!orderBy[entityMetadata.idMetadata.field.key]) {
-            orderBy[entityMetadata.idMetadata.field.key] = 'asc';
-        }
         return orderBy;
     }
 }

package/package.json

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

package/src/remult3/remult3.js

@@ -1,13 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//p1 - remove controller and instance backend methods from the regular backend method article
-//p1 - describe entity
-//p1 - fix includeInApi documentation - figure out why we can't see the see?
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //y1 - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
-//y1 - talk about insert with relations
 //y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
-//y1 - change exp version to preview?
+//y2 - readonly key: keyof MembersOnly<entityType> & string
 //y1 - talk about insert / update / delete with relations
 /*
   repo(Order).insert({},{
@@ -23,14 +19,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
     count:x.count()
   }))
 */
-//p1 - add documentation for bun sqlite
 //p1 - consider upsert (where,set)
 //p1 - wait a second to close stream
 //p1 - prepare the createEntity discussion
-//p1 - write active record article
 //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
+//p1 - article on displayValue including it's definition for entities that is used in relations
 //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?

package/src/sort.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sort = void 0;
 var tslib_1 = require("tslib");
-var CompoundIdField_js_1 = require("./CompoundIdField.js");
 var relationInfoMember_js_1 = require("./remult3/relationInfoMember.js");
 /**
  * The `Sort` class is used to describe sorting criteria for queries. It is mainly used internally,
@@ -169,29 +168,24 @@ var Sort = /** @class */ (function () {
             entityMetadata.options.defaultOrderBy)
             orderBy = Sort.translateOrderByToSort(entityMetadata, entityMetadata.options.defaultOrderBy);
         if (!orderBy)
-            orderBy = new Sort({ field: entityMetadata.idMetadata.field });
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField_js_1.CompoundIdField) {
-            var _loop_2 = function (field) {
-                if (!orderBy.Segments.find(function (x) { return x.field == field; })) {
-                    orderBy.Segments.push({ field: field });
-                }
-            };
-            try {
-                for (var _b = tslib_1.__values(entityMetadata.idMetadata.field.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var field = _c.value;
-                    _loop_2(field);
-                }
+            orderBy = new Sort();
+        var _loop_2 = function (field) {
+            if (!orderBy.Segments.find(function (x) { return x.field == field; })) {
+                orderBy.Segments.push({ field: field });
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_3) throw e_3.error; }
+        };
+        try {
+            for (var _b = tslib_1.__values(entityMetadata.idMetadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var field = _c.value;
+                _loop_2(field);
             }
         }
-        else if (!orderBy.Segments.find(function (x) { return x.field == entityMetadata.idMetadata.field; })) {
-            orderBy.Segments.push({ field: entityMetadata.idMetadata.field });
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_3) throw e_3.error; }
         }
         return orderBy;
     };
@@ -205,34 +199,27 @@ var Sort = /** @class */ (function () {
      * @returns {EntityOrderBy<T>} An `EntityOrderBy` representing the unique order by criteria.
      */
     Sort.createUniqueEntityOrderBy = function (entityMetadata, orderBy) {
-        var _a, e_4, _b;
+        var e_4, _a;
         if (!orderBy || Object.keys(orderBy).length === 0)
             orderBy = entityMetadata.options.defaultOrderBy;
         if (!orderBy)
-            orderBy = (_a = {},
-                _a[entityMetadata.idMetadata.field.key] = 'asc',
-                _a);
+            orderBy = {};
         else
             orderBy = tslib_1.__assign({}, orderBy);
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField_js_1.CompoundIdField) {
-            try {
-                for (var _c = tslib_1.__values(entityMetadata.idMetadata.field.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var field = _d.value;
-                    if (!orderBy[field.key]) {
-                        orderBy[field.key] = 'asc';
-                    }
-                }
-            }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-            finally {
-                try {
-                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+        try {
+            for (var _b = tslib_1.__values(entityMetadata.idMetadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var field = _c.value;
+                if (!orderBy[field.key]) {
+                    orderBy[field.key] = 'asc';
                 }
-                finally { if (e_4) throw e_4.error; }
             }
         }
-        else if (!orderBy[entityMetadata.idMetadata.field.key]) {
-            orderBy[entityMetadata.idMetadata.field.key] = 'asc';
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_4) throw e_4.error; }
         }
         return orderBy;
     };