Fixes wrong types in libraries.interfaces.ts (#3982)gh-4021

* Fix getLibrary functions

* Fix library.path usage in Zig compiler

2 files changed, 20 insertions, 26 deletions

diff --git a/lib/compilers/rust.ts b/lib/compilers/rust.ts
index 89b52533d..f1d0d3a89 100644
--- a/lib/compilers/rust.ts
+++ b/lib/compilers/rust.ts
@@ -35,6 +35,7 @@ import {RustParser} from './argument-parsers';
 
 export class RustCompiler extends BaseCompiler {
     linker: string;
+
     static get key() {
         return 'rust';
     }
@@ -69,24 +70,19 @@ export class RustCompiler extends BaseCompiler {
 
     override getIncludeArguments(libraries) {
         const includeFlag = '--extern';
-        return _.flatten(
-            _.map(libraries, selectedLib => {
-                const foundVersion = this.findLibVersion(selectedLib);
-                if (!foundVersion) return false;
-                if (!foundVersion.name) return false;
-                const list: string[] = [];
-                const lowercaseLibName = foundVersion.name.replaceAll('-', '_');
-                for (const rlib of foundVersion.path) {
-                    list.push(
-                        includeFlag,
-                        `${lowercaseLibName}=${foundVersion.name}/build/debug/${rlib}`,
-                        '-L',
-                        `dependency=${foundVersion.name}/build/debug/deps`,
-                    );
-                }
-                return list;
-            }),
-        );
+        return libraries.flatMap(selectedLib => {
+            const foundVersion = this.findLibVersion(selectedLib);
+            if (!foundVersion || !foundVersion.name) return [];
+            const lowercaseLibName = foundVersion.name.replaceAll('-', '_');
+            return foundVersion.path.flatMap(rlib => {
+                return [
+                    includeFlag,
+                    `${lowercaseLibName}=${foundVersion.name}/build/debug/${rlib}`,
+                    '-L',
+                    `dependency=${foundVersion.name}/build/debug/deps`,
+                ];
+            });
+        });
     }
 
     override orderArguments(
diff --git a/lib/compilers/zig.js b/lib/compilers/zig.js
index 1a9d0512d..d524fc1de 100644
--- a/lib/compilers/zig.js
+++ b/lib/compilers/zig.js
@@ -132,14 +132,12 @@ export class ZigCompiler extends BaseCompiler {
     }
 
     getIncludeArguments(libraries) {
-        return _.flatten(
-            _.map(libraries, selectedLib => {
-                const foundVersion = this.findLibVersion(selectedLib);
-                if (!foundVersion) return false;
-                // Zig should not have more than 1 path
-                return ['--pkg-begin', foundVersion.name, foundVersion.path, '--pkg-end'];
-            }),
-        );
+        return libraries.flatMap(selectedLib => {
+            const foundVersion = this.findLibVersion(selectedLib);
+            if (!foundVersion) return [];
+            // Zig should not have more than 1 path, but it's still an array so spread it
+            return ['--pkg-begin', foundVersion.name, ...foundVersion.path, '--pkg-end'];
+        });
     }
 
     getIrOutputFilename(inputFilename) {