Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
"rebuild": "npm run clean && node-gyp -j 16 rebuild",
"rebuild:dev": "npm run clean && node-gyp -j 16 rebuild --debug",
"generate-messages": "node scripts/generate_messages.js",
"generate-messages:dev": "node scripts/generate_messages.js --debug",
"generate-messages:dev": "node scripts/generate_messages.js --debug && npx --yes prettier --ignore-path --write generated/**/*.js",
"generate-tsd-messages": "node scripts/generate_tsd.js",
"clean": "node-gyp clean && npx rimraf@6.0.1 ./generated",
"clean": "node-gyp clean && npx rimraf ./generated",
"install": "npm run rebuild",
"postinstall": "npm run generate-messages",
"docs": "cd docs && make",
"test": "nyc node --expose-gc ./scripts/run_test.js && npx tsd",
"test": "nyc node --expose-gc ./scripts/run_test.js && tsd",
"lint": "eslint && node ./scripts/cpplint.js",
"format": "clang-format -i -style=file ./src/*.cpp ./src/*.hpp && prettier --write \"{lib,rosidl_gen,rostsd_gen,rosidl_parser,types,example,test,scripts,benchmark,rostsd_gen}/**/*.{js,md,ts}\" ./*.{js,md,ts}",
"format": "clang-format -i -style=file ./src/*.cpp ./src/*.hpp && npx --yes prettier --write \"{lib,rosidl_gen,rostsd_gen,rosidl_parser,types,example,test,scripts,benchmark,rostsd_gen}/**/*.{js,md,ts}\" ./*.{js,md,ts}",
"prepare": "husky",
"coverage": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
},
Expand Down Expand Up @@ -62,6 +62,7 @@
"lint-staged": "^15.2.10",
"mocha": "^11.0.2",
"nyc": "^17.1.0",
"rimraf": "^6.0.1",
"sinon": "^19.0.2",
"tree-kill": "^1.2.2",
"tsd": "^0.31.2",
Expand All @@ -79,7 +80,7 @@
"is-close": "^1.3.3",
"json-bigint": "^1.0.0",
"nan": "^2.22.0",
"prettier": "^3.4.2",
"terser": "^5.39.0",
"walk": "^2.3.15"
},
"husky": {
Expand Down
15 changes: 11 additions & 4 deletions rosidl_gen/idl_generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'use strict';

const dot = require('dot');
const prettier = require('prettier');
const { minify } = require('terser');
const fse = require('fs-extra');
const path = require('path');
const parser = require('../rosidl_parser/rosidl_parser.js');
Expand All @@ -41,11 +41,18 @@ function removeEmptyLines(str) {
* @param {string} code
*/
async function writeGeneratedCode(dir, fileName, code) {
if (fileName.endsWith('.js')) {
code = await prettier.format(code, { parser: 'babel' });
let result = null;
if (!isDebug && fileName.endsWith('.js')) {
try {
result = await minify(code);
} catch (error) {
console.error(`Error minifying ${fileName}:`, error);
result = null;
}
}

await fse.mkdirs(dir);
await fse.writeFile(path.join(dir, fileName), code);
await fse.writeFile(path.join(dir, fileName), result ? result.code : code);
}

async function generateServiceJSStruct(
Expand Down
Loading