@codama/renderers-js 1.5.3 → 1.5.5

package/dist/index.node.cjs

@@ -7,8 +7,10 @@ var renderersCore = require('@codama/renderers-core');
 var visitorsCore = require('@codama/visitors-core');
 var codecsStrings = require('@solana/codecs-strings');
 var prettier = require('prettier');
+var babelPlugin = require('prettier/plugins/babel');
 var estreePlugin = require('prettier/plugins/estree');
 var typeScriptPlugin = require('prettier/plugins/typescript');
+var standalone = require('prettier/standalone');
 var errors = require('@codama/errors');
 var semver = require('semver');
 
@@ -30,6 +32,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
+var babelPlugin__namespace = /*#__PURE__*/_interopNamespace(babelPlugin);
 var estreePlugin__namespace = /*#__PURE__*/_interopNamespace(estreePlugin);
 var typeScriptPlugin__namespace = /*#__PURE__*/_interopNamespace(typeScriptPlugin);
 
@@ -409,29 +412,22 @@ var getDefinedTypeNodesToExtract = (nodes$1, parsedCustomDataOptions) => nodes$1
   ];
 });
 var DEFAULT_PRETTIER_OPTIONS = {
-  arrowParens: "always",
-  parser: "typescript",
-  plugins: [estreePlugin__namespace, typeScriptPlugin__namespace],
-  printWidth: 80,
-  semi: true,
-  singleQuote: true,
-  tabWidth: 2,
-  trailingComma: "es5",
-  useTabs: false
+  plugins: [estreePlugin__namespace, typeScriptPlugin__namespace, babelPlugin__namespace]
 };
-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 renderersCore.mapRenderMapContentAsync(renderMap, (code) => prettier.format(code, prettierOptions));
+  return (code, filepath) => standalone.format(code, { ...prettierOptions, filepath });
 }
 async function resolvePrettierOptions(packageFolder) {
   if (!packageFolder) return null;
-  return await prettier.resolveConfig(packageFolder);
+  const filePathToResolve = renderersCore.joinPath(packageFolder, "package.json");
+  return await prettier.resolveConfig(filePathToResolve);
 }
 function getImportFromFactory(overrides, customAccountData, customInstructionData) {
   const customDataOverrides = Object.fromEntries(
@@ -490,7 +486,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) {
@@ -514,10 +510,10 @@ function syncPackageJson(renderMap, options) {
   }
   if (renderersCore.fileExists(packageJsonPath)) {
     const packageJson = updateExistingPackageJson(renderersCore.readJson(packageJsonPath), usedDependencies);
-    renderersCore.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n");
+    await writePackageJson(packageJson, packageJsonPath, formatCode);
   } else {
     const packageJson = createNewPackageJson(usedDependencies);
-    renderersCore.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n");
+    await writePackageJson(packageJson, packageJsonPath, formatCode);
   }
 }
 function createNewPackageJson(dependencyVersions) {
@@ -645,6 +641,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);
+  renderersCore.writeFile(packageJsonPath, formattedContent);
+}
 
 // src/fragments/accountFetchHelpers.ts
 function getAccountFetchHelpersFragment(scope) {
@@ -3226,8 +3227,9 @@ function renderVisitor(path, options = {}) {
       renderersCore.deleteDirectory(path);
     }
     let renderMap = visitorsCore.visit(root, getRenderMapVisitor(options));
-    renderMap = await formatCode(renderMap, options);
-    syncPackageJson(renderMap, options);
+    const formatCode = await getCodeFormatter(options);
+    renderMap = await renderersCore.mapRenderMapContentAsync(renderMap, formatCode);
+    await syncPackageJson(renderMap, formatCode, options);
     renderersCore.writeRenderMap(renderMap, path);
   });
 }