From 239079d9732aee50ce6446106b481b955cfe2232 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 21 Jan 2021 11:32:26 +0000 Subject: [PATCH] Linting. --- .../common/Dropdowns/DropdownItem.svelte | 4 +- .../userInterface/BindingPanel.svelte | 16 ++--- .../IconSelect/IconSelect.svelte | 10 +-- .../userInterface/PropertyControl.svelte | 18 +++-- .../userInterface/TableViewSelect.svelte | 65 ++++++++++--------- packages/client/src/utils/buttonActions.js | 4 +- .../static/templates/BudibaseApp.svelte | 4 +- packages/standard-components/src/Icon.svelte | 4 +- packages/string-templates/jest.config.js | 2 +- packages/string-templates/rollup.config.js | 2 +- .../src/custom/preprocessor.js | 22 +++++-- .../string-templates/src/helpers/index.js | 10 +-- packages/string-templates/src/index.js | 6 +- packages/string-templates/src/utilities.js | 2 +- 14 files changed, 95 insertions(+), 74 deletions(-) diff --git a/packages/builder/src/components/common/Dropdowns/DropdownItem.svelte b/packages/builder/src/components/common/Dropdowns/DropdownItem.svelte index f6f1ec2d12..98fda9efb1 100644 --- a/packages/builder/src/components/common/Dropdowns/DropdownItem.svelte +++ b/packages/builder/src/components/common/Dropdowns/DropdownItem.svelte @@ -11,9 +11,7 @@ on:click class:big={subtitle != null} {...$$restProps}> - {#if icon} - - {/if} + {#if icon}{/if}
{title}
{#if subtitle != null} diff --git a/packages/builder/src/components/userInterface/BindingPanel.svelte b/packages/builder/src/components/userInterface/BindingPanel.svelte index 1e40e8e001..6ab2504077 100644 --- a/packages/builder/src/components/userInterface/BindingPanel.svelte +++ b/packages/builder/src/components/userInterface/BindingPanel.svelte @@ -1,12 +1,6 @@ - + diff --git a/packages/string-templates/jest.config.js b/packages/string-templates/jest.config.js index 3c3d264fa5..c6391cdb92 100644 --- a/packages/string-templates/jest.config.js +++ b/packages/string-templates/jest.config.js @@ -191,4 +191,4 @@ module.exports = { // Whether to use watchman for file crawling // watchman: true, -}; +} diff --git a/packages/string-templates/rollup.config.js b/packages/string-templates/rollup.config.js index fa215261dc..f4cf851f92 100644 --- a/packages/string-templates/rollup.config.js +++ b/packages/string-templates/rollup.config.js @@ -11,7 +11,7 @@ export default { name: "string-templates", exports: "named", globals: { - "fs": "fs", + fs: "fs", }, }, external: ["fs"], diff --git a/packages/string-templates/src/custom/preprocessor.js b/packages/string-templates/src/custom/preprocessor.js index f562c67c6a..6c851432f3 100644 --- a/packages/string-templates/src/custom/preprocessor.js +++ b/packages/string-templates/src/custom/preprocessor.js @@ -1,5 +1,10 @@ const { HelperFunctions } = require("../helpers") -const { swapStrings, isAlphaNumeric, FIND_HBS_REGEX, includesAny } = require("../utilities") +const { + swapStrings, + isAlphaNumeric, + FIND_HBS_REGEX, + includesAny, +} = require("../utilities") function handleProcessor(string, match, fn) { const output = fn(match) @@ -27,7 +32,9 @@ function handleSpacesInProperties(statement) { // find all the parts split by spaces const splitBySpaces = statement.split(" ") // remove the excluded elements - const propertyParts = splitBySpaces.filter(part => exclusions.indexOf(part) === -1) + const propertyParts = splitBySpaces.filter( + part => exclusions.indexOf(part) === -1 + ) // rebuild to get the full property const fullProperty = propertyParts.join(" ") // now work out the dot notation layers and split them up @@ -35,7 +42,12 @@ function handleSpacesInProperties(statement) { // find the layers which need to be wrapped and wrap them for (let layer of propertyLayers) { if (layer.indexOf(" ") !== -1) { - statement = swapStrings(statement, statement.indexOf(layer), layer.length, `[${layer}]`) + statement = swapStrings( + statement, + statement.indexOf(layer), + layer.length, + `[${layer}]` + ) } } // remove the edge case of double brackets being entered (in-case user already has specified) @@ -67,7 +79,7 @@ function finalise(statement) { * @param {string} string The string which *may* contain handlebars statements, it is OK if it does not contain any. * @returns {string} The string that was input with processed up handlebars statements as required. */ -module.exports.preprocess = (string) => { +module.exports.preprocess = string => { let preprocessors = [swapToDotNotation, handleSpacesInProperties, finalise] for (let processor of preprocessors) { // re-run search each time incase previous cleaner update/removed a match @@ -81,4 +93,4 @@ module.exports.preprocess = (string) => { } } return string -} \ No newline at end of file +} diff --git a/packages/string-templates/src/helpers/index.js b/packages/string-templates/src/helpers/index.js index 498ac40dce..768fe297af 100644 --- a/packages/string-templates/src/helpers/index.js +++ b/packages/string-templates/src/helpers/index.js @@ -12,7 +12,7 @@ const HelperFunctionBuiltin = [ "#each", "#with", "lookup", - "log" + "log", ] const HelperFunctionNames = { @@ -27,17 +27,19 @@ const HELPERS = [ }), // this help is applied to all statements new Helper(HelperFunctionNames.ALL, value => { - let text = new SafeString(unescape(value).replace(/&/g, '&')) + let text = new SafeString(unescape(value).replace(/&/g, "&")) if (text == null || typeof text !== "string") { return text } return text.replace(/[<>]/g, tag => { return HTML_SWAPS[tag] || tag }) - }) + }), ] -module.exports.HelperFunctions = Object.values(HelperFunctionNames).concat(HelperFunctionBuiltin) +module.exports.HelperFunctions = Object.values(HelperFunctionNames).concat( + HelperFunctionBuiltin +) module.exports.registerAll = handlebars => { for (let helper of HELPERS) { diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js index 5f34259260..58ae887e20 100644 --- a/packages/string-templates/src/index.js +++ b/packages/string-templates/src/index.js @@ -30,8 +30,7 @@ module.exports.processObject = async (object, context) => { let val = object[key] if (typeof val === "string") { object[key] = await module.exports.processString(object[key], context) - } - else if (typeof val === "object") { + } else if (typeof val === "object") { object[key] = await module.exports.processObject(object[key], context) } } @@ -64,8 +63,7 @@ module.exports.processObjectSync = (object, context) => { let val = object[key] if (typeof val === "string") { object[key] = module.exports.processStringSync(object[key], context) - } - else if (typeof val === "object") { + } else if (typeof val === "object") { object[key] = module.exports.processObjectSync(object[key], context) } } diff --git a/packages/string-templates/src/utilities.js b/packages/string-templates/src/utilities.js index c7179aac75..76edaef923 100644 --- a/packages/string-templates/src/utilities.js +++ b/packages/string-templates/src/utilities.js @@ -2,7 +2,7 @@ const ALPHA_NUMERIC_REGEX = /^[A-Za-z0-9]+$/g module.exports.FIND_HBS_REGEX = /{{[^}}]*}}/g -module.exports.isAlphaNumeric = (char) => { +module.exports.isAlphaNumeric = char => { return char.match(ALPHA_NUMERIC_REGEX) }