@codama/renderers-rust 1.2.9 → 2.0.1

package/dist/templates/accountsPage.njk

@@ -145,12 +145,12 @@ pub fn fetch_all_{{ account.name | snakeCase }}(
   addresses: &[solana_pubkey::Pubkey],
 ) -> Result<Vec<crate::shared::DecodedAccount<{{ account.name | pascalCase }}>>, std::io::Error> {
     let accounts = rpc.get_multiple_accounts(addresses)
-      .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?;
+      .map_err(|e| std::io::Error::other(e.to_string()))?;
     let mut decoded_accounts: Vec<crate::shared::DecodedAccount<{{ account.name | pascalCase }}>> = Vec::new();
     for i in 0..addresses.len() {
       let address = addresses[i];
       let account = accounts[i].as_ref()
-        .ok_or(std::io::Error::new(std::io::ErrorKind::Other, format!("Account not found: {}", address)))?;
+        .ok_or(std::io::Error::other(format!("Account not found: {address}")))?;
       let data = {{ account.name | pascalCase }}::from_bytes(&account.data)?;
       decoded_accounts.push(crate::shared::DecodedAccount { address, account: account.clone(), data });
     }
@@ -172,7 +172,7 @@ pub fn fetch_all_maybe_{{ account.name | snakeCase }}(
   addresses: &[solana_pubkey::Pubkey],
 ) -> Result<Vec<crate::shared::MaybeAccount<{{ account.name | pascalCase }}>>, std::io::Error> {
     let accounts = rpc.get_multiple_accounts(addresses)
-      .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?;
+      .map_err(|e| std::io::Error::other(e.to_string()))?;
     let mut decoded_accounts: Vec<crate::shared::MaybeAccount<{{ account.name | pascalCase }}>> = Vec::new();
     for i in 0..addresses.len() {
       let address = addresses[i];

package/dist/types/ImportMap.d.ts

@@ -1,4 +1,6 @@
-import { TypeManifest } from './getTypeManifestVisitor';
+import type { TypeManifest } from './getTypeManifestVisitor';
+/** Rust keywords that should not be identified as crate names. */
+export declare const RUST_CORE_IMPORTS: Set<string>;
 export declare class ImportMap {
     protected readonly _imports: Set<string>;
     protected readonly _aliases: Map<string, string>;
@@ -11,6 +13,7 @@ export declare class ImportMap {
     addAlias(importName: string, alias: string): ImportMap;
     isEmpty(): boolean;
     resolveDependencyMap(dependencies: Record<string, string>): ImportMap;
+    getExternalDependencies(dependencyMap: Record<string, string>): Set<string>;
     toString(dependencies: Record<string, string>): string;
 }
 //# sourceMappingURL=ImportMap.d.ts.map

package/dist/types/ImportMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImportMap.d.ts","sourceRoot":"","sources":["../../src/ImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAaxD,qBAAa,SAAS;IAClB,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAErD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE7D,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAEzB;IAED,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAEjC;IAED,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS;IAMxD,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS;IAM3D,SAAS,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS;IAQ5C,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS;IAIpD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;IAKtD,OAAO,IAAI,OAAO;IAIlB,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAcrE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;CASzD"}
+{"version":3,"file":"ImportMap.d.ts","sourceRoot":"","sources":["../../src/ImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,kEAAkE;AAClE,eAAO,MAAM,iBAAiB,aAAwE,CAAC;AAavG,qBAAa,SAAS;IAClB,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAErD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE7D,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAEzB;IAED,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAEjC;IAED,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS;IAMxD,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS;IAM3D,SAAS,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS;IAQ5C,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS;IAIpD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;IAKtD,OAAO,IAAI,OAAO;IAIlB,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAcrE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;IAK3E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;CASzD"}

package/dist/types/getRenderMapVisitor.d.ts

@@ -1,13 +1,12 @@
-import { LinkOverrides, TraitOptions } from './utils';
+import { CargoDependencies, Fragment, LinkOverrides, TraitOptions } from './utils';
 export type GetRenderMapOptions = {
     anchorTraits?: boolean;
     defaultTraitOverrides?: string[];
     dependencyMap?: Record<string, string>;
+    dependencyVersions?: CargoDependencies;
     linkOverrides?: LinkOverrides;
     renderParentInstructions?: boolean;
     traitOptions?: TraitOptions;
 };
-export declare function getRenderMapVisitor(options?: GetRenderMapOptions): import("@codama/visitors-core").Visitor<import("@codama/renderers-core").RenderMap<Readonly<{
-    content: string;
-}>>, "accountNode" | "definedTypeNode" | "instructionNode" | "programNode" | "rootNode">;
+export declare function getRenderMapVisitor(options?: GetRenderMapOptions): import("@codama/visitors-core").Visitor<import("@codama/renderers-core").RenderMap<Fragment>, "accountNode" | "definedTypeNode" | "instructionNode" | "programNode" | "rootNode">;
 //# sourceMappingURL=getRenderMapVisitor.d.ts.map

package/dist/types/getRenderMapVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRenderMapVisitor.d.ts","sourceRoot":"","sources":["../../src/getRenderMapVisitor.ts"],"names":[],"mappings":"AA+BA,OAAO,EAIH,aAAa,EAEb,YAAY,EACf,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,mBAAmB,GAAG;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,mBAAwB;;yFAsRpE"}
+{"version":3,"file":"getRenderMapVisitor.d.ts","sourceRoot":"","sources":["../../src/getRenderMapVisitor.ts"],"names":[],"mappings":"AA+BA,OAAO,EACH,iBAAiB,EACjB,QAAQ,EAIR,aAAa,EAEb,YAAY,EACf,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,mBAAmB,GAAG;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IACvC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,mBAAwB,qLAgSpE"}

package/dist/types/renderVisitor.d.ts

@@ -1,9 +1,10 @@
 import { GetRenderMapOptions } from './getRenderMapVisitor';
 export type RenderOptions = GetRenderMapOptions & {
-    crateFolder?: string;
     deleteFolderBeforeRendering?: boolean;
     formatCode?: boolean;
+    generatedFolder?: string;
+    syncCargoToml?: boolean;
     toolchain?: string;
 };
-export declare function renderVisitor(path: string, options?: RenderOptions): import("@codama/visitors-core").Visitor<void, "rootNode">;
+export declare function renderVisitor(crateFolder: string, options?: RenderOptions): import("@codama/visitors-core").Visitor<void, "rootNode">;
 //# sourceMappingURL=renderVisitor.d.ts.map

package/dist/types/renderVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderVisitor.d.ts","sourceRoot":"","sources":["../../src/renderVisitor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,uBAAuB,CAAC;AAEjF,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,6DAyBtE"}
+{"version":3,"file":"renderVisitor.d.ts","sourceRoot":"","sources":["../../src/renderVisitor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,uBAAuB,CAAC;AAGjF,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAC9C,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,6DAyB7E"}

package/dist/types/utils/cargoToml.d.ts

@@ -0,0 +1,51 @@
+import { RenderMap } from '@codama/renderers-core';
+import type { RenderOptions } from '../renderVisitor';
+import type { Fragment } from './fragment';
+type CargoToml = CargoDependencyGroups & {
+    description?: string;
+    edition?: string | {
+        workspace: true;
+    };
+    features?: Record<string, string[]>;
+    license?: string | {
+        workspace: true;
+    };
+    name?: string;
+    repository?: string | {
+        workspace: true;
+    };
+    target?: Record<string, CargoDependencyGroups>;
+    version?: string;
+    workspace?: {
+        dependencies?: CargoDependencies;
+    };
+};
+type CargoDependencyGroups = {
+    'build-dependencies'?: CargoDependencies;
+    dependencies?: CargoDependencies;
+    'dev-dependencies'?: CargoDependencies;
+};
+export type CargoDependencies = Record<string, CargoDependency>;
+type CargoDependency = CargoDependencyObject | string;
+type CargoDependencyObject = {
+    branch?: string;
+    'default-features'?: boolean;
+    features?: string[];
+    git?: string;
+    optional?: boolean;
+    package?: string;
+    path?: string;
+    tag?: string;
+    version?: string;
+    workspace?: boolean;
+};
+export declare const DEFAULT_DEPENDENCY_VERSIONS: CargoDependencies;
+export declare function syncCargoToml(renderMap: RenderMap<Fragment>, crateFolder: string, options: Pick<RenderOptions, 'dependencyMap' | 'dependencyVersions' | 'syncCargoToml'>): void;
+export declare function createNewCargoToml(usedDependencies: CargoDependencies): CargoToml;
+export declare function updateExistingCargoToml(cargoToml: CargoToml, usedDependencies: CargoDependencies): CargoToml;
+export declare function checkExistingCargoToml(cargoToml: CargoToml, usedDependencies: CargoDependencies): void;
+export declare function getUsedDependencyVersions(renderMap: RenderMap<Fragment>, dependencyMap: Record<string, string>, dependencyVersions: CargoDependencies): CargoDependencies;
+export declare function shouldUpdateDependency(dependency: string, currentDependency: CargoDependency, requiredDependency: CargoDependency): boolean;
+export declare function shouldUpdateRange(dependency: string, currentRange: string, requiredRange: string): boolean;
+export {};
+//# sourceMappingURL=cargoToml.d.ts.map

package/dist/types/utils/cargoToml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cargoToml.d.ts","sourceRoot":"","sources":["../../../src/utils/cargoToml.ts"],"names":[],"mappings":"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"}

package/dist/types/utils/fragment.d.ts

@@ -0,0 +1,6 @@
+import { BaseFragment } from '@codama/renderers-core';
+import { ImportMap } from '../ImportMap';
+export type Fragment = BaseFragment & {
+    imports: ImportMap;
+};
+//# sourceMappingURL=fragment.d.ts.map

package/dist/types/utils/fragment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fragment.d.ts","sourceRoot":"","sources":["../../../src/utils/fragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,MAAM,QAAQ,GAAG,YAAY,GAAG;IAClC,OAAO,EAAE,SAAS,CAAC;CACtB,CAAC"}

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

@@ -1,5 +1,7 @@
+export * from './cargoToml';
 export * from './codecs';
 export * from './discriminatorConstant';
+export * from './fragment';
 export * from './linkOverrides';
 export * from './render';
 export * from './traitOptions';

package/dist/types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codama/renderers-rust",
-  "version": "1.2.9",
+  "version": "2.0.1",
   "description": "Renders Rust clients for your programs",
   "exports": {
     "types": "./dist/types/index.d.ts",
@@ -28,21 +28,24 @@
     "client"
   ],
   "dependencies": {
-    "@codama/errors": "^1.4.4",
-    "@codama/nodes": "^1.4.4",
-    "@codama/renderers-core": "^1.3.3",
-    "@codama/visitors-core": "^1.4.4",
-    "@solana/codecs-strings": "^5.0.0",
-    "nunjucks": "^3.2.4"
+    "@codama/errors": "^1.5.0",
+    "@codama/nodes": "^1.5.0",
+    "@codama/renderers-core": "^1.3.5",
+    "@codama/visitors-core": "^1.5.0",
+    "@iarna/toml": "^2.2.5",
+    "@solana/codecs-strings": "^6.0.0",
+    "nunjucks": "^3.2.4",
+    "semver": "^7.7.3"
   },
   "devDependencies": {
-    "@codama/nodes-from-anchor": "^1.3.6",
     "@changesets/changelog-github": "^0.5.1",
     "@changesets/cli": "^2.29.7",
+    "@codama/nodes-from-anchor": "^1.3.6",
     "@solana/eslint-config-solana": "^5.0.0",
     "@solana/prettier-config-solana": "0.0.5",
-    "@types/node": "^24",
+    "@types/node": "^25",
     "@types/nunjucks": "^3.2.6",
+    "@types/semver": "^7.7.1",
     "agadoo": "^3.0.0",
     "eslint": "^9.35.0",
     "happy-dom": "^20.0.0",