@medyll/idae-machine 0.121.0 → 0.122.0

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/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/main/machineDb.d.ts

@@ -45,20 +45,6 @@ export type IDbForge = {
  */
 export declare class IDbBase {
     #private;
-    /**
-     * Public: Get the foreign keys (fks) object for a collection.
-     */
-    getCollectionTemplateFks(collection: TplCollectionName): {
-        [x: string]: {
-            code: string;
-            multiple: boolean;
-            rules: import("@medyll/idae-idbql").CombinedArgs;
-        } | undefined;
-    };
-    /**
-     * Public: Get the value of the index field for a given data object.
-     */
-    indexValue(collection: TplCollectionName, data: object): unknown;
     /**
      * The database model (schema) used for introspection.
      */
@@ -71,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.
      */
@@ -88,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.
      */
@@ -100,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;
@@ -124,19 +99,22 @@ 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;
-    constructor(collection: TplCollectionName, dbCollections: IDbBase);
-    getCollectionModelTemplate(): Tpl;
-    getCollectionModelTemplateFks(): {
-        [x: string]: {
-            code: string;
-            multiple: boolean;
-            rules: import("@medyll/idae-idbql").CombinedArgs;
-        } | undefined;
-    };
+    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>;

package/dist/main/machineDb.js

@@ -52,20 +52,6 @@ class IDbError extends Error {
  * Used for dynamic UI generation, validation, and schema-driven logic.
  */
 export class IDbBase {
-    /**
-     * Public: Get the foreign keys (fks) object for a collection.
-     */
-    getCollectionTemplateFks(collection) {
-        return this.getCollectionModelTemplateFks(collection);
-    }
-    /**
-     * Public: Get the value of the index field for a given data object.
-     */
-    indexValue(collection, data) {
-        const indexName = this.getIndexName(collection);
-        // @ts-ignore
-        return data && typeof data === 'object' && indexName && data[indexName];
-    }
     /**
      * The database model (schema) used for introspection.
      */
@@ -80,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.
@@ -107,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 = {};
@@ -149,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('.');
@@ -189,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: '' };
@@ -246,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) => {
@@ -257,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]) => {
@@ -286,23 +241,44 @@ 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;
-    constructor(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)];
     }
-    getCollectionModelTemplate() {
-        return this._dbCollections.getCollectionModelTemplate(this.collection);
+    getModelTemplate() {
+        return this.model['template'];
     }
-    getCollectionModelTemplateFks() {
-        return this._dbCollections.getCollectionModelTemplateFks(this.collection);
+    getModelTemplateFks() {
+        return this.model['template']?.fks;
     }
     getIndexName() {
-        return this._dbCollections.getIndexName(this.collection);
+        return this.getModelTemplate()?.index;
     }
     collectionValues() {
         return this._dbCollections.collectionValues(this.collection);
@@ -367,7 +343,7 @@ export class IDbCollectionValues {
     presentation(data) {
         try {
             this.#checkError(!this.#checkAccess(), 'Access denied', 'ACCESS_DENIED');
-            const presentation = this.idbBase.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
@@ -390,7 +366,7 @@ export class IDbCollectionValues {
     indexValue(data) {
         try {
             this.#checkError(!this.#checkAccess(), 'Access denied', 'ACCESS_DENIED');
-            const indexName = this.idbBase.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];
@@ -441,7 +417,7 @@ export class IDbCollectionValues {
         const fieldInfo = this.idbBase.parseCollectionFieldName(this.collectionName, fieldName);
         const fieldType = fieldInfo?.fieldType ?? '';
         const fieldArgs = fieldInfo?.fieldArgs?.join(' ') ?? '';
-        const indexName = this.idbBase.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]) : '',
@@ -712,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.121.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.174.0",
-    "@medyll/idae-idbql": "0.171.0"
+    "@medyll/idae-slotui-svelte": "0.175.0",
+    "@medyll/idae-idbql": "0.172.0"
   },
   "scripts": {
     "dev": "vite dev",