@intentius/chant-lexicon-aws 0.20.0 → 0.22.0

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "4ae49ba58f7394ceaba8508c998178e1b13207da2deaf6e51e6340774baea3a2",
+    "manifest.json": "09898a0a59ba358390d650c4387dd81b6d48f5469c6ab4e66eb932452b941299",
     "meta.json": "ef04b67841e39eed4550d4ec0527ebb2a0a367dc7628728522168f11b67a7a9f",
     "types/index.d.ts": "2a5fb678eae51c9ce44c59696e3e708b5d7dcbc91b24da7be199f010a9a63361",
     "rules/hardcoded-region.ts": "5a0eaf7ab391231fe6cd51426ece29539cb4b36f31c8dd060956638fed55722a",
@@ -59,5 +59,5 @@
     "skills/chant-aws-eks.md": "8789255709ff004ad0a875fd5999edcdc66fc6e33d710db058d9f42703bcfdfe",
     "skills/chant-aws-carve-terraform.md": "f4c6fe1c702250665f90d82b3bdaba5ea50ae75e380a8ae321dad6eb1c39683e"
   },
-  "composite": "ad8f56986d9aa3b2b502fe18aef713c744880fc8b5109df270027ab789a4d904"
+  "composite": "5a0569b0420e50a37cc206b437b19be0813524b51326c099084c0e448642de2f"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "aws",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "chantVersion": ">=0.1.0",
   "namespace": "AWS",
   "intrinsics": [
@@ -14,49 +14,57 @@
       "name": "Ref",
       "description": "Reference a parameter or resource",
       "outputKey": "Ref",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     },
     {
       "name": "GetAtt",
       "description": "Fn::GetAtt — get resource attribute",
       "outputKey": "Fn::GetAtt",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     },
     {
       "name": "If",
       "description": "Fn::If — conditional value",
       "outputKey": "Fn::If",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     },
     {
       "name": "Join",
       "description": "Fn::Join — join values with delimiter",
       "outputKey": "Fn::Join",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     },
     {
       "name": "Select",
       "description": "Fn::Select — select value by index",
       "outputKey": "Fn::Select",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     },
     {
       "name": "Split",
       "description": "Fn::Split — split string by delimiter",
       "outputKey": "Fn::Split",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     },
     {
       "name": "Base64",
       "description": "Fn::Base64 — encode to Base64",
       "outputKey": "Fn::Base64",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     },
     {
       "name": "GetAZs",
       "description": "Fn::GetAZs — list Availability Zones",
       "outputKey": "Fn::GetAZs",
-      "isTag": false
+      "isTag": false,
+      "foldsAsCall": true
     }
   ],
   "pseudoParameters": {

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAA+G,MAAM,0BAA0B,CAAC;AAwB3K;;sFAEsF;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;;GAKG;AACH,eAAO,MAAM,SAAS,EAAE,aA+vBvB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAA+G,MAAM,0BAA0B,CAAC;AAwB3K;;sFAEsF;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;;GAKG;AACH,eAAO,MAAM,SAAS,EAAE,aAkxBvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-aws",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "description": "AWS CloudFormation lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -80,7 +80,7 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.20.0",
+    "@intentius/chant": "^0.22.0",
     "typescript": "^5.9.3"
   }
 }

package/src/codegen/package.ts

@@ -52,6 +52,11 @@ export async function packageLexicon(opts: PackageOptions = {}): Promise<Package
             description: i.description,
             outputKey: intrinsicOutputKey(i.name),
             isTag: i.isTag,
+            // chant #1044 — carried through verbatim for the same reason as
+            // `isTag`: the packaged manifest is what a consumer reads to
+            // learn which intrinsics fold, so recomputing it here would be a
+            // second source of truth able to drift from ../plugin.ts.
+            foldsAsCall: i.foldsAsCall,
           }),
         );
 

package/src/plugin.ts

@@ -52,17 +52,36 @@ export const awsPlugin: LexiconPlugin = {
     return discoverLintRules(rulesDir, import.meta.url);
   },
 
+  /**
+   * chant #1044 — every plain-call intrinsic below carries
+   * `foldsAsCall: true`, opting its CALL form into `chant build --fold`.
+   *
+   * Audited one at a time against the criterion in `IntrinsicDef.foldsAsCall`
+   * (core's lexicon.ts): the call must be a pure function of its arguments
+   * that builds a deterministic data envelope. Each of these constructs its
+   * `*Intrinsic` class and stores the arguments verbatim (../intrinsics.ts) —
+   * no I/O, no environment, no module state, and no CloudFormation semantics
+   * evaluated locally: `Base64("x")` emits `{"Fn::Base64": "x"}` for the
+   * deployment to encode, it does not encode anything here. Calling one while
+   * folding is therefore indistinguishable from calling it during a real run
+   * of the file.
+   *
+   * `Sub` is the one intrinsic NOT opted in, and cannot be: it is authored as
+   * a tagged template (`isTag: true`), which already folds through
+   * `foldTaggedTemplate`. `Sub(...)` as a plain call is not its authoring
+   * form, and `chant dev check-lexicon` rejects a registration claiming both.
+   */
   intrinsics(): IntrinsicDef[] {
     return [
       { name: "Sub", description: "Fn::Sub template string interpolation", isTag: true },
-      { name: "Ref", description: "Reference a parameter or resource", isTag: false },
-      { name: "GetAtt", description: "Fn::GetAtt — get resource attribute", isTag: false },
-      { name: "If", description: "Fn::If — conditional value", isTag: false },
-      { name: "Join", description: "Fn::Join — join values with delimiter", isTag: false },
-      { name: "Select", description: "Fn::Select — select value by index", isTag: false },
-      { name: "Split", description: "Fn::Split — split string by delimiter", isTag: false },
-      { name: "Base64", description: "Fn::Base64 — encode to Base64", isTag: false },
-      { name: "GetAZs", description: "Fn::GetAZs — list Availability Zones", isTag: false },
+      { name: "Ref", description: "Reference a parameter or resource", isTag: false, foldsAsCall: true },
+      { name: "GetAtt", description: "Fn::GetAtt — get resource attribute", isTag: false, foldsAsCall: true },
+      { name: "If", description: "Fn::If — conditional value", isTag: false, foldsAsCall: true },
+      { name: "Join", description: "Fn::Join — join values with delimiter", isTag: false, foldsAsCall: true },
+      { name: "Select", description: "Fn::Select — select value by index", isTag: false, foldsAsCall: true },
+      { name: "Split", description: "Fn::Split — split string by delimiter", isTag: false, foldsAsCall: true },
+      { name: "Base64", description: "Fn::Base64 — encode to Base64", isTag: false, foldsAsCall: true },
+      { name: "GetAZs", description: "Fn::GetAZs — list Availability Zones", isTag: false, foldsAsCall: true },
     ];
   },
 

package/src/serializer.ts

@@ -1,5 +1,5 @@
 import type { Declarable, CoreParameter } from "@intentius/chant/declarable";
-import { isPropertyDeclarable } from "@intentius/chant/declarable";
+import { isPropertyDeclarable, isResourceDeclarable } from "@intentius/chant/declarable";
 import type { Serializer, SerializerResult, SerializeContext } from "@intentius/chant/serializer";
 import { ownershipEntries, type OwnershipMarker } from "@intentius/chant/ownership";
 import { AWS_TAG_OWNERSHIP_KEYS } from "./ownership";
@@ -82,7 +82,7 @@ function cfnVisitor(entityNames: Map<Declarable, string>): SerializerVisitor {
     attrRef: (name, attr) => ({ "Fn::GetAtt": [name, attr] }),
     resourceRef: (name) => ({ Ref: name }),
     propertyDeclarable: (entity, walk) => {
-      if (!("props" in entity) || typeof entity.props !== "object" || entity.props === null) {
+      if (!isResourceDeclarable(entity) || typeof entity.props !== "object" || entity.props === null) {
         return undefined;
       }
       const props = entity.props as Record<string, unknown>;
@@ -136,7 +136,7 @@ function toProperties(
   entity: Declarable,
   entityNames: Map<Declarable, string>
 ): Record<string, unknown> | undefined {
-  if (!("props" in entity) || typeof entity.props !== "object" || entity.props === null) {
+  if (!isResourceDeclarable(entity) || typeof entity.props !== "object" || entity.props === null) {
     return undefined;
   }
 
@@ -281,7 +281,7 @@ function serializeToTemplate(
       };
 
       // Read resource-level attributes from the second constructor arg
-      const attrs = ("attributes" in entity && typeof entity.attributes === "object" && entity.attributes !== null)
+      const attrs = (isResourceDeclarable(entity) && typeof entity.attributes === "object" && entity.attributes !== null)
         ? entity.attributes as Record<string, unknown>
         : undefined;