@junobuild/functions-tools 0.4.6 → 0.5.0

package/dist/types/api/index.d.ts

@@ -1,3 +1,3 @@
 export * from './idl';
+export * from './schema';
 export type * from './types/transformer-options';
-export * from './zod';

package/dist/types/api/{zod → schema}/index.d.ts

@@ -1,6 +1,6 @@
 import type { Query, Update } from '@junobuild/functions';
 import type { TransformerOptions } from '../types/transformer-options';
-export declare const generateZodApi: ({ functions, outputFile, transformerOptions }: {
+export declare const generateSchemaApi: ({ functions, outputFile, transformerOptions }: {
     functions: [string, Update | Query][];
     outputFile: string;
     transformerOptions: TransformerOptions;

package/dist/types/api/{zod → schema}/services/_javascript.templates.d.ts

@@ -1,4 +1,4 @@
-export declare const jsTemplateImports = "import {idlFactory} from './satellite.factory.did.js';\nimport {getSatelliteExtendedActor} from '@junobuild/%CORE_LIB%';\nimport {recursiveToNullable, recursiveFromNullable} from '@junobuild/zod';\nimport * as z from 'zod';";
+export declare const jsTemplateImports = "import {idlFactory} from './satellite.factory.did.js';\nimport {getSatelliteExtendedActor} from '@junobuild/%CORE_LIB%';\nimport {recursiveToNullable, recursiveFromNullable} from '@junobuild/schema/utils';\nimport {j} from '@junobuild/schema';";
 export declare const jsTemplateWithArgsWithResult = "\n%ARGS_ZOD%\n%RESULT_ZOD%\n\nconst %JS_FUNCTION% = async (args) => {\n\tconst parsedArgs = %ARGS_SCHEMA%.parse(args);\n\tconst idlArgs = recursiveToNullable({schema: %ARGS_SCHEMA%, value: parsedArgs});\n\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor({idlFactory});\n\tconst idlResult = await %RS_FUNCTION%(idlArgs);\n\n\tconst result = recursiveFromNullable({schema: %RESULT_SCHEMA%, value: idlResult});\n\treturn %RESULT_SCHEMA%.parse(result);\n};";
 export declare const jsTemplateWithArgsNoResult = "\n%ARGS_ZOD%\n\nconst %JS_FUNCTION% = async (args) => {\n\tconst parsedArgs = %ARGS_SCHEMA%.parse(args);\n\tconst idlArgs = recursiveToNullable({schema: %ARGS_SCHEMA%, value: parsedArgs});\n\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor({idlFactory});\n\tawait %RS_FUNCTION%(idlArgs);\n};";
 export declare const jsTemplateNoArgsWithResult = "\n%RESULT_ZOD%\n\nconst %JS_FUNCTION% = async () => {\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor({idlFactory});\n\tconst idlResult = await %RS_FUNCTION%();\n\n\tconst result = recursiveFromNullable({schema: %RESULT_SCHEMA%, value: idlResult});\n\treturn %RESULT_SCHEMA%.parse(result);\n};";

package/dist/types/api/{zod → schema}/services/_typescript.templates.d.ts

@@ -1,5 +1,5 @@
-export declare const tsTemplateImports = "import type {_SERVICE as SatelliteActor} from './satellite.did';\nimport {idlFactory} from './satellite.factory.did.js';\nimport {getSatelliteExtendedActor} from '@junobuild/%CORE_LIB%';\nimport {recursiveToNullable, recursiveFromNullable} from '@junobuild/zod';\nimport * as z from 'zod';";
-export declare const tsTemplateWithArgsWithResult = "\n%ARGS_ZOD%\n%RESULT_ZOD%\n\nconst %JS_FUNCTION% = async (args: z.infer<typeof %ARGS_SCHEMA%>): Promise<z.infer<typeof %RESULT_SCHEMA%>> => {\n\tconst parsedArgs = %ARGS_SCHEMA%.parse(args);\n\tconst idlArgs = recursiveToNullable({schema: %ARGS_SCHEMA%, value: parsedArgs});\n\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor<SatelliteActor>({idlFactory});\n\tconst idlResult = await %RS_FUNCTION%(idlArgs);\n\n\tconst result = recursiveFromNullable({schema: %RESULT_SCHEMA%, value: idlResult});\n\treturn %RESULT_SCHEMA%.parse(result);\n};";
-export declare const tsTemplateWithArgsNoResult = "\n%ARGS_ZOD%\n\nconst %JS_FUNCTION% = async (args: z.infer<typeof %ARGS_SCHEMA%>): Promise<void> => {\n\tconst parsedArgs = %ARGS_SCHEMA%.parse(args);\n\tconst idlArgs = recursiveToNullable({schema: %ARGS_SCHEMA%, value: parsedArgs});\n\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor<SatelliteActor>({idlFactory});\n\tawait %RS_FUNCTION%(idlArgs);\n};";
-export declare const tsTemplateNoArgsWithResult = "\n%RESULT_ZOD%\n\nconst %JS_FUNCTION% = async (): Promise<z.infer<typeof %RESULT_SCHEMA%>> => {\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor<SatelliteActor>({idlFactory});\n\tconst idlResult = await %RS_FUNCTION%();\n\n\tconst result = recursiveFromNullable({schema: %RESULT_SCHEMA%, value: idlResult});\n\treturn %RESULT_SCHEMA%.parse(result);\n};";
+export declare const tsTemplateImports = "import type {_SERVICE as SatelliteActor} from './satellite.did';\nimport {idlFactory} from './satellite.factory.did.js';\nimport {getSatelliteExtendedActor} from '@junobuild/%CORE_LIB%';\nimport {recursiveToNullable, recursiveFromNullable} from '@junobuild/schema/utils';\nimport {j} from '@junobuild/schema';";
+export declare const tsTemplateWithArgsWithResult = "\n%ARGS_ZOD%\n%RESULT_ZOD%\n\nconst %JS_FUNCTION% = async (args: j.infer<typeof %ARGS_SCHEMA%>): Promise<j.infer<typeof %RESULT_SCHEMA%>> => {\n\tconst parsedArgs = %ARGS_SCHEMA%.parse(args);\n\tconst idlArgs = recursiveToNullable({schema: %ARGS_SCHEMA%, value: parsedArgs});\n\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor<SatelliteActor>({idlFactory});\n\tconst idlResult = await %RS_FUNCTION%(idlArgs);\n\n\tconst result = recursiveFromNullable({schema: %RESULT_SCHEMA%, value: idlResult});\n\treturn %RESULT_SCHEMA%.parse(result);\n};";
+export declare const tsTemplateWithArgsNoResult = "\n%ARGS_ZOD%\n\nconst %JS_FUNCTION% = async (args: j.infer<typeof %ARGS_SCHEMA%>): Promise<void> => {\n\tconst parsedArgs = %ARGS_SCHEMA%.parse(args);\n\tconst idlArgs = recursiveToNullable({schema: %ARGS_SCHEMA%, value: parsedArgs});\n\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor<SatelliteActor>({idlFactory});\n\tawait %RS_FUNCTION%(idlArgs);\n};";
+export declare const tsTemplateNoArgsWithResult = "\n%RESULT_ZOD%\n\nconst %JS_FUNCTION% = async (): Promise<j.infer<typeof %RESULT_SCHEMA%>> => {\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor<SatelliteActor>({idlFactory});\n\tconst idlResult = await %RS_FUNCTION%();\n\n\tconst result = recursiveFromNullable({schema: %RESULT_SCHEMA%, value: idlResult});\n\treturn %RESULT_SCHEMA%.parse(result);\n};";
 export declare const tsTemplateNoArgsNoResult = "\nconst %JS_FUNCTION% = async (): Promise<void> => {\n\tconst {%RS_FUNCTION%} = await getSatelliteExtendedActor<SatelliteActor>({idlFactory});\n\tawait %RS_FUNCTION%();\n};";

package/dist/types/api/{zod → schema}/services/parser.services.d.ts

@@ -1,6 +1,6 @@
 import type { Query, Update } from '@junobuild/functions';
 import type { TransformerOptions } from '../../types/transformer-options';
-export declare const parseZodApi: ({ functions: devFunctions, transformerOptions: { coreLib, outputLanguage } }: {
+export declare const parseSchemaApi: ({ functions: devFunctions, transformerOptions: { coreLib, outputLanguage } }: {
     functions: [string, Update | Query][];
     transformerOptions: TransformerOptions;
 }) => string;

package/dist/types/converters/_types.d.ts

@@ -32,9 +32,6 @@ export type SputnikSchema = {
 } | {
     kind: 'variant';
     tags: string[];
-} | {
-    kind: 'variantRecords';
-    members: SputnikSchema[];
 } | {
     kind: 'discriminatedUnion';
     discriminator: string;

package/dist/types/converters/{zod-to-zod.d.ts → zod-to-schema.d.ts}

@@ -1,18 +1,18 @@
 import type { z } from 'zod';
-export interface ZodResult {
+export interface SchemaResult {
     baseName: string;
     code: string;
 }
 /**
- * Converts a Zod schema to a Zod schema source code string.
+ * Converts a Zod schema to Juno schema source code.
  *
  * @param {string} id - The base name used to generate the schema constant name.
  * @param {z.ZodType} schema - The Zod schema to convert.
  * @param {'Args' | 'Result'} suffix - Whether this represents function arguments or a return type.
- * @returns {ZodResult} An object containing the generated code and the base type name.
+ * @returns {SchemaResult} An object containing the generated code and the base type name.
  */
-export declare const zodToZod: ({ id, schema, suffix }: {
+export declare const zodToSchema: ({ id, schema, suffix }: {
     id: string;
     schema: z.ZodType;
     suffix: "Args" | "Result";
-}) => ZodResult;
+}) => SchemaResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junobuild/functions-tools",
-  "version": "0.4.6",
+  "version": "0.5.0",
   "description": "Tools for generating Juno serverless functions code.",
   "author": "David Dal Busco (https://daviddalbusco.com)",
   "license": "MIT",
@@ -53,9 +53,9 @@
     "@babel/traverse": "7.28.4",
     "@babel/types": "7.28.4",
     "@dfinity/utils": "^4.1",
-    "@junobuild/functions": "^0.6",
+    "@junobuild/functions": "^0.7",
     "@junobuild/utils": "^0.3",
-    "@junobuild/zod": "^1",
+    "@junobuild/schema": "^1",
     "zod": "^4.3"
   }
 }