EFS-1285 update jsonpath version

babel.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', {
+      targets: {
+        node: '20.13.1' // Your specific Node version
+      },
+      modules: 'commonjs' // Explicitly set to CommonJS
+    }]
+  ]
+};

package.json

@@ -13,6 +13,7 @@
     "dev": "NODE_ENV=development nodemon src/index.js;",
     "dev_debug": "NODE_ENV=development DEBUG=express:router node src/index.js;",
     "test": "NODE_ENV=test npm run lint && npm run test:jest",
+    "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
     "test:mem_leak": "NODE_ENV=test node --inspect-brk --expose-gc ./node_modules/.bin/jest --runInBand --logHeapUsage -i src/tests/performance/search_by_id_many/search_by_id_many.csv.test.js",
     "coverage": "NODE_ENV=test npm run lint && npm run test:jest_coverage",
     "test_shards": "NODE_ENV=test npm run lint && npm run test:jest_cleanCache && npm run test:jest_shard1 && npm run test:jest_shard2 && npm run test:jest_shard3 && npm run test:jest_shard4 && npm run test:jest_shard5",
@@ -83,7 +84,18 @@
     ],
     "testTimeout": 60000,
     "workerIdleMemoryLimit": "8MB",
-    "injectGlobals": false
+    "injectGlobals": false,
+    "transform": {
+      "^.+\\.js$": [
+        "babel-jest",
+        {
+          "configFile": "./babel.config.js"
+        }
+      ]
+    },
+    "transformIgnorePatterns": [
+      "node_modules/(?!(@kubernetes/client-node|openid-client|openid-client|jose|oauth4webapi)/)"
+    ]
   },
   "graphql-schema-linter": {
     "rules": [
@@ -113,6 +125,7 @@
     "@asymmetrik/sof-scope-checker": "^1.0.7",
     "@aws-sdk/client-s3": "^3.592.0",
     "@aws-sdk/lib-storage": "^3.609.0",
+    "@babel/preset-env": "^7.26.9",
     "@eslint/js": "^9.3.0",
     "@godaddy/terminus": "^4.12.1",
     "@graphql-tools/graphql-file-loader": "^8.0.1",
@@ -121,7 +134,7 @@
     "@json2csv/node": "^7.0.6",
     "@json2csv/plainjs": "^7.0.6",
     "@json2csv/transforms": "^7.0.6",
-    "@kubernetes/client-node": "1.0.0-rc7",
+    "@kubernetes/client-node": "1.0.0",
     "@mongodb-js/zstd": "^1.2.0",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-metrics-otlp-grpc": "^0.51.1",
@@ -184,9 +197,10 @@
     "zlib": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.6",
+    "@babel/core": "^7.26.9",
     "@graphql-eslint/eslint-plugin": "^3.20.1",
     "@jest/globals": "^29.7.0",
+    "babel-jest": "^29.7.0",
     "csv42": "^5.0.0",
     "dotenv": "^16.4.5",
     "eslint": "^9.3.0",

src/graphqlv2/resolvers/scalars/decimal.js

@@ -1,7 +1,7 @@
 const { GraphQLScalarType, Kind } = require('graphql');
 
 // https://www.hl7.org/fhir/r4b/datatypes.html#decimal
-DECIMAL_REGEX = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
+const DECIMAL_REGEX = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
 
 const decimalScalar = new GraphQLScalarType({
     name: 'Decimal',

src/tests/bugs/update_patient_with_source_id/update_patient_with_source_id.test.js

@@ -24,7 +24,7 @@ describe('Patient with source id update test', () => {
         const request = await createTestRequest();
         // ARRANGE
         // add the resources to FHIR server
-        resp = await request
+        let resp = await request
             .post('/4_0_0/Patient/1/$merge?validate=true')
             .send(patient1Resource)
             .set(getHeaders());

src/tests/graphql/subscription/subscription.test.js

@@ -390,7 +390,7 @@ describe('GraphQL Subscription Tests', () => {
             };
 
             const headers = getHeadersWithCustomPayload(person_payload)
-            resp = await request
+            let resp = await request
                 .get('/4_0_0/Subscription/subscription4')
                 .set(headers)
                 .expect(404)

src/tests/graphql/v2Fields/v2Fields.test.js

@@ -35,7 +35,7 @@ describe('GraphQL v2 field test', () => {
         const request = await createTestRequest();
         // ARRANGE
         // add the resources to FHIR server
-        resp = await request
+        let resp = await request
             .post('/4_0_0/MedicationStatement/$merge')
             .send(medicationStatementResource)
             .set(getHeaders());

src/tests/graphqlv2/carePlan/graphql.carePlans.test.js

@@ -143,7 +143,7 @@ describe('GraphQL CarePlan Tests', () => {
             // noinspection JSUnresolvedFunction
             expect(resp).toHaveResponse(expectedCarePlanBundle3Resource);
 
-            GRAPHQL_FETCH_RESOURCE_BATCH_SIZE = envValue;
+            env.GRAPHQL_FETCH_RESOURCE_BATCH_SIZE = envValue;
         });
     });
 });

src/tests/graphqlv2/contained/graphql.contained.test.js

@@ -30,7 +30,7 @@ describe('GraphQL Contained Field Tests', () => {
         const request = await createTestRequest();
         const graphqlQueryText = conditionContainedQuery.replace(/\\n/g, '');
 
-        resp = await request
+        let resp = await request
             .post('/4_0_0/Condition/1/$merge')
             .send(conditionResourceWithContained)
             .set(getHeaders());

src/tests/graphqlv2/documentReference/graphql.documentReference.test.js

@@ -44,7 +44,7 @@ describe('GraphQL DocumentReference Tests', () => {
         const request = await createTestRequest();
         let graphqlQueryText = documentReferenceWithBinaryQuery.replace(/\\n/g, '');
 
-        resp = await request.post('/4_0_0/Binary/1/$merge').send(binary1Resource).set(getHeaders());
+        let resp = await request.post('/4_0_0/Binary/1/$merge').send(binary1Resource).set(getHeaders());
         // noinspection JSUnresolvedFunction
         expect(resp).toHaveMergeResponse({ created: true });
 
@@ -99,7 +99,7 @@ describe('GraphQL DocumentReference Tests', () => {
         const request = await createTestRequest();
         let graphqlQueryText = documentReferenceWithBinaryQuery.replace(/\\n/g, '');
 
-        resp = await request
+        let resp = await request
             .post('/4_0_0/Patient/1/$merge')
             .send(patient1Resource)
             .set(getHeaders());

src/tests/graphqlv2/entities/entities.test.js

@@ -32,7 +32,7 @@ describe('GraphQL entities Tests', () => {
         const request = await createTestRequest();
         const entitiesQueryText = entitiesQuery.replace(/\\n/g, '');
 
-        resp = await request
+        let resp = await request
             .post('/4_0_0/Patient/1/$merge')
             .send(patientBundleResource)
             .set(getHeaders());
@@ -106,7 +106,7 @@ describe('GraphQL entities Tests', () => {
         const request = await createTestRequest();
         const entitiesQueryText = entitiesQuery.replace(/\\n/g, '');
 
-        resp = await request
+        let resp = await request
             .post('/4_0_0/Patient/1/$merge')
             .send(patientBundleResource)
             .set(getHeaders());

src/tests/history/auditEvent/auditEventHistory.test.js

@@ -32,7 +32,7 @@ describe('AuditEvent History Collection Tests', () => {
 
         // ARRANGE
         // add the resources to FHIR server
-        resp = await request
+        let resp = await request
             .post('/4_0_0/AuditEvent/1/$merge?validate=true')
             .send(auditevent1Resource)
             .set(getHeaders());

src/tests/patient/search_by_missing/patient.search_by_missing.test.js

@@ -25,7 +25,7 @@ describe('Search By Missing Fields', () => {
         test('search by birthdate field not present', async () => {
             const request = await createTestRequest();
 
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Patient/$merge')
                 .send(patient1Resource)
                 .set(getHeaders());
@@ -52,7 +52,7 @@ describe('Search By Missing Fields', () => {
         test('search by birthdate present', async () => {
             const request = await createTestRequest();
 
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Patient/$merge')
                 .send(patient1Resource)
                 .set(getHeaders());

src/tests/searchParameters/search_by_text/search_by_text.test.js

@@ -78,7 +78,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication4Resource)
                 .set(getHeaders());
@@ -106,7 +106,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication3Resource)
                 .set(getHeaders());
@@ -127,7 +127,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication3Resource)
                 .set(getHeaders());
@@ -147,7 +147,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication3Resource)
                 .set(getHeaders());
@@ -169,7 +169,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Composition/$merge?validate=true')
                 .send(compositionResource1)
                 .set(getHeaders());
@@ -189,7 +189,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Composition/$merge?validate=true')
                 .send(compositionResource1)
                 .set(getHeaders());
@@ -213,7 +213,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication4Resource)
                 .set(getHeaders());
@@ -234,7 +234,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication4Resource)
                 .set(getHeaders());
@@ -262,7 +262,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication4Resource)
                 .set(getHeaders());
@@ -284,7 +284,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication3Resource)
                 .set(getHeaders());
@@ -304,7 +304,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication4Resource)
                 .set(getHeaders());
@@ -327,7 +327,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication4Resource)
                 .set(getHeaders());
@@ -347,7 +347,7 @@ describe('Search By Text', () => {
             const request = await createTestRequest();
             // ARRANGE
             // add the resources to FHIR server
-            resp = await request
+            let resp = await request
                 .post('/4_0_0/Medication/$merge?validate=true')
                 .send(medication4Resource)
                 .set(getHeaders());

src/utils/k8sClient.js

@@ -1,5 +1,6 @@
 const env = require('var');
-const k8s = require('@kubernetes/client-node');
+//const k8s = require('@kubernetes/client-node');
+const k8s = import('@kubernetes/client-node');
 const { assertTypeEquals } = require('./assertType');
 const { ConfigManager } = require('./configManager');
 const { logError, logInfo } = require('../operations/common/logging');