add locale, update test cases, add serve, ...

abichinger · abichinger · commit 090fff3a8c73 · 2021-11-13T14:12:57.000+01:00
diff --git a/build/rollup.config.js b/build/rollup.config.js
@@ -13,11 +13,11 @@ export default {
             css: true, // Dynamically inject css as a <style> tag
             compileTemplate: true, // Explicitly convert template to render function
         }),
-        buble({
-            objectAssign: 'Object.assign',
-            transforms: {
-                forOf: false
-            }
-        }), // Transpile to ES5
+        // buble({
+        //     objectAssign: 'Object.assign',
+        //     transforms: {
+        //         forOf: false
+        //     }
+        // }), // Transpile to ES5
     ],
 };
diff --git a/examples/vue-cron.vue b/examples/vue-cron.vue
@@ -12,7 +12,7 @@
                     </span>
 
                     
-                    <template v-for="f in p.fields">
+                    <template v-for="f in orderByRank(p.fields)">
                         <span :key="f.name" v-if="p.rankAttrs.value >= f.rank">
                             {{f.name}}:
                             <select @input="f.events.input(getSelected($event.target))" multiple>
@@ -68,6 +68,10 @@ export default {
         getSelected(select){
             let options = select && select.options;
             return Array.from(options).filter((opt) => opt.selected).map((opt) => opt.value)
+        },
+
+        orderByRank(fields){
+            return fields.slice().sort((a, b) => b.rank - a.rank)
         }
     }
 }
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   },
   "scripts": {
     "test": "jest",
+    "serve": "vue serve examples/vue-cron.vue",
     "build": "yarn build:umd & yarn run build:es & yarn run build:unpkg",
     "build:umd": "yarn rollup --config build/rollup.config.js --format umd --file dist/core.umd.js",
     "build:es": "yarn rollup --config build/rollup.config.js --format es --file dist/core.esm.js",
diff --git a/src/core.vue b/src/core.vue
@@ -1,8 +1,9 @@
 <script>
 import multiple from './fields/multiple'
 import util from './util'
-import en from './locale/en'
+import locale from './locale'
 
+const {getLocale} = locale
 const {Field} = util
 
 export default {
@@ -12,15 +13,22 @@ export default {
             type: String,
             required: true
         },
+        locale: {
+            type: String,
+            default: 'en'
+        },
         fields: {
             type: Array,
-            default: () => {
+            default: function() {
+
+                let locale = getLocale(this.locale)
+
                 return [
-                    {name: 'minute', items: en.minuteItems, rank: 0},
-                    {name: 'hour', items: en.hourItems, rank: 1},
-                    {name: 'day', items: en.dayItems, rank: 2},
-                    {name: 'month', items: en.monthItems, rank: 4},
-                    {name: 'dayOfWeek', items: en.dayOfWeekItems, rank: 3},
+                    {name: 'minute', items: locale.minuteItems, rank: 0},
+                    {name: 'hour', items: locale.hourItems, rank: 1},
+                    {name: 'day', items: locale.dayItems, rank: 2},
+                    {name: 'month', items: locale.monthItems, rank: 4},
+                    {name: 'dayOfWeek', items: locale.dayOfWeekItems, rank: 3},
                 ]
             }
         },
@@ -48,7 +56,7 @@ export default {
         return {
             selected: selected,
             error: '',
-            selectedRank: this.ranks[this.ranks.length-1].value 
+            selectedRank: this.ranks[this.ranks.length-1].value
         }
     },
 
@@ -111,7 +119,7 @@ export default {
             fieldProps.push({
                 ...field,
                 cron: this.splitValue[i],
-                selectedStr: multiple.arrayToStr(values, field),
+                selectedStr: multiple.arrayToStr(values, field).text,
                 events,
                 attrs
             })
@@ -180,7 +188,7 @@ export default {
                     this.error = 'invalid selection'
                     return
                 }
-                strings.push(str)
+                strings.push(str.value)
             }
             this.error = ''
             this.$emit('input', strings.join(' '))
diff --git a/src/fields/any.js b/src/fields/any.js
@@ -1,5 +1,7 @@
 
 // *
+import util from '../util'
+const { AnyColumn } = util
 
 function strToArray(str){
     if(str != '*'){
@@ -8,9 +10,11 @@ function strToArray(str){
     return []
 }
 
-function arrayToStr(arr, {items}){
+function arrayToStr(arr, field){
+    let {items} = field
+
     if(arr.length == 0){
-        return '*'
+        return new AnyColumn(field)
     }
     if(arr.length != items.length){
         return null
@@ -21,7 +25,7 @@ function arrayToStr(arr, {items}){
             return null
         }
     }
-    return '*'
+    return new AnyColumn(field)
 }
 
 export default {
diff --git a/src/fields/every.js b/src/fields/every.js
@@ -1,4 +1,6 @@
 // */x
+import util from '../util'
+const { EveryColumn } = util
 
 let re = /^\*\/\d+$/
 
@@ -20,7 +22,9 @@ function strToArray(str, {min, max}){
     return res.length > 0 ? res : null
 }
 
-function arrayToStr(arr, {min, max}){
+function arrayToStr(arr, field){
+    let {min, max} = field
+
     if(arr.length < 3){
         return null
     }
@@ -41,7 +45,7 @@ function arrayToStr(arr, {min, max}){
         }
     }
 
-    return '*/'+step
+    return new EveryColumn(field, step)
 }
 
 export default {
diff --git a/src/fields/multiple.js b/src/fields/multiple.js
@@ -32,9 +32,9 @@ function strToArray(str, field){
 
 function arrayToStr(arr, field){
     for(let fieldType of fieldTypes){
-        let strValue = fieldType.arrayToStr(arr, field)
-        if(strValue){
-            return strValue
+        let value = fieldType.arrayToStr(arr, field)
+        if(value){
+            return value
         }
     }
     return null
diff --git a/src/fields/range.js b/src/fields/range.js
@@ -1,5 +1,5 @@
 import util from '../util'
-
+let { RangeColumn, CombinedColumn, ValueColumn } = util
 // x-y
 
 let re = /^\d+-\d+$/
@@ -20,7 +20,8 @@ function strToArray(str, {min, max}){
     return util.range(start, end)
 }
 
-function arrayToStr(arr, {min, max}){
+function arrayToStr(arr, field){
+    let {min, max} = field
     
     if(arr.length <= 1){
         return null
@@ -41,16 +42,16 @@ function arrayToStr(arr, {min, max}){
     for(let i = 0; i < arr.length; i++){
         if(arr[i+1] === undefined || arr[i+1] - arr[i] > 1){
             if(i == start){
-                ranges.push(arr[start])
+                ranges.push(new ValueColumn(field, arr[start]))
             }
             else{
-                ranges.push(arr[start]+'-'+arr[i])
+                ranges.push(new RangeColumn(field, arr[start], arr[i]))
             }
             start = i+1
         }
     }
 
-    return ranges.join(',')
+    return new CombinedColumn(field, ranges)
 }
 
 export default {
diff --git a/src/fields/value.js b/src/fields/value.js
@@ -1,19 +1,24 @@
 // x
+import util from '../util'
+const { ValueColumn, CombinedColumn } = util
 
 function strToArray(str, {min, max}){
     let number = parseInt(str)
     return (String(number) == str && number >= min && number <= max) ? [number] : null
 }
 
-function arrayToStr(arr, {min, max}){
+function arrayToStr(arr, field){
+    let {min, max} = field
+
     if(Math.min(arr) < min){
         return null
     }
     if(Math.max(arr) > max){
         return null
     }
 
-    return arr.join(',')
+    let values = arr.map((x) => {return new ValueColumn(field, x)})
+    return new CombinedColumn(field, values)
 }
 
 export default {
diff --git a/src/locale/en.js b/src/locale/en.js
@@ -1,30 +1,16 @@
 import util from '../util'
 
-function genItems(min, max, textFormat=(value) => {return value+''}){
-    let res = []
-    for(let i of new util.Range(min, max)){
-        let item = {}
-        item.text = textFormat(i)
-        item.value = i
-        res.push(item)
+export default () => {
+    return {
+        minuteItems: util.genItems(0, 59, (value) => util.pad(value, 2)),
+        hourItems: util.genItems(0, 59, (value) => util.pad(value, 2)),
+        dayItems: util.genItems(1, 31),
+        monthItems: util.genItems(1, 12, (value) => {
+            return new Date(2021, value-1, 1).toLocaleDateString('en-US', {month: 'long'})
+        }),
+        dayOfWeekItems: util.genItems(0, 6, (value) => {
+            let date = new Date(2021, 0, 3+value) //first sunday in 2021
+            return date.toLocaleDateString('en-US', {weekday: 'long'})
+        })
     }
-    return res
-}
-
-function pad(n, width){
-    n = n+''
-    return (n.length < width) ? new Array(width - n.length).fill('0').join('') + n : n;
-}
-
-export default {
-    minuteItems: genItems(0, 59, (value) => pad(value, 2)),
-    hourItems: genItems(0, 59, (value) => pad(value, 2)),
-    dayItems: genItems(1, 31),
-    monthItems: genItems(1, 12, (value) => {
-        return new Date(2021, value-1, 1).toLocaleDateString('en-US', {month: 'long'})
-    }),
-    dayOfWeekItems: genItems(0, 6, (value) => {
-        let date = new Date(2021, 0, 3+value) //first sunday in 2021
-        return date.toLocaleDateString('en-US', {weekday: 'long'})
-    })
 }
diff --git a/src/locale/index.js b/src/locale/index.js
@@ -0,0 +1,16 @@
+import en from './en'
+
+const locales = {
+    en: en
+}
+
+export default {
+    getLocale: (locale) => {
+        if(locales.hasOwnProperty(locale)){
+            return locales[locale]()
+        }
+        else {
+            return locales['en']()
+        }
+    }
+}
diff --git a/src/util.js b/src/util.js
@@ -61,7 +61,7 @@ class CronColumn{
     }
 }
 
-class AnyColunn extends CronColumn {
+class AnyColumn extends CronColumn {
     get value(){
         return '*'
     }
@@ -107,13 +107,39 @@ class EveryColumn extends CronColumn {
 class ValueColumn extends CronColumn {
 
     constructor(field, value){
+        super(field)
         this.v = value
     }
 
     get value(){
         return ''+this.v
     }
 
+    get text(){
+        return this.field.getText(this.v)
+    }
+
+}
+
+class CombinedColumn extends CronColumn {
+
+    constructor(field, columns=[]){
+        super(field)
+        this.columns = columns
+    }
+
+    addColumn(cronColumn){
+        this.columns.push(cronColumn)
+    }
+
+    get value(){
+        return this.columns.map((c) => c.value).join(',')
+    }
+
+    get text(){
+        return this.columns.map((c) => c.text).join(',')
+    }
+
 }
 
 function range(start, end, step=1) {
@@ -176,11 +202,32 @@ function format(str, params){
     return str    
 }
 
+function genItems(min, max, textFormat=(value) => {return value+''}){
+    let res = []
+    for(let i of new Range(min, max)){
+        let item = {}
+        item.text = textFormat(i)
+        item.value = i
+        res.push(item)
+    }
+    return res
+}
 
+function pad(n, width){
+    n = n+''
+    return (n.length < width) ? new Array(width - n.length).fill('0').join('') + n : n;
+}
 
 export default {
     range,
     Range,
     format,
-    Field
+    Field,
+    AnyColumn,
+    RangeColumn,
+    ValueColumn,
+    EveryColumn,
+    CombinedColumn,
+    genItems,
+    pad
 }
diff --git a/test/core.test.js b/test/core.test.js
diff --git a/test/multiple.test.js b/test/multiple.test.js

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`</span>`
`13`	`13`
`14`	`14`
`15`		`- <template v-for="f in p.fields">`
	`15`	`+ <template v-for="f in orderByRank(p.fields)">`
`16`	`16`	`<span :key="f.name" v-if="p.rankAttrs.value >= f.rank">`
`17`	`17`	`{{f.name}}:`
`18`	`18`	`<select @input="f.events.input(getSelected($event.target))" multiple>`
`@@ -68,6 +68,10 @@ export default {`
`68`	`68`	`getSelected(select){`
`69`	`69`	`let options = select && select.options;`
`70`	`70`	`return Array.from(options).filter((opt) => opt.selected).map((opt) => opt.value)`
	`71`	`+ },`
	`72`	`+`
	`73`	`+ orderByRank(fields){`
	`74`	`+ return fields.slice().sort((a, b) => b.rank - a.rank)`
`71`	`75`	`}`
`72`	`76`	`}`
`73`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`
`2`	`2`	`// *`
	`3`	`+import util from '../util'`
	`4`	`+const { AnyColumn } = util`
`3`	`5`
`4`	`6`	`function strToArray(str){`
`5`	`7`	`if(str != '*'){`
`@@ -8,9 +10,11 @@ function strToArray(str){`
`8`	`10`	`return []`
`9`	`11`	`}`
`10`	`12`
`11`		`-function arrayToStr(arr, {items}){`
	`13`	`+function arrayToStr(arr, field){`
	`14`	`+ let {items} = field`
	`15`	`+`
`12`	`16`	`if(arr.length == 0){`
`13`		`- return '*'`
	`17`	`+ return new AnyColumn(field)`
`14`	`18`	`}`
`15`	`19`	`if(arr.length != items.length){`
`16`	`20`	`return null`
`@@ -21,7 +25,7 @@ function arrayToStr(arr, {items}){`
`21`	`25`	`return null`
`22`	`26`	`}`
`23`	`27`	`}`
`24`		`- return '*'`
	`28`	`+ return new AnyColumn(field)`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`export default {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`// */x`
	`2`	`+import util from '../util'`
	`3`	`+const { EveryColumn } = util`
`2`	`4`
`3`	`5`	`let re = /^\*\/\d+$/`
`4`	`6`
`@@ -20,7 +22,9 @@ function strToArray(str, {min, max}){`
`20`	`22`	`return res.length > 0 ? res : null`
`21`	`23`	`}`
`22`	`24`
`23`		`-function arrayToStr(arr, {min, max}){`
	`25`	`+function arrayToStr(arr, field){`
	`26`	`+ let {min, max} = field`
	`27`	`+`
`24`	`28`	`if(arr.length < 3){`
`25`	`29`	`return null`
`26`	`30`	`}`
`@@ -41,7 +45,7 @@ function arrayToStr(arr, {min, max}){`
`41`	`45`	`}`
`42`	`46`	`}`
`43`	`47`
`44`		`- return '*/'+step`
	`48`	`+ return new EveryColumn(field, step)`
`45`	`49`	`}`
`46`	`50`
`47`	`51`	`export default {`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ function strToArray(str, field){`
`32`	`32`
`33`	`33`	`function arrayToStr(arr, field){`
`34`	`34`	`for(let fieldType of fieldTypes){`
`35`		`- let strValue = fieldType.arrayToStr(arr, field)`
`36`		`- if(strValue){`
`37`		`- return strValue`
	`35`	`+ let value = fieldType.arrayToStr(arr, field)`
	`36`	`+ if(value){`
	`37`	`+ return value`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`return null`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import util from '../util'`
`2`		`-`
	`2`	`+let { RangeColumn, CombinedColumn, ValueColumn } = util`
`3`	`3`	`// x-y`
`4`	`4`
`5`	`5`	`let re = /^\d+-\d+$/`
`@@ -20,7 +20,8 @@ function strToArray(str, {min, max}){`
`20`	`20`	`return util.range(start, end)`
`21`	`21`	`}`
`22`	`22`
`23`		`-function arrayToStr(arr, {min, max}){`
	`23`	`+function arrayToStr(arr, field){`
	`24`	`+ let {min, max} = field`
`24`	`25`
`25`	`26`	`if(arr.length <= 1){`
`26`	`27`	`return null`
`@@ -41,16 +42,16 @@ function arrayToStr(arr, {min, max}){`
`41`	`42`	`for(let i = 0; i < arr.length; i++){`
`42`	`43`	`if(arr[i+1] === undefined \|\| arr[i+1] - arr[i] > 1){`
`43`	`44`	`if(i == start){`
`44`		`- ranges.push(arr[start])`
	`45`	`+ ranges.push(new ValueColumn(field, arr[start]))`
`45`	`46`	`}`
`46`	`47`	`else{`
`47`		`- ranges.push(arr[start]+'-'+arr[i])`
	`48`	`+ ranges.push(new RangeColumn(field, arr[start], arr[i]))`
`48`	`49`	`}`
`49`	`50`	`start = i+1`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`
`53`		`- return ranges.join(',')`
	`54`	`+ return new CombinedColumn(field, ranges)`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`export default {`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,24 @@`
`1`	`1`	`// x`
	`2`	`+import util from '../util'`
	`3`	`+const { ValueColumn, CombinedColumn } = util`
`2`	`4`
`3`	`5`	`function strToArray(str, {min, max}){`
`4`	`6`	`let number = parseInt(str)`
`5`	`7`	`return (String(number) == str && number >= min && number <= max) ? [number] : null`
`6`	`8`	`}`
`7`	`9`
`8`		`-function arrayToStr(arr, {min, max}){`
	`10`	`+function arrayToStr(arr, field){`
	`11`	`+ let {min, max} = field`
	`12`	`+`
`9`	`13`	`if(Math.min(arr) < min){`
`10`	`14`	`return null`
`11`	`15`	`}`
`12`	`16`	`if(Math.max(arr) > max){`
`13`	`17`	`return null`
`14`	`18`	`}`
`15`	`19`
`16`		`- return arr.join(',')`
	`20`	`+ let values = arr.map((x) => {return new ValueColumn(field, x)})`
	`21`	`+ return new CombinedColumn(field, values)`
`17`	`22`	`}`
`18`	`23`
`19`	`24`	`export default {`