carrick 0.3.105 → 0.3.107

package/sidecar/dist/src/type-structural-expander.js

@@ -31,6 +31,7 @@
 import { ts } from 'ts-morph';
 import { canonicalizeUnionsInText, foldBooleanLiterals, } from './type-text-canonicalizer.js';
 import { isExternalOrigin } from './origin.js';
+import { notePrintedType } from './printed-names.js';
 /**
  * Bound on the structural-expansion recursion. Deep enough for every realistic
  * request/response shape; a backstop against pathological/recursive types the
@@ -385,8 +386,16 @@ function isLibraryType(type, origin) {
 export function namedText(type) {
     return canonicalizeUnionsInText(compilerText(type));
 }
-/** The compiler's print, with the two fallbacks. */
+/**
+ * The compiler's print, with the two fallbacks. The print writes names bare,
+ * whatever scope reads it, so it is noted for the inference (carrick#1836).
+ */
 function compilerText(type) {
+    const text = compilerPrint(type);
+    notePrintedType(type, undefined, text);
+    return text;
+}
+function compilerPrint(type) {
     try {
         return type.getText(undefined, ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.InTypeAlias);
     }

package/sidecar/dist/src/types.d.ts

@@ -38,7 +38,10 @@ export interface ExtractionRule {
     originModuleGlobs?: string[];
     /**
      * Index of the generic type argument containing the payload.
-     * Defaults to 0 (first type arg).
+     * Defaults to 0 (first type arg). It counts the parameters of the name
+     * the rule matched: a type alias named in `wrapperSymbols` is read by its
+     * own parameters, which it may order differently from the type it stands
+     * for (carrick#1843).
      * Examples:
      *   - Response<T> → index 0
      *   - Map<K, V> → index 1 for values
@@ -780,14 +783,18 @@ export interface InferredType {
     array_depth?: number;
     /**
      * Declaration file of `primary_type_symbol` (absolute path), when the
-     * anchor symbol has a resolvable source declaration. Lets the scanner's
-     * pub/sub two-anchor arbitration (carrick#413) re-aim a demoted explicit
+     * anchor symbol has a resolvable source declaration. Reported by every
+     * infer kind that reports the symbol (carrick#1819): it is where a reader
+     * finds the type an anchor names, and the scanner writes an anchor's home
+     * from it. The file is the one that declares the symbol the type resolves
+     * to, never a barrel that re-exports it.
+     *
+     * The scanner's pub/sub two-anchor arbitration (carrick#413) also reads it,
+     * for a borrowed-anchor request only, to re-aim a demoted explicit
      * `SymbolRequest` at the tsc-witnessed payload type: the bundler requires
      * the symbol to be declared in, or re-exported by, the request's
      * `source_file`, and the inference is the only party that knows where that
-     * is. Reported only by
-     * the pub/sub infer kinds (`function_param`, `expression`); other kinds
-     * omit it.
+     * is.
      */
     primary_type_symbol_source?: string;
     /**
@@ -823,6 +830,23 @@ export interface InferredType {
      * stated, or when the only annotation is further away than the read.
      */
     stated_body?: StatedBody;
+    /**
+     * carrick#1836: the declarations behind the names `type_string` prints that
+     * the request's file does not resolve. The printer writes names bare where
+     * no scope reads them, so this is the only record of what they meant. A
+     * name printed for two declarations is listed twice. Absent when there is
+     * nothing to list.
+     */
+    printed_names?: PrintedName[];
+    /**
+     * carrick#1842, `call_result` only: the published `string` is the body read
+     * as raw text, by a `.text()` read of the call's response or by a call whose
+     * signature takes the literal `'text'` the source passes as its body format.
+     * Raw text states no structural contract, so the check phase reads the pair
+     * unverifiable rather than comparing `string` with the other side's body.
+     * Absent when the body is not a raw-text read.
+     */
+    raw_text_read?: true;
 }
 /**
  * What the source states a body read to be (carrick#1749). The scanner
@@ -843,6 +867,11 @@ export interface StatedBody {
     root_source?: string;
     /** Array levels peeled on the way to `root`. Omitted when 0. */
     array_depth?: number;
+    /**
+     * Type arguments written at `root` (`Page<Order>` → 1). Omitted when 0.
+     * `root` alone does not name the body such a statement states.
+     */
+    root_type_arguments?: number;
 }
 /**
  * Why a type carries `any`/`unknown` at a position, and where.
@@ -853,6 +882,8 @@ export interface StatedBody {
  * across the bundle seam.
  */
 export type TypeProvenance = import('./capture/api.js').TypeProvenance;
+/** carrick#1836: declared in the capture bundle, which reads it on a literal anchor. */
+export type PrintedName = import('./capture/api.js').PrintedName;
 export type TypeProvenanceReason = import('./capture/api.js').TypeProvenanceReason;
 /**
  * Source location information for a type

package/sidecar/dist/src/validators.d.ts

@@ -332,18 +332,44 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         type_text: z.ZodString;
         anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         source_file: z.ZodOptional<z.ZodString>;
+        printed_names: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            name: z.ZodString;
+            file: z.ZodString;
+            export_path: z.ZodArray<z.ZodString, "many">;
+        }, "strip", z.ZodTypeAny, {
+            name: string;
+            file: string;
+            export_path: string[];
+        }, {
+            name: string;
+            file: string;
+            export_path: string[];
+        }>, "many">>;
+        raw_text_read: z.ZodOptional<z.ZodLiteral<true>>;
     }, "strip", z.ZodTypeAny, {
         kind: "literal";
         alias: string;
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     }, {
         kind: "literal";
         alias: string;
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     }>]>, "many">;
     out_dir: z.ZodString;
     tsconfig_path: z.ZodOptional<z.ZodString>;
@@ -382,6 +408,12 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     })[];
     out_dir: string;
     tsconfig_path?: string | undefined;
@@ -420,6 +452,12 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     })[];
     out_dir: string;
     tsconfig_path?: string | undefined;
@@ -2077,18 +2115,44 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         type_text: z.ZodString;
         anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         source_file: z.ZodOptional<z.ZodString>;
+        printed_names: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            name: z.ZodString;
+            file: z.ZodString;
+            export_path: z.ZodArray<z.ZodString, "many">;
+        }, "strip", z.ZodTypeAny, {
+            name: string;
+            file: string;
+            export_path: string[];
+        }, {
+            name: string;
+            file: string;
+            export_path: string[];
+        }>, "many">>;
+        raw_text_read: z.ZodOptional<z.ZodLiteral<true>>;
     }, "strip", z.ZodTypeAny, {
         kind: "literal";
         alias: string;
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     }, {
         kind: "literal";
         alias: string;
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     }>]>, "many">;
     out_dir: z.ZodString;
     tsconfig_path: z.ZodOptional<z.ZodString>;
@@ -2127,6 +2191,12 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     })[];
     out_dir: string;
     tsconfig_path?: string | undefined;
@@ -2165,6 +2235,12 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
+        printed_names?: {
+            name: string;
+            file: string;
+            export_path: string[];
+        }[] | undefined;
+        raw_text_read?: true | undefined;
     })[];
     out_dir: string;
     tsconfig_path?: string | undefined;

package/sidecar/dist/src/validators.js

@@ -184,6 +184,14 @@ const CaptureAnchorRequestSchema = z.discriminatedUnion('kind', [
         type_text: z.string().min(1),
         anchor_origin: AnchorOriginSchema,
         source_file: z.string().min(1).optional(),
+        printed_names: z
+            .array(z.object({
+            name: z.string().min(1),
+            file: z.string().min(1),
+            export_path: z.array(z.string().min(1)).min(1),
+        }))
+            .optional(),
+        raw_text_read: z.literal(true).optional(),
     }),
 ]);
 export const CaptureV2RequestSchema = BaseRequestSchema.extend({