@common-stack/rollup-vite-utils 6.0.8-alpha.37 → 6.0.8-alpha.38

package/lib/tools/codegen/templates/common/src/configuration.ts.template

@@ -1,5 +1,5 @@
 import { IPreferences } from './generated/generated-models';
-import { FlattenWithFinite } from './types';
+import { FlattenKeys } from './types';
 
 export const enum ConfigurationTarget {
     /**
@@ -34,4 +34,4 @@ export const enum ConfigurationTarget {
     MACHINE_OVERRIDABLE,
 }
 
-export type IConfigurationsFlattenedKeys = FlattenWithFinite<IPreferences, 10, ''>;
+export type IConfigurationsFlattenedKeys = FlattenKeys<IPreferences>;

package/lib/tools/codegen/templates/common/src/types.ts.template

@@ -1,13 +1,12 @@
-export type GetFlattenedValue<
-  T,
-  K extends string
-> = K extends `${infer Prop}.${infer Rest}`
-  ? Prop extends keyof T
-    ? GetFlattenedValue<T[Prop], Rest>
-    : never
-  : K extends keyof T
-  ? T[K]
-  : never;
+export type GetFlattenedValue<T, K extends string> = K extends ''
+    ? T
+    : K extends `${infer Prop}.${infer Rest}`
+    ? Prop extends keyof T
+        ? GetFlattenedValue<T[Prop], Rest>
+        : never
+    : K extends keyof T
+    ? T[K]
+    : never;
 
 // Utility to limit recursion depth
 export type Flatten<T, Prefix extends string = '', Depth extends number = 30> = [Depth] extends [never] // Check if depth limit is reached
@@ -26,3 +25,18 @@ export type FlattenWithFinite<T, Depth extends number = 10, Prefix extends strin
               ? FlattenWithFinite<T[K], Depth extends 1 ? never : Depth extends 2 ? 1 : 2, `${Prefix}${K}.`>
               : `${Prefix}${K}`;
       }[keyof T & (string | number)];
+
+// Update the FlattenKeys type to handle circular references and add the empty key to return the entire preferences.
+export type FlattenKeys<T> =
+    | ''
+    | (T extends object
+          ? {
+                [K in keyof T]: T[K] extends object
+                    ? K extends string
+                        ? `${K}` | `${K}.${FlattenKeys<Omit<T[K], 'overrideOf'>>}`
+                        : never
+                    : K extends string
+                    ? `${K}`
+                    : never;
+            }[keyof T]
+          : never);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/rollup-vite-utils",
-    "version": "6.0.8-alpha.37",
+    "version": "6.0.8-alpha.38",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -56,7 +56,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d35ca66d58ef400304d37e106051970a70d11ed2",
+    "gitHead": "b5923dcd0bc3020fe2f6f4cbb0a49e61f277fa6e",
     "typescript": {
         "definition": "lib/index.d.ts"
     }