bpmnlint 7.3.0 → 7.4.0

package/CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to [bpmnlint](https://github.com/bpmn-io/bpmnlint) are docum
 
 ___Note:__ Yet to be released changes appear here._
 
+## 7.4.0
+
+* `FEAT`: resolve local package by name ([#64](https://github.com/bpmn-io/bpmnlint/pull/64))
+
 ## 7.3.0
 
 * `FEAT`: support `--version` command line flag ([#65](https://github.com/bpmn-io/bpmnlint/pull/65))

package/lib/resolver/node-resolver.js

@@ -9,6 +9,12 @@ function NodeResolver(options) {
   this.require = options && options.require || createScopedRequire(process.cwd());
 
   this.requireLocal = options && options.requireLocal || require;
+
+  try {
+    this.pkg = this.require('./package.json').name;
+  } catch (err) {
+    this.pkg = '__unknown';
+  }
 }
 
 module.exports = NodeResolver;
@@ -16,6 +22,10 @@ module.exports = NodeResolver;
 
 NodeResolver.prototype.resolveRule = function(pkg, ruleName) {
 
+  const originalPkg = pkg;
+
+  pkg = this.normalizePkg(pkg);
+
   try {
     if (pkg === 'bpmnlint') {
       return this.requireLocal(`../../rules/${ruleName}`);
@@ -23,12 +33,16 @@ NodeResolver.prototype.resolveRule = function(pkg, ruleName) {
       return this.require(`${pkg}/rules/${ruleName}`);
     }
   } catch (err) {
-    throw new Error('Cannot resolve rule <' + ruleName + '> from <' + pkg + '>');
+    throw new Error('Cannot resolve rule <' + ruleName + '> from <' + originalPkg + '>');
   }
 };
 
 NodeResolver.prototype.resolveConfig = function(pkg, configName) {
 
+  const originalPkg = pkg;
+
+  pkg = this.normalizePkg(pkg);
+
   // resolve config via $PKG/config/$NAME
   try {
     if (pkg === 'bpmnlint') {
@@ -53,10 +67,17 @@ NodeResolver.prototype.resolveConfig = function(pkg, configName) {
   }
 
   throw new Error(
-    'Cannot resolve config <' + configName + '> from <' + pkg + '>'
+    'Cannot resolve config <' + configName + '> from <' + originalPkg + '>'
   );
 };
 
+NodeResolver.prototype.normalizePkg = function(pkg) {
+  if (pkg !== 'bpmnlint' && pkg === this.pkg) {
+    pkg = '.';
+  }
+
+  return pkg;
+};
 
 // helpers ////////////////////
 

package/lib/support/compile-config.js

@@ -7,13 +7,15 @@ const NodeResolver = require('../resolver/node-resolver');
  * a { config, resolver } bundle, resolving all enabled rules.
  *
  * @param  {Object} config the parsed bpmnlint configuration
- *
+ * @param  {NodeResolver} [resolver]
  * @return {Promise<String>} the configuration compiled to a JS file
  */
-async function compileConfig(config) {
+async function compileConfig(config, resolver) {
+
+  resolver = resolver || new NodeResolver();
 
   const linter = new Linter({
-    resolver: new NodeResolver()
+    resolver
   });
 
   const resolvedRules = await linter.resolveConfiguredRules(config);
@@ -86,7 +88,7 @@ export default bundle;
     } = linter.parseRuleName(key);
 
     return `
-import rule_${idx} from '${pkg}/rules/${ruleName}';
+import rule_${idx} from '${resolver.normalizePkg(pkg)}/rules/${ruleName}';
 cache['${pkg}/${ruleName}'] = rule_${idx};`;
   }).join('\n');
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bpmnlint",
   "description": "Validate your BPMN diagrams based on configurable lint rules",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "main": "lib/index.js",
   "keywords": [
     "bpmnlint",