@obsidiane/meridiane 1.0.1 → 2.0.1

package/tools/generator/models/schema-utils.js

@@ -13,10 +13,11 @@ export function isObject(v) {
 /**
  * Extrait le nom du schéma depuis une référence $ref
  * @param {string} $ref
+ * @returns {string|undefined}
  */
 export function schemaNameFromRef($ref) {
   const m = $ref.match(/#\/components\/schemas\/(.+)$/);
-  return m ? m[1] : $ref;
+  return m ? m[1] : undefined;
 }
 
 /**
@@ -31,7 +32,7 @@ export function mergeAllOf(schemas) {
   for (const s of schemas) {
     if (s.$ref) {
       const ref = schemaNameFromRef(s.$ref);
-      if (HYDRA_BASE_RE.test(ref)) {
+      if (ref && HYDRA_BASE_RE.test(ref)) {
         continue;
       }
       return null;
@@ -46,101 +47,3 @@ export function mergeAllOf(schemas) {
   out.required = [...new Set(out.required)];
   return out;
 }
-
-/**
- * Liste les noms de schémas dans `components.schemas`.
- * La sélection/filtres est gérée par `applySchemaNameFilters`.
- * @param {Record<string, any>} schemas
- * @returns {string[]}
- */
-export function filterSchemaNames(schemas, cfg) {
-  return Object.keys(schemas).sort((a, b) => a.localeCompare(b));
-}
-
-/**
- * @param {unknown} rule
- * @returns {rule is ((name: string) => boolean)}
- */
-function isRuleFn(rule) {
-  return typeof rule === 'function';
-}
-
-/**
- * @param {string} name
- * @param {RegExp|string|((name: string) => boolean)} rule
- */
-function matchesRule(name, rule) {
-  if (rule instanceof RegExp) return rule.test(name);
-  if (isRuleFn(rule)) return !!rule(name);
-  if (typeof rule === 'string' && rule.length) return name.includes(rule);
-  return false;
-}
-
-/**
- * Applique un preset de génération et/ou des règles include/exclude.
- *
- * - `preset: "all"`: ne filtre rien (comportement par défaut)
- * - `preset: "native"`: retire les schémas "techniques" (Hydra*, jsonMergePatch…)
- *
- * Les règles `includeSchemaNames` / `excludeSchemaNames` s'appliquent sur les noms
- * de schémas OpenAPI (ex: "User-user.read", "Conversation.jsonMergePatch", …).
- *
- * @param {string[]} schemaNames
- * @param {{
- *   preset?: 'all'|'native',
- *   includeSchemaNames?: Array<RegExp|string|((name: string) => boolean)>,
- *   excludeSchemaNames?: Array<RegExp|string|((name: string) => boolean)>,
- * }} [cfg]
- */
-export function applySchemaNameFilters(schemaNames, cfg) {
-  const preset = cfg?.preset ?? 'all';
-
-  /** @type {Array<RegExp|string|((name: string) => boolean)>} */
-  const include = Array.isArray(cfg?.includeSchemaNames) ? cfg.includeSchemaNames : [];
-  /** @type {Array<RegExp|string|((name: string) => boolean)>} */
-  const exclude = Array.isArray(cfg?.excludeSchemaNames) ? [...cfg.excludeSchemaNames] : [];
-
-  // 1) include/exclude user filters (always applied first)
-  const hasInclude = include.length > 0;
-  let out = schemaNames.filter((name) => {
-    if (hasInclude && !include.some((r) => matchesRule(name, r))) return false;
-    if (exclude.some((r) => matchesRule(name, r))) return false;
-    return true;
-  });
-
-  // 2) preset filters
-  if (preset === 'native') {
-    out = out
-      .filter((n) => !/^Hydra/i.test(n))
-      // API Platform adds a technical "Multipart" schema for multipart/form-data request bodies (file uploads).
-      // It's not a resource model and tends to pollute the generated "native" model list.
-      .filter((n) => !/^Multipart(?:$|[.-])/i.test(n))
-      .filter((n) => !/jsonMergePatch/i.test(n))
-      .filter((n) => !/\.jsonld\b/i.test(n))
-      .filter((n) => !/\.jsonapi\b/i.test(n));
-
-    // 3) collapse group variants: keep one schema per base (before `-`)
-    const score = (name) => {
-      if (!name.includes('-')) return 100;
-      const group = name.split('-').slice(1).join('-');
-      if (/(^|[.\-])read($|[.\-])/i.test(group)) return 50;
-      return 0;
-    };
-    const byBase = new Map();
-    for (const name of out) {
-      const base = name.split('-')[0];
-      const prev = byBase.get(base);
-      if (!prev) {
-        byBase.set(base, name);
-        continue;
-      }
-      const a = prev, b = name;
-      const sa = score(a), sb = score(b);
-      if (sb > sa) byBase.set(base, b);
-      else if (sb === sa && b.localeCompare(a) < 0) byBase.set(base, b);
-    }
-    out = [...byBase.values()].sort((a, b) => a.localeCompare(b));
-  }
-
-  return out;
-}

package/tools/generator/models/templates/model.hbs

@@ -1,9 +1,11 @@
+{{#if extendsItem}}
 import type { Item } from '../lib/ports/resource-repository.port';
+{{/if}}
 {{#each imports}}
 import type { {{this}} } from './{{this}}';
 {{/each}}
 
-export interface {{name}} extends Item{{#each extendsTypes}}, {{this}}{{/each}} {
+export interface {{name}}{{#if extendsItem}} extends Item{{#each extendsTypes}}, {{this}}{{/each}}{{else}}{{#each extendsTypes}}{{#if @first}} extends {{this}}{{else}}, {{this}}{{/if}}{{/each}}{{/if}} {
 {{#each props}}
   {{{tsKey}}}{{#if optional}}?{{/if}}: {{type}};
 {{/each}}

package/tools/generator/models/type-resolver.js

@@ -16,16 +16,19 @@ export function withNullable(ts, schema) {
  * @param {any} schema
  * @param {Set<string>} deps
  * @param {Map<string,string>} nameMap
- * @param {{ requiredMode?: 'all-optional'|'spec', forceNullable?: boolean }} [cfg]
+ * @param {{ requiredMode?: 'all'|'spec' }} [cfg]
  * @returns {string}
  */
 export function tsTypeOf(schema, deps, nameMap, cfg) {
   if (!schema) return 'any';
-  const requiredMode = cfg?.requiredMode ?? 'all-optional';
-  const forceNullable = !!cfg?.forceNullable;
+  const requiredMode = cfg?.requiredMode ?? 'all';
+  const forceNullable = requiredMode !== 'spec';
 
   if (schema.$ref) {
     const orig = schemaNameFromRef(schema.$ref);
+    if (!orig) return 'any';
+    if (/jsonMergePatch/i.test(orig)) return 'any';
+    if (/^Hydra/i.test(orig)) return 'any';
     const name = nameMap.get(orig) || orig;
     deps.add(name);
     return name;

package/tools/generator/models/naming.js

@@ -1,26 +0,0 @@
-/**
- * Construit un label "tokenisé" (sans `.` ni `-`) à partir d'un nom de schéma OpenAPI.
- * Le label est ensuite passé à `sanitizeTypeName()` pour produire un identifiant TS stable.
- *
- * @param {string} original
- * @param {{ preset: 'all'|'native' }} cfg
- */
-export function schemaLabel(original, cfg) {
-  const preset = cfg?.preset ?? 'all';
-  if (preset === 'native') {
-    // En native, on vise un nom "entity-like" : on ignore le groupe (après `-`) si présent.
-    // Les variantes .jsonld/.jsonapi/jsonMergePatch sont censées être filtrées par le preset.
-    return String(original).split('-')[0];
-  }
-
-  // En all, on encode tout : `.` et `-` deviennent des séparateurs de tokens.
-  const rawTokens = String(original).split(/[.-]/g).filter(Boolean);
-  const tokens = rawTokens.map((t) => {
-    const lower = t.toLowerCase();
-    if (lower === 'jsonld') return 'Jsonld';
-    if (lower === 'jsonapi') return 'Jsonapi';
-    if (lower === 'jsonmergepatch' || t === 'jsonMergePatch') return 'JsonMergePatch';
-    return t;
-  });
-  return tokens.join(' ');
-}