Address pr feedback.

Author: fnando

cmd/crates/soroban-spec-typescript/src/boilerplate.rs

@@ -97,7 +97,7 @@ impl Project {
         let root: &Path = self.as_ref();
 
         // Handle package.json with proper JSON serialization
-        self.replace_package_json(root, contract_name)?;
+        replace_package_json(root, contract_name)?;
 
         // Handle non-JSON files with string replacement
         ["README.md", "src/index.ts"]
@@ -112,33 +112,6 @@ impl Project {
             })
     }
 
-    fn replace_package_json(&self, root: &Path, contract_name: &str) -> std::io::Result<()> {
-        let file = root.join("package.json");
-        let contents = fs::read_to_string(&file)?;
-        let mut json: serde_json::Value = serde_json::from_str(&contents).map_err(|e| {
-            std::io::Error::new(
-                std::io::ErrorKind::InvalidData,
-                format!("failed to parse package.json template: {e}"),
-            )
-        })?;
-
-        if let Some(obj) = json.as_object_mut() {
-            obj.insert(
-                "name".to_string(),
-                serde_json::Value::String(contract_name.to_string()),
-            );
-        }
-
-        let serialized = serde_json::to_string_pretty(&json).map_err(|e| {
-            std::io::Error::new(
-                std::io::ErrorKind::InvalidData,
-                format!("failed to serialize package.json: {e}"),
-            )
-        })?;
-        // Append trailing newline to match standard formatting
-        fs::write(&file, format!("{serialized}\n"))
-    }
-
     fn append_index_ts(
         &self,
         spec: &[ScSpecEntry],
@@ -179,6 +152,38 @@ impl Project {
     }
 }
 
+fn replace_package_json(root: &Path, contract_name: &str) -> std::io::Result<()> {
+    let file = root.join("package.json");
+    let contents = fs::read_to_string(&file)?;
+    let mut json: serde_json::Value = serde_json::from_str(&contents).map_err(|e| {
+        std::io::Error::new(
+            std::io::ErrorKind::InvalidData,
+            format!("failed to parse package.json template: {e}"),
+        )
+    })?;
+
+    if let Some(obj) = json.as_object_mut() {
+        obj.insert(
+            "name".to_string(),
+            serde_json::Value::String(contract_name.to_string()),
+        );
+    } else {
+        return Err(std::io::Error::new(
+            std::io::ErrorKind::InvalidData,
+            "package.json template must be a JSON object",
+        ));
+    }
+
+    let serialized = serde_json::to_string_pretty(&json).map_err(|e| {
+        std::io::Error::new(
+            std::io::ErrorKind::InvalidData,
+            format!("failed to serialize package.json: {e}"),
+        )
+    })?;
+    // Append trailing newline to match standard formatting
+    fs::write(&file, format!("{serialized}\n"))
+}
+
 #[cfg(test)]
 mod test {
     use temp_dir::TempDir;
@@ -248,10 +253,10 @@ mod test {
             "dependencies",
             "devDependencies",
         ];
-        for key in obj.keys() {
+        for key in expected_keys {
             assert!(
-                expected_keys.contains(&key.as_str()),
-                "unexpected key in package.json: {key}"
+                obj.contains_key(key),
+                "missing expected key in package.json: {key}"
             );
         }
     }

cmd/soroban-cli/src/commands/contract/bindings/typescript.rs

@@ -39,8 +39,8 @@ pub enum Error {
     Spec(#[from] spec_tools::Error),
     #[error("Failed to get file name from path: {0:?}")]
     FailedToGetFileName(PathBuf),
-    #[error("--output-dir basename is not a valid npm package name: {0}. Use only lowercase alphanumeric characters, hyphens, dots, and underscores")]
-    InvalidContractName(String),
+    #[error("--output-dir basename '{0}' is not a valid npm package name: {1}. Use only lowercase alphanumeric characters, hyphens, dots, and underscores")]
+    InvalidContractName(String, String),
     #[error(transparent)]
     WasmOrContract(#[from] contract_spec::Error),
     #[error(transparent)]
@@ -85,7 +85,7 @@ impl Cmd {
             .to_str()
             .ok_or_else(|| Error::NotUtf8(file_name.to_os_string()))?;
         soroban_spec_typescript::validate_npm_package_name(contract_name)
-            .map_err(Error::InvalidContractName)?;
+            .map_err(|reason| Error::InvalidContractName(contract_name.to_string(), reason))?;
         let (resolved_address, network) = match source {
             contract_spec::Source::Contract {
                 resolved_address,