@suss/contract-serverless 0.34.0 → 0.35.0

package/dist/index.cjs

@@ -44,6 +44,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_node_path2 = __toESM(require("path"), 1);
 var import_behavioral_ir = require("@suss/behavioral-ir");
+var import_files = require("@suss/behavioral-ir/files");
 var import_contract_cloudformation = require("@suss/contract-cloudformation");
 
 // src/document.ts
@@ -598,10 +599,12 @@ function serverlessFileToSummaries(servicePath, options = {}) {
     return [];
   }
   const document = loadServerlessDocument(located.file);
+  const { projectRoot, ...readOptions } = options;
+  const workspace = (0, import_files.projectNameOf)(import_node_path2.default.dirname(located.file));
   return serverlessToSummaries(document, {
-    ...options,
-    source: options.source ?? (0, import_contract_cloudformation.documentSourceLabel)("serverless", located.file)
-  });
+    ...readOptions,
+    source: options.source ?? (0, import_files.documentSourceLabel)("serverless", located.file, projectRoot)
+  }).map((summary) => (0, import_behavioral_ir.withCodeScopeWorkspace)(summary, workspace));
 }
 function reportUnread(wiring) {
   const where = wiring.functionName === null ? wiring.kind : `${wiring.functionName}.${wiring.kind}`;

package/dist/index.d.cts

@@ -195,11 +195,15 @@ interface ServerlessToSummariesOptions {
      */
     onUnread?: (wiring: UnreadWiring) => void;
 }
+interface ServerlessFileToSummariesOptions extends ServerlessToSummariesOptions {
+    /** Absolute. The directory the service file's label is measured from. */
+    projectRoot?: string;
+}
 declare function serverlessToSummaries(document: ServerlessDocument, options?: ServerlessToSummariesOptions): BehavioralSummary[];
 /**
  * Reads a service file and returns its summaries. The path may be the
  * service file itself or the directory it is in.
  */
-declare function serverlessFileToSummaries(servicePath: string, options?: ServerlessToSummariesOptions): BehavioralSummary[];
+declare function serverlessFileToSummaries(servicePath: string, options?: ServerlessFileToSummariesOptions): BehavioralSummary[];
 
-export { EVENT_TRANSLATIONS, PROGRAM_SERVICE_FILE_NAMES, type ResolvedString, type ResolvedValue, SERVICE_FILE_NAMES, type ServerlessDocument, type ServerlessEvent, type ServerlessFunctionDefinition, type ServerlessToSummariesOptions, type ServiceLocation, type TranslatedService, type UnreadWiring, type VariableResolver, createVariableResolver, findServiceFile, loadServerlessDocument, locateServiceFile, serverlessFileToSummaries, serverlessToSummaries, translateService };
+export { EVENT_TRANSLATIONS, PROGRAM_SERVICE_FILE_NAMES, type ResolvedString, type ResolvedValue, SERVICE_FILE_NAMES, type ServerlessDocument, type ServerlessEvent, type ServerlessFileToSummariesOptions, type ServerlessFunctionDefinition, type ServerlessToSummariesOptions, type ServiceLocation, type TranslatedService, type UnreadWiring, type VariableResolver, createVariableResolver, findServiceFile, loadServerlessDocument, locateServiceFile, serverlessFileToSummaries, serverlessToSummaries, translateService };

package/dist/index.d.ts

@@ -195,11 +195,15 @@ interface ServerlessToSummariesOptions {
      */
     onUnread?: (wiring: UnreadWiring) => void;
 }
+interface ServerlessFileToSummariesOptions extends ServerlessToSummariesOptions {
+    /** Absolute. The directory the service file's label is measured from. */
+    projectRoot?: string;
+}
 declare function serverlessToSummaries(document: ServerlessDocument, options?: ServerlessToSummariesOptions): BehavioralSummary[];
 /**
  * Reads a service file and returns its summaries. The path may be the
  * service file itself or the directory it is in.
  */
-declare function serverlessFileToSummaries(servicePath: string, options?: ServerlessToSummariesOptions): BehavioralSummary[];
+declare function serverlessFileToSummaries(servicePath: string, options?: ServerlessFileToSummariesOptions): BehavioralSummary[];
 
-export { EVENT_TRANSLATIONS, PROGRAM_SERVICE_FILE_NAMES, type ResolvedString, type ResolvedValue, SERVICE_FILE_NAMES, type ServerlessDocument, type ServerlessEvent, type ServerlessFunctionDefinition, type ServerlessToSummariesOptions, type ServiceLocation, type TranslatedService, type UnreadWiring, type VariableResolver, createVariableResolver, findServiceFile, loadServerlessDocument, locateServiceFile, serverlessFileToSummaries, serverlessToSummaries, translateService };
+export { EVENT_TRANSLATIONS, PROGRAM_SERVICE_FILE_NAMES, type ResolvedString, type ResolvedValue, SERVICE_FILE_NAMES, type ServerlessDocument, type ServerlessEvent, type ServerlessFileToSummariesOptions, type ServerlessFunctionDefinition, type ServerlessToSummariesOptions, type ServiceLocation, type TranslatedService, type UnreadWiring, type VariableResolver, createVariableResolver, findServiceFile, loadServerlessDocument, locateServiceFile, serverlessFileToSummaries, serverlessToSummaries, translateService };

package/dist/index.js

@@ -1,10 +1,11 @@
 // src/index.ts
 import path2 from "path";
-import { nestedDocumentLabel } from "@suss/behavioral-ir";
 import {
-  cloudFormationToSummaries,
-  documentSourceLabel
-} from "@suss/contract-cloudformation";
+  nestedDocumentLabel,
+  withCodeScopeWorkspace
+} from "@suss/behavioral-ir";
+import { documentSourceLabel, projectNameOf } from "@suss/behavioral-ir/files";
+import { cloudFormationToSummaries } from "@suss/contract-cloudformation";
 
 // src/document.ts
 import fs from "fs";
@@ -558,10 +559,12 @@ function serverlessFileToSummaries(servicePath, options = {}) {
     return [];
   }
   const document = loadServerlessDocument(located.file);
+  const { projectRoot, ...readOptions } = options;
+  const workspace = projectNameOf(path2.dirname(located.file));
   return serverlessToSummaries(document, {
-    ...options,
-    source: options.source ?? documentSourceLabel("serverless", located.file)
-  });
+    ...readOptions,
+    source: options.source ?? documentSourceLabel("serverless", located.file, projectRoot)
+  }).map((summary) => withCodeScopeWorkspace(summary, workspace));
 }
 function reportUnread(wiring) {
   const where = wiring.functionName === null ? wiring.kind : `${wiring.functionName}.${wiring.kind}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/contract-serverless",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "type": "module",
   "description": "Turn a Serverless Framework serverless.yml into a suss contract and check it against the Lambda handlers and clients behind it.",
   "keywords": [
@@ -48,11 +48,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.34.0",
-    "@suss/contract-aws-apigateway": "0.34.0",
-    "@suss/contract-cloudformation": "0.34.0",
-    "@suss/ir-core": "0.34.0",
-    "@suss/manifest-aws": "0.34.0",
+    "@suss/behavioral-ir": "0.35.0",
+    "@suss/contract-aws-apigateway": "0.35.0",
+    "@suss/contract-cloudformation": "0.35.0",
+    "@suss/ir-core": "0.35.0",
+    "@suss/manifest-aws": "0.35.0",
     "yaml": "^2.4.0"
   },
   "devDependencies": {