@orioro/util 0.13.1 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @orioro/util
 
+## 0.15.0
+
+### Minor Changes
+
+- add support for special chars inside string interpolator
+
+## 0.14.0
+
+### Minor Changes
+
+- syntheticJson fallback to full json in case of error
+
+## 0.13.2
+
+### Patch Changes
+
+- undo export update
+
 ## 0.13.1
 
 ### Patch Changes

package/dist/index.js

@@ -932,8 +932,10 @@ function debugFn(fnName, fn, logCall, logResult) {
 }
 
 /**
- * /\$\{\s*([\w$.]+)\s*\}/g
- * ![](docs/resources/interpolation_regexp.png)
+ * /\$\{\s*([A-Za-z0-9_$.=#+?@ \/'"-]+)\s*\}/g
+ * ![](docs/interpolation_regexp.png)
+ *
+ * https://regex-vis.com/?r=%2F%5C%24%5C%7B%5Cs*%28%5BA-Za-z0-9_%24.%3D%23%2B%3F%40+%5C%2F%27%22-%5D%2B%29%5Cs*%5C%7D%2Fg
  *
  * RegExp used for matching interpolation expressions.
  * Allows a non-interrupted sequence of alphanumeric chars ([A-Za-z0-9_]),
@@ -954,7 +956,7 @@ function debugFn(fnName, fn, logCall, logResult) {
  *
  * @const {RegExp} INTERPOLATION_REGEXP
  */
-var INTERPOLATION_REGEXP = /\$\{\s*([\w$.=\s]+)\s*\}/g;
+var INTERPOLATION_REGEXP = /\$\{\s*([A-Za-z0-9_$.=#+?@ \/'"-]+)\s*\}/g;
 var DEFAULT_SIGN = '=';
 function _parsePathExpr(pathExpr) {
   var splitRes = pathExpr.split(DEFAULT_SIGN);
@@ -1491,8 +1493,12 @@ function syntheticJson(str) {
   // Step 3: Parse as JSON
   try {
     return JSON.parse(normalized);
-  } catch (error) {
-    throw new Error("Invalid synthetic JSON: ".concat(str));
+  } catch (err1) {
+    try {
+      return JSON.parse(str);
+    } catch (err2) {
+      throw new Error("Invalid synthetic JSON: ".concat(str));
+    }
   }
 }
 

package/dist/index.mjs

@@ -930,8 +930,10 @@ function debugFn(fnName, fn, logCall, logResult) {
 }
 
 /**
- * /\$\{\s*([\w$.]+)\s*\}/g
- * ![](docs/resources/interpolation_regexp.png)
+ * /\$\{\s*([A-Za-z0-9_$.=#+?@ \/'"-]+)\s*\}/g
+ * ![](docs/interpolation_regexp.png)
+ *
+ * https://regex-vis.com/?r=%2F%5C%24%5C%7B%5Cs*%28%5BA-Za-z0-9_%24.%3D%23%2B%3F%40+%5C%2F%27%22-%5D%2B%29%5Cs*%5C%7D%2Fg
  *
  * RegExp used for matching interpolation expressions.
  * Allows a non-interrupted sequence of alphanumeric chars ([A-Za-z0-9_]),
@@ -952,7 +954,7 @@ function debugFn(fnName, fn, logCall, logResult) {
  *
  * @const {RegExp} INTERPOLATION_REGEXP
  */
-var INTERPOLATION_REGEXP = /\$\{\s*([\w$.=\s]+)\s*\}/g;
+var INTERPOLATION_REGEXP = /\$\{\s*([A-Za-z0-9_$.=#+?@ \/'"-]+)\s*\}/g;
 var DEFAULT_SIGN = '=';
 function _parsePathExpr(pathExpr) {
   var splitRes = pathExpr.split(DEFAULT_SIGN);
@@ -1489,8 +1491,12 @@ function syntheticJson(str) {
   // Step 3: Parse as JSON
   try {
     return JSON.parse(normalized);
-  } catch (error) {
-    throw new Error("Invalid synthetic JSON: ".concat(str));
+  } catch (err1) {
+    try {
+      return JSON.parse(str);
+    } catch (err2) {
+      throw new Error("Invalid synthetic JSON: ".concat(str));
+    }
   }
 }
 

package/package.json

@@ -1,19 +1,13 @@
 {
   "name": "@orioro/util",
-  "version": "0.13.1",
+  "version": "0.15.0",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
-    },
-    "./*": {
-      "import": "./dist/*.mjs",
-      "require": "./dist/*.js"
-    }
+    ".": "./dist/index.mjs",
+    "./*": "./dist/*"
   },
   "files": [
     "dist"