Requested Changes Part 1

* Reapply types that were accidentally deleted.
* Add additional tests for implicitly determining prop types.

Author: ITenthusiasm

packages/jss/src/index.d.ts

@@ -53,8 +53,8 @@ export type CreateGenerateId = (options?: CreateGenerateIdOptions) => GenerateId
 export type GenerateId = (rule: Rule, sheet?: StyleSheet<string>) => string
 
 export type JssValue =
-  | string
-  | number
+  | (string & {})
+  | (number & {})
   | Array<string | number | Array<string | number> | '!important'>
   | null
   | false

packages/react-jss/tests/types/createUseStyles.ts

@@ -80,6 +80,24 @@ const themeArg6ClassesFail = themeArg6({theme: {}})
 const themeArg6ClassesFail2 = themeArg6({theme: expectedDefaultTheme})
 const themeArg6ClassesPass = themeArg6({theme: expectedCustomTheme})
 
+// Props can be determined implicitly
+const themeArg7 = createUseStyles(theme => ({
+  checkbox: ({property}: MyProps) => ({
+    borderColor: property
+  })
+}))
+
+// @ts-expect-error invalid props
+const themeArg7ClassesFail = themeArg7({colour: 'green'})
+// @ts-expect-error extraneous props
+const themeArg7ClassesFail2 = themeArg7({...expectedCustomProps, someUnTypedProp: 1})
+const themeArg7ClassesPass = themeArg7(expectedCustomProps)
+
+// Classes check
+const themeArgClasses7String: string = themeArg7ClassesPass.checkbox
+// @ts-expect-error invalid className
+themeArg7ClassesPass.doesntExist
+
 /* -------------------- NO THEME ARGUMENT -------------------- */
 // Regular, static styles work fine
 const noThemeArg1 = createUseStyles({
@@ -200,3 +218,21 @@ const noThemeArg7 = createUseStyles<MyProps, MyTheme>({
     }
   }
 })
+
+// Props can be determined implicitly
+const noThemeArg8 = createUseStyles({
+  checkbox: ({property}: MyProps) => ({
+    borderColor: property
+  })
+})
+
+// @ts-expect-error invalid props
+const noThemeArg8ClassesFail = noThemeArg8({colour: 'green'})
+// @ts-expect-error extraneous props
+const noThemeArg8ClassesFail2 = noThemeArg8({...expectedCustomProps, someUnTypedProp: 1})
+const noThemeArg8ClassesPass = noThemeArg8(expectedCustomProps)
+
+// Classes check
+const noThemeArg8ClassesString: string = noThemeArg8ClassesPass.checkbox
+// @ts-expect-error invalid className
+noThemeArg8ClassesPass.doesntExist