generator-ehrcraft-script 1.0.0 → 1.1.0

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 (6) hide show
  1. package/LICENSE +21 -21
  2. package/README.md +39 -39
  3. package/generators/app/index.js +94 -94
  4. package/generators/app/templates/gulpfile.js/index.js +5 -0
  5. package/generators/app/templates/package.json +60 -60
  6. package/package.json +87 -87
package/LICENSE CHANGED
@@ -1,21 +1,21 @@
1
- The MIT License (MIT)
2
-
3
- Copyright (c) 2020 Bjørn Næss <bna@dips.no>
4
-
5
- Permission is hereby granted, free of charge, to any person obtaining a copy
6
- of this software and associated documentation files (the "Software"), to deal
7
- in the Software without restriction, including without limitation the rights
8
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
- copies of the Software, and to permit persons to whom the Software is
10
- furnished to do so, subject to the following conditions:
11
-
12
- The above copyright notice and this permission notice shall be included in
13
- all copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
- THE SOFTWARE.
1
+ The MIT License (MIT)
2
+
3
+ Copyright (c) 2020 Bjørn Næss <bna@dips.no>
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in
13
+ all copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
+ THE SOFTWARE.
package/README.md CHANGED
@@ -1,39 +1,39 @@
1
- # generator-ehrcraft-script [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url] [![Coverage percentage][coveralls-image]][coveralls-url]
2
- >
3
-
4
- ## Installation
5
-
6
- First, install [Yeoman](http://yeoman.io) and generator-ehrcraft-script using [npm](https://www.npmjs.com/) (we assume you have pre-installed [node.js](https://nodejs.org/)).
7
-
8
- ```bash
9
- npm install -g yo
10
- npm link
11
- # npm install -g generator-ehrcraft-script
12
- ```
13
-
14
- Then generate your new project:
15
-
16
- ```bash
17
- yo ehrcraft-script
18
- ```
19
-
20
- ## Getting To Know Yeoman
21
-
22
- * Yeoman has a heart of gold.
23
- * Yeoman is a person with feelings and opinions, but is very easy to work with.
24
- * Yeoman can be too opinionated at times but is easily convinced not to be.
25
- * Feel free to [learn more about Yeoman](http://yeoman.io/).
26
-
27
- ## License
28
-
29
- MIT © [Bjørn Næss]()
30
-
31
-
32
- [npm-image]: https://badge.fury.io/js/generator-ehrcraft-script.svg
33
- [npm-url]: https://npmjs.org/package/generator-ehrcraft-script
34
- [travis-image]: https://travis-ci.com/ehrforce/generator-ehrcraft-script.svg?branch=master
35
- [travis-url]: https://travis-ci.com/ehrforce/generator-ehrcraft-script
36
- [daviddm-image]: https://david-dm.org/ehrforce/generator-ehrcraft-script.svg?theme=shields.io
37
- [daviddm-url]: https://david-dm.org/ehrforce/generator-ehrcraft-script
38
- [coveralls-image]: https://coveralls.io/repos/ehrforce/generator-ehrcraft-script/badge.svg
39
- [coveralls-url]: https://coveralls.io/r/ehrforce/generator-ehrcraft-script
1
+ # generator-ehrcraft-script [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url] [![Coverage percentage][coveralls-image]][coveralls-url]
2
+ >
3
+
4
+ ## Installation
5
+
6
+ First, install [Yeoman](http://yeoman.io) and generator-ehrcraft-script using [npm](https://www.npmjs.com/) (we assume you have pre-installed [node.js](https://nodejs.org/)).
7
+
8
+ ```bash
9
+ npm install -g yo
10
+ npm link
11
+ # npm install -g generator-ehrcraft-script
12
+ ```
13
+
14
+ Then generate your new project:
15
+
16
+ ```bash
17
+ yo ehrcraft-script
18
+ ```
19
+
20
+ ## Getting To Know Yeoman
21
+
22
+ * Yeoman has a heart of gold.
23
+ * Yeoman is a person with feelings and opinions, but is very easy to work with.
24
+ * Yeoman can be too opinionated at times but is easily convinced not to be.
25
+ * Feel free to [learn more about Yeoman](http://yeoman.io/).
26
+
27
+ ## License
28
+
29
+ MIT © [Bjørn Næss]()
30
+
31
+
32
+ [npm-image]: https://badge.fury.io/js/generator-ehrcraft-script.svg
33
+ [npm-url]: https://npmjs.org/package/generator-ehrcraft-script
34
+ [travis-image]: https://travis-ci.com/ehrforce/generator-ehrcraft-script.svg?branch=master
35
+ [travis-url]: https://travis-ci.com/ehrforce/generator-ehrcraft-script
36
+ [daviddm-image]: https://david-dm.org/ehrforce/generator-ehrcraft-script.svg?theme=shields.io
37
+ [daviddm-url]: https://david-dm.org/ehrforce/generator-ehrcraft-script
38
+ [coveralls-image]: https://coveralls.io/repos/ehrforce/generator-ehrcraft-script/badge.svg
39
+ [coveralls-url]: https://coveralls.io/r/ehrforce/generator-ehrcraft-script
package/generators/app/index.js CHANGED
@@ -1,94 +1,94 @@
1
- "use strict";
2
- const Generator = require("yeoman-generator");
3
- const chalk = require("chalk");
4
- const yosay = require("yosay");
5
- const path = require("path");
6
- const _ = require("lodash");
7
-
8
- module.exports = class extends Generator {
9
- // eslint-disable-next-line no-useless-constructor
10
- constructor(args,opts) {
11
- super(args,opts);
12
- }
13
-
14
- prompting() {
15
- // Have Yeoman greet the user.
16
- this.log(
17
- yosay(`Welcome to ${chalk.red("generator-ehrcraft-script")} generator!`)
18
- );
19
- this.log(chalk.cyan("Enter some details about your new project"));
20
-
21
- const prompts = [
22
- {
23
- type: "input",
24
- name: "form_name",
25
- message:
26
- "The form name - will be written as <form_name>.js into the <form_scripts> folder",
27
- default: this.appname
28
- },
29
- {
30
- type: "input",
31
- name: "form_scripts",
32
- message: "The folder where the script should be placed",
33
- default: "../../form_scripts"
34
- }
35
- ];
36
-
37
- return this.prompt(prompts).then(props => {
38
- // To access props later use this.props.someAnswer;
39
- this.props = props;
40
- });
41
- }
42
-
43
- writing() {
44
- this.fs.copy(
45
- this.templatePath("gulpfile.js"),
46
- this.destinationPath("gulpfile.js")
47
- );
48
- this.fs.copyTpl(
49
- this.templatePath("package.json"),
50
- this.destinationPath("package.json"),
51
- { appname: _.kebabCase(path.basename(process.cwd())) }
52
- );
53
-
54
- this.fs.copyTpl(
55
- this.templatePath("ehrcraft.config.yml"),
56
- this.destinationPath("ehrcraft.config.yml"),
57
- {
58
- formname: this.props.form_name,
59
- formscripts: this.props.form_scripts
60
- }
61
- );
62
- this.fs.copy(
63
- this.templatePath("tsconfig.json"),
64
- this.destinationPath("tsconfig.json")
65
- );
66
- this.fs.copy(
67
- this.templatePath("gitignore"),
68
- this.destinationPath(".gitignore")
69
- );
70
- this.fs.copy(
71
- this.templatePath("npmignore"),
72
- this.destinationPath(".npmignore")
73
- );
74
-
75
- this.fs.copy(
76
- this.templatePath("README.md"),
77
- this.destinationPath("README.md")
78
- );
79
- /**
80
- This.fs.copy(
81
- this.templatePath("index.js"),
82
- this.destinationPath("index.js")
83
- ); */
84
- this.fs.copy(this.templatePath("src"),this.destinationPath("src"));
85
- }
86
-
87
- install() {
88
- this.installDependencies({
89
- npm: true,
90
- bower: false,
91
- yarn: false
92
- });
93
- }
94
- };
1
+ "use strict";
2
+ const Generator = require("yeoman-generator");
3
+ const chalk = require("chalk");
4
+ const yosay = require("yosay");
5
+ const path = require("path");
6
+ const _ = require("lodash");
7
+
8
+ module.exports = class extends Generator {
9
+ // eslint-disable-next-line no-useless-constructor
10
+ constructor(args,opts) {
11
+ super(args,opts);
12
+ }
13
+
14
+ prompting() {
15
+ // Have Yeoman greet the user.
16
+ this.log(
17
+ yosay(`Welcome to ${chalk.red("generator-ehrcraft-script")} generator!`)
18
+ );
19
+ this.log(chalk.cyan("Enter some details about your new project"));
20
+
21
+ const prompts = [
22
+ {
23
+ type: "input",
24
+ name: "form_name",
25
+ message:
26
+ "The form name - will be written as <form_name>.js into the <form_scripts> folder",
27
+ default: this.appname
28
+ },
29
+ {
30
+ type: "input",
31
+ name: "form_scripts",
32
+ message: "The folder where the script should be placed",
33
+ default: "../../form_scripts"
34
+ }
35
+ ];
36
+
37
+ return this.prompt(prompts).then(props => {
38
+ // To access props later use this.props.someAnswer;
39
+ this.props = props;
40
+ });
41
+ }
42
+
43
+ writing() {
44
+ this.fs.copy(
45
+ this.templatePath("gulpfile.js"),
46
+ this.destinationPath("gulpfile.js")
47
+ );
48
+ this.fs.copyTpl(
49
+ this.templatePath("package.json"),
50
+ this.destinationPath("package.json"),
51
+ { appname: _.kebabCase(path.basename(process.cwd())) }
52
+ );
53
+
54
+ this.fs.copyTpl(
55
+ this.templatePath("ehrcraft.config.yml"),
56
+ this.destinationPath("ehrcraft.config.yml"),
57
+ {
58
+ formname: this.props.form_name,
59
+ formscripts: this.props.form_scripts
60
+ }
61
+ );
62
+ this.fs.copy(
63
+ this.templatePath("tsconfig.json"),
64
+ this.destinationPath("tsconfig.json")
65
+ );
66
+ this.fs.copy(
67
+ this.templatePath("gitignore"),
68
+ this.destinationPath(".gitignore")
69
+ );
70
+ this.fs.copy(
71
+ this.templatePath("npmignore"),
72
+ this.destinationPath(".npmignore")
73
+ );
74
+
75
+ this.fs.copy(
76
+ this.templatePath("README.md"),
77
+ this.destinationPath("README.md")
78
+ );
79
+ /**
80
+ This.fs.copy(
81
+ this.templatePath("index.js"),
82
+ this.destinationPath("index.js")
83
+ ); */
84
+ this.fs.copy(this.templatePath("src"),this.destinationPath("src"));
85
+ }
86
+
87
+ install() {
88
+ this.installDependencies({
89
+ npm: true,
90
+ bower: false,
91
+ yarn: false
92
+ });
93
+ }
94
+ };
package/generators/app/templates/gulpfile.js/index.js CHANGED
@@ -67,6 +67,11 @@ function compile() {
67
67
  * i.e.
68
68
  * main(api, ctx, http)
69
69
  * main(api, ctx)
70
+ *
71
+ * NOTE:
72
+ * If you want to use api2, the second generation of script api delivered with DIPS Arena 22.2, add the following:
73
+ *
74
+ * main(api2)
70
75
  *
71
76
  * Then you have to changes the export function main(......) in index.ts as well
72
77
  */
package/generators/app/templates/package.json CHANGED
@@ -1,60 +1,60 @@
1
- {
2
- "name": "<%= appname %>",
3
- "version": "1.0.0",
4
- "description": "<%= appname %>",
5
- "main": "index.js",
6
- "scripts": {
7
- "test": "ts-mocha test/**/*.spec.ts"
8
- },
9
- "keywords": [
10
- "openEHR",
11
- "<%= appname %>",
12
- "BIFROST",
13
- "Arena"
14
- ],
15
- "author": "Bjørn Næss <bna@dips.no>",
16
- "license": "ISC",
17
- "devDependencies": {
18
- "@babel/cli": "^7.6.4",
19
- "@babel/core": "^7.6.4",
20
- "@babel/plugin-proposal-class-properties": "^7.5.5",
21
- "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
22
- "@babel/preset-typescript": "^7.6.0",
23
- "@types/adm-zip": "^0.4.32",
24
- "@types/chai": "^4.2.3",
25
- "@types/mocha": "^8.2.0",
26
- "@types/node": "^14.0.0",
27
- "@types/voca": "^1.4.0",
28
- "adm-zip": "^0.5.2",
29
- "aliasify": "^2.1.0",
30
- "chai": "^4.2.0",
31
- "del": "^6.0.0",
32
- "gulp": "^4.0.2",
33
- "gulp-babel": "^8.0.0",
34
- "gulp-browserify": "^0.5.1",
35
- "gulp-buffer": "0.0.2",
36
- "gulp-concat": "^2.6.1",
37
- "gulp-copy": "^4.0.1",
38
- "gulp-inject-string": "^1.1.2",
39
- "gulp-rename": "^2.0.0",
40
- "gulp-tap": "^2.0.0",
41
- "gulp-typescript": "^5.0.1",
42
- "gulp-uglify": "^3.0.2",
43
- "gulp-uglify-es": "^2.0.0",
44
- "gulp-watch": "^5.0.1",
45
- "gulplog": "^1.0.0",
46
- "mocha": "^8.0.0",
47
- "nyc": "^15.0.0",
48
- "ts-mocha": "^8.0.0",
49
- "ts-mockito": "^2.5.0",
50
- "ts-node": "^9.1.1",
51
- "typescript": "^4.0.0",
52
- "vinyl-buffer": "^1.0.1",
53
- "vinyl-source-stream": "^2.0.0",
54
- "voca": "^1.4.0"
55
- },
56
- "dependencies": {
57
- "ehrcraft-form-api": "^1",
58
- "yaml": "^1.7.2"
59
- }
60
- }
1
+ {
2
+ "name": "<%= appname %>",
3
+ "version": "1.0.0",
4
+ "description": "<%= appname %>",
5
+ "main": "index.js",
6
+ "scripts": {
7
+ "test": "ts-mocha test/**/*.spec.ts"
8
+ },
9
+ "keywords": [
10
+ "openEHR",
11
+ "<%= appname %>",
12
+ "BIFROST",
13
+ "Arena"
14
+ ],
15
+ "author": "Bjørn Næss <bna@dips.no>",
16
+ "license": "ISC",
17
+ "devDependencies": {
18
+ "@babel/cli": "^7.6.4",
19
+ "@babel/core": "^7.6.4",
20
+ "@babel/plugin-proposal-class-properties": "^7.5.5",
21
+ "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
22
+ "@babel/preset-typescript": "^7.6.0",
23
+ "@types/adm-zip": "^0.4.32",
24
+ "@types/chai": "^4.2.3",
25
+ "@types/mocha": "^8.2.0",
26
+ "@types/node": "^14.0.0",
27
+ "@types/voca": "^1.4.0",
28
+ "adm-zip": "^0.5.2",
29
+ "aliasify": "^2.1.0",
30
+ "chai": "^4.2.0",
31
+ "del": "^6.0.0",
32
+ "gulp": "^4.0.2",
33
+ "gulp-babel": "^8.0.0",
34
+ "gulp-browserify": "^0.5.1",
35
+ "gulp-buffer": "0.0.2",
36
+ "gulp-concat": "^2.6.1",
37
+ "gulp-copy": "^4.0.1",
38
+ "gulp-inject-string": "^1.1.2",
39
+ "gulp-rename": "^2.0.0",
40
+ "gulp-tap": "^2.0.0",
41
+ "gulp-typescript": "^5.0.1",
42
+ "gulp-uglify": "^3.0.2",
43
+ "gulp-uglify-es": "^2.0.0",
44
+ "gulp-watch": "^5.0.1",
45
+ "gulplog": "^1.0.0",
46
+ "mocha": "^8.0.0",
47
+ "nyc": "^15.0.0",
48
+ "ts-mocha": "^8.0.0",
49
+ "ts-mockito": "^2.5.0",
50
+ "ts-node": "^9.1.1",
51
+ "typescript": "^4.0.0",
52
+ "vinyl-buffer": "^1.0.1",
53
+ "vinyl-source-stream": "^2.0.0",
54
+ "voca": "^1.4.0"
55
+ },
56
+ "dependencies": {
57
+ "ehrcraft-form-api": "^2",
58
+ "yaml": "^1.7.2"
59
+ }
60
+ }
package/package.json CHANGED
@@ -1,87 +1,87 @@
1
- {
2
- "name": "generator-ehrcraft-script",
3
- "version": "1.0.0",
4
- "description": "A code generator for DIPS Forms typescript",
5
- "homepage": "https://dev.azure.com/dips/DIPS%20Configured%20Products/_git/generator-ehrcraft-script",
6
- "author": {
7
- "name": "Bjørn Næss",
8
- "email": "bna@dips.no",
9
- "url": "https://dev.azure.com/dips/DIPS%20Configured%20Products/_git/generator-ehrcraft-script"
10
- },
11
- "files": [
12
- "generators"
13
- ],
14
- "main": "generators/index.js",
15
- "keywords": [
16
- "",
17
- "yeoman-generator"
18
- ],
19
- "devDependencies": {
20
- "@types/chai": "^4.0.0",
21
- "@types/mocha": "^8.0.0",
22
- "chai": "^4.2.0",
23
- "coveralls": "^3.0.7",
24
- "ehrcraft-form-api": "^1.0.0",
25
- "eslint": "^7.0.0",
26
- "eslint-config-prettier": "^7.0.0",
27
- "eslint-plugin-prettier": "^3.1.1",
28
- "husky": "^4.0.0",
29
- "jest": "^26.0.0",
30
- "lint-staged": "^10.0.0",
31
- "mocha": "^8.2.1",
32
- "prettier": "^2.0.0",
33
- "ts-mockito": "^2.6.1",
34
- "yeoman-assert": "^3.1.0",
35
- "yeoman-test": "^4.0.0"
36
- },
37
- "engines": {
38
- "npm": ">= 4.0.0"
39
- },
40
- "dependencies": {
41
- "chalk": "^4.0.0",
42
- "loadash": "^1.0.0",
43
- "lodash": "^4.17.20",
44
- "yeoman-generator": "^4.0.0",
45
- "yosay": "^2.0.1"
46
- },
47
- "jest": {
48
- "testEnvironment": "node"
49
- },
50
- "lint-staged": {
51
- "*.js": [
52
- "eslint --fix",
53
- "git add"
54
- ],
55
- "*.json": [
56
- "prettier --write",
57
- "git add"
58
- ]
59
- },
60
- "husky": {
61
- "hooks": {
62
- "pre-commit": "lint-staged"
63
- }
64
- },
65
- "eslintConfig": {
66
- "extends": [
67
- "xo",
68
- "prettier"
69
- ],
70
- "env": {
71
- "jest": true,
72
- "node": true
73
- },
74
- "rules": {
75
- "prettier/prettier": "error"
76
- },
77
- "plugins": [
78
- "prettier"
79
- ]
80
- },
81
- "scripts": {
82
- "pretest": "eslint .",
83
- "test": "jest"
84
- },
85
- "repository": "ehrforce/generator-ehrcraft-script",
86
- "license": "MIT"
87
- }
1
+ {
2
+ "name": "generator-ehrcraft-script",
3
+ "version": "1.1.0",
4
+ "description": "A code generator for DIPS Forms typescript",
5
+ "homepage": "https://dev.azure.com/dips/DIPS%20Configured%20Products/_git/generator-ehrcraft-script",
6
+ "author": {
7
+ "name": "Bjørn Næss",
8
+ "email": "bna@dips.no",
9
+ "url": "https://dev.azure.com/dips/DIPS%20Configured%20Products/_git/generator-ehrcraft-script"
10
+ },
11
+ "files": [
12
+ "generators"
13
+ ],
14
+ "main": "generators/index.js",
15
+ "keywords": [
16
+ "",
17
+ "yeoman-generator"
18
+ ],
19
+ "devDependencies": {
20
+ "@types/chai": "^4.0.0",
21
+ "@types/mocha": "^8.0.0",
22
+ "chai": "^4.2.0",
23
+ "coveralls": "^3.0.7",
24
+ "ehrcraft-form-api": "^1.0.0",
25
+ "eslint": "^7.0.0",
26
+ "eslint-config-prettier": "^7.0.0",
27
+ "eslint-plugin-prettier": "^3.1.1",
28
+ "husky": "^4.0.0",
29
+ "jest": "^26.0.0",
30
+ "lint-staged": "^10.0.0",
31
+ "mocha": "^8.2.1",
32
+ "prettier": "^2.0.0",
33
+ "ts-mockito": "^2.6.1",
34
+ "yeoman-assert": "^3.1.0",
35
+ "yeoman-test": "^4.0.0"
36
+ },
37
+ "engines": {
38
+ "npm": ">= 4.0.0"
39
+ },
40
+ "dependencies": {
41
+ "chalk": "^4.0.0",
42
+ "loadash": "^1.0.0",
43
+ "lodash": "^4.17.20",
44
+ "yeoman-generator": "^4.0.0",
45
+ "yosay": "^2.0.1"
46
+ },
47
+ "jest": {
48
+ "testEnvironment": "node"
49
+ },
50
+ "lint-staged": {
51
+ "*.js": [
52
+ "eslint --fix",
53
+ "git add"
54
+ ],
55
+ "*.json": [
56
+ "prettier --write",
57
+ "git add"
58
+ ]
59
+ },
60
+ "husky": {
61
+ "hooks": {
62
+ "pre-commit": "lint-staged"
63
+ }
64
+ },
65
+ "eslintConfig": {
66
+ "extends": [
67
+ "xo",
68
+ "prettier"
69
+ ],
70
+ "env": {
71
+ "jest": true,
72
+ "node": true
73
+ },
74
+ "rules": {
75
+ "prettier/prettier": "error"
76
+ },
77
+ "plugins": [
78
+ "prettier"
79
+ ]
80
+ },
81
+ "scripts": {
82
+ "pretest": "eslint .",
83
+ "test": "jest"
84
+ },
85
+ "repository": "ehrforce/generator-ehrcraft-script",
86
+ "license": "MIT"
87
+ }