Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 7 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,10 @@ or
mocha test-basic -timeout 0 -g 'test bindParam with qualifier'

There are also tests in the `test-complete` folder. The setup for these is more complicated and can
be found in the `Jenkinsfile` file in this repository in the `runE2ETests` function.
be found in the `Jenkinsfile` file in this repository in the `runE2ETests` function.

## Notes on dependencies in package.json

We are using @fastify/busboy because it has a forked copy of dicer that apparently does not
have the same high security vulnerability that the 0.3.1 release of dicer has.

3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ pipeline {
runAuditReport()
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
runTests()
runE2ETests()
// Commenting this out temporarily for faster PR feedback.
// runE2ETests()
}
post {
always {
Expand Down
32 changes: 1 addition & 31 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MarkLogic® Node Client API
MarkLogic® Node Client API

Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

Expand All @@ -23,9 +23,7 @@ Third Party Components
@fastify/busboy 1.2.1 (MIT)
big-integer 1.6.52 (Public Domain)
concat-stream 2.0.0 (MIT)
deepcopy 2.1.0 (MIT)
duplexify 4.1.3 (MIT)
eslint 8.57.1 (MIT)
form-data 4.0.1 (MIT)
json-text-sequence 1.0.1 (MIT)
Kerberos 2.2.1 (Apache-2.0)
Expand Down Expand Up @@ -90,22 +88,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

************************************************************

deepcopy 2.1.0 (MIT)

https://www.npmjs.com/package/deepcopy

The MIT LICENSE)

Copyright (c) 2013 sasa+1 <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

************************************************************

duplexify 4.1.3 (MIT)

https://www.npmjs.com/package/duplexify
Expand All @@ -122,18 +104,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

************************************************************

eslint 8.57.1 (MIT)

Copyright OpenJS Foundation and other contributors, <www.openjsf.org>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

************************************************************

form-data 4.0.1 (MIT)

https://www.npmjs.com/package/form-data
Expand Down
5 changes: 2 additions & 3 deletions lib/query-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
'use strict';
var util = require("util");
var deepcopy = require('deepcopy');

var mlutil = require('./mlutil.js');

Expand Down Expand Up @@ -3641,8 +3640,8 @@ function copyFromQueryBuilder(otherQueryBuilder) {
var key = clauseKeys[i];
var value = other[key];
if (value != null) {
// deepcopy instead of clone to avoid preserving prototype
qb[key] = isString ? value : deepcopy(value);
// structuredClone instead of clone to avoid preserving prototype
qb[key] = isString ? value : structuredClone(value);
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions lib/values-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
'use strict';
var deepcopy = require('deepcopy');


var mlutil = require('./mlutil.js');
Expand Down Expand Up @@ -409,8 +408,8 @@ function copyFromValueBuilder(otherValueBuilder) {
var key = clauseKeys[i];
var value = other[key];
if (value != null) {
// deepcopy instead of clone to avoid preserving prototype
tb[key] = isString ? value : deepcopy(value);
// structuredClone instead of clone to avoid preserving prototype
tb[key] = isString ? value : structuredClone(value);
}
}
}
Expand Down
Loading