@kosdev-code/kos-codegen-core 3.0.22 → 3.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kosdev-code/kos-codegen-core",
-  "version": "3.0.22",
+  "version": "3.0.23",
   "type": "commonjs",
   "main": "./index.js",
   "module": "./index.mjs",
@@ -25,7 +25,7 @@
   },
   "kos": {
     "build": {
-      "gitHash": "b64d9a0431aa83daea7eba6b84d7b39db7d47ea9"
+      "gitHash": "78a2bbd25c176cfbcb4add6ee11dd660941657c2"
     }
   }
 }

package/templates/kos-container-model/model/__nameDashCase__-model.ts.template

@@ -11,12 +11,11 @@
 import type {
   IKosDataModel
 } from "../../../core/core/kosModel";
-<% if (singleton === false) { %>import type { KosModelRegistrationType } from "../../../core/core/registration/model-registration";
-<% } else { %>import type { SingletonKosModelRegistrationFactory } from "../../../core/core/registration/singleton-kos-model-registration-factory";
-<% } %>import type { IKosIdentifiable } from "../../../core/core/types";
+import type { KosRegistrationFor } from "../../../core/core/registration/model-registration";
+import type { IKosIdentifiable } from "../../../core/core/types";
 import type { PublicModelInterface } from "../../../core/types";
 <% } else { %>import { kosModel, kosContainerAware, type KosContainerAware } from "@kosdev-code/kos-ui-sdk";
-import  {   type <%= singleton === false ? "KosModelRegistrationType" : "SingletonKosModelRegistrationFactory" %>, IKosDataModel, IKosIdentifiable, PublicModelInterface, kosLoggerAware, type KosLoggerAware } from "@kosdev-code/kos-ui-sdk";<% } %>
+import  {   type KosRegistrationFor, IKosDataModel, IKosIdentifiable, PublicModelInterface, kosLoggerAware, type KosLoggerAware } from "@kosdev-code/kos-ui-sdk";<% } %>
 
 
 import type { <%= nameProperCase %>Options } from "./types";
@@ -30,19 +29,16 @@ export type <%= nameProperCase %>Model = PublicModelInterface<<%= nameProperCase
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface <%= nameProperCase %>ModelImpl extends KosLoggerAware, KosContainerAware<<%= modelNameProperCase %>Model> {}
 
-@kosModel({ modelTypeId: MODEL_TYPE, singleton: <%= singleton === false ? "false" : "true" %><% if (autoRegister) { %>, autoRegister: true<% } %> })
+// Flipping `singleton` here moves the Registration type with it.
+export const MODEL_CONFIG = { modelTypeId: MODEL_TYPE, singleton: <%= singleton === false ? "false" : "true" %><% if (autoRegister) { %>, autoRegister: true<% } %> } as const;
+
+@kosModel(MODEL_CONFIG)
 @kosContainerAware<<%= modelNameProperCase %>Model>()
 @kosLoggerAware()
 export class <%= nameProperCase %>ModelImpl implements IKosIdentifiable, IKosDataModel {
 
-    // Registration property for type safety - actual value injected by @kosModel
-    // decorator; the annotation must match the decorator's singleton flag (the
-    // decorator injects SingletonKosModelRegistrationFactory when singleton: true,
-    // KosModelRegistrationFactory when false).
-    static Registration: <%= singleton === false ? "KosModelRegistrationType" : "SingletonKosModelRegistrationFactory" %><
-      <%= nameProperCase %>Model,
-      <%= nameProperCase %>Options
-    >;
+    // Registration property for type safety - actual value injected by @kosModel decorator
+    static Registration: KosRegistrationFor<typeof MODEL_CONFIG, <%= nameProperCase %>Model, <%= nameProperCase %>Options>;
 
 
     id: string;