@codama/renderers-js 1.5.3 → 1.5.5

package/dist/index.node.mjs

@@ -1,10 +1,12 @@
 import { camelCase, pascalCase, snakeCase, titleCase, kebabCase, capitalize, REGISTERED_TYPE_NODE_KINDS, REGISTERED_VALUE_NODE_KINDS, isNodeFilter, resolveNestedTypeNode, structTypeNodeFromInstructionArgumentNodes, isNode, isScalarEnum, structTypeNode, structFieldTypeNode, getAllPrograms, getAllPdas, getAllAccounts, getAllInstructionsWithSubs, getAllDefinedTypes, definedTypeLinkNode, definedTypeNode, isDataEnum, accountValueNode, argumentValueNode, parseOptionalAccountStrategy, VALUE_NODES, getAllInstructionArguments, constantDiscriminatorNode, constantValueNodeFromBytes, constantValueNode, assertIsNode } from '@codama/nodes';
-import { setFragmentContent, mapFragmentContent, createRenderMap, mergeRenderMaps, deleteDirectory, writeRenderMap, createFragmentTemplate, mapRenderMapContentAsync, joinPath, fileExists, readJson, writeFile } from '@codama/renderers-core';
+import { setFragmentContent, mapFragmentContent, createRenderMap, mergeRenderMaps, deleteDirectory, mapRenderMapContentAsync, writeRenderMap, createFragmentTemplate, joinPath, fileExists, readJson, writeFile } from '@codama/renderers-core';
 import { NodeStack, pipe, staticVisitor, extendVisitor, visit, findLastNodeFromPath, recordNodeStackVisitor, LinkableDictionary, getResolvedInstructionInputsVisitor, getByteSizeVisitor, recordLinkablesOnFirstVisitVisitor, rootNodeVisitor, findProgramNodeFromPath, getLastNodeFromPath, findInstructionNodeFromPath, deduplicateInstructionDependencies } from '@codama/visitors-core';
 import { getBase64Encoder, getBase58Encoder, getBase16Encoder, getUtf8Encoder, getBase64Decoder } from '@solana/codecs-strings';
-import { format, resolveConfig } from 'prettier';
+import { resolveConfig } from 'prettier';
+import * as babelPlugin from 'prettier/plugins/babel';
 import * as estreePlugin from 'prettier/plugins/estree';
 import * as typeScriptPlugin from 'prettier/plugins/typescript';
+import { format } from 'prettier/standalone';
 import { CodamaError, CODAMA_ERROR__UNEXPECTED_NODE_KIND, logWarn, CODAMA_ERROR__RENDERERS__MISSING_DEPENDENCY_VERSIONS } from '@codama/errors';
 import { subset, minVersion, lt } from 'semver';
 
@@ -384,29 +386,22 @@ var getDefinedTypeNodesToExtract = (nodes, parsedCustomDataOptions) => nodes.fla
   ];
 });
 var DEFAULT_PRETTIER_OPTIONS = {
-  arrowParens: "always",
-  parser: "typescript",
-  plugins: [estreePlugin, typeScriptPlugin],
-  printWidth: 80,
-  semi: true,
-  singleQuote: true,
-  tabWidth: 2,
-  trailingComma: "es5",
-  useTabs: false
+  plugins: [estreePlugin, typeScriptPlugin, babelPlugin]
 };
-async function formatCode(renderMap, options) {
+async function getCodeFormatter(options) {
   const shouldFormatCode = options.formatCode ?? true;
-  if (!shouldFormatCode) return renderMap;
+  if (!shouldFormatCode) return (code) => Promise.resolve(code);
   const prettierOptions = {
     ...DEFAULT_PRETTIER_OPTIONS,
     ...await resolvePrettierOptions(options.packageFolder),
     ...options.prettierOptions
   };
-  return await mapRenderMapContentAsync(renderMap, (code) => format(code, prettierOptions));
+  return (code, filepath) => format(code, { ...prettierOptions, filepath });
 }
 async function resolvePrettierOptions(packageFolder) {
   if (!packageFolder) return null;
-  return await resolveConfig(packageFolder);
+  const filePathToResolve = joinPath(packageFolder, "package.json");
+  return await resolveConfig(filePathToResolve);
 }
 function getImportFromFactory(overrides, customAccountData, customInstructionData) {
   const customDataOverrides = Object.fromEntries(
@@ -465,7 +460,7 @@ var DEFAULT_DEPENDENCY_VERSIONS = {
   "@solana/rpc-types": "^5.0.0",
   "@solana/signers": "^5.0.0"
 };
-function syncPackageJson(renderMap, options) {
+async function syncPackageJson(renderMap, formatCode, options) {
   const shouldSyncPackageJson = options.syncPackageJson ?? false;
   const packageFolder = options.packageFolder;
   if (!packageFolder) {
@@ -489,10 +484,10 @@ function syncPackageJson(renderMap, options) {
   }
   if (fileExists(packageJsonPath)) {
     const packageJson = updateExistingPackageJson(readJson(packageJsonPath), usedDependencies);
-    writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n");
+    await writePackageJson(packageJson, packageJsonPath, formatCode);
   } else {
     const packageJson = createNewPackageJson(usedDependencies);
-    writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n");
+    await writePackageJson(packageJson, packageJsonPath, formatCode);
   }
 }
 function createNewPackageJson(dependencyVersions) {
@@ -620,6 +615,11 @@ function updateDependency(dependencyGroup, dependency, requiredRange) {
   if (!shouldUpdateRange(dependency, currentRange, requiredRange)) return;
   dependencyGroup[dependency] = requiredRange;
 }
+async function writePackageJson(packageJson, packageJsonPath, formatCode) {
+  const packageJsonContent = JSON.stringify(packageJson, null, 2) + "\n";
+  const formattedContent = await formatCode(packageJsonContent, packageJsonPath);
+  writeFile(packageJsonPath, formattedContent);
+}
 
 // src/fragments/accountFetchHelpers.ts
 function getAccountFetchHelpersFragment(scope) {
@@ -3201,8 +3201,9 @@ function renderVisitor(path, options = {}) {
       deleteDirectory(path);
     }
     let renderMap = visit(root, getRenderMapVisitor(options));
-    renderMap = await formatCode(renderMap, options);
-    syncPackageJson(renderMap, options);
+    const formatCode = await getCodeFormatter(options);
+    renderMap = await mapRenderMapContentAsync(renderMap, formatCode);
+    await syncPackageJson(renderMap, formatCode, options);
     writeRenderMap(renderMap, path);
   });
 }