Refactor types and validators for improved type safety and clarity. Added DirectionReportRequest and ElementalDignitiesRequest types. Updated mergeConfigWithParams to use generic type T. Adjusted various interfaces in requests and responses for consistency and accuracy. Ensured all changes maintain strict TypeScript compliance.

Author: serslon

src/categories/AnalysisClient.ts

@@ -3,6 +3,7 @@ import type { AxiosRequestConfig } from 'axios';
 import {
   CompatibilityRequest,
   CompositeReportRequest,
+  DirectionReportRequest,
   LunarAnalysisRequest,
   LunarReturnReportRequest,
   LunarReturnTransitRequest,

src/categories/LunarClient.ts

@@ -25,9 +25,9 @@ import {
 } from '../utils/validators';
 import { BaseCategoryClient } from './BaseCategoryClient';
 
-const mergeConfigWithParams = (
+const mergeConfigWithParams = <T extends object>(
   config: AxiosRequestConfig | undefined,
-  params?: Record<string, unknown>,
+  params?: T,
 ): AxiosRequestConfig | undefined => {
   if (!params || Object.keys(params).length === 0) {
     return config;

src/categories/TarotClient.ts

@@ -52,9 +52,9 @@ import {
 } from '../utils/validators';
 import { BaseCategoryClient } from './BaseCategoryClient';
 
-const mergeConfigWithParams = (
+const mergeConfigWithParams = <T extends object>(
   config: AxiosRequestConfig | undefined,
-  params?: Record<string, unknown> | null,
+  params?: T | null,
 ): AxiosRequestConfig | undefined => {
   if (!params || Object.keys(params).length === 0) {
     return config;

src/types/requests.ts

@@ -134,12 +134,14 @@ export type ActivePointType =
   | 'asteroid'
   | 'fixed-star';
 
+export type PrimaryActivePointType = Exclude<ActivePointType, 'fixed-star'>;
+
 export interface ActivePointsQuery {
   type?: ActivePointType;
 }
 
 export interface PrimaryActivePointsQuery {
-  type?: Exclude<ActivePointType, 'fixed-star'>;
+  type?: PrimaryActivePointType;
 }
 
 export interface HousesRequest {
@@ -514,34 +516,6 @@ export interface PersonalTradingRequest {
   language?: Language | null;
 }
 
-export type ActivePointType = 'planet' | 'lunar-node' | 'angle' | 'special-point' | 'asteroid' | 'fixed-star';
-
-export interface ActivePointsQuery {
-  type?: ActivePointType;
-}
-
-export type PrimaryActivePointType = Exclude<ActivePointType, 'fixed-star'>;
-
-export interface PrimaryActivePointsQuery {
-  type?: PrimaryActivePointType;
-}
-
-export interface HousesRequest {
-  house_system?: HouseSystem;
-}
-
-export type KeywordsCategory = 'planets' | 'lines' | 'houses' | 'aspects' | 'themes';
-
-export interface KeywordsRequest {
-  category?: KeywordsCategory;
-}
-
-export type LifeAreasLanguage = 'en' | 'de' | 'fr' | 'es' | 'ru';
-
-export interface LifeAreasRequest {
-  language?: LifeAreasLanguage;
-}
-
 export interface ProgressionReportRequest extends ProgressionRequest {
   report_options?: ReportOptions | null;
 }

src/types/responses.ts

@@ -1,7 +1,7 @@
 import type { components } from './generated/api';
 import type {
   ActivePointType,
-  KeywordCategory,
+  KeywordsCategory,
   LifeAreasLanguage,
   Subject,
 } from './requests';
@@ -149,7 +149,7 @@ export interface SynastryReportResponse {
 export interface ActivePoint {
   id: string;
   description: string;
-  type: string;
+  type: ActivePointType;
   strength?: number | null;
   [key: string]: unknown;
 }
@@ -232,7 +232,7 @@ export interface AvailableHouseSystem {
 }
 
 export interface HousesResponse {
-  house_system?: string;
+  house_system: string;
   houses: HouseInfo[];
   available_systems?: AvailableHouseSystem[];
   [key: string]: unknown;
@@ -247,7 +247,7 @@ export interface KeywordCollection {
 }
 
 export interface KeywordsResponse {
-  category: string;
+  category: KeywordsCategory;
   total_concepts?: number;
   keywords: KeywordCollection[];
   [key: string]: unknown;
@@ -270,7 +270,7 @@ export interface LifeArea {
   description: string;
   keywords?: string[];
   category?: string;
-  emoji?: string;
+  emoji?: string | null;
   primary_planets?: string[];
   secondary_planets?: string[];
   primary_houses?: number[];
@@ -281,8 +281,8 @@ export interface LifeArea {
 }
 
 export interface LifeAreasResponse {
-  language: string;
-  total_areas?: number;
+  language: LifeAreasLanguage;
+  total_areas: number;
   life_areas: LifeArea[];
   [key: string]: unknown;
 }
@@ -402,85 +402,18 @@ export interface PaginatedResponse<T> {
   offset: number;
 }
 
-export interface ActivePoint {
-  id: string;
-  description: string;
-  type: ActivePointType;
-  strength?: number;
-}
-
-export interface CountryInfo {
-  name: string;
-  iso: string;
-  capital?: string | null;
-  population?: number | null;
-  continent?: string | null;
-  currency?: string | null;
-}
+export type CountryInfo = CountryReference;
 
 export interface GlossaryItem {
   id: string;
   description: string;
 }
 
-export interface HouseSystemInfo {
-  code: string;
-  name: string;
-  description?: string;
-  category?: string;
-  usage?: string;
-  is_default?: boolean;
-}
+export type HouseSystemInfo = AvailableHouseSystem;
 
-export interface HouseInfo {
-  number: number;
-  name: string;
-  themes?: string[];
-  primary_theme?: string | null;
-  life_areas?: string[];
-  traditional_meaning?: string;
-  modern_keywords?: string[];
-}
+export type KeywordEntry = KeywordCollection;
 
-export interface HousesResponse {
-  house_system: string;
-  houses: HouseInfo[];
-  available_systems?: HouseSystemInfo[];
-}
-
-export interface KeywordEntry {
-  id: string;
-  name: string;
-  keywords: string[];
-  total_keywords?: number;
-}
-
-export interface KeywordsResponse {
-  category: KeywordCategory;
-  total_concepts?: number;
-  keywords: KeywordEntry[];
-}
-
-export interface LifeAreaDetails {
-  id: string;
-  name: string;
-  description: string;
-  keywords?: string[];
-  category?: string;
-  emoji?: string | null;
-  primary_planets?: string[];
-  secondary_planets?: string[];
-  primary_houses?: number[];
-  secondary_houses?: number[];
-  preferred_lines?: string[];
-  strength_weight?: number;
-}
-
-export interface LifeAreasResponse {
-  language: LifeAreasLanguage;
-  total_areas: number;
-  life_areas: LifeAreaDetails[];
-}
+export type LifeAreaDetails = LifeArea;
 
 export type EnhancedPlanetaryPosition = Schemas['EnhancedPlanetaryPosition'];
 

src/utils/validators.ts

@@ -28,6 +28,7 @@ import {
   DirectionReportRequest,
   DirectionType,
   DrawCardsRequest,
+  ElementalDignitiesRequest,
   CryptoTimingRequest,
   ForexTimingRequest,
   FixedStarsConjunctionsRequest,
@@ -103,6 +104,7 @@ import {
   TarotNatalReportRequest,
   TarotReportRequest,
   TarotTransitReportRequest,
+  TreeOfLifeRequest,
   TextHoroscopeRequest,
   TextMonthlyHoroscopeRequest,
   TextWeeklyHoroscopeRequest,
@@ -480,12 +482,12 @@ const validateChineseSubject = (subject: ChineseHoroscopeSubject | ChineseSubjec
   ensureIntegerInRange(birthData.minute ?? null, [0, 59], `${context}.birth_data.minute`);
   ensureIntegerInRange((birthData as { second?: number | null }).second ?? null, [0, 59], `${context}.birth_data.second`);
 
-  if (birthData.latitude !== undefined) {
-    ensureNumberInRange(birthData.latitude ?? null, [-90, 90], `${context}.birth_data.latitude`);
+  if ('latitude' in birthData && birthData.latitude !== undefined) {
+    ensureNumberInRange((birthData.latitude as number | null) ?? null, [-90, 90], `${context}.birth_data.latitude`);
   }
 
-  if (birthData.longitude !== undefined) {
-    ensureNumberInRange(birthData.longitude ?? null, [-180, 180], `${context}.birth_data.longitude`);
+  if ('longitude' in birthData && birthData.longitude !== undefined) {
+    ensureNumberInRange((birthData.longitude as number | null) ?? null, [-180, 180], `${context}.birth_data.longitude`);
   }
 
   const gender = extractChineseGender(subject);
@@ -1539,7 +1541,10 @@ const validateBusinessOptions = (
   }
 
   if ('departments' in opts) {
-    validateDepartments(opts.departments as BusinessMultipleRequest['options']['departments'], subjectCount, `${context}.departments`);
+    const { departments } = opts as {
+      departments?: NonNullable<BusinessMultipleRequest['options']>['departments'] | null;
+    };
+    validateDepartments(departments ?? null, subjectCount, `${context}.departments`);
   }
 };
 
@@ -1682,10 +1687,16 @@ export const validatePersonalTradingRequest = (
 
   const options = extractOptionsObject(request.options ?? null);
   if (options) {
-    validateAnalysisDays(options.analysis_period_days ?? null, `${context}.options.analysis_period_days`);
-    ensureOptionalBoolean(options.include_lunar_cycles, `${context}.options.include_lunar_cycles`);
-    normalizeTradingStyle(options.trading_style as string | undefined, `${context}.options.trading_style`);
-    validateLanguageValue(options.language as string | undefined, `${context}.options.language`);
+    const typedOptions = options as {
+      analysis_period_days?: number | null;
+      include_lunar_cycles?: boolean | null;
+      trading_style?: string | null;
+      language?: string | null;
+    };
+    validateAnalysisDays(typedOptions.analysis_period_days ?? null, `${context}.options.analysis_period_days`);
+    ensureOptionalBoolean(typedOptions.include_lunar_cycles, `${context}.options.include_lunar_cycles`);
+    normalizeTradingStyle(typedOptions.trading_style, `${context}.options.trading_style`);
+    validateLanguageValue(typedOptions.language, `${context}.options.language`);
   }
 };
 
@@ -1962,8 +1973,10 @@ export const validateElementalDignitiesRequest = (
     throw new AstrologyError(`${context}.cards must include at least one entry.`);
   }
 
-  request.cards.forEach((card, index) => {
-    if (!card || typeof card !== 'object') {
+  const cards = request.cards as Array<NonNullable<ElementalDignitiesRequest['cards']>[number]>;
+
+  cards.forEach((card, index) => {
+    if (!card || typeof card !== 'object' || Array.isArray(card)) {
       throw new AstrologyError(`${context}.cards[${index}] must be an object.`);
     }