# Feature (4156): P3) Bug with deploying a client function after it a…

.gitignore

@@ -137,3 +137,4 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+.idea

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polyapi",
-  "version": "0.23.8",
+  "version": "0.23.9",
   "description": "Poly is a CLI tool to help create and manage your Poly definitions.",
   "license": "MIT",
   "repository": {

src/cli.ts

@@ -230,7 +230,7 @@ void yargs
           return;
         }
         const { addOrUpdateCustomFunction } = await import('./commands/function');
-        await addOrUpdateCustomFunction(DEFAULT_POLY_PATH, context, name, description, file, server, logsEnabled, generateContexts, executionApiKey);
+        await addOrUpdateCustomFunction(DEFAULT_POLY_PATH, context, name, description, file, client, server, logsEnabled, generateContexts, executionApiKey);
       },
     );
   })

src/commands/function.ts

@@ -15,6 +15,7 @@ export const addOrUpdateCustomFunction = async (
   name: string,
   description: string | null,
   file: string,
+  client: boolean | undefined,
   server: boolean | undefined,
   logsEnabled: boolean | undefined,
   generateContexts: string | undefined,
@@ -38,10 +39,21 @@ export const addOrUpdateCustomFunction = async (
     const specs = await getSpecs([context], [name]);
     const functionSpec = specs.find(spec => spec.name === name && spec.context === context);
     const updating = !!functionSpec;
-    if (server === undefined && updating) {
-      server = functionSpec.type === 'serverFunction';
-    } else {
-      server = server ?? false;
+    if (updating) {
+      const isConflictingType =
+        (client === true && functionSpec.type === 'serverFunction') ||
+        (server === true && functionSpec.type === 'customFunction');
+
+      if (isConflictingType) {
+        const existingType = functionSpec.type === 'serverFunction' ? 'server' : 'client';
+        const targetType = existingType === 'server' ? 'client' : 'server';
+
+        shell.echo(
+          chalk.redBright(`ERROR: Function already exists as a ${existingType} function.`) + '\n' +
+          chalk.red(`Please delete it before deploying as a ${targetType} function.`),
+        );
+        return;
+      }
     }
 
     const typeSchemas = generateTypeSchemas(file, tsConfigBaseUrl, DeployableTypeEntries.map(d => d[0]));
@@ -69,7 +81,9 @@ export const addOrUpdateCustomFunction = async (
       shell.echo(chalk.green('DEPLOYED'));
 
       shell.echo(`Function ID: ${customFunction.id}`);
-    } else {
+    }
+
+    if (client) {
       shell.echo('-n', `${updating ? 'Updating' : 'Adding'} Client Function to PolyAPI Catalog...`);
       customFunction = await createOrUpdateClientFunction(context, name, description, code, typeSchemas);
       shell.echo(chalk.green('DONE'));

src/config.ts

@@ -3,7 +3,7 @@ import dotenv from 'dotenv';
 
 const getPolyConfigDirPath = (polyPath: string) =>
   // If path does not start with `./` or `/` then we adjust!
-  /^\.?\/.*/.test(polyPath) ? polyPath : `${__dirname}/../../../../../${polyPath}`;
+  /^\.?\/.*/.test(polyPath) ? polyPath : `${__dirname}/../../../${polyPath}`;
 
 const getPolyConfigFilePath = (polyPath: string) =>
   `${getPolyConfigDirPath(polyPath)}/.config.env`;