From 6962e7f6a83ffd6c6bcffc8957f8adcb635b74f3 Mon Sep 17 00:00:00 2001
From: Jorge Luis Calleja Alvarado <jorgelca1205@gmail.com>
Date: Tue, 26 Dec 2023 17:43:48 -0600
Subject: [PATCH] fix: export create folder

---
 examples/basic/src/components/Box.tsx         |  8 -------
 examples/basic/src/components/Stack.tsx       |  7 ------
 examples/basic/src/screens/DS/screen.tsx      | 23 ++++++++-----------
 packages/@blocks-primitives/src/Box/Box.tsx   |  2 +-
 .../src/{create => Box}/createBox.tsx         |  2 +-
 .../src/Box/{ => tests}/Box.test.tsx          |  4 ++--
 .../{create => Box}/tests/createBox.test.tsx  |  2 +-
 .../@blocks-primitives/src/Stack/Stack.tsx    |  2 +-
 .../src/{create => Stack}/createStack.tsx     |  4 ++--
 .../@blocks-primitives/src/Stack/index.ts     |  1 +
 .../src/Stack/{ => tests}/Stack.test.tsx      |  9 +++++---
 .../tests/createStack.test.tsx                |  0
 packages/@blocks-primitives/src/Text/Text.tsx |  2 +-
 .../src/{create => Text}/createText.tsx       |  2 +-
 .../src/Text/{ => tests}/Text.test.tsx        |  4 ++--
 .../tests/createText.test.tsx                 |  2 +-
 .../@blocks-primitives/src/XStack/XStack.tsx  |  2 +-
 .../src/XStack/{ => tests}/XStack.test.tsx    |  4 ++--
 .../@blocks-primitives/src/YStack/YStack.tsx  |  2 +-
 .../src/YStack/{ => tests}/YStack.test.tsx    |  4 ++--
 .../@blocks-primitives/src/create/index.tsx   |  3 ---
 packages/@blocks-primitives/src/index.ts      |  1 -
 22 files changed, 36 insertions(+), 54 deletions(-)
 delete mode 100644 examples/basic/src/components/Box.tsx
 delete mode 100644 examples/basic/src/components/Stack.tsx
 rename packages/@blocks-primitives/src/{create => Box}/createBox.tsx (94%)
 rename packages/@blocks-primitives/src/Box/{ => tests}/Box.test.tsx (93%)
 rename packages/@blocks-primitives/src/{create => Box}/tests/createBox.test.tsx (94%)
 rename packages/@blocks-primitives/src/{create => Stack}/createStack.tsx (93%)
 rename packages/@blocks-primitives/src/Stack/{ => tests}/Stack.test.tsx (92%)
 rename packages/@blocks-primitives/src/{create => Stack}/tests/createStack.test.tsx (100%)
 rename packages/@blocks-primitives/src/{create => Text}/createText.tsx (94%)
 rename packages/@blocks-primitives/src/Text/{ => tests}/Text.test.tsx (92%)
 rename packages/@blocks-primitives/src/{create => Text}/tests/createText.test.tsx (97%)
 rename packages/@blocks-primitives/src/XStack/{ => tests}/XStack.test.tsx (96%)
 rename packages/@blocks-primitives/src/YStack/{ => tests}/YStack.test.tsx (96%)
 delete mode 100644 packages/@blocks-primitives/src/create/index.tsx

diff --git a/examples/basic/src/components/Box.tsx b/examples/basic/src/components/Box.tsx
deleted file mode 100644
index 0e30d5b7..00000000
--- a/examples/basic/src/components/Box.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createBox, BoxProps } from '@design-blocks/primitives';
-
-import type { ColorMapProps } from '@design-blocks/native';
-import type { ColorsAppTheme } from '../../block';
-
-interface BoxPropsCustom extends ColorMapProps<ColorsAppTheme> {}
-const Box = createBox<BoxPropsCustom & BoxProps>();
-export default Box;
diff --git a/examples/basic/src/components/Stack.tsx b/examples/basic/src/components/Stack.tsx
deleted file mode 100644
index a617992b..00000000
--- a/examples/basic/src/components/Stack.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStack, StackProps } from '@design-blocks/primitives';
-
-import type { ColorMapProps } from '@design-blocks/native';
-import type { ColorsAppTheme } from '../../block';
-
-interface StackPropsCustom extends ColorMapProps<ColorsAppTheme> {}
-export default createStack<StackPropsCustom & StackProps>();
diff --git a/examples/basic/src/screens/DS/screen.tsx b/examples/basic/src/screens/DS/screen.tsx
index 3dc62c03..6531e02f 100644
--- a/examples/basic/src/screens/DS/screen.tsx
+++ b/examples/basic/src/screens/DS/screen.tsx
@@ -1,36 +1,33 @@
-import { ScrollView, View } from 'react-native';
+import { ScrollView, View } from "react-native";
 
-import { Text } from '@design-blocks/primitives';
+import { Text, Box, Stack } from "@design-blocks/primitives";
 
-import { block } from '../../../blocks.config';
-
-import Box from '../../components/Box';
-import Stack from '../../components/Stack';
+import { block } from "../../../blocks.config";
 
 const ScrollViewBlock = block(ScrollView)(({ theme }) => {
   return {
     backgroundColor: theme.colors.blue[950],
-    height: '100%',
+    height: "100%",
   };
 });
 
 function DSScreen() {
   return (
-    <ScrollViewBlock contentInsetAdjustmentBehavior='automatic'>
-      <Text mb='2xl' fontSize='10xl' color='zinc.50' textAlign='center'>
+    <ScrollViewBlock contentInsetAdjustmentBehavior="automatic">
+      <Text mb="2xl" fontSize="10xl" color="zinc.50" textAlign="center">
         Blocks v0.0.1
       </Text>
 
-      <Stack gap='8xl'>
-        <Box bgColor='fuchsia.500'>
+      <Stack gap="8xl">
+        <Box bgColor="fuchsia.500">
           <Text>Box 1</Text>
         </Box>
 
-        <Box bgColor='amber.500'>
+        <Box bgColor="amber.500">
           <Text>Box 2</Text>
         </Box>
 
-        <Box bgColor='red.500'>
+        <Box bgColor="red.500">
           <Text>Box 3</Text>
         </Box>
 
diff --git a/packages/@blocks-primitives/src/Box/Box.tsx b/packages/@blocks-primitives/src/Box/Box.tsx
index 68a6f3a5..b7ba2d93 100644
--- a/packages/@blocks-primitives/src/Box/Box.tsx
+++ b/packages/@blocks-primitives/src/Box/Box.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { __DEV__ } from '@design-blocks/utils';
 
-import { createBox } from '../create';
+import { createBox } from './createBox';
 
 const Box = createBox();
 
diff --git a/packages/@blocks-primitives/src/create/createBox.tsx b/packages/@blocks-primitives/src/Box/createBox.tsx
similarity index 94%
rename from packages/@blocks-primitives/src/create/createBox.tsx
rename to packages/@blocks-primitives/src/Box/createBox.tsx
index 0cf83a82..f92f83d1 100644
--- a/packages/@blocks-primitives/src/create/createBox.tsx
+++ b/packages/@blocks-primitives/src/Box/createBox.tsx
@@ -6,7 +6,7 @@ import block from '@design-blocks/block';
 import { StyleFunctionMode, styleFunction } from '@design-blocks/system';
 import { __DEV__ } from '@design-blocks/utils';
 
-import type { BoxProps } from '../Box';
+import type { BoxProps } from './Box.types';
 
 export function createBox<AdditionalProps extends BoxProps = BoxProps>() {
   const BoxBlock = block(RN.View, {
diff --git a/packages/@blocks-primitives/src/Box/Box.test.tsx b/packages/@blocks-primitives/src/Box/tests/Box.test.tsx
similarity index 93%
rename from packages/@blocks-primitives/src/Box/Box.test.tsx
rename to packages/@blocks-primitives/src/Box/tests/Box.test.tsx
index 947fd460..4183cd3f 100644
--- a/packages/@blocks-primitives/src/Box/Box.test.tsx
+++ b/packages/@blocks-primitives/src/Box/tests/Box.test.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 
 import { Text } from 'react-native';
 
-import { lightTheme, renderWithWrapper, screen } from '../../.ci/testHelper';
+import { lightTheme, renderWithWrapper, screen } from '../../../.ci/testHelper';
 
-import { Box } from '.';
+import { Box } from '../..';
 
 describe('<Box />', () => {
   it('should render correctly', () => {
diff --git a/packages/@blocks-primitives/src/create/tests/createBox.test.tsx b/packages/@blocks-primitives/src/Box/tests/createBox.test.tsx
similarity index 94%
rename from packages/@blocks-primitives/src/create/tests/createBox.test.tsx
rename to packages/@blocks-primitives/src/Box/tests/createBox.test.tsx
index 280d253b..4a8914ac 100644
--- a/packages/@blocks-primitives/src/create/tests/createBox.test.tsx
+++ b/packages/@blocks-primitives/src/Box/tests/createBox.test.tsx
@@ -4,7 +4,7 @@ import { Text } from 'react-native';
 
 import { renderWithWrapper, screen } from '../../../.ci/testHelper';
 
-import { createBox } from '..';
+import { createBox } from '../createBox';
 
 describe('createBox', () => {
   const Box = createBox();
diff --git a/packages/@blocks-primitives/src/Stack/Stack.tsx b/packages/@blocks-primitives/src/Stack/Stack.tsx
index deef905e..09cebe1d 100644
--- a/packages/@blocks-primitives/src/Stack/Stack.tsx
+++ b/packages/@blocks-primitives/src/Stack/Stack.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { __DEV__ } from '@design-blocks/utils';
 
-import { createStack } from '../create';
+import { createStack } from './createStack';
 
 import type { StackProps } from './Stack.types';
 
diff --git a/packages/@blocks-primitives/src/create/createStack.tsx b/packages/@blocks-primitives/src/Stack/createStack.tsx
similarity index 93%
rename from packages/@blocks-primitives/src/create/createStack.tsx
rename to packages/@blocks-primitives/src/Stack/createStack.tsx
index 4dec72c4..a7b59cb9 100644
--- a/packages/@blocks-primitives/src/create/createStack.tsx
+++ b/packages/@blocks-primitives/src/Stack/createStack.tsx
@@ -6,9 +6,9 @@ import { StyleFunctionMode, styleFunction } from '@design-blocks/system';
 import { __DEV__, camelCase } from '@design-blocks/utils';
 
 import { Box } from '../Box';
-import { variants } from '../Stack/Stack.utils';
+import { variants } from './Stack.utils';
 
-import type { IStackStyleValue, StackProps } from '../Stack/Stack.types';
+import type { IStackStyleValue, StackProps } from './Stack.types';
 
 export function createStack<AdditionalProps extends StackProps = StackProps>() {
   const StackBlock = block(Box, {
diff --git a/packages/@blocks-primitives/src/Stack/index.ts b/packages/@blocks-primitives/src/Stack/index.ts
index 81b928e1..6ede6d0f 100644
--- a/packages/@blocks-primitives/src/Stack/index.ts
+++ b/packages/@blocks-primitives/src/Stack/index.ts
@@ -1,2 +1,3 @@
 export { default as Stack } from './Stack';
+export * from './createStack';
 export type { StackProps } from './Stack.types';
diff --git a/packages/@blocks-primitives/src/Stack/Stack.test.tsx b/packages/@blocks-primitives/src/Stack/tests/Stack.test.tsx
similarity index 92%
rename from packages/@blocks-primitives/src/Stack/Stack.test.tsx
rename to packages/@blocks-primitives/src/Stack/tests/Stack.test.tsx
index 47bcf65c..3804993b 100644
--- a/packages/@blocks-primitives/src/Stack/Stack.test.tsx
+++ b/packages/@blocks-primitives/src/Stack/tests/Stack.test.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 
 import { Text, View } from 'react-native';
 
-import { lightTheme, renderWithWrapper, screen } from '../../.ci/testHelper';
+import { lightTheme, renderWithWrapper, screen } from '../../../.ci/testHelper';
 
-import { Stack } from '.';
+import { Stack } from '../..';
 
 const flexboxStyles = {
   display: 'flex',
@@ -37,7 +37,10 @@ describe('<Stack />', () => {
     const result = screen.toJSON();
 
     expect(result.type).toEqual('View');
-    expect(result.props.style[1][0]).toMatchObject({ ...flexboxStyles, flexDirection: 'row' });
+    expect(result.props.style[1][0]).toMatchObject({
+      ...flexboxStyles,
+      flexDirection: 'row',
+    });
   });
 
   it('should render the View component with a background color corresponding to the "red.950" value from the bgColor prop', () => {
diff --git a/packages/@blocks-primitives/src/create/tests/createStack.test.tsx b/packages/@blocks-primitives/src/Stack/tests/createStack.test.tsx
similarity index 100%
rename from packages/@blocks-primitives/src/create/tests/createStack.test.tsx
rename to packages/@blocks-primitives/src/Stack/tests/createStack.test.tsx
diff --git a/packages/@blocks-primitives/src/Text/Text.tsx b/packages/@blocks-primitives/src/Text/Text.tsx
index 22868c20..33f69e60 100644
--- a/packages/@blocks-primitives/src/Text/Text.tsx
+++ b/packages/@blocks-primitives/src/Text/Text.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { __DEV__ } from '@design-blocks/utils';
 
-import { createText } from '../create';
+import { createText } from './createText';
 
 const Text = createText();
 
diff --git a/packages/@blocks-primitives/src/create/createText.tsx b/packages/@blocks-primitives/src/Text/createText.tsx
similarity index 94%
rename from packages/@blocks-primitives/src/create/createText.tsx
rename to packages/@blocks-primitives/src/Text/createText.tsx
index f70042c2..2ff403d9 100644
--- a/packages/@blocks-primitives/src/create/createText.tsx
+++ b/packages/@blocks-primitives/src/Text/createText.tsx
@@ -5,7 +5,7 @@ import block from '@design-blocks/block';
 import { StyleFunctionMode, styleFunction } from '@design-blocks/system';
 import { __DEV__ } from '@design-blocks/utils';
 
-import type { TextProps } from '../Text/Text.types';
+import type { TextProps } from './Text.types';
 
 export function createText<AdditionalProps extends TextProps = TextProps>() {
   const TextBlock = block(RN.Text, {
diff --git a/packages/@blocks-primitives/src/Text/Text.test.tsx b/packages/@blocks-primitives/src/Text/tests/Text.test.tsx
similarity index 92%
rename from packages/@blocks-primitives/src/Text/Text.test.tsx
rename to packages/@blocks-primitives/src/Text/tests/Text.test.tsx
index d2d7a6a3..ebcd187a 100644
--- a/packages/@blocks-primitives/src/Text/Text.test.tsx
+++ b/packages/@blocks-primitives/src/Text/tests/Text.test.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { lightTheme, renderWithWrapper, screen } from '../../.ci/testHelper';
+import { lightTheme, renderWithWrapper, screen } from '../../../.ci/testHelper';
 
-import { Text } from '.';
+import { Text } from '../..';
 
 describe('<Text />', () => {
   it('should render correctly', () => {
diff --git a/packages/@blocks-primitives/src/create/tests/createText.test.tsx b/packages/@blocks-primitives/src/Text/tests/createText.test.tsx
similarity index 97%
rename from packages/@blocks-primitives/src/create/tests/createText.test.tsx
rename to packages/@blocks-primitives/src/Text/tests/createText.test.tsx
index a47e8718..79a52ca7 100644
--- a/packages/@blocks-primitives/src/create/tests/createText.test.tsx
+++ b/packages/@blocks-primitives/src/Text/tests/createText.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { lightTheme, renderWithWrapper, screen } from '../../../.ci/testHelper';
 
-import { createText } from '../..';
+import { createText } from '../createText';
 
 describe('createText', () => {
   const Text = createText();
diff --git a/packages/@blocks-primitives/src/XStack/XStack.tsx b/packages/@blocks-primitives/src/XStack/XStack.tsx
index 7cbbbd7c..1286c85d 100644
--- a/packages/@blocks-primitives/src/XStack/XStack.tsx
+++ b/packages/@blocks-primitives/src/XStack/XStack.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { __DEV__ } from '@design-blocks/utils';
 
-import { createStack } from '../create';
+import { createStack } from '../Stack';
 
 import type { StackProps } from '../Stack';
 
diff --git a/packages/@blocks-primitives/src/XStack/XStack.test.tsx b/packages/@blocks-primitives/src/XStack/tests/XStack.test.tsx
similarity index 96%
rename from packages/@blocks-primitives/src/XStack/XStack.test.tsx
rename to packages/@blocks-primitives/src/XStack/tests/XStack.test.tsx
index 6e85c30b..e968c5c7 100644
--- a/packages/@blocks-primitives/src/XStack/XStack.test.tsx
+++ b/packages/@blocks-primitives/src/XStack/tests/XStack.test.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 
 import { Text, View } from 'react-native';
 
-import { lightTheme, renderWithWrapper, screen } from '../../.ci/testHelper';
+import { lightTheme, renderWithWrapper, screen } from '../../../.ci/testHelper';
 
-import { XStack } from '.';
+import { XStack } from '../..';
 
 const flexboxStyles = {
   display: 'flex',
diff --git a/packages/@blocks-primitives/src/YStack/YStack.tsx b/packages/@blocks-primitives/src/YStack/YStack.tsx
index 2c02e1e6..9e7f11db 100644
--- a/packages/@blocks-primitives/src/YStack/YStack.tsx
+++ b/packages/@blocks-primitives/src/YStack/YStack.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { __DEV__ } from '@design-blocks/utils';
 
-import { createStack } from '../create';
+import { createStack } from '../Stack';
 
 import type { StackProps } from '../Stack';
 
diff --git a/packages/@blocks-primitives/src/YStack/YStack.test.tsx b/packages/@blocks-primitives/src/YStack/tests/YStack.test.tsx
similarity index 96%
rename from packages/@blocks-primitives/src/YStack/YStack.test.tsx
rename to packages/@blocks-primitives/src/YStack/tests/YStack.test.tsx
index 28d35ea5..b4b1228c 100644
--- a/packages/@blocks-primitives/src/YStack/YStack.test.tsx
+++ b/packages/@blocks-primitives/src/YStack/tests/YStack.test.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 
 import { Text, View } from 'react-native';
 
-import { lightTheme, renderWithWrapper, screen } from '../../.ci/testHelper';
+import { lightTheme, renderWithWrapper, screen } from '../../../.ci/testHelper';
 
-import { YStack } from '.';
+import { YStack } from '../..';
 
 const flexboxStyles = {
   display: 'flex',
diff --git a/packages/@blocks-primitives/src/create/index.tsx b/packages/@blocks-primitives/src/create/index.tsx
deleted file mode 100644
index 6780f127..00000000
--- a/packages/@blocks-primitives/src/create/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './createBox';
-export * from './createStack';
-export * from './createText';
diff --git a/packages/@blocks-primitives/src/index.ts b/packages/@blocks-primitives/src/index.ts
index c66b0bf9..ca115eea 100644
--- a/packages/@blocks-primitives/src/index.ts
+++ b/packages/@blocks-primitives/src/index.ts
@@ -3,4 +3,3 @@ export * from './Stack';
 export * from './Text';
 export * from './XStack';
 export * from './YStack';
-export * from './create';