feat(functions-tools): tweak api for cli

packages/functions-tools/src/api/zod/index.ts

@@ -4,19 +4,16 @@ import type {TransformerOptions} from '../types/transformer-options';
 import {parseZodApi} from './services/parser.services';
 
 export const generateZodApi = async ({
-  queries,
-  updates,
+  functions,
   outputFile,
   transformerOptions
 }: {
-  queries: [string, Query][];
-  updates: [string, Update][];
+  functions: [string, Update | Query][];
   outputFile: string;
   transformerOptions: TransformerOptions;
 }) => {
   const api = parseZodApi({
-    queries,
-    updates,
+    functions,
     transformerOptions
   });
 

packages/functions-tools/src/api/zod/services/parser.services.ts

@@ -33,25 +33,18 @@ const template = `// This file was automatically generated by the Juno CLI.
 %NAMESPACE%`;
 
 export const parseZodApi = ({
-  queries,
-  updates,
+  functions: devFunctions,
   transformerOptions: {coreLib, outputLanguage}
 }: {
-  queries: [string, Query][];
-  updates: [string, Update][];
+  functions: [string, Update | Query][];
   transformerOptions: TransformerOptions;
 }): string => {
-  const templateQueries = queries
+  const functions = devFunctions
     .map(([jsFnName, fn]) => parseApi({jsFnName, fn, outputLanguage}))
-    .join('\n\n');
-
-  const templateUpdates = updates
-    .map(([jsFnName, fn]) => parseApi({jsFnName, fn, outputLanguage}))
-    .join('\n\n');
-
-  const functions = `${templateQueries}\n\n${templateUpdates}`.trim();
+    .join('\n\n')
+    .trim();
 
-  const functionNames = [...queries, ...updates].map(([jsFnName, _]) => jsFnName).join(',\n\t');
+  const functionNames = devFunctions.map(([jsFnName, _]) => jsFnName).join(',\n\t');
 
   const namespaceExport = templateNamespace
     .replace('%FUNCTION_NAMESPACE%', FRONTEND_FUNCTION_NAMESPACE)

packages/functions-tools/src/functions/index.ts

@@ -9,8 +9,8 @@ export interface GenerateFunctionsArgs {
 }
 
 export interface GenerateFunctionsData {
-  totalQueries: number;
-  totalUpdates: number;
+  queries: [string, Query][];
+  updates: [string, Update][];
   outputPath: string;
 }
 
@@ -73,8 +73,8 @@ export const generateFunctions = async ({
 
     return {
       outputPath: relative(process.cwd(), outputFile),
-      totalQueries: queries.length,
-      totalUpdates: updates.length
+      queries,
+      updates
     };
   } finally {
     globalThis.console = originalConsole;

packages/functions-tools/src/index.ts

@@ -1,3 +1,3 @@
-export * from './api/idl';
+export * from './api';
 export * from './converters';
 export * from './functions';