generating ts in folders for each adl package

millergarym · Apr 19, 2023 · 8aa3ac5 · 8aa3ac5
1 parent a00210b
commit 8aa3ac5
Show file tree

Hide file tree

Showing 19 changed files with 494 additions and 210 deletions.
diff --git a/adl/adl.work.json b/adl/adl.work.json
@@ -1,9 +1,19 @@
 {
     "adlc": "0.0.0",
     "use_embedded_sys_loader": true,
+    "runtimes": [
+        {
+            "ts_runtime": {
+                "outputDir": "../generated/typescript/tests"
+            }
+        }
+    ],
     "use": [
         {
-            "path": "./adlc"
+            "path": "./adlc",
+            "ts_opts": {
+                "npm_pkg_name": "@adl-lang/adlc"
+            }
         },
         {
             "path": "./tests/test31/lib",
@@ -21,6 +31,9 @@
             "path": "./tests/test31/proj",
             "ts_opts": {
                 "npm_pkg_name": "@adl-lang/protoclient",
+                "runtime_opts": {
+                    "packageRef": "@adl-lang/runtime"
+                },
                 "outputs": {
                     "gen": {
                         "outputDir": "../generated/typescript/tests/test31/src",
@@ -31,4 +44,4 @@
             }
         }
     ]
-}
+}
diff --git a/adl/adl.work2.json b/adl/adl.work2.json
@@ -0,0 +1,68 @@
+{
+    "adlc": "0.0.0",
+    "use_embedded_sys_loader": true,
+    "runtimes": [
+        {
+            "ts_runtime": {
+                "outputDir": "../generated2/typescript/tests"
+            }
+        }
+    ],
+    "use": [
+        {
+            "path": "./adlc",
+            "ts_opts": {
+                "npm_pkg_name": "@adl-lang/adlc",
+                "outputs": {
+                    "gen": {
+                        "outputDir": "../generated2/typescript/tests",
+                        "manifest": "../generated2/typescript/tests/adlc/.adl-manifest"
+                    }
+                },
+                "include_resolver": false
+            }
+        },
+        {
+            "path": "./tests/test31/lib",
+            "ts_opts": {
+                "npm_pkg_name": "@adl-lang/common",
+                "outputs": {
+                    "gen": {
+                        "outputDir": "../generated2/typescript/tests",
+                        "manifest": "../generated2/typescript/tests/common/.adl-manifest"
+                    }
+                },
+                "include_resolver": false
+            }
+        },
+        {
+            "path": "./stdlib",
+            "ts_opts": {
+                "npm_pkg_name": "@adl-lang/sys",
+                "outputs": {
+                    "gen": {
+                        "outputDir": "../generated2/typescript/tests",
+                        "manifest": "../generated2/typescript/tests/sys/.adl-manifest"
+                    }
+                },
+                "include_resolver": false
+            }
+        },
+        {
+            "path": "./tests/test31/proj",
+            "ts_opts": {
+                "npm_pkg_name": "@adl-lang/protoclient",
+                "runtime_opts": {
+                    "packageRef": "@adl-lang/runtime"
+                },
+                "outputs": {
+                    "gen": {
+                        "outputDir": "../generated2/typescript/tests/test31/src",
+                        "manifest": "../generated2/typescript/tests/test31/.adl-manifest"
+                    }
+                },
+                "include_resolver": true
+            }
+        }
+    ]
+}
diff --git a/adl/adlc/adlc/packaging.adl b/adl/adlc/adlc/packaging.adl
@@ -27,9 +27,21 @@ struct Payload2 {
 struct AdlWorkspace<T> {
     String adlc;
     Vector<T> use;
+    Vector<RuntimeOpts> runtimes = [];
     Bool use_embedded_sys_loader = true;
 };
 
+union RuntimeOpts {
+    TsWriteRuntime ts_runtime;
+};
+
+struct TsWriteRuntime {
+    String outputDir;
+    ReferenceableScopeOption referenceable = "local";
+    String npm_pkg_name = "@adl-lang/runtime";
+    TsStyle ts_style = "tsc";
+};
+
 // key must be a path to a directory directly under the folder containing the `adl.work.json` file.
 // type AdlPackageRefs = StringMap<AdlPackageRef>;
 
@@ -42,7 +54,7 @@ struct AdlPackageRef {
 
 struct TypescriptGenOptions {
     Nullable<String> npm_pkg_name;
-    OutputOpts outputs = { "ref": {}};
+    Nullable<OutputOpts> outputs = null;
     TsRuntimeOpt runtime_opts = { "packageRef": "@adl-lang/runtime" };
     Bool generate_transitive = false;
     Bool include_resolver = false;
@@ -70,16 +82,17 @@ union TsRuntimeOpt {
 };
 
 struct TsGenRuntime {
-    String runtimeDir;
+    // this is currently hardcoded to "./runtime"
+    // String runtimeDir;
 };
 
 union OutputOpts {
     GenOutput gen;
-    PkgRef ref;
+    // PkgRef ref;
 };
 
-struct PkgRef {
-};
+// struct PkgRef {
+// };
 
 struct GenOutput {
     ReferenceableScopeOption referenceable = "local";
@@ -122,11 +135,16 @@ struct PackageDirective {
 };
 
 struct Require {
-    String path;
-    String version;
+    PkgRef ref;
+    Nullable<String> version = null;
     Bool indirect = false;
 };
 
+union PkgRef {
+    String path;
+    String alias;
+};
+
 struct Exclude {
     String path;
     String version;
@@ -142,4 +160,18 @@ struct Retract {
     Nullable<String> comment = null;
 };
 
+struct NpmPackage {
+    String name;
+    StringMap<String> scripts;
+    StringMap<DependencySpec> dependencies;
+    StringMap<DependencySpec> devDependencies;
+};
+
+union DependencySpec {
+    Void workspace;
+    VersionSpec semverSpec;
+};
+
+type VersionSpec = String;
+
 };
diff --git a/adl/tests/test31/lib/common/flyway/api.adl b/adl/tests/test31/lib/common/flyway/api.adl
@@ -1,8 +1,5 @@
-@NpmPackage "@adl-lang/common"
 module common.flyway.api {
 
-import adlc.config.typescript.*;
-
 import common.flyway.internals.FlywayAction;
 import common.flyway.internals.FlywayContext;
 import common.http.HttpPost;

diff --git a/adl/tests/test31/lib/common/flyway/internals.adl b/adl/tests/test31/lib/common/flyway/internals.adl
@@ -1,8 +1,5 @@
-@NpmPackage "@adl-lang/common"
 module common.flyway.internals {
 
-import adlc.config.typescript.*;
-
 struct FlywayCommand {
   FlywayContext ctx;
   /// The action to take on application startup

diff --git a/adl/tests/test31/proj/adl.pkg.json b/adl/tests/test31/proj/adl.pkg.json
@@ -1,5 +1,17 @@
 {
-    "path" : "github.com/adl-lang/adl/adl/tests/test31/proj",
+    "path": "github.com/adl-lang/adl/adl/tests/test31/proj",
     "globalAlias": "protoclient",
-    "adlc": "0.0.0"
+    "adlc": "0.0.0",
+    "requires": [
+        {
+            "ref": {
+                "alias": "sys"
+            }
+        },
+        {
+            "ref": {
+                "alias": "common"
+            }
+        }
+    ]
 }