@niibase/uniwind 1.6.2 → 1.6.4

package/src/metro/metro-transformer.ts

@@ -91,7 +91,7 @@ export const transform = async (
         isWeb
             ? virtualCode
             : [
-                `import { Uniwind } from '${name}';`,
+                `const { Uniwind } = require('${name}');`,
                 `Uniwind.__reinit(rt => ${virtualCode}, ${injectedThemesCode});`,
             ].join(''),
         'utf-8',

package/src/metro/processor/css.ts

@@ -590,7 +590,6 @@ export class CSS {
         return undefined
     }
 
-    // eslint-disable-next-line @typescript-eslint/member-ordering
     private static readonly TRANSFORM_TYPES = new Set([
         'translate',
         'translateX',

package/src/metro/processor/functions.ts

@@ -239,7 +239,6 @@ export class Functions {
                 .replace(/"/g, '')
                 .replace(new RegExp(unit, 'g'), '')
 
-            // eslint-disable-next-line @typescript-eslint/no-implied-eval, no-new-func
             return new Function(`return ${numericValue} + '${unit}'`)()
         } catch {
             this.logger.error(`Invalid calc ${value}`)

package/src/metro/processor/rn.ts

@@ -231,6 +231,7 @@ const cssToRNMap: Record<string, (value: any) => Record<string, any>> = {
 
 const BORDER_WIDTH_KEYS = ['borderTopWidth', 'borderRightWidth', 'borderBottomWidth', 'borderLeftWidth']
 const BORDER_COLOR_KEYS = ['borderTopColor', 'borderRightColor', 'borderBottomColor', 'borderLeftColor']
+const BORDER_RADIUS_KEYS = ['borderTopLeftRadius', 'borderTopRightRadius', 'borderBottomLeftRadius', 'borderBottomRightRadius']
 
 export class RN {
     constructor(private readonly Processor: ProcessorBuilder) {}
@@ -249,6 +250,12 @@ export class RN {
                             .replace('Block', 'Vertical')
                     }
 
+                    if (x.includes('border')) {
+                        return x
+                            .replace('InlineStart', 'Start')
+                            .replace('InlineEnd', 'End')
+                    }
+
                     return x
                 },
             )
@@ -382,6 +389,18 @@ export class RN {
             }
         }
 
+        if (BORDER_RADIUS_KEYS.every(key => keys.includes(key))) {
+            const borderRadius = styles.borderTopLeftRadius
+
+            // Join border radius
+            if (BORDER_RADIUS_KEYS.every(key => styles[key] === borderRadius)) {
+                return {
+                    ...removeKeys(styles, BORDER_RADIUS_KEYS),
+                    borderRadius,
+                }
+            }
+        }
+
         return styles
     }
 }

package/src/metro/resolvers.ts

@@ -1,5 +1,5 @@
 import { CustomResolutionContext, CustomResolver } from 'metro-resolver'
-import { basename, dirname, join, sep } from 'node:path'
+import { basename, dirname, sep } from 'node:path'
 import { name } from '../../package.json'
 
 type ResolverConfig = {
@@ -47,12 +47,11 @@ export const nativeResolver = (extraComponents: Record<string, string>) =>
     const resolution = resolver(context, moduleName, platform)
 
     if (cachedInternalBasePath === null) {
-        const componentsResolution = resolver(context, `${name}/components`, platform)
-
-        cachedInternalBasePath = componentsResolution.type === 'sourceFile'
-            // Go from src/components to root
-            ? join(dirname(componentsResolution.filePath), '../..')
-            : ''
+        try {
+            cachedInternalBasePath = dirname(require.resolve(`${name}/package.json`))
+        } catch {
+            cachedInternalBasePath = ''
+        }
     }
 
     const isInternal = cachedInternalBasePath !== '' && context.originModulePath.startsWith(cachedInternalBasePath)
@@ -106,13 +105,13 @@ export const webResolver = (extraComponents: Record<string, string>) =>
     const resolution = resolver(context, moduleName, platform)
 
     if (cachedInternalBasePath === null) {
-        const componentsResolution = resolver(context, `${name}/components`, platform)
-
-        cachedInternalBasePath = componentsResolution.type === 'sourceFile'
-            // Go from dist/module/components/web to root
-            ? join(dirname(componentsResolution.filePath), '../../../..')
-            : ''
+        try {
+            cachedInternalBasePath = dirname(require.resolve(`${name}/package.json`))
+        } catch {
+            cachedInternalBasePath = ''
+        }
     }
+
     if (
         (cachedInternalBasePath !== '' && context.originModulePath.startsWith(cachedInternalBasePath))
         || resolution.type !== 'sourceFile'

package/src/metro/utils/common.ts

@@ -52,7 +52,6 @@ export const uniq = <T>(arr: Array<T>) => Array.from(new Set(arr))
 
 export const isValidJSValue = (jsValueString: string) => {
     try {
-        // eslint-disable-next-line @typescript-eslint/no-implied-eval, no-new-func
         new Function(`const test = ${jsValueString}`)
 
         return true

package/src/metro/utils/serialize.ts

@@ -103,7 +103,6 @@ export const serializeJSObject = (obj: Record<string, any>, serializer: (key: st
         serializedValues =>
             serializedValues.filter(serializedValue => {
                 try {
-                    // eslint-disable-next-line @typescript-eslint/no-implied-eval, no-new-func
                     new Function(`function validateJS() { const obj = ({ ${serializedValue} }) }`)
 
                     return true

package/src/types.ts

@@ -20,5 +20,4 @@ export const enum ColorScheme {
     Dark = 'dark',
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface UniwindConfig {}