fix: Fix handling of data operations with falsy update values

.changeset/smart-mice-doubt.md

@@ -0,0 +1,5 @@
+---
+'@baseplate-dev/fastify-generators': patch
+---
+
+Fix handling of data operations with falsy update values

examples/blog-with-auth/apps/backend/baseplate/generated/src/utils/data-operations/define-operations.ts

@@ -145,7 +145,7 @@ export async function transformFields<
       loadExisting,
     });
 
-    if (result.data) {
+    if (result.data !== undefined) {
       data[fieldKey as keyof TFields] = result.data as FieldDataOrFunction<
         TFields[keyof TFields]
       >;
@@ -173,7 +173,7 @@ export async function transformFields<
         create[key as keyof TFields] =
           value.create as InferFieldsCreateOutput<TFields>[keyof TFields];
       }
-      if (value.update) {
+      if (value.update !== undefined) {
         update[key as keyof TFields] =
           value.update as InferFieldsUpdateOutput<TFields>[keyof TFields];
       }

examples/blog-with-auth/apps/backend/src/utils/data-operations/define-operations.ts

@@ -145,7 +145,7 @@ export async function transformFields<
       loadExisting,
     });
 
-    if (result.data) {
+    if (result.data !== undefined) {
       data[fieldKey as keyof TFields] = result.data as FieldDataOrFunction<
         TFields[keyof TFields]
       >;
@@ -173,7 +173,7 @@ export async function transformFields<
         create[key as keyof TFields] =
           value.create as InferFieldsCreateOutput<TFields>[keyof TFields];
       }
-      if (value.update) {
+      if (value.update !== undefined) {
         update[key as keyof TFields] =
           value.update as InferFieldsUpdateOutput<TFields>[keyof TFields];
       }

examples/todo-with-auth0/apps/backend/baseplate/generated/src/tests/scripts/global-setup-redis.ts

@@ -1,4 +1,4 @@
-export default async function setup(): Promise<void> {
+export default function setup(): void {
   // Set Redis key prefix for test isolation
   process.env.REDIS_KEY_PREFIX = 'test:';
   console.info('Redis key prefix set to "test:" for isolation');

examples/todo-with-auth0/apps/backend/baseplate/generated/src/utils/data-operations/define-operations.ts

@@ -145,7 +145,7 @@ export async function transformFields<
       loadExisting,
     });
 
-    if (result.data) {
+    if (result.data !== undefined) {
       data[fieldKey as keyof TFields] = result.data as FieldDataOrFunction<
         TFields[keyof TFields]
       >;
@@ -173,7 +173,7 @@ export async function transformFields<
         create[key as keyof TFields] =
           value.create as InferFieldsCreateOutput<TFields>[keyof TFields];
       }
-      if (value.update) {
+      if (value.update !== undefined) {
         update[key as keyof TFields] =
           value.update as InferFieldsUpdateOutput<TFields>[keyof TFields];
       }

examples/todo-with-auth0/apps/backend/src/utils/data-operations/define-operations.ts

@@ -145,7 +145,7 @@ export async function transformFields<
       loadExisting,
     });
 
-    if (result.data) {
+    if (result.data !== undefined) {
       data[fieldKey as keyof TFields] = result.data as FieldDataOrFunction<
         TFields[keyof TFields]
       >;
@@ -173,7 +173,7 @@ export async function transformFields<
         create[key as keyof TFields] =
           value.create as InferFieldsCreateOutput<TFields>[keyof TFields];
       }
-      if (value.update) {
+      if (value.update !== undefined) {
         update[key as keyof TFields] =
           value.update as InferFieldsUpdateOutput<TFields>[keyof TFields];
       }

packages/fastify-generators/src/generators/prisma/data-utils/templates/src/utils/data-operations/define-operations.ts

@@ -143,7 +143,7 @@ export async function transformFields<
       loadExisting,
     });
 
-    if (result.data) {
+    if (result.data !== undefined) {
       data[fieldKey as keyof TFields] = result.data as FieldDataOrFunction<
         TFields[keyof TFields]
       >;
@@ -171,7 +171,7 @@ export async function transformFields<
         create[key as keyof TFields] =
           value.create as InferFieldsCreateOutput<TFields>[keyof TFields];
       }
-      if (value.update) {
+      if (value.update !== undefined) {
         update[key as keyof TFields] =
           value.update as InferFieldsUpdateOutput<TFields>[keyof TFields];
       }

tests/simple/apps/backend/baseplate/file-id-map.json

@@ -6,7 +6,7 @@
   "@baseplate-dev/core-generators#node/prettier:prettier-ignore": ".prettierignore",
   "@baseplate-dev/core-generators#node/ts-utils:string": "src/utils/string.ts",
   "@baseplate-dev/core-generators#node/typescript:tsconfig": "tsconfig.json",
-  "@baseplate-dev/core-generators#node/vitest:global-setup": "src/tests/scripts/global-setup.ts",
+  "@baseplate-dev/core-generators#node/vitest:global-setup-env": "src/tests/scripts/global-setup-env.ts",
   "@baseplate-dev/core-generators#node/vitest:logger-test-helper": "src/tests/helpers/logger.test-helper.ts",
   "@baseplate-dev/core-generators#node/vitest:vitest-config": "vitest.config.ts",
   "@baseplate-dev/fastify-generators#core/app-module-setup:app-modules": "src/utils/app-modules.ts",
@@ -60,6 +60,7 @@
   "@baseplate-dev/fastify-generators#prisma/prisma:seed": "src/prisma/seed.ts",
   "@baseplate-dev/fastify-generators#prisma/prisma:service": "src/services/prisma.ts",
   "@baseplate-dev/fastify-generators#vitest/prisma-vitest:db-test-helper": "src/tests/helpers/db.test-helper.ts",
+  "@baseplate-dev/fastify-generators#vitest/prisma-vitest:global-setup-prisma": "src/tests/scripts/global-setup-prisma.ts",
   "@baseplate-dev/fastify-generators#vitest/prisma-vitest:prisma-test-helper": "src/tests/helpers/prisma.test-helper.ts",
   "@baseplate-dev/fastify-generators#yoga/yoga-plugin:graphql-plugin": "src/plugins/graphql/index.ts",
   "@baseplate-dev/fastify-generators#yoga/yoga-plugin:use-graph-logger": "src/plugins/graphql/use-graph-logger.ts"

tests/simple/apps/backend/baseplate/generated/src/tests/scripts/global-setup-env.ts

@@ -0,0 +1,7 @@
+import { loadEnvFile } from 'node:process';
+
+loadEnvFile('.env');
+
+export default async function setup(): Promise<void> {
+  // Environment loaded
+}

tests/simple/apps/backend/baseplate/generated/src/tests/scripts/global-setup.ts → tests/simple/apps/backend/baseplate/generated/src/tests/scripts/global-setup-prisma.ts

@@ -1,9 +1,5 @@
-import { loadEnvFile } from 'node:process';
-
 import { createTestDatabase } from '../helpers/db.test-helper.js';
 
-loadEnvFile('.env');
-
 export default async function setup(): Promise<void> {
   const { TEST_MODE } = process.env;
 

tests/simple/apps/backend/baseplate/generated/src/utils/data-operations/define-operations.ts

@@ -145,7 +145,7 @@ export async function transformFields<
       loadExisting,
     });
 
-    if (result.data) {
+    if (result.data !== undefined) {
       data[fieldKey as keyof TFields] = result.data as FieldDataOrFunction<
         TFields[keyof TFields]
       >;
@@ -173,7 +173,7 @@ export async function transformFields<
         create[key as keyof TFields] =
           value.create as InferFieldsCreateOutput<TFields>[keyof TFields];
       }
-      if (value.update) {
+      if (value.update !== undefined) {
         update[key as keyof TFields] =
           value.update as InferFieldsUpdateOutput<TFields>[keyof TFields];
       }

tests/simple/apps/backend/baseplate/generated/vitest.config.ts

@@ -5,7 +5,10 @@ export default defineConfig({
   plugins: [tsconfigPaths()],
   test: {
     clearMocks: true,
-    globalSetup: './tests/scripts/global-setup.ts',
+    globalSetup: [
+      './tests/scripts/global-setup-env.ts',
+      './tests/scripts/global-setup-prisma.ts',
+    ],
     maxWorkers: 1,
     passWithNoTests: true,
     root: './src',

tests/simple/apps/backend/src/tests/scripts/global-setup-env.ts

@@ -0,0 +1,7 @@
+import { loadEnvFile } from 'node:process';
+
+loadEnvFile('.env');
+
+export default async function setup(): Promise<void> {
+  // Environment loaded
+}

tests/simple/apps/backend/src/tests/scripts/global-setup.ts → tests/simple/apps/backend/src/tests/scripts/global-setup-prisma.ts

@@ -1,9 +1,5 @@
-import { loadEnvFile } from 'node:process';
-
 import { createTestDatabase } from '../helpers/db.test-helper.js';
 
-loadEnvFile('.env');
-
 export default async function setup(): Promise<void> {
   const { TEST_MODE } = process.env;
 

tests/simple/apps/backend/src/utils/data-operations/define-operations.ts

@@ -145,7 +145,7 @@ export async function transformFields<
       loadExisting,
     });
 
-    if (result.data) {
+    if (result.data !== undefined) {
       data[fieldKey as keyof TFields] = result.data as FieldDataOrFunction<
         TFields[keyof TFields]
       >;
@@ -173,7 +173,7 @@ export async function transformFields<
         create[key as keyof TFields] =
           value.create as InferFieldsCreateOutput<TFields>[keyof TFields];
       }
-      if (value.update) {
+      if (value.update !== undefined) {
         update[key as keyof TFields] =
           value.update as InferFieldsUpdateOutput<TFields>[keyof TFields];
       }

tests/simple/apps/backend/vitest.config.ts

@@ -5,7 +5,10 @@ export default defineConfig({
   plugins: [tsconfigPaths()],
   test: {
     clearMocks: true,
-    globalSetup: './tests/scripts/global-setup.ts',
+    globalSetup: [
+      './tests/scripts/global-setup-env.ts',
+      './tests/scripts/global-setup-prisma.ts',
+    ],
     maxWorkers: 1,
     passWithNoTests: true,
     root: './src',