From 80f454e09457f415c9fbfbb3e6df4e057c0e5b36 Mon Sep 17 00:00:00 2001
From: Igor Loskutov <igor.loskutoff@gmail.com>
Date: Sun, 25 Jun 2023 13:14:31 +0700
Subject: [PATCH 1/2] fix(rust): wasm-pack arguments + fix libs/apps relative
 paths

---
 .../rust/src/executors/wasm-pack/executor.ts  |  4 +--
 packages/rust/src/utils/build-command.ts      | 26 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/rust/src/executors/wasm-pack/executor.ts b/packages/rust/src/executors/wasm-pack/executor.ts
index 9f28904..73d07cb 100644
--- a/packages/rust/src/executors/wasm-pack/executor.ts
+++ b/packages/rust/src/executors/wasm-pack/executor.ts
@@ -1,5 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
-import { buildCommand } from '../../utils/build-command';
+import { buildCommand, buildWasmPackCommand } from '../../utils/build-command';
 import { runProcess } from '../../utils/run-process';
 import { WasmPackExecutorSchema } from './schema';
 
@@ -12,7 +12,7 @@ export default async function runExecutor(
   context: ExecutorContext
 ) {
   const wasmPackOptions = wasmPackArgs(options);
-  const args = buildCommand('build', wasmPackOptions, context);
+  const args = buildWasmPackCommand('build', wasmPackOptions, context);
   return runWasmPack(...args);
 }
 
diff --git a/packages/rust/src/utils/build-command.ts b/packages/rust/src/utils/build-command.ts
index 768faca..485a605 100644
--- a/packages/rust/src/utils/build-command.ts
+++ b/packages/rust/src/utils/build-command.ts
@@ -1,10 +1,9 @@
 import { ExecutorContext } from '@nx/devkit';
 import { BaseOptions } from '../models/base-options';
 
-export function buildCommand(
+function prebuildCommand(
   baseCommand: string,
   options: BaseOptions,
-  context: ExecutorContext
 ): string[] {
   const args = [];
 
@@ -32,8 +31,29 @@ export function buildCommand(
       args.push(`--${key}`, value);
     }
   }
+  return args;
+}
 
-  args.push('-p', context.projectName);
+function getProjectPath(context: ExecutorContext) {
+  return context.projectsConfigurations!/*is here 16+*/.projects[context.projectName!/*has to be here for it all to work*/].root;
+}
 
+export function buildCommand(
+  baseCommand: string,
+  options: BaseOptions,
+  context: ExecutorContext
+): string[] {
+  const args = prebuildCommand(baseCommand, options);
+  args.push('-p', getProjectPath(context));
+  return args;
+}
+
+export function buildWasmPackCommand(
+  baseCommand: string,
+  options: BaseOptions,
+  context: ExecutorContext
+): string[] {
+  const args = prebuildCommand(baseCommand, options);
+  args.push(getProjectPath(context));
   return args;
 }

From a2fe0f66345857a490b8e641ed683247b098007c Mon Sep 17 00:00:00 2001
From: Igor Loskutov <igor.loskutoff@gmail.com>
Date: Thu, 13 Jul 2023 19:24:40 +0700
Subject: [PATCH 2/2] fix(rust): correct context path for default rust executor

---
 packages/rust/src/utils/build-command.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rust/src/utils/build-command.ts b/packages/rust/src/utils/build-command.ts
index 485a605..e4b8308 100644
--- a/packages/rust/src/utils/build-command.ts
+++ b/packages/rust/src/utils/build-command.ts
@@ -44,7 +44,7 @@ export function buildCommand(
   context: ExecutorContext
 ): string[] {
   const args = prebuildCommand(baseCommand, options);
-  args.push('-p', getProjectPath(context));
+  args.push('-p', context.projectName);
   return args;
 }