remult 0.22.7 → 0.22.8

package/README.md

@@ -3,7 +3,7 @@
     <img src="https://github.com/remult/remult/raw/master/docs/public/logo.png" width="140" height="140">
   </a>
   <h1>Remult</h1>
-  <p>A CRUD framework for full-stack TypeScript</p>
+  <p>Full-stack CRUD, simplified, with SSOT TypeScript entities</p>
 	<a href="https://circleci.com/gh/remult/remult/tree/master" rel="nofollow">
 		<img alt="CircleCI" src="https://circleci.com/gh/remult/remult/tree/master.svg?style=shield">
 	</a>
@@ -22,8 +22,6 @@
 	<a href="https://discord.gg/GXHk7ZfuG5" rel="nofollow">
 		<img alt="Join Discord" src="https://badgen.net/discord/online-members/GXHk7ZfuG5?icon=discord&label=Discord"/>
 	</a>
-  <a href="https://twitter.com/intent/tweet?text=Remult%20-%20open-source%20CRUD%20framework%20for%20full-stack%20TypeScript%0A%0A%40remultjs%0A&url=https%3A%2F%2Fgithub.com%2Fremult%2Fremult">
-    <img alt="Twitter URL" src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Fintent%2Ftweet%3Ftext%3DRemult%2520-%2520open-source%2520CRUD%2520framework%2520for%2520full-stack%2520TypeScript%250A%250A%2540remultjs%250A%26url%3Dhttps%253A%252F%252Fgithub.com%252Fremult%252Fremult">
   </a>
 </div>
 

package/esm/src/column.js

@@ -14,6 +14,8 @@ export class LookupColumn {
     repository;
     id;
     toJson() {
+        if (!this.storedItem)
+            return undefined;
         if (this.item === null)
             return null;
         return this.repository.toJson(this.item);

package/esm/src/filter/filter-interfaces.js

@@ -383,10 +383,11 @@ export function buildFilterFromRequestParameters(entity, filterInfo) {
             })),
         }));
         if (or.length == 1)
-            return or[0];
-        where.push({
-            $and: or,
-        });
+            where.push(or[0]);
+        else
+            where.push({
+                $and: or,
+            });
     }
     for (const key in entity.entityType) {
         const element = entity.entityType[key];

package/esm/src/remult3/RepositoryImplementation.js

@@ -874,7 +874,15 @@ export class rowHelperImplementation extends rowHelperBase {
     }
     metadata;
     getId() {
-        return this.info.idMetadata.getId(this.instance);
+        const getVal = (y) => {
+            let z = this.lookups.get(y.key);
+            if (z)
+                return z.id;
+            return this.instance[y.key];
+        };
+        if (this.metadata.idMetadata.field instanceof CompoundIdField)
+            return this.metadata.idMetadata.field.fields.map(getVal).join(',');
+        return getVal(this.metadata.idMetadata.field);
     }
     saveMoreOriginalData() {
         this.originalId = this.getId();
@@ -1513,6 +1521,9 @@ class EntityFullInfo {
     }
     idMetadata = {
         getId: (item) => {
+            const ref = getEntityRef(item, false);
+            if (ref)
+                return ref.getId();
             if (this.idMetadata.field instanceof CompoundIdField)
                 return this.idMetadata.field.getId(item);
             else

package/esm/src/remult3/remult3.d.ts

@@ -5,6 +5,7 @@ import type { FieldMetadata } from '../column-interfaces';
 import type { EntityOptions } from '../entity';
 import type { LiveQueryChange, SubscriptionListener, Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { SortSegment } from '../sort';
+import type { EntityBase } from './RepositoryImplementation';
 export interface EntityRef<entityType> extends Subscribable {
     hasErrors(): boolean;
     undoChanges(): any;
@@ -153,7 +154,7 @@ export interface EntityMetadata<entityType = any> {
     /** Metadata for the Entity's id */
     readonly idMetadata: IdMetadata<entityType>;
 }
-export declare type OmitEB<T> = Omit<T, keyof import('./RepositoryImplementation').EntityBase>;
+export declare type OmitEB<T> = Omit<T, keyof EntityBase>;
 export declare type idType<entityType> = entityType extends {
     id?: number;
 } ? number : entityType extends {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.22.7",
+    "version": "0.22.8",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/src/column.js

@@ -21,6 +21,8 @@ var LookupColumn = /** @class */ (function () {
         this.id = id;
     }
     LookupColumn.prototype.toJson = function () {
+        if (!this.storedItem)
+            return undefined;
         if (this.item === null)
             return null;
         return this.repository.toJson(this.item);

package/src/filter/filter-interfaces.js

@@ -505,10 +505,11 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
             }),
         }); });
         if (or.length == 1)
-            return or[0];
-        where.push({
-            $and: or,
-        });
+            where.push(or[0]);
+        else
+            where.push({
+                $and: or,
+            });
     }
     var _loop_2 = function (key) {
         var element = entity.entityType[key];

package/src/remult3/RepositoryImplementation.js

@@ -1436,7 +1436,16 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         configurable: true
     });
     rowHelperImplementation.prototype.getId = function () {
-        return this.info.idMetadata.getId(this.instance);
+        var _this = this;
+        var getVal = function (y) {
+            var z = _this.lookups.get(y.key);
+            if (z)
+                return z.id;
+            return _this.instance[y.key];
+        };
+        if (this.metadata.idMetadata.field instanceof CompoundIdField_1.CompoundIdField)
+            return this.metadata.idMetadata.field.fields.map(getVal).join(',');
+        return getVal(this.metadata.idMetadata.field);
     };
     rowHelperImplementation.prototype.saveMoreOriginalData = function () {
         this.originalId = this.getId();
@@ -2413,6 +2422,9 @@ var EntityFullInfo = /** @class */ (function () {
         this.key = key;
         this.idMetadata = {
             getId: function (item) {
+                var ref = (0, getEntityRef_1.getEntityRef)(item, false);
+                if (ref)
+                    return ref.getId();
                 if (_this.idMetadata.field instanceof CompoundIdField_1.CompoundIdField)
                     return _this.idMetadata.field.getId(item);
                 else

package/src/remult3/remult3.d.ts

@@ -5,6 +5,7 @@ import type { FieldMetadata } from '../column-interfaces';
 import type { EntityOptions } from '../entity';
 import type { LiveQueryChange, SubscriptionListener, Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { SortSegment } from '../sort';
+import type { EntityBase } from './RepositoryImplementation';
 export interface EntityRef<entityType> extends Subscribable {
     hasErrors(): boolean;
     undoChanges(): any;
@@ -153,7 +154,7 @@ export interface EntityMetadata<entityType = any> {
     /** Metadata for the Entity's id */
     readonly idMetadata: IdMetadata<entityType>;
 }
-export declare type OmitEB<T> = Omit<T, keyof import('./RepositoryImplementation').EntityBase>;
+export declare type OmitEB<T> = Omit<T, keyof EntityBase>;
 export declare type idType<entityType> = entityType extends {
     id?: number;
 } ? number : entityType extends {