Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
"build:dev": "node-gyp -j 16 build --debug",
"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 && node scripts/generate_tsd.js",
"generate-messages:dev": "node scripts/generate_messages.js --debug && node scripts/generate_tsd.js",
"generate-messages": "node scripts/generate_messages.js",
"generate-messages:dev": "node scripts/generate_messages.js --debug",
"generate-tsd-messages": "node scripts/generate_tsd.js",
"clean": "node-gyp clean && 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",
"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}/**/*.{js,md,ts}\" ./*.{js,md,ts}",
"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}",
"prepare": "husky",
"coverage": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
},
Expand Down
17 changes: 14 additions & 3 deletions rostsd_gen/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ declare module "rclnodejs" {

'use strict';

const os = require('os');
const path = require('path');
const fs = require('fs');
const loader = require('../lib/interface_loader.js');
Expand All @@ -34,7 +35,10 @@ async function generateAll() {
// load pkg and interface info (msgs and srvs)
const generatedPath = path.join(__dirname, '../generated/');
const pkgInfos = getPkgInfos(generatedPath);

if (pkgInfos.length === 0) {
console.log('No package found, prebuild interfaces.d.ts will be used.');
return;
}
// write interfaces.d.ts file
const interfacesFilePath = path.join(__dirname, '../types/interfaces.d.ts');
const fd = fs.openSync(interfacesFilePath, 'w');
Expand Down Expand Up @@ -69,8 +73,15 @@ function getPkgInfos(rootDir) {
})
)
continue;

const rosInterface = loader.loadInterface(typeClass);
let rosInterface = null;
try {
rosInterface = loader.loadInterface(typeClass);
} catch (e) {
console.log(
`${e.message}, please make sure it's built for ${os.arch()} platform correctly.`
);
return pkgInfos;
}

if (!pkgInfo.subfolders.has(typeClass.type)) {
pkgInfo.subfolders.set(typeClass.type, []);
Expand Down
Loading