From 5f40ea49d8127b2ebe569c9247ed6cae818a4d06 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 2 Feb 2021 14:22:10 +0000 Subject: [PATCH 1/6] Adding object and regex helpers as well as a complex test case for forIn. --- packages/string-templates/README.md | 20 +++++++++++-------- .../string-templates/src/helpers/external.js | 2 ++ .../string-templates/test/helpers.spec.js | 7 ++++++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/packages/string-templates/README.md b/packages/string-templates/README.md index d9433b387b..b2a1ce476e 100644 --- a/packages/string-templates/README.md +++ b/packages/string-templates/README.md @@ -2,26 +2,30 @@ This package provides a common system for string templating across the Budibase Builder, client and server. The templating is provided through the use of [Handlebars](https://handlebarsjs.com/) an extension of Mustache which is capable of carrying out logic. We have also extended the base Handlebars functionality through the use -of a set of helpers provided through the [handlebars-helpers](https://github.com/helpers/handlebars-helpers) package. +of a set of helpers provided through the [handlebars-helpers](https://github.com/budibase/handlebars-helpers) package. We have not implemented all the helpers provided by the helpers package as some of them provide functionality we felt would not be beneficial. The following collections of helpers have been implemented: -1. [Math](https://github.com/helpers/handlebars-helpers/tree/master#math) - a set of useful helpers for +1. [Math](https://github.com/budibase/handlebars-helpers/tree/master#math) - a set of useful helpers for carrying out logic pertaining to numbers e.g. `avg`, `add`, `abs` and so on. -2. [Array](https://github.com/helpers/handlebars-helpers/tree/master#array) - some very specific helpers +2. [Array](https://github.com/budibase/handlebars-helpers/tree/master#array) - some very specific helpers for use with arrays, useful for example in automations. Helpers like `first`, `last`, `after` and `join` can be useful for getting particular portions of arrays or turning them into strings. -3. [Number](https://github.com/helpers/handlebars-helpers/tree/master#number) - unlike the math helpers these +3. [Number](https://github.com/budibase/handlebars-helpers/tree/master#number) - unlike the math helpers these are useful for converting numbers into useful formats for display, e.g. `bytes`, `addCommas` and `toPrecision`. -4. [URL](https://github.com/helpers/handlebars-helpers/tree/master#url) - very specific helpers for dealing with URLs, +4. [URL](https://github.com/budibase/handlebars-helpers/tree/master#url) - very specific helpers for dealing with URLs, such as `encodeURI`, `escape`, `stripQueryString` and `stripProtocol`. These are primarily useful for building up particular URLs to hit as say part of an automation. -5. [String](https://github.com/helpers/handlebars-helpers/tree/master#string) - these helpers are useful for building +5. [String](https://github.com/budibase/handlebars-helpers/tree/master#string) - these helpers are useful for building strings and preparing them for display, e.g. `append`, `camelcase`, `capitalize` and `ellipsis`. -6. [Comparison](https://github.com/helpers/handlebars-helpers/tree/master#comparison) - these helpers are mainly for +6. [Comparison](https://github.com/budibase/handlebars-helpers/tree/master#comparison) - these helpers are mainly for building strings when particular conditions are met, for example `and`, `or`, `gt`, `lt`, `not` and so on. This is a very extensive set of helpers but is mostly as would be expected from a set of logical operators. -7. [Date](https://github.com/helpers/helper-date) - last but certainly not least is a moment based date helper, which can +7. [Object](https://github.com/budibase/handlebars-helpers/tree/master#object) - useful operator for parsing objects, as well +as converting them to JSON strings. +8. [Regex](https://github.com/budibase/handlebars-helpers/tree/master#regex) - allows performing regex tests on strings that +can be used in conditional statements. +9. [Date](https://github.com/helpers/helper-date) - last but certainly not least is a moment based date helper, which can format ISO/timestamp based dates into something human-readable. An example of this would be `{{date dateProperty "DD-MM-YYYY"}}`. ## Date formatting diff --git a/packages/string-templates/src/helpers/external.js b/packages/string-templates/src/helpers/external.js index 6cdf976be5..3256134371 100644 --- a/packages/string-templates/src/helpers/external.js +++ b/packages/string-templates/src/helpers/external.js @@ -14,6 +14,8 @@ const EXTERNAL_FUNCTION_COLLECTIONS = [ "url", "string", "comparison", + "object", + "regex", ] const DATE_NAME = "date" diff --git a/packages/string-templates/test/helpers.spec.js b/packages/string-templates/test/helpers.spec.js index 6eadaabb05..a602b286e4 100644 --- a/packages/string-templates/test/helpers.spec.js +++ b/packages/string-templates/test/helpers.spec.js @@ -291,6 +291,12 @@ describe("Cover a few complex use cases", () => { expect(output).toBe("e") }) + it("should allow a complex forIn case", async () => { + const input = `{{#forIn (JSONparse '{"a":1, "b":2, "c":3}' )}}number: {{.}}\n{{/forIn}}` + const output = await processString(input, {}) + expect(output).toBe("number: 1\nnumber: 2\nnumber: 3\n") + }) + it("should make sure case is valid", () => { const validity = isValid("{{ avg [c355ec2b422e54f988ae553c8acd811ea].[a] [c355ec2b422e54f988ae553c8acd811ea].[b] }}") expect(validity).toBe(true) @@ -299,6 +305,5 @@ describe("Cover a few complex use cases", () => { it("should be able to solve an example from docs", async () => { const output = await processString(`{{first ( split "a-b-c" "-") 2}}`, {}) expect(output).toBe(`a,b`) - }) }) \ No newline at end of file From e48e263f9fc6702b542a3919fa7ba4a0746ca2ae Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 2 Feb 2021 16:19:37 +0000 Subject: [PATCH 2/6] bump budibase hbs version --- packages/string-templates/manifest.json | 2 +- packages/string-templates/package.json | 2 +- packages/string-templates/yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json index c23e3dc3a4..cf2145c71a 100644 --- a/packages/string-templates/manifest.json +++ b/packages/string-templates/manifest.json @@ -1054,4 +1054,4 @@ "description": "

Format a date using moment.js data formatting.

\n" } } -} \ No newline at end of file +} diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 1ebaab1d08..187437f83d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -14,7 +14,7 @@ "manifest": "node ./scripts/gen-collection-info.js" }, "dependencies": { - "@budibase/handlebars-helpers": "^0.11.1", + "@budibase/handlebars-helpers": "^0.11.3", "handlebars": "^4.7.6", "handlebars-utils": "^1.0.6", "helper-date": "^1.0.1", diff --git a/packages/string-templates/yarn.lock b/packages/string-templates/yarn.lock index 96ff364e51..c31c74fc15 100644 --- a/packages/string-templates/yarn.lock +++ b/packages/string-templates/yarn.lock @@ -270,10 +270,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/handlebars-helpers@^0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.1.tgz#fe8672612fb4ad8fd3bad338ee15759f45e421eb" - integrity sha512-s72LhOhlHk43QYGVcqjogaGa4h4e6y6X1AfshqWBWceTRYBs/9tUnoYDUiRJ/Mt3WoTmx8Hj5GOZekSqrUsOFQ== +"@budibase/handlebars-helpers@^0.11.3": + version "0.11.3" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.3.tgz#b6e5c91b83e8906e7d7ff10ddde277a3d561016e" + integrity sha512-MS1ptZEYq8o9J3tNLM7cZ2RGSSJIer4GiMIUHtbBI3sC9UKqZebao1JYNfmZKpNjntuqhZKgjqc5GfnVIEjsYQ== dependencies: arr-flatten "^1.1.0" array-sort "^0.1.4" From b19c906572629a01f0b5a0478c96b132da85bf32 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 2 Feb 2021 17:29:46 +0000 Subject: [PATCH 3/6] Updating manifest. --- packages/string-templates/manifest.json | 120 +++++++++++++++++++++++- packages/string-templates/yarn.lock | 6 +- 2 files changed, 122 insertions(+), 4 deletions(-) diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json index 55a86eb22a..294eeeec5e 100644 --- a/packages/string-templates/manifest.json +++ b/packages/string-templates/manifest.json @@ -5,6 +5,7 @@ "a" ], "numArgs": 1, + "example": "{{ abs 12012.1000 }} -> 12012.1", "description": "

Return the magnitude of a.

\n" }, "add": { @@ -13,6 +14,7 @@ "b" ], "numArgs": 2, + "example": "{{ add 1 2 }} -> 3", "description": "

Return the sum of a plus b.

\n" }, "avg": { @@ -20,6 +22,7 @@ "array" ], "numArgs": 1, + "example": "{{ avg [1,2,3,4,5] }} -> 3", "description": "

Returns the average of all numbers in the given array.

\n" }, "ceil": { @@ -27,6 +30,7 @@ "value" ], "numArgs": 1, + "example": "{{ ceil 1.2 }} -> 2", "description": "

Get the Math.ceil() of the given value.

\n" }, "divide": { @@ -35,6 +39,7 @@ "b" ], "numArgs": 2, + "example": "{{ divide 10 5 }} -> 2", "description": "

Divide a by b

\n" }, "floor": { @@ -42,6 +47,7 @@ "value" ], "numArgs": 1, + "example": "{{ floor 1.2 }} -> 1", "description": "

Get the Math.floor() of the given value.

\n" }, "minus": { @@ -50,6 +56,7 @@ "b" ], "numArgs": 2, + "example": "{{ subtract 10 5 }} -> 5", "description": "

Return the product of a minus b.

\n" }, "modulo": { @@ -58,6 +65,7 @@ "b" ], "numArgs": 2, + "example": "{{ modulo 10 5 }} -> 0", "description": "

Get the remainder of a division operation.

\n" }, "multiply": { @@ -66,6 +74,7 @@ "b" ], "numArgs": 2, + "example": "{{ product 10 5 }} -> 50", "description": "

Return the product of a times b.

\n" }, "plus": { @@ -74,6 +83,7 @@ "b" ], "numArgs": 2, + "example": "{{ plus 10 5 }} -> 15", "description": "

Add a by b.

\n" }, "random": { @@ -82,6 +92,7 @@ "max" ], "numArgs": 2, + "example": "{{ random 0 20 }} -> 10", "description": "

Generate a random number between two values

\n" }, "remainder": { @@ -90,6 +101,7 @@ "b" ], "numArgs": 2, + "example": "{{ remainder 10 6 }} -> 4", "description": "

Get the remainder when a is divided by b.

\n" }, "round": { @@ -97,6 +109,7 @@ "number" ], "numArgs": 1, + "example": "{{ round 10.3 }} -> 10", "description": "

Round the given number.

\n" }, "subtract": { @@ -105,6 +118,7 @@ "b" ], "numArgs": 2, + "example": "{{ subtract 10 5 }} -> 5", "description": "

Return the product of a minus b.

\n" }, "sum": { @@ -112,6 +126,7 @@ "array" ], "numArgs": 1, + "example": "{{ sum [1, 2, 3] }} -> 6", "description": "

Returns the sum of all numbers in the given array.

\n" }, "times": { @@ -120,6 +135,7 @@ "b" ], "numArgs": 2, + "example": "{{ times 10 5 }} -> 50", "description": "

Multiply number a by number b.

\n" } }, @@ -130,6 +146,7 @@ "n" ], "numArgs": 2, + "example": "{{ after [1, 2, 3] 1}} -> [3]", "description": "

Returns all of the items in an array after the specified index. Opposite of before.

\n" }, "arrayify": { @@ -137,6 +154,7 @@ "value" ], "numArgs": 1, + "example": "{{ arrayify \"foo\" }} -> [\"foo\"]", "description": "

Cast the given value to an array.

\n" }, "before": { @@ -145,6 +163,7 @@ "n" ], "numArgs": 2, + "example": "{{ before [1, 2, 3] 2}} -> [1, 2]", "description": "

Return all of the items in the collection before the specified count. Opposite of after.

\n" }, "eachIndex": { @@ -153,6 +172,7 @@ "options" ], "numArgs": 2, + "example": "{{#eachIndex [1, 2, 3]}} {{item}} is {{index}} {{/eachIndex}}", "description": "

Iterates the array, listing an item and the index of it.

\n" }, "filter": { @@ -162,6 +182,7 @@ "options" ], "numArgs": 3, + "example": "{{#filter [1, 2, 3] 2}}2 Found{{else}}2 not found{{/filter}}", "description": "

Block helper that filters the given array and renders the block for values that evaluate to true, otherwise the inverse block is returned.

\n" }, "first": { @@ -170,6 +191,7 @@ "n" ], "numArgs": 2, + "example": "{{first [1, 2, 3, 4] 2}} -> [1, 2]", "description": "

Returns the first item, or first n items of an array.

\n" }, "forEach": { @@ -177,6 +199,7 @@ "array" ], "numArgs": 1, + "example": "{{#forEach [{ 'name': 'John' }] }} {{ name }} {{/forEach}}", "description": "

Iterates over each item in an array and exposes the current item in the array as context to the inner block. In addition to the current array item, the helper exposes the following variables to the inner block: - index - total - isFirst - isLast Also, @index is exposed as a private variable, and additional private variables may be defined as hash arguments.

\n" }, "inArray": { @@ -186,6 +209,7 @@ "options" ], "numArgs": 3, + "example": "{{#inArray [1, 2, 3] 2}} 2 exists {{else}} 2 does not exist {{/inArray}} -> 2 exists", "description": "

Block helper that renders the block if an array has the given value. Optionally specify an inverse block to render when the array does not have the given value.

\n" }, "isArray": { @@ -193,6 +217,7 @@ "value" ], "numArgs": 1, + "example": "{{isArray [1, 2]}} -> true", "description": "

Returns true if value is an es5 array.

\n" }, "itemAt": { @@ -201,6 +226,7 @@ "idx" ], "numArgs": 2, + "example": "{{itemAt [1, 2, 3] 1}} -> 2", "description": "

Returns the item from array at index idx.

\n" }, "join": { @@ -209,6 +235,7 @@ "separator" ], "numArgs": 2, + "example": "{{join [1, 2, 3]}} -> '1, 2, 3'", "description": "

Join all elements of array into a string, optionally using a given separator.

\n" }, "equalsLength": { @@ -218,6 +245,7 @@ "options" ], "numArgs": 3, + "example": "{{equalsLength [1, 2, 3] 3}} -> true", "description": "

Returns true if the the length of the given value is equal to the given length. Can be used as a block or inline helper.

\n" }, "last": { @@ -226,6 +254,7 @@ "n" ], "numArgs": 2, + "example": "{{last [1, 2, 3]}} -> 3", "description": "

Returns the last item, or last n items of an array or string. Opposite of first.

\n" }, "length": { @@ -233,6 +262,7 @@ "value" ], "numArgs": 1, + "example": "{{length [1, 2, 3]}} -> 3", "description": "

Returns the length of the given string or array.

\n" }, "lengthEqual": { @@ -242,6 +272,7 @@ "options" ], "numArgs": 3, + "example": "{{equalsLength [1, 2, 3] 3}} -> true", "description": "

Returns true if the the length of the given value is equal to the given length. Can be used as a block or inline helper.

\n" }, "map": { @@ -250,6 +281,7 @@ "fn" ], "numArgs": 2, + "example": "{{map [1, 2, 3] double}} -> [2, 4, 6]", "description": "

Returns a new array, created by calling function on each element of the given array. For example,

\n" }, "pluck": { @@ -258,6 +290,7 @@ "prop" ], "numArgs": 2, + "example": "{{pluck [{ 'name': 'Bob' }] \"name\" }} -> ['Bob']", "description": "

Map over the given object or array or objects and create an array of values from the given prop. Dot-notation may be used (as a string) to get nested properties.

\n" }, "reverse": { @@ -265,6 +298,7 @@ "value" ], "numArgs": 1, + "example": "{{reverse [1, 2, 3]}} -> [3, 2, 1]", "description": "

Reverse the elements in an array, or the characters in a string.

\n" }, "some": { @@ -274,6 +308,7 @@ "provided" ], "numArgs": 3, + "example": "{{#some [1, 'b', 3] isString}} string found {{else}} No string found {{/some}} -> string found", "description": "

Block helper that returns the block if the callback returns true for some value in the given array.

\n" }, "sort": { @@ -282,6 +317,7 @@ "key" ], "numArgs": 2, + "example": "{{ sort ['b', 'a', 'c'] }} -> ['a', 'b', 'c']", "description": "

Sort the given array. If an array of objects is passed, you may optionally pass a key to sort on as the second argument. You may alternatively pass a sorting function as the second argument.

\n" }, "sortBy": { @@ -290,6 +326,7 @@ "props" ], "numArgs": 2, + "example": "{{ sortBy [{a: 'zzz'}, {a: 'aaa'}] \"a\" }} -> [{\"a\":\"aaa\"}, {\"a\":\"zzz\"}]", "description": "

Sort an array. If an array of objects is passed, you may optionally pass a key to sort on as the second argument. You may alternatively pass a sorting function as the second argument.

\n" }, "withAfter": { @@ -299,6 +336,7 @@ "options" ], "numArgs": 3, + "example": "{{ withAfter [1, 2, 3] 1 }} {{this}} {{/withAfter}}", "description": "

Use the items in the array after the specified index as context inside a block. Opposite of withBefore.

\n" }, "withBefore": { @@ -308,6 +346,7 @@ "options" ], "numArgs": 3, + "example": "{{ withBefore [1, 2, 3] 2 }} {{this}} {{/withBefore}}", "description": "

Use the items in the array before the specified index as context inside a block. Opposite of withAfter.

\n" }, "withFirst": { @@ -317,6 +356,7 @@ "options" ], "numArgs": 3, + "example": "{{ withFirst [1, 2, 3] }} {{this}} {{/withFirst}}", "description": "

Use the first item in a collection inside a handlebars block expression. Opposite of withLast.

\n" }, "withGroup": { @@ -326,6 +366,7 @@ "options" ], "numArgs": 3, + "example": "{{#withGroup [1, 2, 3, 4] 2}} {{#each this}} {{.}} {{each}}
{{/withGroup}} -> 1,2
3,4
", "description": "

Block helper that groups array elements by given group size.

\n" }, "withLast": { @@ -335,6 +376,7 @@ "options" ], "numArgs": 3, + "example": "{{#withLast [1, 2, 3, 4]}} {{this}} {{/withLast}} -> 4", "description": "

Use the last item or n items in an array as context inside a block. Opposite of withFirst.

\n" }, "withSort": { @@ -344,6 +386,7 @@ "options" ], "numArgs": 3, + "example": "{{#withSort ['b', 'a', 'c']}} {{this}} {{/withSort}} -> abc", "description": "

Block helper that sorts a collection and exposes the sorted collection as context inside the block.

\n" }, "unique": { @@ -352,6 +395,7 @@ "options" ], "numArgs": 2, + "example": "{{#each (unique ['a', 'a', 'c', 'b', 'e', 'e']) }} {{.}} {{/each}} -> acbe", "description": "

Block helper that return an array with all duplicate values removed. Best used along with a each helper.

\n" } }, @@ -361,6 +405,7 @@ "number" ], "numArgs": 1, + "example": "{{ bytes 1386 }} -> 1.4Kb", "description": "

Format a number to it's equivalent in bytes. If a string is passed, it's length will be formatted and returned. Examples: - 'foo' => 3 B - 13661855 => 13.66 MB - 825399 => 825.39 kB - 1396 => 1.4 kB

\n" }, "addCommas": { @@ -368,6 +413,7 @@ "num" ], "numArgs": 1, + "example": "{{ addCommas 1000000 }} -> 1,000,000", "description": "

Add commas to numbers

\n" }, "phoneNumber": { @@ -375,6 +421,7 @@ "num" ], "numArgs": 1, + "example": "{{ phoneNumber 8005551212 }} -> (800) 555-1212", "description": "

Convert a string or number to a formatted phone number.

\n" }, "toAbbr": { @@ -383,6 +430,7 @@ "precision" ], "numArgs": 2, + "example": "{{ toAbbr 10123 2 }} -> 10.12k", "description": "

Abbreviate numbers to the given number of precision. This for general numbers, not size in bytes.

\n" }, "toExponential": { @@ -391,6 +439,7 @@ "fractionDigits" ], "numArgs": 2, + "example": "{{ toExponential 10123 2 }} -> 101e+4", "description": "

Returns a string representing the given number in exponential notation.

\n" }, "toFixed": { @@ -399,6 +448,7 @@ "digits" ], "numArgs": 2, + "example": "{{ toFixed 1.1234 2 }} -> 1.12", "description": "

Formats the given number using fixed-point notation.

\n" }, "toFloat": { @@ -421,6 +471,7 @@ "precision" ], "numArgs": 2, + "example": "{{toPrecision \"1.1234\" 2}}", "description": "

Returns a string representing the Number object to the specified precision.

\n" } }, @@ -430,6 +481,7 @@ "str" ], "numArgs": 1, + "example": "{{ encodeURI \"https://myurl?Hello There\" }} -> https://myurl?Hello%20There", "description": "

Encodes a Uniform Resource Identifier (URI) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.

\n" }, "escape": { @@ -437,6 +489,7 @@ "str" ], "numArgs": 1, + "example": "{{ escape \"https://myurl?Hello+There\" }} -> https://myurl?Hello%20There", "description": "

Escape the given string by replacing characters with escape sequences. Useful for allowing the string to be used in a URL, etc.

\n" }, "decodeURI": { @@ -444,6 +497,7 @@ "str" ], "numArgs": 1, + "example": "{{ escape \"https://myurl?Hello%20There\" }} -> https://myurl?Hello+There", "description": "

Decode a Uniform Resource Identifier (URI) component.

\n" }, "url_encode": { @@ -462,6 +516,7 @@ "href" ], "numArgs": 2, + "example": "{{ urlResolve \"https://myurl\" \"/api/test\" }} -> https://myurl/api/test", "description": "

Take a base URL, and a href URL, and resolve them as a browser would for an anchor tag.

\n" }, "urlParse": { @@ -469,6 +524,7 @@ "str" ], "numArgs": 1, + "example": "{{ urlParse \"https://myurl/api/test\" }}", "description": "

Parses a url string into an object.

\n" }, "stripQuerystring": { @@ -476,6 +532,7 @@ "url" ], "numArgs": 1, + "example": "{{ stripQueryString \"https://myurl/api/test?foo=bar\" }} -> \"https://myurl/api/test\"", "description": "

Strip the query string from the given url.

\n" }, "stripProtocol": { @@ -483,6 +540,7 @@ "str" ], "numArgs": 1, + "example": "{{ stripProtocol \"https://myurl/api/test\" }} -> \"myurl/api/test\"", "description": "

Strip protocol from a url. Useful for displaying media that may have an 'http' protocol on secure connections.

\n" } }, @@ -493,6 +551,7 @@ "suffix" ], "numArgs": 2, + "example": "{{append \"index\" \".html\"}} -> index.html", "description": "

Append the specified suffix to the given string.

\n" }, "camelcase": { @@ -500,6 +559,7 @@ "string" ], "numArgs": 1, + "example": "{{camelcase \"foo bar baz\"}} -> fooBarBaz", "description": "

camelCase the characters in the given string.

\n" }, "capitalize": { @@ -507,6 +567,7 @@ "str" ], "numArgs": 1, + "example": "{{capitalize \"foo bar baz\"}} -> Foo bar baz", "description": "

Capitalize the first word in a sentence.

\n" }, "capitalizeAll": { @@ -514,6 +575,7 @@ "str" ], "numArgs": 1, + "example": "{{ capitalizeAll \"foo bar baz\"}} -> Foo Bar Baz", "description": "

Capitalize all words in a string.

\n" }, "center": { @@ -522,6 +584,7 @@ "spaces" ], "numArgs": 2, + "example": "{{ center \"test\" 1}} -> \" test \"", "description": "

Center a string using non-breaking spaces

\n" }, "chop": { @@ -529,6 +592,7 @@ "string" ], "numArgs": 1, + "example": "{{ chop \" ABC \"}} -> \"ABC\"", "description": "

Like trim, but removes both extraneous whitespace and non-word characters from the beginning and end of a string.

\n" }, "dashcase": { @@ -536,6 +600,7 @@ "string" ], "numArgs": 1, + "example": "{{dashcase \"a-b-c d_e\"}} -> a-b-c-d-e", "description": "

dash-case the characters in string. Replaces non-word characters and periods with hyphens.

\n" }, "dotcase": { @@ -543,6 +608,7 @@ "string" ], "numArgs": 1, + "example": "{{dotcase \"a-b-c d_e\"}} -> a.b.c.d.e", "description": "

dot.case the characters in string.

\n" }, "downcase": { @@ -550,6 +616,7 @@ "string" ], "numArgs": 1, + "example": "{{downcase \"aBcDeF\"}} -> abcdef", "description": "

Lowercase all of the characters in the given string. Alias for lowercase.

\n" }, "ellipsis": { @@ -558,6 +625,7 @@ "length" ], "numArgs": 2, + "example": "{{ellipsis \"foo bar baz\", 7}} -> foo bar…", "description": "

Truncates a string to the specified length, and appends it with an elipsis, ….

\n" }, "hyphenate": { @@ -565,6 +633,7 @@ "str" ], "numArgs": 1, + "example": "{{hyphenate \"foo bar baz qux\"}} -> foo-bar-baz-qux", "description": "

Replace spaces in a string with hyphens.

\n" }, "isString": { @@ -572,6 +641,7 @@ "value" ], "numArgs": 1, + "example": "{{isString \"foo\"}} -> true", "description": "

Return true if value is a string.

\n" }, "lowercase": { @@ -579,6 +649,7 @@ "str" ], "numArgs": 1, + "example": "{{lowercase \"Foo BAR baZ\"}} -> foo bar baz", "description": "

Lowercase all characters in the given string.

\n" }, "occurrences": { @@ -587,6 +658,7 @@ "substring" ], "numArgs": 2, + "example": "{{occurrences \"foo bar foo bar baz\" \"foo\"}} -> 2", "description": "

Return the number of occurrences of substring within the given string.

\n" }, "pascalcase": { @@ -594,6 +666,7 @@ "string" ], "numArgs": 1, + "example": "{{pascalcase \"foo bar baz\"}} -> FooBarBaz", "description": "

PascalCase the characters in string.

\n" }, "pathcase": { @@ -601,6 +674,7 @@ "string" ], "numArgs": 1, + "example": "{{pathcase \"a-b-c d_e\"}} -> a/b/c/d/e", "description": "

path/case the characters in string.

\n" }, "plusify": { @@ -608,6 +682,7 @@ "str" ], "numArgs": 1, + "example": "{{plusify \"foo bar baz\"}} -> foo+bar+baz", "description": "

Replace spaces in the given string with pluses.

\n" }, "prepend": { @@ -616,6 +691,7 @@ "prefix" ], "numArgs": 2, + "example": "{{prepend \"bar\" \"foo-\"}} -> foo-bar", "description": "

Prepends the given string with the specified prefix.

\n" }, "raw": { @@ -623,6 +699,7 @@ "options" ], "numArgs": 1, + "example": "{{{{#raw}}}} {{foo}} {{{{/raw}}}} -> {{foo}}", "description": "

Render a block without processing mustache templates inside the block.

\n" }, "remove": { @@ -631,6 +708,7 @@ "substring" ], "numArgs": 2, + "example": "{{remove \"a b a b a b\" \"a \"}} -> b b b", "description": "

Remove all occurrences of substring from the given str.

\n" }, "removeFirst": { @@ -639,6 +717,7 @@ "substring" ], "numArgs": 2, + "example": "{{remove \"a b a b a b\" \"a\"}} -> b a b a b", "description": "

Remove the first occurrence of substring from the given str.

\n" }, "replace": { @@ -648,6 +727,7 @@ "b" ], "numArgs": 3, + "example": "{{replace \"a b a b a b\" \"a\" \"z\"}} -> z b z b z b", "description": "

Replace all occurrences of substring a with substring b.

\n" }, "replaceFirst": { @@ -657,6 +737,7 @@ "b" ], "numArgs": 3, + "example": "{{replace \"a b a b a b\" \"a\" \"z\"}} -> z b a b a b", "description": "

Replace the first occurrence of substring a with substring b.

\n" }, "sentence": { @@ -664,6 +745,7 @@ "str" ], "numArgs": 1, + "example": "{{sentence \"hello world. goodbye world.\"}} -> Hello world. Goodbye world.", "description": "

Sentence case the given string

\n" }, "snakecase": { @@ -671,6 +753,7 @@ "string" ], "numArgs": 1, + "example": "{{snakecase \"a-b-c d_e\"}} -> a_b_c_d_e", "description": "

snake_case the characters in the given string.

\n" }, "split": { @@ -678,6 +761,7 @@ "string" ], "numArgs": 1, + "example": "{{split \"a,b,c\"}} -> ['a', 'b', 'c']", "description": "

Split string by the given character.

\n" }, "startsWith": { @@ -687,6 +771,7 @@ "options" ], "numArgs": 3, + "example": "{{#startsWith \"Goodbye\" \"Hello, world!\"}} Yep {{else}} Nope {{/startsWith}} -> Nope", "description": "

Tests whether a string begins with the given prefix.

\n" }, "titleize": { @@ -694,6 +779,7 @@ "str" ], "numArgs": 1, + "example": "{{#titleize \"this is title case\" }} -> This Is Title Case", "description": "

Title case the given string.

\n" }, "trim": { @@ -701,6 +787,7 @@ "string" ], "numArgs": 1, + "example": "{{trim \" ABC \" }} -> ABC", "description": "

Removes extraneous whitespace from the beginning and end of a string.

\n" }, "trimLeft": { @@ -708,6 +795,7 @@ "string" ], "numArgs": 1, + "example": "{{trimLeft \" ABC \" }} -> \"ABC \"", "description": "

Removes extraneous whitespace from the beginning of a string.

\n" }, "trimRight": { @@ -715,6 +803,7 @@ "string" ], "numArgs": 1, + "example": "{{trimRight \" ABC \" }} -> \" ABC \"", "description": "

Removes extraneous whitespace from the end of a string.

\n" }, "truncate": { @@ -724,6 +813,7 @@ "suffix" ], "numArgs": 3, + "example": "{{truncate \"foo bar baz\" 7 }} -> foo bar", "description": "

Truncate a string to the specified length. Also see ellipsis.

\n" }, "truncateWords": { @@ -733,6 +823,7 @@ "suffix" ], "numArgs": 3, + "example": "{{truncateWords \"foo bar baz\" 1 }} -> foo", "description": "

Truncate a string to have the specified number of words. Also see truncate.

\n" }, "upcase": { @@ -740,6 +831,7 @@ "string" ], "numArgs": 1, + "example": "{{upcase \"aBcDef\"}} -> ABCDEF", "description": "

Uppercase all of the characters in the given string. Alias for uppercase.

\n" }, "uppercase": { @@ -748,6 +840,7 @@ "options" ], "numArgs": 2, + "example": "{{uppercase \"aBcDef\"}} -> ABCDEF", "description": "

Uppercase all of the characters in the given string. If used as a block helper it will uppercase the entire block. This helper does not support inverse blocks.

\n" } }, @@ -759,6 +852,7 @@ "options" ], "numArgs": 3, + "example": "{{#and great magnificent}}both{{else}}no{{/and}}", "description": "

Helper that renders the block if both of the given values are truthy. If an inverse block is specified it will be rendered when falsy. Works as a block helper, inline helper or subexpression.

\n" }, "compare": { @@ -769,6 +863,7 @@ "options" ], "numArgs": 4, + "example": "{{compare 10 \"<\" 5 }} -> true", "description": "

Render a block when a comparison of the first and third arguments returns true. The second argument is the [arithemetic operator][operators] to use. You may also optionally specify an inverse block to render when falsy.

\n" }, "contains": { @@ -779,6 +874,7 @@ "options" ], "numArgs": 4, + "example": "{{#contains ['a', 'b', 'c'] \"d\"}} This will not be rendered. {{else}} This will be rendered. {{/contains}}", "description": "

Block helper that renders the block if collection has the given value, using strict equality (===) for comparison, otherwise the inverse block is rendered (if specified). If a startIndex is specified and is negative, it is used as the offset from the end of the collection.

\n" }, "default": { @@ -787,6 +883,7 @@ "defaultValue" ], "numArgs": 2, + "example": "{{default null null \"default\"}} -> default", "description": "

Returns the first value that is not undefined, otherwise the "default" value is returned.

\n" }, "eq": { @@ -796,6 +893,7 @@ "options" ], "numArgs": 3, + "example": "{{#eq 3 3}} equal{{else}} not equal{{/eq}} -> equal", "description": "

Block helper that renders a block if a is equal to b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "gt": { @@ -805,6 +903,7 @@ "options" ], "numArgs": 3, + "example": "{{#gt 4 3}} greater than{{else}} not greater than{{/gt}} -> greater than", "description": "

Block helper that renders a block if a is greater than b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "gte": { @@ -814,6 +913,7 @@ "options" ], "numArgs": 3, + "example": "{{#gte 4 3}} greater than or equal{{else}} not greater than{{/gte}} -> greater than or equal", "description": "

Block helper that renders a block if a is greater than or equal to b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "has": { @@ -823,6 +923,7 @@ "options" ], "numArgs": 3, + "example": "{{#has \"foobar\" \"foo\"}} has it{{else}} doesn't{{/has}} -> has it", "description": "

Block helper that renders a block if value has pattern. If an inverse block is specified it will be rendered when falsy.

\n" }, "isFalsey": { @@ -831,6 +932,7 @@ "options" ], "numArgs": 2, + "example": "{{isFalsey \"\" }} -> true", "description": "

Returns true if the given value is falsey. Uses the [falsey][] library for comparisons. Please see that library for more information or to report bugs with this helper.

\n" }, "isTruthy": { @@ -839,6 +941,7 @@ "options" ], "numArgs": 2, + "example": "{{isTruthy \"12\" }} -> true", "description": "

Returns true if the given value is truthy. Uses the [falsey][] library for comparisons. Please see that library for more information or to report bugs with this helper.

\n" }, "ifEven": { @@ -847,6 +950,7 @@ "options" ], "numArgs": 2, + "example": "{{#ifEven 2}} even {{else}} odd {{/ifEven}} -> even", "description": "

Return true if the given value is an even number.

\n" }, "ifNth": { @@ -856,6 +960,7 @@ "options" ], "numArgs": 3, + "example": "{{#ifNth 10 2}} remainder {{else}} no remainder {{/ifNth}} -> remainder", "description": "

Conditionally renders a block if the remainder is zero when a operand is divided by b. If an inverse block is specified it will be rendered when the remainder is not zero.

\n" }, "ifOdd": { @@ -864,6 +969,7 @@ "options" ], "numArgs": 2, + "example": "{{#ifOdd 3}} odd {{else}} even {{/ifOdd}} -> odd", "description": "

Block helper that renders a block if value is an odd number. If an inverse block is specified it will be rendered when falsy.

\n" }, "is": { @@ -873,6 +979,7 @@ "options" ], "numArgs": 3, + "example": "{{#is 3 3}} is {{else}} is not {{/is}} -> is", "description": "

Block helper that renders a block if a is equal to b. If an inverse block is specified it will be rendered when falsy. Similar to eq but does not do strict equality.

\n" }, "isnt": { @@ -882,6 +989,7 @@ "options" ], "numArgs": 3, + "example": "{{#isnt 3 3}} isnt {{else}} is {{/isnt}} -> is", "description": "

Block helper that renders a block if a is not equal to b. If an inverse block is specified it will be rendered when falsy. Similar to unlessEq but does not use strict equality for comparisons.

\n" }, "lt": { @@ -890,6 +998,7 @@ "options" ], "numArgs": 2, + "example": "{{#lt 2 3}} less than {{else}} more than or equal {{/lt}} -> less than", "description": "

Block helper that renders a block if a is less than b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "lte": { @@ -899,6 +1008,7 @@ "options" ], "numArgs": 3, + "example": "{{#lte 2 3}} less than or equal {{else}} more than {{/lte}} -> less than or equal", "description": "

Block helper that renders a block if a is less than or equal to b. If an inverse block is specified it will be rendered when falsy. You may optionally use the compare="" hash argument for the second value.

\n" }, "neither": { @@ -908,6 +1018,7 @@ "options" ], "numArgs": 3, + "example": "{{#neither null null}} both falsey {{else}} both not falsey {{/neither}} -> both falsey", "description": "

Block helper that renders a block if neither of the given values are truthy. If an inverse block is specified it will be rendered when falsy.

\n" }, "not": { @@ -916,6 +1027,7 @@ "options" ], "numArgs": 2, + "example": "{{#not undefined }} falsey {{else}} not falsey {{/not}} -> falsey", "description": "

Returns true if val is falsey. Works as a block or inline helper.

\n" }, "or": { @@ -924,6 +1036,7 @@ "options" ], "numArgs": 2, + "example": "{{#or 1 2 undefined }} at least one truthy {{else}} all falsey {{/or}} -> at least one truthy", "description": "

Block helper that renders a block if any of the given values is truthy. If an inverse block is specified it will be rendered when falsy.

\n" }, "unlessEq": { @@ -933,6 +1046,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessEq 2 1 }} not equal {{else}} equal {{/unlessEq}} -> not equal", "description": "

Block helper that always renders the inverse block unless a is equal to b.

\n" }, "unlessGt": { @@ -942,6 +1056,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessGt 20 1 }} not greater than {{else}} greater than {{/unlessGt}} -> greater than", "description": "

Block helper that always renders the inverse block unless a is greater than b.

\n" }, "unlessLt": { @@ -951,6 +1066,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessLt 20 1 }} greater than or equal {{else}} less than {{/unlessLt}} -> greater than or equal", "description": "

Block helper that always renders the inverse block unless a is less than b.

\n" }, "unlessGteq": { @@ -960,6 +1076,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessGteq 20 1 }} less than {{else}} greater than or equal to {{/unlessGteq}} -> greater than or equal to", "description": "

Block helper that always renders the inverse block unless a is greater than or equal to b.

\n" }, "unlessLteq": { @@ -969,6 +1086,7 @@ "options" ], "numArgs": 3, + "example": "{{#unlessLteq 20 1 }} greater than {{else}} less than or equal to {{/unlessLteq}} -> greater than", "description": "

Block helper that always renders the inverse block unless a is less than or equal to b.

\n" } }, @@ -983,4 +1101,4 @@ "description": "

Format a date using moment.js data formatting.

\n" } } -} +} \ No newline at end of file diff --git a/packages/string-templates/yarn.lock b/packages/string-templates/yarn.lock index c31c74fc15..a3d5ac638d 100644 --- a/packages/string-templates/yarn.lock +++ b/packages/string-templates/yarn.lock @@ -4386,9 +4386,9 @@ source-map-support@^0.5.6, source-map-support@~0.5.19: source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" From 4bb3f6fe5f551d882408b482d87d39df61d7895d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 2 Feb 2021 17:43:01 +0000 Subject: [PATCH 4/6] adding example code to helpers --- .../automation/SetupPanel/GenericBindingPopover.svelte | 1 + .../src/components/design/PropertiesPanel/BindingPanel.svelte | 1 + packages/builder/src/constants/completions.js | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte index 24b6042940..563a0e187f 100644 --- a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte +++ b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte @@ -83,6 +83,7 @@
{@html helper.description || ''}
+ 
{helper.example}
{/each} diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte index 47334267b6..436c7313c8 100644 --- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte @@ -103,6 +103,7 @@
{@html helper.description}
+ 
{helper.example}
{/each} diff --git a/packages/builder/src/constants/completions.js b/packages/builder/src/constants/completions.js index 69f6ec551b..32de934324 100644 --- a/packages/builder/src/constants/completions.js +++ b/packages/builder/src/constants/completions.js @@ -7,6 +7,7 @@ export function handlebarsCompletions() { Object.entries(manifest[key]).map(([helperName, helperConfig]) => ({ text: helperName, path: helperName, + example: helperConfig.example, label: helperName, displayText: helperName, description: helperConfig.description, From 594906d975dc9c674adb31b7cf96a66507278bd2 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 2 Feb 2021 17:48:23 +0000 Subject: [PATCH 5/6] account for null helpers --- .../automation/SetupPanel/GenericBindingPopover.svelte | 2 +- .../src/components/design/PropertiesPanel/BindingPanel.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte index 563a0e187f..4c85d3865d 100644 --- a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte +++ b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte @@ -83,7 +83,7 @@
{@html helper.description || ''}
- 
{helper.example}
+ 
{helper.example || ''}
{/each} diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte index 436c7313c8..941796d025 100644 --- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte @@ -103,7 +103,7 @@
{@html helper.description}
- 
{helper.example}
+ 
{helper.example || ''}
{/each} From 5dd11ddcc591331232779c0a511b037e3a5b88d9 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 2 Feb 2021 18:01:41 +0000 Subject: [PATCH 6/6] Fixing issue with regex helper - escape test used the word 'test' a lot which breaks the helper. --- packages/string-templates/test/escapes.spec.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/string-templates/test/escapes.spec.js b/packages/string-templates/test/escapes.spec.js index de03c08fe6..21b1c4bcb0 100644 --- a/packages/string-templates/test/escapes.spec.js +++ b/packages/string-templates/test/escapes.spec.js @@ -4,15 +4,15 @@ const { describe("Handling context properties with spaces in their name", () => { it("should allow through literal specifiers", async () => { - const output = await processString("test {{ [test thing] }}", { - "test thing": 1 + const output = await processString("test {{ [one thing] }}", { + "one thing": 1 }) expect(output).toBe("test 1") }) it("should convert to dot notation where required", async () => { - const output = await processString("test {{ test[0] }}", { - test: [2] + const output = await processString("test {{ one[0] }}", { + one: [2] }) expect(output).toBe("test 2") }) @@ -25,9 +25,9 @@ describe("Handling context properties with spaces in their name", () => { }) it("should be able to handle an object with layers that requires escaping", async () => { - const output = await processString("testcase {{ testing.[test case] }}", { - testing: { - "test case": 1 + const output = await processString("testcase {{ thing.[one case] }}", { + thing: { + "one case": 1 } }) expect(output).toBe("testcase 1") @@ -52,10 +52,10 @@ describe("attempt some complex problems", () => { it("should be able to process an odd string produced by builder", async () => { const context = { "c306d140d7e854f388bae056db380a0eb": { - "test prop": "test", + "one prop": "test", } } - const hbs = "null{{ [c306d140d7e854f388bae056db380a0eb].[test prop] }}" + const hbs = "null{{ [c306d140d7e854f388bae056db380a0eb].[one prop] }}" const output = await processString(hbs, context) expect(output).toBe("nulltest") })