wip

containers/ecr.main.w

@@ -1,12 +1,15 @@
 bring "./tfaws-ecr.w" as ecr;
-bring "./utils.w" as utils;
 bring util;
 
+class Extern {
+  pub static extern "./utils.js" dirname(): str;
+}
+
 if util.env("WING_TARGET") == "tf-aws" {
   new ecr.Repository(
     name: "my-repository",
-    directory: utils.dirname() + "/test/my-app",
+    directory: Extern.dirname() + "/test/my-app",
     tag: "tag1"
-  );  
+  );
 }
 

containers/utils.js

@@ -1,10 +1,3 @@
-exports.entrypointDir = function (scope) {
-  if (typeof(scope.entrypointDir) == "string") {
-    return scope.entrypointDir;
-  }
-
-  return exports.entrypointDir(scope.node.scope);
-};
 
 exports.dirname = function() {
   return __dirname;

containers/values.w

@@ -1,6 +1,5 @@
 bring util;
 bring fs;
-bring "./utils.w" as utils;
 
 pub class Values {
   pub static all(): Map<str> {

containers/workload.sim.w

@@ -4,7 +4,6 @@ bring cloud;
 bring sim;
 bring ui;
 bring "./api.w" as api;
-bring "./utils.w" as utils;
 
 pub class Workload_sim {
   pub publicUrl: str?;

containers/workload.tfaws.w

@@ -4,7 +4,6 @@ bring "cdk8s-plus-27" as plus;
 bring "cdk8s" as cdk8s;
 bring "cdktf" as cdktf;
 bring "./tfaws-ecr.w" as ecr;
-bring "./utils.w" as utils;
 bring "@cdktf/provider-kubernetes" as k8s;
 bring "@cdktf/provider-helm" as helm;
 bring fs;
@@ -21,7 +20,7 @@ pub class Workload_tfaws {
 
     if this.isPath(props.image) {
       let hash = this.resolveContentHash(props) ?? props.image;
-      let appDir = utils.entrypointDir(this);
+      let appDir = nodeof(this).app.entrypointDir;
       let repository = new ecr.Repository(
         name: props.name,
         directory: appDir + "/" + props.image,

containers/workload.w

@@ -2,7 +2,6 @@ bring util;
 bring "./workload.sim.w" as sim;
 bring "./workload.tfaws.w" as tfaws;
 bring "./api.w" as api;
-bring "./utils.w" as utils;
 
 bring http;