diff --git a/package-lock.json b/package-lock.json index 7251f9f..f6a4eca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,15 +14,15 @@ "@icp-sdk/core": "^5.0.0", "@junobuild/admin": "^4.2.0", "@junobuild/cdn": "^2.3.0", - "@junobuild/cli-tools": "^0.11.0", - "@junobuild/config": "^2.13.0", + "@junobuild/cli-tools": "^0.12.2", + "@junobuild/config": "^2.14.1", "@junobuild/config-loader": "^0.4.8", "@junobuild/core": "^5.2.1", - "@junobuild/functions-tools": "^0.4.1", + "@junobuild/functions-tools": "^0.5.2", "@junobuild/ic-client": "^8.0.1", + "@junobuild/schema": "^1.1.0", "@junobuild/storage": "^2.3.0", "@junobuild/utils": "^0.3.0", - "@junobuild/zod": "^1.0.0", "chokidar": "^4.0.3", "conf": "^14.0.0", "open": "^11.0.0", @@ -39,7 +39,7 @@ "@eslint/eslintrc": "^3.3.3", "@eslint/js": "^9.39.2", "@junobuild/emulator-playwright": "^0.0.5", - "@junobuild/functions": "^0.6.0", + "@junobuild/functions": "^0.7.1", "@playwright/test": "^1.58.1", "@types/node": "24.10.9", "@types/prompts": "^2.4.9", @@ -1758,9 +1758,9 @@ } }, "node_modules/@junobuild/cli-tools": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.11.0.tgz", - "integrity": "sha512-saKfn0rNFhVZzwTspVGE7YhUm3IqnlxRXgEqT1hXKejA1w/K8ePJCObf1mcSCsEMk2siAGB/2sma24Z5yOak2w==", + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.12.2.tgz", + "integrity": "sha512-YkAxYfAUlQ/s+8JPcaTH7zgXkiyz/hZG6723B56wM9lOR4Dsnr9eYdEwMdoL7VlO1mew8kAIdCKXdTd+y04kAA==", "license": "MIT", "dependencies": { "file-type": "^21.1.1", @@ -1771,20 +1771,20 @@ "peerDependencies": { "@dfinity/utils": "^4.1", "@junobuild/cdn": "^2.3", - "@junobuild/config": "^2.13", - "@junobuild/functions-tools": "^0.4.1", + "@junobuild/config": "^2.14", + "@junobuild/functions-tools": "^0.5.2", "@junobuild/storage": "^2.3", "esbuild": "^0.27.0", "ora": "^9" } }, "node_modules/@junobuild/config": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-2.13.0.tgz", - "integrity": "sha512-SJABydaIs/OmONJMX5OLmD1Lxkn08HftJEfdksJkEpAzRAZAZBf4W+G9eKIDb43e015rQp1f/Z1WrBdPLTsryw==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-2.14.1.tgz", + "integrity": "sha512-4dmMKIXQtumjZ0ZpwLktgk5+BBffNMH++Q9ZcMnILY07oQsBZEvoiUJtDnp7ACTYSmZU0hisEzg2y9kjuZQEsA==", "license": "MIT", "peerDependencies": { - "@junobuild/zod": "^1", + "@junobuild/schema": "^1.1", "zod": "^4.3" } }, @@ -1843,21 +1843,21 @@ "license": "MIT" }, "node_modules/@junobuild/functions": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.6.0.tgz", - "integrity": "sha512-j8Z5iQwJBbmXM8WQJI/nNyDAzBFWgEGyPIOWz7/wCW/D2uKQPEe0BOWccpmcUbHrLaVgA9Ybm4LJZreITT7Cdg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.7.1.tgz", + "integrity": "sha512-dsQuKQJnwfOklIETaqCesZlvsyBfPgaU+0gL5ukeKR4cjFI/Lyhr93wdI29WjzKosK/O3/ZioSRtUfHNTXRl9g==", "license": "MIT", "peerDependencies": { "@dfinity/utils": "^4.1", "@icp-sdk/core": "^5", - "@junobuild/zod": "^1", + "@junobuild/schema": "^1.1", "zod": "^4.3" } }, "node_modules/@junobuild/functions-tools": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.4.1.tgz", - "integrity": "sha512-8mhkalj6ZUsICn7CvceiB+IyVRAMqdPS0Dmota6Ozte+ttsfUo3+tBFJZaXqosbNXElczqyzkjk862eppnR+5w==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.5.2.tgz", + "integrity": "sha512-lCEW9vH3QGrSFo127+aQdRlsFgDIvWiuaAiEKNLSk+sAN2sZ/U94vG+hIuWHfnCx+xirlmlg/DgNmd9KoLD1SA==", "license": "MIT", "peerDependencies": { "@babel/core": "7.28.4", @@ -1867,9 +1867,9 @@ "@babel/traverse": "7.28.4", "@babel/types": "7.28.4", "@dfinity/utils": "^4.1", - "@junobuild/functions": "^0.6", + "@junobuild/functions": "^0.7", + "@junobuild/schema": "^1.1", "@junobuild/utils": "^0.3", - "@junobuild/zod": "^1", "zod": "^4.3" } }, @@ -1884,6 +1884,18 @@ "idb-keyval": "^6.2.2" } }, + "node_modules/@junobuild/schema": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@junobuild/schema/-/schema-1.1.0.tgz", + "integrity": "sha512-jqdKLr760a7vQRsXEU5gWxIDoYdCPHplWci8Nf+aKj0Bko2dZ6BvEaB1a5B4dSe684bAxjcrYk9kr1jKvi5wGw==", + "license": "MIT", + "dependencies": { + "@dfinity/zod-schemas": "^3.1" + }, + "peerDependencies": { + "zod": "^4.3" + } + }, "node_modules/@junobuild/storage": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-2.3.0.tgz", @@ -1905,20 +1917,6 @@ "@dfinity/utils": "^4.1" } }, - "node_modules/@junobuild/zod": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@junobuild/zod/-/zod-1.0.0.tgz", - "integrity": "sha512-EQ588y6d+OKxRq054k7ObsOxe0v7g0ZfhwaZ6eRYnjwPJh/VctuXY+hvlZkMhfEVEdzWlfGQIispvD8y9RTDQg==", - "license": "MIT", - "dependencies": { - "@dfinity/zod-schemas": "^3.1" - }, - "peerDependencies": { - "@icp-sdk/core": "^5", - "@junobuild/utils": "^0.3", - "zod": "^4.3" - } - }, "node_modules/@noble/curves": { "version": "1.9.7", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.7.tgz", @@ -7903,9 +7901,9 @@ "requires": {} }, "@junobuild/cli-tools": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.11.0.tgz", - "integrity": "sha512-saKfn0rNFhVZzwTspVGE7YhUm3IqnlxRXgEqT1hXKejA1w/K8ePJCObf1mcSCsEMk2siAGB/2sma24Z5yOak2w==", + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.12.2.tgz", + "integrity": "sha512-YkAxYfAUlQ/s+8JPcaTH7zgXkiyz/hZG6723B56wM9lOR4Dsnr9eYdEwMdoL7VlO1mew8kAIdCKXdTd+y04kAA==", "requires": { "file-type": "^21.1.1", "listr2": "^9.0.5", @@ -7914,9 +7912,9 @@ } }, "@junobuild/config": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-2.13.0.tgz", - "integrity": "sha512-SJABydaIs/OmONJMX5OLmD1Lxkn08HftJEfdksJkEpAzRAZAZBf4W+G9eKIDb43e015rQp1f/Z1WrBdPLTsryw==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-2.14.1.tgz", + "integrity": "sha512-4dmMKIXQtumjZ0ZpwLktgk5+BBffNMH++Q9ZcMnILY07oQsBZEvoiUJtDnp7ACTYSmZU0hisEzg2y9kjuZQEsA==", "requires": {} }, "@junobuild/config-loader": { @@ -7950,15 +7948,15 @@ "integrity": "sha512-uyfpITxVCDfxcALXi1CVxrwSK8yoVPZW8pgzf5fD1c2Vp1k7B0AIs/s4usW8SLR1CVvjOzf9m/jtVeFe6kuOtQ==" }, "@junobuild/functions": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.6.0.tgz", - "integrity": "sha512-j8Z5iQwJBbmXM8WQJI/nNyDAzBFWgEGyPIOWz7/wCW/D2uKQPEe0BOWccpmcUbHrLaVgA9Ybm4LJZreITT7Cdg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.7.1.tgz", + "integrity": "sha512-dsQuKQJnwfOklIETaqCesZlvsyBfPgaU+0gL5ukeKR4cjFI/Lyhr93wdI29WjzKosK/O3/ZioSRtUfHNTXRl9g==", "requires": {} }, "@junobuild/functions-tools": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.4.1.tgz", - "integrity": "sha512-8mhkalj6ZUsICn7CvceiB+IyVRAMqdPS0Dmota6Ozte+ttsfUo3+tBFJZaXqosbNXElczqyzkjk862eppnR+5w==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@junobuild/functions-tools/-/functions-tools-0.5.2.tgz", + "integrity": "sha512-lCEW9vH3QGrSFo127+aQdRlsFgDIvWiuaAiEKNLSk+sAN2sZ/U94vG+hIuWHfnCx+xirlmlg/DgNmd9KoLD1SA==", "requires": {} }, "@junobuild/ic-client": { @@ -7967,6 +7965,14 @@ "integrity": "sha512-LnT3LQy5sugcQfOh1hNEdu8BzxDBvYXLxCMwG89eU2k/PkEJGNgS5bWio/FyAQoRoCFXth2uhXgEnQMMauQPUw==", "requires": {} }, + "@junobuild/schema": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@junobuild/schema/-/schema-1.1.0.tgz", + "integrity": "sha512-jqdKLr760a7vQRsXEU5gWxIDoYdCPHplWci8Nf+aKj0Bko2dZ6BvEaB1a5B4dSe684bAxjcrYk9kr1jKvi5wGw==", + "requires": { + "@dfinity/zod-schemas": "^3.1" + } + }, "@junobuild/storage": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-2.3.0.tgz", @@ -7979,14 +7985,6 @@ "integrity": "sha512-mFOGBLqzR304gryvYkKLlXXVHaJbeEINRszGrAkow2nyVaKWnvTvkgC2xVuYfKFIg24NzoR1VQiPkuH1IhPHxQ==", "requires": {} }, - "@junobuild/zod": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@junobuild/zod/-/zod-1.0.0.tgz", - "integrity": "sha512-EQ588y6d+OKxRq054k7ObsOxe0v7g0ZfhwaZ6eRYnjwPJh/VctuXY+hvlZkMhfEVEdzWlfGQIispvD8y9RTDQg==", - "requires": { - "@dfinity/zod-schemas": "^3.1" - } - }, "@noble/curves": { "version": "1.9.7", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.7.tgz", diff --git a/package.json b/package.json index 154660f..1150fc3 100644 --- a/package.json +++ b/package.json @@ -34,15 +34,15 @@ "@icp-sdk/core": "^5.0.0", "@junobuild/admin": "^4.2.0", "@junobuild/cdn": "^2.3.0", - "@junobuild/cli-tools": "^0.11.0", - "@junobuild/config": "^2.13.0", + "@junobuild/cli-tools": "^0.12.2", + "@junobuild/config": "^2.14.1", "@junobuild/config-loader": "^0.4.8", "@junobuild/core": "^5.2.1", - "@junobuild/functions-tools": "^0.4.1", + "@junobuild/functions-tools": "^0.5.2", "@junobuild/ic-client": "^8.0.1", + "@junobuild/schema": "^1.1.0", "@junobuild/storage": "^2.3.0", "@junobuild/utils": "^0.3.0", - "@junobuild/zod": "^1.0.0", "chokidar": "^4.0.3", "conf": "^14.0.0", "open": "^11.0.0", @@ -56,7 +56,7 @@ "@eslint/eslintrc": "^3.3.3", "@eslint/js": "^9.39.2", "@junobuild/emulator-playwright": "^0.0.5", - "@junobuild/functions": "^0.6.0", + "@junobuild/functions": "^0.7.1", "@playwright/test": "^1.58.1", "@types/node": "24.10.9", "@types/prompts": "^2.4.9", diff --git a/scripts/install-next b/scripts/install-next index 767548e..f6d5012 100755 --- a/scripts/install-next +++ b/scripts/install-next @@ -1,7 +1,7 @@ #!/usr/bin/env bash npm rm @junobuild/functions -npm rm @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,zod} +npm rm @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,schema} -npm i @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,zod}@next +npm i @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,schema}@next npm i @junobuild/functions@next -D diff --git a/src/configs/cli.state.config.ts b/src/configs/cli.state.config.ts index 853347f..60492ed 100644 --- a/src/configs/cli.state.config.ts +++ b/src/configs/cli.state.config.ts @@ -1,4 +1,4 @@ -import {type PrincipalText} from '@junobuild/zod'; +import {type PrincipalText} from '@junobuild/schema'; import Conf from 'conf'; import {ENV} from '../env'; import { diff --git a/src/services/auth/login.emulator.services.ts b/src/services/auth/login.emulator.services.ts index e83a24c..0898055 100644 --- a/src/services/auth/login.emulator.services.ts +++ b/src/services/auth/login.emulator.services.ts @@ -1,5 +1,5 @@ import {notEmptyString} from '@dfinity/utils'; -import {type PrincipalText} from '@junobuild/zod'; +import {type PrincipalText} from '@junobuild/schema'; import {green, red} from 'kleur'; import ora from 'ora'; import {saveCliConfig} from '../../configs/cli.config'; diff --git a/src/services/functions/build/build.api.services.ts b/src/services/functions/build/build.api.services.ts index 23867de..8328c9f 100644 --- a/src/services/functions/build/build.api.services.ts +++ b/src/services/functions/build/build.api.services.ts @@ -2,7 +2,7 @@ import {isNullish} from '@dfinity/utils'; import type {GenerateResultData} from '@junobuild/cli-tools'; import { generateIdlApi as generateIdlApiLib, - generateZodApi as generateZodApiLib, + generateSchemaApi as generateSchemaApiLib, type TransformerOptions } from '@junobuild/functions-tools'; import {existsSync} from 'node:fs'; @@ -30,7 +30,7 @@ export const generateIdlApi = async () => { await generateApi({generateFn, lang}); }; -export const generateZodApi = async ({ +export const generateSchemaApi = async ({ generatedData, lang }: { @@ -49,7 +49,7 @@ export const generateZodApi = async ({ const functions = [...queries, ...updates]; const generateFn: GenerateFn = async (params) => { - await generateZodApiLib({ + await generateSchemaApiLib({ ...params, functions }); diff --git a/src/services/functions/build/build.javascript.services.ts b/src/services/functions/build/build.javascript.services.ts index d7998c0..2a2b26a 100644 --- a/src/services/functions/build/build.javascript.services.ts +++ b/src/services/functions/build/build.javascript.services.ts @@ -19,7 +19,7 @@ import {checkIcpBindgen} from '../../../utils/build.bindgen.utils'; import {installEsbuild} from '../../../utils/esbuild.utils'; import {formatTime} from '../../../utils/format.utils'; import {readEmulatorConfigAndCreateDeployTargetDir} from '../../emulator/_fs.services'; -import {generateZodApi} from './build.api.services'; +import {generateSchemaApi} from './build.api.services'; import {generateJsTsDid} from './build.did.services'; import {generateIdl} from './build.idl.services'; import {prepareJavaScriptBuildMetadata} from './build.metadata.services'; @@ -55,7 +55,7 @@ const generateAndBuild = async ({lang, ...rest}: BuildArgsTsJs) => { await generateJsTsDid({generatedData}); await generateIdl(); - await generateZodApi({generatedData, lang}); + await generateSchemaApi({generatedData, lang}); if (isNullish(generatedData.generate)) { spinner.stop(); diff --git a/src/services/modules/snapshot/_snapshot.assert.services.ts b/src/services/modules/snapshot/_snapshot.assert.services.ts index 9180d9f..60f0e72 100644 --- a/src/services/modules/snapshot/_snapshot.assert.services.ts +++ b/src/services/modules/snapshot/_snapshot.assert.services.ts @@ -5,7 +5,7 @@ import { JUNO_PACKAGE_ORBITER_ID, JUNO_PACKAGE_SATELLITE_ID } from '@junobuild/config'; -import {type PrincipalText} from '@junobuild/zod'; +import {type PrincipalText} from '@junobuild/schema'; import {actorParameters} from '../../../api/actor.api'; import type {AssetKey} from '../../../types/asset-key'; import {displaySegment} from '../../../utils/display.utils'; diff --git a/src/services/modules/upgrade/upgrade.mission-control.services.ts b/src/services/modules/upgrade/upgrade.mission-control.services.ts index 33338f2..465b939 100644 --- a/src/services/modules/upgrade/upgrade.mission-control.services.ts +++ b/src/services/modules/upgrade/upgrade.mission-control.services.ts @@ -5,7 +5,7 @@ import { } from '@junobuild/admin'; import {hasArgs, nextArg} from '@junobuild/cli-tools'; import type {MissionControlParameters} from '@junobuild/ic-client/actor'; -import type {PrincipalText} from '@junobuild/zod'; +import type {PrincipalText} from '@junobuild/schema'; import {cyan, red} from 'kleur'; import {actorParameters} from '../../../api/actor.api'; import {getCliMissionControl} from '../../../configs/cli.config'; diff --git a/src/services/modules/upgrade/upgrade.orbiter.services.ts b/src/services/modules/upgrade/upgrade.orbiter.services.ts index 0a0b6d2..5712fc6 100644 --- a/src/services/modules/upgrade/upgrade.orbiter.services.ts +++ b/src/services/modules/upgrade/upgrade.orbiter.services.ts @@ -2,7 +2,7 @@ import {isNullish} from '@dfinity/utils'; import {orbiterVersion, upgradeOrbiter as upgradeOrbiterAdmin} from '@junobuild/admin'; import {hasArgs, nextArg} from '@junobuild/cli-tools'; import type {OrbiterParameters} from '@junobuild/ic-client/actor'; -import type {PrincipalText} from '@junobuild/zod'; +import type {PrincipalText} from '@junobuild/schema'; import {cyan, red} from 'kleur'; import {actorParameters} from '../../../api/actor.api'; import {ORBITER_WASM_NAME} from '../../../constants/constants'; diff --git a/src/types/cli.config.ts b/src/types/cli.config.ts index 27c1959..dec50bd 100644 --- a/src/types/cli.config.ts +++ b/src/types/cli.config.ts @@ -1,5 +1,5 @@ import type {JsonnableEd25519KeyIdentity} from '@icp-sdk/core/identity'; -import type {PrincipalText} from '@junobuild/zod'; +import type {PrincipalText} from '@junobuild/schema'; export interface CliConfig { token: JsonnableEd25519KeyIdentity; diff --git a/src/types/cli.state.ts b/src/types/cli.state.ts index 615d285..9031144 100644 --- a/src/types/cli.state.ts +++ b/src/types/cli.state.ts @@ -1,4 +1,4 @@ -import {type PrincipalText} from '@junobuild/zod'; +import {type PrincipalText} from '@junobuild/schema'; export type ConfigHash = string; export type RuleHash = ConfigHash; diff --git a/src/types/satellite.ts b/src/types/satellite.ts index 87d9c7c..146e663 100644 --- a/src/types/satellite.ts +++ b/src/types/satellite.ts @@ -1,5 +1,5 @@ import type {OrbiterParameters, SatelliteParameters} from '@junobuild/ic-client/actor'; -import type {PrincipalText} from '@junobuild/zod'; +import type {PrincipalText} from '@junobuild/schema'; export type SatelliteParametersWithId = Omit & { satelliteId: PrincipalText; diff --git a/src/utils/auth.utils.ts b/src/utils/auth.utils.ts index 44f9118..0d075ad 100644 --- a/src/utils/auth.utils.ts +++ b/src/utils/auth.utils.ts @@ -1,7 +1,7 @@ import {nonNullish} from '@dfinity/utils'; import type {JsonnableEd25519KeyIdentity} from '@icp-sdk/core/identity'; import {Ed25519KeyIdentity} from '@icp-sdk/core/identity'; -import type {PrincipalText} from '@junobuild/zod'; +import type {PrincipalText} from '@junobuild/schema'; import {REDIRECT_URL} from '../constants/constants'; import {ENV} from '../env'; diff --git a/src/utils/juno.config.utils.ts b/src/utils/juno.config.utils.ts index 85675e1..2e9fd08 100644 --- a/src/utils/juno.config.utils.ts +++ b/src/utils/juno.config.utils.ts @@ -1,6 +1,6 @@ import {assertNonNullish, isNullish, nonNullish} from '@dfinity/utils'; import type {JunoConfig, JunoConfigEnv, OrbiterConfig, SatelliteConfig} from '@junobuild/config'; -import type {PrincipalText} from '@junobuild/zod'; +import type {PrincipalText} from '@junobuild/schema'; import {red} from 'kleur'; import {actorParameters} from '../api/actor.api'; import {noJunoConfig, readJunoConfig} from '../configs/juno.config';