Support round and TS types (#84)

extend.d.ts

@@ -1,5 +1,4 @@
 import * as RN from "react-native";
-import { StringifiedStyles, NamedStyles } from './index.d';
 
 declare module "react-native-size-matters/extend" {
  export function scale(size: number): number;
@@ -11,9 +10,24 @@ declare module "react-native-size-matters/extend" {
  export function ms(size: number, factor?: number): number;
  export function mvs(size: number, factor?: number): number;
 
+ type Scale = `${number}@s${'r' | ''}`;
+ type VerticalScale = `${number}@vs${'r' | ''}`;
+ type ModerateScale = `${number}@ms${number | ''}${'r' | ''}`;
+ type ModerateVerticalScale = `${number}@mvs${number | ''}${'r' | ''}`;
+ type Size = Scale | VerticalScale | ModerateScale | ModerateVerticalScale;
+ type WithSize<T> = { [P in keyof T]: number extends T[P] ? Size | T[P] : T[P] };
+ type ViewStyle = WithSize<RN.ViewStyle>;
+ type TextStyle = WithSize<RN.TextStyle>;
+ type ImageStyle = WithSize<RN.ImageStyle>;
+ type NamedStyles<T> = { [P in keyof T]: ViewStyle | TextStyle | ImageStyle };
+
  export namespace ScaledSheet {
- export function create<T extends NamedStyles<T> | NamedStyles<any>>(stylesObject: T): {
- [P in keyof T]: RN.RegisteredStyle<T[P] & Record<Extract<keyof T[P], keyof StringifiedStyles>, number>>
+ export function create<T extends NamedStyles<T> | NamedStyles<any>>(
+ stylesObject: T,
+ ): {
+ [P in keyof T]: RN.RegisteredStyle<{
+ [S in keyof T[P]]: T[P][S] extends Size ? number : T[P][S];
+ }>;
  };
  }
 }

index.d.ts

@@ -10,10 +10,10 @@ declare module 'react-native-size-matters' {
  export function ms(size: number, factor?: number): number;
  export function mvs(size: number, factor?: number): number;
 
- type Scale = `${number}@s`;
- type VerticalScale = `${number}@vs`;
- type ModerateScale = `${number}@ms${number | ''}`;
- type ModerateVerticalScale = `${number}@mvs${number | ''}`;
+ type Scale = `${number}@s${'r' | ''}`;
+ type VerticalScale = `${number}@vs${'r' | ''}`;
+ type ModerateScale = `${number}@ms${number | ''}${'r' | ''}`;
+ type ModerateVerticalScale = `${number}@mvs${number | ''}${'r' | ''}`;
  type Size = Scale | VerticalScale | ModerateScale | ModerateVerticalScale;
  type WithSize<T> = { [P in keyof T]: number extends T[P] ? Size | T[P] : T[P] };
  type ViewStyle = WithSize<RN.ViewStyle>;

package.json

@@ -1,6 +1,6 @@
 {
  "name": "react-native-size-matters",
- "version": "0.4.1",
+ "version": "0.4.2",
  "description": "A React-Native utility belt for scaling the size your apps UI across different sized devices",
  "main": "index.js",
  "scripts": {