Skip to content

Commit

Permalink
Code cleanup, bundle extension, fix test execution
Browse files Browse the repository at this point in the history
  • Loading branch information
JPercival committed Dec 2, 2022
1 parent 02c8e44 commit 582e261
Show file tree
Hide file tree
Showing 27 changed files with 3,846 additions and 3,295 deletions.
9 changes: 0 additions & 9 deletions .editorconfig

This file was deleted.

19 changes: 19 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module.exports = {
ignorePatterns: ['**/*.d.ts', '**/*.test.ts', '**/*.js'],
parser: '@typescript-eslint/parser',
extends: ['plugin:@typescript-eslint/recommended'],
plugins: ['header'],
parserOptions: {
ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
sourceType: 'module', // Allows for the use of imports
},
rules: {
'@typescript-eslint/no-use-before-define': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-namespace': 'off',
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
// e.g. "@typescript-eslint/explicit-function-return-type": "off",
},
};
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ server
*.vsix
target
dist
bin
bin
.vscode-test
4 changes: 3 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"streetsidesoftware.code-spell-checker",
"streetsidesoftware.code-spell-checker-medical-terms",
"streetsidesoftware.code-spell-checker-scientific-terms",
"sonarsource.sonarlint-vscode"
"sonarsource.sonarlint-vscode",
"esbenp.prettier-vscode",
"connor4312.esbuild-problem-matchers"
],
"unwantedRecommendations": [
"ms-vscode.vscode-typescript-tslint-plugin",
Expand Down
50 changes: 23 additions & 27 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,28 @@


// A launch configuration that compiles the extension and then opens it inside a new window
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.2.0",
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "npm: watch"
},
{
"name": "Run Extension Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
],
"outFiles": ["${workspaceFolder}/dist/test/**/*.js"],
"preLaunchTask": "npm: watch"
}
]
}
"version": "0.2.0",
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "npm: watch"
},
{
"name": "Extension Tests",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/dist/test/suite/index"
],
"outFiles": ["${workspaceFolder}/dist/test/**/*.js"],
"preLaunchTask": "npm: pretest"
}
]
}
10 changes: 8 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@
"jdwp",
"jvms",
"LOCALAPPDATA",
"outfile",
"preinstall",
"reimplementation",
"Runtimes",
"vscodesws"
],
"debug.javascript.autoAttachFilter": "smart"
}
"debug.javascript.autoAttachFilter": "smart",
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.organizeImports": true
}
}
36 changes: 19 additions & 17 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "watch",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"reveal": "never"
},
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "watch",
"group": "build",
"problemMatcher": "$esbuild-watch",
"isBackground": true,
"label": "npm: watch"
},
{
"type": "npm",
"script": "pretest",
"group": "build",
"problemMatcher": "$esbuild",
"label": "npm: pretest"
}
]
}
6 changes: 2 additions & 4 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
.vscode
src/
# node_modules
node_modules
*.vsix
.gitignore
tsconfig.json
dist/jars
dist/test
**/*.js.map
out
.vscode-test
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ The Clinical Quality Language (CQL) is a domain specific language for expressing
electronic clinical quality measures (eCQM) and clinical decision support rules
(CDS) in an author-friendly computable format. Find out more about CQL:

* [CQL Specification](http://cql.hl7.org)
* [CQL Stream on FHIR Zulip Chat](https://chat.fhir.org/#narrow/stream/179220-cql)
* [clinical_quality_language on GitHub](https://github.com/cqframework/clinical_quality_language)
* [Clinical Quality Expression Language at HL7](http://www.hl7.org/special/Committees/projman/searchableProjectIndex.cfm?action=view&ProjectNumber=1108)
* [Clinical Quality Framework (CQF)](https://confluence.hl7.org/display/CQIWC/Clinical+Quality+Framework)
- [CQL Specification](http://cql.hl7.org)
- [CQL Stream on FHIR Zulip Chat](https://chat.fhir.org/#narrow/stream/179220-cql)
- [clinical_quality_language on GitHub](https://github.com/cqframework/clinical_quality_language)
- [Clinical Quality Expression Language at HL7](http://www.hl7.org/special/Committees/projman/searchableProjectIndex.cfm?action=view&ProjectNumber=1108)
- [Clinical Quality Framework (CQF)](https://confluence.hl7.org/display/CQIWC/Clinical+Quality+Framework)

## Getting Help

Expand All @@ -30,10 +30,10 @@ Inquires for commercial support can be directed to [[email protected]](info@alpho

## Related Projects

* [atom_cql_support](https://github.com/cqframework/atom_cql_support) - CQL Support for the Atom editor.
* [cql-language-server](https://github.com/DBCG/cql-language-server) - The Java and Language Server Protocol based server that powers this extension.
* [cql-translator](https://github.com/cqframework/clinical_quality_language/tree/master/Src/java/cql-to-elm) - The ELM generation component used in this project.
* [cql-engine](https://github.com/DBCG/cql_engine) - The Java CQL runtime environment used in the extension.
- [atom_cql_support](https://github.com/cqframework/atom_cql_support) - CQL Support for the Atom editor.
- [cql-language-server](https://github.com/DBCG/cql-language-server) - The Java and Language Server Protocol based server that powers this extension.
- [cql-translator](https://github.com/cqframework/clinical_quality_language/tree/master/Src/java/cql-to-elm) - The ELM generation component used in this project.
- [cql-engine](https://github.com/DBCG/cql_engine) - The Java CQL runtime environment used in the extension.

## Local Plugin Development

Expand All @@ -53,6 +53,7 @@ On linux:
Set your repo home directory and update the versions as needed.

## Versioning

This project follows the guidance given by Microsoft for the VS Code marketplace [here](https://code.visualstudio.com/updates/v1_63#_publishing-prerelease-extensions) and publishes prereleases to the VS Code marketplace using odd minor version numbers. Full releases are published using even minor version numbers.

## Acknowledgements
Expand Down
Loading

0 comments on commit 582e261

Please sign in to comment.