Skip to content

Delegate call to prettier from js-layout to the user #2297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dannywillems merged 2 commits into from
Jul 10, 2025
Merged

Delegate call to prettier from js-layout to the user #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a40bda1
js-layout-to-types: delegate prettier call to user
dannywillems Jul 10, 2025
adfa690
Prettier: stop ignoring mina-transaction/gen files
dannywillems Jul 10, 2025
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
1 change: 0 additions & 1 deletion .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ benchmark/
dist/
node_modules/
o1js-reference/
src/bindings/mina-transaction/gen/
src/bindings/compiled/
src/mina/
**/*.d.ts
Expand Down
5 changes: 1 addition & 4 deletions src/bindings/mina-transaction/gen/v1/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
(<> %{env:NO_JS_BUILD=0} 1))
(deps
(:script ../../../../build/js-layout-to-types.mjs)
../../../ocaml/jsLayout.json
../../../../../.prettierrc.cjs
../../../../../node_modules/prettier/standalone.js
(glob_files ../../../../../node_modules/prettier/plugins/*))
../../../ocaml/jsLayout.json)
(action
(run node %{script})))
5 changes: 1 addition & 4 deletions src/bindings/mina-transaction/gen/v2/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
(<> %{env:NO_JS_BUILD=0} 1))
(deps
(:script ../../../../build/js-layout-to-types-v2.mjs)
(:data ../../../ocaml/jsLayout.json)
../../../../../.prettierrc.cjs
../../../../../node_modules/prettier/standalone.js
(glob_files ../../../../../node_modules/prettier/plugins/*))
(:data ../../../ocaml/jsLayout.json))
(action
(run node %{script} %{data} js-layout.ts)))
14 changes: 2 additions & 12 deletions src/build/js-layout-to-types-v2.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

import assert from 'node:assert';
import fs from 'node:fs/promises';
import prettier from 'prettier/standalone.js';
import prettierRc from '../../.prettierrc.cjs';
import parserTypeScript from 'prettier/plugins/typescript.js';
import prettierPluginEstree from 'prettier/plugins/estree.js';

const leafTypes = {
number: 'number',
Expand Down Expand Up @@ -343,14 +339,8 @@ for (const typeName of depOrderTypeNames) {
out += `\
\ const Types: {[key: string]: BindingsType<any>} = {${Object.keys(jsTypes).join(', ')}};\n`;

const prettyOut = await prettier.format(out, {
parser: 'typescript',
plugins: [parserTypeScript, prettierPluginEstree],
...prettierRc,
});

if (outputFilepath !== null) {
await fs.writeFile(outputFilepath, prettyOut);
await fs.writeFile(outputFilepath, out);
} else {
console.log(prettyOut);
console.log(out);
}
10 changes: 0 additions & 10 deletions src/build/js-layout-to-types.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import fs from 'node:fs/promises';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import prettier from 'prettier/standalone.js';
import parserTypeScript from 'prettier/plugins/typescript.js';
import prettierPluginEstree from 'prettier/plugins/estree.js';

import prettierRc from '../../.prettierrc.cjs';

// let jsLayout = JSON.parse(process.argv[2]);
let selfPath = fileURLToPath(import.meta.url);
Expand Down Expand Up @@ -219,11 +214,6 @@ ${output}`;

async function writeTsFile(content, relPath) {
let absPath = path.resolve(selfPath, relPath);
content = await prettier.format(content, {
filepath: absPath,
plugins: [parserTypeScript, prettierPluginEstree],
...prettierRc,
});
await fs.writeFile(absPath, content);
}
let genPath = '../../bindings/mina-transaction/gen/v1';
Expand Down
Loading