bpmnlint 9.1.0 → 9.2.0

package/lib/support/compile-config.js

@@ -1,4 +1,4 @@
-const path = require('path').posix;
+const path = require('path');
 
 const { isString } = require('min-dash');
 
@@ -133,7 +133,7 @@ function createImportStatement(pkg, ruleName, idx, resolver) {
         );
       }
 
-      const rulePath = computeRuleImport(resolver, pkg, rule);
+      const rulePath = computeRuleImport(resolver, pkg, originalPkg, rule);
 
       return `
 import rule_${ idx } from '${rulePath}';
@@ -150,15 +150,23 @@ import rule_${ idx } from '${ pkg }/rules/${ ruleName }';
 cache['${ originalPkg }/${ ruleName }'] = rule_${ idx };`;
 }
 
-function computeRuleImport(resolver, pkg, rule) {
+function computeRuleImport(resolver, pkg, originalPkg, rule) {
 
   // local reference, resolved relative to pkg location
   if (rule.startsWith('.')) {
-    const pkgDir = path.dirname(resolver.require.resolve(pkg));
+    const pkgJsonPath = resolver.require.resolve(`${ pkg }/package.json`);
 
-    return path.posix.normalize(`${ pkgDir }/${ rule }`);
-  }
+    const pkgMainPath = resolver.require.resolve(pkg);
+
+    const relativePkgMainPath = path.relative(
+      path.dirname(pkgJsonPath),
+      path.dirname(pkgMainPath)
+    );
 
-  // absolute reference
-  return path.normalize(rule);
+    return path.posix.normalize(`${ originalPkg }/${ relativePkgMainPath }/${ rule }`);
+  } else {
+
+    // absolute reference
+    return path.posix.normalize(rule);
+  }
 }

package/package.json

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