npm - @baseplate-dev/react-generators - Versions diffs - 0.2.2 → 0.2.4 - Mend

@baseplate-dev/react-generators 0.2.2 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (289) hide show

package/dist/generators/admin/admin-components/generated/index.d.ts CHANGED Viewed

@@ -47,10 +47,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     isTypeOnly: true;
                 };
                 Alert: {};
+                AlertDescription: {};
+                AlertTitle: {};
                 Button: {};
                 buttonVariants: {};
                 Calendar: {};
                 Card: {};
+                CardContent: {};
+                CardDescription: {};
+                CardFooter: {};
+                CardHeader: {};
+                CardTitle: {};
                 Checkbox: {};
                 CheckboxField: {};
                 CheckboxFieldController: {};
@@ -137,12 +144,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                 SidebarLayout: {};
                 SidebarLayoutContent: {};
                 SidebarLayoutSidebar: {};
-                Status: {
-                    isTypeOnly: true;
-                };
-                StatusType: {
-                    isTypeOnly: true;
-                };
                 Switch: {};
                 SwitchField: {};
                 SwitchFieldController: {};
@@ -167,7 +168,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                 useConfirmDialogState: {};
                 useControlledState: {};
                 useControllerMerged: {};
-                useStatus: {};
             }>>;
             typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
         }, undefined>;
@@ -180,10 +180,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                         isTypeOnly: true;
                     };
                     Alert: {};
+                    AlertDescription: {};
+                    AlertTitle: {};
                     Button: {};
                     buttonVariants: {};
                     Calendar: {};
                     Card: {};
+                    CardContent: {};
+                    CardDescription: {};
+                    CardFooter: {};
+                    CardHeader: {};
+                    CardTitle: {};
                     Checkbox: {};
                     CheckboxField: {};
                     CheckboxFieldController: {};
@@ -270,12 +277,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     SidebarLayout: {};
                     SidebarLayoutContent: {};
                     SidebarLayoutSidebar: {};
-                    Status: {
-                        isTypeOnly: true;
-                    };
-                    StatusType: {
-                        isTypeOnly: true;
-                    };
                     Switch: {};
                     SwitchField: {};
                     SwitchFieldController: {};
@@ -300,7 +301,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     useConfirmDialogState: {};
                     useControlledState: {};
                     useControllerMerged: {};
-                    useStatus: {};
                 }>>;
             }>;
             embeddedListInput: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -309,10 +309,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                         isTypeOnly: true;
                     };
                     Alert: {};
+                    AlertDescription: {};
+                    AlertTitle: {};
                     Button: {};
                     buttonVariants: {};
                     Calendar: {};
                     Card: {};
+                    CardContent: {};
+                    CardDescription: {};
+                    CardFooter: {};
+                    CardHeader: {};
+                    CardTitle: {};
                     Checkbox: {};
                     CheckboxField: {};
                     CheckboxFieldController: {};
@@ -399,12 +406,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     SidebarLayout: {};
                     SidebarLayoutContent: {};
                     SidebarLayoutSidebar: {};
-                    Status: {
-                        isTypeOnly: true;
-                    };
-                    StatusType: {
-                        isTypeOnly: true;
-                    };
                     Switch: {};
                     SwitchField: {};
                     SwitchFieldController: {};
@@ -429,7 +430,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     useConfirmDialogState: {};
                     useControlledState: {};
                     useControllerMerged: {};
-                    useStatus: {};
                 }>>;
             }>;
             embeddedObjectField: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -438,10 +438,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                         isTypeOnly: true;
                     };
                     Alert: {};
+                    AlertDescription: {};
+                    AlertTitle: {};
                     Button: {};
                     buttonVariants: {};
                     Calendar: {};
                     Card: {};
+                    CardContent: {};
+                    CardDescription: {};
+                    CardFooter: {};
+                    CardHeader: {};
+                    CardTitle: {};
                     Checkbox: {};
                     CheckboxField: {};
                     CheckboxFieldController: {};
@@ -528,12 +535,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     SidebarLayout: {};
                     SidebarLayoutContent: {};
                     SidebarLayoutSidebar: {};
-                    Status: {
-                        isTypeOnly: true;
-                    };
-                    StatusType: {
-                        isTypeOnly: true;
-                    };
                     Switch: {};
                     SwitchField: {};
                     SwitchFieldController: {};
@@ -558,7 +559,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     useConfirmDialogState: {};
                     useControlledState: {};
                     useControllerMerged: {};
-                    useStatus: {};
                 }>>;
             }>;
             embeddedObjectInput: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -567,10 +567,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                         isTypeOnly: true;
                     };
                     Alert: {};
+                    AlertDescription: {};
+                    AlertTitle: {};
                     Button: {};
                     buttonVariants: {};
                     Calendar: {};
                     Card: {};
+                    CardContent: {};
+                    CardDescription: {};
+                    CardFooter: {};
+                    CardHeader: {};
+                    CardTitle: {};
                     Checkbox: {};
                     CheckboxField: {};
                     CheckboxFieldController: {};
@@ -657,12 +664,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     SidebarLayout: {};
                     SidebarLayoutContent: {};
                     SidebarLayoutSidebar: {};
-                    Status: {
-                        isTypeOnly: true;
-                    };
-                    StatusType: {
-                        isTypeOnly: true;
-                    };
                     Switch: {};
                     SwitchField: {};
                     SwitchFieldController: {};
@@ -687,7 +688,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_GENERATED: {
                     useConfirmDialogState: {};
                     useControlledState: {};
                     useControllerMerged: {};
-                    useStatus: {};
                 }>>;
             }>;
         };

package/dist/generators/admin/admin-components/generated/template-renderers.d.ts CHANGED Viewed

@@ -17,10 +17,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_RENDERERS: {
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -107,12 +114,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_RENDERERS: {
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -137,7 +138,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_RENDERERS: {
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
     }, undefined>;

package/dist/generators/admin/admin-components/generated/typed-templates.d.ts CHANGED Viewed

@@ -5,10 +5,17 @@ export declare const componentsGroup: {
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -95,12 +102,6 @@ export declare const componentsGroup: {
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -125,7 +126,6 @@ export declare const componentsGroup: {
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
     }>;
     embeddedListInput: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -134,10 +134,17 @@ export declare const componentsGroup: {
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -224,12 +231,6 @@ export declare const componentsGroup: {
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -254,7 +255,6 @@ export declare const componentsGroup: {
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
     }>;
     embeddedObjectField: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -263,10 +263,17 @@ export declare const componentsGroup: {
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -353,12 +360,6 @@ export declare const componentsGroup: {
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -383,7 +384,6 @@ export declare const componentsGroup: {
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
     }>;
     embeddedObjectInput: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -392,10 +392,17 @@ export declare const componentsGroup: {
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -482,12 +489,6 @@ export declare const componentsGroup: {
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -512,7 +513,6 @@ export declare const componentsGroup: {
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
     }>;
 };
@@ -524,10 +524,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                     isTypeOnly: true;
                 };
                 Alert: {};
+                AlertDescription: {};
+                AlertTitle: {};
                 Button: {};
                 buttonVariants: {};
                 Calendar: {};
                 Card: {};
+                CardContent: {};
+                CardDescription: {};
+                CardFooter: {};
+                CardHeader: {};
+                CardTitle: {};
                 Checkbox: {};
                 CheckboxField: {};
                 CheckboxFieldController: {};
@@ -614,12 +621,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 SidebarLayout: {};
                 SidebarLayoutContent: {};
                 SidebarLayoutSidebar: {};
-                Status: {
-                    isTypeOnly: true;
-                };
-                StatusType: {
-                    isTypeOnly: true;
-                };
                 Switch: {};
                 SwitchField: {};
                 SwitchFieldController: {};
@@ -644,7 +645,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 useConfirmDialogState: {};
                 useControlledState: {};
                 useControllerMerged: {};
-                useStatus: {};
             }>>;
         }>;
         embeddedListInput: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -653,10 +653,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                     isTypeOnly: true;
                 };
                 Alert: {};
+                AlertDescription: {};
+                AlertTitle: {};
                 Button: {};
                 buttonVariants: {};
                 Calendar: {};
                 Card: {};
+                CardContent: {};
+                CardDescription: {};
+                CardFooter: {};
+                CardHeader: {};
+                CardTitle: {};
                 Checkbox: {};
                 CheckboxField: {};
                 CheckboxFieldController: {};
@@ -743,12 +750,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 SidebarLayout: {};
                 SidebarLayoutContent: {};
                 SidebarLayoutSidebar: {};
-                Status: {
-                    isTypeOnly: true;
-                };
-                StatusType: {
-                    isTypeOnly: true;
-                };
                 Switch: {};
                 SwitchField: {};
                 SwitchFieldController: {};
@@ -773,7 +774,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 useConfirmDialogState: {};
                 useControlledState: {};
                 useControllerMerged: {};
-                useStatus: {};
             }>>;
         }>;
         embeddedObjectField: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -782,10 +782,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                     isTypeOnly: true;
                 };
                 Alert: {};
+                AlertDescription: {};
+                AlertTitle: {};
                 Button: {};
                 buttonVariants: {};
                 Calendar: {};
                 Card: {};
+                CardContent: {};
+                CardDescription: {};
+                CardFooter: {};
+                CardHeader: {};
+                CardTitle: {};
                 Checkbox: {};
                 CheckboxField: {};
                 CheckboxFieldController: {};
@@ -872,12 +879,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 SidebarLayout: {};
                 SidebarLayoutContent: {};
                 SidebarLayoutSidebar: {};
-                Status: {
-                    isTypeOnly: true;
-                };
-                StatusType: {
-                    isTypeOnly: true;
-                };
                 Switch: {};
                 SwitchField: {};
                 SwitchFieldController: {};
@@ -902,7 +903,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 useConfirmDialogState: {};
                 useControlledState: {};
                 useControllerMerged: {};
-                useStatus: {};
             }>>;
         }>;
         embeddedObjectInput: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
@@ -911,10 +911,17 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                     isTypeOnly: true;
                 };
                 Alert: {};
+                AlertDescription: {};
+                AlertTitle: {};
                 Button: {};
                 buttonVariants: {};
                 Calendar: {};
                 Card: {};
+                CardContent: {};
+                CardDescription: {};
+                CardFooter: {};
+                CardHeader: {};
+                CardTitle: {};
                 Checkbox: {};
                 CheckboxField: {};
                 CheckboxFieldController: {};
@@ -1001,12 +1008,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 SidebarLayout: {};
                 SidebarLayoutContent: {};
                 SidebarLayoutSidebar: {};
-                Status: {
-                    isTypeOnly: true;
-                };
-                StatusType: {
-                    isTypeOnly: true;
-                };
                 Switch: {};
                 SwitchField: {};
                 SwitchFieldController: {};
@@ -1031,7 +1032,6 @@ export declare const ADMIN_ADMIN_COMPONENTS_TEMPLATES: {
                 useConfirmDialogState: {};
                 useControlledState: {};
                 useControllerMerged: {};
-                useStatus: {};
             }>>;
         }>;
     };

package/dist/generators/admin/admin-components/templates/src/components/embedded-list-input/embedded-list-input.tsx CHANGED Viewed

@@ -5,6 +5,8 @@ import type { DefaultValues } from 'react-hook-form';
 import {
   Alert,
+  AlertDescription,
+  AlertTitle,
   Button,
   Dialog,
   DialogContent,
@@ -107,7 +109,10 @@ export function EmbeddedListInput<T>({
             },
           })
         ) : (
-          <Alert variant="default">No items currently</Alert>
+          <Alert variant="default">
+            <AlertTitle>No items currently</AlertTitle>
+            <AlertDescription>Add an item to get started.</AlertDescription>
+          </Alert>
         )}
         <DialogContent width="lg">
           <DialogHeader>

package/dist/generators/admin/admin-crud-edit/admin-crud-edit.generator.d.ts CHANGED Viewed

@@ -24,10 +24,17 @@ export declare const adminCrudEditGenerator: import("@baseplate-dev/sync").Gener
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertDescription: {};
+            AlertTitle: {};
             Button: {};
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardContent: {};
+            CardDescription: {};
+            CardFooter: {};
+            CardHeader: {};
+            CardTitle: {};
             Checkbox: {};
             CheckboxField: {};
             CheckboxFieldController: {};
@@ -114,12 +121,6 @@ export declare const adminCrudEditGenerator: import("@baseplate-dev/sync").Gener
             SidebarLayout: {};
             SidebarLayoutContent: {};
             SidebarLayoutSidebar: {};
-            Status: {
-                isTypeOnly: true;
-            };
-            StatusType: {
-                isTypeOnly: true;
-            };
             Switch: {};
             SwitchField: {};
             SwitchFieldController: {};
@@ -144,7 +145,6 @@ export declare const adminCrudEditGenerator: import("@baseplate-dev/sync").Gener
             useConfirmDialogState: {};
             useControlledState: {};
             useControllerMerged: {};
-            useStatus: {};
         }>>;
         reactErrorImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
             formatError: {};

package/dist/generators/admin/admin-crud-edit/admin-crud-edit.generator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin-crud-edit.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/admin/admin-crud-edit/admin-crud-edit.generator.ts"],"names":[],"mappings":"AAuCA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,IAAI,MAAM,CAAC;IACxB,eAAe,IAAI,MAAM,CAAC;IAC1B,gBAAgB,IAAI,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,mEAC4B,CAAC;AAE/D,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~EAkQjC~~,CAAC"}
1	+ {"version":3,"file":"admin-crud-edit.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/admin/admin-crud-edit/admin-crud-edit.generator.ts"],"names":[],"mappings":"AAuCA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,IAAI,MAAM,CAAC;IACxB,eAAe,IAAI,MAAM,CAAC;IAC1B,gBAAgB,IAAI,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,mEAC4B,CAAC;AAE/D,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqQjC,CAAC"}

package/dist/generators/admin/admin-crud-edit/admin-crud-edit.generator.js CHANGED Viewed

@@ -39,18 +39,18 @@ export const adminCrudEditGenerator = createGenerator({
                 adminCrudInputContainer: adminCrudInputContainerProvider.export(),
             },
             run({ typescriptFile, adminCrudQueries, reactRoutes, reactComponentsImports, reactErrorImports, }) {
-                const routePrefix = reactRoutes.getRoutePrefix();
-                const editSchemaPath = `${reactRoutes.getDirectoryBase()}/-schemas/${lowerCaseFirst(dasherize(underscore(modelName)))}-schema.ts`;
+                const routeFilePath = reactRoutes.getRouteFilePath();
+                const editSchemaPath = `${reactRoutes.getOutputRelativePath()}/-schemas/${lowerCaseFirst(dasherize(underscore(modelName)))}-schema.ts`;
                 const editSchemaName = `${lowerCaseFirst(modelName)}EditFormSchema`;
                 const editSchemaExpression = TsCodeUtils.importFragment(editSchemaName, editSchemaPath);
                 const formDataName = `${modelName}FormData`;
                 const formDataExpression = TsCodeUtils.typeImportFragment(formDataName, editSchemaPath);
-                const editFormComponentPath = `${reactRoutes.getDirectoryBase()}/-components/${kebabCase(modelName)}-edit-form.tsx`;
+                const editFormComponentPath = `${reactRoutes.getOutputRelativePath()}/-components/${kebabCase(modelName)}-edit-form.tsx`;
                 const editFormComponentName = `${modelName}EditForm`;
                 const editFormComponentExpression = TsCodeUtils.importFragment(editFormComponentName, editFormComponentPath);
-                const editPagePath = `${reactRoutes.getDirectoryBase()}/$id.tsx`;
+                const editPagePath = `${reactRoutes.getOutputRelativePath()}/$id.tsx`;
                 const editPageName = `${modelName}EditPage`;
-                const createPagePath = `${reactRoutes.getDirectoryBase()}/new.tsx`;
+                const createPagePath = `${reactRoutes.getOutputRelativePath()}/new.tsx`;
                 const createPageName = `${modelName}CreatePage`;
                 const editQueryInfo = adminCrudQueries.getEditQueryHookInfo();
                 const updateInfo = adminCrudQueries.getUpdateHookInfo();
@@ -58,7 +58,7 @@ export const adminCrudEditGenerator = createGenerator({
                 return {
                     providers: {
                         adminCrudEdit: {
-                            getDirectoryBase: () => reactRoutes.getDirectoryBase(),
+                            getDirectoryBase: () => reactRoutes.getOutputRelativePath(),
                             getSchemaPath: () => editSchemaPath,
                             getSchemaImport: () => editSchemaPath,
                         },
@@ -139,10 +139,10 @@ export const adminCrudEditGenerator = createGenerator({
                                     reactErrorImports,
                                 },
                                 variables: {
-                                    TPL_ROUTE_VALUE: quot(`${routePrefix}/new`),
+                                    TPL_ROUTE_PATH: quot(`${routeFilePath}/new`),
                                     TPL_COMPONENT_NAME: createPageName,
                                     TPL_EDIT_FORM: tsTemplate `<${editFormComponentExpression} submitData={submitData} ${inputLoaderExtraProps} />`,
-                                    TPL_CREATE_MUTATION: createInfo.hookExpression,
+                                    TPL_CREATE_MUTATION: createInfo.documentExpression,
                                     TPL_MUTATION_NAME: createInfo.fieldName,
                                     TPL_FORM_DATA_NAME: formDataExpression,
                                     TPL_MODEL_NAME: titleizeCamel(modelName),
@@ -154,7 +154,7 @@ export const adminCrudEditGenerator = createGenerator({
                         }
                         const editPageLoader = {
                             loader: TsCodeUtils.formatFragment(`
-          const { data, error } = GET_EDIT_BY_ID_QUERY({
+          const { data, error } = useQuery(GET_EDIT_BY_ID_QUERY, {
             variables: { id },
           });
@@ -163,10 +163,13 @@ export const adminCrudEditGenerator = createGenerator({
             return data.QUERY_FIELD_NAME;
           }, [data]);
           `, {
-                                GET_EDIT_BY_ID_QUERY: editQueryInfo.hookExpression,
+                                GET_EDIT_BY_ID_QUERY: editQueryInfo.documentExpression,
                                 FORM_DATA_NAME: formDataExpression,
                                 QUERY_FIELD_NAME: editQueryInfo.fieldName,
-                            }, tsImportBuilder(['useMemo']).from('react')),
+                            }, [
+                                tsImportBuilder(['useMemo']).from('react'),
+                                tsImportBuilder(['useQuery']).from('@apollo/client'),
+                            ]),
                             loaderErrorName: 'error',
                             loaderValueName: 'initialData',
                         };
@@ -179,10 +182,10 @@ export const adminCrudEditGenerator = createGenerator({
                                 reactErrorImports,
                             },
                             variables: {
-                                TPL_ROUTE_VALUE: quot(`${routePrefix}/$id`),
+                                TPL_ROUTE_PATH: quot(`${routeFilePath}/$id`),
                                 TPL_COMPONENT_NAME: editPageName,
                                 TPL_EDIT_FORM: tsTemplate `<${editFormComponentExpression} submitData={submitData} initialData={initialData} ${inputLoaderExtraProps} />`,
-                                TPL_UPDATE_MUTATION: updateInfo.hookExpression,
+                                TPL_UPDATE_MUTATION: updateInfo.documentExpression,
                                 TPL_MUTATION_NAME: updateInfo.fieldName,
                                 TPL_FORM_DATA_NAME: formDataExpression,
                                 TPL_MODEL_NAME: titleizeCamel(modelName),