@postxl/generator 0.31.0 → 0.32.0

package/dist/generators/models/react.generator/context.generator.js

@@ -8,8 +8,6 @@ const string_1 = require("../../../lib/utils/string");
  */
 function generateModelContext({ model, meta }) {
     const queryName = (0, string_1.toCamelCase)(model.name);
-    // NOTE: Reference name is not used outside of this file, that's why it's local.
-    const contextReferenceName = `${(0, string_1.toPascalCase)(model.name)}Context`;
     const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addImport({
         items: [model.typeName, model.brandedIdType],
         from: meta.types.importPath,
@@ -19,51 +17,36 @@ function generateModelContext({ model, meta }) {
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import React, { useMemo } from 'react'
 
-import { createUseContext } from '@lib/react'
 import { trpc } from '@lib/trpc'
 import { filterMap, mapMap } from '@lib/utils'
 
 ${imports.generate()}
 
-type Context = {
+type ProviderHookType = {
 	ready: boolean
 	map: ${resultMapTypeDefinition}
 	list: ${model.typeName}[]
 }
 
-const ReactContext = React.createContext<Context | null>(null)
-
 /**
- * Context provider to fetch the ${meta.userFriendlyName} data and use it in componenets.
+ * A React utility hook to access the model data in the generated forms.
  */
-export const ${meta.react.context.contextProviderName} = ({ children }: React.PropsWithChildren) => {
+export const ${meta.react.context.hookFnName} = (): ProviderHookType => {
 	const ${queryName} = trpc.${meta.trpc.getMap.reactQueryMethod}.useQuery()
 
-	const context = useMemo<Context>(() => {
+	const value = useMemo<ProviderHookType>(() => {
 		const data: ${resultMapTypeDefinition} = ${queryName}.data ?? new ${resultMapTypeDefinition}()
 
 		return {
 			ready: ${queryName}.isLoading === false,
 			map: data,
-			list: [...data.values()]
+			list: Array.from(data.values())
 		}
 	}, [${queryName}.isLoading, ${queryName}.data])
 
-	return <ReactContext.Provider value={context}>{children}</ReactContext.Provider>
-}
-
-export const ${meta.react.context.testContextProviderName} = ({ 
-	value, 
-	children 
-}: React.PropsWithChildren<{ value: Context }>) => {
-	return <ReactContext.Provider value={value}>{children}</ReactContext.Provider>
+	return value
 }
 
-/**
- * A React hook to access the model data.
- */
-export const ${meta.react.context.hookFnName} = createUseContext(ReactContext, "${contextReferenceName}")
-
 /**
  * Returns a single instance of the model if the data is ready.
  */

package/dist/generators/models/react.generator/library.generator.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateModelLibraryComponents = void 0;
-const meta_1 = require("../../../lib/meta");
-const fields_1 = require("../../../lib/schema/fields");
 const imports_1 = require("../../../lib/imports");
 /**
  * Generates components that may be used to list all entries of a given data type.
@@ -21,18 +19,6 @@ function generateModelLibraryComponents({ model, meta }) {
         items: [context.hookFnName, components.modals.editComponentName, components.modals.deleteComponentName],
         from: meta.react.folderPath,
     });
-    for (const relation of (0, fields_1.getRelationFields)(model)) {
-        const refMeta = (0, meta_1.getModelMetadata)({ model: relation.relationToModel });
-        imports.addImport({
-            items: [refMeta.react.context.contextProviderName],
-            from: refMeta.react.folderPath,
-        });
-    }
-    const reactContextProvidersOfDependencies = new Set();
-    for (const relation of (0, fields_1.getRelationFields)(model)) {
-        const refMeta = (0, meta_1.getModelMetadata)({ model: relation.relationToModel });
-        reactContextProvidersOfDependencies.add(refMeta.react.context.contextProviderName);
-    }
     return `
     import React, { useState } from 'react'
 
@@ -81,16 +67,11 @@ function generateModelLibraryComponents({ model, meta }) {
               ]}
             />
             
-            ${nestChildrenInComponents({
-        child: `
-                <${components.modals.editComponentName} 
-                  data={item} 
-                  show={isEditModalOpen} 
-                  onHide={() => setIsEditModalOpen(false)} 
-                />
-              `,
-        components: reactContextProvidersOfDependencies,
-    })}
+            <${components.modals.editComponentName} 
+              data={item} 
+              show={isEditModalOpen} 
+              onHide={() => setIsEditModalOpen(false)} 
+            />
 
             <${components.modals.deleteComponentName} 
               id={item.id} 
@@ -106,27 +87,3 @@ function generateModelLibraryComponents({ model, meta }) {
   `;
 }
 exports.generateModelLibraryComponents = generateModelLibraryComponents;
-/**
- * Deterministifcally nests a given React component in an array of parent wrappers.
- */
-function nestChildrenInComponents({ child, components }) {
-    if (components.size === 0) {
-        return child;
-    }
-    const sortedComponents = [...components.values()].sort((a, b) => a.localeCompare(b));
-    return _nestInComponents({ child, components: sortedComponents });
-}
-/**
- * DO NOT USE THIS FUNCTION DIRECTLY. Use `nestChildrenInComponents` instead.
- */
-function _nestInComponents({ child, components }) {
-    if (components.length === 0) {
-        return child;
-    }
-    const [parent, ...rest] = components;
-    return `
-    <${parent}>
-      ${_nestInComponents({ child, components: rest })}
-    </${parent}>
-  `;
-}

package/dist/lib/meta.d.ts

@@ -340,14 +340,6 @@ export type ModelMetaData = {
              * Name of the function that may be used to get a single instance of this model (e.g. `useAggregation`).
              */
             instanceGetterHookFnName: Types.Fnction;
-            /**
-             * Name of the context wrapper.
-             */
-            testContextProviderName: Types.VariableName;
-            /**
-             * Name of the context wrapper for this model.
-             */
-            contextProviderName: Types.VariableName;
         };
         /**
          * Names of React components that should be generated for this model.

package/dist/lib/meta.js

@@ -134,8 +134,6 @@ function getModelMetadata({ model }) {
             context: {
                 hookFnName: Types.toFunction(`use${PascalCase}Context`),
                 instanceGetterHookFnName: Types.toFunction(`use${PascalCase}`),
-                testContextProviderName: Types.toVariableName(`${PascalCase}TestContextProvider`),
-                contextProviderName: Types.toVariableName(`${PascalCase}Provider`),
             },
             components: {
                 modals: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {