Merge pull request #746 from kethinov/1.1.1

1.1.1

Author: kethinov

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 - Put your changes here...
 
+## 1.1.1
+
+- Added support for `variables-with-dashes-in-their-names`.
+- Updated dependencies.
+
 ## 1.1.0
 
 - Added `<escape>` tag.

codecov.yml

@@ -8,7 +8,7 @@
       "url": "https://github.com/rooseveltframework/teddy/graphs/contributors"
     }
   ],
-  "version": "1.1.0",
+  "version": "1.1.1",
   "files": [
     "dist"
   ],
@@ -48,7 +48,7 @@
     "nyc": "17.1.0",
     "standard": "17.1.2",
     "terser-webpack-plugin": "5.3.14",
-    "webpack": "5.98.0",
+    "webpack": "5.99.3",
     "webpack-cli": "6.0.1"
   },
   "standard": {

package-lock.json

@@ -765,7 +765,7 @@ function parseVars (templateString, model) {
   for (let i = 0; i < varsLength; i++) {
     let match = vars[i]
     if (match === '') continue // empty {}
-    if (!/^(\d+|[a-zA-Z_$][a-zA-Z0-9_$|{}.]*(\.[a-zA-Z_$][a-zA-Z0-9_$|{}.]*)*)$/.test(match)) {
+    if (!/^(\d+|[a-zA-Z_$][a-zA-Z0-9_$|{}.-]*(\.[a-zA-Z_$][a-zA-Z0-9_$|{}.-]*)*)$/.test(match)) {
       if (params.verbosity > 2) console.warn(`teddy.parseVars encountered a {variable} that could not be parsed: {${match}}`)
       continue // skip invalid variables
     }

package.json

@@ -11,6 +11,7 @@ export default function makeModel () {
     undefinedVar: undefined,
     emptyString: '',
     zero: 0,
+    'key-with-dashes': true,
     set: new Set(['a', 'b', 'c']),
     definedParent: { undefinedMember: undefined, emptyMember: '' },
     camelLetters: ['a', 'b', 'c'],

teddy.js

@@ -0,0 +1,5 @@
+{!
+  should render {key-wish-dashes} as true
+!}
+
+<p>{key-with-dashes}</p>

test/model.js

@@ -1652,6 +1652,12 @@ export default [
         run: async (teddy, template, model, assert, expected) => assert(teddy.render(template, model), expected),
         expected: '<p>0</p>'
       },
+      {
+        message: 'should render {key-with-dashes} as true (misc/keyWithDashes.html)',
+        template: 'misc/keyWithDashes',
+        run: async (teddy, template, model, assert, expected) => assert(teddy.render(template, model), expected),
+        expected: '<p>true</p>'
+      },
       {
         message: 'should render model value with quotes correctly without double-encoding the HTML entity (misc/varQuoteVal.html)',
         template: 'misc/varQuoteVal',