@suss/adapter-typescript 0.24.1 → 0.24.3

package/dist/index.cjs

@@ -12893,6 +12893,7 @@ function parameterName(segment, convention) {
 }
 
 // src/discovery/graphqlClientConstruction.ts
+var import_graphql2 = require("graphql");
 var import_picomatch2 = __toESM(require("picomatch"), 1);
 var import_ts_morph58 = require("ts-morph");
 var import_behavioral_ir5 = require("@suss/behavioral-ir");
@@ -12904,15 +12905,20 @@ function stampGraphqlClientRefs(summaries, sourceFiles, packs, resolution) {
   const workspace = sole !== null ? boundWorkspaceFor(sole, packs) : null;
   const soleClient = sole !== null ? workspace !== null ? { ...sole, workspace } : sole : null;
   let registry = null;
+  let defined = null;
   for (const summary of summaries) {
     if (!(0, import_behavioral_ir5.isGraphqlOperationBinding)(summary.identity.boundaryBinding)) {
       continue;
     }
-    const existing = (0, import_behavioral_ir5.readGraphqlMetadata)(summary) ?? {};
+    const found = (0, import_behavioral_ir5.readGraphqlMetadata)(summary) ?? {};
+    const existing = withoutFragmentsDefinedElsewhere(found, () => {
+      defined ??= fragmentsRegisteredIn(sourceFiles);
+      return defined;
+    });
     const scoped = scopedWorkspaceFor(summary.location.file, scopes);
     const client = scoped !== null ? { uri: null, uriRef: null, workspace: scoped } : soleClient;
     const dangling = (existing.unresolvedFragments?.length ?? 0) > 0;
-    if (client === null && !dangling) {
+    if (client === null && !dangling && existing === found) {
       continue;
     }
     if (dangling && registry === null) {
@@ -12925,6 +12931,56 @@ function stampGraphqlClientRefs(summaries, sourceFiles, packs, resolution) {
     });
   }
 }
+function fragmentsRegisteredIn(sourceFiles) {
+  const registered = /* @__PURE__ */ new Set();
+  for (const sourceFile of sourceFiles) {
+    sourceFile.forEachDescendant((node) => {
+      if (!import_ts_morph58.Node.isCallExpression(node)) {
+        return;
+      }
+      const argument = node.getArguments()[0];
+      if (argument === void 0 || !import_ts_morph58.Node.isNoSubstitutionTemplateLiteral(argument)) {
+        return;
+      }
+      for (const name of fragmentOnlyDocumentNames(argument.getLiteralText())) {
+        registered.add(name);
+      }
+    });
+  }
+  return registered;
+}
+function fragmentOnlyDocumentNames(text) {
+  if (!text.includes("fragment")) {
+    return [];
+  }
+  let parsed;
+  try {
+    parsed = (0, import_graphql2.parse)(text);
+  } catch {
+    return [];
+  }
+  const names = [];
+  for (const definition of parsed.definitions) {
+    if (definition.kind !== "FragmentDefinition") {
+      return [];
+    }
+    names.push(definition.name.value);
+  }
+  return names;
+}
+function withoutFragmentsDefinedElsewhere(metadata, definedInProject) {
+  const unresolved = metadata.unresolvedFragments ?? [];
+  if (unresolved.length === 0) {
+    return metadata;
+  }
+  const defined = definedInProject();
+  const left = unresolved.filter((name) => !defined.has(name));
+  if (left.length === unresolved.length) {
+    return metadata;
+  }
+  const { unresolvedFragments: _dropped, ...rest } = metadata;
+  return left.length === 0 ? rest : { ...rest, unresolvedFragments: left };
+}
 function compileOperationScopes(packs) {
   return packs.flatMap((pack) => pack.graphqlOperationScopes ?? []).map((scope) => {
     const matchers2 = scope.files.map(
@@ -13979,7 +14035,7 @@ function isJsxOrFragment(node) {
 }
 
 // src/graphqlContract.ts
-var import_graphql2 = require("graphql");
+var import_graphql3 = require("graphql");
 var parseCache = /* @__PURE__ */ new Map();
 function parseSchema(sdl) {
   const cached = parseCache.get(sdl);
@@ -13987,7 +14043,7 @@ function parseSchema(sdl) {
     return cached;
   }
   try {
-    const doc = (0, import_graphql2.parse)(sdl);
+    const doc = (0, import_graphql3.parse)(sdl);
     parseCache.set(sdl, doc);
     return doc;
   } catch (_err) {
@@ -14009,7 +14065,7 @@ function deriveGraphqlContract(sdl, typeName, fieldName, framework) {
     args: (field.arguments ?? []).map((arg) => ({
       name: arg.name.value,
       type: typeNodeToShape(arg.type),
-      required: arg.type.kind === import_graphql2.Kind.NON_NULL_TYPE
+      required: arg.type.kind === import_graphql3.Kind.NON_NULL_TYPE
     })),
     provenance: "derived",
     framework
@@ -14017,7 +14073,7 @@ function deriveGraphqlContract(sdl, typeName, fieldName, framework) {
 }
 function findField(doc, typeName, fieldName) {
   for (const def of doc.definitions) {
-    if (def.kind !== import_graphql2.Kind.OBJECT_TYPE_DEFINITION && def.kind !== import_graphql2.Kind.OBJECT_TYPE_EXTENSION) {
+    if (def.kind !== import_graphql3.Kind.OBJECT_TYPE_DEFINITION && def.kind !== import_graphql3.Kind.OBJECT_TYPE_EXTENSION) {
       continue;
     }
     const node = def;
@@ -14033,10 +14089,10 @@ function findField(doc, typeName, fieldName) {
   return null;
 }
 function typeNodeToShape(node) {
-  if (node.kind === import_graphql2.Kind.NON_NULL_TYPE) {
+  if (node.kind === import_graphql3.Kind.NON_NULL_TYPE) {
     return typeNodeToShape(node.type);
   }
-  if (node.kind === import_graphql2.Kind.LIST_TYPE) {
+  if (node.kind === import_graphql3.Kind.LIST_TYPE) {
     return { type: "array", items: typeNodeToShape(node.type) };
   }
   return scalarOrRef(node);

package/dist/index.js

@@ -12914,6 +12914,9 @@ function parameterName(segment, convention) {
 }
 
 // src/discovery/graphqlClientConstruction.ts
+import {
+  parse as graphqlParse2
+} from "graphql";
 import picomatch2 from "picomatch";
 import {
   Node as Node55
@@ -12931,15 +12934,20 @@ function stampGraphqlClientRefs(summaries, sourceFiles, packs, resolution) {
   const workspace = sole !== null ? boundWorkspaceFor(sole, packs) : null;
   const soleClient = sole !== null ? workspace !== null ? { ...sole, workspace } : sole : null;
   let registry = null;
+  let defined = null;
   for (const summary of summaries) {
     if (!isGraphqlOperationBinding(summary.identity.boundaryBinding)) {
       continue;
     }
-    const existing = readGraphqlMetadata(summary) ?? {};
+    const found = readGraphqlMetadata(summary) ?? {};
+    const existing = withoutFragmentsDefinedElsewhere(found, () => {
+      defined ??= fragmentsRegisteredIn(sourceFiles);
+      return defined;
+    });
     const scoped = scopedWorkspaceFor(summary.location.file, scopes);
     const client = scoped !== null ? { uri: null, uriRef: null, workspace: scoped } : soleClient;
     const dangling = (existing.unresolvedFragments?.length ?? 0) > 0;
-    if (client === null && !dangling) {
+    if (client === null && !dangling && existing === found) {
       continue;
     }
     if (dangling && registry === null) {
@@ -12952,6 +12960,56 @@ function stampGraphqlClientRefs(summaries, sourceFiles, packs, resolution) {
     });
   }
 }
+function fragmentsRegisteredIn(sourceFiles) {
+  const registered = /* @__PURE__ */ new Set();
+  for (const sourceFile of sourceFiles) {
+    sourceFile.forEachDescendant((node) => {
+      if (!Node55.isCallExpression(node)) {
+        return;
+      }
+      const argument = node.getArguments()[0];
+      if (argument === void 0 || !Node55.isNoSubstitutionTemplateLiteral(argument)) {
+        return;
+      }
+      for (const name of fragmentOnlyDocumentNames(argument.getLiteralText())) {
+        registered.add(name);
+      }
+    });
+  }
+  return registered;
+}
+function fragmentOnlyDocumentNames(text) {
+  if (!text.includes("fragment")) {
+    return [];
+  }
+  let parsed;
+  try {
+    parsed = graphqlParse2(text);
+  } catch {
+    return [];
+  }
+  const names = [];
+  for (const definition of parsed.definitions) {
+    if (definition.kind !== "FragmentDefinition") {
+      return [];
+    }
+    names.push(definition.name.value);
+  }
+  return names;
+}
+function withoutFragmentsDefinedElsewhere(metadata, definedInProject) {
+  const unresolved = metadata.unresolvedFragments ?? [];
+  if (unresolved.length === 0) {
+    return metadata;
+  }
+  const defined = definedInProject();
+  const left = unresolved.filter((name) => !defined.has(name));
+  if (left.length === unresolved.length) {
+    return metadata;
+  }
+  const { unresolvedFragments: _dropped, ...rest } = metadata;
+  return left.length === 0 ? rest : { ...rest, unresolvedFragments: left };
+}
 function compileOperationScopes(packs) {
   return packs.flatMap((pack) => pack.graphqlOperationScopes ?? []).map((scope) => {
     const matchers2 = scope.files.map(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.24.1",
+  "version": "0.24.3",
   "type": "module",
   "description": "Read a TypeScript or JavaScript codebase with suss and check what each handler returns against every caller, spec and template it can see.",
   "keywords": [
@@ -48,11 +48,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.24.1",
-    "@suss/datalog": "0.24.1",
-    "@suss/extractor": "0.24.1",
-    "@suss/resolution": "0.24.1",
-    "@suss/values": "0.24.1",
+    "@suss/behavioral-ir": "0.24.3",
+    "@suss/datalog": "0.24.3",
+    "@suss/extractor": "0.24.3",
+    "@suss/resolution": "0.24.3",
+    "@suss/values": "0.24.3",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0",