@suss/packs 0.12.0 → 0.13.1

package/dist/drizzle.js

@@ -2,79 +2,24 @@
 import { Node as N } from "ts-morph";
 import { resolveAliasedSymbol } from "@suss/adapter-typescript";
 import { storageBinding } from "@suss/behavioral-ir";
-import { readSqlAccess, sqlFromParts } from "@suss/sql";
+import {
+  compile,
+  constructedFrom,
+  declarationsIn,
+  declaredBy,
+  sqlStatements
+} from "@suss/recognize";
 var QUERY_API_METHODS = /* @__PURE__ */ new Set(["findMany", "findFirst"]);
 var TABLE_FACTORIES = /* @__PURE__ */ new Set(["pgTable", "mysqlTable", "sqliteTable"]);
 var CHAIN_WALK_LIMIT = 12;
-var RAW_METHOD = "execute";
-function makeRawRecognizer(opts) {
+function rawStatements(opts) {
   const storageSystem = opts.storageSystem ?? "postgresql";
-  const scope = opts.scope ?? "default";
-  return ((call) => {
-    const callNode = call;
-    const callee = callNode.getExpression();
-    if (!N.isPropertyAccessExpression(callee)) {
-      return null;
-    }
-    if (callee.getName() !== RAW_METHOD) {
-      return null;
-    }
-    const statement = sqlTextOf(callNode.getArguments()[0]);
-    if (statement === null) {
-      return null;
-    }
-    const accesses = readSqlAccess(statement, { dialect: storageSystem });
-    if (accesses.length === 0) {
-      return null;
-    }
-    return accesses.map((access) => ({
-      type: "interaction",
-      binding: storageBinding({
-        recognition: "@suss/framework-drizzle",
-        storageSystem,
-        scope,
-        container: access.table
-      }),
-      callee: callee.getText(),
-      interaction: {
-        class: "storage-access",
-        kind: access.kind,
-        fields: access.fields,
-        ...access.selector.length > 0 ? { selector: access.selector } : {},
-        operation: callee.getName()
-      }
-    }));
-  });
-}
-function sqlTextOf(argument) {
-  if (argument === void 0) {
-    return null;
-  }
-  if (N.isNoSubstitutionTemplateLiteral(argument)) {
-    return argument.getLiteralValue();
-  }
-  if (N.isTaggedTemplateExpression(argument)) {
-    const template = argument.getTemplate();
-    if (N.isNoSubstitutionTemplateLiteral(template)) {
-      return template.getLiteralValue();
-    }
-    const spans = template.getTemplateSpans();
-    return sqlFromParts(
-      [
-        template.getHead().getLiteralText(),
-        ...spans.map((span) => span.getLiteral().getLiteralText())
-      ],
-      // A statement that interpolates a table interpolates the schema
-      // object, so the name it declares is what belongs in the text.
-      // Everything else is a value, and a parameter is what a value
-      // would have been.
-      spans.map((span) => resolveTableName(span.getExpression()))
-    );
-  }
-  if (N.isStringLiteral(argument)) {
-    return argument.getLiteralValue();
-  }
-  return null;
+  return sqlStatements({
+    system: storageSystem,
+    dialect: storageSystem,
+    scope: opts.scope ?? "default",
+    client: declaredBy("drizzle-orm")
+  }).methods({ execute: { statement: { at: 0 } } }).interpolating({ from: constructedFrom("drizzle-orm"), named: { at: 0 } }).example("db.execute(sql`SELECT id, email FROM users`)");
 }
 function makeRecognizer(opts) {
   const storageSystem = opts.storageSystem ?? "postgresql";
@@ -360,6 +305,7 @@ function selectorFromWhere(whereCall, tableExprText) {
   return columns.size > 0 ? [...columns] : null;
 }
 function drizzleFramework(options = {}) {
+  const raw = rawStatements(options);
   return {
     name: "drizzle",
     protocol: "in-process",
@@ -371,10 +317,11 @@ function drizzleFramework(options = {}) {
     // drizzle-orm/pg-core and driver entry points): files without
     // them can't type-check as Drizzle receivers anyway.
     requiresImport: ["drizzle-orm"],
-    invocationRecognizers: [
-      makeRecognizer(options),
-      makeRawRecognizer(options)
-    ]
+    invocationRecognizers: [makeRecognizer(options)],
+    // A statement can be written as a tagged template, which the
+    // invocation walk never reaches.
+    accessRecognizers: [compile(raw.declared, "@suss/framework-drizzle")],
+    declarations: declarationsIn([raw])
   };
 }
 var index_default = drizzleFramework;

package/dist/fastapi.js

@@ -30,6 +30,7 @@ function fastapiFramework(options = {}) {
         routerComposition: {
           routerConstructorName: "APIRouter",
           includeMethodName: "include_router",
+          routerKeyword: "router",
           prefixKeyword: "prefix"
         }
       }

package/dist/fetch.js

@@ -19,7 +19,7 @@ function webFetchPack() {
             property: "method",
             default: "GET"
           },
-          path: { type: "fromArgumentLiteral", position: 0 }
+          path: { type: "fromArgument", position: 0 }
         },
         // No import gate: `fetch` is a global. Walk every file,
         // the discovery dispatch is itself cheap (just looks for

package/dist/gcs.js

@@ -1,132 +1,53 @@
 // ../framework/gcs/dist/index.js
-import { Node as N } from "ts-morph";
-import { methodDeclaredIn, readName } from "@suss/adapter-typescript";
-import { storageBinding } from "@suss/behavioral-ir";
-var RECOGNITION = "@suss/framework-gcs";
+import { declaredBy, pack, storageCalls } from "@suss/recognize";
 var CLIENT_MODULE = "@google-cloud/storage";
-var OPERATIONS = {
-  download: "read",
-  createReadStream: "read",
-  getMetadata: "read",
-  exists: "read",
-  isPublic: "read",
-  getFiles: "read",
-  save: "write",
-  upload: "write",
-  createWriteStream: "write",
-  delete: "write",
-  copy: "write",
-  move: "write",
-  rename: "write",
-  setMetadata: "write",
-  makePublic: "write",
-  makePrivate: "write"
+var BUCKET_STEP = { to: "receiver", method: "bucket" };
+var FILE_STEP = { to: "receiver", method: "file" };
+var OBJECT = { of: [FILE_STEP], at: 0 };
+var BUCKET = { of: [BUCKET_STEP], at: 0 };
+var READ = { kind: "read", selector: OBJECT };
+var WRITE = { kind: "write", selector: OBJECT };
+var SIGNED_URL = {
+  kind: {
+    asks: { at: 0, property: ["action"] },
+    means: {
+      read: "read",
+      write: "write",
+      delete: "write",
+      resumable: "write"
+    },
+    otherwise: "read"
+  },
+  selector: OBJECT
 };
-var SIGNED_URL = "getSignedUrl";
-var SIGNED_ACTIONS = {
-  read: "read",
-  write: "write",
-  delete: "write",
-  resumable: "write"
+var OPERATIONS = {
+  download: READ,
+  createReadStream: READ,
+  getMetadata: READ,
+  exists: READ,
+  isPublic: READ,
+  getFiles: READ,
+  save: WRITE,
+  upload: WRITE,
+  createWriteStream: WRITE,
+  delete: WRITE,
+  copy: WRITE,
+  move: WRITE,
+  rename: WRITE,
+  setMetadata: WRITE,
+  makePublic: WRITE,
+  makePrivate: WRITE,
+  getSignedUrl: SIGNED_URL
 };
-var BUCKET_STEP = "bucket";
-var FILE_STEP = "file";
-function gcsRecognizer(call, ctx) {
-  const callNode = call;
-  const resolve = ctx.resolveWrittenValue ?? (() => null);
-  const callee = callNode.getExpression();
-  if (!N.isPropertyAccessExpression(callee)) {
-    return null;
-  }
-  const operation = callee.getName();
-  const kind = kindOf(operation, callNode, resolve);
-  if (kind === null || !methodDeclaredIn(callee, CLIENT_MODULE)) {
-    return null;
-  }
-  const chain = walkChain(callee.getExpression(), resolve);
-  return [
-    {
-      type: "interaction",
-      binding: storageBinding({
-        recognition: RECOGNITION,
-        storageSystem: "gcs",
-        scope: "default",
-        container: chain.bucket,
-        accessPath: null
-      }),
-      callee: callee.getText(),
-      interaction: {
-        class: "storage-access",
-        kind,
-        // An object has no fields, so a call says nothing about any.
-        fields: [],
-        operation,
-        ...chain.object !== null ? { selector: [chain.object] } : {}
-      }
-    }
-  ];
-}
-function kindOf(operation, call, resolve) {
-  if (operation !== SIGNED_URL) {
-    return OPERATIONS[operation] ?? null;
-  }
-  const config = call.getArguments()[0];
-  const asked = config === void 0 ? null : property(config, "action");
-  const action = asked === null ? null : readName(asked, { resolve });
-  return action === null ? "read" : SIGNED_ACTIONS[action] ?? "read";
-}
-function walkChain(subject, resolve) {
-  let step = subject;
-  const found = { bucket: null, object: null };
-  for (let hops = 0; step !== null && hops < MAX_CHAIN_STEPS; hops++) {
-    if (N.isIdentifier(step) || N.isPropertyAccessExpression(step)) {
-      const written = resolve(step);
-      step = written === step ? null : written;
-      continue;
-    }
-    if (!N.isCallExpression(step)) {
-      return found;
-    }
-    const callee = step.getExpression();
-    if (!N.isPropertyAccessExpression(callee)) {
-      return found;
-    }
-    const named = callee.getName();
-    const argument = step.getArguments()[0];
-    if (named === FILE_STEP && found.object === null) {
-      found.object = argument === void 0 ? null : readName(argument, { resolve, unsettled: "reference" });
-    }
-    if (named === BUCKET_STEP && found.bucket === null) {
-      found.bucket = argument === void 0 ? null : readName(argument, { resolve, unsettled: "reference" });
-      return found;
-    }
-    step = callee.getExpression();
-  }
-  return found;
-}
-var MAX_CHAIN_STEPS = 8;
-function property(input, name) {
-  if (!N.isObjectLiteralExpression(input)) {
-    return null;
-  }
-  for (const prop of input.getProperties()) {
-    if (N.isPropertyAssignment(prop) && prop.getName() === name) {
-      return prop.getInitializer() ?? null;
-    }
-  }
-  return null;
-}
+var CHAIN_CALLS = storageCalls({
+  system: "gcs",
+  client: declaredBy(CLIENT_MODULE)
+}).methods(OPERATIONS).container(BUCKET).example('storage.bucket("uploads").file("reports/a.pdf").download()');
 function gcsFramework() {
-  return {
-    name: "gcs",
-    protocol: "gcs",
+  return pack("gcs", [CHAIN_CALLS], {
     languages: ["typescript", "javascript"],
-    discovery: [],
-    terminals: [],
-    inputMapping: { type: "positionalParams", params: [] },
-    requiresImport: [CLIENT_MODULE],
-    invocationRecognizers: [gcsRecognizer]
-  };
+    recognizedAs: "@suss/framework-gcs"
+  });
 }
 var index_default = gcsFramework;
 export {