Simplify codegen for the solidity_npm_package crate (#1411)

This is a first step towards reducing the number of boilerplate in the
project. More concretely, this PR moves the code from
`crates/codegen/runtime/npm/package` to
`crates/solidity/outputs/npm/package`, and performs an in-place codegen
of the jinja templates (in fact, just one for the nodes).

Author: beta-ziliani

.cspell.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/v5.19.2/cspell.schema.json",
   "language": "en-US",
   "files": ["**/*.md"],
-  "ignorePaths": ["submodules/**", "**/generated/**", "CHANGELOG.md"],
+  "ignorePaths": ["submodules/**", "**/generated/**", "**/*.generated.*", "CHANGELOG.md"],
   "ignoreWords": [
     // Alphabetically sorted list of "allowed" words to ignore:
     "abicoder",

.gitattributes

@@ -3,6 +3,7 @@
 
 # Generated Sources
 **/generated/** linguist-generated=true
+**/*.generated.* linguist-generated=true
 
 # Lock Files
 **/Cargo.lock linguist-generated=true

.vscode/settings.json

@@ -12,7 +12,8 @@
   "files.eol": "\n",
   "files.insertFinalNewline": true,
   "files.readonlyInclude": {
-    "**/generated/**": true
+    "**/generated/**": true,
+    "**/*.generated.*": true
   },
   "rust-analyzer.check.allTargets": true,
   "rust-analyzer.check.command": "clippy",

Cargo.lock

@@ -16,7 +16,6 @@ members = [
     "crates/codegen/runtime/cargo/crate",
     "crates/codegen/runtime/cargo/wasm",
     "crates/codegen/runtime/generator",
-    "crates/codegen/runtime/npm/package",
     "crates/codegen/spec",
     "crates/codegen/testing",
 
@@ -54,7 +53,6 @@ codegen_runner = { path = "crates/codegen/runner", version = "1.2.1" }
 codegen_runtime_cargo_crate = { path = "crates/codegen/runtime/cargo/crate", version = "1.2.1" }
 codegen_runtime_cargo_wasm = { path = "crates/codegen/runtime/cargo/wasm", version = "1.2.1" }
 codegen_runtime_generator = { path = "crates/codegen/runtime/generator", version = "1.2.1" }
-codegen_runtime_npm_package = { path = "crates/codegen/runtime/npm/package", version = "1.2.1" }
 codegen_spec = { path = "crates/codegen/spec", version = "1.2.1" }
 codegen_testing = { path = "crates/codegen/testing", version = "1.2.1" }
 

Cargo.toml

@@ -23,7 +23,6 @@ fn main() {
         || generate_solidity_tests(),
         || generate_stubs("codegen_runtime_cargo_crate"),
         || generate_stubs("codegen_runtime_cargo_wasm"),
-        || generate_stubs("codegen_runtime_npm_package"),
         || {
             let mut fs = CodegenFileSystem::default();
             let language = SolidityDefinition::create();
@@ -55,10 +54,9 @@ fn main() {
             )
         },
         || {
-            generate_product(
+            generate_in_place(
                 &mut CodegenFileSystem::default(),
                 &SolidityDefinition::create(),
-                "codegen_runtime_npm_package",
                 "solidity_npm_package",
             )
         },
@@ -119,6 +117,16 @@ fn generate_product(
     RuntimeGenerator::generate_product(language, fs, &input_dir, &output_dir)
 }
 
+fn generate_in_place(
+    fs: &mut CodegenFileSystem,
+    language: &Language,
+    the_crate: &str,
+) -> Result<()> {
+    let the_crate = CargoWorkspace::locate_source_crate(the_crate)?;
+
+    RuntimeGenerator::generate_templates_in_place(language, fs, &the_crate)
+}
+
 fn generate_builtins(
     fs: &mut CodegenFileSystem,
     language: &Language,

crates/codegen/runner/src/main.rs

@@ -37,6 +37,19 @@ impl RuntimeGenerator {
         CodegenRuntime::render_product(fs, input_dir, output_dir, model)
     }
 
+    pub fn generate_templates_in_place(
+        language: &Language,
+        fs: &mut CodegenFileSystem,
+        dir: &Path,
+    ) -> Result<()> {
+        let model = ModelWrapper {
+            rendering_in_stubs: false,
+            model: RuntimeModel::from_language(language)?,
+        };
+
+        CodegenRuntime::render_templates_in_place(fs, dir, model)
+    }
+
     pub fn generate_stubs(fs: &mut CodegenFileSystem, source_dir: &Path) -> Result<()> {
         let model = ModelWrapper {
             rendering_in_stubs: true,