@communecter/cocolight-api-client 1.0.128 → 1.0.130

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@communecter/cocolight-api-client",
-    "version": "1.0.128",
+    "version": "1.0.130",
     "description": "Client Axios simplifié pour l'API cocolight",
     "repository": {
         "type": "git",

package/src/Api.ts

@@ -167,7 +167,7 @@ export default class Api {
    */
   async project(projectData: EntityData): Promise<Project> {
     try {
-      const project = new Project(this._client, projectData, { EndpointApi, User, Organization, Event, Poi, Badge, News, Comment, Classified, Action });
+      const project = new Project(this._client, projectData, { EndpointApi, User, Organization, Event, Poi, Badge, News, Comment, Answer, Classified, Action });
       if (!projectData.id && !projectData.slug) {
         throw new Error("Vous devez fournir un id ou un slug pour créer une instance Project.");
       }

package/src/api/BaseEntity.ts

@@ -4835,11 +4835,22 @@ export class BaseEntity<TServerData = any> {
       ...(result.projects && {
         projects: (result.projects as FundingEnvelopeProjectItem[]).map((envelope) => {
           const inner = envelope?.project as { collection?: string } | undefined;
+          let linked: AnyEntity | object | undefined = envelope.project;
           if (inner && typeof inner === "object") {
-            const linked = this._linkEntity(inner.collection ?? "projects", inner);
-            return { ...envelope, project: linked ?? envelope.project };
+            linked = this._linkEntity(inner.collection ?? "projects", inner) ?? envelope.project;
           }
-          return envelope;
+
+          // Linker les actions imbriquées avec le Project linké comme parent sémantique.
+          // (action.parent === Project → save/refresh/isContributor cohérents)
+          const sd = (envelope as { serverData?: { actions?: unknown[] } }).serverData;
+          if (sd?.actions && Array.isArray(sd.actions)
+              && linked && typeof (linked as BaseEntity)._linkEntity === "function") {
+            sd.actions = sd.actions.map((action) =>
+              (linked as BaseEntity)._linkEntity("actions", action as object) ?? action
+            );
+          }
+
+          return { ...envelope, project: linked };
         })
       }),
       ...(result.userOrga && { userOrga: this._linkEntities(Object.values(result.userOrga)) ?? result.userOrga })

package/src/api/EndpointApi.types.ts

@@ -1651,8 +1651,13 @@ export interface GetMembersNoAdminData {
   name?: string;
   /**
    * Types d'entités à inclure dans la recherche
+   *
+   * @minItems 1
    */
-  searchType: ("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[];
+  searchType: [
+    "citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative",
+    ...("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[]
+  ];
   /**
    * Critère de recherche (actuellement vide)
    */
@@ -1726,8 +1731,13 @@ export interface GetMembersAdminData {
   name?: string;
   /**
    * Types d'entités à inclure dans la recherche
+   *
+   * @minItems 1
    */
-  searchType: ("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[];
+  searchType: [
+    "citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative",
+    ...("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[]
+  ];
   /**
    * Critère de recherche (actuellement vide)
    */
@@ -2193,8 +2203,13 @@ export interface GetContributorsNoAdminData {
   name?: string;
   /**
    * Types d'entités à inclure dans la recherche
+   *
+   * @minItems 1
    */
-  searchType: ("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[];
+  searchType: [
+    "citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative",
+    ...("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[]
+  ];
   /**
    * Critère de recherche (actuellement vide)
    */
@@ -2268,8 +2283,13 @@ export interface GetContributorsAdminData {
   name?: string;
   /**
    * Types d'entités à inclure dans la recherche
+   *
+   * @minItems 1
    */
-  searchType: ("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[];
+  searchType: [
+    "citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative",
+    ...("citoyens" | "NGO" | "LocalBusiness" | "Group" | "GovernmentOrganization" | "Cooperative")[]
+  ];
   /**
    * Critère de recherche (actuellement vide)
    */

package/src/api/EntityRegistry.ts

@@ -98,6 +98,49 @@ export function fromEntityJSON(json: unknown, parent: ApiClient | BaseEntity | n
   return meta.entityClass.fromJSON(json, actualParent, meta.deps);
 }
 
+/**
+ * Walker récursif : parcourt un objet/tableau et ressuscite toutes les entités
+ * sérialisées (marqueurs `__isSerializedEntity` / `__entityTag`) rencontrées.
+ *
+ * Pensé pour les wrappers non-entité retournés par certains endpoints (ex: `fundingEnvelope`)
+ * ou pour réhydrater un état côté client après un transfert JSON (SSR, cache restore).
+ *
+ * Dates, RegExp et primitives sont préservées. Pour les entités, la chaîne de parents
+ * est reconstruite automatiquement depuis les méta embarquées par `toJSON()`.
+ *
+ * @param obj - L'objet à parcourir (wrapper, array, primitive…)
+ * @param parent - Parent racine (typiquement l'ApiClient côté client)
+ * @returns L'objet avec toutes les entités revived
+ *
+ * @example
+ * // Côté client SSR : revive l'état dehydraté
+ * const apiClient = new ApiClient({ baseURL });
+ * const envelope = reviveEntities(window.__INIT__.envelope, apiClient);
+ * envelope.projects[0].serverData.actions[0]; // Action instance
+ */
+export function reviveEntities<T = unknown>(
+  obj: unknown,
+  parent: ApiClient | BaseEntity | null = null
+): T {
+  if (obj === null || obj === undefined) return obj as T;
+  if (typeof obj !== "object") return obj as T;
+  if (obj instanceof Date || obj instanceof RegExp) return obj as T;
+
+  if (isEntityJSON(obj)) {
+    return fromEntityJSON(obj, parent) as T;
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.map(item => reviveEntities(item, parent)) as T;
+  }
+
+  const result: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(obj as object)) {
+    result[key] = reviveEntities(value, parent);
+  }
+  return result as T;
+}
+
 /**
  * Mappe un EntityTag vers son CollectionKey correspondant.
  */

package/src/api/Organization.ts

@@ -322,8 +322,12 @@ export class Organization extends BaseEntity<OrganizationItemNormalized> {
    * 
    * // Récupérer les membres en attente de validation pour être admin
    * const adminPendingMembers = await organization.getMembers({}, { isAdminPending: true });
-   * 
-   * 
+   *
+   * // Restreindre la recherche : uniquement les citoyens
+   * const onlyCitoyens = await organization.getMembers({}, { searchType: "citoyens" });
+   *
+   * // Restreindre la recherche : uniquement les organisations
+   * const onlyOrgas = await organization.getMembers({}, { searchType: "organizations" });
    */
   async getMembers(
     data: Partial<GetMembersAdminData | GetMembersNoAdminData> = {},
@@ -333,6 +337,7 @@ export class Organization extends BaseEntity<OrganizationItemNormalized> {
       isAdminPending?: boolean;
       isInviting?: boolean;
       roles?: any[];
+      searchType?: "all" | "citoyens" | "organizations";
       restoredState?: PaginatorState;
     } = {}
   ): Promise<PaginatorPage<User | Organization>> {
@@ -344,8 +349,14 @@ export class Organization extends BaseEntity<OrganizationItemNormalized> {
     /** « Snapshot » local, typé string */
     const orgId = this.id as string;
 
-    data.searchType = this._getDefaultFromEndpoint("GET_MEMBERS_ADMIN", "searchType") as GetMembersAdminData["searchType"];
-    // data.searchBy = "ALL";
+    const allTypes = this._getDefaultFromEndpoint("GET_MEMBERS_ADMIN", "searchType") as GetMembersAdminData["searchType"];
+    if (options.searchType === "citoyens") {
+      data.searchType = ["citoyens"];
+    } else if (options.searchType === "organizations") {
+      data.searchType = allTypes.filter(t => t !== "citoyens") as GetMembersAdminData["searchType"];
+    } else {
+      data.searchType = allTypes;
+    }
 
     const paginator = this._createPaginatorEngine({
       initialData: data,

package/src/api/Project.ts

@@ -232,6 +232,11 @@ export class Project extends BaseEntity<ProjectItemNormalized> {
    * // Récupérer les contributeurs en attente d'invitation
    * const invitingContributors = await project.getContributors({}, { isInviting: true });
    *
+   * // Restreindre la recherche : uniquement les citoyens
+   * const onlyCitoyens = await project.getContributors({}, { searchType: "citoyens" });
+   *
+   * // Restreindre la recherche : uniquement les organisations
+   * const onlyOrgas = await project.getContributors({}, { searchType: "organizations" });
    */
   async getContributors(
     data: Partial<GetContributorsAdminData | GetContributorsNoAdminData> = {},
@@ -241,11 +246,19 @@ export class Project extends BaseEntity<ProjectItemNormalized> {
       isAdminPending?: boolean;
       isInviting?: boolean;
       roles?: any[];
+      searchType?: "all" | "citoyens" | "organizations";
       restoredState?: PaginatorState;
     } = {}
   ): Promise<PaginatorPage<User | Organization>> {
-    data.searchType = this._getDefaultFromEndpoint("GET_CONTRIBUTORS_ADMIN", "searchType") as GetContributorsAdminData["searchType"];
-    // data.searchBy = "ALL";
+    const allTypes = this._getDefaultFromEndpoint("GET_CONTRIBUTORS_ADMIN", "searchType") as GetContributorsAdminData["searchType"];
+    if (options.searchType === "citoyens") {
+      data.searchType = ["citoyens"];
+    } else if (options.searchType === "organizations") {
+      data.searchType = allTypes.filter(t => t !== "citoyens") as GetContributorsAdminData["searchType"];
+    } else {
+      // "all" ou omis : on initialise explicitement (le paginator exige searchType avant la validation AJV)
+      data.searchType = allTypes;
+    }
 
     const paginator = this._createPaginatorEngine({
       initialData: data,