MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linting.

This commit is contained in:
mike12345567 2021-02-03 13:56:01 +00:00
parent 537c5a02ca
commit f4c7d3acd7
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/string-templates/src/helpers/date.js
View File

@ -10,13 +10,15 @@ const dayjs = require("dayjs")
*/ */
function isOptions(val) { function isOptions(val) {
return typeof(val) === "object" && typeof(val.hash) === "object" return typeof val === "object" && typeof val.hash === "object"
} }
function isApp(thisArg) { function isApp(thisArg) {
return typeof(thisArg) === "object" return (
&& typeof(thisArg.options) === "object" typeof thisArg === "object" &&
&& typeof(thisArg.app) === "object" typeof thisArg.options === "object" &&
typeof thisArg.app === "object"
)
} }
function getContext(thisArg, locals, options) { function getContext(thisArg, locals, options) {
@ -66,11 +68,11 @@ module.exports = function dateHelper(str, pattern, options) {
return dayjs().format("MMMM DD, YYYY") return dayjs().format("MMMM DD, YYYY")
} }
const defaults = {lang: "en", date: new Date(str)} const defaults = { lang: "en", date: new Date(str) }
const opts = getContext(this, defaults, options) const opts = getContext(this, defaults, options)
// set the language to use // set the language to use
dayjs.locale(opts.lang || opts.language) dayjs.locale(opts.lang || opts.language)
return dayjs(new Date(str)).format(pattern) return dayjs(new Date(str)).format(pattern)
} }

14
packages/string-templates/src/index.js
View File

@ -2,7 +2,11 @@ const handlebars = require("handlebars")
const { registerAll } = require("./helpers/index") const { registerAll } = require("./helpers/index")
const processors = require("./processors") const processors = require("./processors")
const { cloneDeep } = require("lodash/fp") const { cloneDeep } = require("lodash/fp")
const { removeNull, addConstants, removeHandlebarsStatements } = require("./utilities") const {
removeNull,
addConstants,
removeHandlebarsStatements,
} = require("./utilities")
const manifest = require("../manifest.json") const manifest = require("../manifest.json")
const hbsInstance = handlebars.create() const hbsInstance = handlebars.create()
@ -121,7 +125,13 @@ module.exports.makePropSafe = property => {
* @returns {boolean} Whether or not the input string is valid. * @returns {boolean} Whether or not the input string is valid.
*/ */
module.exports.isValid = string => { module.exports.isValid = string => {
const validCases = ["string", "number", "object", "array", "cannot read property"] const validCases = [
"string",
"number",
"object",
"array",
"cannot read property",
]
// this is a portion of a specific string always output by handlebars in the case of a syntax error // this is a portion of a specific string always output by handlebars in the case of a syntax error
const invalidCases = [`expecting '`] const invalidCases = [`expecting '`]
// don't really need a real context to check if its valid // don't really need a real context to check if its valid