@suss/packs 0.34.1 → 0.35.0

package/dist/prisma.js

@@ -14,20 +14,63 @@ import {
   declaredBy,
   sqlStatements
 } from "@suss/recognize";
-import fs from "fs";
-import path from "path";
+import fs3 from "fs";
+import path3 from "path";
 import { getSchema as getSchema2 } from "@mrleebo/prisma-ast";
 import { ts } from "ts-morph";
 
 // ../contract/prisma/dist/index.js
+import fs from "fs";
+import path from "path";
 import { getSchema } from "@mrleebo/prisma-ast";
 import { storageBinding } from "@suss/behavioral-ir";
+import { defaultProjectRoot, pathInProject } from "@suss/behavioral-ir/files";
 var PROVIDER_TO_SYSTEM = {
   postgresql: "postgresql",
   postgres: "postgresql",
   mysql: "mysql",
   sqlite: "sqlite"
 };
+function prismaSchemaFiles(schemaPath) {
+  const stat = statOf(schemaPath);
+  if (stat?.isDirectory() === true) {
+    return prismaFilesIn(schemaPath, true);
+  }
+  if (stat?.isFile() !== true) {
+    return [];
+  }
+  const beside = prismaFilesIn(path.dirname(schemaPath), false).flatMap(
+    (file) => {
+      const list = schemaListOf(file);
+      return list === null ? [] : [{ file, list }];
+    }
+  );
+  const datasources = beside.filter(
+    ({ list }) => list.some(isDatasource)
+  ).length;
+  const given = path.resolve(schemaPath);
+  return datasources === 1 && beside.some(({ file }) => path.resolve(file) === given) ? beside.map(({ file }) => file) : [schemaPath];
+}
+function statOf(file) {
+  try {
+    return fs.statSync(file);
+  } catch {
+    return null;
+  }
+}
+function prismaFilesIn(dir, below) {
+  return fs.readdirSync(dir, { recursive: below, encoding: "utf8" }).filter((name) => name.endsWith(".prisma")).map((name) => path.join(dir, name)).filter((file) => statOf(file)?.isFile() === true).sort();
+}
+function schemaListOf(file) {
+  try {
+    return getSchema(fs.readFileSync(file, "utf8")).list;
+  } catch {
+    return null;
+  }
+}
+function isDatasource(node) {
+  return node.type === "datasource";
+}
 function prismaStorageSystem(source) {
   try {
     return storageSystemIn(getSchema(source).list);
@@ -67,9 +110,9 @@ var CONFIG_FILES = [
   "prisma.config.js",
   "prisma.config.mjs",
   "prisma.config.cjs",
-  path.join(".config", "prisma.ts")
+  path3.join(".config", "prisma.ts")
 ];
-var DEFAULT_SCHEMAS = [path.join("prisma", "schema.prisma"), "schema.prisma"];
+var DEFAULT_SCHEMAS = [path3.join("prisma", "schema.prisma"), "schema.prisma"];
 var readProjects = /* @__PURE__ */ new Map();
 function generatedClientDirs(fromDir) {
   return readProjectAt(fromDir)?.dirs ?? [];
@@ -102,26 +145,26 @@ function readProjectAt(fromDir) {
 }
 function textOf(file) {
   try {
-    return fs.readFileSync(file, "utf8");
+    return fs3.readFileSync(file, "utf8");
   } catch {
     return "";
   }
 }
 function isInGeneratedClient(filePath) {
-  return generatedClientDirs(path.dirname(filePath)).some(
-    (dir) => filePath.startsWith(`${dir}${path.sep}`)
+  return generatedClientDirs(path3.dirname(filePath)).some(
+    (dir) => filePath.startsWith(`${dir}${path3.sep}`)
   );
 }
 function projectFilesOf(root) {
   return [
-    path.join(root, "package.json"),
-    ...CONFIG_FILES.map((name) => path.join(root, name)),
-    ...DEFAULT_SCHEMAS.map((name) => path.join(root, name))
+    path3.join(root, "package.json"),
+    ...CONFIG_FILES.map((name) => path3.join(root, name)),
+    ...DEFAULT_SCHEMAS.map((name) => path3.join(root, name))
   ];
 }
 function changedAt(file) {
   try {
-    return fs.statSync(file).mtimeMs;
+    return fs3.statSync(file).mtimeMs;
   } catch {
     return -1;
   }
@@ -145,12 +188,12 @@ function projectRootOf(fromDir) {
   return root;
 }
 function findProjectRoot(fromDir) {
-  let dir = path.resolve(fromDir);
+  let dir = path3.resolve(fromDir);
   while (true) {
-    if (fs.existsSync(path.join(dir, "package.json")) || configFileIn(dir) !== null) {
+    if (fs3.existsSync(path3.join(dir, "package.json")) || configFileIn(dir) !== null) {
       return dir;
     }
-    const parent = path.dirname(dir);
+    const parent = path3.dirname(dir);
     if (parent === dir) {
       return null;
     }
@@ -159,41 +202,31 @@ function findProjectRoot(fromDir) {
 }
 function configFileIn(dir) {
   for (const name of CONFIG_FILES) {
-    const candidate = path.join(dir, name);
-    if (fs.existsSync(candidate)) {
+    const candidate = path3.join(dir, name);
+    if (fs3.existsSync(candidate)) {
       return candidate;
     }
   }
   return null;
 }
 function schemaFilesOf(root) {
-  const stated = [configuredSchema(root), packageJsonSchema(root)];
+  const manifest = manifestOf(root);
+  const stated = [
+    configuredSchema(root),
+    packageJsonSchema(root, manifest),
+    generateScriptSchema(root, manifest)
+  ];
   for (const schema of [
     ...stated.filter((one) => one !== null),
-    ...DEFAULT_SCHEMAS.map((name) => path.join(root, name))
+    ...DEFAULT_SCHEMAS.map((name) => path3.join(root, name))
   ]) {
-    const files = prismaFilesAt(schema);
+    const files = prismaSchemaFiles(schema);
     if (files.length > 0) {
       return files;
     }
   }
   return [];
 }
-function prismaFilesAt(schemaPath) {
-  let stat;
-  try {
-    stat = fs.statSync(schemaPath);
-  } catch {
-    return [];
-  }
-  if (stat.isFile()) {
-    return [schemaPath];
-  }
-  if (!stat.isDirectory()) {
-    return [];
-  }
-  return fs.readdirSync(schemaPath, { recursive: true, encoding: "utf8" }).filter((name) => name.endsWith(".prisma")).map((name) => path.join(schemaPath, name)).sort();
-}
 function configuredSchema(root) {
   const config = configFileIn(root);
   if (config === null) {
@@ -201,7 +234,7 @@ function configuredSchema(root) {
   }
   const source = ts.createSourceFile(
     config,
-    fs.readFileSync(config, "utf8"),
+    fs3.readFileSync(config, "utf8"),
     ts.ScriptTarget.Latest
   );
   let found = null;
@@ -216,21 +249,31 @@ function configuredSchema(root) {
     ts.forEachChild(node, visit);
   };
   visit(source);
-  return found === null ? null : path.resolve(root, found);
+  return found === null ? null : path3.resolve(root, found);
 }
-function packageJsonSchema(root) {
-  const file = path.join(root, "package.json");
-  if (!fs.existsSync(file)) {
-    return null;
-  }
+function manifestOf(root) {
   try {
-    const manifest = JSON.parse(fs.readFileSync(file, "utf8"));
-    const schema = manifest.prisma?.schema;
-    return typeof schema === "string" ? path.resolve(root, schema) : null;
+    return JSON.parse(
+      fs3.readFileSync(path3.join(root, "package.json"), "utf8")
+    );
   } catch {
     return null;
   }
 }
+function packageJsonSchema(root, manifest) {
+  const schema = manifest?.prisma?.schema;
+  return typeof schema === "string" ? path3.resolve(root, schema) : null;
+}
+var GENERATE_SCHEMA_FLAG = /\bprisma\s+generate\b[^&|;]*?--schema(?:=|\s+)(["']?)([^\s"'&|;]+)\1/;
+function generateScriptSchema(root, manifest) {
+  for (const script of Object.values(manifest?.scripts ?? {})) {
+    const match = typeof script === "string" ? GENERATE_SCHEMA_FLAG.exec(script) : null;
+    if (match?.[2] !== void 0) {
+      return path3.resolve(root, match[2]);
+    }
+  }
+  return null;
+}
 function outputDirsIn(schema) {
   const schemaFile = schema.file;
   let list;
@@ -243,7 +286,7 @@ function outputDirsIn(schema) {
   for (const block of list) {
     const output = generatorOutput(block);
     if (output !== null) {
-      dirs.push(path.resolve(path.dirname(schemaFile), output));
+      dirs.push(path3.resolve(path3.dirname(schemaFile), output));
     }
   }
   return dirs;
@@ -421,7 +464,7 @@ function nestedReads(optionsArg) {
   collectRelations(optionsArg, [], found);
   return found;
 }
-function collectRelations(shape, path3, found) {
+function collectRelations(shape, path32, found) {
   const select = readObjectArg(shape.fields.select);
   if (select !== null) {
     for (const [name, value] of Object.entries(select.fields)) {
@@ -429,7 +472,7 @@ function collectRelations(shape, path3, found) {
       if (nested === null) {
         continue;
       }
-      recordRelation(name, nested, path3, found);
+      recordRelation(name, nested, path32, found);
     }
   }
   const include = readObjectArg(shape.fields.include);
@@ -439,14 +482,14 @@ function collectRelations(shape, path3, found) {
   for (const [name, value] of Object.entries(include.fields)) {
     const nested = readObjectArg(value);
     if (nested === null) {
-      found.push({ relationPath: [...path3, name], fields: ["*"] });
+      found.push({ relationPath: [...path32, name], fields: ["*"] });
       continue;
     }
-    recordRelation(name, nested, path3, found);
+    recordRelation(name, nested, path32, found);
   }
 }
-function recordRelation(name, nested, path3, found) {
-  const relationPath = [...path3, name];
+function recordRelation(name, nested, path32, found) {
+  const relationPath = [...path32, name];
   found.push({ relationPath, fields: extractFields(nested, "read") });
   collectRelations(nested, relationPath, found);
 }
@@ -500,13 +543,13 @@ function nestedWrites(optionsArg) {
   }
   return found;
 }
-function collectNestedWrites(row, path3, found) {
+function collectNestedWrites(row, path32, found) {
   for (const [field, value] of Object.entries(row.fields)) {
     const nested = readObjectArg(value);
     if (nested === null) {
       continue;
     }
-    const relationPath = [...path3, field];
+    const relationPath = [...path32, field];
     for (const [operation, payload] of Object.entries(nested.fields)) {
       const does = NESTED_OPERATIONS.get(operation);
       if (does === void 0) {

package/dist/rails.js

@@ -1362,7 +1362,9 @@ var RelationSchema = z14.enum([
 var EffectRelationSchema = RelationSchema.exclude(["provides"]);
 var SuppressionSideSchema = z22.object({
   summary: z22.string().optional(),
-  transitionId: z22.string().optional()
+  transitionId: z22.string().optional(),
+  /** The field on that side, for a finding about one field and no transition. */
+  field: z22.string().optional()
 }).optional();
 var SuppressionRuleSchema = z22.object({
   /**
@@ -2455,6 +2457,7 @@ var RACK_STATUS_CODE_NAMES = {
   variant_also_negotiates: 506,
   insufficient_storage: 507,
   loop_detected: 508,
+  bandwidth_limit_exceeded: 509,
   not_extended: 510,
   network_authentication_required: 511
 };
@@ -2650,7 +2653,8 @@ function railsFramework(options = {}) {
     options.configDirectory,
     options.routesFile ?? "config/routes.rb"
   );
-  const displayPathOf = (file) => options.configDirectory === void 0 ? file : path5.relative(options.configDirectory, file);
+  const railsRoot = path5.dirname(root);
+  const displayPathOf = (file) => path5.isAbsolute(file) ? path5.relative(railsRoot, file) : file;
   const engineRoots = () => expandPatterns(options.configDirectory, options.engineRoots);
   const extraRoutesFiles = () => expandPatterns(options.configDirectory, options.routesFiles);
   const inflections = options.configDirectory === void 0 ? EMPTY_INFLECTIONS : readInflections(options.configDirectory);
@@ -2658,7 +2662,7 @@ function railsFramework(options = {}) {
   const routesInput = () => ({
     routesFile: {
       file: routesFile,
-      displayPath: options.routesFile ?? "config/routes.rb"
+      displayPath: displayPathOf(routesFile)
     },
     engines: readEngines(engineRoots(), acronyms).map((engine) => ({
       ...engine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/packs",
-  "version": "0.34.1",
+  "version": "0.35.0",
   "type": "module",
   "description": "Every pack suss ships in one install, so it can read Express, Hono, NestJS, FastAPI, Rails, Prisma, OpenAPI and the rest.",
   "keywords": [
@@ -267,15 +267,15 @@
   },
   "dependencies": {
     "@mrleebo/prisma-ast": "^0.15.0",
-    "@suss/adapter-python": "0.34.1",
-    "@suss/adapter-ruby": "0.34.1",
-    "@suss/adapter-typescript": "0.34.1",
-    "@suss/behavioral-ir": "0.34.1",
-    "@suss/contract-graphql": "0.34.1",
-    "@suss/extractor": "0.34.1",
-    "@suss/manifest-aws": "0.34.1",
-    "@suss/recognize": "0.34.1",
-    "@suss/sql": "0.34.1",
+    "@suss/adapter-python": "0.35.0",
+    "@suss/adapter-ruby": "0.35.0",
+    "@suss/adapter-typescript": "0.35.0",
+    "@suss/behavioral-ir": "0.35.0",
+    "@suss/contract-graphql": "0.35.0",
+    "@suss/extractor": "0.35.0",
+    "@suss/manifest-aws": "0.35.0",
+    "@suss/recognize": "0.35.0",
+    "@suss/sql": "0.35.0",
     "zod": "^4.0.0"
   },
   "devDependencies": {