fix: More explicitly reject invalid ids.

joist-orm · May 2, 2024 · 3bf7c84 · 3bf7c84
1 parent 6c3571a
commit 3bf7c84
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/packages/orm/src/EntityManager.ts b/packages/orm/src/EntityManager.ts
@@ -836,7 +836,7 @@ export class EntityManager<C = unknown, Entity extends EntityW = EntityW> {
       id = typeOrId;
     } else {
       type = typeOrId;
-      id = id || fail();
+      id = id || fail(`Invalid id for ${typeOrId.name}: ${id}`);
     }
     const meta = getMetadata(type);
     const tagged = toTaggedId(meta, id);

diff --git a/packages/orm/src/createOrUpdatePartial.ts b/packages/orm/src/createOrUpdatePartial.ts
@@ -1,3 +1,4 @@
+import { isPlainObject } from "joist-utils";
 import { Entity, isEntity } from "./Entity";
 import { EntityManager, IdOf, MaybeAbstractEntityConstructor, OptIdsOf, OptsOf, isKey } from "./EntityManager";
 import { getMetadata } from "./EntityMetadata";
@@ -140,10 +141,14 @@ export async function createOrUpdatePartial<T extends Entity>(
 
       const entities = await Promise.all(
         toArray(value).map(async (value: any) => {
-          if (!value || isEntity(value)) {
+          if (isEntity(value)) {
             return value;
           } else if (isKey(value)) {
             return await em.load(field.otherMetadata().cstr, value);
+          } else if (value === null || value === undefined) {
+            return undefined;
+          } else if (!isPlainObject(value)) {
+            throw new Error(`Invalid value ${value}`);
           } else {
             // Look for `delete: true/false` and `remove: true/false` markers
             const deleteMarker: any = allowDelete && value["delete"];

diff --git a/packages/tests/integration/src/EntityManager.createOrUpdatePartial.test.ts b/packages/tests/integration/src/EntityManager.createOrUpdatePartial.test.ts
@@ -11,9 +11,8 @@ import {
   insertTag,
   select,
 } from "@src/entities/inserts";
-import { Author, Book, ImageType } from "./entities";
-
 import { newEntityManager } from "@src/testEm";
+import { Author, Book, ImageType } from "./entities";
 
 describe("EntityManager.createOrUpdatePartial", () => {
   it("can create new entity with valid data", async () => {
@@ -372,6 +371,16 @@ describe("EntityManager.createOrUpdatePartial", () => {
     });
   });
 
+  describe("m2m", () => {
+    it("rejects invalid ids", async () => {
+      const em = newEntityManager();
+      const result = em.createOrUpdatePartial(Author, {
+        tags: ["", ""],
+      });
+      await expect(result).rejects.toThrow("Invalid id for Tag");
+    });
+  });
+
   it("createOrUpdatePartial doesnt allow unknown fields to be passed", async () => {
     const em = newEntityManager();
     // Given an opt `publisherTypo` (instead of `publisher`) that don't match exactly what Author supports