fix(json): support recursive definitions

zenstackhq · Nov 16, 2024 · 26292dc · 26292dc
1 parent 68a0eb3
commit 26292dc
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 0 deletions.
diff --git a/packages/sdk/src/code-gen.ts b/packages/sdk/src/code-gen.ts
@@ -15,6 +15,7 @@ export function createProject(options?: CompilerOptions) {
             strict: true,
             skipLibCheck: true,
             noEmitOnError: true,
+            noImplicitAny: false,
             ...options,
         },
     });

diff --git a/tests/integration/tests/enhancements/json/crud.test.ts b/tests/integration/tests/enhancements/json/crud.test.ts
@@ -344,4 +344,49 @@ describe('Json field CRUD', () => {
         expect(u2.profile.ownerId).toBe(2);
         expect(u2.profile.nested.userId).toBe(3);
     });
+
+    it('works with recursive types', async () => {
+        const params = await loadSchema(
+            `
+            type Content {
+                type String
+                content Content[]?
+                text String?
+            }
+            
+            model Post {
+                id Int @id @default(autoincrement())
+                content Content @json
+                @@allow('all', true)
+            }
+            `,
+            {
+                provider: 'postgresql',
+                dbUrl,
+            }
+        );
+
+        prisma = params.prisma;
+        const db = params.enhance();
+        const post = await db.post.create({
+            data: {
+                content: {
+                    type: 'text',
+                    content: [
+                        {
+                            type: 'text',
+                            content: [
+                                {
+                                    type: 'text',
+                                    text: 'hello',
+                                },
+                            ],
+                        },
+                    ],
+                },
+            },
+        });
+
+        await expect(post.content.content[0].content[0].text).toBe('hello');
+    });
 });
diff --git a/tests/integration/tests/enhancements/json/typing.test.ts b/tests/integration/tests/enhancements/json/typing.test.ts
@@ -325,6 +325,59 @@ async function main() {
         dateTime: new Date(),
         json: { a: 1 },
     }
+}
+                `,
+                    },
+                ],
+            }
+        );
+    });
+
+    it('supports recursive definition', async () => {
+        await loadSchema(
+            `
+            type Content {
+                type String
+                content Content[]?
+                text String?
+            }
+            
+            model Post {
+                id Int @id @default(autoincrement())
+                content Content @json
+            }
+            `,
+            {
+                provider: 'postgresql',
+                pushDb: false,
+                compile: true,
+                extraSourceFiles: [
+                    {
+                        name: 'main.ts',
+                        content: `
+import type { Content } from '.zenstack/models';
+import { enhance } from '.zenstack/enhance';
+import { PrismaClient } from '@prisma/client';
+
+async function main() {
+    const content: Content = {
+        type: 'text',
+        content: [
+            {
+                type: 'text',
+                content: [
+                    {
+                        type: 'text',
+                        text: 'hello',
+                    },
+                ],
+            },
+        ],
+    }
+
+    const db = enhance(new PrismaClient());
+    const post = await db.post.create({ data: { content } });
+    console.log(post.content.content?.[0].content?.[0].text);
 }
                 `,
                     },