@medyll/idae-machine 0.120.0 → 0.122.0

package/dist/form/CollectionFks.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { IDbBase } from '../db/dbFields.js';
+	import { IDbBase } from '../main/machineDb.js';
 	import { schemeModel, idbqlState } from '../db/dbSchema.js';
 	import type { TplCollectionName, Where } from '@medyll/idae-idbql';
 	import { Looper } from '@medyll/idae-slotui-svelte';

package/dist/form/CollectionList.svelte

@@ -41,8 +41,8 @@ import {machine } from '../main/machine.js';
 
 	let collections = machine.collections;
 	let store = machine.store;
-	let fieldValues = machine.collections.get(collection).collectionValues() ;
-	let index = collections.get(collection).getIndexName();
+	let fieldValues = machine.collections.collection(collection).collectionValues() ;
+	let index = collections.collection(collection).getIndexName();
 
 	let qy = $derived(where ? store[collection].where(where) : store[collection].getAll());
 

package/dist/form/CollectionReverseFks.svelte

@@ -14,7 +14,7 @@
     } 
  -->
 <script lang="ts">
-	import { IDbBase } from '../db/dbFields.js';
+	import { IDbBase } from '../main/machineDb.js';
 	import { schemeModel, idbqlState } from '../db/dbSchema';
 	import type { Tpl, TplCollectionName, Where } from '@medyll/idae-idbql';
 	import { Looper } from '@medyll/idae-slotui-svelte';

package/dist/form/CreateUpdate.svelte

@@ -4,7 +4,7 @@
  -->
 
 <script lang="ts" generics="COL = Record<string,any>">
-	import {  IDbFormValidate } from '../db/dbFields.js'; 
+	import {  IDbFormValidate } from '../main/machineDb.js'; 
 	import type { CreateUpdateProps } from './types';
 	import CollectionReverseFks from './CollectionReverseFks.svelte';
 	import FieldInput from './FieldValue.svelte';

package/dist/form/FieldValue.svelte

@@ -34,8 +34,8 @@
 	data = data ?? ({} as COL);
 
 	// Initialisation des valeurs de champ de collection
-	const forge = machine.collections.get(collection).fieldForge(String(fieldName), data)  
-	let collectionFieldValues = machine.collections.get(collection).collectionValues() 
+	const forge = machine.collections.collection(collection).fieldForge(String(fieldName), data)  
+	let collectionFieldValues = machine.collections.collection(collection).collectionValues() 
 	let inputDataset = collectionFieldValues.getInputDataSet(fieldName, data);
 
 	// Création d'une instance de forge de champ de collection

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 export * from './types/appschemeTypes.js';
+export * from './main/machineDb.js';
+export * from './main/machineDb.spec.js';
 export * from './main/machine.js';
 export * from './main/machine.spec.js';
 export { default as Skeleton } from './fragments/Skeleton.svelte';
@@ -25,8 +27,6 @@ export * from './db/testDbSchema.js';
 export * from './db/dbSchema.js';
 export * from './db/dbSchema.spec.js';
 export * from './db/dbFormValidate.spec.js';
-export * from './db/dbFields.js';
-export * from './db/dbFields.spec.js';
 export * from './db/dbCollectionValues.spec.js';
 export * from './db/dbCollectionFieldValues.spec.js';
 export * from './db/dbCollectionFieldForge.spec.js';

package/dist/index.js

@@ -1,5 +1,7 @@
 // auto exports of entry components
 export * from './types/appschemeTypes.js';
+export * from './main/machineDb.js';
+export * from './main/machineDb.spec.js';
 export * from './main/machine.js';
 export * from './main/machine.spec.js';
 export { default as Skeleton } from './fragments/Skeleton.svelte';
@@ -26,8 +28,6 @@ export * from './db/testDbSchema.js';
 export * from './db/dbSchema.js';
 export * from './db/dbSchema.spec.js';
 export * from './db/dbFormValidate.spec.js';
-export * from './db/dbFields.js';
-export * from './db/dbFields.spec.js';
 export * from './db/dbCollectionValues.spec.js';
 export * from './db/dbCollectionFieldValues.spec.js';
 export * from './db/dbCollectionFieldForge.spec.js';

package/dist/main/machine.d.ts

@@ -24,14 +24,13 @@
  * // Access the IDBQL data model
  * const model = machine.idbqModel;
  */
-import { IDbBase } from '../db/dbFields.js';
+import { IDbBase } from './machineDb.js';
 import { createIdbqDb, type IdbqModel } from '@medyll/idae-idbql';
 /**
  * Machine: main entry point for managing the IDBQL connection and centralized data access.
  */
 export declare class Machine {
     /**
-  
      * IDBQL (readonly collections instance)
      */
     _idbql: ReturnType<ReturnType<typeof createIdbqDb>["create"]>["idbql"] | undefined;
@@ -50,7 +49,7 @@ export declare class Machine {
     /**
      * Centralized access to schema and collection logic
      */
-    _collections: IDbBase;
+    _idbbase: IDbBase;
     /**
      * Database name
      */
@@ -66,7 +65,7 @@ export declare class Machine {
     /**
      * Main constructor
      */
-    constructor();
+    constructor(dbName?: string, version?: number, model?: IdbqModel);
     init(options?: {
         dbName?: string;
         version?: number;
@@ -79,7 +78,7 @@ export declare class Machine {
     private createCollections;
     private createStore;
     /**
-     * Get the IDbCollections (schema logic) instance
+     * Get the IDbBase (schema logic) instance
      */
     get collections(): IDbBase;
     /**
@@ -87,9 +86,13 @@ export declare class Machine {
      */
     get idbql(): import("@medyll/idae-idbql").ReadonlyCollections<IdbqModel<Record<string, Record<string, any>>>> | undefined;
     /**
-     * IDBQL (stateful) instance
+     * IDBQL (stateful) instance , old name was idbqlState => store
      */
     get store(): import("@medyll/idae-idbql").StateCollections<IdbqModel<Record<string, Record<string, any>>>>;
+    /**
+     * Direct getter for idbqlState (for test compatibility)
+     */
+    get idbqlState(): import("@medyll/idae-idbql").StateCollections<IdbqModel<Record<string, Record<string, any>>>>;
     /**
      * IndexedDB (core) instance
      * @deprecated

package/dist/main/machine.js

@@ -24,14 +24,13 @@
  * // Access the IDBQL data model
  * const model = machine.idbqModel;
  */
-import { IDbBase } from '../db/dbFields.js';
+import { IDbBase } from './machineDb.js';
 import { createIdbqDb } from '@medyll/idae-idbql';
 /**
  * Machine: main entry point for managing the IDBQL connection and centralized data access.
  */
 export class Machine {
     /**
-  
      * IDBQL (readonly collections instance)
      */
     _idbql;
@@ -50,7 +49,7 @@ export class Machine {
     /**
      * Centralized access to schema and collection logic
      */
-    _collections;
+    _idbbase;
     /**
      * Database name
      */
@@ -66,7 +65,10 @@ export class Machine {
     /**
      * Main constructor
      */
-    constructor() {
+    constructor(dbName, version, model) {
+        this._dbName = dbName ?? '';
+        this._version = version ?? 1;
+        this._model = model ?? undefined;
     }
     init(options) {
         this._dbName = options?.dbName ?? this._dbName;
@@ -84,7 +86,7 @@ export class Machine {
         if (!this._model) {
             throw new Error('Data model is not defined');
         }
-        this._collections = new IDbBase(this._model);
+        this._idbbase = new IDbBase(this._model);
     }
     createStore() {
         if (!this._model || !this._dbName || !this._version) {
@@ -98,10 +100,10 @@ export class Machine {
         this._idbqModel = idbqModel;
     }
     /**
-     * Get the IDbCollections (schema logic) instance
+     * Get the IDbBase (schema logic) instance
      */
     get collections() {
-        return this._collections;
+        return this._idbbase;
     }
     /**
      * IDBQL (readonly) instance
@@ -110,11 +112,17 @@ export class Machine {
         return this._idbql;
     }
     /**
-     * IDBQL (stateful) instance
+     * IDBQL (stateful) instance , old name was idbqlState => store
      */
     get store() {
         return this._idbqlState;
     }
+    /**
+     * Direct getter for idbqlState (for test compatibility)
+     */
+    get idbqlState() {
+        return this._idbqlState;
+    }
     /**
      * IndexedDB (core) instance
      * @deprecated

package/dist/{db/dbFields.d.ts → main/machineDb.d.ts}

@@ -38,28 +38,6 @@ export type IDbForge = {
     fieldArgs?: IDbForgeArgs | undefined;
     is: any;
 };
-export declare class IDbCollection {
-    collection: TplCollectionName;
-    _dbCollections: IDbBase;
-    constructor(collection: TplCollectionName, dbCollections: IDbBase);
-    getCollectionModelTemplate(): Tpl;
-    getCollectionModelTemplateFks(): {
-        [x: string]: {
-            code: string;
-            multiple: boolean;
-            rules: import("@medyll/idae-idbql").CombinedArgs;
-        } | undefined;
-    };
-    getIndexName(): string;
-    collectionValues(): IDbCollectionValues<any>;
-    collectionFieldValues<T extends Record<string, any>>(data: T): IDbCollectionFieldValues<T>;
-    fieldForge<T extends Record<string, any>>(fieldName: keyof T, data: T): IDbCollectionFieldForge<T>;
-    getFormValidate(): IDbFormValidate;
-    fks(): {
-        [collection: string]: Tpl;
-    };
-    reverseFks(): Record<string, any>;
-}
 /**
  * Central class for parsing, introspecting, and extracting metadata from the database schema.
  * Provides methods to access collections, templates, fields, foreign keys, and type information.
@@ -79,7 +57,11 @@ export declare class IDbBase {
     /**
      * Get an IDbCollection instance for a collection name.
      */
-    get(collection: TplCollectionName): IDbCollection;
+    collection(collection: TplCollectionName): IDbCollection;
+    /**
+     * Public: Get the value of the index field for a given data object.
+     */
+    indexValue(collection: TplCollectionName, data: object): unknown;
     /**
      * Get an IDbCollectionValues instance for a collection name.
      */
@@ -96,10 +78,6 @@ export declare class IDbBase {
      * Get an IDbFormValidate instance for a collection name.
      */
     formValidate(collection: TplCollectionName): IDbFormValidate;
-    /**
-     * Parse all collections in the model and return their fields as IDbForge objects.
-     */
-    parseAllCollections(): Record<string, Record<string, IDbForge | undefined> | undefined>;
     /**
      * Parse all fields of a given collection.
      */
@@ -108,17 +86,6 @@ export declare class IDbBase {
      * Parse a single field of a collection and return its IDbForge metadata.
      */
     parseCollectionFieldName(collection: TplCollectionName, fieldName: keyof TplFields): IDbForge | undefined;
-    /**
-     * Internal helper to construct an IDbForge object from its components.
-     */
-    private forge;
-    getCollection(collection: TplCollectionName): CollectionModel;
-    getCollectionModel(collection: TplCollectionName): CollectionModel;
-    getCollectionModelTemplate(collection: TplCollectionName): Tpl;
-    getCollectionModelTemplateFks(collection: TplCollectionName): Tpl["fks"];
-    getIndexName(collection: TplCollectionName): string;
-    getCollectionTemplateFields(collection: TplCollectionName): TplFields;
-    getTemplatePresentation(collection: TplCollectionName): string;
     getFkFieldType(string: `${string}.${string}`): IDbFieldRules | undefined;
     getFkTemplateFields(string: `${string}.${string}`): {
         [x: string]: import("@medyll/idae-idbql").TplFieldRules;
@@ -132,6 +99,31 @@ export declare class IDbBase {
     reverseFks(targetCollection: TplCollectionName): Record<string, any>;
     iterateArrayField(collection: TplCollectionName, fieldName: keyof TplFields, data: any[]): IDbForge[];
     iterateObjectField(collection: TplCollectionName, fieldName: keyof TplFields, data: Record<string, any>): IDbForge[];
+    /**
+     * Internal helper to construct an IDbForge object from its components.
+     */
+    private forge;
+}
+export declare class IDbCollection {
+    collection: TplCollectionName;
+    _dbCollections: IDbBase;
+    model: IdbqModel["Collection"];
+    constructor(collection: TplCollectionName, dbCollections: IDbBase, model: IdbqModel);
+    getModel(): CollectionModel<Record<string, any>>;
+    getFields(): TplFields;
+    getPresentation(): string;
+    getFieldRule(fieldName: keyof TplFields): IDbFieldRules | undefined;
+    getModelTemplate(): Tpl;
+    getModelTemplateFks(): Tpl["fks"];
+    getIndexName(): string;
+    collectionValues(): IDbCollectionValues<any>;
+    collectionFieldValues<T extends Record<string, any>>(data: T): IDbCollectionFieldValues<T>;
+    fieldForge<T extends Record<string, any>>(fieldName: keyof T, data: T): IDbCollectionFieldForge<T>;
+    getFormValidate(): IDbFormValidate;
+    fks(): {
+        [collection: string]: Tpl;
+    };
+    reverseFks(): Record<string, any>;
 }
 /**
  * IDbCollectionValues
@@ -140,7 +132,7 @@ export declare class IDbBase {
  * It is designed for dynamic UI rendering, presentation logic, and metadata extraction for form generation in schema-driven applications.
  *
  * Main responsibilities:
- * - Holds a reference to the collection name and the schema (IDbCollections).
+ * - Holds a reference to the collection name and the schema (IDbBase).
  * - Provides methods to format field values according to their type (number, text, array, object, etc.).
  * - Supplies presentation logic for displaying records (e.g., presentation string, index value).
  * - Offers input attribute generation for forms (inputDataSet).
@@ -154,15 +146,15 @@ export declare class IDbBase {
  *   const formatted = values.format('name', agentData); // formatted field value
  *   const attrs = values.getInputDataSet('name', agentData); // input attributes for forms
  *
- * This class is typically used via IDbCollections.getCollectionValues for shared instance management.
+ * This class is typically used via IDbBase.getCollectionValues for shared instance management.
  * @template T - The type of the data object for the collection.
  */
 export declare class IDbCollectionValues<T extends Record<string, any>> {
     #private;
     /**
-     * The IDbCollections instance used for schema introspection.
+     * The IDbBase instance used for schema introspection.
      */
-    idbCollections: IDbBase;
+    idbBase: IDbBase;
     /**
      * The collection name this instance operates on.
      */
@@ -171,7 +163,7 @@ export declare class IDbCollectionValues<T extends Record<string, any>> {
      * Create a new IDbCollectionValues instance for a given collection.
      * @param collectionName The collection name.
      */
-    constructor(collectionName: TplCollectionName, idbCollections?: IDbBase);
+    constructor(collectionName: TplCollectionName, idbBase?: IDbBase);
     presentation(data: Record<string, any>): string;
     /**
      * Get the value of the index field for a data object.
@@ -241,7 +233,7 @@ export declare class IDbCollectionFieldValues<T extends Record<string, any>> {
  *   const inputType = forge.htmlInputType; // e.g. 'text', 'area', 'email', etc.
  *   const meta = forge.forge; // IDbForge metadata for the field
  *
- * This class is typically used via IDbCollections.getCollectionFieldForge for shared instance management.
+ * This class is typically used via IDbBase.getCollectionFieldForge for shared instance management.
  */
 export declare class IDbCollectionFieldForge<T extends Record<string, any>> {
     #private;

package/dist/{db/dbFields.js → main/machineDb.js}

@@ -1,7 +1,7 @@
 /*
     path: D:\boulot\python\wollama\src\lib\db\dbFields.ts
  */
-import { schemeModel } from './dbSchema.js';
+import { schemeModel } from '../db/dbSchema.js';
 export var enumPrimitive;
 (function (enumPrimitive) {
     enumPrimitive["id"] = "id";
@@ -46,42 +46,6 @@ class IDbError extends Error {
         }
     }
 }
-/* Single collection relies on IDbCollections */
-export class IDbCollection {
-    collection;
-    _dbCollections;
-    constructor(collection, dbCollections) {
-        this.collection = collection;
-        this._dbCollections = dbCollections;
-    }
-    getCollectionModelTemplate() {
-        return this._dbCollections.getCollectionModelTemplate(this.collection);
-    }
-    getCollectionModelTemplateFks() {
-        return this._dbCollections.getCollectionModelTemplateFks(this.collection);
-    }
-    getIndexName() {
-        return this._dbCollections.getIndexName(this.collection);
-    }
-    collectionValues() {
-        return this._dbCollections.collectionValues(this.collection);
-    }
-    collectionFieldValues(data) {
-        return this._dbCollections.collectionFieldValues(this.collection, data);
-    }
-    fieldForge(fieldName, data) {
-        return this._dbCollections.collectionFieldForge(this.collection, fieldName, data);
-    }
-    getFormValidate() {
-        return this._dbCollections.formValidate(this.collection);
-    }
-    fks() {
-        return this._dbCollections.fks(this.collection);
-    }
-    reverseFks() {
-        return this._dbCollections.reverseFks(this.collection);
-    }
-}
 /**
  * Central class for parsing, introspecting, and extracting metadata from the database schema.
  * Provides methods to access collections, templates, fields, foreign keys, and type information.
@@ -102,8 +66,15 @@ export class IDbBase {
     /**
      * Get an IDbCollection instance for a collection name.
      */
-    get(collection) {
-        return new IDbCollection(collection, this);
+    collection(collection) {
+        return new IDbCollection(collection, this, this.model);
+    }
+    /**
+     * Public: Get the value of the index field for a given data object.
+     */
+    indexValue(collection, data) {
+        const indexName = new IDbCollection(collection, this, this.model).getIndexName();
+        return data && typeof data === 'object' && indexName && data[indexName];
     }
     /**
      * Get an IDbCollectionValues instance for a collection name.
@@ -129,21 +100,11 @@ export class IDbBase {
     formValidate(collection) {
         return new IDbFormValidate(collection, this);
     }
-    /**
-     * Parse all collections in the model and return their fields as IDbForge objects.
-     */
-    parseAllCollections() {
-        let out = {};
-        Object.keys(this.model).forEach((collection) => {
-            out[collection] = this.parseRawCollection(collection);
-        });
-        return out;
-    }
     /**
      * Parse all fields of a given collection.
      */
     parseRawCollection(collection) {
-        const fields = this.getCollectionTemplateFields(collection);
+        const fields = new IDbCollection(collection, this, this.model).getFields();
         if (!fields)
             return;
         const out = {};
@@ -171,38 +132,10 @@ export class IDbBase {
         const fieldType = array ?? object ?? fk ?? primitive;
         return this.forge({ collection, fieldName, ...fieldType });
     }
-    /**
-     * Internal helper to construct an IDbForge object from its components.
-     */
-    forge({ collection, fieldName, fieldType, fieldRule, fieldArgs, is }) {
-        return { collection, fieldName, fieldType, fieldRule, fieldArgs, is };
-    }
-    #getModel() {
-        return this.model;
-    }
-    getCollection(collection) {
-        return this.#getModel()[String(collection)];
-    }
-    getCollectionModel(collection) {
-        return this.#getModel()[String(collection)];
-    }
-    getCollectionModelTemplate(collection) {
-        return this.getCollectionModel(collection)['template'];
-    }
-    getCollectionModelTemplateFks(collection) {
-        return this.getCollectionModel(collection)['template']?.fks;
-    }
-    getIndexName(collection) {
-        return this.getCollectionModel(collection)?.template?.index;
-    }
-    getCollectionTemplateFields(collection) {
-        return this.getCollectionModelTemplate(collection)?.fields;
-    }
-    getTemplatePresentation(collection) {
-        return this.getCollectionModelTemplate(collection)?.presentation;
-    }
+    // Toutes ces méthodes sont maintenant dans IDbCollection
     #getTemplateFieldRule(collection, fieldName) {
-        return this.getCollectionTemplateFields(collection)?.[String(fieldName)];
+        // Utilise la nouvelle API orientée collection
+        return new IDbCollection(collection, this, this.model).getFieldRule(fieldName);
     }
     getFkFieldType(string) {
         const [collection, field] = string.split('.');
@@ -211,7 +144,7 @@ export class IDbBase {
     }
     getFkTemplateFields(string) {
         const [collection, field] = string.split('.');
-        return this.getCollectionModel(collection).template?.fields;
+        return this.collection(collection).getModelTemplate()?.fields;
     }
     testIs(what, fieldRule) {
         const typeMappings = { fk: 'fk-', array: 'array-of-', object: 'object-', primitive: '' };
@@ -268,7 +201,7 @@ export class IDbBase {
         return { fieldType, fieldRule, fieldArgs, is: type };
     }
     fks(collection) {
-        let fks = this.getCollectionModelTemplateFks(collection);
+        let fks = this.collection(collection).getModelTemplateFks();
         let out = {};
         if (fks) {
             Object.keys(fks).forEach((collection) => {
@@ -279,7 +212,7 @@ export class IDbBase {
     }
     reverseFks(targetCollection) {
         const result = {};
-        Object.entries(this.#getModel()).forEach(([collectionName, collectionModel]) => {
+        Object.entries(this.model).forEach(([collectionName, collectionModel]) => {
             const template = collectionModel.template;
             if (template && template.fks) {
                 Object.entries(template.fks).forEach(([fkName, fkConfig]) => {
@@ -308,6 +241,63 @@ export class IDbBase {
         }
         return Object.keys(data).map((key) => ({ ...fieldInfo, fieldName: `${String(fieldName)}.${key}` }));
     }
+    /**
+     * Internal helper to construct an IDbForge object from its components.
+     */
+    forge({ collection, fieldName, fieldType, fieldRule, fieldArgs, is }) {
+        return { collection, fieldName, fieldType, fieldRule, fieldArgs, is };
+    }
+}
+/* Single collection relies on IDbBase */
+export class IDbCollection {
+    // --- NOUVELLES MÉTHODES MIGRÉES DE IDbBase ---
+    collection;
+    _dbCollections;
+    model;
+    constructor(collection, dbCollections, model) {
+        this.collection = collection;
+        this._dbCollections = dbCollections;
+        this.model = model[String(collection)];
+    }
+    getModel() {
+        return this.model;
+    }
+    getFields() {
+        return this.getModelTemplate()?.fields;
+    }
+    getPresentation() {
+        return this.getModelTemplate()?.presentation;
+    }
+    getFieldRule(fieldName) {
+        return this.getFields()?.[String(fieldName)];
+    }
+    getModelTemplate() {
+        return this.model['template'];
+    }
+    getModelTemplateFks() {
+        return this.model['template']?.fks;
+    }
+    getIndexName() {
+        return this.getModelTemplate()?.index;
+    }
+    collectionValues() {
+        return this._dbCollections.collectionValues(this.collection);
+    }
+    collectionFieldValues(data) {
+        return this._dbCollections.collectionFieldValues(this.collection, data);
+    }
+    fieldForge(fieldName, data) {
+        return this._dbCollections.collectionFieldForge(this.collection, fieldName, data);
+    }
+    getFormValidate() {
+        return this._dbCollections.formValidate(this.collection);
+    }
+    fks() {
+        return this._dbCollections.fks(this.collection);
+    }
+    reverseFks() {
+        return this._dbCollections.reverseFks(this.collection);
+    }
 }
 /**
  * IDbCollectionValues
@@ -316,7 +306,7 @@ export class IDbBase {
  * It is designed for dynamic UI rendering, presentation logic, and metadata extraction for form generation in schema-driven applications.
  *
  * Main responsibilities:
- * - Holds a reference to the collection name and the schema (IDbCollections).
+ * - Holds a reference to the collection name and the schema (IDbBase).
  * - Provides methods to format field values according to their type (number, text, array, object, etc.).
  * - Supplies presentation logic for displaying records (e.g., presentation string, index value).
  * - Offers input attribute generation for forms (inputDataSet).
@@ -330,14 +320,14 @@ export class IDbBase {
  *   const formatted = values.format('name', agentData); // formatted field value
  *   const attrs = values.getInputDataSet('name', agentData); // input attributes for forms
  *
- * This class is typically used via IDbCollections.getCollectionValues for shared instance management.
+ * This class is typically used via IDbBase.getCollectionValues for shared instance management.
  * @template T - The type of the data object for the collection.
  */
 export class IDbCollectionValues {
     /**
-     * The IDbCollections instance used for schema introspection.
+     * The IDbBase instance used for schema introspection.
      */
-    idbCollections;
+    idbBase;
     /**
      * The collection name this instance operates on.
      */
@@ -346,14 +336,14 @@ export class IDbCollectionValues {
      * Create a new IDbCollectionValues instance for a given collection.
      * @param collectionName The collection name.
      */
-    constructor(collectionName, idbCollections) {
+    constructor(collectionName, idbBase) {
         this.collectionName = collectionName;
-        this.idbCollections = idbCollections ?? new IDbBase();
+        this.idbBase = idbBase ?? new IDbBase();
     }
     presentation(data) {
         try {
             this.#checkError(!this.#checkAccess(), 'Access denied', 'ACCESS_DENIED');
-            const presentation = this.idbCollections.getTemplatePresentation(this.collectionName);
+            const presentation = this.idbBase.collection(this.collectionName).getPresentation();
             this.#checkError(!presentation, 'Presentation template not found', 'TEMPLATE_NOT_FOUND');
             const fields = presentation.split(' ');
             return fields
@@ -376,7 +366,7 @@ export class IDbCollectionValues {
     indexValue(data) {
         try {
             this.#checkError(!this.#checkAccess(), 'Access denied', 'ACCESS_DENIED');
-            const indexName = this.idbCollections.getIndexName(this.collectionName);
+            const indexName = this.idbBase.collection(this.collectionName).getIndexName();
             this.#checkError(!indexName, 'Index not found for collection', 'INDEX_NOT_FOUND');
             this.#checkError(!(indexName in data), `Index field ${indexName} not found in data`, 'FIELD_NOT_FOUND');
             return data[indexName];
@@ -396,7 +386,7 @@ export class IDbCollectionValues {
         try {
             this.#checkError(!this.#checkAccess(), 'Access denied', 'ACCESS_DENIED');
             this.#checkError(!(fieldName in data), `Field ${String(fieldName)} not found in data`, 'FIELD_NOT_FOUND');
-            const fieldInfo = this.idbCollections.parseCollectionFieldName(this.collectionName, fieldName);
+            const fieldInfo = this.idbBase.parseCollectionFieldName(this.collectionName, fieldName);
             this.#checkError(!fieldInfo, `Field ${String(fieldName)} not found in collection`, 'FIELD_NOT_FOUND');
             switch (fieldInfo?.fieldType) {
                 case 'number':
@@ -424,10 +414,10 @@ export class IDbCollectionValues {
      * @returns An object with data-* attributes for the field.
      */
     getInputDataSet(fieldName, data) {
-        const fieldInfo = this.idbCollections.parseCollectionFieldName(this.collectionName, fieldName);
+        const fieldInfo = this.idbBase.parseCollectionFieldName(this.collectionName, fieldName);
         const fieldType = fieldInfo?.fieldType ?? '';
         const fieldArgs = fieldInfo?.fieldArgs?.join(' ') ?? '';
-        const indexName = this.idbCollections.getIndexName(this.collectionName);
+        const indexName = this.idbBase.collection(this.collectionName).getIndexName();
         return {
             'data-collection': this.collectionName,
             'data-collectionId': indexName && data?.[indexName] !== undefined ? String(data?.[indexName]) : '',
@@ -443,7 +433,7 @@ export class IDbCollectionValues {
      * @returns An array of IDbForge objects.
      */
     iterateArrayField(fieldName, data) {
-        return this.idbCollections.iterateArrayField(this.collectionName, fieldName, data);
+        return this.idbBase.iterateArrayField(this.collectionName, fieldName, data);
     }
     /**
      * Iterate over an object field and return an array of IDbForge objects for each property.
@@ -452,7 +442,7 @@ export class IDbCollectionValues {
      * @returns An array of IDbForge objects.
      */
     iterateObjectField(fieldName, data) {
-        return this.idbCollections.iterateObjectField(this.collectionName, fieldName, data);
+        return this.idbBase.iterateObjectField(this.collectionName, fieldName, data);
     }
     /**
      * Internal: Format a number field for display.
@@ -477,8 +467,9 @@ export class IDbCollectionValues {
             'text-long': 40,
             'text-giant': 50
         };
-        const maxLength = lengths[type] || value.length;
-        return value.substring(0, maxLength);
+        const str = typeof value === 'string' ? value : String(value ?? '');
+        const maxLength = lengths[type] || str.length;
+        return str.substring(0, maxLength);
     }
     /**
      * Internal: Check if access is allowed (override for custom logic).
@@ -509,7 +500,7 @@ export class IDbCollectionFieldValues {
  * @param fieldName The field name to introspect.
  */
     getForge(fieldName) {
-        return this.#collectionValues.idbCollections.parseCollectionFieldName(this.#collection, String(fieldName));
+        return this.#collectionValues.idbBase.parseCollectionFieldName(this.#collection, String(fieldName));
     }
     constructor(collection, data, collectionValues) {
         this.#collection = collection;
@@ -517,7 +508,7 @@ export class IDbCollectionFieldValues {
         this.#data = data;
     }
     format(fieldName) {
-        const fieldInfo = this.#collectionValues.idbCollections.parseCollectionFieldName(this.#collection, fieldName);
+        const fieldInfo = this.#collectionValues.idbBase.parseCollectionFieldName(this.#collection, fieldName);
         if (fieldInfo?.is === 'array') {
             return this.iterateArray(String(fieldName), this.#data);
         }
@@ -560,14 +551,13 @@ export class IDbCollectionFieldValues {
  *   const inputType = forge.htmlInputType; // e.g. 'text', 'area', 'email', etc.
  *   const meta = forge.forge; // IDbForge metadata for the field
  *
- * This class is typically used via IDbCollections.getCollectionFieldForge for shared instance management.
+ * This class is typically used via IDbBase.getCollectionFieldForge for shared instance management.
  */
 export class IDbCollectionFieldForge {
     #collection;
     #collectionValues;
     #fieldName;
     #data;
-    #forge;
     constructor(collection, fieldName, data, collectionValues) {
         this.#collection = collection;
         this.#collectionValues = collectionValues ?? new IDbCollectionValues(collection);
@@ -582,7 +572,7 @@ export class IDbCollectionFieldForge {
     }
     // renamed from parseCollectionFieldName
     get forge() {
-        return this.#collectionValues.idbCollections.parseCollectionFieldName(this.#collection, String(this.#fieldName));
+        return this.#collectionValues.idbBase.parseCollectionFieldName(this.#collection, String(this.#fieldName));
     }
     get fieldArgs() {
         return this.forge?.fieldArgs;
@@ -698,7 +688,7 @@ export class IDbFormValidate {
         const errors = {};
         const invalidFields = [];
         let isValid = true;
-        const fields = this.idbCollections.getCollectionTemplateFields(this.collection);
+        const fields = this.idbCollections.collection(this.collection).getModelTemplate().fields;
         if (!fields) {
             return {
                 isValid: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medyll/idae-machine",
-  "version": "0.120.0",
+  "version": "0.122.0",
   "files": [
     "dist",
     "!dist/**/*.test.*",
@@ -49,8 +49,8 @@
   "scope": "@medyll",
   "dependencies": {
     "@huggingface/prettier-plugin-vertical-align": "^0.2.3",
-    "@medyll/idae-slotui-svelte": "0.173.0",
-    "@medyll/idae-idbql": "0.170.0"
+    "@medyll/idae-slotui-svelte": "0.175.0",
+    "@medyll/idae-idbql": "0.172.0"
   },
   "scripts": {
     "dev": "vite dev",