Fix types

master-co · Dec 7, 2023 · 2511e2a · 2511e2a
1 parent 4df3165
commit 2511e2a
Show file tree

Hide file tree

Showing 43 changed files with 4,390 additions and 853 deletions.
diff --git a/packages/class-variant/src/index.tsx b/packages/class-variant/src/index.tsx
@@ -1,12 +1,12 @@
 import clsx from 'clsx'
 
-type Param<T> = string 
+type Param<T> = string
     | string[]
     | Record<string, boolean>
     | [string, { [key in keyof T]?: T[key] }]
     | { [key in keyof T]?: T[key] extends boolean | undefined ? string : Record<string, string> }
     | ((valueByProp: T) => any)
-type ReturnType<T> = { default?: Partial<T> } & ((valueByProp?: T) => string) 
+type ReturnType<T> = { default?: Partial<T> } & ((valueByProp?: T) => string)
 
 /**
  * 1. 'inline-flex rounded'
@@ -20,7 +20,7 @@ function cv<T extends Record<string, string | number | boolean>>(...params: Arra
 function cv<T extends Record<string, string | number | boolean>>(firstParam: TemplateStringsArray, ...params: Array<Param<T>>): ReturnType<T>
 function cv<T extends Record<string, string | number | boolean>>(firstParam: TemplateStringsArray | Param<T>, ...params: Array<Param<T>>): ReturnType<T> {
     return function getClassNames(valueByProp: T = {} as any) {
-        const mergedValueByProp = Object.assign({}, getClassNames['default'], valueByProp)
+        const mergedValueByProp = Object.assign({}, (getClassNames as ReturnType<T>).default, valueByProp)
         const isTemplateLiteral = Array.isArray(firstParam) && 'raw' in firstParam
         const classesConditions: [string, Record<string, string | number | boolean>][] = []
         const valuesByProp: Record<string, Record<string, string>> = {}
@@ -34,7 +34,7 @@ function cv<T extends Record<string, string | number | boolean>>(firstParam: Tem
                         const newClassesByCondition = param[1]
                         if (newClassesByCondition && typeof newClassesByCondition === 'object') {
                             const keys = Object.keys(newClassesByCondition)
-        
+
                             let duplicated = false
                             for (const eachClassesByCondition of classesConditions) {
                                 const entries = Object.entries(eachClassesByCondition[1])
@@ -47,7 +47,7 @@ function cv<T extends Record<string, string | number | boolean>>(firstParam: Tem
                                     break
                                 }
                             }
-        
+
                             if (!duplicated) {
                                 classesConditions.push(param as any)
                             }
@@ -83,7 +83,7 @@ function cv<T extends Record<string, string | number | boolean>>(firstParam: Tem
                                         }
                                     }
                                     break
-                            } 
+                            }
                         }
                     }
                     break
@@ -126,10 +126,10 @@ function cv<T extends Record<string, string | number | boolean>>(firstParam: Tem
                 classNames.push(eachClassesByCondition[0])
             }
         }
-    
+
         for (const eachProp in valuesByProp) {
             const value = mergedValueByProp[eachProp] ?? mergedValueByProp['$' + eachProp] ?? ''
-            const classes = valuesByProp[eachProp][value]
+            const classes = valuesByProp[eachProp][value as string | number]
             if (classes) {
                 classNames.push(classes)
             }
@@ -148,7 +148,7 @@ function cv<T extends Record<string, string | number | boolean>>(firstParam: Tem
                 classNames.push(eachClasses)
             }
         }
-    
+
         let result = classNames.join(' ')
         if (isTemplateLiteral) {
             result = result.trim().replace(/\n/g, ' ').replace(/  +/g, ' ')

diff --git a/packages/css/src/bin/index.ts b/packages/css/src/bin/index.ts
@@ -69,7 +69,7 @@ program.command('render')
         try {
             const action = require('@master/css-renderer/actions/main')
             await action(args, options)
-        } catch (error) {
+        } catch (error: any) {
             if (error.code === 'ERR_MODULE_NOT_FOUND') {
                 log.i`Please run **npm** **install** **@master/css-renderer** first`
             } else {
@@ -88,7 +88,7 @@ program.command('extract')
         try {
             const action = require('@master/css-extractor/actions/main')
             await action(args, options)
-        } catch (error) {
+        } catch (error: any) {
             if (error.code === 'ERR_MODULE_NOT_FOUND') {
                 log.i`Please run **npm** **install** **@master/css-extractor** first`
             } else {

diff --git a/packages/css/src/config/functions.ts b/packages/css/src/config/functions.ts
@@ -1,4 +1,4 @@
-import type { FunctionDefinition } from './'
+import type { FunctionDefinition, FunctionDefinitions } from './'
 import type { Rule } from '../rule'
 
 const functions = {
@@ -20,7 +20,7 @@ const functions = {
     calc: {
         transform(value, bypassVariableNames) {
             const valueComponents: Rule['valueComponents'] = []
-            const functions = this.css.config.functions
+            const functions = this.css.config.functions as FunctionDefinitions
             let i = 0
             const anaylze = (currentValueComponents: Rule['valueComponents'], bypassHandlingSeparator: boolean, bypassHandlingUnitForcely: boolean) => {
                 let bypassHandlingUnit = false

diff --git a/packages/css/src/config/index.ts b/packages/css/src/config/index.ts
@@ -11,11 +11,13 @@ import type { Rule, RuleDefinition, ValueComponent } from '../rule'
 const config: Config = {
     mediaQueries,
     selectors,
+    // @ts-expect-error
     semantics,
     rules,
-    functions: functions as any,
+    functions,
+    // @ts-expect-error
     animations,
-    variables: variables as any,
+    variables,
     scope: '',
     rootSize: 16,
     override: false,
@@ -48,7 +50,7 @@ export type SemanticDefinitions = { [key in keyof typeof semantics]?: CSSDeclara
 export interface FunctionDefinition {
     unit?: string
     colored?: boolean
-    transform?(this: Rule, value: string, bypassVariableNames?: string[]): string | ValueComponent[]
+    transform?(this: Rule, value: string, bypassVariableNames: string[]): string | ValueComponent[]
 }
 export type FunctionDefinitions = { [key: string]: FunctionDefinition }