Enables strict null checks in SDK #2360

infomiho · 2024-10-28T11:42:17Z

This PR enables strictNullChecks option in the SDK tsconfig.json.

We want to enable this option to make sure Zod schemas are working properly before we start using them for env variables validation.

Left to do

Rough changes to get it to work
Go through changes one more time
- Keep changes that are straightforward and long term
- Add @ts-ignore and a TODO for things that need more work

Using @ts-ignore is not that problematic since it will unblock us for using Zod schemas, but also explicitly mark parts of the code base that need some work. This work was still needed before this PR, but it was implicit.

infomiho · 2024-10-28T11:43:18Z

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/common/LoginSignupForm.tsx

@@ -302,7 +302,7 @@ function AdditionalFormFields({
          disabled={isLoading}
        />
        {errors[field.name] && (
-          <FormError>{errors[field.name].message}</FormError>
+          <FormError>{errors[field.name]!.message}</FormError>


I'm not sure why this is needed since we have the check errors[field.name] && (?

infomiho · 2024-10-28T11:44:04Z

waspc/data/Generator/templates/sdk/wasp/auth/session.ts

@@ -69,7 +69,7 @@ async function getAuthUserData(userId: {= userEntityUpper =}['id']): Promise<Aut
    throwInvalidCredentialsError()
  }

-  return createAuthUserData(user);
+  return createAuthUserData(user!);


Again, I'm not sure why this is needed since we have the check if (!user) {. Maybe it's not obvious to the compiler that the throwInvalidCredentialsError fn throws?

infomiho · 2024-10-28T12:13:16Z

waspc/examples/crud-testing/src/DetailPage.tsx

-  const { data: task, isLoading } = tasksCrud.get.useQuery({
-    id: parseInt(id, 10),
-  });
+  const { id } = useParams<{ id: string }>()


Not related to this PR, but a quick fix since id is of type string | undefined.

infomiho · 2024-10-28T12:14:36Z

waspc/data/Generator/templates/sdk/wasp/client/operations/queries/core.ts

@@ -18,7 +18,7 @@ import {
 // Details here: https://github.com/wasp-lang/wasp/issues/2017
 export function makeQueryCacheKey<Input, Output>(
  query: Query<Input, Output>,
-  payload: Input
+  payload?: Input


payload !== undefined hints at payload being optional

I'm not sure this is equivalent to what we had. Perhaps Input can be undefined and we only want this check to fire then (i.e., we never call this function without a payload).

Can you double check?

infomiho · 2024-10-28T12:16:29Z

waspc/data/Generator/templates/sdk/wasp/server/config.ts

@@ -1,9 +1,9 @@
 {{={= =}=}}


I've started to work on enabling strict null checks while working on env variables, so these are some changes I left from that effort - env -> nodeEnv since I imagined that the import of env vars would look like import { env } from 'wasp/server'

infomiho · 2024-10-28T12:26:15Z

waspc/data/Generator/templates/sdk/wasp/client/operations/rpc.ts

@@ -93,4 +93,5 @@ type ClientOperationWithNonAnyInput<Input, Output> =
  ? (args?: unknown) => Promise<Output>
  : [Input] extends [void]
  ? () => Promise<Output>
-  : (args: Input) => Promise<Output>
+  // TODO: decide if this is what we want?
+  : (args?: Input) => Promise<Output>


We get the error:

client/operations/hooks.ts(32,26): error TS2345: Argument of type 'Input | undefined' is not assignable to parameter of type 'Input'.

The useQuery hook definition:

function useQuery<Input, Output>( query: Query<Input, Output>, queryFnArgs?: Input, options?: any ): UseQueryResult<Output, Error>

has the queryFnArgs as an optional argument: and it executes query(queryFnArgs), query is:

query: Query<Input, Output>

which is in the end (args: Input) => Promise<Output>.

This leads me to set the args as optional here.

@sodic alternativelly, I can just put a @ts-ignore and not modify anything related to operations, so we can deal with this in the future?

I don't fully understand what happened here, but our type tests should cover this. If you can change it without breaking them, then it should be fine.

That said, I'm 99% sure this change introduces a bug that the tests will catch. If they fail to catch it, then I'll look into it some more.

sodic · 2024-11-19T10:41:11Z

waspc/data/Generator/templates/sdk/wasp/api/index.ts

@@ -88,10 +88,10 @@ export function handleApiError(error: AxiosError<{ message?: string, data?: unkn
    //   That would require copying HttpError code to web-app also and using it here.
    const responseJson = error.response?.data
    const responseStatusCode = error.response.status
-    throw new WaspHttpError(responseStatusCode, responseJson?.message ?? error.message, responseJson)
+    return new WaspHttpError(responseStatusCode, responseJson?.message ?? error.message, responseJson)


Why did we change this function?

If we use handleApiError(error) which throws the error in some fn - TS thinks that fn has undefined as one of the return values.

If we do throw handleApiError(error) in the same fn, TS now knows this throws and then the fn doesn't return i.e. it doesn't return undefined.

sodic · 2024-11-19T10:42:52Z

waspc/data/Generator/templates/sdk/wasp/auth/utils.ts

-export function throwInvalidCredentialsError(message?: string): void {
-  throw new HttpError(401, 'Invalid credentials', { message })
+export function createInvalidCredentialsError(message?: string): HttpError {
+  return new HttpError(401, 'Invalid credentials', { message })


Why did we change this one?

Same reasoning as here: #2360 (comment)

sodic · 2024-11-19T10:45:25Z

waspc/data/Generator/templates/sdk/wasp/auth/validation.ts

@@ -6,37 +6,37 @@ const EMAIL_FIELD = 'email';
 const TOKEN_FIELD = 'token';

 // PUBLIC API
-export function ensureValidEmail(args: unknown): void {
+export function ensureValidEmail<Args extends object>(args: Args): void {


I believe the type parameter is unnecessary. It's enough to say:

ensureValidEmail(args: object) ...

See item 51 of Effective TypeScript for an explanation.

The same applies to all functions in the file.

Good catch! Read Item 51 and it makes sense 👍

sodic · 2024-11-19T11:11:23Z

waspc/data/Generator/templates/sdk/wasp/auth/user.ts

      const identities = Object.values(data.identities).filter(Boolean);
-      return identities.length > 0 ? identities[0].id : null;
+      return identities.length > 0 ? identities[0]!.id : null;


We should remove the assertion and change the filtering predicate:

const identities = Object.values(data.identities).filter(identity => identity !== null); return identities.length > 0 ? identities[0].id : null;

Three benefits:

TypeScript can now infer a type predicate so the ! on the next line is no longer necessary. It's both safer and less fragile (the entire type procedure is localized and no longer spans two lines).

identity => identity !== null is cleaner than Boolean anyway. The first is clear to everyone, and the second only to those familiar with JS's quirks and idioms.

Note
Type predicate inference is a pretty new feature. It's available in TS 5.5, and our package.json requires ^5.1.0. This breaks the build for old users who have started their Wasp project before TS 5.5. was released.

We can either update TS to ^5.5, or we can define an isNotNull type guard as a named function and use that instead of a Boolean. It behaves the same way but requires more ceremony.

The first option requires users to migrate stuff, while the second one doesn't. So it all depends on whether we want to release this as part of a minor or a major release.

sodic · 2024-11-19T12:12:07Z

waspc/data/Generator/templates/sdk/wasp/auth/useAuth.ts

+      // TODO: figure out why overloading is not working
+      // @ts-ignore


I am strongly in favor of resolving all these issues now. It's unlikely we'll ever prioritize returning to them, and even if we did, we'd be missing context.

Figuring this stuff out is a part of this task and is a little annoying (that's mostly why I postponed it :)), but I believe it should be done.

I'd be more in favor of the "we'll figure it out later approach" if:

The issue was about something else and these postponed fixes were tangential stuff.

Merging this was a blocker for a critical bugfix.

But since figuring this stuff out is the central point of the issue, and since closing the issue isn't a blocker for a critical bugfix, I don't think postponing is justified.

To be clear, I'm not against banning ts-ignores altogether. But if we're using them, we should know why. Dirty hacks are sometimes ok, as long as we understand what we're doing and can document it.

Adding a hack we don't understand with a "figure this out later" todo is an extreme measure, and should be reserved reserved for production-is-down-and-were-losing-millions situations, with a clear plan on when to come back to it.

So, in short, I don't think we should add tsignores we don't understand (I may be convinced otherwise). We can meet in person and go through these issues together.

As we discussed IRL: this PR has the goal of unblocking the #2362 PR and nothing will substantially change in the codebase - besides quick fixes and enabling the strict null checking option. It will have the effect that Zod works as expected and all future code has to be written with strict null checks. All the things that were "broken" until this point - will remain broken (in the eyes of Typescript).

I'd go through all the @ts-ignores and do one of the following:

if we can fix it now - fix it

if the fix requires going down a rabbit hole - make an issue which we will mention in a comment

use type assertion instead of @ts-ignore if we can - makes the override more precise

sodic · 2024-11-20T14:46:29Z

waspc/examples/todoApp/src/testTypes/operations/client.ts

+  Expect<Equal<typeof boolToStringAuth, (payload?: boolean) => Promise<string>>>,
+  Expect<Equal<typeof boolToVoidNoAuth, (payload?: boolean) => Promise<void>>>,
+  Expect<Equal<typeof boolToVoidAuth, (payload?: boolean) => Promise<void>>>,


Yeah, this is what I suspected had to happen when I saw the change in the templates 😄

Anyway, we shouldn't introduce a regression in user space to make internal TS happy.

sodic · 2024-11-20T14:47:36Z

waspc/headless-test/examples/todoApp/src/auth/hooks.ts

@@ -29,7 +29,7 @@ export const onBeforeLogin: OnBeforeLoginHook = async ({ providerId }) => {

 export const onAfterLogin: OnAfterLoginHook = async ({ prisma, user }) => {
  await prisma.user.update({
-    where: { id: user.id },
+    where: { id: user!.id },


Hmm, how come we need this? Shouldn't the hook enforce the user code in its type signature?

You are right, the hook should demand that user exists and the end user shouldn't be exposed to this.

sodic · 2024-11-20T14:55:50Z

waspc/headless-test/examples/todoApp/src/server/actions.ts

@@ -73,7 +73,7 @@ export const toggleAllTasks: ToggleAllTasks = async (_args, context) => {

  const whereIsDone = (isDone: boolean) => ({
    isDone,
-    user: { id: context.user.id },
+    user: { id: context.user!.id },


This one is surprising too. How come TS can't infer this from the check we did above?

I'm not sure, I was surprised as well, but it wouldn't narrow the type for me - for some reason. We can talk about this IRL.

sodic · 2024-11-20T14:58:59Z

waspc/data/Generator/templates/sdk/wasp/server/auth/hooks.ts

@@ -100,7 +100,7 @@ type OnBeforeLoginHookParams = {
  /**
   * User that is trying to log in.
  */
-    user: Awaited<ReturnType<typeof findAuthWithUserBy>>['user']
+    user: NonNullable<Awaited<ReturnType<typeof findAuthWithUserBy>>>['user']


Hm, it's a little weird that this type is defined in terms of a function's return value. Also, how come the NonNullable part is only now coming into the picture?

How come it's not defined using the User type (and the function's return type would then also be defined using the User type).

Have we discussed something like this already (defining values in terms of types and vice versa)? I'm having a Deja Vu but can't find it.

We have a FindAuthWithUserResult type that we didn't export - we should export it and use it instead of the return type 👍

NonNullable came into play because findAuthWithUserBy had the wrong return type of User and not User | null which is logical - user maybe doesn't exist in the DB.

sodic · 2024-11-20T15:02:42Z

waspc/data/Generator/templates/sdk/wasp/server/email/index.ts

+    username: process.env.SMTP_USERNAME!,
+    password: process.env.SMTP_PASSWORD!,


This file is throwing all kinds of errors for me. I tried to build the server with TypeScript (npx tsc in .wasp/out/server) and it failed.

Does this work for you normally (I'm guessing it does, because you wouldn't know these types needed changing if it didn't).

I probably messed something up because it also fails on older versions of main. If everything's normal for you, I'll dig in.

infomiho commented Oct 28, 2024

View reviewed changes

infomiho changed the title ~~WIP: Enables strict null checks in SDK~~ Enables strict null checks in SDK Oct 28, 2024

infomiho requested a review from sodic October 28, 2024 15:04

infomiho mentioned this pull request Oct 29, 2024

Validate env vars with Zod #2362

Draft

5 tasks

infomiho added 14 commits October 29, 2024 12:26

WIP: Enables strict null checks in SDK

ddd10d1

Update handleApiError type

90baa94

Throw invalid credentials error explictly

b5c3c63

Formatting

7afc4f0

Update comment and type

b4e2362

Update email env vars

465856c

Update isHttpErrorWithExtraMessage

5c329a4

Update comment

e04aac3

Remove TODO

1928b6f

Fixes jobs types

e231dda

Update todoApp tests. Comment update.

f431153

Update e2e tests

c8b2120

Fixes headless tests

08304fe

Fixes CORS error

a509762

infomiho force-pushed the miho-strict-null-checks branch from 18f9fd0 to a509762 Compare October 29, 2024 11:26

sodic reviewed Nov 20, 2024

View reviewed changes

Fixes some of the @ts-ignored types

4a88a94

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enables strict null checks in SDK #2360

Enables strict null checks in SDK #2360

infomiho commented Oct 28, 2024 •

edited

Loading

infomiho Oct 28, 2024

infomiho Oct 28, 2024

infomiho Oct 28, 2024

infomiho Oct 28, 2024 •

edited

Loading

sodic Nov 19, 2024

infomiho Oct 28, 2024

infomiho Oct 28, 2024

infomiho Oct 28, 2024

sodic Nov 19, 2024

sodic Nov 19, 2024

infomiho Nov 20, 2024

sodic Nov 19, 2024

infomiho Nov 20, 2024

sodic Nov 19, 2024

infomiho Nov 20, 2024

sodic Nov 19, 2024

sodic Nov 19, 2024

infomiho Nov 20, 2024 •

edited

Loading

sodic Nov 20, 2024

sodic Nov 20, 2024

infomiho Nov 20, 2024

sodic Nov 20, 2024

infomiho Nov 20, 2024

sodic Nov 20, 2024

infomiho Nov 20, 2024

sodic Nov 20, 2024

		// TODO: figure out why overloading is not working
		// @ts-ignore

		username: process.env.SMTP_USERNAME!,
		password: process.env.SMTP_PASSWORD!,

Enables strict null checks in SDK #2360

Are you sure you want to change the base?

Enables strict null checks in SDK #2360

Conversation

infomiho commented Oct 28, 2024 • edited Loading

Left to do

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

infomiho Oct 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

infomiho Nov 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

infomiho commented Oct 28, 2024 •

edited

Loading

infomiho Oct 28, 2024 •

edited

Loading

infomiho Nov 20, 2024 •

edited

Loading