namirasoft-core 1.4.67 → 1.4.68

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.
@@ -1,5 +1,6 @@
1
1
  export declare class NamingConvention {
2
2
  static abbreviations: string[];
3
+ static combineSingleCharacters(words: string[]): string[];
3
4
  static formatter_lower: (word: string) => string;
4
5
  static formatter_upper: (word: string) => string;
5
6
  static formatter_pascal: (word: string) => string;
@@ -3,6 +3,28 @@ var _a;
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.NamingConvention = void 0;
5
5
  class NamingConvention {
6
+ static combineSingleCharacters(words) {
7
+ let combined = [];
8
+ let single_found = false;
9
+ for (let i = 0; i < words.length; i++) {
10
+ let word = words[i];
11
+ if (word) {
12
+ if (word.length > 1) {
13
+ combined.push(word);
14
+ single_found = false;
15
+ }
16
+ else {
17
+ if (i == 0 || !single_found) {
18
+ combined.push(word);
19
+ single_found = true;
20
+ }
21
+ else
22
+ combined[combined.length - 1] += word;
23
+ }
24
+ }
25
+ }
26
+ return combined;
27
+ }
6
28
  constructor(name, delimiter, revertable, formatter, splitter) {
7
29
  this.name = name;
8
30
  this.delimiter = delimiter;
@@ -18,28 +40,8 @@ class NamingConvention {
18
40
  convertByWords(words, revertable = true) {
19
41
  for (let i = 0; i < words.length; i++)
20
42
  words[i] = this.formatter(words[i], i);
21
- let single_found = false;
22
- if (this.revertable || !revertable) {
23
- let combined = [];
24
- for (let i = 0; i < words.length; i++) {
25
- let word = words[i];
26
- if (word) {
27
- if (word.length > 1) {
28
- combined.push(word);
29
- single_found = false;
30
- }
31
- else {
32
- if (i == 0 || !single_found) {
33
- combined.push(word);
34
- single_found = true;
35
- }
36
- else
37
- combined[combined.length - 1] += word;
38
- }
39
- }
40
- }
41
- words = combined;
42
- }
43
+ if (this.revertable || !revertable)
44
+ words = _a.combineSingleCharacters(words);
43
45
  return words.join(this.delimiter);
44
46
  }
45
47
  convert(name, to, revertable = true) {
@@ -107,7 +109,9 @@ NamingConvention.splitter_pascal = (name, delimiter) => {
107
109
  return _a.splitter_multi(name, _a.splitter_uppercase, (w) => _a.splitter_normal(w, delimiter));
108
110
  };
109
111
  NamingConvention.splitter_uppercase = (name) => {
110
- return name.split(/(?=[A-Z])/);
112
+ let ans = name.split(/(?=[A-Z])/);
113
+ ans = _a.combineSingleCharacters(ans);
114
+ return ans;
111
115
  };
112
116
  NamingConvention.splitter_none = (name) => {
113
117
  return [name];
@@ -1 +1 @@
1
- {"version":3,"file":"NamingConvention.js","sourceRoot":"","sources":["../src/NamingConvention.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NamingConvention.js","sourceRoot":"","sources":["../src/NamingConvention.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.67",
11
+ "version": "1.4.68",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
@@ -4,6 +4,34 @@ export class NamingConvention
4
4
  "ID", "AWS", "NWS", "FTP", "SFTP", "SMTP", "API", "AI", "CPU", "DB", "DNS", "HTML", "CSS", "JSON", "HTTP", "HTTPS", "IP", "YAML", "YML", "NFS", "OS", "SQL", "SSL", "TCP", "UDP", "SSL", "TLS", "UI", "UID",
5
5
  "URL", "URI", "UTC", "XML", "CLI", "FIFO", "LIFO", "GPU", "GCP", "SMS"
6
6
  ];
7
+ static combineSingleCharacters(words: string[])
8
+ {
9
+ let combined = [];
10
+ let single_found: boolean = false;
11
+ for (let i = 0; i < words.length; i++)
12
+ {
13
+ let word = words[i];
14
+ if (word)
15
+ {
16
+ if (word.length > 1)
17
+ {
18
+ combined.push(word);
19
+ single_found = false;
20
+ }
21
+ else
22
+ {
23
+ if (i == 0 || !single_found)
24
+ {
25
+ combined.push(word);
26
+ single_found = true;
27
+ }
28
+ else
29
+ combined[combined.length - 1] += word;
30
+ }
31
+ }
32
+ }
33
+ return combined;
34
+ }
7
35
  public static formatter_lower = (word: string) =>
8
36
  {
9
37
  if (word)
@@ -68,7 +96,9 @@ export class NamingConvention
68
96
  };
69
97
  public static splitter_uppercase = (name: string) =>
70
98
  {
71
- return name.split(/(?=[A-Z])/);
99
+ let ans = name.split(/(?=[A-Z])/);
100
+ ans = NamingConvention.combineSingleCharacters(ans);
101
+ return ans;
72
102
  };
73
103
  public static splitter_none = (name: string) =>
74
104
  {
@@ -147,34 +177,8 @@ export class NamingConvention
147
177
  {
148
178
  for (let i = 0; i < words.length; i++)
149
179
  words[i] = this.formatter(words[i], i);
150
- let single_found: boolean = false;
151
180
  if (this.revertable || !revertable)
152
- {
153
- let combined = [];
154
- for (let i = 0; i < words.length; i++)
155
- {
156
- let word = words[i];
157
- if (word)
158
- {
159
- if (word.length > 1)
160
- {
161
- combined.push(word);
162
- single_found = false;
163
- }
164
- else
165
- {
166
- if (i == 0 || !single_found)
167
- {
168
- combined.push(word);
169
- single_found = true;
170
- }
171
- else
172
- combined[combined.length - 1] += word;
173
- }
174
- }
175
- }
176
- words = combined;
177
- }
181
+ words = NamingConvention.combineSingleCharacters(words);
178
182
  return words.join(this.delimiter);
179
183
  }
180
184
  convert(name: string, to: NamingConvention, revertable: boolean = true)