renusify 2.1.2 → 2.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/components/meta/index.js +1 -1
  2. package/package.json +1 -1
  3. package/plugins/trans/Translate.js +144 -140
  4. package/plugins/validation/Validate.js +11 -11
package/components/meta/index.js CHANGED
@@ -1 +1 @@
1
- export * as rMeta from './index.js'
1
+ export * as rMeta from './meta.js'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "renusify",
3
- "version": "2.1.2",
3
+ "version": "2.1.4",
4
4
  "description": "Vue3 Framework",
5
5
  "keywords": [
6
6
  "vuejs",
package/plugins/trans/Translate.js CHANGED
@@ -1,161 +1,165 @@
1
- import Axios from 'axios';
2
-
3
1
  export default class Translate {
4
- constructor($r, $storage) {
5
- this.$r = $r
6
- this.$storage = $storage
7
- this._count = 0;
8
- this._failed_messages = {};
9
- this._messages = {};
10
- this._local = 'en';
11
- this._package = null;
12
- this._store = []
13
- }
14
-
15
- get messages() {
16
- return this._messages;
17
- }
18
-
19
- get failed_messages() {
20
- return Object.keys(this._failed_messages);
21
- }
22
-
23
- get local() {
24
- return this._local;
25
- }
26
-
27
- set local(value) {
28
- this._local = value;
29
- }
30
-
31
- set package(value) {
32
- this._package = value;
33
- }
34
-
35
- setMessages(obj, local) {
36
- this._messages[local || this._local] = Object.assign({}, this._messages[local || this._local], obj);
37
- }
2
+ constructor($r, $storage) {
3
+ this.$r = $r
4
+ this.$storage = $storage
5
+ this._count = 0;
6
+ this._failed_messages = {};
7
+ this._messages = {};
8
+ this._local = 'en';
9
+ this._package = $r.package;
10
+ this._store = []
11
+ }
38
12
 
39
- add(key, value) {
40
- if (!this._messages[this._local]) {
41
- this._messages[this._local] = {}
13
+ get messages() {
14
+ return this._messages;
42
15
  }
43
- this._messages[this._local][key] = value;
44
- }
45
16
 
46
- replaceAll(string, search, replace) {
47
- return string.split(search).join(replace);
48
- }
17
+ get failed_messages() {
18
+ return Object.keys(this._failed_messages);
19
+ }
49
20
 
50
- get(key, package_name = null, lang = null) {
51
- if (key === undefined || key === null) {
52
- return ''
21
+ get local() {
22
+ return this._local;
53
23
  }
54
- let variable = []
55
- if (typeof key === 'object') {
56
- variable = key[1]
57
- key = key[0]
58
- if (!variable) {
59
- console.error(
60
- 'object key must have variables. key:' + key + ' variable:' + variable
61
- )
62
- this._failed_messages[key] = true
63
- return key
64
- }
24
+
25
+ set local(value) {
26
+ this._local = value;
65
27
  }
66
28
 
67
- if (package_name && typeof package_name !== 'string') {
68
- console.error(
69
- 'package name must be string. key:' + key + ' package_name:' + package_name
70
- )
71
- this._failed_messages[key] = true
72
- return key
29
+ set package(value) {
30
+ this._package = value;
73
31
  }
74
- if (typeof key !== 'string') {
75
- this._failed_messages[key] = true
76
- return key
32
+
33
+ setMessages(obj, local) {
34
+ this._messages[local || this._local] = Object.assign({}, this._messages[local || this._local], obj);
77
35
  }
78
- key = key.toLowerCase()
79
36
 
80
- const local = lang !== null ? lang : this._local
81
- const pack = package_name !== null ? package_name : this._package
82
- if (!local) {
83
- this._failed_messages[key] = true
84
- return key;
37
+ add(key, value) {
38
+ if (!this._messages[this._local]) {
39
+ this._messages[this._local] = {}
40
+ }
41
+ this._messages[this._local][key] = value;
85
42
  }
86
- if (!this._messages[local]) {
87
- this._failed_messages[key] = true
88
- return key;
43
+
44
+ replaceAll(string, search, replace) {
45
+ return string.split(search).join(replace);
89
46
  }
90
- if (this._messages[local][key]) {
91
- let val = this._messages[local][key];
92
- const lng = variable.length
93
- for (let i = 0; i < lng; i++) {
94
- val = this.replaceAll(val, '{' + i + '}', variable[i]);
95
- }
96
47
 
97
- if (val === null || val === '') {
98
- this._failed_messages[key] = true
99
- return key;
100
- }
101
- return val;
102
- } else if (this.$r && this.$r.autoAddTranslate && pack && this._count < 100 && /^([a-z_.])*$/.test(key)) {
103
- if (!this._store.includes(key)) {
104
- let url = '/translate/' + pack + '/' + key + '?v=';
105
- const lng = variable.length
106
- for (let i = 0; i < lng; i++) {
107
- url += '{' + i + '}';
48
+ get(key, package_name = null, lang = null) {
49
+ if (key === undefined || key === null) {
50
+ return ''
51
+ }
52
+ let variable = []
53
+ if (typeof key === 'object') {
54
+ variable = key[1]
55
+ key = key[0]
56
+ if (!variable) {
57
+ console.error(
58
+ 'object key must have variables. key:' + key + ' variable:' + variable
59
+ )
60
+ this._failed_messages[key] = true
61
+ return key
62
+ }
108
63
  }
109
- Axios.post(url);
110
- this._count++;
111
- this._store.push(key)
112
- }
113
- this._failed_messages[key] = true
114
- return key;
115
- } else {
116
- this._failed_messages[key] = true
117
- return key;
118
- }
119
- }
120
64
 
121
- loads(packages = []) {
122
- packages.forEach((p) => {
123
- this.load(p)
124
- })
125
- }
65
+ if (package_name && typeof package_name !== 'string') {
66
+ console.error(
67
+ 'package name must be string. key:' + key + ' package_name:' + package_name
68
+ )
69
+ this._failed_messages[key] = true
70
+ return key
71
+ }
72
+ if (typeof key !== 'string') {
73
+ this._failed_messages[key] = true
74
+ return key
75
+ }
76
+ key = key.toLowerCase()
126
77
 
127
- load(p) {
128
- const pack = p || this.$r.package;
129
- if (!p) {
130
- this.package = pack;
131
- }
132
- if (!this.$r.store['langs_loaded']) {
133
- this.$r.store['langs_loaded'] = {}
134
- }
135
- this.$r.store['langs_loaded'][pack] = false;
136
- let locale = this.$r.lang;
137
- if (this.$storage.get("lang")) {
138
- locale = this.$storage.get("lang");
139
- }
140
- Axios.get(`/translate/${pack}/${locale}`).then(
141
- res => {
142
- if (res.data.length !== 0) {
143
- const lang = {};
144
- const lng = res.data.length
78
+ const local = lang !== null ? lang : this._local
79
+ const pack = package_name !== null ? package_name : this._package
80
+ if (!local) {
81
+ this._failed_messages[key] = true
82
+ return key;
83
+ }
84
+ if (!this._messages[local]) {
85
+ this._failed_messages[key] = true
86
+ return key;
87
+ }
88
+ if (this._messages[local][key]) {
89
+ let val = this._messages[local][key];
90
+ const lng = variable.length
145
91
  for (let i = 0; i < lng; i++) {
146
- lang[res.data[i].key] = res.data[i][locale];
92
+ val = this.replaceAll(val, '{' + i + '}', variable[i]);
147
93
  }
148
- this.local = locale;
149
- this.setMessages(lang);
150
- } else {
151
- this.local = locale;
152
- this.setMessages({});
153
- }
154
- this.$r.store['langs_loaded'][pack] = true;
155
- },
156
- () => {
157
- this.$r.store['langs_loaded'][pack] = true;
94
+
95
+ if (val === null || val === '') {
96
+ this._failed_messages[key] = true
97
+ return key;
98
+ }
99
+ return val;
100
+ } else if (this.$r && this.$r.autoAddTranslate && pack && this._count < 100 && /^([0-9a-z_.])*$/.test(key)) {
101
+ if (!this._store.includes(key)) {
102
+ let url = '/translate/' + pack + '/' + key + '?v=';
103
+ const lng = variable.length
104
+ for (let i = 0; i < lng; i++) {
105
+ url += '{' + i + '}';
106
+ }
107
+ fetch(url, {
108
+ method: 'POST'
109
+ });
110
+ this._count++;
111
+ this._store.push(key)
112
+ }
113
+ this._failed_messages[key] = true
114
+ return key;
115
+ } else {
116
+ this._failed_messages[key] = true
117
+ return key;
158
118
  }
159
- );
160
- }
119
+ }
120
+
121
+ loads(packages = []) {
122
+ packages.forEach((p) => {
123
+ this.load(p)
124
+ })
125
+ }
126
+
127
+ load(p) {
128
+ const pack = p || this.$r.package;
129
+ if (!p) {
130
+ this.package = pack;
131
+ }
132
+ if (!this.$r.store['langs_loaded']) {
133
+ this.$r.store['langs_loaded'] = {}
134
+ }
135
+ this.$r.store['langs_loaded'][pack] = false;
136
+ let locale = this.$r.lang;
137
+ if (this.$storage.get("lang")) {
138
+ locale = this.$storage.get("lang");
139
+ }
140
+ fetch(`/api/translate/${pack}/${locale}`, {
141
+ method: 'GET',
142
+ }).then(
143
+ res => {
144
+ if (res.ok) {
145
+ let data = res.json()
146
+ if (data.length !== 0) {
147
+ const lang = {};
148
+ const lng = data.length
149
+ for (let i = 0; i < lng; i++) {
150
+ lang[data[i].key] = data[i][locale];
151
+ }
152
+ this.local = locale;
153
+ this.setMessages(lang);
154
+ } else {
155
+ this.local = locale;
156
+ this.setMessages({});
157
+ }
158
+ this.$r.store['langs_loaded'][pack] = true;
159
+ } else {
160
+ this.$r.store['langs_loaded'][pack] = true;
161
+ }
162
+ }
163
+ );
164
+ }
161
165
  }
package/plugins/validation/Validate.js CHANGED
@@ -72,17 +72,17 @@ export default class Validate {
72
72
 
73
73
  checkType(names) {
74
74
  let filters = [];
75
- if (typeof names === 'object') {
76
- names.forEach((name) => {
77
- let res = name.split(':');
78
- let par1 = res[1] ? res[1] : null;
79
- let par2 = res[2] ? res[2] : null;
80
- let par3 = res[3] ? res[3] : null;
81
- if (this[res[0]]) {
82
- if (par3 === null && par2 === null) {
83
- filters.push(this[res[0]](par1))
84
- } else if (par3 === null) {
85
- filters.push(this[res[0]](par1, par2))
75
+ if (Array.isArray(names)) {
76
+ names.forEach((name) => {
77
+ let res = name.split(':');
78
+ let par1 = res[1] ? res[1] : null;
79
+ let par2 = res[2] ? res[2] : null;
80
+ let par3 = res[3] ? res[3] : null;
81
+ if (this[res[0]]) {
82
+ if (par3 === null && par2 === null) {
83
+ filters.push(this[res[0]](par1))
84
+ } else if (par3 === null) {
85
+ filters.push(this[res[0]](par1, par2))
86
86
  } else {
87
87
  filters.push(this[res[0]](par1, par2, par3))
88
88
  }