@@ -61,6 +61,15 @@ type generator struct {
6161 isComponent bool
6262 deferredOutputVariables []* pcl.DeferredOutputVariable
6363
64+ // rangeVariable is the Python loop variable bound for the resource currently
65+ // being range-generated, replacing the PCL `range` scope name. It is unique
66+ // per range statement so that distinct ranges in one program never share a
67+ // loop variable — which would otherwise type-lock its element type across
68+ // loops and reject, for example, a map range's string key after a numeric
69+ // range. Empty outside a ranged resource, where references keep the `range`
70+ // name.
71+ rangeVariable string
72+
6473 // insideApplyLambda is set while generating the body of an __apply callback.
6574 insideApplyLambda bool
6675 // applyLambdaType holds the destination type for the current resource input.
@@ -1244,6 +1253,32 @@ func (g *generator) genHookDeclarations(r *pcl.Resource) map[string][]string {
12441253 return hookVars
12451254}
12461255
1256+ // genMapRangedCollection emits a dict-typed collection, keyed by the map key and
1257+ // strongly typed by valueType, for a resource or component that ranges over a
1258+ // map. Indexing such a collection by key (e.g. `r["k"]`) is then well-typed,
1259+ // unlike the list used for numeric and list ranges. preInstantiate, when
1260+ // non-nil, runs inside the loop before each resource is instantiated.
1261+ func (g * generator ) genMapRangedCollection (
1262+ w io.Writer , nameVar , valueType , name string , rangeExpr model.Expression ,
1263+ needsDefinition bool , preInstantiate func (), instantiate func (string ),
1264+ ) {
1265+ if needsDefinition {
1266+ g .Fgenf (w , "%s%s: dict[str, %s] = {}\n " , g .Indent , nameVar , valueType )
1267+ }
1268+ g .Fgenf (w ,
1269+ "%sfor %s in [{\" key\" : k, \" value\" : v} for [k, v] in sorted((%.v).items())]:\n " ,
1270+ g .Indent , g .rangeVariable , rangeExpr )
1271+ resName := g .makeResourceName (name , g .rangeVariable + "['key']" )
1272+ g .Indented (func () {
1273+ if preInstantiate != nil {
1274+ preInstantiate ()
1275+ }
1276+ g .Fgenf (w , "%s%s[%s['key']] = " , g .Indent , nameVar , g .rangeVariable )
1277+ instantiate (resName )
1278+ g .Fprint (w , "\n " )
1279+ })
1280+ }
1281+
12471282// genResourceDeclaration handles the generation of instantiations resources.
12481283func (g * generator ) genResourceDeclaration (w io.Writer , r * pcl.Resource , needsDefinition bool ) {
12491284 qualifiedMemberName , diagnostics := g .resourceTypeName (r )
@@ -1315,14 +1350,19 @@ func (g *generator) genResourceDeclaration(w io.Writer, r *pcl.Resource, needsDe
13151350
13161351 if r .Options != nil && r .Options .Range != nil {
13171352 rangeExpr := r .Options .Range
1353+ prevRangeVariable := g .rangeVariable
1354+ g .rangeVariable = nameVar + "_range"
1355+ defer func () { g .rangeVariable = prevRangeVariable }()
13181356 rangeType := r .Options .Range .Type ()
13191357
13201358 if model .ContainsOutputs (rangeType ) {
13211359 loweredRangeExpr , rangeExprTemps := g .lowerExpression (rangeExpr , rangeType )
13221360 if model .InputType (model .BoolType ).ConversionFrom (r .Options .Range .Type ()) == model .SafeConversion {
13231361 g .Fgenf (w , "%s%s = None\n " , g .Indent , nameVar )
1362+ } else if _ , isMap := pcl .UnwrapOption (model .ResolveOutputs (rangeType )).(* model.MapType ); isMap {
1363+ g .Fgenf (w , "%s%s: dict[str, %s] = {}\n " , g .Indent , nameVar , qualifiedMemberName )
13241364 } else {
1325- g .Fgenf (w , "%s%s: list[Any ] = []\n " , g .Indent , nameVar )
1365+ g .Fgenf (w , "%s%s: list[%s ] = []\n " , g .Indent , nameVar , qualifiedMemberName )
13261366 }
13271367 localFuncName := "create_" + PyName (r .LogicalName ())
13281368
@@ -1423,24 +1463,23 @@ func (g *generator) genResourceDeclaration(w io.Writer, r *pcl.Resource, needsDe
14231463 instantiate (g .makeResourceName (name , "" ))
14241464 g .Fprint (w , "\n " )
14251465 })
1466+ } else if _ , isMap := pcl .UnwrapOption (rangeExpr .Type ()).(* model.MapType ); isMap {
1467+ g .genMapRangedCollection (w , nameVar , qualifiedMemberName , name , rangeExpr , needsDefinition , nil , instantiate )
14261468 } else {
14271469 if needsDefinition {
1428- g .Fgenf (w , "%s%s: list[Any ] = []\n " , g .Indent , nameVar )
1470+ g .Fgenf (w , "%s%s: list[%s ] = []\n " , g .Indent , nameVar , qualifiedMemberName )
14291471 }
14301472
14311473 resKey := "key"
14321474 if model .InputType (model .NumberType ).ConversionFrom (rangeExpr .Type ()) != model .NoConversion {
1433- g .Fgenf (w , "%sfor range in [{\" value\" : i} for i in range(0, %.v)]:\n " , g .Indent , rangeExpr )
1475+ g .Fgenf (w , "%sfor %s in [{\" value\" : i} for i in range(0, %.v)]:\n " , g .Indent , g . rangeVariable , rangeExpr )
14341476 resKey = "value"
1435- } else if _ , isMap := pcl .UnwrapOption (rangeExpr .Type ()).(* model.MapType ); isMap {
1436- g .Fgenf (w ,
1437- "%sfor range in [{\" key\" : k, \" value\" : v} for [k, v] in sorted((%.v).items())]:\n " ,
1438- g .Indent , rangeExpr )
14391477 } else {
1440- g .Fgenf (w , "%sfor range in [{\" key\" : k, \" value\" : v} for [k, v] in enumerate(%.v)]:\n " , g .Indent , rangeExpr )
1478+ g .Fgenf (w , "%sfor %s in [{\" key\" : k, \" value\" : v} for [k, v] in enumerate(%.v)]:\n " ,
1479+ g .Indent , g .rangeVariable , rangeExpr )
14411480 }
14421481
1443- resName := g .makeResourceName (name , fmt .Sprintf ("range ['%s']" , resKey ))
1482+ resName := g .makeResourceName (name , fmt .Sprintf ("%s ['%s']" , g . rangeVariable , resKey ))
14441483 g .Indented (func () {
14451484 g .Fgenf (w , "%s%s.append(" , g .Indent , nameVar )
14461485 instantiate (resName )
@@ -1536,13 +1575,16 @@ func (g *generator) genReadResourceDeclaration(w io.Writer, r *pcl.ReadResource,
15361575
15371576 if r .Options != nil && r .Options .Range != nil {
15381577 rangeExpr := r .Options .Range
1578+ prevRangeVariable := g .rangeVariable
1579+ g .rangeVariable = nameVar + "_range"
1580+ defer func () { g .rangeVariable = prevRangeVariable }()
15391581 rangeType := r .Options .Range .Type ()
15401582 if model .ContainsOutputs (rangeType ) {
15411583 loweredRangeExpr , rangeExprTemps := g .lowerExpression (rangeExpr , rangeType )
15421584 if model .InputType (model .BoolType ).ConversionFrom (r .Options .Range .Type ()) == model .SafeConversion {
15431585 g .Fgenf (w , "%s%s = None\n " , g .Indent , nameVar )
15441586 } else {
1545- g .Fgenf (w , "%s%s: list[Any ] = []\n " , g .Indent , nameVar )
1587+ g .Fgenf (w , "%s%s: list[%s ] = []\n " , g .Indent , nameVar , qualifiedMemberName )
15461588 }
15471589 localFuncName := "read_" + PyName (r .LogicalName ())
15481590 g .Fgenf (w , "def %s(range_body):\n " , localFuncName )
@@ -1615,23 +1657,22 @@ func (g *generator) genReadResourceDeclaration(w io.Writer, r *pcl.ReadResource,
16151657 instantiate (g .makeResourceName (name , "" ))
16161658 g .Fprint (w , "\n " )
16171659 })
1660+ } else if _ , isMap := pcl .UnwrapOption (rangeExpr .Type ()).(* model.MapType ); isMap {
1661+ g .genMapRangedCollection (w , nameVar , qualifiedMemberName , name , rangeExpr , needsDefinition , nil , instantiate )
16181662 } else {
16191663 if needsDefinition {
1620- g .Fgenf (w , "%s%s: list[Any ] = []\n " , g .Indent , nameVar )
1664+ g .Fgenf (w , "%s%s: list[%s ] = []\n " , g .Indent , nameVar , qualifiedMemberName )
16211665 }
16221666 resKey := "key"
16231667 if model .InputType (model .NumberType ).ConversionFrom (rangeExpr .Type ()) != model .NoConversion {
1624- g .Fgenf (w , "%sfor range in [{\" value\" : i} for i in range(0, %.v)]:\n " , g .Indent , rangeExpr )
1668+ g .Fgenf (w , "%sfor %s in [{\" value\" : i} for i in range(0, %.v)]:\n " , g .Indent , g . rangeVariable , rangeExpr )
16251669 resKey = "value"
1626- } else if _ , isMap := pcl .UnwrapOption (rangeExpr .Type ()).(* model.MapType ); isMap {
1627- g .Fgenf (w ,
1628- "%sfor range in [{\" key\" : k, \" value\" : v} for [k, v] in sorted((%.v).items())]:\n " ,
1629- g .Indent , rangeExpr )
16301670 } else {
1631- g .Fgenf (w , "%sfor range in [{\" key\" : k, \" value\" : v} for [k, v] in enumerate(%.v)]:\n " , g .Indent , rangeExpr )
1671+ g .Fgenf (w , "%sfor %s in [{\" key\" : k, \" value\" : v} for [k, v] in enumerate(%.v)]:\n " ,
1672+ g .Indent , g .rangeVariable , rangeExpr )
16321673 }
16331674
1634- resName := g .makeResourceName (name , fmt .Sprintf ("range ['%s']" , resKey ))
1675+ resName := g .makeResourceName (name , fmt .Sprintf ("%s ['%s']" , g . rangeVariable , resKey ))
16351676 g .Indented (func () {
16361677 g .Fgenf (w , "%s%s.append(" , g .Indent , nameVar )
16371678 instantiate (resName )
@@ -1733,6 +1774,9 @@ func (g *generator) genComponent(w io.Writer, r *pcl.Component) {
17331774
17341775 if r .Options != nil && r .Options .Range != nil {
17351776 rangeExpr := r .Options .Range
1777+ prevRangeVariable := g .rangeVariable
1778+ g .rangeVariable = nameVar + "_range"
1779+ defer func () { g .rangeVariable = prevRangeVariable }()
17361780 if model .InputType (model .BoolType ).ConversionFrom (r .Options .Range .Type ()) == model .SafeConversion {
17371781 g .Fgenf (w , "%s%s = None\n " , g .Indent , nameVar )
17381782 g .Fgenf (w , "%sif %.v:\n " , g .Indent , rangeExpr )
@@ -1742,22 +1786,22 @@ func (g *generator) genComponent(w io.Writer, r *pcl.Component) {
17421786 instantiate (g .makeResourceName (name , "" ))
17431787 g .Fprint (w , "\n " )
17441788 })
1789+ } else if _ , isMap := pcl .UnwrapOption (rangeExpr .Type ()).(* model.MapType ); isMap {
1790+ g .genMapRangedCollection (w , nameVar , componentName , name , rangeExpr , true ,
1791+ declareDeferredOutputVariables , instantiate )
17451792 } else {
1746- g .Fgenf (w , "%s%s: list[Any ] = []\n " , g .Indent , nameVar )
1793+ g .Fgenf (w , "%s%s: list[%s ] = []\n " , g .Indent , nameVar , componentName )
17471794
17481795 resKey := "key"
17491796 if model .InputType (model .NumberType ).ConversionFrom (rangeExpr .Type ()) != model .NoConversion {
1750- g .Fgenf (w , "%sfor range in [{\" value\" : i} for i in range(0, %.v)]:\n " , g .Indent , rangeExpr )
1797+ g .Fgenf (w , "%sfor %s in [{\" value\" : i} for i in range(0, %.v)]:\n " , g .Indent , g . rangeVariable , rangeExpr )
17511798 resKey = "value"
1752- } else if _ , isMap := pcl .UnwrapOption (rangeExpr .Type ()).(* model.MapType ); isMap {
1753- g .Fgenf (w ,
1754- "%sfor range in [{\" key\" : k, \" value\" : v} for [k, v] in sorted((%.v).items())]:\n " ,
1755- g .Indent , rangeExpr )
17561799 } else {
1757- g .Fgenf (w , "%sfor range in [{\" key\" : k, \" value\" : v} for [k, v] in enumerate(%.v)]:\n " , g .Indent , rangeExpr )
1800+ g .Fgenf (w , "%sfor %s in [{\" key\" : k, \" value\" : v} for [k, v] in enumerate(%.v)]:\n " ,
1801+ g .Indent , g .rangeVariable , rangeExpr )
17581802 }
17591803
1760- resName := g .makeResourceName (name , fmt .Sprintf ("range ['%s']" , resKey ))
1804+ resName := g .makeResourceName (name , fmt .Sprintf ("%s ['%s']" , g . rangeVariable , resKey ))
17611805 g .Indented (func () {
17621806 declareDeferredOutputVariables ()
17631807 g .Fgenf (w , "%s%s.append(" , g .Indent , nameVar )
0 commit comments