@postxl/generators 1.0.9 → 1.0.10
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.
- package/dist/frontend-trpc-client/generators/model-hook.generator.js +3 -11
- package/dist/frontend-trpc-client/generators/model-hook.generator.js.map +1 -1
- package/dist/frontend-trpc-client/trpc-client.generator.d.ts +1 -7
- package/dist/frontend-trpc-client/trpc-client.generator.js +1 -6
- package/dist/frontend-trpc-client/trpc-client.generator.js.map +1 -1
- package/package.json +1 -1
|
@@ -64,10 +64,6 @@ function generateModelHook({ model, context }) {
|
|
|
64
64
|
import { useMemo } from 'react'
|
|
65
65
|
${imports.generate()}
|
|
66
66
|
|
|
67
|
-
export type ${itemHook.type.name} = {
|
|
68
|
-
${itemHook.item.name}: ${model.types.name} | null
|
|
69
|
-
}
|
|
70
|
-
|
|
71
67
|
export type ${itemsHook.type.name} = {
|
|
72
68
|
${itemsHook.list.name}: ${model.types.name}[]
|
|
73
69
|
${itemsHook.map.name}: Map<${model.types.id.name}, ${model.types.name}>
|
|
@@ -77,16 +73,12 @@ export type ${itemsHook.type.name} = {
|
|
|
77
73
|
}
|
|
78
74
|
|
|
79
75
|
|
|
80
|
-
export const ${itemHook.name} = (id: ${model.types.id.name}):
|
|
76
|
+
export const ${itemHook.name} = (id: ${model.types.id.name} | null): ${model.types.name} | null => {
|
|
81
77
|
const trpc = ${context.trpcClient.name}()
|
|
82
78
|
|
|
83
|
-
const { data, isPending } = useQuery(trpc.${trpcRoute.name}.get.queryOptions(id))
|
|
79
|
+
const { data, isPending } = useQuery(trpc.${trpcRoute.name}.get.queryOptions(id!, { enabled: id !== null })) // NOSONAR
|
|
84
80
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
return {
|
|
88
|
-
${itemHook.item.name},
|
|
89
|
-
}
|
|
81
|
+
return useMemo((): ${model.types.name} | null => (isPending || !data) ? null : data, [data, isPending])
|
|
90
82
|
}
|
|
91
83
|
|
|
92
84
|
export const ${itemsHook.name} = (): ${itemsHook.type.name} => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-hook.generator.js","sourceRoot":"","sources":["../../../src/frontend-trpc-client/generators/model-hook.generator.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"model-hook.generator.js","sourceRoot":"","sources":["../../../src/frontend-trpc-client/generators/model-hook.generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,13 +18,7 @@ export type WithTrpcClient<Context> = Generator.ExtendContextAndModel<Context, {
|
|
|
18
18
|
/**
|
|
19
19
|
* Hook that provides access to one model entity (data and operations)
|
|
20
20
|
*/
|
|
21
|
-
itemHook: Generator.ImportableConstant
|
|
22
|
-
type: Generator.ImportableType;
|
|
23
|
-
/**
|
|
24
|
-
* Name of the hook that returns a model
|
|
25
|
-
*/
|
|
26
|
-
item: Generator.ImportableConstant;
|
|
27
|
-
};
|
|
21
|
+
itemHook: Generator.ImportableConstant;
|
|
28
22
|
/**
|
|
29
23
|
* Hook that provides access to all model entities
|
|
30
24
|
*/
|
|
@@ -94,12 +94,7 @@ function registerModel(model) {
|
|
|
94
94
|
const location = Generator.toBackendModuleLocation(`@hooks/use-${model._conjugated.kebabCasePlural}`);
|
|
95
95
|
return {
|
|
96
96
|
...model,
|
|
97
|
-
itemHook: {
|
|
98
|
-
name: Generator.toConstantName(`use${model._conjugated.PascalCase}`),
|
|
99
|
-
location,
|
|
100
|
-
type: { name: Generator.toTypeName(`${model._conjugated.PascalCase}Hook`), location },
|
|
101
|
-
item: { name: Generator.toConstantName(`get`), location },
|
|
102
|
-
},
|
|
97
|
+
itemHook: { name: Generator.toConstantName(`use${model._conjugated.PascalCase}`), location },
|
|
103
98
|
itemsHook: {
|
|
104
99
|
name: Generator.toConstantName(`use${model._conjugated.PascalCasePlural}`),
|
|
105
100
|
location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trpc-client.generator.js","sourceRoot":"","sources":["../../src/frontend-trpc-client/trpc-client.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAG9C,gEAA4F;AAC5F,sDAAyE;AACzE,kCAAmD;AACnD,oDAAoE;AACpE,oCAAsD;AAEtD,4EAAqE;AACrE,8EAAuE;
|
|
1
|
+
{"version":3,"file":"trpc-client.generator.js","sourceRoot":"","sources":["../../src/frontend-trpc-client/trpc-client.generator.ts"],"names":[],"mappings":"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"}
|