@craft-ng/dev-tools 0.5.1-beta.0 → 0.6.0-beta.2

package/src/scripts/primitives/migrate-primitive-generators.ts

@@ -0,0 +1,402 @@
+import { relative, dirname, resolve } from 'node:path';
+import {
+  ArrowFunction,
+  CallExpression,
+  Identifier,
+  Node,
+  Project,
+  QuoteKind,
+  SourceFile,
+  SyntaxKind,
+} from 'ts-morph';
+
+/**
+ * Migrates call-sites of the generator-returning craft primitives (`state`,
+ * `query`, `mutation`, `asyncProcess`, `queryParam`):
+ *
+ * 1. `yield* track(X)` → `yield* X` (track import purged when unused).
+ * 2. Already-consumed invocations (`yield*`, `craftUse(...)`) are left alone.
+ * 3. Inside a generator function → prefix with `yield* ` (parenthesised when
+ *    the parent is a spread / member access / template position).
+ * 4. Direct expression-body return of a `craftService` factory or of a
+ *    `queryParams:` arrow stays as-is (the runtime drives the generator).
+ * 5. Anywhere else → wrap with `craftUse(...)` (import added).
+ * 6. A `craftService` factory / `queryParams:` arrow returning an object
+ *    literal containing primitive creations is first converted to a
+ *    `function*` so rule 3 applies.
+ */
+
+export const ALL_PRIMITIVES = [
+  'state',
+  'query',
+  'mutation',
+  'asyncProcess',
+  'queryParam',
+] as const;
+
+export type PrimitiveName = (typeof ALL_PRIMITIVES)[number];
+
+export type MigratePrimitiveGeneratorsOptions = {
+  paths: readonly string[];
+  primitives?: readonly PrimitiveName[];
+  write?: boolean;
+  log?: (message: string) => void;
+};
+
+export type MigratePrimitiveGeneratorsResult = {
+  changedFiles: string[];
+};
+
+const FACTORY_HOST_CALLEES = new Set(['craftService', 'toCraftService']);
+
+export async function migratePrimitiveGenerators({
+  paths,
+  primitives = ALL_PRIMITIVES,
+  write = true,
+  log = console.log,
+}: MigratePrimitiveGeneratorsOptions): Promise<MigratePrimitiveGeneratorsResult> {
+  const project = new Project({
+    skipAddingFilesFromTsConfig: true,
+    manipulationSettings: { quoteKind: QuoteKind.Single },
+  });
+  project.addSourceFilesAtPaths(paths as string[]);
+
+  const changedFiles: string[] = [];
+  for (const sourceFile of project.getSourceFiles()) {
+    if (migrateFile(sourceFile, new Set(primitives))) {
+      changedFiles.push(relative(process.cwd(), sourceFile.getFilePath()));
+    }
+  }
+
+  if (write) {
+    await project.save();
+  }
+
+  log(
+    `${write ? 'Migrated' : 'Would migrate'} ${changedFiles.length} file(s).`,
+  );
+  for (const file of changedFiles) log(`  ${file}`);
+
+  return { changedFiles };
+}
+
+function migrateFile(
+  sourceFile: SourceFile,
+  primitives: Set<string>,
+): boolean {
+  const localNames = collectImportedLocalNames(sourceFile, primitives);
+  if (localNames.size === 0) return false;
+
+  let changed = false;
+
+  changed = unwrapTrackCalls(sourceFile) || changed;
+  changed = convertObjectLiteralFactories(sourceFile, localNames) || changed;
+
+  // Bottom-up so an edit never invalidates a not-yet-processed call above it.
+  const calls = findPrimitiveCreationCalls(sourceFile, localNames).sort(
+    (a, b) => b.getStart() - a.getStart(),
+  );
+
+  let needsCraftUseImport = false;
+  for (const call of calls) {
+    if (isAlreadyConsumed(call) || isDirectFactoryReturn(call)) continue;
+
+    if (isInsideGeneratorFunction(call)) {
+      const text = call.getText();
+      call.replaceWithText(
+        needsYieldParens(call) ? `(yield* ${text})` : `yield* ${text}`,
+      );
+      changed = true;
+      continue;
+    }
+
+    call.replaceWithText(`craftUse(${call.getText()})`);
+    needsCraftUseImport = true;
+    changed = true;
+  }
+
+  if (needsCraftUseImport) {
+    ensureCraftUseImport(sourceFile);
+  }
+
+  return changed;
+}
+
+function collectImportedLocalNames(
+  sourceFile: SourceFile,
+  primitives: Set<string>,
+): Map<string, string> {
+  const localNames = new Map<string, string>();
+  for (const importDeclaration of sourceFile.getImportDeclarations()) {
+    for (const specifier of importDeclaration.getNamedImports()) {
+      const original = specifier.getName();
+      if (primitives.has(original)) {
+        localNames.set(specifier.getAliasNode()?.getText() ?? original, original);
+      }
+    }
+  }
+  return localNames;
+}
+
+function findPrimitiveCreationCalls(
+  sourceFile: SourceFile,
+  localNames: Map<string, string>,
+): CallExpression[] {
+  return sourceFile
+    .getDescendantsOfKind(SyntaxKind.CallExpression)
+    .filter((call) => {
+      const callee = call.getExpression();
+      if (!Node.isIdentifier(callee)) return false;
+      if (!localNames.has(callee.getText())) return false;
+      // A creation call always takes a config; destructured readers such as
+      // `({ state }) => state().page` are argument-less.
+      if (call.getArguments().length === 0) return false;
+      return !isShadowed(callee);
+    });
+}
+
+function isShadowed(identifier: Identifier): boolean {
+  const name = identifier.getText();
+  let node: Node | undefined = identifier.getParent();
+  while (node) {
+    if (
+      Node.isFunctionDeclaration(node) ||
+      Node.isFunctionExpression(node) ||
+      Node.isArrowFunction(node) ||
+      Node.isMethodDeclaration(node)
+    ) {
+      for (const parameter of node.getParameters()) {
+        const bindsName = parameter
+          .getDescendants()
+          .concat(parameter.getNameNode())
+          .some(
+            (descendant) =>
+              (Node.isIdentifier(descendant) &&
+                descendant.getText() === name &&
+                (Node.isBindingElement(descendant.getParent()) ||
+                  Node.isParameterDeclaration(descendant.getParent())) &&
+                (descendant.getParent() as any).getNameNode?.() === descendant),
+          );
+        if (bindsName) return true;
+      }
+    }
+    node = node.getParent();
+  }
+  return false;
+}
+
+function isAlreadyConsumed(call: CallExpression): boolean {
+  const parent = skipParens(call.getParent());
+  if (Node.isYieldExpression(parent)) return true;
+  if (
+    Node.isCallExpression(parent) &&
+    parent.getExpression().getText() === 'craftUse' &&
+    parent.getArguments()[0] === skipParensDown(call)
+  ) {
+    return true;
+  }
+  return false;
+}
+
+function isDirectFactoryReturn(call: CallExpression): boolean {
+  const arrow = skipParens(call.getParent());
+  if (!Node.isArrowFunction(arrow)) return false;
+  if (skipParensDown(arrow.getBody()) !== call) return false;
+  return isFactoryHostArrow(arrow);
+}
+
+function isFactoryHostArrow(arrow: ArrowFunction): boolean {
+  const parent = arrow.getParent();
+  if (Node.isCallExpression(parent)) {
+    const callee = parent.getExpression();
+    if (Node.isIdentifier(callee) && FACTORY_HOST_CALLEES.has(callee.getText())) {
+      return parent.getArguments().includes(arrow);
+    }
+  }
+  if (Node.isPropertyAssignment(parent)) {
+    return parent.getName() === 'queryParams';
+  }
+  return false;
+}
+
+function isInsideGeneratorFunction(call: CallExpression): boolean {
+  let node: Node | undefined = call.getParent();
+  while (node) {
+    if (Node.isArrowFunction(node)) return false;
+    if (
+      Node.isFunctionDeclaration(node) ||
+      Node.isFunctionExpression(node) ||
+      Node.isMethodDeclaration(node)
+    ) {
+      return node.isGenerator();
+    }
+    node = node.getParent();
+  }
+  return false;
+}
+
+function needsYieldParens(call: CallExpression): boolean {
+  const parent = call.getParent();
+  return (
+    Node.isSpreadElement(parent) ||
+    Node.isSpreadAssignment(parent) ||
+    Node.isPropertyAccessExpression(parent) ||
+    Node.isElementAccessExpression(parent) ||
+    Node.isTemplateSpan(parent) ||
+    Node.isBinaryExpression(parent) ||
+    Node.isConditionalExpression(parent) ||
+    (Node.isCallExpression(parent) && parent.getExpression() === call)
+  );
+}
+
+function unwrapTrackCalls(sourceFile: SourceFile): boolean {
+  const trackImport = sourceFile
+    .getImportDeclarations()
+    .flatMap((declaration) => declaration.getNamedImports())
+    .find((specifier) => specifier.getName() === 'track');
+  if (!trackImport) return false;
+
+  const localName = trackImport.getAliasNode()?.getText() ?? 'track';
+  const trackCalls = sourceFile
+    .getDescendantsOfKind(SyntaxKind.CallExpression)
+    .filter((call) => {
+      const callee = call.getExpression();
+      return (
+        Node.isIdentifier(callee) &&
+        callee.getText() === localName &&
+        call.getArguments().length === 1
+      );
+    })
+    .sort((a, b) => b.getStart() - a.getStart());
+
+  if (trackCalls.length === 0) return false;
+
+  for (const call of trackCalls) {
+    call.replaceWithText(call.getArguments()[0].getText());
+  }
+
+  const remaining = sourceFile
+    .getDescendantsOfKind(SyntaxKind.Identifier)
+    .filter(
+      (identifier) =>
+        identifier.getText() === localName &&
+        !Node.isImportSpecifier(identifier.getParent()),
+    );
+  if (remaining.length === 0) {
+    trackImport.remove();
+  }
+
+  return true;
+}
+
+function convertObjectLiteralFactories(
+  sourceFile: SourceFile,
+  localNames: Map<string, string>,
+): boolean {
+  const arrows = sourceFile
+    .getDescendantsOfKind(SyntaxKind.ArrowFunction)
+    .filter((arrow) => {
+      if (!isFactoryHostArrow(arrow)) return false;
+      const body = skipParensDown(arrow.getBody());
+      if (!Node.isObjectLiteralExpression(body)) return false;
+      return findPrimitiveCreationCalls(sourceFile, localNames).some((call) =>
+        body.getDescendants().includes(call),
+      );
+    })
+    .sort((a, b) => b.getStart() - a.getStart());
+
+  for (const arrow of arrows) {
+    const body = skipParensDown(arrow.getBody());
+    const parameters = arrow
+      .getParameters()
+      .map((parameter) => parameter.getText())
+      .join(', ');
+    arrow.replaceWithText(
+      `function* (${parameters}) {\n  return ${body.getText()};\n}`,
+    );
+  }
+
+  return arrows.length > 0;
+}
+
+function ensureCraftUseImport(sourceFile: SourceFile): void {
+  const alreadyImported = sourceFile
+    .getImportDeclarations()
+    .some((declaration) =>
+      declaration
+        .getNamedImports()
+        .some((specifier) => specifier.getName() === 'craftUse'),
+    );
+  if (alreadyImported) return;
+
+  const filePath = sourceFile.getFilePath();
+  const coreSrc = resolve('libs/core/src');
+  const isInsideCore = resolve(filePath).startsWith(coreSrc + '/');
+
+  if (isInsideCore) {
+    let specifier = relative(
+      dirname(filePath),
+      resolve('libs/core/src/lib/craft-use'),
+    );
+    if (!specifier.startsWith('.')) specifier = `./${specifier}`;
+    sourceFile.addImportDeclaration({
+      moduleSpecifier: specifier,
+      namedImports: ['craftUse'],
+    });
+    return;
+  }
+
+  const coreImport = sourceFile
+    .getImportDeclarations()
+    .find((declaration) => declaration.getModuleSpecifierValue() === '@craft-ng/core');
+  if (coreImport) {
+    coreImport.addNamedImport('craftUse');
+    return;
+  }
+
+  sourceFile.addImportDeclaration({
+    moduleSpecifier: '@craft-ng/core',
+    namedImports: ['craftUse'],
+  });
+}
+
+function skipParens(node: Node | undefined): Node | undefined {
+  while (node && Node.isParenthesizedExpression(node)) {
+    node = node.getParent();
+  }
+  return node;
+}
+
+function skipParensDown(node: Node): Node {
+  while (Node.isParenthesizedExpression(node)) {
+    node = node.getExpression();
+  }
+  return node;
+}
+
+const isCli = process.argv[1]?.includes('migrate-primitive-generators');
+if (isCli) {
+  const args = process.argv.slice(2);
+  const readListArg = (name: string): string[] | undefined => {
+    const index = args.indexOf(`--${name}`);
+    if (index === -1) return undefined;
+    return args[index + 1]?.split(',').filter(Boolean);
+  };
+
+  const paths = readListArg('paths');
+  if (!paths || paths.length === 0) {
+    console.error(
+      'Usage: migrate-primitive-generators --paths <glob,...> [--primitives state,query,...] [--dry]',
+    );
+    process.exit(1);
+  }
+
+  void migratePrimitiveGenerators({
+    paths,
+    primitives: readListArg('primitives') as PrimitiveName[] | undefined,
+    write: !args.includes('--dry'),
+  }).catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+}

package/src/scripts/primitives/migrate-primitives.js

@@ -35,10 +35,17 @@ export function runPrimitivesMigration() {
             const changedSignals = migrateSignalsToState(sourceFile);
             const changedResources = migrateSingleEmissionRxResources(sourceFile, diagnostics);
             const changedWorkflows = annotateImperativeWorkflows(sourceFile, diagnostics);
+            const changedFormTreeInserts = annotateFormTreeInsertExtractions(sourceFile, diagnostics);
             diagnoseSignalForms(sourceFile, diagnostics);
-            if (changedSignals || changedResources || changedWorkflows)
+            if (changedSignals ||
+                changedResources ||
+                changedWorkflows ||
+                changedFormTreeInserts)
                 touched.add(sourceFile);
-            if (changedSignals || changedResources || changedWorkflows)
+            if (changedSignals ||
+                changedResources ||
+                changedWorkflows ||
+                changedFormTreeInserts)
                 getFileReport(files, sourceFile.getFilePath()).changed = true;
         }
         for (const file of touched)
@@ -133,6 +140,31 @@ function findImperativeStateDeclaration(call) {
 }
 const REACTIVE_WORKFLOW_COMMENT = '// CRAFT_REACTIVE_WORKFLOW_RECOMMENDED: workflow impératif détecté...';
 const FIRST_VALUE_FROM_REVIEW_COMMENT = '// CRAFT_FIRST_VALUE_FROM_REVIEW: firstValueFrom bridges an Observable temporarily; prefer a Promise-native Craft API when possible.';
+const FORM_TREE_INSERT_EXTRACTION_REVIEW_COMMENT = '// CRAFT_FORM_TREE_INSERT_EXTRACTION_REVIEW: makeFormTreeInsert sert surtout à extraire et découper une logique de formulaire; si cet insert n’est utilisé qu’ici, envisager de le placer directement dans insertForm.';
+function annotateFormTreeInsertExtractions(sourceFile, diagnostics) {
+    const statements = new Set();
+    for (const call of sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression)) {
+        if (call.getExpression().getText() !== 'makeFormTreeInsert')
+            continue;
+        const statement = call.getFirstAncestor((ancestor) => Node.isVariableStatement(ancestor));
+        if (statement)
+            statements.add(statement);
+    }
+    let changed = false;
+    for (const statement of [...statements].sort((left, right) => right.getStart() - left.getStart())) {
+        if (statement.wasForgotten() ||
+            statement
+                .getFullText()
+                .includes('CRAFT_FORM_TREE_INSERT_EXTRACTION_REVIEW'))
+            continue;
+        statement.replaceWithText(`${FORM_TREE_INSERT_EXTRACTION_REVIEW_COMMENT}\n${statement.getText()}`);
+        changed = true;
+    }
+    if (changed) {
+        diagnose(diagnostics, 'FORM_TREE_INSERT_EXTRACTION_REQUIRES_REVIEW', sourceFile, '`makeFormTreeInsert(...)` est utile pour extraire une logique de formulaire; si l’insert n’a qu’un seul usage local, envisager de l’imbriquer directement dans `insertForm(...)`.');
+    }
+    return changed;
+}
 function migrateSingleEmissionRxResources(sourceFile, diagnostics) {
     var _a, _b;
     const rxInterop = sourceFile.getImportDeclaration('@angular/core/rxjs-interop');
@@ -270,11 +302,11 @@ function diagnoseSignalForms(sourceFile, diagnostics) {
         for (const call of sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression)) {
             if (!isValidateAsyncRxResourceCall(call))
                 continue;
-            diagnose(diagnostics, 'ASYNC_VALIDATOR_REQUIRES_QUERY', sourceFile, '`validateAsync(...)` basé sur `rxResource(...)` doit devenir une `query(...)` locale déclenchée par la valeur du champ, puis `cAsyncValidate(queryRef, ...)`. Dans un craftService, créer la query avec `yield* track(query(...))`.');
+            diagnose(diagnostics, 'ASYNC_VALIDATOR_REQUIRES_QUERY', sourceFile, '`validateAsync(...)` basé sur `rxResource(...)` doit devenir une `query(...)` locale déclenchée par la valeur du champ, puis `cAsyncValidate(queryRef, ...)`. Dans un craftService, créer la query avec `yield* query(...)` ; dans un champ de composant, `craftUse(query(...))`.');
         }
     }
     if ((_a = sourceFile.getImportDeclaration('@angular/core/rxjs-interop')) === null || _a === void 0 ? void 0 : _a.getNamedImports().some((item) => item.getName() === 'rxResource')) {
-        diagnose(diagnostics, 'RX_RESOURCE_REQUIRES_QUERY', sourceFile, '`rxResource(...)` doit être remplacé par `query(...)` ou `mutation(...)` selon l’intention; dans un validateur async, préférer `query(...) + cAsyncValidate(...)`. Dans un craftService, englober toute primitive dépendante avec `yield* track(...)`.');
+        diagnose(diagnostics, 'RX_RESOURCE_REQUIRES_QUERY', sourceFile, '`rxResource(...)` doit être remplacé par `query(...)` ou `mutation(...)` selon l’intention; dans un validateur async, préférer `query(...) + cAsyncValidate(...)`. Dans un craftService, consommer toute primitive avec `yield*` ; dans un champ de composant, `craftUse(...)`.');
     }
 }
 function isValidateAsyncRxResourceCall(call) {

package/src/scripts/primitives/migrate-primitives.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-primitives.js","sourceRoot":"","sources":["../../../../../../libs/dev-tools/src/scripts/primitives/migrate-primitives.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrate-primitives.js","sourceRoot":"","sources":["../../../../../../libs/dev-tools/src/scripts/primitives/migrate-primitives.ts"],"names":[],"mappings":"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"}

package/src/scripts/primitives/migrate-primitives.spec.ts

@@ -276,4 +276,47 @@ describe('primitives migration', () => {
     expect(result.exitCode).toBe(1);
     expect(result.remainingSignalForms).toBe(1);
   });
+
+  it('suggests inlining a local makeFormTreeInsert into insertForm', async () => {
+    const root = await fixture({
+      'tsconfig.json': '{}',
+      'checkout.ts': `
+        import { formTreeNeed, insertForm, insertSelectFormTree, makeFormTreeInsert, state } from '@craft-ng/core';
+        type CheckoutForm = { coupon: { code: string } };
+        const { insertCouponTree } = makeFormTreeInsert(
+          'Coupon',
+          formTreeNeed<CheckoutForm['coupon']>(),
+          () => ({}),
+        );
+        export const checkout = state(
+          { coupon: { code: '' } },
+          insertForm(insertSelectFormTree('coupon', insertCouponTree())),
+        );
+      `,
+    });
+
+    const first = await runPrimitivesMigration({
+      rootDir: root,
+      write: true,
+      eslint: false,
+      log: () => undefined,
+    });
+    await runPrimitivesMigration({
+      rootDir: root,
+      write: true,
+      eslint: false,
+      log: () => undefined,
+    });
+
+    const output = await readFile(join(root, 'checkout.ts'), 'utf8');
+    expect(first.diagnostics.map((diagnostic) => diagnostic.code)).toContain(
+      'FORM_TREE_INSERT_EXTRACTION_REQUIRES_REVIEW',
+    );
+    expect(output).toContain(
+      '// CRAFT_FORM_TREE_INSERT_EXTRACTION_REVIEW: makeFormTreeInsert sert surtout à extraire et découper une logique de formulaire; si cet insert n’est utilisé qu’ici, envisager de le placer directement dans insertForm.',
+    );
+    expect(
+      output.match(/CRAFT_FORM_TREE_INSERT_EXTRACTION_REVIEW/g),
+    ).toHaveLength(1);
+  });
 });

package/src/scripts/primitives/migrate-primitives.ts

@@ -88,10 +88,24 @@ export async function runPrimitivesMigration(
       sourceFile,
       diagnostics,
     );
+    const changedFormTreeInserts = annotateFormTreeInsertExtractions(
+      sourceFile,
+      diagnostics,
+    );
     diagnoseSignalForms(sourceFile, diagnostics);
-    if (changedSignals || changedResources || changedWorkflows)
+    if (
+      changedSignals ||
+      changedResources ||
+      changedWorkflows ||
+      changedFormTreeInserts
+    )
       touched.add(sourceFile);
-    if (changedSignals || changedResources || changedWorkflows)
+    if (
+      changedSignals ||
+      changedResources ||
+      changedWorkflows ||
+      changedFormTreeInserts
+    )
       getFileReport(files, sourceFile.getFilePath()).changed = true;
   }
 
@@ -210,6 +224,50 @@ const REACTIVE_WORKFLOW_COMMENT =
   '// CRAFT_REACTIVE_WORKFLOW_RECOMMENDED: workflow impératif détecté...';
 const FIRST_VALUE_FROM_REVIEW_COMMENT =
   '// CRAFT_FIRST_VALUE_FROM_REVIEW: firstValueFrom bridges an Observable temporarily; prefer a Promise-native Craft API when possible.';
+const FORM_TREE_INSERT_EXTRACTION_REVIEW_COMMENT =
+  '// CRAFT_FORM_TREE_INSERT_EXTRACTION_REVIEW: makeFormTreeInsert sert surtout à extraire et découper une logique de formulaire; si cet insert n’est utilisé qu’ici, envisager de le placer directement dans insertForm.';
+
+function annotateFormTreeInsertExtractions(
+  sourceFile: SourceFile,
+  diagnostics: PrimitiveMigrationDiagnostic[],
+): boolean {
+  const statements = new Set<Node>();
+  for (const call of sourceFile.getDescendantsOfKind(
+    SyntaxKind.CallExpression,
+  )) {
+    if (call.getExpression().getText() !== 'makeFormTreeInsert') continue;
+    const statement = call.getFirstAncestor((ancestor) =>
+      Node.isVariableStatement(ancestor),
+    );
+    if (statement) statements.add(statement);
+  }
+
+  let changed = false;
+  for (const statement of [...statements].sort(
+    (left, right) => right.getStart() - left.getStart(),
+  )) {
+    if (
+      statement.wasForgotten() ||
+      statement
+        .getFullText()
+        .includes('CRAFT_FORM_TREE_INSERT_EXTRACTION_REVIEW')
+    )
+      continue;
+    statement.replaceWithText(
+      `${FORM_TREE_INSERT_EXTRACTION_REVIEW_COMMENT}\n${statement.getText()}`,
+    );
+    changed = true;
+  }
+  if (changed) {
+    diagnose(
+      diagnostics,
+      'FORM_TREE_INSERT_EXTRACTION_REQUIRES_REVIEW',
+      sourceFile,
+      '`makeFormTreeInsert(...)` est utile pour extraire une logique de formulaire; si l’insert n’a qu’un seul usage local, envisager de l’imbriquer directement dans `insertForm(...)`.',
+    );
+  }
+  return changed;
+}
 
 function migrateSingleEmissionRxResources(
   sourceFile: SourceFile,
@@ -423,7 +481,7 @@ function diagnoseSignalForms(
         diagnostics,
         'ASYNC_VALIDATOR_REQUIRES_QUERY',
         sourceFile,
-        '`validateAsync(...)` basé sur `rxResource(...)` doit devenir une `query(...)` locale déclenchée par la valeur du champ, puis `cAsyncValidate(queryRef, ...)`. Dans un craftService, créer la query avec `yield* track(query(...))`.',
+        '`validateAsync(...)` basé sur `rxResource(...)` doit devenir une `query(...)` locale déclenchée par la valeur du champ, puis `cAsyncValidate(queryRef, ...)`. Dans un craftService, créer la query avec `yield* query(...)` ; dans un champ de composant, `craftUse(query(...))`.',
       );
     }
   }
@@ -432,7 +490,7 @@ function diagnoseSignalForms(
       diagnostics,
       'RX_RESOURCE_REQUIRES_QUERY',
       sourceFile,
-      '`rxResource(...)` doit être remplacé par `query(...)` ou `mutation(...)` selon l’intention; dans un validateur async, préférer `query(...) + cAsyncValidate(...)`. Dans un craftService, englober toute primitive dépendante avec `yield* track(...)`.',
+      '`rxResource(...)` doit être remplacé par `query(...)` ou `mutation(...)` selon l’intention; dans un validateur async, préférer `query(...) + cAsyncValidate(...)`. Dans un craftService, consommer toute primitive avec `yield*` ; dans un champ de composant, `craftUse(...)`.',
     );
   }
 }