Merge pull request #3 from mcode/main

merge main to dev

.eslintrc.json

@@ -5,22 +5,25 @@
         "es6": true,
         "jest": true
     },
-    "extends": [
-        "airbnb-base"
-    ],
     "globals": {
         "Atomics": "readonly",
         "SharedArrayBuffer": "readonly"
     },
-    "parserOptions": {
-        "ecmaVersion": 2018
-    },
-    "rules": {
+    "extends": [
+        "prettier"
+      ],
+      "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "module"
+      },
+      "rules": {
+        "semi": ["error", "always"],
+        "quotes": ["error", "single", { "avoidEscape": true }],
         "class-methods-use-this": "off",
         "no-console": "off",
         "max-len": ["error", { "code": 200 }],
         "object-curly-newline": ["error", {
-            "ObjectPattern": { "minProperties": 5 }
+            "ObjectPattern": { "minProperties": 10 }
         }],
         "no-underscore-dangle":  ["error", { "allow": ["__get__", "__set__"] }]
     }

.github/workflows/ci-workflow.yml

@@ -0,0 +1,36 @@
+name: Lint and Test
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    name: Check tsc, lint, and prettier
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '16.x'
+    - run: npm install
+    - run: npm run lint
+    - run: npm run prettier
+      env:
+        CI: true
+  test:
+    name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [16]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - run: npm test
+      env:
+        CI: true

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "trailingComma": "none",
+  "arrowParens": "avoid",
+  "endOfLine": "auto",
+  "printWidth": 100,
+  "tabWidth": 2,
+  "singleQuote": true
+}

README.md

@@ -33,14 +33,18 @@ The cql parameter to the convert method may be of one of the following types:
  }}`
 
 ### Command line 
+```
 Usage: cli [options]
 
 Options:
   -f --file <path>     Path to cql file to translate
   -o, --output <path>  Output directory for generated resources (default: "output")
-  -u --url <url>       Specify url to cql-translation-service: (default: "http://localhost:3000")
+  -u, --url <url>      Specify url to cql-translation-service: (default: "http://localhost:3000")
+  -i, --id <id>        Specify the id of the output fhir library (default: cql library name or id of specified library)
+  -l, --lib <path>     Specify the library to embed the CQL/ELM
+  -d, --depends <path> Path to the CQL dependency files
   -h, --help           display help for command
-
+```
 
 Example usage: