chore: Merge PR #55 from feat/generator-improvements

Author: codinsonn

apps/next/schema.graphql

@@ -980,11 +980,14 @@ type UpsertResumeResponse {
   upsertedResume: ResumeData!
 }
 
+type Mutation {
+  syncUserBiosFromAirtable(args: SyncUserBiosFromAirtableArgs!): SyncUserBiosFromAirtableResponse
+  upsertResume(args: UpsertResumeArgs!): UpsertResumeResponse
+}
+
 type Query {
   getResumeDataByUserSlug(args: GetResumeDataByUserSlugArgs!): ResumeData
   getShopifyProducts(args: GetShopifyProductsArgs): GetShopifyProductsResponse
   getUserBioBySlug(args: UserBioInput!): UserBio
   healthCheck(args: HealthCheckArgs): HealthCheckResponse
-  syncUserBiosFromAirtable(args: SyncUserBiosFromAirtableArgs!): SyncUserBiosFromAirtableResponse
-  upsertResume(args: UpsertResumeArgs!): UpsertResumeResponse
 }

features/cv-page/schemas/GetResumeDataByUserSlugDataBridge.ts

@@ -29,8 +29,9 @@ export type GetResumeDataByUserSlugResponse = z.infer<typeof GetResumeDataByUser
 /** -i- API Config for getResumeDataByUserSlug() */
 export const GetResumeDataByUserSlugDataBridge = createDataBridge({
   resolverName: 'getResumeDataByUserSlug',
+  resolverType: 'query',
   argsSchema: GetResumeDataByUserSlugArgs,
   responseSchema: GetResumeDataByUserSlugResponse,
   apiPath: '/api/resume/[slug]',
-  allowedMethods: ['GET', 'POST'],
+  allowedMethods: ['GRAPHQL', 'GET', 'POST'],
 })

features/cv-page/schemas/UpsertResumeDataBridge.ts

@@ -35,8 +35,9 @@ export type UpsertResumeResponse = z.infer<typeof UpsertResumeResponse>
 /** -i- Aetherspace API Config for upsertResume() */
 export const UpsertResumeDataBridge = createDataBridge({
   resolverName: 'upsertResume',
+  resolverType: 'mutation',
   argsSchema: UpsertResumeArgs,
   responseSchema: UpsertResumeResponse,
   apiPath: '/api/resume/[slug]/upsert',
-  allowedMethods: ['GET', 'POST'],
+  allowedMethods: ['GRAPHQL', 'GET', 'POST'],
 })

features/links-page/schemas/GetUserBioBySlugDataBridge.ts

@@ -5,8 +5,9 @@ import { UserBio, UserBioInput } from './UserBio'
 /** -i- API Config for getResumeDataByUserSlug() */
 export const GetUserBioBySlugDataBridge = createDataBridge({
   resolverName: 'getUserBioBySlug',
+  resolverType: 'query',
   argsSchema: UserBioInput,
   responseSchema: UserBio,
   apiPath: '/api/bio/[slug]',
-  allowedMethods: ['GET', 'POST'],
+  allowedMethods: ['GRAPHQL', 'GET', 'POST'],
 })

features/links-page/schemas/SyncUserBiosFromAirtableDataBridge.ts

@@ -41,8 +41,9 @@ export type SyncUserBiosFromAirtableResponse = z.infer<typeof SyncUserBiosFromAi
 /** -i- Aetherspace API Config for syncUserBiosFromAirtable() */
 export const SyncUserBiosFromAirtableDataBridge = createDataBridge({
   resolverName: 'syncUserBiosFromAirtable',
+  resolverType: 'mutation',
   argsSchema: SyncUserBiosFromAirtableArgs,
   responseSchema: SyncUserBiosFromAirtableResponse,
   apiPath: '/api/links/syncs/airtable',
-  allowedMethods: ['GET', 'POST'],
+  allowedMethods: ['GRAPHQL', 'GET', 'POST'],
 })

packages/@aetherspace-commerce/schemas/GetShopifyProductsDataBridge.ts

@@ -24,8 +24,9 @@ export type GetShopifyProductsResponse = z.infer<typeof GetShopifyProductsRespon
 /** -i- The API config for the getShopifyProduct() resolver */
 export const GetShopifyProductsDataBridge = createDataBridge({
   resolverName: 'getShopifyProducts',
+  resolverType: 'query',
   argsSchema: GetShopifyProductsArgs,
   responseSchema: GetShopifyProductsResponse,
   apiPath: '/api/aetherspace/commerce/shopify/products',
-  allowedMethods: ['GET', 'POST'],
+  allowedMethods: ['GRAPHQL', 'GET', 'POST'],
 })

packages/@aetherspace/README.md

@@ -26,11 +26,11 @@ yarn dev:docs
 
 ## Up and running in minutes
 
-`packages/@aetherspace` houses a bunch of helpers that can be imported under the `aetherspace` namespace. These aim to make your cross-platform journey a breeze. All of it has been written in Typescript and is in the process of being documented in Storybook. Feel free to edit these to your liking, but here's what it you can do with it out of the box:
+`packages/@aetherspace` houses a bunch of helpers that can be imported under the `aetherspace` namespace. These aim to make your cross-platform journey a breeze. All of it has been written in Typescript and is documented in Storybook and the repo README's. Feel free to edit these to your liking if you make changes, but here's what it you can do with it out of the box:
 
 #### Write & style your components just once
 
-> 💚 Aetherspace primitives are ___built with [tailwind](), iOS, Android, web, node and ssr (+ media queries) in mind___.  
+> 💚 Aetherspace primitives are ___built with [tailwind](https://tailwindcss.com/), iOS, Android, web, node and ssr (+ media queries) in mind___.  
 > We mention media queries specifically because react-native-web does not support them out of the box. But we've got you covered.
 
 ```tsx
@@ -133,7 +133,8 @@ export const MyComponent = (props: AetherProps<typeof PropSchema>) => {
 #### Hook into automatic docgen
 
 > 📚 ___Documentation drives adoption___... and Storybook is a great way to do it.  
-> Just assign your `aetherSchema()` & `zod` powered prop definition as a __`getDocumentationProps` export__ and our scripts will __automatically turn it into Storybook controls.__
+> However, it can be a pain to set up and maintain the docs for every component manually. Luckily, we've already set it up for you.
+> On top of that, all you need to do is assign your `aetherSchema()` & `zod` powered prop definition as a __`getDocumentationProps` export__ and our scripts will __automatically turn it into Storybook controls.__
 
 `../../components/MyComponent.tsx`
 
@@ -243,11 +244,12 @@ Performing these 6 steps has provided us with a bunch of value in little time:
 
 <p>
   <a href="https://dev.to/codinsonn/how-to-compete-with-elons-twitter-a-dev-perspective-4j64#:~:text=%27Move%20fast%20%26%20build%20things%27%20with%20Zod%2C%20Expo%20%26%20Next.js" target="_blank">
-    <img alt="Intro Article on DEV" longdesc="Read the Intro Artical on DEV.to" src="https://img.shields.io/badge/dev.to-0A0A0A?style=for-the-badge&logo=devdotto&logoColor=white" />
+    <img alt="Intro Article on DEV" longdesc="Read the Intro Article on DEV.to" src="https://img.shields.io/badge/dev.to-0A0A0A?style=for-the-badge&logo=devdotto&logoColor=white" />
   </a>
 </p>
 
 - [Aetherspace Core Concepts](/packages/@aetherspace/core/README.md)
+- [Recommended way of working](/packages/@aetherspace/scripts/README.md)
 - [Single Sources of Truth for Front & Back-End with Zod](/packages/@aetherspace/schemas/README.md)
 - [Styling your components with Tailwind for Web & Mobile](/packages/@aetherspace/styles/README.md)
 - [Universal Routing with Expo and Next.js](/packages/@aetherspace/navigation/README.md)

packages/@aetherspace/core/README.md

@@ -177,8 +177,8 @@ Similar to adding recurring features, removing features or packages from a fresh
 ## Getting started with Aetherspace
 
 - [Quickstart](/packages/@aetherspace/README.md)
+- [Recommended way of working](/packages/@aetherspace/scripts/README.md)
 - [Universal Routing](/packages/@aetherspace/navigation/README.md)
-- [Free and Premium Licenses](/LICENSE.md)
 
 ...
 

packages/@aetherspace/generators/aether-form.ts

@@ -7,6 +7,7 @@ import {
   uppercaseFirstChar,
   createAutocompleteSource,
   validateNonEmptyNoSpaces,
+  normalizeName,
 } from '../scripts/helpers/scriptUtils'
 
 /* --- Disclaimer ------------------------------------------------------------------------------ */
@@ -20,14 +21,14 @@ const workspaceOptions = getWorkspaceOptions('')
 
 const availableSchemas = getAvailableSchemas('')
 
-const availableDataBridges = getAvailableDataBridges('')
+const availableDataBridges = getAvailableDataBridges('', 'mutation', true)
 
 const LINES = 100 - 12 // -i- 100 = max length, 12 = everything but the title & '-' lines
 
 const schemaTypeOptions = {
   ["No, I'll create my own form state schema"]: 'new',
   ['Yes, use an existing schema']: 'existing-schema',
-  ['Yes, use an existing data bridge to integrate with a resolver']: 'bridge',
+  ['Yes, use an existing data bridge to integrate state for a resolver']: 'bridge',
 }
 
 /** --- Resolver Generator --------------------------------------------------------------------- */
@@ -72,14 +73,16 @@ export const registerAetherFormGenerator = (plop: PlopTypes.NodePlopAPI) => {
           const schemaName = schemaConfig?.schemaName || bridgeConfig?.resolverName || 'useSomeFormState' // prettier-ignore
           let formHookName = `use${uppercaseFirstChar(schemaName)}FormState`
           formHookName = formHookName.replace('Edit', '').replace('Resolver', '').replace('Update', '') // prettier-ignore
-          return formHookName
+          return normalizeName(formHookName)
         },
         validate: validateNonEmptyNoSpaces,
+        transformer: normalizeName,
       },
     ],
     actions: (data) => {
       // Args
-      const { workspaceTarget, formHookName, schemaTarget, bridgeTarget } = data || {}
+      const { workspaceTarget, schemaTarget, bridgeTarget } = data || {}
+      const formHookName = normalizeName(data!.formHookName)
       const workspacePath = workspaceOptions[workspaceTarget]
       const dataBridgeConfig = availableDataBridges[bridgeTarget]
       const schemaConfig = availableSchemas[schemaTarget]