@windwalker-io/unicorn-next 0.1.7 → 0.1.9

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 (133) hide show
  1. package/.editorconfig +18 -18
  2. package/.gulp.json +7 -7
  3. package/bin/release.mjs +47 -47
  4. package/dist/chunks/button-radio.js.map +1 -1
  5. package/dist/chunks/checkboxes-multi-select.js.map +1 -1
  6. package/dist/chunks/field-cascade-select.js +2 -2
  7. package/dist/chunks/field-cascade-select.js.map +1 -1
  8. package/dist/chunks/field-file-drag.js.map +1 -1
  9. package/dist/chunks/field-flatpickr.js.map +1 -1
  10. package/dist/chunks/field-modal-select.js.map +1 -1
  11. package/dist/chunks/field-modal-tree.js +2 -2
  12. package/dist/chunks/field-modal-tree.js.map +1 -1
  13. package/dist/chunks/field-multi-uploader.js.map +1 -1
  14. package/dist/chunks/field-repeatable.js.map +1 -1
  15. package/dist/chunks/field-single-image-drag.js.map +1 -1
  16. package/dist/chunks/form.js.map +1 -1
  17. package/dist/chunks/grid.js.map +1 -1
  18. package/dist/chunks/http-client.js.map +1 -1
  19. package/dist/chunks/iframe-modal.js.map +1 -1
  20. package/dist/chunks/index.js +1 -15
  21. package/dist/chunks/index.js.map +1 -1
  22. package/dist/chunks/keep-tab.js +2 -2
  23. package/dist/chunks/keep-tab.js.map +1 -1
  24. package/dist/chunks/legacy.js +3 -3
  25. package/dist/chunks/legacy.js.map +1 -1
  26. package/dist/chunks/list-dependent.js.map +1 -1
  27. package/dist/chunks/s3-multipart-uploader.js +23 -2
  28. package/dist/chunks/s3-multipart-uploader.js.map +1 -1
  29. package/dist/chunks/s3-uploader.js.map +1 -1
  30. package/dist/chunks/show-on.js +2 -2
  31. package/dist/chunks/show-on.js.map +1 -1
  32. package/dist/chunks/tinymce.js.map +1 -1
  33. package/dist/chunks/ui-bootstrap5.js.map +1 -1
  34. package/dist/chunks/unicorn.js +108 -89
  35. package/dist/chunks/unicorn.js.map +1 -1
  36. package/dist/chunks/validation.js.map +1 -1
  37. package/dist/index.d.ts +28 -6
  38. package/dist/unicorn.js +43 -41
  39. package/fusionfile.mjs +155 -155
  40. package/package.json +104 -104
  41. package/scss/bootstrap/multi-level-menu.scss +121 -121
  42. package/scss/editor.scss +116 -116
  43. package/scss/field/file-drag.scss +102 -102
  44. package/scss/field/single-image-drag.scss +88 -88
  45. package/scss/field/vue-drag-uploader.scss +160 -160
  46. package/scss/switcher.scss +156 -156
  47. package/src/app.ts +128 -128
  48. package/src/bootstrap/button-radio.ts +208 -208
  49. package/src/bootstrap/keep-tab.ts +155 -155
  50. package/src/composable/index.ts +22 -22
  51. package/src/composable/useCheckboxesMultiSelect.ts +22 -22
  52. package/src/composable/useFieldCascadeSelect.ts +9 -9
  53. package/src/composable/useFieldFileDrag.ts +9 -9
  54. package/src/composable/useFieldFlatpickr.ts +3 -3
  55. package/src/composable/useFieldModalSelect.ts +6 -6
  56. package/src/composable/useFieldModalTree.ts +3 -3
  57. package/src/composable/useFieldMultiUploader.ts +9 -9
  58. package/src/composable/useFieldRepeatable.ts +9 -9
  59. package/src/composable/useFieldSingleImageDrag.ts +9 -9
  60. package/src/composable/useForm.ts +43 -43
  61. package/src/composable/useGrid.ts +57 -57
  62. package/src/composable/useHttp.ts +9 -9
  63. package/src/composable/useIframeModal.ts +10 -10
  64. package/src/composable/useListDependent.ts +26 -26
  65. package/src/composable/useQueue.ts +13 -13
  66. package/src/composable/useS3Uploader.ts +32 -32
  67. package/src/composable/useShowOn.ts +9 -9
  68. package/src/composable/useStack.ts +13 -13
  69. package/src/composable/useTinymce.ts +29 -29
  70. package/src/composable/useTomSelect.ts +72 -72
  71. package/src/composable/useUIBootstrap5.ts +48 -48
  72. package/src/composable/useUniDirective.ts +43 -43
  73. package/src/composable/useValidation.ts +50 -50
  74. package/src/data.ts +34 -34
  75. package/src/events.ts +82 -82
  76. package/src/legacy/legacy.ts +190 -190
  77. package/src/legacy/loader.ts +125 -125
  78. package/src/module/checkboxes-multi-select.ts +54 -54
  79. package/src/module/field-cascade-select.ts +292 -292
  80. package/src/module/field-file-drag.ts +295 -295
  81. package/src/module/field-flatpickr.ts +130 -130
  82. package/src/module/field-modal-select.ts +179 -179
  83. package/src/module/field-modal-tree.ts +31 -31
  84. package/src/module/field-multi-uploader.ts +368 -368
  85. package/src/module/field-repeatable.ts +202 -202
  86. package/src/module/field-single-image-drag.ts +477 -477
  87. package/src/module/form.ts +223 -223
  88. package/src/module/grid.ts +479 -479
  89. package/src/module/http-client.ts +248 -248
  90. package/src/module/iframe-modal.ts +170 -170
  91. package/src/module/list-dependent.ts +321 -321
  92. package/src/module/s3-multipart-uploader.ts +330 -300
  93. package/src/module/s3-uploader.ts +234 -234
  94. package/src/module/show-on.ts +175 -175
  95. package/src/module/tinymce.ts +276 -276
  96. package/src/module/ui-bootstrap5.ts +116 -116
  97. package/src/module/validation.ts +1046 -1046
  98. package/src/plugin/index.ts +1 -1
  99. package/src/plugin/php-adapter.ts +72 -72
  100. package/src/polyfill/form-request-submit.ts +31 -31
  101. package/src/polyfill/index.ts +9 -9
  102. package/src/service/animate.ts +58 -58
  103. package/src/service/crypto.ts +27 -27
  104. package/src/service/dom-watcher.ts +62 -62
  105. package/src/service/dom.ts +291 -265
  106. package/src/service/helper.ts +52 -48
  107. package/src/service/index.ts +10 -10
  108. package/src/service/lang.ts +122 -122
  109. package/src/service/loader.ts +152 -152
  110. package/src/service/router.ts +118 -118
  111. package/src/service/ui.ts +525 -525
  112. package/src/service/uri.ts +106 -106
  113. package/src/types/base.ts +9 -9
  114. package/src/types/index.ts +4 -4
  115. package/src/types/modal-tree.ts +12 -12
  116. package/src/types/plugin.ts +6 -6
  117. package/src/types/shims.d.ts +18 -18
  118. package/src/types/ui.ts +6 -6
  119. package/src/unicorn.ts +79 -79
  120. package/src/utilities/arr.ts +25 -25
  121. package/src/utilities/base.ts +9 -9
  122. package/src/utilities/data.ts +48 -48
  123. package/src/utilities/index.ts +5 -5
  124. package/src/utilities/tree.ts +20 -20
  125. package/src/vue/components/ModalTree/ModalTreeApp.vue +175 -175
  126. package/src/vue/components/ModalTree/TreeItem.vue +262 -262
  127. package/src/vue/components/ModalTree/TreeModal.vue +225 -225
  128. package/tests/test.js +4 -4
  129. package/tsconfig.js.json +25 -25
  130. package/tsconfig.json +17 -17
  131. package/vite.assets.config.ts +61 -61
  132. package/vite.config.test.ts +36 -36
  133. package/vite.config.ts +112 -112
@@ -1,10 +1,10 @@
1
- export * from './animate';
2
- export * from './crypto';
3
- export * from './dom';
4
- export * from './dom-watcher';
5
- export * from './helper';
6
- export * from './lang';
7
- export * from './loader';
8
- export * from './ui';
9
- export * from './uri';
10
- export * from './router';
1
+ export * from './animate';
2
+ export * from './crypto';
3
+ export * from './dom';
4
+ export * from './dom-watcher';
5
+ export * from './helper';
6
+ export * from './lang';
7
+ export * from './loader';
8
+ export * from './ui';
9
+ export * from './uri';
10
+ export * from './router';
@@ -1,122 +1,122 @@
1
- import { data } from '../data';
2
- import { isDebug } from './/helper';
3
- import { Dictionary } from '../types';
4
- import { vsprintf } from 'sprintf-js';
5
-
6
- let lang: UnicornLang;
7
-
8
- export function useLang() {
9
- return lang ??= new UnicornLang();
10
- }
11
-
12
- export function trans(id: string, ...args: any[]) {
13
- return useLang().trans(id, ...args);
14
- }
15
-
16
- export function __(id: string, ...args: any[]) {
17
- return trans(id, ...args);
18
- }
19
-
20
- export default class UnicornLang {
21
- /**
22
- * Translate a string.
23
- */
24
- trans(id: string, ...args: any[]): string {
25
- const key = this.normalize(id);
26
-
27
- let translated = this.get(key) || '';
28
-
29
- translated = this.replace(translated, args);
30
-
31
- return translated !== '' ? translated : this.wrapDebug(id, false);
32
- }
33
-
34
- protected replace(str: string, args: any[]): string {
35
- let replacements: Dictionary<any> = {};
36
- let values: any[] = [];
37
-
38
- for (const arg of args) {
39
- if (typeof arg === 'object') {
40
- replacements = { ...replacements, ...arg };
41
- } else {
42
- values.push(arg);
43
- }
44
- }
45
-
46
- if (values.length) {
47
- str = vsprintf(str, values);
48
- }
49
-
50
- if (Object.values(replacements).length) {
51
- for (const key in replacements) {
52
- let value = replacements[key];
53
-
54
- if (typeof value === 'function') {
55
- value = value();
56
- }
57
-
58
- str = str.replace(new RegExp(':' + key, 'g'), String(value));
59
- }
60
- }
61
-
62
- return str;
63
- }
64
-
65
- /**
66
- * Find text.
67
- */
68
- get(id: string): string | null {
69
- const strings = this.getStrings();
70
-
71
- if (strings[id]) {
72
- return strings[id];
73
- }
74
-
75
- return null;
76
- }
77
-
78
- /**
79
- * Has language key.
80
- */
81
- has(key: string): boolean {
82
- const strings = this.getStrings();
83
-
84
- return strings[key] !== undefined;
85
- }
86
-
87
- /**
88
- * Add language key.
89
- */
90
- add(key: string, value: string): this {
91
- const strings = this.getStrings();
92
-
93
- strings[this.normalize(key)] = value;
94
-
95
- data('unicorn.languages', strings);
96
-
97
- return this;
98
- }
99
-
100
- /**
101
- * Replace all symbols to dot(.).
102
- */
103
- protected normalize(text: string): string {
104
- return text.replace(/[^A-Z0-9]+/ig, '.');
105
- }
106
-
107
- protected wrapDebug(text: string, success: boolean): string {
108
- if (isDebug()) {
109
- if (success) {
110
- return '**' + text + '**';
111
- }
112
-
113
- return '??' + text + '??';
114
- }
115
-
116
- return text;
117
- }
118
-
119
- getStrings(): Record<string, string> {
120
- return data('unicorn.languages') || {};
121
- }
122
- }
1
+ import { data } from '../data';
2
+ import { isDebug } from './/helper';
3
+ import { Dictionary } from '../types';
4
+ import { vsprintf } from 'sprintf-js';
5
+
6
+ let lang: UnicornLang;
7
+
8
+ export function useLang() {
9
+ return lang ??= new UnicornLang();
10
+ }
11
+
12
+ export function trans(id: string, ...args: any[]) {
13
+ return useLang().trans(id, ...args);
14
+ }
15
+
16
+ export function __(id: string, ...args: any[]) {
17
+ return trans(id, ...args);
18
+ }
19
+
20
+ export default class UnicornLang {
21
+ /**
22
+ * Translate a string.
23
+ */
24
+ trans(id: string, ...args: any[]): string {
25
+ const key = this.normalize(id);
26
+
27
+ let translated = this.get(key) || '';
28
+
29
+ translated = this.replace(translated, args);
30
+
31
+ return translated !== '' ? translated : this.wrapDebug(id, false);
32
+ }
33
+
34
+ protected replace(str: string, args: any[]): string {
35
+ let replacements: Dictionary<any> = {};
36
+ let values: any[] = [];
37
+
38
+ for (const arg of args) {
39
+ if (typeof arg === 'object') {
40
+ replacements = { ...replacements, ...arg };
41
+ } else {
42
+ values.push(arg);
43
+ }
44
+ }
45
+
46
+ if (values.length) {
47
+ str = vsprintf(str, values);
48
+ }
49
+
50
+ if (Object.values(replacements).length) {
51
+ for (const key in replacements) {
52
+ let value = replacements[key];
53
+
54
+ if (typeof value === 'function') {
55
+ value = value();
56
+ }
57
+
58
+ str = str.replace(new RegExp(':' + key, 'g'), String(value));
59
+ }
60
+ }
61
+
62
+ return str;
63
+ }
64
+
65
+ /**
66
+ * Find text.
67
+ */
68
+ get(id: string): string | null {
69
+ const strings = this.getStrings();
70
+
71
+ if (strings[id]) {
72
+ return strings[id];
73
+ }
74
+
75
+ return null;
76
+ }
77
+
78
+ /**
79
+ * Has language key.
80
+ */
81
+ has(key: string): boolean {
82
+ const strings = this.getStrings();
83
+
84
+ return strings[key] !== undefined;
85
+ }
86
+
87
+ /**
88
+ * Add language key.
89
+ */
90
+ add(key: string, value: string): this {
91
+ const strings = this.getStrings();
92
+
93
+ strings[this.normalize(key)] = value;
94
+
95
+ data('unicorn.languages', strings);
96
+
97
+ return this;
98
+ }
99
+
100
+ /**
101
+ * Replace all symbols to dot(.).
102
+ */
103
+ protected normalize(text: string): string {
104
+ return text.replace(/[^A-Z0-9]+/ig, '.');
105
+ }
106
+
107
+ protected wrapDebug(text: string, success: boolean): string {
108
+ if (isDebug()) {
109
+ if (success) {
110
+ return '**' + text + '**';
111
+ }
112
+
113
+ return '??' + text + '??';
114
+ }
115
+
116
+ return text;
117
+ }
118
+
119
+ getStrings(): Record<string, string> {
120
+ return data('unicorn.languages') || {};
121
+ }
122
+ }
@@ -1,152 +1,152 @@
1
- import { Dictionary } from '../types';
2
- import { injectCssToDocument } from './';
3
-
4
- export function useScriptImport(src: string, attrs: Record<string, string> = {}): Promise<void> {
5
- const script = document.createElement('script');
6
- script.src = resolveUrl(src);
7
-
8
- for (const key in attrs) {
9
- script.setAttribute(key, attrs[key]);
10
- }
11
-
12
- return new Promise((resolve, reject) => {
13
- script.onload = () => {
14
- resolve();
15
- document.body.removeChild(script);
16
- };
17
- script.onerror = (e) => {
18
- reject(e);
19
- document.body.removeChild(script);
20
- };
21
-
22
- document.body.appendChild(script);
23
- });
24
- }
25
-
26
- export function doImport<T = any>(src: string): Promise<T> {
27
- return import(/* @vite-ignore */src);
28
- }
29
-
30
- export async function useImport(...src: any[]): Promise<any>;
31
- export async function useImport<T extends any[]>(...src: string[]): Promise<T>;
32
- export async function useImport<T = any>(src: string): Promise<{ default: T }>;
33
- export async function useImport<D = any, C = any>(src: string): Promise<{ default: D } & Dictionary<C>>;
34
- export async function useImport(...src: any[]): Promise<any> {
35
- if (src.length === 1) {
36
- return doImport(src[0]);
37
- }
38
-
39
- const promises: Promise<any>[] = [];
40
-
41
- src.forEach((link) => {
42
- promises.push(
43
- link instanceof Promise ? link : doImport(link)
44
- );
45
- });
46
-
47
- return Promise.all(promises);
48
- }
49
-
50
- export async function useSeriesImport(...src: any[]): Promise<any>;
51
- export async function useSeriesImport<T extends any[]>(...src: string[]): Promise<T>;
52
- export async function useSeriesImport<T = any>(src: string): Promise<{ default: T }>;
53
- export async function useSeriesImport<D = any, C = any>(src: string): Promise<{ default: D } & Dictionary<C>>;
54
- export async function useSeriesImport(...src: any[]): Promise<any> {
55
- const modules: any[] = [];
56
-
57
- for (const source of src) {
58
- if (Array.isArray(source)) {
59
- const m = await useImport(...source);
60
- modules.push(m);
61
-
62
- continue;
63
- }
64
-
65
- const m = await useImport(source);
66
-
67
- modules.push(m);
68
- }
69
-
70
- return modules;
71
- }
72
-
73
- export async function useCssIncludes(...hrefs: string[]): Promise<void[]> {
74
- const promises = hrefs.map((href) => {
75
- href = resolveUrl(href);
76
-
77
- return new Promise<void>((resolve, reject) => {
78
- const link = document.createElement('link');
79
- link.rel = 'stylesheet';
80
- link.href = href;
81
- link.onload = () => resolve();
82
- link.onerror = (e) => reject(e);
83
-
84
- document.head.appendChild(link);
85
- });
86
- });
87
-
88
- return Promise.all(promises);
89
- }
90
-
91
- const importedSheets: Record<string, Promise<{ default: CSSStyleSheet }>> = {};
92
-
93
- export async function useCssImport(...hrefs: string[]): Promise<CSSStyleSheet[]> {
94
- // Todo: Use `{ assert: { type: "css" }` after all browsers support it.
95
- const modules = await Promise.all(
96
- hrefs.map((href) => {
97
- if (!importedSheets[href]) {
98
- importedSheets[href] = simulateCssImport(href);
99
- }
100
-
101
- return importedSheets[href];
102
- })
103
- );
104
- const styles = modules.map(module => module.default);
105
-
106
- return injectCssToDocument(...styles);
107
- }
108
-
109
- async function simulateCssImport(href: string) {
110
- href = resolveUrl(href);
111
-
112
- const response = await fetch(href);
113
- if (!response.ok) {
114
- throw new Error(`Failed to load CSS: ${href}`);
115
- }
116
- const cssText = await response.text();
117
-
118
- const sheet = new CSSStyleSheet();
119
- await sheet.replace(cssText);
120
- return { default: sheet };
121
- }
122
-
123
- let importMap: Record<string, string>;
124
-
125
- function parseImportMap() {
126
- const importMapScript = document.querySelector('script[type="importmap"]');
127
- if (importMapScript) {
128
- try {
129
- return JSON.parse(importMapScript.textContent || '{}').imports || {};
130
- } catch (e) {
131
- console.error('Failed to parse import map:', e);
132
- }
133
- }
134
- return {};
135
- }
136
-
137
- function resolveUrl(specifier: string) {
138
- importMap ??= parseImportMap();
139
-
140
- for (const [prefix, target] of Object.entries(importMap)) {
141
- if (specifier === prefix) {
142
- return target;
143
- }
144
- }
145
-
146
- for (const [prefix, target] of Object.entries(importMap)) {
147
- if (specifier.startsWith(prefix)) {
148
- return specifier.replace(prefix, target);
149
- }
150
- }
151
- return specifier;
152
- }
1
+ import { Dictionary } from '../types';
2
+ import { injectCssToDocument } from './';
3
+
4
+ export function useScriptImport(src: string, attrs: Record<string, string> = {}): Promise<void> {
5
+ const script = document.createElement('script');
6
+ script.src = resolveUrl(src);
7
+
8
+ for (const key in attrs) {
9
+ script.setAttribute(key, attrs[key]);
10
+ }
11
+
12
+ return new Promise((resolve, reject) => {
13
+ script.onload = () => {
14
+ resolve();
15
+ document.body.removeChild(script);
16
+ };
17
+ script.onerror = (e) => {
18
+ reject(e);
19
+ document.body.removeChild(script);
20
+ };
21
+
22
+ document.body.appendChild(script);
23
+ });
24
+ }
25
+
26
+ export function doImport<T = any>(src: string): Promise<T> {
27
+ return import(/* @vite-ignore */src);
28
+ }
29
+
30
+ export async function useImport(...src: any[]): Promise<any>;
31
+ export async function useImport<T extends any[]>(...src: string[]): Promise<T>;
32
+ export async function useImport<T = any>(src: string): Promise<{ default: T }>;
33
+ export async function useImport<D = any, C = any>(src: string): Promise<{ default: D } & Dictionary<C>>;
34
+ export async function useImport(...src: any[]): Promise<any> {
35
+ if (src.length === 1) {
36
+ return doImport(src[0]);
37
+ }
38
+
39
+ const promises: Promise<any>[] = [];
40
+
41
+ src.forEach((link) => {
42
+ promises.push(
43
+ link instanceof Promise ? link : doImport(link)
44
+ );
45
+ });
46
+
47
+ return Promise.all(promises);
48
+ }
49
+
50
+ export async function useSeriesImport(...src: any[]): Promise<any>;
51
+ export async function useSeriesImport<T extends any[]>(...src: string[]): Promise<T>;
52
+ export async function useSeriesImport<T = any>(src: string): Promise<{ default: T }>;
53
+ export async function useSeriesImport<D = any, C = any>(src: string): Promise<{ default: D } & Dictionary<C>>;
54
+ export async function useSeriesImport(...src: any[]): Promise<any> {
55
+ const modules: any[] = [];
56
+
57
+ for (const source of src) {
58
+ if (Array.isArray(source)) {
59
+ const m = await useImport(...source);
60
+ modules.push(m);
61
+
62
+ continue;
63
+ }
64
+
65
+ const m = await useImport(source);
66
+
67
+ modules.push(m);
68
+ }
69
+
70
+ return modules;
71
+ }
72
+
73
+ export async function useCssIncludes(...hrefs: string[]): Promise<void[]> {
74
+ const promises = hrefs.map((href) => {
75
+ href = resolveUrl(href);
76
+
77
+ return new Promise<void>((resolve, reject) => {
78
+ const link = document.createElement('link');
79
+ link.rel = 'stylesheet';
80
+ link.href = href;
81
+ link.onload = () => resolve();
82
+ link.onerror = (e) => reject(e);
83
+
84
+ document.head.appendChild(link);
85
+ });
86
+ });
87
+
88
+ return Promise.all(promises);
89
+ }
90
+
91
+ const importedSheets: Record<string, Promise<{ default: CSSStyleSheet }>> = {};
92
+
93
+ export async function useCssImport(...hrefs: string[]): Promise<CSSStyleSheet[]> {
94
+ // Todo: Use `{ assert: { type: "css" }` after all browsers support it.
95
+ const modules = await Promise.all(
96
+ hrefs.map((href) => {
97
+ if (!importedSheets[href]) {
98
+ importedSheets[href] = simulateCssImport(href);
99
+ }
100
+
101
+ return importedSheets[href];
102
+ })
103
+ );
104
+ const styles = modules.map(module => module.default);
105
+
106
+ return injectCssToDocument(...styles);
107
+ }
108
+
109
+ async function simulateCssImport(href: string) {
110
+ href = resolveUrl(href);
111
+
112
+ const response = await fetch(href);
113
+ if (!response.ok) {
114
+ throw new Error(`Failed to load CSS: ${href}`);
115
+ }
116
+ const cssText = await response.text();
117
+
118
+ const sheet = new CSSStyleSheet();
119
+ await sheet.replace(cssText);
120
+ return { default: sheet };
121
+ }
122
+
123
+ let importMap: Record<string, string>;
124
+
125
+ function parseImportMap() {
126
+ const importMapScript = document.querySelector('script[type="importmap"]');
127
+ if (importMapScript) {
128
+ try {
129
+ return JSON.parse(importMapScript.textContent || '{}').imports || {};
130
+ } catch (e) {
131
+ console.error('Failed to parse import map:', e);
132
+ }
133
+ }
134
+ return {};
135
+ }
136
+
137
+ function resolveUrl(specifier: string) {
138
+ importMap ??= parseImportMap();
139
+
140
+ for (const [prefix, target] of Object.entries(importMap)) {
141
+ if (specifier === prefix) {
142
+ return target;
143
+ }
144
+ }
145
+
146
+ for (const [prefix, target] of Object.entries(importMap)) {
147
+ if (specifier.startsWith(prefix)) {
148
+ return specifier.replace(prefix, target);
149
+ }
150
+ }
151
+ return specifier;
152
+ }