@obsidiane/meridiane 2.0.6 → 2.0.10

package/README.md

@@ -1,8 +1,8 @@
 # @obsidiane/meridiane
 
-CLI pour générer un bridge Angular (API Platform + Mercure) depuis une spec OpenAPI.
+CLI pour générer un bridge Angular (runtime + models TypeScript) depuis une spec OpenAPI (API Platform + Mercure).
 
-Documentation complète (repo) : `docs/guide-bridge.md`.
+Documentation complète du repo : `docs/guide-bridge.md`.
 
 ## Installation
 
@@ -10,17 +10,11 @@ Documentation complète (repo) : `docs/guide-bridge.md`.
 npm i -D @obsidiane/meridiane
 ```
 
-Ou en global :
-
-```bash
-npm i -g @obsidiane/meridiane
-```
-
 ## Commandes
 
 ### `meridiane generate <packageName>`
 
-Génère uniquement les fichiers du bridge dans le workspace courant (pas de build, pas de `npm pack`).
+Génère uniquement les sources du bridge dans le workspace courant.
 
 ```bash
 npx meridiane generate @acme/backend-bridge --spec ./openapi.json
@@ -30,7 +24,7 @@ Sortie par défaut : `projects/<libName>/` (modifiable via `--out`).
 
 ### `meridiane dev [packageName]`
 
-Build standalone + installation locale dans `node_modules`.
+Génération + build standalone + `npm pack` + installation locale dans `node_modules`.
 
 ```bash
 npx meridiane dev @acme/backend-bridge --spec http://localhost:8000/api/docs.json
@@ -42,10 +36,10 @@ Sorties :
 
 ### `meridiane build <packageName>`
 
-Build standalone + `npm pack` (artefact publiable).
+Génération + build standalone + `npm pack` (artefact publiable).
 
 ```bash
-npx meridiane build @acme/backend-bridge --version 0.1.0 --spec https://staging.example/api/docs.json
+npx meridiane build @acme/backend-bridge --version 1.2.3 --spec https://staging.example/api/docs.json
 ```
 
 Sorties :
@@ -54,20 +48,21 @@ Sorties :
 
 ## Options
 
-- `--spec <url|file>` : source OpenAPI (URL ou fichier JSON local) ; requis sauf `--no-models`.
-- `--formats <mimeTypes>` : répétable ou liste `,` (ordre significatif). Active le mode contract-driven.
-- `--include/--exclude <substr>` : filtrer des noms de schémas OpenAPI.
-- `--no-models` : ne génère que le runtime (pas de models).
-- `--version <semver>` : version écrite dans le `package.json` (`build` + `generate`).
-- `--out <dir>` : répertoire de sortie pour `generate` (défaut `projects/<libName>`).
-- `--debug` : logs détaillés.
+- `--spec <url|file>` : URL OpenAPI ou fichier JSON local (requis sauf `--no-models`)
+- `--formats <mimeTypes>` : répétable ou liste `,` ; défaut `application/ld+json`
+- `--include <substr>` / `--exclude <substr>` : filtres de noms de schémas (répétables, support `,`)
+- `--no-models` : runtime only
+- `--version <semver>` : `build` et `generate` (défaut `0.0.0`)
+- `--out <dir>` : uniquement `generate`
+- `--debug` : logs détaillés
 
 ## Notes importantes
 
-- `--formats` active un mode contract-driven : seuls les schemas réellement utilisés par les endpoints/paths sont générés.
-- Les modèles `*.jsonMergePatch` ne sont jamais générés (`PATCH` est typé en `Partial<T>`).
-- Meridiane **ne publie pas** : utilisez `npm publish` côté CI.
+- fallback automatique `.../api/docs.json` -> `.../api/docs.jsonopenapi` si nécessaire
+- mode contract-driven : uniquement les schémas atteignables via `paths` pour les formats sélectionnés
+- modèles `*jsonMergePatch*` non générés (`PATCH` typé `Partial<T>`)
+- Meridiane ne publie pas : publication via `npm publish` côté CI
 
-## Note (repo Meridiane)
+## Spécifique à ce repo
 
-Dans ce repo, `meridiane dev` peut être exécutée sans `packageName` et cible l’app sandbox (`apps/sandbox`).
+Dans ce monorepo, `meridiane dev` peut être exécuté sans `packageName` et cible alors `@obsidiane/bridge-sandbox` (app `apps/sandbox`).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obsidiane/meridiane",
-  "version": "2.0.6",
+  "version": "2.0.10",
   "description": "Générateur de librairie Angular et modèles TypeScript (OpenAPI) pour un bridge Symfony/API Platform + Mercure.",
   "repository": {
     "type": "git",

package/templates/_lib_template/README.md

@@ -60,6 +60,7 @@ export class AppModule {}
 `provideBridge({ ... })` accepte notamment :
 - `baseUrl` (requis) ;
 - `auth` (Bearer ou interceptor custom) ;
+- `http` (`withCredentials` HTTP par défaut) ;
 - `mercure` (hubUrl + `topicMode` + stratégie de connexions SSE `connectionMode`/`maxUrlLength`) ;
 - `defaults` (headers/timeout/retries) ;
 - `singleFlight` (déduplication “in-flight” des requêtes HTTP identiques `GET/HEAD/OPTIONS`) ;
@@ -70,17 +71,25 @@ export class AppModule {}
 
 Le bridge peut envoyer des cookies (sessions) côté HTTP et SSE.
 
-Le comportement `withCredentials` par défaut est déduit de `mercure.init` :
-- `credentials: 'include'` (défaut) → cookies envoyés
-- `credentials: 'omit'` → cookies non envoyés
+Vous pouvez configurer explicitement le HTTP via `http.withCredentials` :
+- `true` → cookies envoyés sur les requêtes HTTP
+- `false` → cookies désactivés côté HTTP
 
-Vous pouvez aussi surcharger au cas par cas via `opts.withCredentials` sur les appels HTTP.
+`mercure.init.credentials` pilote uniquement Mercure/SSE :
+- `credentials: 'include'` (défaut) → cookies envoyés sur EventSource
+- `credentials: 'omit'` → cookies désactivés côté SSE
+
+Compat legacy :
+- si `http.withCredentials` est absent, le bridge conserve le comportement historique et le déduit de `mercure.init.credentials`
+
+Vous pouvez aussi surcharger appel par appel via `opts.withCredentials` sur les appels HTTP.
 
 ```ts
 import {provideBridge} from '__PACKAGE_NAME__';
 
 provideBridge({
   baseUrl: 'https://api.example.com',
+  http: {withCredentials: true},
   mercure: {
     hubUrl: 'https://api.example.com/.well-known/mercure',
     init: {credentials: 'omit'},

package/templates/_lib_template/src/lib/bridge/rest/api-platform.adapter.ts

@@ -19,7 +19,7 @@ export class ApiPlatformRestRepository<T extends Item> implements ResourceReposi
     private readonly http: HttpClient,
     private readonly apiBase: string,
     private readonly resourcePath: Iri,
-    private readonly withCredentialsDefault: boolean,
+    private readonly httpWithCredentialsDefault: boolean,
   ) {
   }
 
@@ -28,42 +28,42 @@ export class ApiPlatformRestRepository<T extends Item> implements ResourceReposi
     return this.http.get<Collection<T>>(this.resolveUrl(this.resourcePath), {
       params,
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   get$(iri: IriRequired, opts?: HttpCallOptions): Observable<T> {
     return this.http.get<T>(this.resolveUrl(iri), {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   post$(payload: Partial<T>, opts?: HttpCallOptions): Observable<T> {
     return this.http.post<T>(this.resolveUrl(this.resourcePath), payload, {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   patch$(iri: IriRequired, changes: Partial<T>, opts?: HttpCallOptions): Observable<T> {
     return this.http.patch<T>(this.resolveUrl(iri), changes, {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   put$(iri: IriRequired, payload: Partial<T>, opts?: HttpCallOptions): Observable<T> {
     return this.http.put<T>(this.resolveUrl(iri), payload, {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   delete$(iri: IriRequired, opts?: HttpCallOptions): Observable<void> {
     return this.http.delete<void>(this.resolveUrl(iri), {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
@@ -72,7 +72,7 @@ export class ApiPlatformRestRepository<T extends Item> implements ResourceReposi
     const {method, url} = req;
 
     const targetUrl = this.resolveUrl(url ?? this.resourcePath);
-    const mergedOptions = buildHttpRequestOptions(req, {withCredentialsDefault: this.withCredentialsDefault});
+    const mergedOptions = buildHttpRequestOptions(req, {withCredentialsDefault: this.httpWithCredentialsDefault});
     return this.http.request<R>(method, targetUrl, mergedOptions as {observe: 'body'});
   }
 

package/templates/_lib_template/src/lib/bridge/sse/mercure.adapter.ts

@@ -4,7 +4,7 @@ import {auditTime, concatMap, filter, finalize, map, share, takeUntil} from 'rxj
 import {
   API_BASE_URL,
   BRIDGE_LOGGER,
-  BRIDGE_WITH_CREDENTIALS,
+  BRIDGE_MERCURE_WITH_CREDENTIALS,
   MERCURE_CONNECTION_MODE,
   MERCURE_HUB_URL,
   MERCURE_MAX_URL_LENGTH,
@@ -88,7 +88,7 @@ export class MercureRealtimeAdapter implements RealtimePort, OnDestroy {
 
   constructor(
     @Inject(API_BASE_URL) private readonly apiBase: string,
-    @Inject(BRIDGE_WITH_CREDENTIALS) private readonly withCredentialsDefault: boolean,
+    @Inject(BRIDGE_MERCURE_WITH_CREDENTIALS) private readonly mercureWithCredentials: boolean,
     @Inject(PLATFORM_ID) private readonly platformId: object,
     @Optional() @Inject(MERCURE_HUB_URL) private readonly hubUrl?: string,
     @Optional() @Inject(MERCURE_TOPIC_MODE) topicMode?: MercureTopicMode,
@@ -364,7 +364,7 @@ export class MercureRealtimeAdapter implements RealtimePort, OnDestroy {
       lastEventId,
     });
 
-    const wrapper = new EventSourceWrapper(url, {withCredentials: this.withCredentialsDefault}, this.logger);
+    const wrapper = new EventSourceWrapper(url, {withCredentials: this.mercureWithCredentials}, this.logger);
     const stop$ = new Subject<void>();
 
     const conn: ManagedConnection = {
@@ -704,7 +704,7 @@ export class MercureRealtimeAdapter implements RealtimePort, OnDestroy {
   private computeConnectionKey(topics: ReadonlySet<string>, scope: ManagedConnectionScope, groupId?: string): string {
     const topicsSorted = Array.from(topics).sort().join('|');
     const hub = this.hubUrl ?? '';
-    const creds = this.withCredentialsDefault ? '1' : '0';
+    const creds = this.mercureWithCredentials ? '1' : '0';
     const mode = this.connectionMode;
     const group = groupId ?? '';
     return `${scope}::${group}::${hub}::${creds}::${mode}::${topicsSorted}`;

package/templates/_lib_template/src/lib/facades/bridge.facade.ts

@@ -5,7 +5,7 @@ import {filter, map, share} from 'rxjs/operators';
 import {toHttpParams} from '../bridge/rest/query-builder';
 import {buildHttpRequestOptions} from '../bridge/rest/http-request.options';
 import {MercureRealtimeAdapter} from '../bridge/sse/mercure.adapter';
-import {API_BASE_URL, BRIDGE_WITH_CREDENTIALS} from '../tokens';
+import {API_BASE_URL, BRIDGE_HTTP_WITH_CREDENTIALS} from '../tokens';
 import {AnyQuery, Collection, HttpCallOptions, HttpRequestConfig, Iri, IriRequired, Item} from '../ports/resource-repository.port';
 import {SubscribeFilter} from '../ports/realtime.port';
 import {resolveUrl} from '../utils/url';
@@ -37,7 +37,7 @@ export class BridgeFacade {
     private readonly http: HttpClient,
     private readonly realtime: MercureRealtimeAdapter,
     @Inject(API_BASE_URL) private readonly apiBase: string,
-    @Inject(BRIDGE_WITH_CREDENTIALS) private readonly withCredentialsDefault: boolean,
+    @Inject(BRIDGE_HTTP_WITH_CREDENTIALS) private readonly httpWithCredentialsDefault: boolean,
   ) {
   }
 
@@ -46,7 +46,7 @@ export class BridgeFacade {
   get$<R = unknown>(url: IriRequired, opts?: HttpCallOptions): Observable<R> {
     return this.http.get<R>(this.resolveUrl(url), {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
@@ -59,35 +59,35 @@ export class BridgeFacade {
     return this.http.get<Collection<T>>(this.resolveUrl(url), {
       params,
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   post$<R = unknown, B = unknown>(url: IriRequired, payload: B, opts?: HttpCallOptions): Observable<R> {
     return this.http.post<R>(this.resolveUrl(url), payload, {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   patch$<R = unknown, B = unknown>(url: IriRequired, changes: B, opts?: HttpCallOptions): Observable<R> {
     return this.http.patch<R>(this.resolveUrl(url), changes, {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   put$<R = unknown, B = unknown>(url: IriRequired, payload: B, opts?: HttpCallOptions): Observable<R> {
     return this.http.put<R>(this.resolveUrl(url), payload, {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
   delete$(url: IriRequired, opts?: HttpCallOptions): Observable<void> {
     return this.http.delete<void>(this.resolveUrl(url), {
       headers: opts?.headers,
-      withCredentials: opts?.withCredentials ?? this.withCredentialsDefault,
+      withCredentials: opts?.withCredentials ?? this.httpWithCredentialsDefault,
     });
   }
 
@@ -95,7 +95,7 @@ export class BridgeFacade {
     const {method, url} = req;
     const targetUrl = this.resolveUrl(url);
 
-    const mergedOptions = buildHttpRequestOptions(req, {withCredentialsDefault: this.withCredentialsDefault});
+    const mergedOptions = buildHttpRequestOptions(req, {withCredentialsDefault: this.httpWithCredentialsDefault});
     return this.http.request<R>(method, targetUrl, mergedOptions as {observe: 'body'});
   }
 

package/templates/_lib_template/src/lib/facades/facade.factory.ts

@@ -2,7 +2,7 @@ import {EnvironmentInjector, inject, Injectable, runInInjectionContext} from '@a
 import {HttpClient} from '@angular/common/http';
 import {RealtimePort} from '../ports/realtime.port';
 import {Item, ResourceRepository} from '../ports/resource-repository.port';
-import {API_BASE_URL, BRIDGE_WITH_CREDENTIALS} from '../tokens';
+import {API_BASE_URL, BRIDGE_HTTP_WITH_CREDENTIALS} from '../tokens';
 import {MercureRealtimeAdapter} from '../bridge/sse/mercure.adapter';
 import {ApiPlatformRestRepository} from '../bridge/rest/api-platform.adapter';
 import {ResourceFacade} from './resource.facade';
@@ -19,7 +19,7 @@ export class FacadeFactory {
   private readonly env = inject(EnvironmentInjector);
   private readonly http = inject(HttpClient);
   private readonly baseUrl = inject(API_BASE_URL);
-  private readonly withCredentials = inject(BRIDGE_WITH_CREDENTIALS);
+  private readonly httpWithCredentials = inject(BRIDGE_HTTP_WITH_CREDENTIALS);
   private readonly mercure = inject(MercureRealtimeAdapter);
 
   /**
@@ -30,7 +30,7 @@ export class FacadeFactory {
    */
   create<T extends Item>(config: FacadeConfig<T>): ResourceFacade<T> {
     const url = config.url;
-    const repo = config.repo ?? new ApiPlatformRestRepository<T>(this.http, this.baseUrl, url, this.withCredentials);
+    const repo = config.repo ?? new ApiPlatformRestRepository<T>(this.http, this.baseUrl, url, this.httpWithCredentials);
     const realtime = config.realtime ?? this.mercure;
 
     return runInInjectionContext(this.env, () => new ResourceFacade<T>(repo, realtime));

package/templates/_lib_template/src/lib/provide-bridge.ts

@@ -3,8 +3,9 @@ import {HttpInterceptorFn, provideHttpClient, withFetch, withInterceptors} from
 import {
   API_BASE_URL,
   BRIDGE_DEFAULTS,
+  BRIDGE_HTTP_WITH_CREDENTIALS,
   BRIDGE_LOGGER,
-  BRIDGE_WITH_CREDENTIALS,
+  BRIDGE_MERCURE_WITH_CREDENTIALS,
   MERCURE_CONNECTION_MODE,
   MERCURE_HUB_URL,
   MERCURE_MAX_URL_LENGTH,
@@ -40,11 +41,23 @@ export interface BridgeMercureOptions {
   maxUrlLength?: number;
 }
 
+export interface BridgeHttpOptions {
+  /**
+   * Enables cookies / credentials on HTTP requests by default.
+   *
+   * When omitted, the bridge preserves the historical behavior and derives the
+   * HTTP value from `mercure.init.credentials`.
+   */
+  withCredentials?: boolean;
+}
+
 export interface BridgeOptions {
   /** Base URL of the API (e.g. `http://localhost:8000`). */
   baseUrl: string;
   /** Auth strategy used to attach an Authorization header. */
   auth?: BridgeAuth;
+  /** Default HTTP transport options. */
+  http?: BridgeHttpOptions;
   /**
    * Use `topicMode` to control the `topic=` values sent to the hub.
    */
@@ -69,6 +82,7 @@ export function provideBridge(opts: BridgeOptions): EnvironmentProviders {
   const {
     baseUrl,
     auth,
+    http,
     mercure,
     defaults,
     singleFlight = true,
@@ -85,7 +99,8 @@ export function provideBridge(opts: BridgeOptions): EnvironmentProviders {
   const resolvedMercureTopicMode: MercureTopicMode = mercure?.topicMode ?? 'url';
   const resolvedMercureConnectionMode: MercureConnectionMode = mercure?.connectionMode ?? 'auto';
   const resolvedMercureMaxUrlLength = normalizeMercureMaxUrlLength(mercure?.maxUrlLength, 1900);
-  const withCredentials = resolveWithCredentials(resolvedMercureInit);
+  const mercureWithCredentials = resolveWithCredentials(resolvedMercureInit);
+  const httpWithCredentials = http?.withCredentials ?? mercureWithCredentials;
 
   const loggerProvider: BridgeLogger = createBridgeLogger(debug);
 
@@ -104,7 +119,8 @@ export function provideBridge(opts: BridgeOptions): EnvironmentProviders {
       withInterceptors(interceptors)
     ),
     {provide: API_BASE_URL, useValue: baseUrl},
-    {provide: BRIDGE_WITH_CREDENTIALS, useValue: withCredentials},
+    {provide: BRIDGE_HTTP_WITH_CREDENTIALS, useValue: httpWithCredentials},
+    {provide: BRIDGE_MERCURE_WITH_CREDENTIALS, useValue: mercureWithCredentials},
     ...(resolvedMercureHubUrl ? [{provide: MERCURE_HUB_URL, useValue: resolvedMercureHubUrl}] : []),
     {provide: MERCURE_TOPIC_MODE, useValue: resolvedMercureTopicMode},
     {provide: MERCURE_CONNECTION_MODE, useValue: resolvedMercureConnectionMode},

package/templates/_lib_template/src/lib/tokens.ts

@@ -8,10 +8,16 @@ export const API_BASE_URL = new InjectionToken<string>('API_BASE_URL');
 export const MERCURE_HUB_URL = new InjectionToken<string>('MERCURE_HUB_URL');
 
 /**
- * Default credential policy for HTTP requests and Mercure EventSource.
- * When `true`, the bridge sets `withCredentials: true` on HTTP calls and uses cookies for SSE.
+ * Default credential policy for HTTP requests.
+ * When `true`, the bridge sets `withCredentials: true` on HTTP calls.
  */
-export const BRIDGE_WITH_CREDENTIALS = new InjectionToken<boolean>('BRIDGE_WITH_CREDENTIALS');
+export const BRIDGE_HTTP_WITH_CREDENTIALS = new InjectionToken<boolean>('BRIDGE_HTTP_WITH_CREDENTIALS');
+
+/**
+ * Default credential policy for Mercure EventSource.
+ * When `true`, the bridge opens SSE connections with cookies enabled.
+ */
+export const BRIDGE_MERCURE_WITH_CREDENTIALS = new InjectionToken<boolean>('BRIDGE_MERCURE_WITH_CREDENTIALS');
 
 export const MERCURE_TOPIC_MODE = new InjectionToken<MercureTopicMode>('MERCURE_TOPIC_MODE');