@suss/manifest-aws 0.35.1 → 0.37.0

package/dist/index.cjs

@@ -32,14 +32,18 @@ var index_exports = {};
 __export(index_exports, {
   CLOUDFORMATION_YAML_TAGS: () => CLOUDFORMATION_YAML_TAGS,
   MAX_STACK_DEPTH: () => MAX_STACK_DEPTH,
+  apiScopedKey: () => apiScopedKey,
+  documentRef: () => documentRef,
   inheritedEnvVars: () => inheritedEnvVars,
+  loadCloudFormationDocument: () => loadCloudFormationDocument,
   loadCloudFormationTemplate: () => loadCloudFormationTemplate,
   loadTemplateTree: () => loadTemplateTree,
   parseHandler: () => import_ir_core2.parseHandler,
   qualifiedLogicalId: () => qualifiedLogicalId,
   readAppSyncResolvers: () => readAppSyncResolvers,
+  readEventPattern: () => readEventPattern,
+  readResourceLines: () => readResourceLines,
   readServerlessFunctions: () => readServerlessFunctions,
-  reduceEventPattern: () => reduceEventPattern,
   refTarget: () => refTarget,
   resolveBucketChannel: () => resolveBucketChannel,
   resolveEventBusToken: () => resolveEventBusToken,
@@ -97,6 +101,9 @@ var CLOUDFORMATION_YAML_TAGS = [
   ].flatMap((tag) => everyNodeKind(tag, (value) => value))
 ];
 function loadCloudFormationTemplate(templatePath) {
+  return loadCloudFormationDocument(templatePath).template;
+}
+function loadCloudFormationDocument(templatePath) {
   const resolved = import_node_path.default.resolve(templatePath);
   if (!import_node_fs.default.existsSync(resolved)) {
     throw new Error(`CloudFormation template not found: ${resolved}`);
@@ -107,7 +114,30 @@ function loadCloudFormationTemplate(templatePath) {
   if (parsed === null || typeof parsed !== "object") {
     throw new Error(`CloudFormation template is not an object: ${resolved}`);
   }
-  return parsed;
+  return {
+    template: parsed,
+    resourceLines: readResourceLines(raw)
+  };
+}
+function readResourceLines(raw) {
+  const lines = /* @__PURE__ */ new Map();
+  const lineCounter = new import_yaml.LineCounter();
+  const document = import_yaml.default.parseDocument(raw, {
+    customTags: CLOUDFORMATION_YAML_TAGS,
+    lineCounter
+  });
+  const resources = document.get("Resources", true);
+  if (!(0, import_yaml.isMap)(resources)) {
+    return lines;
+  }
+  for (const item of resources.items) {
+    const key = item.key;
+    if (!(0, import_yaml.isScalar)(key) || key.range === void 0 || key.range === null) {
+      continue;
+    }
+    lines.set(String(key.value), lineCounter.linePos(key.range[0]).line);
+  }
+  return lines;
 }
 function refTarget(value) {
   if (typeof value === "string") {
@@ -332,40 +362,36 @@ function resolveBucketChannel(value) {
 }
 
 // src/eventPattern.ts
-function reduceEventPattern(pattern) {
+var STATED_FIELDS = /* @__PURE__ */ new Set(["detail-type", "source"]);
+function readEventPattern(pattern) {
   if (pattern === null || typeof pattern !== "object") {
-    return {
-      kind: "unresolvable",
-      reason: "rule declares no EventPattern"
-    };
-  }
-  const detailType = pattern["detail-type"];
-  if (detailType === void 0) {
-    return {
-      kind: "unresolvable",
-      reason: "EventPattern has no detail-type; v0 reduces routing to exact detail-type match only"
-    };
-  }
-  if (!Array.isArray(detailType)) {
-    return {
-      kind: "unresolvable",
-      reason: "detail-type is not a plain array of string literals"
-    };
+    return null;
   }
-  const detailTypes = [];
-  for (const entry of detailType) {
-    if (typeof entry !== "string") {
-      return {
-        kind: "unresolvable",
-        reason: "detail-type contains a content filter (prefix / anything-but / etc.); pattern subsumption is out of v0 scope"
-      };
-    }
-    detailTypes.push(entry);
+  const record = pattern;
+  const detailTypes = literalValues(record["detail-type"]);
+  const sources = literalValues(record.source);
+  const unsettled = [
+    ...detailTypes === "unsettled" ? ["detail-type"] : [],
+    ...sources === "unsettled" ? ["source"] : []
+  ];
+  return {
+    ...Array.isArray(detailTypes) ? { detailTypes } : {},
+    ...Array.isArray(sources) ? { sources } : {},
+    unsettled,
+    filtersOtherFields: Object.keys(record).some(
+      (key) => !STATED_FIELDS.has(key)
+    ),
+    emittedByAws: Array.isArray(sources) && sources.some((source) => source.startsWith("aws."))
+  };
+}
+function literalValues(value) {
+  if (value === void 0) {
+    return null;
   }
-  if (detailTypes.length === 0) {
-    return { kind: "unresolvable", reason: "detail-type array is empty" };
+  if (!Array.isArray(value) || value.length === 0 || !value.every((entry) => typeof entry === "string")) {
+    return "unsettled";
   }
-  return { kind: "exact", detailTypes };
+  return value;
 }
 function resolveEventBusToken(value) {
   if (value === null || value === void 0) {
@@ -484,12 +510,40 @@ var CHILD_TEMPLATE_PROPERTY = {
   "AWS::Serverless::Application": "Location"
 };
 var MAX_STACK_DEPTH = 10;
+function documentRef(document, value) {
+  const id = refTarget(value);
+  if (id === null) {
+    return null;
+  }
+  return document.parameterTargets.get(id) ?? qualifiedLogicalId(document.stackPath, id);
+}
+function parameterTargetsOf(parent, passed) {
+  const targets = /* @__PURE__ */ new Map();
+  if (passed === null || typeof passed !== "object") {
+    return targets;
+  }
+  const resources = parent.template.Resources ?? {};
+  for (const [name, value] of Object.entries(
+    passed
+  )) {
+    const id = refTarget(value);
+    if (id === null || typeof value === "string") {
+      continue;
+    }
+    const target = parent.parameterTargets.get(id) ?? (resources[id] === void 0 ? null : qualifiedLogicalId(parent.stackPath, id));
+    if (target !== null) {
+      targets.set(name, target);
+    }
+  }
+  return targets;
+}
 function loadTemplateTree(rootPath) {
   const rootFile = import_node_path2.default.resolve(rootPath);
   const root = {
     path: rootFile,
     stackPath: [],
-    template: loadCloudFormationTemplate(rootFile)
+    ...loadCloudFormationDocument(rootFile),
+    parameterTargets: /* @__PURE__ */ new Map()
   };
   const documents = [root];
   const unfollowed = [];
@@ -533,7 +587,8 @@ function childStacksOf(document, ancestors) {
         document,
         ancestors,
         logicalId,
-        location: resource.Properties?.[property]
+        location: resource.Properties?.[property],
+        parameters: resource.Properties?.Parameters
       })
     );
   }
@@ -595,7 +650,8 @@ function childStack(opts) {
       document: {
         path: childPath,
         stackPath,
-        template: loadCloudFormationTemplate(childPath)
+        ...loadCloudFormationDocument(childPath),
+        parameterTargets: parameterTargetsOf(opts.document, opts.parameters)
       }
     };
   } catch (err) {
@@ -666,7 +722,9 @@ function readServerlessFunctions(template) {
     if (typeof handlerRaw !== "string") {
       continue;
     }
-    const parsed = (0, import_ir_core.parseHandler)(handlerRaw);
+    const runtimeRaw = resource.Properties?.Runtime;
+    const runtime = typeof runtimeRaw === "string" ? runtimeRaw : void 0;
+    const parsed = (0, import_ir_core.parseHandler)(handlerRaw, runtime);
     if (parsed === null) {
       continue;
     }
@@ -679,6 +737,7 @@ function readServerlessFunctions(template) {
       modulePath: parsed.modulePath,
       exportName: parsed.exportName,
       codeUri: readCodeUri(resource),
+      ...runtime !== void 0 ? { runtime } : {},
       httpRoutes,
       nonHttpEvents
     });
@@ -689,14 +748,18 @@ function readServerlessFunctions(template) {
 0 && (module.exports = {
   CLOUDFORMATION_YAML_TAGS,
   MAX_STACK_DEPTH,
+  apiScopedKey,
+  documentRef,
   inheritedEnvVars,
+  loadCloudFormationDocument,
   loadCloudFormationTemplate,
   loadTemplateTree,
   parseHandler,
   qualifiedLogicalId,
   readAppSyncResolvers,
+  readEventPattern,
+  readResourceLines,
   readServerlessFunctions,
-  reduceEventPattern,
   refTarget,
   resolveBucketChannel,
   resolveEventBusToken,

package/dist/index.d.cts

@@ -35,6 +35,19 @@ declare const CLOUDFORMATION_YAML_TAGS: YAML.CollectionTag[];
  * malformed manifest is a load-time error rather than an empty result.
  */
 declare function loadCloudFormationTemplate(templatePath: string): CloudFormationTemplate;
+interface LoadedTemplate {
+    template: CloudFormationTemplate;
+    /** The 1-based line each resource's logical id is written on. */
+    resourceLines: Map<string, number>;
+}
+/** `loadCloudFormationTemplate`, plus the line each resource starts on. */
+declare function loadCloudFormationDocument(templatePath: string): LoadedTemplate;
+/**
+ * The line each key under `Resources` is written on. JSON is valid YAML,
+ * so one reader covers both formats. A text that does not parse gives
+ * an empty map, and its summaries keep line 1.
+ */
+declare function readResourceLines(raw: string): Map<string, number>;
 /**
  * CloudFormation references come out of the parser in four forms:
  *   - { Ref: "LogicalId" }
@@ -81,6 +94,8 @@ interface AppSyncResolverBinding {
     lambdaFunctionLogicalIds: string[];
 }
 declare function readAppSyncResolvers(template: CloudFormationTemplate): AppSyncResolverBinding[];
+/** A name only means something next to the API it was declared in. */
+declare function apiScopedKey(apiId: string | null, name: string): string;
 
 /**
  * Resolves the references AWS manifests use to point at a queue, a topic,
@@ -128,25 +143,32 @@ declare function resolveBucketChannel(value: unknown): string | null;
  * CloudFormation template and in a serverless.yml eventBridge event, so
  * both readers reduce them here.
  */
+/** A pattern field that is not a plain list of strings. */
+type UnsettledPatternField = "detail-type" | "source";
 /**
- * How far a rule's EventPattern reduced: either to the exact
- * detail-types it lists, or not at all, along with a reason someone can
- * read.
+ * What a rule's EventPattern says about the two fields a send states.
+ * A field the pattern leaves out matches every value, so it has no
+ * entry here. A field written as anything but a list of strings, such
+ * as a prefix filter, is listed in `unsettled`.
  */
-type PatternReduction = {
-    kind: "exact";
-    detailTypes: string[];
-} | {
-    kind: "unresolvable";
-    reason: string;
-};
-/**
- * Reduce a rule's EventPattern to the exact set of DetailTypes it
- * matches. Only a literal `detail-type` array reduces. Anything else,
- * such as a missing detail-type, a content filter or an empty array,
- * comes back unresolvable with a reason, and the checker reports it.
- */
-declare function reduceEventPattern(pattern: unknown): PatternReduction;
+interface EventPatternFields {
+    detailTypes?: string[];
+    sources?: string[];
+    unsettled: UnsettledPatternField[];
+    /**
+     * The pattern also filters on a field a send does not state, such as
+     * `detail`, so a send that agrees on source and detail-type still
+     * reaches the rule only for some events.
+     */
+    filtersOtherFields: boolean;
+    /**
+     * A source starts with `aws.`. Only AWS services send those, and
+     * PutEvents refuses them from anyone else.
+     */
+    emittedByAws: boolean;
+}
+/** Null when the rule declares no EventPattern at all. */
+declare function readEventPattern(pattern: unknown): EventPatternFields | null;
 /**
  * Resolve a rule's EventBusName to the channel's bus token: the CFN
  * logical id when it's a Ref/GetAtt, the name segment of an event-bus
@@ -217,7 +239,22 @@ interface TemplateDocument {
      */
     stackPath: string[];
     template: CloudFormationTemplate;
+    /** The 1-based line each resource's logical id is written on. */
+    resourceLines: Map<string, number>;
+    /**
+     * The resource each of this document's parameters points at, for a
+     * parameter the parent stack sets to a reference. The id is qualified
+     * by its own document's stack path, so a child's `!Ref ApiId` can be
+     * read as the API its parent declares. Empty for the root.
+     */
+    parameterTargets: Map<string, string>;
 }
+/**
+ * The qualified logical id a reference in this document points at: the
+ * resource the parent passed in as a parameter, or the document's own.
+ * Null for a value only known at deploy time.
+ */
+declare function documentRef(document: Pick<TemplateDocument, "stackPath" | "parameterTargets">, value: unknown): string | null;
 /**
  * Why a child template was not read. Every value is a limit on what the
  * reader could reach, so a consumer should report it as a read that
@@ -309,15 +346,17 @@ interface ServerlessFunctionInfo {
     logicalId: string;
     /** Raw Handler string, e.g. "src/handlers/confirmToken.handler". */
     handler: string;
-    /** Module-path portion of the handler (everything before the final dot). */
+    /** Module-path portion of the handler, as `parseHandler` splits it. */
     modulePath: string;
-    /** Exported symbol the handler points at (everything after the final dot). */
+    /** The function the handler points at, as `parseHandler` splits it. */
     exportName: string;
     /**
      * CodeUri base directory the handler resolves against: the function's
      * own CodeUri, else the `Globals.Function.CodeUri` default, else ".".
      */
     codeUri: string;
+    /** The `Runtime`, from the function or Globals, when the template states one. */
+    runtime?: string;
     httpRoutes: ServerlessHttpRoute[];
     nonHttpEvents: ServerlessNonHttpEvent[];
 }
@@ -331,4 +370,4 @@ interface ServerlessFunctionInfo {
  */
 declare function readServerlessFunctions(template: CloudFormationTemplate): ServerlessFunctionInfo[];
 
-export { type AppSyncResolverBinding, CLOUDFORMATION_YAML_TAGS, type CloudFormationResource, type CloudFormationTemplate, MAX_STACK_DEPTH, type PatternReduction, type ServerlessFunctionInfo, type ServerlessHttpRoute, type ServerlessNonHttpEvent, type TemplateDocument, type TemplateTree, type UnfollowedReason, type UnfollowedStack, inheritedEnvVars, loadCloudFormationTemplate, loadTemplateTree, qualifiedLogicalId, readAppSyncResolvers, readServerlessFunctions, reduceEventPattern, refTarget, resolveBucketChannel, resolveEventBusToken, resolveQueueChannel, resolveResourceChannel, resolveTopicChannel, resourcesWithGlobals, unfollowedStackMessage };
+export { type AppSyncResolverBinding, CLOUDFORMATION_YAML_TAGS, type CloudFormationResource, type CloudFormationTemplate, type EventPatternFields, type LoadedTemplate, MAX_STACK_DEPTH, type ServerlessFunctionInfo, type ServerlessHttpRoute, type ServerlessNonHttpEvent, type TemplateDocument, type TemplateTree, type UnfollowedReason, type UnfollowedStack, type UnsettledPatternField, apiScopedKey, documentRef, inheritedEnvVars, loadCloudFormationDocument, loadCloudFormationTemplate, loadTemplateTree, qualifiedLogicalId, readAppSyncResolvers, readEventPattern, readResourceLines, readServerlessFunctions, refTarget, resolveBucketChannel, resolveEventBusToken, resolveQueueChannel, resolveResourceChannel, resolveTopicChannel, resourcesWithGlobals, unfollowedStackMessage };

package/dist/index.d.ts

@@ -35,6 +35,19 @@ declare const CLOUDFORMATION_YAML_TAGS: YAML.CollectionTag[];
  * malformed manifest is a load-time error rather than an empty result.
  */
 declare function loadCloudFormationTemplate(templatePath: string): CloudFormationTemplate;
+interface LoadedTemplate {
+    template: CloudFormationTemplate;
+    /** The 1-based line each resource's logical id is written on. */
+    resourceLines: Map<string, number>;
+}
+/** `loadCloudFormationTemplate`, plus the line each resource starts on. */
+declare function loadCloudFormationDocument(templatePath: string): LoadedTemplate;
+/**
+ * The line each key under `Resources` is written on. JSON is valid YAML,
+ * so one reader covers both formats. A text that does not parse gives
+ * an empty map, and its summaries keep line 1.
+ */
+declare function readResourceLines(raw: string): Map<string, number>;
 /**
  * CloudFormation references come out of the parser in four forms:
  *   - { Ref: "LogicalId" }
@@ -81,6 +94,8 @@ interface AppSyncResolverBinding {
     lambdaFunctionLogicalIds: string[];
 }
 declare function readAppSyncResolvers(template: CloudFormationTemplate): AppSyncResolverBinding[];
+/** A name only means something next to the API it was declared in. */
+declare function apiScopedKey(apiId: string | null, name: string): string;
 
 /**
  * Resolves the references AWS manifests use to point at a queue, a topic,
@@ -128,25 +143,32 @@ declare function resolveBucketChannel(value: unknown): string | null;
  * CloudFormation template and in a serverless.yml eventBridge event, so
  * both readers reduce them here.
  */
+/** A pattern field that is not a plain list of strings. */
+type UnsettledPatternField = "detail-type" | "source";
 /**
- * How far a rule's EventPattern reduced: either to the exact
- * detail-types it lists, or not at all, along with a reason someone can
- * read.
+ * What a rule's EventPattern says about the two fields a send states.
+ * A field the pattern leaves out matches every value, so it has no
+ * entry here. A field written as anything but a list of strings, such
+ * as a prefix filter, is listed in `unsettled`.
  */
-type PatternReduction = {
-    kind: "exact";
-    detailTypes: string[];
-} | {
-    kind: "unresolvable";
-    reason: string;
-};
-/**
- * Reduce a rule's EventPattern to the exact set of DetailTypes it
- * matches. Only a literal `detail-type` array reduces. Anything else,
- * such as a missing detail-type, a content filter or an empty array,
- * comes back unresolvable with a reason, and the checker reports it.
- */
-declare function reduceEventPattern(pattern: unknown): PatternReduction;
+interface EventPatternFields {
+    detailTypes?: string[];
+    sources?: string[];
+    unsettled: UnsettledPatternField[];
+    /**
+     * The pattern also filters on a field a send does not state, such as
+     * `detail`, so a send that agrees on source and detail-type still
+     * reaches the rule only for some events.
+     */
+    filtersOtherFields: boolean;
+    /**
+     * A source starts with `aws.`. Only AWS services send those, and
+     * PutEvents refuses them from anyone else.
+     */
+    emittedByAws: boolean;
+}
+/** Null when the rule declares no EventPattern at all. */
+declare function readEventPattern(pattern: unknown): EventPatternFields | null;
 /**
  * Resolve a rule's EventBusName to the channel's bus token: the CFN
  * logical id when it's a Ref/GetAtt, the name segment of an event-bus
@@ -217,7 +239,22 @@ interface TemplateDocument {
      */
     stackPath: string[];
     template: CloudFormationTemplate;
+    /** The 1-based line each resource's logical id is written on. */
+    resourceLines: Map<string, number>;
+    /**
+     * The resource each of this document's parameters points at, for a
+     * parameter the parent stack sets to a reference. The id is qualified
+     * by its own document's stack path, so a child's `!Ref ApiId` can be
+     * read as the API its parent declares. Empty for the root.
+     */
+    parameterTargets: Map<string, string>;
 }
+/**
+ * The qualified logical id a reference in this document points at: the
+ * resource the parent passed in as a parameter, or the document's own.
+ * Null for a value only known at deploy time.
+ */
+declare function documentRef(document: Pick<TemplateDocument, "stackPath" | "parameterTargets">, value: unknown): string | null;
 /**
  * Why a child template was not read. Every value is a limit on what the
  * reader could reach, so a consumer should report it as a read that
@@ -309,15 +346,17 @@ interface ServerlessFunctionInfo {
     logicalId: string;
     /** Raw Handler string, e.g. "src/handlers/confirmToken.handler". */
     handler: string;
-    /** Module-path portion of the handler (everything before the final dot). */
+    /** Module-path portion of the handler, as `parseHandler` splits it. */
     modulePath: string;
-    /** Exported symbol the handler points at (everything after the final dot). */
+    /** The function the handler points at, as `parseHandler` splits it. */
     exportName: string;
     /**
      * CodeUri base directory the handler resolves against: the function's
      * own CodeUri, else the `Globals.Function.CodeUri` default, else ".".
      */
     codeUri: string;
+    /** The `Runtime`, from the function or Globals, when the template states one. */
+    runtime?: string;
     httpRoutes: ServerlessHttpRoute[];
     nonHttpEvents: ServerlessNonHttpEvent[];
 }
@@ -331,4 +370,4 @@ interface ServerlessFunctionInfo {
  */
 declare function readServerlessFunctions(template: CloudFormationTemplate): ServerlessFunctionInfo[];
 
-export { type AppSyncResolverBinding, CLOUDFORMATION_YAML_TAGS, type CloudFormationResource, type CloudFormationTemplate, MAX_STACK_DEPTH, type PatternReduction, type ServerlessFunctionInfo, type ServerlessHttpRoute, type ServerlessNonHttpEvent, type TemplateDocument, type TemplateTree, type UnfollowedReason, type UnfollowedStack, inheritedEnvVars, loadCloudFormationTemplate, loadTemplateTree, qualifiedLogicalId, readAppSyncResolvers, readServerlessFunctions, reduceEventPattern, refTarget, resolveBucketChannel, resolveEventBusToken, resolveQueueChannel, resolveResourceChannel, resolveTopicChannel, resourcesWithGlobals, unfollowedStackMessage };
+export { type AppSyncResolverBinding, CLOUDFORMATION_YAML_TAGS, type CloudFormationResource, type CloudFormationTemplate, type EventPatternFields, type LoadedTemplate, MAX_STACK_DEPTH, type ServerlessFunctionInfo, type ServerlessHttpRoute, type ServerlessNonHttpEvent, type TemplateDocument, type TemplateTree, type UnfollowedReason, type UnfollowedStack, type UnsettledPatternField, apiScopedKey, documentRef, inheritedEnvVars, loadCloudFormationDocument, loadCloudFormationTemplate, loadTemplateTree, qualifiedLogicalId, readAppSyncResolvers, readEventPattern, readResourceLines, readServerlessFunctions, refTarget, resolveBucketChannel, resolveEventBusToken, resolveQueueChannel, resolveResourceChannel, resolveTopicChannel, resourcesWithGlobals, unfollowedStackMessage };

package/dist/index.js

@@ -1,7 +1,7 @@
 // src/templateLoader.ts
 import fs from "fs";
 import path from "path";
-import YAML from "yaml";
+import YAML, { isMap, isScalar, LineCounter } from "yaml";
 var everyNodeKind = (tag, resolve) => {
   const forNode = (value) => resolve(plainly(value));
   return [
@@ -44,6 +44,9 @@ var CLOUDFORMATION_YAML_TAGS = [
   ].flatMap((tag) => everyNodeKind(tag, (value) => value))
 ];
 function loadCloudFormationTemplate(templatePath) {
+  return loadCloudFormationDocument(templatePath).template;
+}
+function loadCloudFormationDocument(templatePath) {
   const resolved = path.resolve(templatePath);
   if (!fs.existsSync(resolved)) {
     throw new Error(`CloudFormation template not found: ${resolved}`);
@@ -54,7 +57,30 @@ function loadCloudFormationTemplate(templatePath) {
   if (parsed === null || typeof parsed !== "object") {
     throw new Error(`CloudFormation template is not an object: ${resolved}`);
   }
-  return parsed;
+  return {
+    template: parsed,
+    resourceLines: readResourceLines(raw)
+  };
+}
+function readResourceLines(raw) {
+  const lines = /* @__PURE__ */ new Map();
+  const lineCounter = new LineCounter();
+  const document = YAML.parseDocument(raw, {
+    customTags: CLOUDFORMATION_YAML_TAGS,
+    lineCounter
+  });
+  const resources = document.get("Resources", true);
+  if (!isMap(resources)) {
+    return lines;
+  }
+  for (const item of resources.items) {
+    const key = item.key;
+    if (!isScalar(key) || key.range === void 0 || key.range === null) {
+      continue;
+    }
+    lines.set(String(key.value), lineCounter.linePos(key.range[0]).line);
+  }
+  return lines;
 }
 function refTarget(value) {
   if (typeof value === "string") {
@@ -279,40 +305,36 @@ function resolveBucketChannel(value) {
 }
 
 // src/eventPattern.ts
-function reduceEventPattern(pattern) {
+var STATED_FIELDS = /* @__PURE__ */ new Set(["detail-type", "source"]);
+function readEventPattern(pattern) {
   if (pattern === null || typeof pattern !== "object") {
-    return {
-      kind: "unresolvable",
-      reason: "rule declares no EventPattern"
-    };
-  }
-  const detailType = pattern["detail-type"];
-  if (detailType === void 0) {
-    return {
-      kind: "unresolvable",
-      reason: "EventPattern has no detail-type; v0 reduces routing to exact detail-type match only"
-    };
-  }
-  if (!Array.isArray(detailType)) {
-    return {
-      kind: "unresolvable",
-      reason: "detail-type is not a plain array of string literals"
-    };
+    return null;
   }
-  const detailTypes = [];
-  for (const entry of detailType) {
-    if (typeof entry !== "string") {
-      return {
-        kind: "unresolvable",
-        reason: "detail-type contains a content filter (prefix / anything-but / etc.); pattern subsumption is out of v0 scope"
-      };
-    }
-    detailTypes.push(entry);
+  const record = pattern;
+  const detailTypes = literalValues(record["detail-type"]);
+  const sources = literalValues(record.source);
+  const unsettled = [
+    ...detailTypes === "unsettled" ? ["detail-type"] : [],
+    ...sources === "unsettled" ? ["source"] : []
+  ];
+  return {
+    ...Array.isArray(detailTypes) ? { detailTypes } : {},
+    ...Array.isArray(sources) ? { sources } : {},
+    unsettled,
+    filtersOtherFields: Object.keys(record).some(
+      (key) => !STATED_FIELDS.has(key)
+    ),
+    emittedByAws: Array.isArray(sources) && sources.some((source) => source.startsWith("aws."))
+  };
+}
+function literalValues(value) {
+  if (value === void 0) {
+    return null;
   }
-  if (detailTypes.length === 0) {
-    return { kind: "unresolvable", reason: "detail-type array is empty" };
+  if (!Array.isArray(value) || value.length === 0 || !value.every((entry) => typeof entry === "string")) {
+    return "unsettled";
   }
-  return { kind: "exact", detailTypes };
+  return value;
 }
 function resolveEventBusToken(value) {
   if (value === null || value === void 0) {
@@ -431,12 +453,40 @@ var CHILD_TEMPLATE_PROPERTY = {
   "AWS::Serverless::Application": "Location"
 };
 var MAX_STACK_DEPTH = 10;
+function documentRef(document, value) {
+  const id = refTarget(value);
+  if (id === null) {
+    return null;
+  }
+  return document.parameterTargets.get(id) ?? qualifiedLogicalId(document.stackPath, id);
+}
+function parameterTargetsOf(parent, passed) {
+  const targets = /* @__PURE__ */ new Map();
+  if (passed === null || typeof passed !== "object") {
+    return targets;
+  }
+  const resources = parent.template.Resources ?? {};
+  for (const [name, value] of Object.entries(
+    passed
+  )) {
+    const id = refTarget(value);
+    if (id === null || typeof value === "string") {
+      continue;
+    }
+    const target = parent.parameterTargets.get(id) ?? (resources[id] === void 0 ? null : qualifiedLogicalId(parent.stackPath, id));
+    if (target !== null) {
+      targets.set(name, target);
+    }
+  }
+  return targets;
+}
 function loadTemplateTree(rootPath) {
   const rootFile = path2.resolve(rootPath);
   const root = {
     path: rootFile,
     stackPath: [],
-    template: loadCloudFormationTemplate(rootFile)
+    ...loadCloudFormationDocument(rootFile),
+    parameterTargets: /* @__PURE__ */ new Map()
   };
   const documents = [root];
   const unfollowed = [];
@@ -480,7 +530,8 @@ function childStacksOf(document, ancestors) {
         document,
         ancestors,
         logicalId,
-        location: resource.Properties?.[property]
+        location: resource.Properties?.[property],
+        parameters: resource.Properties?.Parameters
       })
     );
   }
@@ -542,7 +593,8 @@ function childStack(opts) {
       document: {
         path: childPath,
         stackPath,
-        template: loadCloudFormationTemplate(childPath)
+        ...loadCloudFormationDocument(childPath),
+        parameterTargets: parameterTargetsOf(opts.document, opts.parameters)
       }
     };
   } catch (err) {
@@ -613,7 +665,9 @@ function readServerlessFunctions(template) {
     if (typeof handlerRaw !== "string") {
       continue;
     }
-    const parsed = parseHandler(handlerRaw);
+    const runtimeRaw = resource.Properties?.Runtime;
+    const runtime = typeof runtimeRaw === "string" ? runtimeRaw : void 0;
+    const parsed = parseHandler(handlerRaw, runtime);
     if (parsed === null) {
       continue;
     }
@@ -626,6 +680,7 @@ function readServerlessFunctions(template) {
       modulePath: parsed.modulePath,
       exportName: parsed.exportName,
       codeUri: readCodeUri(resource),
+      ...runtime !== void 0 ? { runtime } : {},
       httpRoutes,
       nonHttpEvents
     });
@@ -635,14 +690,18 @@ function readServerlessFunctions(template) {
 export {
   CLOUDFORMATION_YAML_TAGS,
   MAX_STACK_DEPTH,
+  apiScopedKey,
+  documentRef,
   inheritedEnvVars,
+  loadCloudFormationDocument,
   loadCloudFormationTemplate,
   loadTemplateTree,
   parseHandler2 as parseHandler,
   qualifiedLogicalId,
   readAppSyncResolvers,
+  readEventPattern,
+  readResourceLines,
   readServerlessFunctions,
-  reduceEventPattern,
   refTarget,
   resolveBucketChannel,
   resolveEventBusToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/manifest-aws",
-  "version": "0.35.1",
+  "version": "0.37.0",
   "type": "module",
   "description": "Parse a CloudFormation or SAM template into plain data, the facts every suss reader of an AWS template works from.",
   "keywords": [
@@ -46,7 +46,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/ir-core": "0.35.1",
+    "@suss/ir-core": "0.37.0",
     "yaml": "^2.4.0"
   },
   "devDependencies": {