@specific.dev/spectest 0.91.2 → 0.92.1

package/src/harness/wrapper-rules.ts

@@ -351,11 +351,6 @@ export interface WrapperRuleRun {
   durationMs: number;
 }
 
-/** `TypeFlags.Object | TypeFlags.Union` — the only shapes a carrier can wear.
- *  Filtering on the flags the batch call already returned keeps the printed
- *  name (one round trip each) off every ordinary `boolean` condition. */
-const OBJECT_OR_UNION = (1 << 19) | (1 << 20);
-
 /** Candidate positions, and what each one means if the operand is a carrier. */
 interface Candidate {
   node: TsNode;
@@ -431,6 +426,8 @@ export async function runWrapperRules(opts: {
   configFile: string;
   /** Only files under here produce diagnostics. */
   appDir: string;
+  /** Restrict eval findings to its submitted module. */
+  diagnosticFile?: string;
   readFile: (p: string) => Promise<string>;
   relative: (from: string, to: string) => string;
   join: (...parts: string[]) => string;
@@ -456,6 +453,13 @@ export async function runWrapperRules(opts: {
     const utils = (await import(opts.join(base, "ast", "utils.js"))) as {
       formatSyntaxKind(k: number): string;
     };
+    // Native TypeScript's flag values differ from the JavaScript compiler's.
+    // Read them from the compiler serving this API; hard-coded TS 5 flags
+    // silently miss wrapped boolean unions in TS 7.
+    const { TypeFlags } = await import(opts.join(base, "enums", "typeFlags.js")) as {
+      TypeFlags: { Object: number; Union: number };
+    };
+    const objectOrUnion = TypeFlags.Object | TypeFlags.Union;
     const visitor = (await import(opts.join(base, "ast", "visitor.js"))) as {
       visitEachChild(n: unknown, cb: (c: unknown) => unknown, ctx: unknown): unknown;
     };
@@ -505,7 +509,8 @@ export async function runWrapperRules(opts: {
     const names = await project.program.getSourceFileNames();
     const files = names.filter(
       (f) =>
-        f.startsWith(`${opts.appDir}/`) && !f.includes("/node_modules/") && !f.endsWith(".d.ts"),
+        f.startsWith(`${opts.appDir}/`) && !f.includes("/node_modules/") && !f.endsWith(".d.ts") &&
+        (!opts.diagnosticFile || f === opts.diagnosticFile),
     );
 
     const diagnostics: WrapperDiagnostic[] = [];
@@ -522,7 +527,7 @@ export async function runWrapperRules(opts: {
       const printed = new Map<number, string>();
       for (let i = 0; i < nodes.length; i += 1) {
         const t = types[i];
-        if (t && (t.flags & OBJECT_OR_UNION) !== 0) {
+        if (t && (t.flags & objectOrUnion) !== 0) {
           printed.set(i, await project.checker.typeToString(t));
         }
       }

package/src/index.ts

@@ -796,13 +796,16 @@ export interface ServiceDefinition<
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type ServicesMap = Record<string, ServiceDefinition<any>>;
 
-/** Awaited return type of a service's `helpers` factory, or `never` if
- * the service doesn't ship one. */
-type HelpersOf<D> = D extends {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  helpers: (...args: any) => infer R;
-}
-  ? Awaited<R>
+/** Awaited return type of a service's helpers factory. Check key presence
+ * before removing optionality: annotations keep `helpers?`, while plain
+ * service literals with no factory must stay out of ctx.svc. */
+type HelpersOf<D> = "helpers" extends keyof D
+  ? [NonNullable<D["helpers"]>] extends [never]
+    ? never
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    : NonNullable<D["helpers"]> extends (...args: any[]) => infer R
+      ? Awaited<R>
+      : never
   : never;
 
 /**