Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency and rename to bluehalo #361

Merged
merged 11 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .eslintignore

This file was deleted.

70 changes: 0 additions & 70 deletions .eslintrc

This file was deleted.

4 changes: 3 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
node_modules
**/node_modules/**
**/dist/**
**/__tmp__/**
lerna.json
coverage/
coverage/
**/resources/**
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# BlueHalo FHIR API Server
# Bluehalo FHIR API Server

> A Secure Rest implementation for the [HL7 FHIR Specification](https://www.hl7.org/fhir/). For API documentation, please see [our documents](https://github.com/bluehalo/node-fhir-server-core/tree/master/docs).

Expand All @@ -10,7 +10,7 @@ The framework defines a core server, `node-fhir-server-core`, a simple, secure N

For an example implementation using MongoDB, please refer to our Github repository that we used for the ONC FHIR Secure API Server Showdown Challenge: [https://github.com/bluehalo/node-fhir-server-mongo](https://github.com/bluehalo/node-fhir-server-mongo).

<img src="https://www.asymmetrik.com/wp-content/uploads/2018/01/FHIR-Server-Architecture_Update.png" width="800">
<img src="https://www.bluehalo.com/wp-content/uploads/2018/01/FHIR-Server-Architecture_Update.png" width="800" alt="">

## [email protected]

Expand Down
10 changes: 0 additions & 10 deletions babel.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,5 @@
}
]
],
"build": {
"ignore": [
"**/*.test.ts",
"**/*.test.ts",
"**/*.story.tsx",
"__snapshots__",
"__tests__",
"__stories__"
]
},
"ignore": ["node_modules"]
}
2 changes: 1 addition & 1 deletion docs/MIGRATION_2.0.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ module.exports.search = async (args, context) => {
.map((result) => new Observation(result));
let entries = Array.prototype.concat(
patients.map((patient) => new BundleEntry({ resource: patient })),
observations.map((observation) => new BundleEntry({ resource: observation }))
observations.map((observation) => new BundleEntry({ resource: observation })),
);
return new Bundle({ entry: entries });
};
Expand Down
94 changes: 94 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
const globals = require('globals');
const js = require('@eslint/js');
const { FlatCompat } = require('@eslint/eslintrc');

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

module.exports = [
...compat.extends('eslint:recommended', 'prettier'),
{
ignores: [
'eslint.config.js',
'coverage/**',
'node_modules/**',
'**/node_modules/**',
'**/dist/**/*',
'**/__tmp__/**/*',
'lerna.json',
'**/resources/**',
],
},
{
languageOptions: {
globals: {
...globals.browser,
...globals.jest,
...globals.node,
},
ecmaVersion: 8,
sourceType: 'commonjs',
},

rules: {
'no-mixed-spaces-and-tabs': [0, 'smart-tabs'],
quotes: [2, 'single', 'avoid-escape'],
'no-compare-neg-zero': 0,
'no-console': 0,
'no-debugger': 2,
'no-array-constructor': 2,
'no-caller': 2,
'no-catch-shadow': 2,
'no-eval': 2,
'no-extend-native': 2,
'no-extra-bind': 2,
'no-implied-eval': 2,
'no-irregular-whitespace': [2, { skipComments: true }],
'no-iterator': 2,
'no-label-var': 2,
'no-labels': 2,
'no-lone-blocks': 2,
'no-loop-func': 2,
'no-multi-spaces': 2,
'no-multi-str': 2,
'no-native-reassign': 2,
'no-new': 2,
'no-new-func': 2,
'no-new-object': 2,
'no-new-wrappers': 2,
'no-octal-escape': 2,
'no-proto': 2,
'no-return-assign': 2,
'no-script-url': 2,
'no-sequences': 2,
'no-shadow': 0,
'no-shadow-restricted-names': 2,
'no-spaced-func': 2,
'no-trailing-spaces': 2,
'no-undef-init': 2,
'no-unused-expressions': 2,
'no-unused-vars': 'off',
'no-use-before-define': 2,
'no-useless-escape': 0,
'no-with': 2,
'comma-spacing': 2,
curly: [2, 'all'],
'dot-notation': [2, { allowKeywords: true }],
'eol-last': 2,
'no-extra-parens': [2, 'functions'],
eqeqeq: 2,
'key-spacing': [2, { beforeColon: false, afterColon: true }],
'new-cap': 2,
'new-parens': 2,
semi: 2,
'semi-spacing': [2, { before: false, after: true }],
'space-infix-ops': 2,
'keyword-spacing': 2,
'space-unary-ops': [2, { words: true, nonwords: false }],
yoda: [2, 'never'],
},
},
];
8 changes: 0 additions & 8 deletions jest.config.js

This file was deleted.

16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "node-fhir-server-core-project",
"private": true,
"version": "2.0.11",
"version": "2.1.0",
"description": "Node FHIR Rest API Server and surrounding ecosystem",
"homepage": "https://github.com/bluehalo/node-fhir-server-core#readme",
"bugs": {
Expand All @@ -12,7 +12,7 @@
"url": "git+https://github.com/bluehalo/node-fhir-server-core.git"
},
"license": "MIT",
"author": "BlueHalo",
"author": "Bluehalo",
"contributors": [
"Robert Winterbottom <[email protected]>",
"Jon Lee <[email protected]>",
Expand All @@ -27,7 +27,7 @@
"prettier-fix": "prettier --write \"**/*.{js,mjs,cjs,jsx,json,ts,tsx,md,mdx,css,html,yml,yaml,scss,less,graphql,graphqls,gql}\"",
"lint": "run-p prettier-check lint-eslint",
"lint-staged": "lint-staged",
"lint-eslint": "eslint . --ext js,jsx,ts,tsx"
"lint-eslint": "eslint . '**/*.{js,jsx,ts,tsx}"
},
"jest": {
"clearMocks": true,
Expand All @@ -43,11 +43,13 @@
"verbose": true
},
"devDependencies": {
"eslint": "^8.33.0",
"jest-cli": "^29.4.1",
"lerna": "^8.0.2",
"eslint": "^9.9",
"eslint-config-prettier": "^9.1.0",
"globals": "^15.9.0",
"jest-cli": "^29.7.0",
"lerna": "^8.1.8",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.3",
"prettier": "^3.3.3",
"yarn-audit-fix": "^10.0.7"
},
"engines": {
Expand Down
7 changes: 4 additions & 3 deletions packages/fhir-gql-schema-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@bluehalo/fhir-gql-schema-utils",
"version": "1.1.5",
"version": "1.2.0",
"description": "Suite of FHIR related utilities for GraphQL schemas.",
"homepage": "https://github.com/BlueHalo/node-fhir-server-core",
"homepage": "https://github.com/Bluehalo/node-fhir-server-core",
"repository": {
"type": "git",
"directory": "packages/fhir-gql-schema-utils"
Expand All @@ -14,7 +14,8 @@
"test": "jest"
},
"devDependencies": {
"graphql": "^15.6.0"
"graphql": "^16.9.0",
"jest": "^29.7.0"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 0 additions & 8 deletions packages/fhir-gql-schema-utils/yarn.lock

This file was deleted.

5 changes: 4 additions & 1 deletion packages/fhir-json-schema-validator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bluehalo/fhir-json-schema-validator",
"version": "0.9.9",
"version": "0.10.0",
"description": "FHIR json schema validator",
"homepage": "https://github.com/BlueHalo/node-fhir-server-core",
"repository": {
Expand Down Expand Up @@ -29,6 +29,9 @@
"dependencies": {
"ajv": "^6.12.6"
},
"devDependencies": {
"jest": "^29.7.0"
},
"publishConfig": {
"access": "public"
},
Expand Down
40 changes: 0 additions & 40 deletions packages/fhir-json-schema-validator/yarn.lock

This file was deleted.

2 changes: 1 addition & 1 deletion packages/fhir-qb-mongo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ let buildEndsWithQuery = function ({ field, value, caseSensitive = false }) {
let applySearchResultTransformations = function ({ query, searchResultTransformations }) {
Object.keys(searchResultTransformations).forEach((transformation) => {
query.push(
supportedSearchTransformations[transformation](searchResultTransformations[transformation])
supportedSearchTransformations[transformation](searchResultTransformations[transformation]),
);
});
return query;
Expand Down
2 changes: 1 addition & 1 deletion packages/fhir-qb-mongo/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ describe('Mongo Query Builder Tests', () => {
error = err;
}
expect(error.message).toContain(
"Missing required implementation parameter 'archivedParamPath'"
"Missing required implementation parameter 'archivedParamPath'",
);
});
test('Should return input query as is if we are not filtering out archived results', () => {
Expand Down
Loading
Loading