@kosdev-code/kos-codegen-core 0.1.0-next.739 → 3.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kosdev-code/kos-codegen-core",
-  "version": "0.1.0-next.739",
+  "version": "3.0.1",
   "type": "commonjs",
   "main": "./index.js",
   "module": "./index.mjs",
@@ -24,7 +24,7 @@
   },
   "kos": {
     "build": {
-      "gitHash": "506414d4f05f3f54f7eee18d876842eab1e33ed6"
+      "gitHash": "02d344d23282211e7c8aafcd4b805a0df779d028"
     }
   }
 }

package/templates/kos-hook/with-__nameDashCase__.tsx.template

@@ -11,24 +11,18 @@ interface Identifiable {
 }
 <% } %>
 
+type HoC<%= nameProperCase %>Props = <%= nameProperCase %>Props<% if (!singleton) { %> & Identifiable<% } %>;
 // react HOC to provide a <%= nameProperCase %> to a component
-export function with<%= nameProperCase %><T extends <%= nameProperCase %>Props<% if (!singleton) { %> & Identifiable<% } %>>(
+export function with<%= nameProperCase %><T extends HoC<%= nameProperCase %>Props = HoC<%= nameProperCase %>Props>(
   WrappedComponent: React.ComponentType<T>
 ) {
-  const ComponentWith<%= nameProperCase %> = (props: Omit<T, keyof <%= nameProperCase %>Props>) => {
+  return (props: Omit<T, keyof <%= nameProperCase %>Props>) => {
     const { model, status, KosModelLoader } = use<%= nameProperCase %>(<% if (!singleton) { %>props.id<% } %>);
 
     return (
       <KosModelLoader {...status}>
-        <WrappedComponent
-          {...(props as any)}
-          <%= nameCamelCase %>={model}
-        />
+        <WrappedComponent {...(props as T)} <%= nameCamelCase %>={model} />
       </KosModelLoader>
     );
   };
-
-  ComponentWith<%= nameProperCase %>.displayName = `With<%= nameProperCase %>(${WrappedComponent.displayName || WrappedComponent.name || "Component"})`;
-
-  return ComponentWith<%= nameProperCase %>;
-}
+}