@gershy/lilac 0.0.15 → 0.0.16

package/cmp/cjs/main.d.ts

@@ -20,6 +20,7 @@ export declare class Flower {
     constructor();
     getDependencies(): Generator<Flower>;
     getPetals(ctx: Context): SuperIterable<PetalTerraform.Base>;
+    cultivate(): Promise<void>;
 }
 type RegistryFlowers<R extends Registry<any>, M extends 'real' | 'test'> = R extends Registry<infer Flowers> ? {
     [K in keyof Flowers]: Flowers[K][M];
@@ -48,7 +49,7 @@ export declare class Garden<Reg extends Registry<any>> {
         define: Garden<Reg>['def'];
     });
     private getPetals;
-    genTerraform(deployTarget: Soil.Base): Promise<Obj<Fact>>;
+    genTerraform(soil: Soil.Base): Promise<Obj<Fact>>;
     private terraformInit;
     private terraformPlan;
     private terraformApply;

package/cmp/cjs/main.js

@@ -32,6 +32,7 @@ const nodejs_proc_1 = __importDefault(require("@gershy/nodejs-proc"));
 const { isCls, skip } = cl;
 const toArr = cl.toArr;
 const allObj = cl.allObj;
+const allArr = cl.allArr;
 const has = cl.has;
 const map = cl.map;
 const mod = cl.mod;
@@ -55,6 +56,11 @@ class Flower {
     getPetals(ctx) {
         throw Error('not implemented');
     }
+    async cultivate() {
+        // This function is called once all Flowers for a given Garden have been constructed. The main
+        // purpose of this phase is to allow Flowers which reference each other via functions to run
+        // such functions without running into uninitialized values.
+    }
 }
 exports.Flower = Flower;
 ;
@@ -112,21 +118,22 @@ class Garden {
         // conditionally calling `this.registry.get('fake')`...
         const seenFlowers = new Set();
         const seenPetals = new Set();
-        for await (const topLevelFlower of await this.def(this.ctx, this.reg.get('real'))) {
-            for (const flower of topLevelFlower.getDependencies()) {
-                if (seenFlowers.has(flower))
-                    continue;
+        for await (const topLevelFlower of await this.def(this.ctx, this.reg.get('real')))
+            for (const flower of topLevelFlower.getDependencies())
                 seenFlowers.add(flower);
-                for await (const petal of await flower.getPetals(this.ctx)) {
-                    if (seenPetals.has(petal))
-                        continue;
-                    yield petal;
-                }
+        // Now we've exhaustively referenced all Flowers - we can cultivate them
+        await Promise.all(seenFlowers[toArr](f => f.cultivate()));
+        for (const flower of seenFlowers) {
+            for await (const petal of await flower.getPetals(this.ctx)) {
+                if (seenPetals.has(petal))
+                    continue;
+                seenPetals.add(petal);
+                yield petal;
             }
         }
     }
-    async genTerraform(deployTarget) {
-        const soilTfPetalsPrm = deployTarget.getTerraformPetals(this.ctx);
+    async genTerraform(soil) {
+        const soilTfPetalsPrm = soil.getTerraformPetals(this.ctx);
         return this.ctx.logger.scope('garden.genTerraform', {}, async (logger) => {
             const setupTfProj = async (args) => args.logger.scope('tf', { proj: this.ctx.name, tf: args.term }, async (logger) => {
                 // Allows a terraform project to be defined in terms of a function which writes to main.tf,
@@ -148,8 +155,7 @@ class Garden {
                     const stream = await args.fact.kid(['main.tf']).getDataHeadStream();
                     await args.setup(args.fact, stream, async (petal) => {
                         // Include a utility function the caller can use to easily write petals
-                        const { tf, files = {} } = await petal.getResult()
-                            .then(tf => isCls(tf, String) ? { tf } : tf);
+                        const { tf, files = {} } = await petal.getResult().then(tf => isCls(tf, String) ? { tf } : tf);
                         if (tf)
                             await stream.write(`${tf}\n`);
                         await Promise.all(files[toArr]((data, kfp) => args.fact.kid(kfp.split('/')).setData(data)));

package/cmp/cjs/soil/soil.d.ts

@@ -22,6 +22,7 @@ export declare namespace Soil {
         protected logger: Logger;
         protected registry: Registry<any>;
         constructor(args: BaseArgs);
+        getRegion(): string;
         getTerraformPetals(ctx: Context): Promise<PetalProjResult>;
     }
     type LocalStackArgs = BaseArgs & {
@@ -39,6 +40,7 @@ export declare namespace Soil {
         private aws;
         private localStackDocker;
         constructor(args: LocalStackArgs);
+        getRegion(): "ca-central-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2";
         private getAwsServices;
         private getDockerContainers;
         run(): Promise<{
@@ -77,6 +79,7 @@ export declare namespace Soil {
     class AwsCloud extends Base {
         private aws;
         constructor(args: AwsCloudArgs);
+        getRegion(): "ca-central-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2";
         getTerraformPetals(ctx: Context): Promise<{
             boot: () => Generator<PetalTerraform.Terraform | PetalTerraform.Provider | PetalTerraform.File, void, unknown>;
             main: (args: any) => Generator<PetalTerraform.Terraform | PetalTerraform.Provider | PetalTerraform.File, void, unknown>;

package/cmp/cjs/soil/soil.js

@@ -34,8 +34,11 @@ var Soil;
             this.logger = args.logger;
             this.registry = args.registry;
         }
+        getRegion() {
+            throw Error('method definition missing');
+        }
         async getTerraformPetals(ctx) {
-            throw Error('not implemented');
+            throw Error('method definition missing');
         }
     }
     Soil.Base = Base;
@@ -53,6 +56,7 @@ var Soil;
                 containerName: 'gershyLilacLocalStack'
             }[merge](args.localStackDocker ?? {});
         }
+        getRegion() { return this.aws.region; }
         getAwsServices() {
             // Note that "overhead" services are essential for initializing localstack:
             // - s3 + ddb used for terraform state locking
@@ -243,6 +247,7 @@ var Soil;
             super(args);
             this.aws = args.aws;
         }
+        getRegion() { return this.aws.region; }
         async getTerraformPetals(ctx) {
             const { aws } = this;
             return {

package/cmp/mjs/main.d.ts

@@ -20,6 +20,7 @@ export declare class Flower {
     constructor();
     getDependencies(): Generator<Flower>;
     getPetals(ctx: Context): SuperIterable<PetalTerraform.Base>;
+    cultivate(): Promise<void>;
 }
 type RegistryFlowers<R extends Registry<any>, M extends 'real' | 'test'> = R extends Registry<infer Flowers> ? {
     [K in keyof Flowers]: Flowers[K][M];
@@ -48,7 +49,7 @@ export declare class Garden<Reg extends Registry<any>> {
         define: Garden<Reg>['def'];
     });
     private getPetals;
-    genTerraform(deployTarget: Soil.Base): Promise<Obj<Fact>>;
+    genTerraform(soil: Soil.Base): Promise<Obj<Fact>>;
     private terraformInit;
     private terraformPlan;
     private terraformApply;

package/cmp/mjs/main.js

@@ -12,6 +12,7 @@ import proc from '@gershy/nodejs-proc';
 const { isCls, skip } = cl;
 const toArr = cl.toArr;
 const allObj = cl.allObj;
+const allArr = cl.allArr;
 const has = cl.has;
 const map = cl.map;
 const mod = cl.mod;
@@ -35,6 +36,11 @@ export class Flower {
     getPetals(ctx) {
         throw Error('not implemented');
     }
+    async cultivate() {
+        // This function is called once all Flowers for a given Garden have been constructed. The main
+        // purpose of this phase is to allow Flowers which reference each other via functions to run
+        // such functions without running into uninitialized values.
+    }
 }
 ;
 export class Registry {
@@ -90,21 +96,22 @@ export class Garden {
         // conditionally calling `this.registry.get('fake')`...
         const seenFlowers = new Set();
         const seenPetals = new Set();
-        for await (const topLevelFlower of await this.def(this.ctx, this.reg.get('real'))) {
-            for (const flower of topLevelFlower.getDependencies()) {
-                if (seenFlowers.has(flower))
-                    continue;
+        for await (const topLevelFlower of await this.def(this.ctx, this.reg.get('real')))
+            for (const flower of topLevelFlower.getDependencies())
                 seenFlowers.add(flower);
-                for await (const petal of await flower.getPetals(this.ctx)) {
-                    if (seenPetals.has(petal))
-                        continue;
-                    yield petal;
-                }
+        // Now we've exhaustively referenced all Flowers - we can cultivate them
+        await Promise.all(seenFlowers[toArr](f => f.cultivate()));
+        for (const flower of seenFlowers) {
+            for await (const petal of await flower.getPetals(this.ctx)) {
+                if (seenPetals.has(petal))
+                    continue;
+                seenPetals.add(petal);
+                yield petal;
             }
         }
     }
-    async genTerraform(deployTarget) {
-        const soilTfPetalsPrm = deployTarget.getTerraformPetals(this.ctx);
+    async genTerraform(soil) {
+        const soilTfPetalsPrm = soil.getTerraformPetals(this.ctx);
         return this.ctx.logger.scope('garden.genTerraform', {}, async (logger) => {
             const setupTfProj = async (args) => args.logger.scope('tf', { proj: this.ctx.name, tf: args.term }, async (logger) => {
                 // Allows a terraform project to be defined in terms of a function which writes to main.tf,
@@ -126,8 +133,7 @@ export class Garden {
                     const stream = await args.fact.kid(['main.tf']).getDataHeadStream();
                     await args.setup(args.fact, stream, async (petal) => {
                         // Include a utility function the caller can use to easily write petals
-                        const { tf, files = {} } = await petal.getResult()
-                            .then(tf => isCls(tf, String) ? { tf } : tf);
+                        const { tf, files = {} } = await petal.getResult().then(tf => isCls(tf, String) ? { tf } : tf);
                         if (tf)
                             await stream.write(`${tf}\n`);
                         await Promise.all(files[toArr]((data, kfp) => args.fact.kid(kfp.split('/')).setData(data)));

package/cmp/mjs/soil/soil.d.ts

@@ -22,6 +22,7 @@ export declare namespace Soil {
         protected logger: Logger;
         protected registry: Registry<any>;
         constructor(args: BaseArgs);
+        getRegion(): string;
         getTerraformPetals(ctx: Context): Promise<PetalProjResult>;
     }
     type LocalStackArgs = BaseArgs & {
@@ -39,6 +40,7 @@ export declare namespace Soil {
         private aws;
         private localStackDocker;
         constructor(args: LocalStackArgs);
+        getRegion(): "ca-central-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2";
         private getAwsServices;
         private getDockerContainers;
         run(): Promise<{
@@ -77,6 +79,7 @@ export declare namespace Soil {
     class AwsCloud extends Base {
         private aws;
         constructor(args: AwsCloudArgs);
+        getRegion(): "ca-central-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2";
         getTerraformPetals(ctx: Context): Promise<{
             boot: () => Generator<PetalTerraform.Terraform | PetalTerraform.Provider | PetalTerraform.File, void, unknown>;
             main: (args: any) => Generator<PetalTerraform.Terraform | PetalTerraform.Provider | PetalTerraform.File, void, unknown>;

package/cmp/mjs/soil/soil.js

@@ -28,8 +28,11 @@ export var Soil;
             this.logger = args.logger;
             this.registry = args.registry;
         }
+        getRegion() {
+            throw Error('method definition missing');
+        }
         async getTerraformPetals(ctx) {
-            throw Error('not implemented');
+            throw Error('method definition missing');
         }
     }
     Soil.Base = Base;
@@ -47,6 +50,7 @@ export var Soil;
                 containerName: 'gershyLilacLocalStack'
             }[merge](args.localStackDocker ?? {});
         }
+        getRegion() { return this.aws.region; }
         getAwsServices() {
             // Note that "overhead" services are essential for initializing localstack:
             // - s3 + ddb used for terraform state locking
@@ -237,6 +241,7 @@ export var Soil;
             super(args);
             this.aws = args.aws;
         }
+        getRegion() { return this.aws.region; }
         async getTerraformPetals(ctx) {
             const { aws } = this;
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gershy/lilac",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Luscious infrastructure Living as Code - an opinionated approach to IAC",
   "keywords": [
     "lilac",
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@gershy/disk": "^0.0.13",
-    "@gershy/entry": "^0.0.6",
+    "@gershy/entry": "^0.0.7",
     "@gershy/logger": "^0.0.8",
     "@gershy/util-hash": "^0.0.5",
     "@types/node": "^24.10.1",