add defaults to classes instead

Author: panteliselef

packages/clerk-js/src/core/resources/Client.ts

@@ -1,11 +1,11 @@
-import {
-  type ActiveSessionResource,
-  type ClientJSON,
-  type ClientJSONSnapshot,
-  type ClientResource,
-  type SignedInSessionResource,
-  type SignInResource,
-  type SignUpResource,
+import type {
+  ActiveSessionResource,
+  ClientJSON,
+  ClientJSONSnapshot,
+  ClientResource,
+  SignedInSessionResource,
+  SignInResource,
+  SignUpResource,
 } from '@clerk/types';
 
 import { unixEpochToDate } from '../../utils/date';
@@ -127,11 +127,11 @@ export class Client extends BaseResource implements ClientResource {
       this.sessions = (data.sessions || []).map(s => new Session(s));
       this.signUp = new SignUp(data.sign_up);
       this.signIn = new SignIn(data.sign_in);
-      this.lastActiveSessionId = data.last_active_session_id;
+      this.lastActiveSessionId = data.last_active_session_id ?? null;
       this.captchaBypass = data.captcha_bypass || false;
       this.cookieExpiresAt = data.cookie_expires_at ? unixEpochToDate(data.cookie_expires_at) : null;
-      this.createdAt = unixEpochToDate(data.created_at || undefined);
-      this.updatedAt = unixEpochToDate(data.updated_at || undefined);
+      this.createdAt = unixEpochToDate(data.created_at ?? undefined);
+      this.updatedAt = unixEpochToDate(data.updated_at ?? undefined);
     }
 
     return this;

packages/clerk-js/src/core/resources/Organization.ts

@@ -41,12 +41,12 @@ export class Organization extends BaseResource implements OrganizationResource {
   slug!: string;
   imageUrl!: string;
   hasImage!: boolean;
-  publicMetadata: OrganizationPublicMetadata = {};
+  publicMetadata!: OrganizationPublicMetadata;
   adminDeleteEnabled!: boolean;
   createdAt!: Date;
   updatedAt!: Date;
-  membersCount = 0;
-  pendingInvitationsCount = 0;
+  membersCount!: number;
+  pendingInvitationsCount!: number;
   maxAllowedMemberships!: number;
 
   constructor(data: OrganizationJSON | OrganizationJSONSnapshot) {
@@ -269,13 +269,13 @@ export class Organization extends BaseResource implements OrganizationResource {
     this.id = data.id;
     this.name = data.name;
     this.slug = data.slug;
-    this.imageUrl = data.image_url;
-    this.hasImage = data.has_image;
-    this.publicMetadata = data.public_metadata;
-    this.membersCount = data.members_count;
-    this.pendingInvitationsCount = data.pending_invitations_count;
-    this.maxAllowedMemberships = data.max_allowed_memberships;
-    this.adminDeleteEnabled = data.admin_delete_enabled;
+    this.imageUrl = data.image_url ?? '';
+    this.hasImage = data.has_image ?? false;
+    this.publicMetadata = data.public_metadata ?? {};
+    this.membersCount = data.members_count ?? 0;
+    this.pendingInvitationsCount = data.pending_invitations_count ?? 0;
+    this.maxAllowedMemberships = data.max_allowed_memberships ?? 0;
+    this.adminDeleteEnabled = data.admin_delete_enabled ?? false;
     this.createdAt = unixEpochToDate(data.created_at);
     this.updatedAt = unixEpochToDate(data.updated_at);
     return this;

packages/clerk-js/src/core/resources/OrganizationMembership.ts

@@ -69,7 +69,7 @@ export class OrganizationMembership extends BaseResource implements Organization
 
     this.id = data.id;
     this.organization = new Organization(data.organization);
-    this.publicMetadata = data.public_metadata;
+    this.publicMetadata = data.public_metadata ?? {};
     if (data.public_user_data) {
       this.publicUserData = new PublicUserData(data.public_user_data);
     }

packages/clerk-js/src/core/resources/PublicUserData.ts

@@ -14,11 +14,11 @@ export class PublicUserData implements IPublicUserData {
 
   protected fromJSON(data: PublicUserDataJSON | PublicUserDataJSONSnapshot | null): this {
     if (data) {
-      this.firstName = data.first_name;
-      this.lastName = data.last_name;
-      this.imageUrl = data.image_url;
-      this.hasImage = data.has_image;
-      this.identifier = data.identifier;
+      this.firstName = data.first_name ?? null;
+      this.lastName = data.last_name ?? null;
+      this.imageUrl = data.image_url ?? '';
+      this.hasImage = data.has_image ?? false;
+      this.identifier = data.identifier ?? '';
       this.userId = data.user_id;
     }
 

packages/clerk-js/src/core/resources/Session.ts

@@ -282,11 +282,11 @@ export class Session extends BaseResource implements SessionResource {
     this.factorVerificationAge = data.factor_verification_age;
     this.lastActiveAt = unixEpochToDate(data.last_active_at || undefined);
     this.lastActiveOrganizationId = data.last_active_organization_id;
-    this.actor = data.actor;
+    this.actor = data.actor ?? null;
     this.createdAt = unixEpochToDate(data.created_at);
     this.updatedAt = unixEpochToDate(data.updated_at);
     this.user = new User(data.user);
-    this.tasks = data.tasks;
+    this.tasks = data.tasks ?? null;
 
     if (data.public_user_data) {
       this.publicUserData = new PublicUserData(data.public_user_data);

packages/clerk-js/src/core/resources/User.ts

@@ -316,32 +316,32 @@ export class User extends BaseResource implements UserResource {
     }
 
     this.id = data.id;
-    this.externalId = data.external_id;
-    this.firstName = data.first_name;
-    this.lastName = data.last_name;
+    this.externalId = data.external_id ?? null;
+    this.firstName = data.first_name ?? null;
+    this.lastName = data.last_name ?? null;
     if (this.firstName || this.lastName) {
       this.fullName = getFullName({ firstName: this.firstName, lastName: this.lastName });
     }
 
-    this.imageUrl = data.image_url;
-    this.hasImage = data.has_image;
-    this.username = data.username;
-    this.passwordEnabled = data.password_enabled;
+    this.imageUrl = data.image_url || '';
+    this.hasImage = data.has_image || false;
+    this.username = data.username ?? null;
+    this.passwordEnabled = data.password_enabled ?? false;
     this.emailAddresses = (data.email_addresses || []).map(
       ea => new EmailAddress(ea, this.path() + '/email_addresses'),
     );
 
-    this.primaryEmailAddressId = data.primary_email_address_id;
+    this.primaryEmailAddressId = data.primary_email_address_id ?? null;
     this.primaryEmailAddress = this.emailAddresses.find(({ id }) => id === this.primaryEmailAddressId) || null;
 
     this.phoneNumbers = (data.phone_numbers || []).map(ph => new PhoneNumber(ph, this.path() + '/phone_numbers'));
 
-    this.primaryPhoneNumberId = data.primary_phone_number_id;
+    this.primaryPhoneNumberId = data.primary_phone_number_id ?? null;
     this.primaryPhoneNumber = this.phoneNumbers.find(({ id }) => id === this.primaryPhoneNumberId) || null;
 
     this.web3Wallets = (data.web3_wallets || []).map(ph => new Web3Wallet(ph, this.path() + '/web3_wallets'));
 
-    this.primaryWeb3WalletId = data.primary_web3_wallet_id;
+    this.primaryWeb3WalletId = data.primary_web3_wallet_id ?? null;
     this.primaryWeb3Wallet = this.web3Wallets.find(({ id }) => id === this.primaryWeb3WalletId) || null;
 
     this.externalAccounts = (data.external_accounts || []).map(
@@ -358,16 +358,16 @@ export class User extends BaseResource implements UserResource {
       ea => new EnterpriseAccount(ea, this.path() + '/enterprise_accounts'),
     );
 
-    this.publicMetadata = data.public_metadata;
-    this.unsafeMetadata = data.unsafe_metadata;
+    this.publicMetadata = data.public_metadata ?? {};
+    this.unsafeMetadata = data.unsafe_metadata ?? {};
 
-    this.totpEnabled = data.totp_enabled;
-    this.backupCodeEnabled = data.backup_code_enabled;
-    this.twoFactorEnabled = data.two_factor_enabled;
+    this.totpEnabled = data.totp_enabled ?? false;
+    this.backupCodeEnabled = data.backup_code_enabled ?? false;
+    this.twoFactorEnabled = data.two_factor_enabled ?? false;
 
-    this.createOrganizationEnabled = data.create_organization_enabled;
-    this.createOrganizationsLimit = data.create_organizations_limit;
-    this.deleteSelfEnabled = data.delete_self_enabled;
+    this.createOrganizationEnabled = data.create_organization_enabled ?? false;
+    this.createOrganizationsLimit = data.create_organizations_limit ?? null;
+    this.deleteSelfEnabled = data.delete_self_enabled ?? false;
 
     if (data.last_sign_in_at) {
       this.lastSignInAt = unixEpochToDate(data.last_sign_in_at);

packages/types/src/json.ts

@@ -28,6 +28,9 @@ export interface ClerkResourceJSON {
   object: string;
 }
 
+export type PartialWithClerkResource<T extends ClerkResourceJSON> = Omit<Partial<T>, 'id' | 'object'> &
+  Pick<T, 'id' | 'object'>;
+
 export interface DisplayThemeJSON {
   general: {
     color: HexColor;