@medyll/idae-machine 0.122.0 → 0.124.0

package/dist/form/CollectionFks.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { IDbBase } from '../main/machineDb.js';
+	import { MachineDb } 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';
@@ -15,7 +15,7 @@
 	// idbqlState[fkCollection].get(fkId);
 
 	const dbFields = machine.collections;
-	const collections = new IDbBase(schemeModel);
+	const collections = new MachineDb(schemeModel);
 	const fks = $derived(collections.fks(collection));
 </script>
 

package/dist/form/CollectionListMenu.svelte

@@ -1,8 +1,8 @@
 <script lang="ts" generics="COL = Record<string,any>">
 	import { type MenuListProps, Button, MenuList, MenuListItem, openWindow, type Props } from '@medyll/idae-slotui-svelte';
 	import CreateUpdate from './CreateUpdate.svelte';
-	import { idbqlState } from '../db/dbSchema';
-	import { IDbBase, IDbCollectionValues } from '../db/dbFields';
+	import { idbqlState } from '../db/dbSchema.js';
+	import { MachineDb, IDbCollectionValues } from '../main/machineDb.js';
 	import { hydrate } from 'svelte';
 	import type { Where } from '@medyll/idae-idbql';
 
@@ -18,7 +18,7 @@
 
 	let { collection, target, data, menuListProps, onclick, style, where }: DataListMenuProps = $props();
 
-	let test = new IDbBase();
+	let test = new MachineDb();
 	let fieldValues = new IDbCollectionValues(collection);
 	let index = test.getIndexName(collection);
 

package/dist/form/CollectionReverseFks.svelte

@@ -14,7 +14,7 @@
     } 
  -->
 <script lang="ts">
-	import { IDbBase } from '../main/machineDb.js';
+	import { MachineDb } 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';
@@ -30,7 +30,7 @@
 		componentProps?: Record<string, any>;
 	};
 	let { collection, children: child, showTitle = false, component, componentProps = {} }: CollectionFksProps = $props();
-	const dbFields = new IDbBase(schemeModel);
+	const dbFields = new MachineDb(schemeModel);
 	const fks = $derived(dbFields.reverseFks(collection));
 
 	function getTitle() {

package/dist/main/machine.d.ts

@@ -24,7 +24,7 @@
  * // Access the IDBQL data model
  * const model = machine.idbqModel;
  */
-import { IDbBase } from './machineDb.js';
+import { MachineDb } from './machineDb.js';
 import { createIdbqDb, type IdbqModel } from '@medyll/idae-idbql';
 /**
  * Machine: main entry point for managing the IDBQL connection and centralized data access.
@@ -49,7 +49,7 @@ export declare class Machine {
     /**
      * Centralized access to schema and collection logic
      */
-    _idbbase: IDbBase;
+    _idbbase: MachineDb;
     /**
      * Database name
      */
@@ -80,7 +80,7 @@ export declare class Machine {
     /**
      * Get the IDbBase (schema logic) instance
      */
-    get collections(): IDbBase;
+    get collections(): MachineDb;
     /**
      * IDBQL (readonly) instance
      */

package/dist/main/machine.js

@@ -24,7 +24,7 @@
  * // Access the IDBQL data model
  * const model = machine.idbqModel;
  */
-import { IDbBase } from './machineDb.js';
+import { MachineDb } from './machineDb.js';
 import { createIdbqDb } from '@medyll/idae-idbql';
 /**
  * Machine: main entry point for managing the IDBQL connection and centralized data access.
@@ -86,7 +86,7 @@ export class Machine {
         if (!this._model) {
             throw new Error('Data model is not defined');
         }
-        this._idbbase = new IDbBase(this._model);
+        this._idbbase = new MachineDb(this._model);
     }
     createStore() {
         if (!this._model || !this._dbName || !this._version) {

package/dist/main/machineDb.d.ts

@@ -36,14 +36,14 @@ export type IDbForge = {
     fieldType?: IDbFieldType;
     fieldRule?: IDbFieldRules;
     fieldArgs?: IDbForgeArgs | undefined;
-    is: any;
+    is: unknown;
 };
 /**
  * Central class for parsing, introspecting, and extracting metadata from the database schema.
  * Provides methods to access collections, templates, fields, foreign keys, and type information.
  * Used for dynamic UI generation, validation, and schema-driven logic.
  */
-export declare class IDbBase {
+export declare class MachineDb {
     #private;
     /**
      * The database model (schema) used for introspection.
@@ -70,10 +70,6 @@ export declare class IDbBase {
      * Get an IDbCollectionFieldValues instance for a collection and data.
      */
     collectionFieldValues<T extends Record<string, any>>(collection: TplCollectionName, data: T): IDbCollectionFieldValues<T>;
-    /**
-     * Get an IDbCollectionFieldForge instance for a collection, field, and data.
-     */
-    collectionFieldForge<T extends Record<string, any>>(collection: TplCollectionName, fieldName: keyof T | string, data: T): IDbCollectionFieldForge<T>;
     /**
      * Get an IDbFormValidate instance for a collection name.
      */
@@ -105,18 +101,17 @@ export declare class IDbBase {
     private forge;
 }
 export declare class IDbCollection {
+    #private;
     collection: TplCollectionName;
-    _dbCollections: IDbBase;
-    model: IdbqModel["Collection"];
-    constructor(collection: TplCollectionName, dbCollections: IDbBase, model: IdbqModel);
-    getModel(): CollectionModel<Record<string, any>>;
-    getFields(): TplFields;
+    constructor(collectionName: TplCollectionName, idbBase: MachineDb, model: IdbqModel);
+    get model(): CollectionModel<Record<string, any>>;
+    get fields(): TplFields;
     getPresentation(): string;
     getFieldRule(fieldName: keyof TplFields): IDbFieldRules | undefined;
-    getModelTemplate(): Tpl;
+    getTemplate(): Tpl;
     getModelTemplateFks(): Tpl["fks"];
     getIndexName(): string;
-    collectionValues(): IDbCollectionValues<any>;
+    collectionValues(): IDbCollectionValues<Record<string, 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;
@@ -154,7 +149,7 @@ export declare class IDbCollectionValues<T extends Record<string, any>> {
     /**
      * The IDbBase instance used for schema introspection.
      */
-    idbBase: IDbBase;
+    idbBase: MachineDb;
     /**
      * The collection name this instance operates on.
      */
@@ -163,7 +158,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, idbBase?: IDbBase);
+    constructor(collectionName: TplCollectionName, idbBase?: MachineDb);
     presentation(data: Record<string, any>): string;
     /**
      * Get the value of the index field for a data object.
@@ -255,7 +250,7 @@ export declare class IDbFormValidate {
     #private;
     private collection;
     private idbCollections;
-    constructor(collection: TplCollectionName, idbCollections?: IDbBase);
+    constructor(collection: TplCollectionName, idbCollections?: MachineDb);
     validateField(fieldName: keyof TplFields, value: any): {
         isValid: boolean;
         error?: string;

package/dist/main/machineDb.js

@@ -51,11 +51,12 @@ class IDbError extends Error {
  * Provides methods to access collections, templates, fields, foreign keys, and type information.
  * Used for dynamic UI generation, validation, and schema-driven logic.
  */
-export class IDbBase {
+export class MachineDb {
     /**
      * The database model (schema) used for introspection.
      */
     model = schemeModel;
+    #idbCollectionsList = {};
     /**
      * Create a new IDbBase instance.
      * @param model Optional custom model to use (default: schemeModel)
@@ -67,13 +68,16 @@ export class IDbBase {
      * Get an IDbCollection instance for a collection name.
      */
     collection(collection) {
-        return new IDbCollection(collection, this, this.model);
+        if (!this.#idbCollectionsList[collection]) {
+            this.#idbCollectionsList[collection] = new IDbCollection(collection, this, this.model);
+        }
+        return this.#idbCollectionsList[collection];
     }
     /**
      * 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();
+        const indexName = this.collection(collection).getIndexName();
         return data && typeof data === 'object' && indexName && data[indexName];
     }
     /**
@@ -88,12 +92,6 @@ export class IDbBase {
     collectionFieldValues(collection, data) {
         return new IDbCollectionFieldValues(collection, data, this.collectionValues(collection));
     }
-    /**
-     * Get an IDbCollectionFieldForge instance for a collection, field, and data.
-     */
-    collectionFieldForge(collection, fieldName, data) {
-        return new IDbCollectionFieldForge(collection, fieldName, data, this.collectionValues(collection));
-    }
     /**
      * Get an IDbFormValidate instance for a collection name.
      */
@@ -104,7 +102,7 @@ export class IDbBase {
      * Parse all fields of a given collection.
      */
     parseRawCollection(collection) {
-        const fields = new IDbCollection(collection, this, this.model).getFields();
+        const fields = new IDbCollection(collection, this, this.model).fields;
         if (!fields)
             return;
         const out = {};
@@ -144,7 +142,7 @@ export class IDbBase {
     }
     getFkTemplateFields(string) {
         const [collection, field] = string.split('.');
-        return this.collection(collection).getModelTemplate()?.fields;
+        return this.collection(collection).getTemplate()?.fields;
     }
     testIs(what, fieldRule) {
         const typeMappings = { fk: 'fk-', array: 'array-of-', object: 'object-', primitive: '' };
@@ -248,55 +246,56 @@ export class IDbBase {
         return { collection, fieldName, fieldType, fieldRule, fieldArgs, is };
     }
 }
-/* Single collection relies on IDbBase */
+/* Single collection template 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)];
+    #template;
+    #machineDb;
+    #model;
+    constructor(collectionName, idbBase, model) {
+        this.collection = collectionName;
+        this.#machineDb = idbBase;
+        this.#model = model[String(collectionName)];
+        this.#template = this.#model['template'];
     }
-    getModel() {
-        return this.model;
+    get model() {
+        return this.#model;
     }
-    getFields() {
-        return this.getModelTemplate()?.fields;
+    get fields() {
+        return this.#template?.fields;
     }
     getPresentation() {
-        return this.getModelTemplate()?.presentation;
+        return this.#template?.presentation;
     }
     getFieldRule(fieldName) {
-        return this.getFields()?.[String(fieldName)];
+        return this.fields[String(fieldName)];
     }
-    getModelTemplate() {
-        return this.model['template'];
+    getTemplate() {
+        return this.#template;
     }
     getModelTemplateFks() {
-        return this.model['template']?.fks;
+        return this.#template?.fks;
     }
     getIndexName() {
-        return this.getModelTemplate()?.index;
+        return this.#template?.index;
     }
     collectionValues() {
-        return this._dbCollections.collectionValues(this.collection);
+        return new IDbCollectionValues(this.collection, this.#machineDb);
     }
     collectionFieldValues(data) {
-        return this._dbCollections.collectionFieldValues(this.collection, data);
+        return new IDbCollectionFieldValues(this.collection, data, this.collectionValues());
     }
     fieldForge(fieldName, data) {
-        return this._dbCollections.collectionFieldForge(this.collection, fieldName, data);
+        return new IDbCollectionFieldForge(this.collection, fieldName, data, this.collectionValues());
     }
     getFormValidate() {
-        return this._dbCollections.formValidate(this.collection);
+        return new IDbFormValidate(this.collection, this.#machineDb);
     }
     fks() {
-        return this._dbCollections.fks(this.collection);
+        return this.#machineDb.fks(this.collection);
     }
     reverseFks() {
-        return this._dbCollections.reverseFks(this.collection);
+        return this.#machineDb.reverseFks(this.collection);
     }
 }
 /**
@@ -338,7 +337,7 @@ export class IDbCollectionValues {
      */
     constructor(collectionName, idbBase) {
         this.collectionName = collectionName;
-        this.idbBase = idbBase ?? new IDbBase();
+        this.idbBase = idbBase ?? new MachineDb();
     }
     presentation(data) {
         try {
@@ -619,7 +618,7 @@ export class IDbFormValidate {
     idbCollections;
     constructor(collection, idbCollections) {
         this.collection = collection;
-        this.idbCollections = idbCollections ?? new IDbBase();
+        this.idbCollections = idbCollections ?? new MachineDb();
     }
     validateField(fieldName, value) {
         try {
@@ -688,7 +687,7 @@ export class IDbFormValidate {
         const errors = {};
         const invalidFields = [];
         let isValid = true;
-        const fields = this.idbCollections.collection(this.collection).getModelTemplate().fields;
+        const fields = this.idbCollections.collection(this.collection).getTemplate().fields;
         if (!fields) {
             return {
                 isValid: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medyll/idae-machine",
-  "version": "0.122.0",
+  "version": "0.124.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.175.0",
-    "@medyll/idae-idbql": "0.172.0"
+    "@medyll/idae-slotui-svelte": "0.177.0",
+    "@medyll/idae-idbql": "0.174.0"
   },
   "scripts": {
     "dev": "vite dev",