fix(project): do not allow placeholders in IDs

Related to camunda/camunda-modeler#1623
bpmn-io · Dec 10, 2019 · 799938e · 799938e
1 parent 2d1cbc6
commit 799938e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/lib/Utils.js b/lib/Utils.js
@@ -10,8 +10,6 @@ var QNAME_REGEX = /^([a-z][\w-.]*:)?[a-z_][\w-.]*$/i;
 // for ID validation as per CMMN Schema (QName - Namespace)
 var ID_REGEX = /^[a-z_][\w-.]*$/i;
 
-var PLACEHOLDER_REGEX = /\$\{([^}]*)\}/g;
-
 var HTML_ESCAPE_MAP = {
   '&': '&amp;',
   '<': '&lt;',
@@ -55,8 +53,6 @@ module.exports.isIdValid = isIdValid;
 
 function validateId(idValue) {
 
-  idValue = stripPlaceholders(idValue);
-
   if (containsSpace(idValue)) {
     return 'Id must not contain spaces.';
   }
@@ -80,15 +76,6 @@ function containsSpace(value) {
 
 module.exports.containsSpace = containsSpace;
 
-
-function stripPlaceholders(idValue) {
-
-  // replace expression e.g. ${VERSION_TAG}
-  // use only the content between ${}
-  // for the REGEX check
-  return idValue.replace(PLACEHOLDER_REGEX, '$1');
-}
-
 /**
  * generate a semantic id with given prefix
  */
@@ -135,4 +122,4 @@ function escapeHTML(str) {
   });
 }
 
-module.exports.escapeHTML = escapeHTML;
+module.exports.escapeHTML = escapeHTML;
diff --git a/test/spec/UtilsSpec.js b/test/spec/UtilsSpec.js
@@ -36,7 +36,7 @@ describe('Utils', function() {
     it('may NOT start with numbers', validate('9ba', 'Id must be a valid QName.'));
     it('may NOT start prefix with numbers', validate('9ba:foo', 'Id must be a valid QName.'));
 
-    it('may contain ${} placeholders', validate('${foo}ba99'));
+    it('may NOT contain ${} placeholders', validate('${foo}ba99', 'Id must be a valid QName.'));
     it('may NOT contain empty placeholders', validate('${}', 'Id must be a valid QName.'));
   });