Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 55 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions scripts/install-next
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/configs/cli.state.config.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/services/auth/login.emulator.services.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions src/services/functions/build/build.api.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -30,7 +30,7 @@ export const generateIdlApi = async () => {
await generateApi({generateFn, lang});
};

export const generateZodApi = async ({
export const generateSchemaApi = async ({
generatedData,
lang
}: {
Expand All @@ -49,7 +49,7 @@ export const generateZodApi = async ({
const functions = [...queries, ...updates];

const generateFn: GenerateFn = async (params) => {
await generateZodApiLib({
await generateSchemaApiLib({
...params,
functions
});
Expand Down
4 changes: 2 additions & 2 deletions src/services/functions/build/build.javascript.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/services/modules/snapshot/_snapshot.assert.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/services/modules/upgrade/upgrade.orbiter.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/types/cli.config.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/types/cli.state.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {type PrincipalText} from '@junobuild/zod';
import {type PrincipalText} from '@junobuild/schema';

export type ConfigHash = string;
export type RuleHash = ConfigHash;
Expand Down
2 changes: 1 addition & 1 deletion src/types/satellite.ts
Original file line number Diff line number Diff line change
@@ -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<SatelliteParameters, 'satelliteId'> & {
satelliteId: PrincipalText;
Expand Down
2 changes: 1 addition & 1 deletion src/utils/auth.utils.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/utils/juno.config.utils.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Loading