From 01586dc7b047ce90c68ad9ca6d69ad78af7d8c1e Mon Sep 17 00:00:00 2001 From: asinha Date: Tue, 19 Aug 2025 13:53:54 -0700 Subject: [PATCH 01/58] MLE-23575 : Security vulnerability detected in Node Client - https://github.com/advisories/GHSA-52f5-9888-hmc6 --- package-lock.json | 100 ++++++++++++++++------------------------------ package.json | 3 +- 2 files changed, 37 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index bfa4c179..40d7d9ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -73,12 +73,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", - "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz", + "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==", "dev": true, "dependencies": { - "@babel/types": "^7.28.0" + "@babel/types": "^7.28.2" }, "bin": { "parser": "bin/babel-parser.js" @@ -276,9 +276,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", + "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", "engines": { "node": ">=12" }, @@ -716,9 +716,9 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/bare-events": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.0.tgz", - "integrity": "sha512-EKZ5BTXYExaNqi3I3f9RtEsaI/xBSGjE0XZCZilPzFAV/goswFHuPd9jEZlPIZ/iNZJwDSao9qRiScySz7MbQg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.1.tgz", + "integrity": "sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==", "optional": true }, "node_modules/base64-js": { @@ -5270,28 +5270,12 @@ } }, "node_modules/tmp": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", + "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", "dev": true, - "dependencies": { - "rimraf": "^2.6.3" - }, "engines": { - "node": ">=6" - } - }, - "node_modules/tmp/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" + "node": ">=14.14" } }, "node_modules/to-regex-range": { @@ -5720,9 +5704,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", + "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", "engines": { "node": ">=12" }, @@ -5902,12 +5886,12 @@ "dev": true }, "@babel/parser": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", - "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz", + "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==", "dev": true, "requires": { - "@babel/types": "^7.28.0" + "@babel/types": "^7.28.2" } }, "@babel/types": { @@ -6046,9 +6030,9 @@ }, "dependencies": { "ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", + "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==" }, "emoji-regex": { "version": "9.2.2", @@ -6376,9 +6360,9 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "bare-events": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.0.tgz", - "integrity": "sha512-EKZ5BTXYExaNqi3I3f9RtEsaI/xBSGjE0XZCZilPzFAV/goswFHuPd9jEZlPIZ/iNZJwDSao9qRiScySz7MbQg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.1.tgz", + "integrity": "sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==", "optional": true }, "base64-js": { @@ -7600,7 +7584,7 @@ "ink-docstrap": "^1.3.2", "jsdoc": "4.0.0", "map-stream": "0.0.7", - "tmp": "0.1.0" + "tmp": "0.2.4" } }, "gulp-jshint": { @@ -9766,24 +9750,10 @@ "dev": true }, "tmp": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", - "dev": true, - "requires": { - "rimraf": "^2.6.3" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "10.3.11" - } - } - } + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", + "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", + "dev": true }, "to-regex-range": { "version": "5.0.1", @@ -10102,9 +10072,9 @@ }, "dependencies": { "ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", + "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==" }, "ansi-styles": { "version": "6.2.1", diff --git a/package.json b/package.json index 497ab934..e4ba353f 100644 --- a/package.json +++ b/package.json @@ -89,6 +89,7 @@ "simple-get": "4.0.1", "semver": "7.5.3", "serialize-javascript": "6.0.2", - "tar-fs": "2.1.3" + "tar-fs": "2.1.3", + "tmp": "0.2.4" } } From cb0120353e25f3db5ea0a14f4ca100fe55e1ac8b Mon Sep 17 00:00:00 2001 From: asinha Date: Wed, 20 Aug 2025 15:47:26 -0700 Subject: [PATCH 02/58] MLE-23607 : Node Client Sparql test fails for 12-nightly on Jenkins --- test-complete/nodejs-optic-from-sparql.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test-complete/nodejs-optic-from-sparql.js b/test-complete/nodejs-optic-from-sparql.js index 5b8a184b..ca4d2c5a 100644 --- a/test-complete/nodejs-optic-from-sparql.js +++ b/test-complete/nodejs-optic-from-sparql.js @@ -314,13 +314,11 @@ describe('Nodejs Optic from sparql test', function () { db.rows.explain(output, 'json') .then(function (output) { expect(output.node).to.equal('plan'); - if (serverConfiguration.serverVersion >= 11) { - expect(output.expr.expr.from['default-graph'][0].value).to.equal('/optic/sparql/test/companies.ttl'); - } else { - expect(output.expr.from['default-graph'][0].value).to.equal('/optic/sparql/test/companies.ttl'); - } + const defaultGraph = (serverConfiguration.serverVersion >= 12)?output.expr.expr.from['default-graph'][0]: + ((serverConfiguration.serverVersion >= 11)?output.expr.expr.from['default-graph'][0].value:output.expr.from['default-graph'][0].value); + expect(defaultGraph).to.equal('/optic/sparql/test/companies.ttl'); done(); - }, done).catch(error => done(error)); + }).catch(error => done(error)); }); it('TEST 16 - negative case', function (done) { From 1cdebb1dd0e4ca965fe77ba5442ef83bc6009d84 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Mon, 15 Sep 2025 14:48:50 -0700 Subject: [PATCH 03/58] MLE-24312: map port 8017 via docker-compose. SSL service configured for port 8017. Add a second error message for test using SSL to confirm error when connecting to non-SSL REST service. Message probably changed for ML12 (not sure, but error message in test does not work). --- test-app/docker-compose-nightlies.yaml | 2 +- test-app/docker-compose.yaml | 2 +- test-basic/client.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test-app/docker-compose-nightlies.yaml b/test-app/docker-compose-nightlies.yaml index e9a70161..161a0fde 100644 --- a/test-app/docker-compose-nightlies.yaml +++ b/test-app/docker-compose-nightlies.yaml @@ -22,6 +22,6 @@ services: volumes: - ./containerLogs:/var/opt/MarkLogic/Logs ports: - - 8000-8016:8000-8016 + - 8000-8017:8000-8017 - 8024-8029:8024-8029 - 8079:8079 diff --git a/test-app/docker-compose.yaml b/test-app/docker-compose.yaml index af43e8c7..cd0181d0 100644 --- a/test-app/docker-compose.yaml +++ b/test-app/docker-compose.yaml @@ -15,4 +15,4 @@ services: - ./docker/marklogic/logs:/var/opt/MarkLogic/Logs ports: - 8000-8002:8000-8002 - - 8015-8016:8015-8016 + - 8015-8017:8015-8017 diff --git a/test-basic/client.js b/test-basic/client.js index 24236061..1edff42c 100644 --- a/test-basic/client.js +++ b/test-basic/client.js @@ -146,7 +146,8 @@ describe('database clients', function () { .result() .catch(error => { try{ - assert(error.message.toString().includes('You have attempted to access an HTTP server using HTTPS. Please check your configuration.')); + assert(error.message.toString().includes('You have attempted to access an HTTP server using HTTPS. Please check your configuration.') || + error.message.toString().includes('write EPROTO')); done(); } catch(err){ done(err); From 8c9e5ffda1c4fc2143bd45105826945404dcef71 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Fri, 19 Sep 2025 13:13:10 -0700 Subject: [PATCH 04/58] MLE-24397 - fix reported issue on Linux FIPS around exception caused by default load of FIPS-forbidden MD5 digest algorithm. Incorporate the source from the abandoned www-authenticate project and fix in place. --- lib/requester.js | 2 +- lib/www-authenticate/md5.js | 7 + lib/www-authenticate/parsers.js | 109 ++++++++++++ lib/www-authenticate/user-credentials.js | 46 +++++ lib/www-authenticate/www-authenticate.js | 218 +++++++++++++++++++++++ package-lock.json | 16 +- package.json | 3 +- test-basic/digestauth-fips-nomd5load.js | 54 ++++++ 8 files changed, 437 insertions(+), 18 deletions(-) create mode 100644 lib/www-authenticate/md5.js create mode 100644 lib/www-authenticate/parsers.js create mode 100644 lib/www-authenticate/user-credentials.js create mode 100644 lib/www-authenticate/www-authenticate.js create mode 100644 test-basic/digestauth-fips-nomd5load.js diff --git a/lib/requester.js b/lib/requester.js index 1a5668a0..bb063426 100644 --- a/lib/requester.js +++ b/lib/requester.js @@ -2,7 +2,7 @@ * Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var createAuthInitializer = require('www-authenticate'); +var createAuthInitializer = require('./www-authenticate/www-authenticate'); var Kerberos = require('./optional.js') .libraryProperty('kerberos', 'Kerberos'); var Multipart = require('multipart-stream'); diff --git a/lib/www-authenticate/md5.js b/lib/www-authenticate/md5.js new file mode 100644 index 00000000..3e6de8bf --- /dev/null +++ b/lib/www-authenticate/md5.js @@ -0,0 +1,7 @@ +var crypto= require('crypto'); + +function md5(s) { + return crypto.createHash('md5').update(s).digest('hex'); +} + +module.exports= md5; \ No newline at end of file diff --git a/lib/www-authenticate/parsers.js b/lib/www-authenticate/parsers.js new file mode 100644 index 00000000..65e2be1d --- /dev/null +++ b/lib/www-authenticate/parsers.js @@ -0,0 +1,109 @@ +var ParseAuth= /(\w+)\s+(.*)/ // -> scheme, params + , Separators= /([",=])/ + ; + +function parse_params(header) { + // This parser will definitely fail if there is more than one challenge + var tok, last_tok, _i, _len, key, value; + var state= 0; //0: token, + var m= header.split(Separators) + for (_i = 0, _len = m.length; _i < _len; _i++) { + last_tok= tok; + tok = m[_i]; + if (!tok.length) continue; + switch (state) { + case 0: // token + key= tok.trim(); + state= 1; // expect equals + continue; + case 1: // expect equals + if ('=' != tok) return 'Equal sign was expected after '+key; + state= 2; + continue; + case 2: // expect value + if ('"' == tok) { + value= ''; + state= 3; // expect quoted + continue; + } + else { + this.parms[key]= value= tok.trim(); + state= 9; // expect comma or end + continue; + } + case 3: // handling quoted string + if ('"' == tok) { + state= 8; // end quoted + continue; + } + else { + value+= tok; + state= 3; // continue accumulating quoted string + continue; + } + case 8: // end quote encountered + if ('"' == tok) { + // double quoted + value+= '"'; + state= 3; // back to quoted string + continue; + } + if (',' == tok) { + this.parms[key]= value; + state= 0; + continue; + } + else { + return 'Unexpected token ('+tok+') after '+value+'"'; + } + continue; + case 9: // expect commma + if (',' != tok) return 'Comma expected after '+value; + state= 0; + continue; + } + } + switch (state) { // terminal state + case 0: // Empty or ignoring terminal comma + case 9: // Expecting comma or end of header + return; + case 8: // Last token was end quote + this.parms[key]= value; + return; + default: + return 'Unexpected end of www-authenticate value.'; + } +} + +function Parse_WWW_Authenticate(to_parse) +{ + var m= to_parse.match(ParseAuth); + this.scheme= m[1]; + this.parms= {}; + var err= this.parse_params(m[2]); + if (err) { + this.scheme= ''; + this.parms= {}; + this.err= err; + } +} + +function Parse_Authentication_Info(to_parse) +{ + this.scheme= 'Digest'; + this.parms= {}; + var err= this.parse_params(to_parse); + if (err) { + this.scheme= ''; + this.parms= {}; + this.err= err; + } +} + +Parse_Authentication_Info.prototype.parse_params= parse_params; +Parse_WWW_Authenticate.prototype.parse_params= parse_params; + +module.exports = { + WWW_Authenticate: Parse_WWW_Authenticate, + Authentication_Info: Parse_Authentication_Info +}; diff --git a/lib/www-authenticate/user-credentials.js b/lib/www-authenticate/user-credentials.js new file mode 100644 index 00000000..25bc405d --- /dev/null +++ b/lib/www-authenticate/user-credentials.js @@ -0,0 +1,46 @@ +var md5= require('./md5'); + +/* + * Hide the password. Uses the password to form authorization strings, + * but provides no interface for exporting it. + */ +function user_credentials(username,password,options) { + if (username.is_user_credentials && + typeof username.basic === 'function' && + typeof username.digest === 'function' + ) { + return username; + } + + var basic_string= options && options.hide_basic ? + '' + : + (!password && password !== '' ? + Buffer.from(username, "ascii").toString("base64") + : + Buffer.from(username+':'+password, "ascii").toString("base64") + ) + function Credentials() + { + this.username= username; + } + Credentials.prototype.basic= function() + { + return basic_string; + } + Credentials.prototype.digest= function(realm) + { + return !password && password !== '' ? + md5(username+':'+realm) + : + md5(username+':'+realm+':'+password) + } + Credentials.prototype.is_user_credentials= function() + { + return true; + } + + return new Credentials; +} + +module.exports= user_credentials; diff --git a/lib/www-authenticate/www-authenticate.js b/lib/www-authenticate/www-authenticate.js new file mode 100644 index 00000000..f09c16ba --- /dev/null +++ b/lib/www-authenticate/www-authenticate.js @@ -0,0 +1,218 @@ +/* + * www-authenticate + * https://github.com/randymized/www-authenticate + * + * Copyright (c) 2013 Randy McLaughlin + * Licensed under the MIT license. + */ + +/* +* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ + +'use strict'; + +var crypto= require('crypto') + , parsers= require('./parsers') + , md5= require('./md5') + , user_credentials= require('./user-credentials') + , basic_challenge= { + statusCode: 401, + headers: { + 'www-authenticate': 'Basic realm="sample"' + } + } + ; + +function hex8(num) +{ + return ("00000000" + num.toString(16)).slice(-8); +} + +var www_authenticator = function(username,password,options) +{ + if (2 == arguments.length && toString.call(password) != '[object String]') { + options= password; + password= null; + } + var credentials= user_credentials(username,password) + var cnonce; + if (options) { + if (toString.call(options.cnonce) == '[object String]') + cnonce= options.cnonce; + } + if (cnonce === void 0) cnonce= crypto.pseudoRandomBytes(8).toString('hex'); + + /** + * @typedef {Object} Authenticator + * @property {any} [err] + * @property {function(string=, string=): string} [authorize] + * @property {any} [parms] + * @property {string} [cnonce] + */ + + /** + * Parses the WWW-Authenticate header. + * @param {string} www_authenticate + * @returns {Authenticator} + */ + var parse_header= function(www_authenticate) + { + function Authenticator() + { + function note_error(err) + { + this.err= err + } + var nc= 0; + + var parsed= new parsers.WWW_Authenticate(www_authenticate); + if (parsed.err) return note_error(parsed.err); + var auth_parms= this.parms= parsed.parms; + this.cnonce= cnonce; + + switch(parsed.scheme) { + case 'Basic': + var auth_string= 'Basic '+credentials.basic(); + this.authorize= function() { + return auth_string; + }; + return; + case 'Digest': + var realm= auth_parms.realm; + if (!realm) { + return note_error("Realm not found in www-authenticate header."); + } + + var ha1= + credentials.digest(realm); + var nonce= auth_parms.nonce; + if (!nonce) { + return note_error("Nonce not found in www-authenticate header."); + } + + var fixed= 'Digest username="'+credentials.username+'",'+ + ' realm="'+realm+'",'+ + ' nonce="'+nonce+'",'; + var qop= auth_parms.qop; + if (!qop) { + this.authorize= function(method,digestURI) { + var ha2= md5(method+':'+digestURI); + return fixed+ + ' uri="'+digestURI+'",'+ + ' response="'+md5(ha1+':'+nonce+':'+ha2)+'",'; + }; + return; + } + else { + var qopa= qop.split(','); + var q, x, _i, _len; + for (_i = 0, _len = qopa.length; _i < _len; _i++) { + if ('auth' === qopa[_i]) { + var opaque= auth_parms.opaque; + var algorithm= auth_parms.algorithm; + if (algorithm) { + fixed+= ' algorithm="'+algorithm+'",'; + } + else { + algorithm= 'MD5'; + } + var a1= 'MD5-sess' == algorithm ? + md5(ha1+':'+nonce+':'+cnonce) + : + ha1; + this.authorize= function(method,digestURI) { + var ha2= md5(method+':'+digestURI); + nc= nc+1; + var hexed_nc= hex8(nc); + var s= fixed+ + ' uri="'+digestURI+'",'+ + ' qop=auth,'+ + ' nc='+hexed_nc+','+ + ' cnonce="'+cnonce+'",'+ + ' response="'+md5(a1+':'+nonce+':'+hexed_nc+':'+cnonce+':auth:'+ha2)+'"'; + if (opaque) { + s+= ', opaque="'+opaque+'"'; + } + return s; + }; + return; + } + return note_error('Server does not accept any supported quality of protection techniques.'); + } + } + break; + default: + return note_error("Unknown scheme"); + } + } + + return new Authenticator(); + }; + + parse_header.authenticator= new HigherLevel(credentials,options); // deprecated + return parse_header; +}; + + +function HigherLevel(credentials,options) +{ + this.credentials= credentials + this.options= options + if (options && options.sendImmediately) { + this.sendImmediately= true; + } +} +HigherLevel.prototype.get_challenge= function(request) { + if (401 == request.statusCode && 'www-authenticate' in request.headers) { + if (!this.parse_header) { + this.parse_header= www_authenticator(this.credentials,this.options) + } + this.challenge= this.parse_header(request.headers['www-authenticate']) + return this.challenge.err; + } +} +HigherLevel.prototype._challenge= function() { + if (!this.challenge) { + if (this.sendImmediately) { + // simulate receipt of a basic challenge + this.get_challenge(basic_challenge) + return this.challenge + } + else return; // simply won't produce an 'Authorization' header + } + return this.challenge; +} +HigherLevel.prototype.authentication_string= function(method,digestURI) { + var challenge= this._challenge(); + if (!challenge) return; // simply won't produce an 'Authorization' header + if (challenge.err) return challenge.err; + return challenge.authorize(method,digestURI); +} +HigherLevel.prototype.authenticate_headers= function(headers,method,digestURI) { + var challenge= this._challenge(); + if (!challenge) return; // simply won't produce an 'Authorization' header + if (challenge.err) return challenge.err; + headers.authorization= challenge.authorize(method,digestURI); +} +HigherLevel.prototype.authenticate_request_options= function(request_options) { + var challenge= this._challenge(); + if (!challenge) return; // simply won't produce an 'Authorization' header + if (challenge.err) return challenge.err; + if (!request_options.headers) request_options.headers= {}; + request_options.headers.authorization= challenge.authorize(request_options.method,request_options.path); +} + +module.exports = www_authenticator; +module.exports.parsers= parsers; +module.exports.user_credentials= user_credentials; +module.exports.basic_challenge= basic_challenge; +module.exports.authenticator= function(username,password,options) +{ + if (2 == arguments.length && toString.call(password) != '[object String]') { + options= password; + password= null; + } + var credentials= user_credentials(username,password) + return new HigherLevel(credentials,options); +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 40d7d9ed..42423f9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,8 +20,7 @@ "json-text-sequence": "^1.0.1", "multipart-stream": "^2.0.1", "qs": "^6.11.0", - "through2": "^4.0.2", - "www-authenticate": "^0.6.3" + "through2": "^4.0.2" }, "devDependencies": { "@jsdoc/salty": "0.2.3", @@ -5765,14 +5764,6 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, - "node_modules/www-authenticate": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/www-authenticate/-/www-authenticate-0.6.3.tgz", - "integrity": "sha512-8VkdLBJiBh5aXlJvcVaPykwSI//OA+Sxw7g84vIyCqoqlXtLupGNhyXxbgVuZ7g5ZS+lCJ4bTtcw/gJciqEuAg==", - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/xml": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", @@ -10121,11 +10112,6 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, - "www-authenticate": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/www-authenticate/-/www-authenticate-0.6.3.tgz", - "integrity": "sha512-8VkdLBJiBh5aXlJvcVaPykwSI//OA+Sxw7g84vIyCqoqlXtLupGNhyXxbgVuZ7g5ZS+lCJ4bTtcw/gJciqEuAg==" - }, "xml": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", diff --git a/package.json b/package.json index e4ba353f..444db78e 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,7 @@ "json-text-sequence": "^1.0.1", "multipart-stream": "^2.0.1", "qs": "^6.11.0", - "through2": "^4.0.2", - "www-authenticate": "^0.6.3" + "through2": "^4.0.2" }, "repository": { "type": "git", diff --git a/test-basic/digestauth-fips-nomd5load.js b/test-basic/digestauth-fips-nomd5load.js new file mode 100644 index 00000000..c90ca73d --- /dev/null +++ b/test-basic/digestauth-fips-nomd5load.js @@ -0,0 +1,54 @@ +/* +* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ +'use strict'; + +const should = require('should'); + +describe('FIPS test - ensure MD5 hash digester object is not loaded by default on require of www-authenticate module', function () { + it('should not automatically load MD5 digest algorithm function when requiring www-authenticate module', function () { + /** + * Attempt to load/require the www-authenticate module after applying a monkey-patch + * to the crypto.createHash function to intercept any attempts to create an MD5 hash + * digester object. + * This is to simulate a FIPS-enabled environment where MD5 is not allowed. + * + * First, create a monkey-patch to intercept calls to crypto.createHash + * and throw an Error object if the code attempts to create an + * MD5 hashing algorithm object. + * + * We undo this monkey-patch after the test to avoid side effects on all the other tests. + * + * To simulate the require/load, we first delete the module from Node's require cache + * and then require it again, which forces a reload of the module. + */ + delete require.cache[require.resolve('../lib/www-authenticate/www-authenticate')]; + delete require.cache[require.resolve('../lib/www-authenticate/md5')]; + const crypto = require('crypto'); + const originalCreateHash = crypto.createHash; + + crypto.createHash = function (algorithm, ...args) { + if (algorithm.toLowerCase() === 'md5') { + throw new Error('FIPS emulation: MD5 digest algorithm is not allowed on this system!'); + } + return originalCreateHash.call(this, algorithm, ...args); + }; + + try { // we must ensure the createHash function is restored after the test + + // Verify MD5 detection works + (() => crypto.createHash('md5')).should.throw('FIPS emulation: MD5 digest algorithm is not allowed on this system!'); + + // Require the module - should not call to get MD5 digester so should not throw + (() => require('../lib/www-authenticate/md5')).should.not.throw(); + (() => require('../lib/www-authenticate/www-authenticate')).should.not.throw(); + + } finally { + // Restore the original createHash function to avoid side effects + // This MUST execute to avoid breaking other tests! + crypto.createHash = originalCreateHash; + } + }); +}); + + From 507cec1ff250e03da899ad027bc421b55d980c2b Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Mon, 22 Sep 2025 10:31:02 -0700 Subject: [PATCH 05/58] Re-add external www-authenticate library so we can show our changes in another commit.. Delete and re-add existing www-authenticate files to www-authenticate-patched. Change path for require for requester and tests. Changes to www-authenticate will be in subsequent commit, for tracking --- lib/requester.js | 2 +- .../md5.js | 4 +++- .../parsers.js | 3 ++- .../user-credentials.js | 4 ++-- .../www-authenticate.js | 20 ++----------------- test-basic/digestauth-fips-nomd5load.js | 8 ++++---- 6 files changed, 14 insertions(+), 27 deletions(-) rename lib/{www-authenticate => www-authenticate-patched}/md5.js (58%) rename lib/{www-authenticate => www-authenticate-patched}/parsers.js (99%) rename lib/{www-authenticate => www-authenticate-patched}/user-credentials.js (88%) rename lib/{www-authenticate => www-authenticate-patched}/www-authenticate.js (93%) diff --git a/lib/requester.js b/lib/requester.js index bb063426..8f922a2c 100644 --- a/lib/requester.js +++ b/lib/requester.js @@ -2,7 +2,7 @@ * Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var createAuthInitializer = require('./www-authenticate/www-authenticate'); +var createAuthInitializer = require('./www-authenticate-patched/www-authenticate'); var Kerberos = require('./optional.js') .libraryProperty('kerberos', 'Kerberos'); var Multipart = require('multipart-stream'); diff --git a/lib/www-authenticate/md5.js b/lib/www-authenticate-patched/md5.js similarity index 58% rename from lib/www-authenticate/md5.js rename to lib/www-authenticate-patched/md5.js index 3e6de8bf..5af85469 100644 --- a/lib/www-authenticate/md5.js +++ b/lib/www-authenticate-patched/md5.js @@ -1,4 +1,6 @@ -var crypto= require('crypto'); +var crypto= require('crypto') + , md5sum = crypto.createHash('md5') + ; function md5(s) { return crypto.createHash('md5').update(s).digest('hex'); diff --git a/lib/www-authenticate/parsers.js b/lib/www-authenticate-patched/parsers.js similarity index 99% rename from lib/www-authenticate/parsers.js rename to lib/www-authenticate-patched/parsers.js index 65e2be1d..8659d62d 100644 --- a/lib/www-authenticate/parsers.js +++ b/lib/www-authenticate-patched/parsers.js @@ -88,6 +88,8 @@ function Parse_WWW_Authenticate(to_parse) } } +Parse_Authentication_Info.prototype.parse_params= parse_params; + function Parse_Authentication_Info(to_parse) { this.scheme= 'Digest'; @@ -100,7 +102,6 @@ function Parse_Authentication_Info(to_parse) } } -Parse_Authentication_Info.prototype.parse_params= parse_params; Parse_WWW_Authenticate.prototype.parse_params= parse_params; module.exports = { diff --git a/lib/www-authenticate/user-credentials.js b/lib/www-authenticate-patched/user-credentials.js similarity index 88% rename from lib/www-authenticate/user-credentials.js rename to lib/www-authenticate-patched/user-credentials.js index 25bc405d..60ce4f0a 100644 --- a/lib/www-authenticate/user-credentials.js +++ b/lib/www-authenticate-patched/user-credentials.js @@ -16,9 +16,9 @@ function user_credentials(username,password,options) { '' : (!password && password !== '' ? - Buffer.from(username, "ascii").toString("base64") + new Buffer(username, "ascii").toString("base64") : - Buffer.from(username+':'+password, "ascii").toString("base64") + new Buffer(username+':'+password, "ascii").toString("base64") ) function Credentials() { diff --git a/lib/www-authenticate/www-authenticate.js b/lib/www-authenticate-patched/www-authenticate.js similarity index 93% rename from lib/www-authenticate/www-authenticate.js rename to lib/www-authenticate-patched/www-authenticate.js index f09c16ba..6bcb129f 100644 --- a/lib/www-authenticate/www-authenticate.js +++ b/lib/www-authenticate-patched/www-authenticate.js @@ -1,3 +1,4 @@ + /* * www-authenticate * https://github.com/randymized/www-authenticate @@ -6,13 +7,10 @@ * Licensed under the MIT license. */ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ - 'use strict'; var crypto= require('crypto') + , md5sum = crypto.createHash('md5') , parsers= require('./parsers') , md5= require('./md5') , user_credentials= require('./user-credentials') @@ -42,20 +40,6 @@ var www_authenticator = function(username,password,options) cnonce= options.cnonce; } if (cnonce === void 0) cnonce= crypto.pseudoRandomBytes(8).toString('hex'); - - /** - * @typedef {Object} Authenticator - * @property {any} [err] - * @property {function(string=, string=): string} [authorize] - * @property {any} [parms] - * @property {string} [cnonce] - */ - - /** - * Parses the WWW-Authenticate header. - * @param {string} www_authenticate - * @returns {Authenticator} - */ var parse_header= function(www_authenticate) { function Authenticator() diff --git a/test-basic/digestauth-fips-nomd5load.js b/test-basic/digestauth-fips-nomd5load.js index c90ca73d..fd244643 100644 --- a/test-basic/digestauth-fips-nomd5load.js +++ b/test-basic/digestauth-fips-nomd5load.js @@ -22,8 +22,8 @@ describe('FIPS test - ensure MD5 hash digester object is not loaded by default o * To simulate the require/load, we first delete the module from Node's require cache * and then require it again, which forces a reload of the module. */ - delete require.cache[require.resolve('../lib/www-authenticate/www-authenticate')]; - delete require.cache[require.resolve('../lib/www-authenticate/md5')]; + delete require.cache[require.resolve('../lib/www-authenticate-patched/www-authenticate')]; + delete require.cache[require.resolve('../lib/www-authenticate-patched/md5')]; const crypto = require('crypto'); const originalCreateHash = crypto.createHash; @@ -40,8 +40,8 @@ describe('FIPS test - ensure MD5 hash digester object is not loaded by default o (() => crypto.createHash('md5')).should.throw('FIPS emulation: MD5 digest algorithm is not allowed on this system!'); // Require the module - should not call to get MD5 digester so should not throw - (() => require('../lib/www-authenticate/md5')).should.not.throw(); - (() => require('../lib/www-authenticate/www-authenticate')).should.not.throw(); + (() => require('../lib/www-authenticate-patched/md5')).should.not.throw(); + (() => require('../lib/www-authenticate-patched/www-authenticate')).should.not.throw(); } finally { // Restore the original createHash function to avoid side effects From 9d57aef620d59378f14cc0c089b731180eff8fe5 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Mon, 22 Sep 2025 11:12:36 -0700 Subject: [PATCH 06/58] Remove unnecessary top-level MD5 digester functions that cause an exception on FIPS-enabled systems when the www-authenticate module is loaded via require. The MD5 digester functions are already created on demand when using DIGEST authentication. Use Buffer.from rather than deprecated new Buffer constructor form. Move the Parser_Authenticate_Info prototype statement to after the definition of the function. Add copyright to all the files. --- lib/www-authenticate-patched/md5.js | 15 ++++++++++++--- lib/www-authenticate-patched/parsers.js | 14 ++++++++++++-- lib/www-authenticate-patched/user-credentials.js | 15 +++++++++++++-- lib/www-authenticate-patched/www-authenticate.js | 5 +++-- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/lib/www-authenticate-patched/md5.js b/lib/www-authenticate-patched/md5.js index 5af85469..732d576e 100644 --- a/lib/www-authenticate-patched/md5.js +++ b/lib/www-authenticate-patched/md5.js @@ -1,6 +1,15 @@ -var crypto= require('crypto') - , md5sum = crypto.createHash('md5') - ; +/* + * www-authenticate + * https://github.com/randymized/www-authenticate + * + * Copyright (c) 2013 Randy McLaughlin + * Licensed under the MIT license. + */ + +/* +* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ +var crypto= require('crypto'); function md5(s) { return crypto.createHash('md5').update(s).digest('hex'); diff --git a/lib/www-authenticate-patched/parsers.js b/lib/www-authenticate-patched/parsers.js index 8659d62d..7deb6fe6 100644 --- a/lib/www-authenticate-patched/parsers.js +++ b/lib/www-authenticate-patched/parsers.js @@ -1,3 +1,14 @@ +/* + * www-authenticate + * https://github.com/randymized/www-authenticate + * + * Copyright (c) 2013 Randy McLaughlin + * Licensed under the MIT license. + */ + +/* +* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ var ParseAuth= /(\w+)\s+(.*)/ // -> scheme, params , Separators= /([",=])/ ; @@ -88,8 +99,6 @@ function Parse_WWW_Authenticate(to_parse) } } -Parse_Authentication_Info.prototype.parse_params= parse_params; - function Parse_Authentication_Info(to_parse) { this.scheme= 'Digest'; @@ -102,6 +111,7 @@ function Parse_Authentication_Info(to_parse) } } +Parse_Authentication_Info.prototype.parse_params= parse_params; Parse_WWW_Authenticate.prototype.parse_params= parse_params; module.exports = { diff --git a/lib/www-authenticate-patched/user-credentials.js b/lib/www-authenticate-patched/user-credentials.js index 60ce4f0a..c1f5db0b 100644 --- a/lib/www-authenticate-patched/user-credentials.js +++ b/lib/www-authenticate-patched/user-credentials.js @@ -1,3 +1,14 @@ +/* + * www-authenticate + * https://github.com/randymized/www-authenticate + * + * Copyright (c) 2013 Randy McLaughlin + * Licensed under the MIT license. + */ + +/* +* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ var md5= require('./md5'); /* @@ -16,9 +27,9 @@ function user_credentials(username,password,options) { '' : (!password && password !== '' ? - new Buffer(username, "ascii").toString("base64") + Buffer.from(username, "ascii").toString("base64") : - new Buffer(username+':'+password, "ascii").toString("base64") + Buffer.from(username+':'+password, "ascii").toString("base64") ) function Credentials() { diff --git a/lib/www-authenticate-patched/www-authenticate.js b/lib/www-authenticate-patched/www-authenticate.js index 6bcb129f..739006b8 100644 --- a/lib/www-authenticate-patched/www-authenticate.js +++ b/lib/www-authenticate-patched/www-authenticate.js @@ -1,4 +1,3 @@ - /* * www-authenticate * https://github.com/randymized/www-authenticate @@ -7,10 +6,12 @@ * Licensed under the MIT license. */ +/* +* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ 'use strict'; var crypto= require('crypto') - , md5sum = crypto.createHash('md5') , parsers= require('./parsers') , md5= require('./md5') , user_credentials= require('./user-credentials') From 80fadc6bfbb39044abe5dbaa499edd714fef6ae9 Mon Sep 17 00:00:00 2001 From: asinha Date: Mon, 22 Sep 2025 12:23:35 -0700 Subject: [PATCH 07/58] MLE-24407 : Update package.json and changelog for Node Client 3.7.1 --- CHANGELOG.md | 4 + package-lock.json | 253 +++++++++++++++++++++++++--------------------- package.json | 2 +- 3 files changed, 144 insertions(+), 115 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4338d959..140b08a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 3.7.1 +#### Bug Fix +- https://github.com/marklogic/node-client-api/issues/961 + ## 3.7.0 #### New Functionality diff --git a/package-lock.json b/package-lock.json index 42423f9b..ac55aab1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "marklogic", - "version": "3.7.0", + "version": "3.7.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "marklogic", - "version": "3.7.0", + "version": "3.7.1", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -72,12 +72,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz", - "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", + "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", "dev": true, "dependencies": { - "@babel/types": "^7.28.2" + "@babel/types": "^7.28.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -87,9 +87,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", - "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", + "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -120,9 +120,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dependencies": { "eslint-visitor-keys": "^3.4.3" }, @@ -275,9 +275,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "engines": { "node": ">=12" }, @@ -307,9 +307,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -690,10 +690,18 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/b4a": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", - "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", - "devOptional": true + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.1.tgz", + "integrity": "sha512-ZovbrBV0g6JxK5cGUF1Suby1vLfKjv4RWi8IxoaO/Mon8BDD9I21RxjHFtgQ+kskJqLAVyQZly3uMBui+vhc8Q==", + "devOptional": true, + "peerDependencies": { + "react-native-b4a": "*" + }, + "peerDependenciesMeta": { + "react-native-b4a": { + "optional": true + } + } }, "node_modules/bach": { "version": "2.0.1", @@ -715,10 +723,10 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/bare-events": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.1.tgz", - "integrity": "sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==", - "optional": true + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.7.0.tgz", + "integrity": "sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==", + "devOptional": true }, "node_modules/base64-js": { "version": "1.5.1", @@ -1222,9 +1230,9 @@ "dev": true }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dependencies": { "ms": "^2.1.3" }, @@ -1325,9 +1333,9 @@ } }, "node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", + "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", "optional": true, "engines": { "node": ">=8" @@ -1706,6 +1714,15 @@ "node": ">=0.10.0" } }, + "node_modules/events-universal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.0.tgz", + "integrity": "sha512-1KVXP1Oq8SiC0HsRraCryA4XGrZ2uJgIt/h4X+mB/8pzMKE7L8yBDN2lBlqJZeUwLAt7kf80m/5GX3HvoCrSGA==", + "devOptional": true, + "dependencies": { + "bare-events": "^2.7.0" + } + }, "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -1814,9 +1831,9 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "node_modules/fast-uri": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", - "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", "dev": true, "funding": [ { @@ -2916,9 +2933,9 @@ } }, "node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", + "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", "dev": true }, "node_modules/is-binary-path": { @@ -3910,9 +3927,9 @@ } }, "node_modules/node-abi": { - "version": "3.75.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz", - "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==", + "version": "3.77.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", + "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -5002,9 +5019,9 @@ } }, "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", + "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", "dev": true, "dependencies": { "is-arrayish": "^0.3.1" @@ -5067,16 +5084,14 @@ } }, "node_modules/streamx": { - "version": "2.22.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz", - "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", + "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", "devOptional": true, "dependencies": { + "events-universal": "^1.0.0", "fast-fifo": "^1.3.2", "text-decoder": "^1.1.0" - }, - "optionalDependencies": { - "bare-events": "^2.2.0" } }, "node_modules/string_decoder": { @@ -5703,9 +5718,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "engines": { "node": ">=12" }, @@ -5714,9 +5729,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "engines": { "node": ">=12" }, @@ -5746,9 +5761,9 @@ } }, "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -5877,18 +5892,18 @@ "dev": true }, "@babel/parser": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz", - "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", + "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", "dev": true, "requires": { - "@babel/types": "^7.28.2" + "@babel/types": "^7.28.4" } }, "@babel/types": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", - "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", + "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.27.1", @@ -5913,9 +5928,9 @@ } }, "@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "requires": { "eslint-visitor-keys": "^3.4.3" } @@ -6021,9 +6036,9 @@ }, "dependencies": { "ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==" + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" }, "emoji-regex": { "version": "9.2.2", @@ -6041,9 +6056,9 @@ } }, "strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "requires": { "ansi-regex": "^6.0.1" } @@ -6329,10 +6344,11 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "b4a": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", - "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", - "devOptional": true + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.1.tgz", + "integrity": "sha512-ZovbrBV0g6JxK5cGUF1Suby1vLfKjv4RWi8IxoaO/Mon8BDD9I21RxjHFtgQ+kskJqLAVyQZly3uMBui+vhc8Q==", + "devOptional": true, + "requires": {} }, "bach": { "version": "2.0.1", @@ -6351,10 +6367,10 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "bare-events": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.1.tgz", - "integrity": "sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==", - "optional": true + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.7.0.tgz", + "integrity": "sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==", + "devOptional": true }, "base64-js": { "version": "1.5.1", @@ -6733,9 +6749,9 @@ "dev": true }, "debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "requires": { "ms": "^2.1.3" } @@ -6801,9 +6817,9 @@ "dev": true }, "detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", + "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", "optional": true }, "diff": { @@ -7093,6 +7109,15 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, + "events-universal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.0.tgz", + "integrity": "sha512-1KVXP1Oq8SiC0HsRraCryA4XGrZ2uJgIt/h4X+mB/8pzMKE7L8yBDN2lBlqJZeUwLAt7kf80m/5GX3HvoCrSGA==", + "devOptional": true, + "requires": { + "bare-events": "^2.7.0" + } + }, "execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -7180,9 +7205,9 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "fast-uri": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", - "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", "dev": true }, "fastest-levenshtein": { @@ -7996,9 +8021,9 @@ } }, "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", + "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", "dev": true }, "is-binary-path": { @@ -8765,9 +8790,9 @@ "optional": true }, "node-abi": { - "version": "3.75.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz", - "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==", + "version": "3.77.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", + "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", "optional": true, "requires": { "semver": "7.5.3" @@ -9523,9 +9548,9 @@ } }, "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", + "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", "dev": true, "requires": { "is-arrayish": "^0.3.1" @@ -9579,12 +9604,12 @@ } }, "streamx": { - "version": "2.22.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz", - "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", + "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", "devOptional": true, "requires": { - "bare-events": "^2.2.0", + "events-universal": "^1.0.0", "fast-fifo": "^1.3.2", "text-decoder": "^1.1.0" } @@ -10063,14 +10088,14 @@ }, "dependencies": { "ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==" + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" }, "ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==" + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" }, "emoji-regex": { "version": "9.2.2", @@ -10088,9 +10113,9 @@ } }, "strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "requires": { "ansi-regex": "^6.0.1" } diff --git a/package.json b/package.json index 444db78e..230b390f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "marklogic", "description": "The official MarkLogic Node.js client API.", "homepage": "https://github.com/marklogic/node-client-api", - "version": "3.7.0", + "version": "3.7.1", "license": "Apache-2.0", "main": "./lib/marklogic.js", "scripts": { From 21e78bc0105f9a6dce6fb9d8437416cd7fee40e3 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Mon, 22 Sep 2025 13:32:47 -0700 Subject: [PATCH 08/58] MLE-123456 - polaris fixes: remove unreachable break and continue statements, unused variables, and move return note_error line outside of the for loop, which was probably intended. --- lib/www-authenticate-patched/parsers.js | 4 +--- lib/www-authenticate-patched/www-authenticate.js | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/www-authenticate-patched/parsers.js b/lib/www-authenticate-patched/parsers.js index 7deb6fe6..acf54416 100644 --- a/lib/www-authenticate-patched/parsers.js +++ b/lib/www-authenticate-patched/parsers.js @@ -15,11 +15,10 @@ var ParseAuth= /(\w+)\s+(.*)/ // -> scheme, params function parse_params(header) { // This parser will definitely fail if there is more than one challenge - var tok, last_tok, _i, _len, key, value; + var tok, _i, _len, key, value; var state= 0; //0: token, var m= header.split(Separators) for (_i = 0, _len = m.length; _i < _len; _i++) { - last_tok= tok; tok = m[_i]; if (!tok.length) continue; switch (state) { @@ -67,7 +66,6 @@ function parse_params(header) { else { return 'Unexpected token ('+tok+') after '+value+'"'; } - continue; case 9: // expect commma if (',' != tok) return 'Comma expected after '+value; state= 0; diff --git a/lib/www-authenticate-patched/www-authenticate.js b/lib/www-authenticate-patched/www-authenticate.js index 739006b8..2069a5d8 100644 --- a/lib/www-authenticate-patched/www-authenticate.js +++ b/lib/www-authenticate-patched/www-authenticate.js @@ -91,7 +91,7 @@ var www_authenticator = function(username,password,options) } else { var qopa= qop.split(','); - var q, x, _i, _len; + var _i, _len; for (_i = 0, _len = qopa.length; _i < _len; _i++) { if ('auth' === qopa[_i]) { var opaque= auth_parms.opaque; @@ -123,10 +123,9 @@ var www_authenticator = function(username,password,options) }; return; } - return note_error('Server does not accept any supported quality of protection techniques.'); } + return note_error('Server does not accept any supported quality of protection techniques.'); } - break; default: return note_error("Unknown scheme"); } From 2d8f70e91739d37c246185dd6e5baa6405014ca7 Mon Sep 17 00:00:00 2001 From: Sameera Priyatham Tadikonda Date: Tue, 26 Aug 2025 17:37:13 -0700 Subject: [PATCH 09/58] PDP-536: Adding copyright check --- .copyrightconfig | 14 ++++++++++++++ .github/workflows/pr-workflow.yaml | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .copyrightconfig diff --git a/.copyrightconfig b/.copyrightconfig new file mode 100644 index 00000000..67674203 --- /dev/null +++ b/.copyrightconfig @@ -0,0 +1,14 @@ +# COPYRIGHT VALIDATION CONFIG +# --------------------------------- +# Required start year (keep fixed; end year auto-updates in check output) +startyear: 2015 + +# Optional exclusions list (comma-separated). Leave commented if none. +# Rules: +# - Relative paths (no leading ./) +# - Simple * wildcard only (no recursive **) +# - Use sparingly (third_party, generated, binary assets) +# - Dotfiles already skipped automatically +# Enable by removing the leading '# ' from the next line and editing values. +# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js +filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json \ No newline at end of file diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml index f2a31ab9..9165227c 100644 --- a/.github/workflows/pr-workflow.yaml +++ b/.github/workflows/pr-workflow.yaml @@ -1,4 +1,4 @@ -name: 🏷️ JIRA ID Validator +name: PR Workflow on: # Using pull_request_target instead of pull_request to handle PRs from forks @@ -14,3 +14,10 @@ jobs: with: # Pass the PR title from the event context pr-title: ${{ github.event.pull_request.title }} + copyright-validation: + name: © Validate Copyright Headers + uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main + permissions: + contents: read + pull-requests: write + issues: write From e76b2a10cf9f320e1ca4ea4b8bd71d51e84e5521 Mon Sep 17 00:00:00 2001 From: asinha Date: Mon, 29 Sep 2025 11:24:27 -0700 Subject: [PATCH 10/58] MLE-24492 : Upgrade Jenkins Node version for Node Client --- Jenkinsfile | 2 +- package-lock.json | 5079 ++++++--------------------------------------- 2 files changed, 635 insertions(+), 4446 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 490cc396..f2852566 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,7 +84,7 @@ pipeline{ buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10') } environment{ - NODE_HOME_DIR= "/home/builder/nodeJs/node-v18.14.0-linux-x64" + NODE_HOME_DIR= "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64" DMC_USER = credentials('MLBUILD_USER') DMC_PASSWORD = credentials('MLBUILD_PASSWORD') GRADLE_DIR=".gradle" diff --git a/package-lock.json b/package-lock.json index ac55aab1..a896f461 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "marklogic", "version": "3.7.1", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -58,6 +58,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -67,6 +68,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -76,6 +78,7 @@ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.28.4" }, @@ -91,6 +94,7 @@ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" @@ -104,6 +108,7 @@ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.1.90" } @@ -113,6 +118,7 @@ "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", "dev": true, + "license": "MIT", "dependencies": { "colorspace": "1.1.x", "enabled": "2.0.x", @@ -123,6 +129,7 @@ "version": "4.9.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" }, @@ -140,6 +147,7 @@ "version": "4.12.1", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -148,6 +156,7 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -170,6 +179,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -184,12 +194,14 @@ "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "license": "MIT" }, "node_modules/@eslint/js": { "version": "8.57.1", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "license": "MIT", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -198,6 +210,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz", "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==", + "license": "MIT", "dependencies": { "text-decoding": "^1.0.0" }, @@ -210,6 +223,7 @@ "resolved": "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz", "integrity": "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -219,6 +233,7 @@ "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz", "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==", "dev": true, + "license": "MIT", "dependencies": { "is-negated-glob": "^1.0.0" }, @@ -231,6 +246,7 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", + "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", @@ -244,6 +260,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -256,12 +273,14 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead" + "deprecated": "Use @eslint/object-schema instead", + "license": "BSD-3-Clause" }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -278,6 +297,7 @@ "version": "6.2.2", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -288,12 +308,14 @@ "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -310,6 +332,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -325,6 +348,7 @@ "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz", "integrity": "sha512-bbtCxCkxcnWhi50I+4Lj6mdz9w3pOXOgEQrID8TCZ/DF51fW7M9GCQW2y45SpBDdHd1Eirm1X/Cf6CkAAe8HPg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" }, @@ -336,6 +360,7 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -348,6 +373,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", "engines": { "node": ">= 8" } @@ -356,6 +382,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -368,6 +395,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", "optional": true, "engines": { "node": ">=14" @@ -377,6 +405,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@sovpro/delimited-stream/-/delimited-stream-1.1.0.tgz", "integrity": "sha512-kQpk267uxB19X3X2T1mvNMjyvIEonpNSHrMlK5ZaBU6aZxw7wPbpgKJOjHN3+/GPVpXgAV9soVT2oyHpLkLtyw==", + "license": "MIT", "engines": { "node": ">= 8" } @@ -385,13 +414,15 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/markdown-it": { "version": "12.2.3", "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz", "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/linkify-it": "*", "@types/mdurl": "*" @@ -401,29 +432,34 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz", "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/triple-beam": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@ungap/structured-clone": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==" + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "license": "ISC" }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -435,6 +471,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -444,6 +481,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -460,6 +498,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -469,6 +508,7 @@ "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "0.1.0" }, @@ -481,6 +521,7 @@ "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "0.1.0" }, @@ -493,6 +534,7 @@ "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "0.1.0" }, @@ -504,6 +546,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -512,6 +555,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -527,6 +571,7 @@ "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -535,13 +580,15 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -553,13 +600,15 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" }, "node_modules/arr-diff": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==", "dev": true, + "license": "MIT", "dependencies": { "arr-flatten": "^1.0.1", "array-slice": "^0.2.3" @@ -573,6 +622,7 @@ "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -582,6 +632,7 @@ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -591,6 +642,7 @@ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -600,6 +652,7 @@ "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -609,6 +662,7 @@ "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -618,6 +672,7 @@ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -627,6 +682,7 @@ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -636,6 +692,7 @@ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz", "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.1" }, @@ -648,6 +705,7 @@ "resolved": "https://registry.npmjs.org/astring/-/astring-1.9.0.tgz", "integrity": "sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==", "dev": true, + "license": "MIT", "bin": { "astring": "bin/astring" } @@ -656,13 +714,15 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/async-done": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz", "integrity": "sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==", "dev": true, + "license": "MIT", "dependencies": { "end-of-stream": "^1.4.4", "once": "^1.4.0", @@ -677,6 +737,7 @@ "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz", "integrity": "sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==", "dev": true, + "license": "MIT", "dependencies": { "async-done": "^2.0.0" }, @@ -687,13 +748,15 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" }, "node_modules/b4a": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.1.tgz", - "integrity": "sha512-ZovbrBV0g6JxK5cGUF1Suby1vLfKjv4RWi8IxoaO/Mon8BDD9I21RxjHFtgQ+kskJqLAVyQZly3uMBui+vhc8Q==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz", + "integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==", "devOptional": true, + "license": "Apache-2.0", "peerDependencies": { "react-native-b4a": "*" }, @@ -708,6 +771,7 @@ "resolved": "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz", "integrity": "sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==", "dev": true, + "license": "MIT", "dependencies": { "async-done": "^2.0.0", "async-settle": "^2.0.0", @@ -720,13 +784,15 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" }, "node_modules/bare-events": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.7.0.tgz", "integrity": "sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==", - "devOptional": true + "devOptional": true, + "license": "Apache-2.0" }, "node_modules/base64-js": { "version": "1.5.1", @@ -746,13 +812,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/beeper": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/beeper/-/beeper-2.1.0.tgz", "integrity": "sha512-85+CcymhlP0jM4fs4ZMiMRl58VthoN9NRdvi+knXiQpP2UggkSre+A9rOZ0c2g2Vh+pEF5ZAlT+k8dsJNoanAA==", "dev": true, + "license": "MIT", "dependencies": { "yoctodelay": "^1.1.0" }, @@ -764,6 +832,7 @@ "version": "1.6.52", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", + "license": "Unlicense", "engines": { "node": ">=0.6" } @@ -773,6 +842,7 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -784,6 +854,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", "optional": true, "dependencies": { "buffer": "^5.5.0", @@ -795,12 +866,14 @@ "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/brace-expansion": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -810,6 +883,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -821,7 +895,8 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/buffer": { "version": "5.7.1", @@ -841,6 +916,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "optional": true, "dependencies": { "base64-js": "^1.3.1", @@ -850,7 +926,8 @@ "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" }, "node_modules/bunyan": { "version": "1.8.15", @@ -860,6 +937,7 @@ "engines": [ "node >=0.10.0" ], + "license": "MIT", "bin": { "bunyan": "bin/bunyan" }, @@ -874,6 +952,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -886,6 +965,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" @@ -901,6 +981,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "license": "MIT", "engines": { "node": ">=6" } @@ -910,6 +991,7 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -922,6 +1004,7 @@ "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz", "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==", "dev": true, + "license": "MIT", "dependencies": { "lodash": "^4.17.15" }, @@ -934,6 +1017,7 @@ "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "dev": true, + "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -951,6 +1035,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -967,6 +1052,7 @@ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": "*" } @@ -976,6 +1062,7 @@ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, + "license": "MIT", "dependencies": { "get-func-name": "^2.0.2" }, @@ -988,6 +1075,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -1011,6 +1099,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC", "optional": true }, "node_modules/cli": { @@ -1018,6 +1107,7 @@ "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", "integrity": "sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==", "dev": true, + "license": "MIT", "dependencies": { "exit": "0.1.2", "glob": "^7.1.1" @@ -1031,6 +1121,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -1042,6 +1133,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1059,6 +1151,7 @@ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", "devOptional": true, + "license": "MIT", "engines": { "node": ">=0.8" } @@ -1068,6 +1161,7 @@ "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^1.9.3", "color-string": "^1.6.0" @@ -1077,6 +1171,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -1087,13 +1182,15 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/color-string": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -1104,6 +1201,7 @@ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true, + "license": "ISC", "bin": { "color-support": "bin.js" } @@ -1113,6 +1211,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "1.1.3" } @@ -1121,13 +1220,15 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/colorspace": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", "dev": true, + "license": "MIT", "dependencies": { "color": "^3.1.3", "text-hex": "1.0.x" @@ -1137,6 +1238,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -1151,6 +1253,7 @@ "engines": [ "node >= 6.0" ], + "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -1171,13 +1274,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/copy-props": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz", "integrity": "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==", "dev": true, + "license": "MIT", "dependencies": { "each-props": "^3.0.0", "is-plain-object": "^5.0.0" @@ -1190,12 +1295,14 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1210,6 +1317,7 @@ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": "*" } @@ -1219,6 +1327,7 @@ "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1233,6 +1342,7 @@ "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -1250,6 +1360,7 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -1261,6 +1372,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "license": "MIT", "optional": true, "dependencies": { "mimic-response": "^3.1.0" @@ -1277,6 +1389,7 @@ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", "dev": true, + "license": "MIT", "dependencies": { "type-detect": "^4.0.0" }, @@ -1288,6 +1401,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "license": "MIT", "optional": true, "engines": { "node": ">=4.0.0" @@ -1296,12 +1410,14 @@ "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "license": "MIT" }, "node_modules/deepcopy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz", "integrity": "sha512-8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ==", + "license": "MIT", "dependencies": { "type-detect": "^4.0.8" } @@ -1311,6 +1427,7 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1319,6 +1436,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -1328,14 +1446,16 @@ "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/detect-libc": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", - "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.1.tgz", + "integrity": "sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==", + "license": "Apache-2.0", "optional": true, "engines": { "node": ">=8" @@ -1346,6 +1466,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -1354,6 +1475,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -1366,6 +1488,7 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", "entities": "^2.0.0" @@ -1381,13 +1504,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/dom-serializer/node_modules/entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true, + "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -1396,7 +1521,8 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/domhandler": { "version": "2.3.0", @@ -1423,6 +1549,7 @@ "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==", "dev": true, "hasInstallScript": true, + "license": "BSD-2-Clause", "optional": true, "dependencies": { "nan": "^2.14.0" @@ -1435,6 +1562,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -1448,6 +1576,7 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz", "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==", + "license": "MIT", "dependencies": { "end-of-stream": "^1.4.1", "inherits": "^2.0.3", @@ -1460,6 +1589,7 @@ "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz", "integrity": "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==", "dev": true, + "license": "MIT", "dependencies": { "is-plain-object": "^5.0.0", "object.defaults": "^1.1.0" @@ -1471,23 +1601,27 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/enabled": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/end-of-stream": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", + "license": "MIT", "dependencies": { "once": "^1.4.0" } @@ -1496,12 +1630,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", "integrity": "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==", - "dev": true + "dev": true, + "license": "BSD-like" }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -1510,6 +1646,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -1518,6 +1655,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -1529,6 +1667,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", @@ -1544,6 +1683,7 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -1552,6 +1692,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -1564,6 +1705,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -1618,6 +1760,7 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -1633,6 +1776,7 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -1644,6 +1788,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1658,12 +1803,14 @@ "node_modules/eslint/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "license": "MIT" }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -1680,6 +1827,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -1691,6 +1839,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -1702,6 +1851,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -1710,15 +1860,17 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/events-universal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.0.tgz", - "integrity": "sha512-1KVXP1Oq8SiC0HsRraCryA4XGrZ2uJgIt/h4X+mB/8pzMKE7L8yBDN2lBlqJZeUwLAt7kf80m/5GX3HvoCrSGA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz", + "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==", "devOptional": true, + "license": "Apache-2.0", "dependencies": { "bare-events": "^2.7.0" } @@ -1728,6 +1880,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -1759,6 +1912,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "license": "(MIT OR WTFPL)", "optional": true, "engines": { "node": ">=6" @@ -1769,6 +1923,7 @@ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", "dev": true, + "license": "MIT", "dependencies": { "homedir-polyfill": "^1.0.1" }, @@ -1780,13 +1935,15 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/extend-shallow": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==", "dev": true, + "license": "MIT", "dependencies": { "kind-of": "^1.1.0" }, @@ -1799,6 +1956,7 @@ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", "dev": true, + "license": "MIT", "dependencies": { "ansi-gray": "^0.1.1", "color-support": "^1.1.3", @@ -1812,23 +1970,27 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "license": "MIT" }, "node_modules/fast-fifo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "devOptional": true + "devOptional": true, + "license": "MIT" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "license": "MIT" }, "node_modules/fast-uri": { "version": "3.1.0", @@ -1844,13 +2006,15 @@ "type": "opencollective", "url": "https://opencollective.com/fastify" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/fastest-levenshtein": { "version": "1.0.16", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4.9.1" } @@ -1859,6 +2023,7 @@ "version": "1.19.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -1867,12 +2032,14 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" }, @@ -1885,6 +2052,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -1896,6 +2064,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -1912,6 +2081,7 @@ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", "dev": true, + "license": "MIT", "dependencies": { "detect-file": "^1.0.0", "is-glob": "^4.0.3", @@ -1927,6 +2097,7 @@ "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz", "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", "dev": true, + "license": "MIT", "dependencies": { "expand-tilde": "^2.0.2", "is-plain-object": "^5.0.0", @@ -1943,6 +2114,7 @@ "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz", "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -1952,6 +2124,7 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -1960,6 +2133,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -1972,19 +2146,22 @@ "node_modules/flatted": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==" + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "license": "ISC" }, "node_modules/fn.name": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1994,6 +2171,7 @@ "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", "dev": true, + "license": "MIT", "dependencies": { "for-in": "^1.0.1" }, @@ -2005,6 +2183,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" @@ -2020,6 +2199,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", "engines": { "node": ">=14" }, @@ -2031,6 +2211,7 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -2046,6 +2227,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT", "optional": true }, "node_modules/fs-mkdirp-stream": { @@ -2053,6 +2235,7 @@ "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz", "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.8", "streamx": "^2.12.0" @@ -2067,6 +2250,7 @@ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -2079,6 +2263,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2088,6 +2273,7 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -2097,6 +2283,7 @@ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -2105,6 +2292,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -2128,6 +2316,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -2141,6 +2330,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -2152,12 +2342,14 @@ "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "license": "MIT", "optional": true }, "node_modules/glob": { "version": "10.3.11", "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.11.tgz", "integrity": "sha512-0UAMm+R/z1E2bTR8eFnoIIlnrUK89m36i90Ez36ld9hLulfUPBgRCQtBy/v86ABx18jnGyrTvu4X3LAjIeBogw==", + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.3.6", @@ -2179,6 +2371,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -2191,6 +2384,7 @@ "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.3.tgz", "integrity": "sha512-fqZVj22LtFJkHODT+M4N1RJQ3TjnnQhfE9GwZI8qXscYarnhpip70poMldRnP8ipQ/w0B621kOhfc53/J9bd/A==", "dev": true, + "license": "MIT", "dependencies": { "@gulpjs/to-absolute-glob": "^4.0.0", "anymatch": "^3.1.3", @@ -2210,6 +2404,7 @@ "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz", "integrity": "sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==", "dev": true, + "license": "MIT", "dependencies": { "async-done": "^2.0.0", "chokidar": "^3.5.3" @@ -2223,6 +2418,7 @@ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, + "license": "MIT", "dependencies": { "global-prefix": "^1.0.1", "is-windows": "^1.0.1", @@ -2237,6 +2433,7 @@ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", "dev": true, + "license": "MIT", "dependencies": { "expand-tilde": "^2.0.2", "homedir-polyfill": "^1.0.1", @@ -2253,6 +2450,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -2264,6 +2462,7 @@ "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -2279,6 +2478,7 @@ "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz", "integrity": "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==", "dev": true, + "license": "MIT", "dependencies": { "sparkles": "^2.1.0" }, @@ -2290,6 +2490,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2301,18 +2502,21 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "license": "MIT" }, "node_modules/growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.x" } @@ -2322,6 +2526,7 @@ "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz", "integrity": "sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==", "dev": true, + "license": "MIT", "dependencies": { "glob-watcher": "^6.0.0", "gulp-cli": "^3.1.0", @@ -2340,6 +2545,7 @@ "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.1.0.tgz", "integrity": "sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==", "dev": true, + "license": "MIT", "dependencies": { "@gulpjs/messages": "^1.1.0", "chalk": "^4.1.2", @@ -2366,6 +2572,7 @@ "resolved": "https://registry.npmjs.org/gulp-jsdoc3/-/gulp-jsdoc3-3.0.0.tgz", "integrity": "sha512-rE2jAwCPA8XFi9g4V3Z3LPhZNjxuMTIYQVMjdqZAQpRfJITLVaUK3xfmiiNTMc7j+fT7pL8Q5yj7ZPRdwCJWNg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "ansi-colors": "^4.1.1", "beeper": "^2.0.0", @@ -2382,6 +2589,7 @@ "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.1.0.tgz", "integrity": "sha512-sP3NK8Y/1e58O0PH9t6s7DAr/lKDSUbIY207oWSeufM6/VclB7jJrIBcPCsyhrFTCDUl9DauePbt6VqP2vPM5w==", "dev": true, + "license": "MIT", "dependencies": { "lodash": "^4.12.0", "minimatch": "^3.0.3", @@ -2401,6 +2609,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -2415,13 +2624,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/gulp-jshint/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -2431,6 +2642,7 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, + "license": "MIT", "dependencies": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" @@ -2441,6 +2653,7 @@ "resolved": "https://registry.npmjs.org/gulp-mocha/-/gulp-mocha-8.0.0.tgz", "integrity": "sha512-FdbBydfzszaES/gXfwD6RFq1yJTj4Z6328R1yqsmhf+t7hW2aj9ZD9Hz8boQShjZ9J8/w6tQBM5mePb8K2pbqA==", "dev": true, + "license": "MIT", "dependencies": { "dargs": "^7.0.0", "execa": "^5.0.0", @@ -2469,6 +2682,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2478,6 +2692,7 @@ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2487,6 +2702,7 @@ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2496,6 +2712,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", @@ -2517,6 +2734,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -2533,13 +2751,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/gulp-mocha/node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -2549,6 +2769,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", "dev": true, + "license": "MIT", "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -2562,6 +2783,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -2574,6 +2796,7 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0" }, @@ -2586,6 +2809,7 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", "dev": true, + "license": "MIT", "dependencies": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", @@ -2630,6 +2854,7 @@ "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^1.0.1", "arr-diff": "^4.0.0", @@ -2645,6 +2870,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "^0.1.0" }, @@ -2657,6 +2883,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -2669,6 +2896,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -2683,13 +2911,15 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/gulp-mocha/node_modules/yargs-parser": { "version": "20.2.4", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -2699,6 +2929,7 @@ "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz", "integrity": "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==", "dev": true, + "license": "MIT", "dependencies": { "glogg": "^2.2.0" }, @@ -2710,6 +2941,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -2718,6 +2950,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2729,6 +2962,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -2743,6 +2977,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -2755,6 +2990,7 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, + "license": "MIT", "bin": { "he": "bin/he" } @@ -2764,6 +3000,7 @@ "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, + "license": "MIT", "dependencies": { "parse-passwd": "^1.0.0" }, @@ -2776,6 +3013,7 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", "integrity": "sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "1", "domhandler": "2.3", @@ -2788,13 +3026,15 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/htmlparser2/node_modules/readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -2806,13 +3046,15 @@ "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=10.17.0" } @@ -2822,6 +3064,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -2847,12 +3090,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -2861,6 +3106,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -2876,6 +3122,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -2883,19 +3130,22 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" }, "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "devOptional": true + "devOptional": true, + "license": "ISC" }, "node_modules/ink-docstrap": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, + "license": "MIT", "dependencies": { "moment": "^2.14.1", "sanitize-html": "^1.13.0" @@ -2906,6 +3156,7 @@ "resolved": "https://registry.npmjs.org/intercept-stdout/-/intercept-stdout-0.1.2.tgz", "integrity": "sha512-Umb41Ryp5FzLurfCRAWx+jjNAk8jsw2RTk2XPIwus+86h/Y2Eb4DfOWof/mZ6FBww8SoO45rJSlg25054/Di9w==", "dev": true, + "license": "MIT", "dependencies": { "lodash.toarray": "^3.0.0" } @@ -2915,6 +3166,7 @@ "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -2924,6 +3176,7 @@ "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "dev": true, + "license": "MIT", "dependencies": { "is-relative": "^1.0.0", "is-windows": "^1.0.1" @@ -2936,13 +3189,15 @@ "version": "0.3.4", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -2954,13 +3209,15 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-core-module": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, + "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -2976,6 +3233,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, + "license": "MIT", "dependencies": { "is-plain-object": "^2.0.4" }, @@ -2988,6 +3246,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, + "license": "MIT", "dependencies": { "isobject": "^3.0.1" }, @@ -2999,6 +3258,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3007,6 +3267,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -3015,6 +3276,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -3027,6 +3289,7 @@ "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3036,6 +3299,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -3044,6 +3308,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -3053,6 +3318,7 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -3062,6 +3328,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3071,6 +3338,7 @@ "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "dev": true, + "license": "MIT", "dependencies": { "is-unc-path": "^1.0.0" }, @@ -3083,6 +3351,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -3095,6 +3364,7 @@ "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "dev": true, + "license": "MIT", "dependencies": { "unc-path-regex": "^0.1.2" }, @@ -3107,6 +3377,7 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -3119,6 +3390,7 @@ "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3128,6 +3400,7 @@ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3136,18 +3409,21 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" }, "node_modules/isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3156,6 +3432,7 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -3173,6 +3450,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -3185,6 +3463,7 @@ "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz", "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "xmlcreate": "^2.0.4" } @@ -3194,6 +3473,7 @@ "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz", "integrity": "sha512-tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@babel/parser": "^7.9.4", "@jsdoc/salty": "^0.2.1", @@ -3223,6 +3503,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -3232,6 +3513,7 @@ "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.6.tgz", "integrity": "sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ==", "dev": true, + "license": "MIT", "dependencies": { "cli": "~1.0.0", "console-browserify": "1.1.x", @@ -3250,6 +3532,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==", "dev": true, + "license": "MIT", "bin": { "strip-json-comments": "cli.js" }, @@ -3260,23 +3543,27 @@ "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "license": "MIT" }, "node_modules/json-text-sequence": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-text-sequence/-/json-text-sequence-1.0.1.tgz", "integrity": "sha512-AYvyAj02ukg85KiFMLphUMFWcNDCSwmNNuoqmpHUyBr/MJOB0c3rQrsJgzM2ELv25yozY9s9NrORuqdP1vNLXQ==", + "license": "MIT", "dependencies": { "@sovpro/delimited-stream": "^1.1.0" }, @@ -3289,6 +3576,7 @@ "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.2.2.tgz", "integrity": "sha512-42O7+/1Zatsc3MkxaMPpXcIl/ukIrbQaGoArZEAr6GcEi2qhfprOBYOPhj+YvSMJkEkdpTjApUx+2DuWaKwRhg==", "hasInstallScript": true, + "license": "Apache-2.0", "optional": true, "dependencies": { "node-addon-api": "^6.1.0", @@ -3302,6 +3590,7 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -3311,6 +3600,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3320,6 +3610,7 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.1.9" } @@ -3328,13 +3619,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/last-run": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz", "integrity": "sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -3344,6 +3637,7 @@ "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz", "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -3352,6 +3646,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -3365,6 +3660,7 @@ "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.1.tgz", "integrity": "sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==", "dev": true, + "license": "MIT", "dependencies": { "extend": "^3.0.2", "findup-sync": "^5.0.0", @@ -3383,6 +3679,7 @@ "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dev": true, + "license": "MIT", "dependencies": { "uc.micro": "^2.0.0" } @@ -3391,6 +3688,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -3405,61 +3703,71 @@ "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash._arraycopy": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz", "integrity": "sha512-RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash._basevalues": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isarray": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isobject": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==", "dev": true, + "license": "MIT", "dependencies": { "lodash._getnative": "^3.0.0", "lodash.isarguments": "^3.0.0", @@ -3469,13 +3777,15 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "license": "MIT" }, "node_modules/lodash.toarray": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-3.0.2.tgz", "integrity": "sha512-ptkjUqvuHjTuMJJxiktJpZhxM5l60bEkfntJx+NFzdQd1bZVxfpTF1bhFYFqBrT4F0wZ1qx9KbVmHJV3Rfc7Tw==", "dev": true, + "license": "MIT", "dependencies": { "lodash._arraycopy": "^3.0.0", "lodash._basevalues": "^3.0.0", @@ -3487,6 +3797,7 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -3503,6 +3814,7 @@ "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", "dev": true, + "license": "MIT", "dependencies": { "@colors/colors": "1.6.0", "@types/triple-beam": "^1.3.2", @@ -3520,6 +3832,7 @@ "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, + "license": "MIT", "dependencies": { "get-func-name": "^2.0.1" } @@ -3527,13 +3840,15 @@ "node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" }, "node_modules/map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3542,13 +3857,15 @@ "version": "0.0.7", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/markdown-it": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1", "entities": "^4.4.0", @@ -3566,6 +3883,7 @@ "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", "dev": true, + "license": "Unlicense", "peerDependencies": { "@types/markdown-it": "*", "markdown-it": "*" @@ -3576,6 +3894,7 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -3588,6 +3907,7 @@ "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", "dev": true, + "license": "MIT", "bin": { "marked": "bin/marked.js" }, @@ -3599,6 +3919,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -3608,6 +3929,7 @@ "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "charenc": "0.0.2", "crypt": "0.0.2", @@ -3618,19 +3940,22 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -3643,6 +3968,7 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3651,6 +3977,7 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -3663,6 +3990,7 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -3671,6 +3999,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "license": "MIT", "optional": true, "engines": { "node": ">=10" @@ -3683,6 +4012,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3694,6 +4024,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", "optional": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3703,6 +4034,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } @@ -3712,6 +4044,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, + "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" }, @@ -3723,6 +4056,7 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT", "optional": true }, "node_modules/mocha": { @@ -3730,6 +4064,7 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", @@ -3765,6 +4100,7 @@ "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.0.tgz", "integrity": "sha512-W83Ddf94nfLiTBl24aS8IVyFvO8aRDLlCvb+cKb/VEaN5dEbcqu3CXiTe8MQK2DvzS7oKE1RsFTxzN302GGbDQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.4", "md5": "^2.3.0", @@ -3781,6 +4117,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -3796,6 +4133,7 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -3803,12 +4141,14 @@ "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/multipart-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/multipart-stream/-/multipart-stream-2.0.1.tgz", "integrity": "sha512-s2DhMKNH12ydxvLMIjE4lX5ZZsh0lusC1EWzXwg+haFfX/ODTt3+xYkUnGRLy119tVMLltbHnUiEKfuqdQySfA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.1", "is-stream": "^1.0.1", @@ -3819,6 +4159,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3828,6 +4169,7 @@ "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz", "integrity": "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -3836,13 +4178,15 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "mkdirp": "~0.5.1", @@ -3858,6 +4202,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "minimist": "^1.2.6" @@ -3872,6 +4217,7 @@ "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, + "license": "ISC", "optional": true, "dependencies": { "glob": "^6.0.1" @@ -3885,6 +4231,7 @@ "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz", "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/nanoid": { @@ -3898,6 +4245,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -3909,18 +4257,21 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", + "license": "MIT", "optional": true }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "license": "MIT" }, "node_modules/ncp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", "dev": true, + "license": "MIT", "optional": true, "bin": { "ncp": "bin/ncp" @@ -3930,6 +4281,7 @@ "version": "3.77.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", + "license": "MIT", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -3942,6 +4294,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", + "license": "MIT", "optional": true }, "node_modules/normalize-path": { @@ -3949,6 +4302,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3958,6 +4312,7 @@ "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz", "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==", "dev": true, + "license": "MIT", "dependencies": { "once": "^1.4.0" }, @@ -3970,6 +4325,7 @@ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.0.0" }, @@ -3981,6 +4337,7 @@ "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3993,6 +4350,7 @@ "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", "dev": true, + "license": "MIT", "dependencies": { "array-each": "^1.0.1", "array-slice": "^1.0.0", @@ -4008,6 +4366,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", "dev": true, + "license": "MIT", "dependencies": { "isobject": "^3.0.1" }, @@ -4019,6 +4378,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -4028,6 +4388,7 @@ "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", "dev": true, + "license": "MIT", "dependencies": { "fn.name": "1.x.x" } @@ -4037,6 +4398,7 @@ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, + "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -4051,6 +4413,7 @@ "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "license": "MIT", "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -4067,6 +4430,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -4081,6 +4445,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -4095,6 +4460,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -4107,6 +4473,7 @@ "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", "dev": true, + "license": "MIT", "dependencies": { "is-absolute": "^1.0.0", "map-cache": "^0.2.0", @@ -4121,6 +4488,7 @@ "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -4130,6 +4498,7 @@ "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4138,12 +4507,14 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", "engines": { "node": ">=8" } @@ -4152,6 +4523,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", "engines": { "node": ">=8" } @@ -4160,13 +4532,15 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-root": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", "dev": true, + "license": "MIT", "dependencies": { "path-root-regex": "^0.1.0" }, @@ -4179,6 +4553,7 @@ "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4187,6 +4562,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -4203,6 +4579,7 @@ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -4211,13 +4588,15 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -4230,6 +4609,7 @@ "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==", "dev": true, + "license": "MIT", "dependencies": { "ansi-cyan": "^0.1.1", "ansi-red": "^0.1.1", @@ -4260,6 +4640,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -4273,6 +4654,7 @@ "version": "7.1.3", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", + "license": "MIT", "optional": true, "dependencies": { "detect-libc": "^2.0.0", @@ -4299,6 +4681,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "license": "MIT", "engines": { "node": ">= 0.8.0" } @@ -4307,12 +4690,14 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/pump": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", + "license": "MIT", "optional": true, "dependencies": { "end-of-stream": "^1.1.0", @@ -4323,6 +4708,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "license": "MIT", "engines": { "node": ">=6" } @@ -4332,6 +4718,7 @@ "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -4340,6 +4727,7 @@ "version": "6.14.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" }, @@ -4367,13 +4755,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -4382,6 +4772,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", "optional": true, "dependencies": { "deep-extend": "^0.6.0", @@ -4397,6 +4788,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "license": "MIT", "optional": true, "engines": { "node": ">=0.10.0" @@ -4407,6 +4799,7 @@ "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz", "integrity": "sha512-rhSo812VIVaX7cxl33KkllHRwfLvjZL3lQedWEpQ27YlMFKZbFZsiVdCcQn/Z0FauLWxIpKrNREGuHbJFSi0Lw==", "dev": true, + "license": "MIT", "dependencies": { "lodash.clonedeep": "^4.3.2" }, @@ -4420,6 +4813,7 @@ "integrity": "sha512-hSkFcFiLb5buT0X1fNI023M6tn0ywblKzF0hGzVCkTjEggT5tQUZI+fCG71utA7NiEyiBEc3trl/LDFFHzGIrw==", "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", "dev": true, + "license": "MIT", "dependencies": { "lodash.assign": "^4.2.0", "lodash.isobject": "^3.0.2", @@ -4435,6 +4829,7 @@ "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", "dev": true, + "license": "ISC", "dependencies": { "mute-stream": "~0.0.4" }, @@ -4446,6 +4841,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -4460,6 +4856,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -4472,6 +4869,7 @@ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", "dev": true, + "license": "MIT", "dependencies": { "resolve": "^1.20.0" }, @@ -4483,13 +4881,15 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", - "devOptional": true + "devOptional": true, + "license": "ISC" }, "node_modules/replace-ext": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", "devOptional": true, + "license": "MIT", "engines": { "node": ">= 10" } @@ -4499,6 +4899,7 @@ "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz", "integrity": "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -4508,6 +4909,7 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4517,6 +4919,7 @@ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4526,6 +4929,7 @@ "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz", "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==", "dev": true, + "license": "MIT", "dependencies": { "lodash": "^4.17.21" } @@ -4535,6 +4939,7 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, + "license": "MIT", "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", @@ -4555,6 +4960,7 @@ "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", "dev": true, + "license": "MIT", "dependencies": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" @@ -4567,6 +4973,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "license": "MIT", "engines": { "node": ">=4" } @@ -4576,6 +4983,7 @@ "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz", "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==", "dev": true, + "license": "MIT", "dependencies": { "value-or-function": "^4.0.0" }, @@ -4587,6 +4995,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -4597,6 +5006,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -4625,6 +5035,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } @@ -4646,13 +5057,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safe-json-stringify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/safe-stable-stringify": { @@ -4660,6 +5073,7 @@ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } @@ -4668,7 +5082,8 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/sandwich-stream": { "version": "1.0.0", @@ -4683,6 +5098,7 @@ "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.17.0.tgz", "integrity": "sha512-dLAADUSS8rBwhaevT12yCezvioCA+bmUTPH/u57xKPT8d++voeYE6HeluA/bPbQ15TwDBG2ii+QZIEmYx8VdxA==", "dev": true, + "license": "MIT", "dependencies": { "deepmerge": "^4.2.2", "escape-string-regexp": "^4.0.0", @@ -4697,6 +5113,7 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -4716,13 +5133,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/sanitize-html/node_modules/domhandler": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -4738,6 +5157,7 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -4752,6 +5172,7 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -4771,6 +5192,7 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", @@ -4782,6 +5204,7 @@ "version": "7.5.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "license": "ISC", "optional": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4798,6 +5221,7 @@ "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz", "integrity": "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==", "dev": true, + "license": "MIT", "dependencies": { "sver": "^1.8.3" }, @@ -4809,6 +5233,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", "optional": true, "dependencies": { "yallist": "^4.0.0" @@ -4822,6 +5247,7 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -4830,6 +5256,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -4841,6 +5268,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", "engines": { "node": ">=8" } @@ -4850,6 +5278,7 @@ "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz", "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==", "dev": true, + "license": "MIT", "dependencies": { "should-equal": "^2.0.0", "should-format": "^3.0.3", @@ -4863,6 +5292,7 @@ "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz", "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==", "dev": true, + "license": "MIT", "dependencies": { "should-type": "^1.4.0" } @@ -4872,6 +5302,7 @@ "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz", "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==", "dev": true, + "license": "MIT", "dependencies": { "should-type": "^1.3.0", "should-type-adaptors": "^1.0.1" @@ -4881,13 +5312,15 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz", "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/should-type-adaptors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz", "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==", "dev": true, + "license": "MIT", "dependencies": { "should-type": "^1.3.0", "should-util": "^1.0.0" @@ -4897,12 +5330,14 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz", "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/side-channel": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", @@ -4921,6 +5356,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" @@ -4936,6 +5372,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -4953,6 +5390,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -4971,7 +5409,8 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/simple-concat": { "version": "1.0.1", @@ -4991,6 +5430,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "optional": true }, "node_modules/simple-get": { @@ -5011,6 +5451,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "optional": true, "dependencies": { "decompress-response": "^6.0.0", @@ -5023,6 +5464,7 @@ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", "dev": true, + "license": "MIT", "dependencies": { "is-arrayish": "^0.3.1" } @@ -5032,6 +5474,7 @@ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -5041,6 +5484,7 @@ "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz", "integrity": "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -5050,6 +5494,7 @@ "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -5059,6 +5504,7 @@ "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz", "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==", "dev": true, + "license": "MIT", "dependencies": { "streamx": "^2.13.2" } @@ -5067,18 +5513,21 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/stream-shift": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz", - "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==" + "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==", + "license": "MIT" }, "node_modules/stream-to-array": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz", "integrity": "sha512-UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA==", "dev": true, + "license": "MIT", "dependencies": { "any-promise": "^1.1.0" } @@ -5088,6 +5537,7 @@ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", "devOptional": true, + "license": "MIT", "dependencies": { "events-universal": "^1.0.0", "fast-fifo": "^1.3.2", @@ -5098,6 +5548,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -5106,6 +5557,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5120,6 +5572,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5133,6 +5586,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5145,6 +5599,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5157,6 +5612,7 @@ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -5165,6 +5621,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "license": "MIT", "engines": { "node": ">=8" }, @@ -5176,6 +5633,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -5188,6 +5646,7 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5200,6 +5659,7 @@ "resolved": "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz", "integrity": "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==", "dev": true, + "license": "MIT", "optionalDependencies": { "semver": "^6.3.0" } @@ -5208,6 +5668,7 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz", "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==", + "license": "MIT", "optional": true, "dependencies": { "chownr": "^1.1.1", @@ -5220,6 +5681,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", "optional": true, "dependencies": { "bl": "^4.0.3", @@ -5237,6 +5699,7 @@ "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", "devOptional": true, + "license": "MIT", "dependencies": { "streamx": "^2.12.5" } @@ -5246,6 +5709,7 @@ "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", "devOptional": true, + "license": "Apache-2.0", "dependencies": { "b4a": "^1.6.4" } @@ -5253,23 +5717,27 @@ "node_modules/text-decoding": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz", - "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==" + "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==", + "license": "MIT" }, "node_modules/text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "license": "MIT" }, "node_modules/through2": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "license": "MIT", "dependencies": { "readable-stream": "3" } @@ -5279,6 +5747,7 @@ "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5288,6 +5757,7 @@ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.14" } @@ -5297,6 +5767,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -5309,6 +5780,7 @@ "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz", "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==", "dev": true, + "license": "MIT", "dependencies": { "streamx": "^2.12.5" }, @@ -5321,6 +5793,7 @@ "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 14.0.0" } @@ -5329,12 +5802,14 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "license": "Apache-2.0", "optional": true, "dependencies": { "safe-buffer": "^5.0.1" @@ -5347,6 +5822,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -5358,6 +5834,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "license": "MIT", "engines": { "node": ">=4" } @@ -5366,6 +5843,7 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -5376,19 +5854,22 @@ "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "license": "MIT" }, "node_modules/uc.micro": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5397,13 +5878,15 @@ "version": "1.13.7", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/undertaker": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz", "integrity": "sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==", "dev": true, + "license": "MIT", "dependencies": { "bach": "^2.0.1", "fast-levenshtein": "^3.0.0", @@ -5419,6 +5902,7 @@ "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz", "integrity": "sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -5428,6 +5912,7 @@ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz", "integrity": "sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==", "dev": true, + "license": "MIT", "dependencies": { "fastest-levenshtein": "^1.0.7" } @@ -5436,6 +5921,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } @@ -5443,13 +5929,15 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" }, "node_modules/v8flags": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz", "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -5459,6 +5947,7 @@ "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz", "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -5468,6 +5957,7 @@ "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", "devOptional": true, + "license": "MIT", "dependencies": { "clone": "^2.1.2", "remove-trailing-separator": "^1.1.0", @@ -5483,6 +5973,7 @@ "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz", "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==", "dev": true, + "license": "MIT", "dependencies": { "bl": "^5.0.0", "vinyl": "^3.0.0" @@ -5496,6 +5987,7 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz", "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==", "dev": true, + "license": "MIT", "dependencies": { "buffer": "^6.0.3", "inherits": "^2.0.4", @@ -5521,6 +6013,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" @@ -5531,6 +6024,7 @@ "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.2.tgz", "integrity": "sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==", "dev": true, + "license": "MIT", "dependencies": { "fs-mkdirp-stream": "^2.0.1", "glob-stream": "^8.0.3", @@ -5556,6 +6050,7 @@ "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz", "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==", "dev": true, + "license": "MIT", "dependencies": { "convert-source-map": "^2.0.0", "graceful-fs": "^4.2.10", @@ -5572,6 +6067,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -5587,6 +6083,7 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^1.0.2 || 2" } @@ -5596,6 +6093,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -5605,6 +6103,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -5614,6 +6113,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, + "license": "MIT", "dependencies": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -5627,6 +6127,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^3.0.0" }, @@ -5639,6 +6140,7 @@ "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz", "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==", "dev": true, + "license": "MIT", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -5661,6 +6163,7 @@ "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", "dev": true, + "license": "MIT", "dependencies": { "logform": "^2.7.0", "readable-stream": "^3.6.2", @@ -5674,6 +6177,7 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5682,12 +6186,14 @@ "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -5705,6 +6211,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -5721,6 +6228,7 @@ "version": "6.2.2", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -5732,6 +6240,7 @@ "version": "6.2.3", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -5742,12 +6251,14 @@ "node_modules/wrap-ansi/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" }, "node_modules/wrap-ansi/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -5764,6 +6275,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -5777,25 +6289,29 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" }, "node_modules/xml": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/xmlcreate": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz", "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4" } @@ -5805,6 +6321,7 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -5813,6 +6330,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC", "optional": true }, "node_modules/yargs": { @@ -5820,6 +6338,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -5838,6 +6357,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -5847,6 +6367,7 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -5861,6 +6382,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -5873,4343 +6395,10 @@ "resolved": "https://registry.npmjs.org/yoctodelay/-/yoctodelay-1.2.0.tgz", "integrity": "sha512-12y/P9MSig9/5BEhBgylss+fkHiCRZCvYR81eH35NW9uw801cvJt31EAV+WOLcwZRZbLiIQl/hxcdXXXFmGvXg==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } } - }, - "dependencies": { - "@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", - "dev": true - }, - "@babel/parser": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", - "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", - "dev": true, - "requires": { - "@babel/types": "^7.28.4" - } - }, - "@babel/types": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", - "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1" - } - }, - "@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "dev": true - }, - "@dabh/diagnostics": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", - "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", - "dev": true, - "requires": { - "colorspace": "1.1.x", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, - "@eslint-community/eslint-utils": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", - "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", - "requires": { - "eslint-visitor-keys": "^3.4.3" - } - }, - "@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==" - }, - "@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "5.1.0", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - } - } - }, - "@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==" - }, - "@fastify/busboy": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz", - "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==", - "requires": { - "text-decoding": "^1.0.0" - } - }, - "@gulpjs/messages": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz", - "integrity": "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==", - "dev": true - }, - "@gulpjs/to-absolute-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz", - "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==", - "dev": true, - "requires": { - "is-negated-glob": "^1.0.0" - } - }, - "@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "requires": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "5.1.0" - } - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" - }, - "@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==" - }, - "@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "requires": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "requires": { - "ansi-regex": "^6.0.1" - } - } - } - }, - "@jsdoc/salty": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz", - "integrity": "sha512-bbtCxCkxcnWhi50I+4Lj6mdz9w3pOXOgEQrID8TCZ/DF51fW7M9GCQW2y45SpBDdHd1Eirm1X/Cf6CkAAe8HPg==", - "dev": true, - "requires": { - "lodash": "^4.17.21" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "optional": true - }, - "@sovpro/delimited-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sovpro/delimited-stream/-/delimited-stream-1.1.0.tgz", - "integrity": "sha512-kQpk267uxB19X3X2T1mvNMjyvIEonpNSHrMlK5ZaBU6aZxw7wPbpgKJOjHN3+/GPVpXgAV9soVT2oyHpLkLtyw==" - }, - "@types/linkify-it": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==", - "dev": true - }, - "@types/markdown-it": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz", - "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==", - "dev": true, - "requires": { - "@types/linkify-it": "*", - "@types/mdurl": "*" - } - }, - "@types/mdurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==", - "dev": true - }, - "@types/triple-beam": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", - "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", - "dev": true - }, - "@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, - "@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==" - }, - "acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==" - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": {} - }, - "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - } - }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true - }, - "ansi-cyan": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", - "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==", - "dev": true, - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==", - "dev": true, - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-red": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", - "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==", - "dev": true, - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "requires": { - "color-convert": "^2.0.1" - } - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==", - "dev": true - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", - "dev": true - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "arr-diff": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", - "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1", - "array-slice": "^0.2.3" - }, - "dependencies": { - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==", - "dev": true - } - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "arr-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", - "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==", - "dev": true - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", - "dev": true - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", - "dev": true - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", - "dev": true - }, - "ast-types": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz", - "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==", - "dev": true, - "requires": { - "tslib": "^2.0.1" - } - }, - "astring": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/astring/-/astring-1.9.0.tgz", - "integrity": "sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==", - "dev": true - }, - "async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true - }, - "async-done": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz", - "integrity": "sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==", - "dev": true, - "requires": { - "end-of-stream": "^1.4.4", - "once": "^1.4.0", - "stream-exhaust": "^1.0.2" - } - }, - "async-settle": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz", - "integrity": "sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==", - "dev": true, - "requires": { - "async-done": "^2.0.0" - } - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "b4a": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.1.tgz", - "integrity": "sha512-ZovbrBV0g6JxK5cGUF1Suby1vLfKjv4RWi8IxoaO/Mon8BDD9I21RxjHFtgQ+kskJqLAVyQZly3uMBui+vhc8Q==", - "devOptional": true, - "requires": {} - }, - "bach": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz", - "integrity": "sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==", - "dev": true, - "requires": { - "async-done": "^2.0.0", - "async-settle": "^2.0.0", - "now-and-later": "^3.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "bare-events": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.7.0.tgz", - "integrity": "sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==", - "devOptional": true - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "devOptional": true - }, - "beeper": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-2.1.0.tgz", - "integrity": "sha512-85+CcymhlP0jM4fs4ZMiMRl58VthoN9NRdvi+knXiQpP2UggkSre+A9rOZ0c2g2Vh+pEF5ZAlT+k8dsJNoanAA==", - "dev": true, - "requires": { - "yoctodelay": "^1.1.0" - } - }, - "big-integer": { - "version": "1.6.52", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", - "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==" - }, - "binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true - }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "optional": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, - "brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "requires": { - "balanced-match": "^1.0.0" - } - }, - "braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "requires": { - "fill-range": "^7.1.1" - } - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "optional": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "bunyan": { - "version": "1.8.15", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz", - "integrity": "sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==", - "dev": true, - "requires": { - "dtrace-provider": "~0.8", - "moment": "^2.19.3", - "mv": "~2", - "safe-json-stringify": "~1" - } - }, - "call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "requires": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - } - }, - "call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" - }, - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - }, - "catharsis": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz", - "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==", - "dev": true, - "requires": { - "lodash": "^4.17.15" - } - }, - "chai": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", - "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", - "dev": true, - "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.1.0" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "charenc": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", - "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", - "dev": true - }, - "check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", - "dev": true, - "requires": { - "get-func-name": "^2.0.2" - } - }, - "chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "3.0.3", - "fsevents": "~2.3.2", - "glob-parent": "6.0.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "optional": true - }, - "cli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", - "integrity": "sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==", - "dev": true, - "requires": { - "exit": "0.1.2", - "glob": "10.3.11" - } - }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - } - } - }, - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", - "devOptional": true - }, - "color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "dev": true, - "requires": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - }, - "dependencies": { - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - } - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "color-string": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", - "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", - "dev": true, - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true - }, - "colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "dev": true, - "requires": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg==", - "dev": true, - "requires": { - "date-now": "^0.1.4" - } - }, - "convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true - }, - "copy-props": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz", - "integrity": "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==", - "dev": true, - "requires": { - "each-props": "^3.0.0", - "is-plain-object": "^5.0.0" - } - }, - "core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, - "cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "crypt": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", - "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", - "dev": true - }, - "dargs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", - "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", - "dev": true - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==", - "dev": true - }, - "debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "requires": { - "ms": "^2.1.3" - } - }, - "decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true - }, - "decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "optional": true, - "requires": { - "mimic-response": "^3.1.0" - } - }, - "deep-eql": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", - "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", - "dev": true, - "requires": { - "type-detect": "^4.0.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "optional": true - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" - }, - "deepcopy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz", - "integrity": "sha512-8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ==", - "requires": { - "type-detect": "^4.0.8" - } - }, - "deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", - "dev": true - }, - "detect-libc": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", - "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", - "optional": true - }, - "diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", - "dev": true - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-serializer": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", - "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" - }, - "dependencies": { - "domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - } - } - }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true - }, - "domhandler": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", - "integrity": "sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==", - "dev": true, - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==", - "dev": true, - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "dtrace-provider": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz", - "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==", - "dev": true, - "optional": true, - "requires": { - "nan": "^2.14.0" - } - }, - "dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "requires": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - } - }, - "duplexify": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz", - "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==", - "requires": { - "end-of-stream": "^1.4.1", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1", - "stream-shift": "^1.0.2" - } - }, - "each-props": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz", - "integrity": "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==", - "dev": true, - "requires": { - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0" - } - }, - "eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "dev": true - }, - "end-of-stream": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", - "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", - "requires": { - "once": "^1.4.0" - } - }, - "entities": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", - "integrity": "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==", - "dev": true - }, - "es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" - }, - "es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" - }, - "es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "requires": { - "es-errors": "^1.3.0" - } - }, - "es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "requires": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - } - }, - "escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" - }, - "eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "7.0.6", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "5.1.0", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - } - } - }, - "eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==" - }, - "espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "requires": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - } - }, - "esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "requires": { - "estraverse": "^5.1.0" - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "requires": { - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, - "events-universal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.0.tgz", - "integrity": "sha512-1KVXP1Oq8SiC0HsRraCryA4XGrZ2uJgIt/h4X+mB/8pzMKE7L8yBDN2lBlqJZeUwLAt7kf80m/5GX3HvoCrSGA==", - "devOptional": true, - "requires": { - "bare-events": "^2.7.0" - } - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "7.0.6", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "optional": true - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extend-shallow": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", - "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==", - "dev": true, - "requires": { - "kind-of": "^1.1.0" - } - }, - "fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "dev": true, - "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-fifo": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", - "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "devOptional": true - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" - }, - "fast-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", - "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", - "dev": true - }, - "fastest-levenshtein": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", - "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", - "dev": true - }, - "fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", - "requires": { - "reusify": "^1.0.4" - } - }, - "fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", - "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "dev": true - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "findup-sync": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", - "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.3", - "micromatch": "^4.0.4", - "resolve-dir": "^1.0.1" - } - }, - "fined": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz", - "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0", - "object.pick": "^1.3.0", - "parse-filepath": "^1.0.2" - } - }, - "flagged-respawn": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz", - "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==", - "dev": true - }, - "flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true - }, - "flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "requires": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==" - }, - "fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "dev": true - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "requires": { - "cross-spawn": "7.0.6", - "signal-exit": "^4.0.1" - }, - "dependencies": { - "signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" - } - } - }, - "form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.12" - } - }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "optional": true - }, - "fs-mkdirp-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz", - "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.8", - "streamx": "^2.12.0" - } - }, - "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true - }, - "get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - } - }, - "get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "requires": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", - "optional": true - }, - "glob": { - "version": "10.3.11", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.11.tgz", - "integrity": "sha512-0UAMm+R/z1E2bTR8eFnoIIlnrUK89m36i90Ez36ld9hLulfUPBgRCQtBy/v86ABx18jnGyrTvu4X3LAjIeBogw==", - "requires": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "5.1.0", - "minipass": "^7.0.4", - "path-scurry": "^1.10.2" - } - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "requires": { - "is-glob": "^4.0.3" - } - }, - "glob-stream": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.3.tgz", - "integrity": "sha512-fqZVj22LtFJkHODT+M4N1RJQ3TjnnQhfE9GwZI8qXscYarnhpip70poMldRnP8ipQ/w0B621kOhfc53/J9bd/A==", - "dev": true, - "requires": { - "@gulpjs/to-absolute-glob": "^4.0.0", - "anymatch": "^3.1.3", - "fastq": "^1.13.0", - "glob-parent": "6.0.2", - "is-glob": "^4.0.3", - "is-negated-glob": "^1.0.0", - "normalize-path": "^3.0.0", - "streamx": "^2.12.5" - } - }, - "glob-watcher": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz", - "integrity": "sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==", - "dev": true, - "requires": { - "async-done": "^2.0.0", - "chokidar": "^3.5.3" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - }, - "dependencies": { - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "requires": { - "type-fest": "^0.20.2" - } - }, - "glogg": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz", - "integrity": "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==", - "dev": true, - "requires": { - "sparkles": "^2.1.0" - } - }, - "gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" - }, - "graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "gulp": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz", - "integrity": "sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==", - "dev": true, - "requires": { - "glob-watcher": "^6.0.0", - "gulp-cli": "^3.1.0", - "undertaker": "^2.0.0", - "vinyl-fs": "^4.0.2" - } - }, - "gulp-cli": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.1.0.tgz", - "integrity": "sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==", - "dev": true, - "requires": { - "@gulpjs/messages": "^1.1.0", - "chalk": "^4.1.2", - "copy-props": "^4.0.0", - "gulplog": "^2.2.0", - "interpret": "^3.1.1", - "liftoff": "^5.0.1", - "mute-stdout": "^2.0.0", - "replace-homedir": "^2.0.0", - "semver-greatest-satisfied-range": "^2.0.0", - "string-width": "^4.2.3", - "v8flags": "^4.0.0", - "yargs": "^16.2.0" - } - }, - "gulp-jsdoc3": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-jsdoc3/-/gulp-jsdoc3-3.0.0.tgz", - "integrity": "sha512-rE2jAwCPA8XFi9g4V3Z3LPhZNjxuMTIYQVMjdqZAQpRfJITLVaUK3xfmiiNTMc7j+fT7pL8Q5yj7ZPRdwCJWNg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.1", - "beeper": "^2.0.0", - "debug": "^4.1.1", - "fancy-log": "^1.3.3", - "ink-docstrap": "^1.3.2", - "jsdoc": "4.0.0", - "map-stream": "0.0.7", - "tmp": "0.2.4" - } - }, - "gulp-jshint": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.1.0.tgz", - "integrity": "sha512-sP3NK8Y/1e58O0PH9t6s7DAr/lKDSUbIY207oWSeufM6/VclB7jJrIBcPCsyhrFTCDUl9DauePbt6VqP2vPM5w==", - "dev": true, - "requires": { - "lodash": "^4.12.0", - "minimatch": "5.1.0", - "plugin-error": "^0.1.2", - "rcloader": "^0.2.2", - "through2": "^2.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - } - } - }, - "gulp-mocha": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/gulp-mocha/-/gulp-mocha-8.0.0.tgz", - "integrity": "sha512-FdbBydfzszaES/gXfwD6RFq1yJTj4Z6328R1yqsmhf+t7hW2aj9ZD9Hz8boQShjZ9J8/w6tQBM5mePb8K2pbqA==", - "dev": true, - "requires": { - "dargs": "^7.0.0", - "execa": "^5.0.0", - "mocha": "^8.3.0", - "plugin-error": "^1.0.1", - "supports-color": "^8.1.1", - "through2": "^4.0.2" - }, - "dependencies": { - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true - }, - "chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "3.0.3", - "fsevents": "~2.3.1", - "glob-parent": "6.0.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - } - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - }, - "dependencies": { - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", - "dev": true - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", - "dev": true, - "requires": { - "chalk": "^4.0.0" - } - }, - "mocha": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", - "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", - "dev": true, - "requires": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.1", - "debug": "4.3.1", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "10.3.11", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "4.0.0", - "log-symbols": "4.0.0", - "minimatch": "5.1.0", - "ms": "2.1.3", - "nanoid": "3.3.8", - "serialize-javascript": "6.0.2", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.1.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" - } - }, - "plugin-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", - "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", - "dev": true, - "requires": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" - }, - "dependencies": { - "ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "requires": { - "ansi-wrap": "^0.1.0" - } - } - } - }, - "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "workerpool": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", - "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", - "dev": true - }, - "yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", - "dev": true - } - } - }, - "gulplog": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz", - "integrity": "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==", - "dev": true, - "requires": { - "glogg": "^2.2.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" - }, - "has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "requires": { - "has-symbols": "^1.0.3" - } - }, - "hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "requires": { - "function-bind": "^1.1.2" - } - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "htmlparser2": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", - "integrity": "sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==", - "dev": true, - "requires": { - "domelementtype": "1", - "domhandler": "2.3", - "domutils": "1.5", - "entities": "1.0", - "readable-stream": "1.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "dev": true - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", - "dev": true - } - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "devOptional": true - }, - "ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==" - }, - "import-fresh": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", - "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "devOptional": true - }, - "ink-docstrap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", - "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", - "dev": true, - "requires": { - "moment": "^2.14.1", - "sanitize-html": "^2.13.0" - } - }, - "intercept-stdout": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/intercept-stdout/-/intercept-stdout-0.1.2.tgz", - "integrity": "sha512-Umb41Ryp5FzLurfCRAWx+jjNAk8jsw2RTk2XPIwus+86h/Y2Eb4DfOWof/mZ6FBww8SoO45rJSlg25054/Di9w==", - "dev": true, - "requires": { - "lodash.toarray": "^3.0.0" - } - }, - "interpret": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", - "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", - "dev": true - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "dev": true, - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-arrayish": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", - "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, - "requires": { - "hasown": "^2.0.2" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - }, - "dependencies": { - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - } - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" - }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true - }, - "is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "dev": true, - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "dev": true, - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true - }, - "is-valid-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", - "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true - }, - "jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "requires": { - "@isaacs/cliui": "^8.0.2", - "@pkgjs/parseargs": "^0.11.0" - } - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "requires": { - "argparse": "^2.0.1" - } - }, - "js2xmlparser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz", - "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==", - "dev": true, - "requires": { - "xmlcreate": "^2.0.4" - } - }, - "jsdoc": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz", - "integrity": "sha512-tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg==", - "dev": true, - "requires": { - "@babel/parser": "^7.9.4", - "@jsdoc/salty": "^0.2.1", - "@types/markdown-it": "^12.2.3", - "bluebird": "^3.7.2", - "catharsis": "^0.9.0", - "escape-string-regexp": "^2.0.0", - "js2xmlparser": "^4.0.2", - "klaw": "^3.0.0", - "markdown-it": "14.1.0", - "markdown-it-anchor": "^8.4.1", - "marked": "^4.0.10", - "mkdirp": "^1.0.4", - "requizzle": "^0.2.3", - "strip-json-comments": "^3.1.0", - "underscore": "~1.13.2" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - } - } - }, - "jshint": { - "version": "2.13.6", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.6.tgz", - "integrity": "sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ==", - "dev": true, - "requires": { - "cli": "~1.0.0", - "console-browserify": "1.1.x", - "exit": "0.1.x", - "htmlparser2": "3.8.x", - "lodash": "~4.17.21", - "minimatch": "5.1.0", - "strip-json-comments": "1.0.x" - }, - "dependencies": { - "strip-json-comments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", - "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==", - "dev": true - } - } - }, - "json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" - }, - "json-text-sequence": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-text-sequence/-/json-text-sequence-1.0.1.tgz", - "integrity": "sha512-AYvyAj02ukg85KiFMLphUMFWcNDCSwmNNuoqmpHUyBr/MJOB0c3rQrsJgzM2ELv25yozY9s9NrORuqdP1vNLXQ==", - "requires": { - "@sovpro/delimited-stream": "^1.1.0" - } - }, - "kerberos": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.2.2.tgz", - "integrity": "sha512-42O7+/1Zatsc3MkxaMPpXcIl/ukIrbQaGoArZEAr6GcEi2qhfprOBYOPhj+YvSMJkEkdpTjApUx+2DuWaKwRhg==", - "optional": true, - "requires": { - "node-addon-api": "^6.1.0", - "prebuild-install": "^7.1.2" - } - }, - "keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "requires": { - "json-buffer": "3.0.1" - } - }, - "kind-of": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", - "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==", - "dev": true - }, - "klaw": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", - "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.9" - } - }, - "kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "dev": true - }, - "last-run": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz", - "integrity": "sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==", - "dev": true - }, - "lead": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz", - "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==", - "dev": true - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "liftoff": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.1.tgz", - "integrity": "sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==", - "dev": true, - "requires": { - "extend": "^3.0.2", - "findup-sync": "^5.0.0", - "fined": "^2.0.0", - "flagged-respawn": "^2.0.0", - "is-plain-object": "^5.0.0", - "rechoir": "^0.8.0", - "resolve": "^1.20.0" - } - }, - "linkify-it": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", - "dev": true, - "requires": { - "uc.micro": "^2.0.0" - } - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "requires": { - "p-locate": "^5.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash._arraycopy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz", - "integrity": "sha512-RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A==", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==", - "dev": true - }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==", - "dev": true - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==", - "dev": true - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==", - "dev": true - }, - "lodash.isobject": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", - "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==", - "dev": true, - "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "lodash.toarray": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-3.0.2.tgz", - "integrity": "sha512-ptkjUqvuHjTuMJJxiktJpZhxM5l60bEkfntJx+NFzdQd1bZVxfpTF1bhFYFqBrT4F0wZ1qx9KbVmHJV3Rfc7Tw==", - "dev": true, - "requires": { - "lodash._arraycopy": "^3.0.0", - "lodash._basevalues": "^3.0.0", - "lodash.keys": "^3.0.0" - } - }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - } - }, - "logform": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", - "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", - "dev": true, - "requires": { - "@colors/colors": "1.6.0", - "@types/triple-beam": "^1.3.2", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - } - }, - "loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", - "dev": true, - "requires": { - "get-func-name": "^2.0.1" - } - }, - "lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", - "dev": true - }, - "map-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==", - "dev": true - }, - "markdown-it": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", - "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", - "dev": true, - "requires": { - "argparse": "^2.0.1", - "entities": "^4.4.0", - "linkify-it": "^5.0.0", - "mdurl": "^2.0.0", - "punycode.js": "^2.3.1", - "uc.micro": "^2.1.0" - }, - "dependencies": { - "entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true - } - } - }, - "markdown-it-anchor": { - "version": "8.6.7", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", - "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", - "dev": true, - "requires": {} - }, - "marked": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", - "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", - "dev": true - }, - "math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" - }, - "md5": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", - "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", - "dev": true, - "requires": { - "charenc": "0.0.2", - "crypt": "0.0.2", - "is-buffer": "~1.1.6" - } - }, - "mdurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", - "dev": true - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "requires": { - "braces": "3.0.3", - "picomatch": "^2.3.1" - } - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "optional": true - }, - "minimatch": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", - "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", - "requires": { - "brace-expansion": "2.0.2" - } - }, - "minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "optional": true - }, - "minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==" - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "optional": true - }, - "mocha": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", - "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.3", - "browser-stdout": "^1.3.1", - "chokidar": "^3.5.3", - "debug": "^4.3.5", - "diff": "^5.2.0", - "escape-string-regexp": "^4.0.0", - "find-up": "^5.0.0", - "glob": "10.3.11", - "he": "^1.2.0", - "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", - "minimatch": "5.1.0", - "ms": "^2.1.3", - "serialize-javascript": "6.0.2", - "strip-json-comments": "^3.1.1", - "supports-color": "^8.1.1", - "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", - "yargs-unparser": "^2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "mocha-junit-reporter": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.0.tgz", - "integrity": "sha512-W83Ddf94nfLiTBl24aS8IVyFvO8aRDLlCvb+cKb/VEaN5dEbcqu3CXiTe8MQK2DvzS7oKE1RsFTxzN302GGbDQ==", - "dev": true, - "requires": { - "debug": "^4.3.4", - "md5": "^2.3.0", - "mkdirp": "~1.0.4", - "strip-ansi": "^6.0.1", - "xml": "^1.0.1" - } - }, - "moment": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", - "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "dev": true - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "multipart-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/multipart-stream/-/multipart-stream-2.0.1.tgz", - "integrity": "sha512-s2DhMKNH12ydxvLMIjE4lX5ZZsh0lusC1EWzXwg+haFfX/ODTt3+xYkUnGRLy119tVMLltbHnUiEKfuqdQySfA==", - "requires": { - "inherits": "^2.0.1", - "is-stream": "^1.0.1", - "sandwich-stream": "^1.0.0" - }, - "dependencies": { - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==" - } - } - }, - "mute-stdout": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz", - "integrity": "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==", - "dev": true - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "mv": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==", - "dev": true, - "optional": true, - "requires": { - "mkdirp": "~0.5.1", - "ncp": "~2.0.0", - "rimraf": "~2.4.0" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.6" - } - }, - "rimraf": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", - "dev": true, - "optional": true, - "requires": { - "glob": "10.3.11" - } - } - } - }, - "nan": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz", - "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==", - "dev": true, - "optional": true - }, - "nanoid": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", - "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", - "dev": true - }, - "napi-build-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", - "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", - "optional": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" - }, - "ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "dev": true, - "optional": true - }, - "node-abi": { - "version": "3.77.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", - "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", - "optional": true, - "requires": { - "semver": "7.5.3" - } - }, - "node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", - "optional": true - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "now-and-later": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz", - "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "dev": true, - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "dev": true, - "requires": { - "fn.name": "1.x.x" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "requires": { - "p-limit": "^3.0.2" - } - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "dev": true, - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", - "dev": true - }, - "parse-srcset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", - "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "dev": true, - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", - "dev": true - }, - "path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "requires": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - } - }, - "pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true - }, - "picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "plugin-error": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", - "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==", - "dev": true, - "requires": { - "ansi-cyan": "^0.1.1", - "ansi-red": "^0.1.1", - "arr-diff": "^1.0.1", - "arr-union": "^2.0.1", - "extend-shallow": "^1.1.2" - } - }, - "postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, - "requires": { - "nanoid": "3.3.8", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - } - }, - "prebuild-install": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", - "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", - "optional": true, - "requires": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^2.0.0", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "4.0.1", - "tar-fs": "2.1.3", - "tunnel-agent": "^0.6.0" - } - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "pump": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", - "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", - "optional": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" - }, - "punycode.js": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", - "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", - "dev": true - }, - "qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", - "requires": { - "side-channel": "^1.1.0" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "optional": true - } - } - }, - "rcfinder": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz", - "integrity": "sha512-rhSo812VIVaX7cxl33KkllHRwfLvjZL3lQedWEpQ27YlMFKZbFZsiVdCcQn/Z0FauLWxIpKrNREGuHbJFSi0Lw==", - "dev": true, - "requires": { - "lodash.clonedeep": "^4.3.2" - } - }, - "rcloader": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.2.2.tgz", - "integrity": "sha512-hSkFcFiLb5buT0X1fNI023M6tn0ywblKzF0hGzVCkTjEggT5tQUZI+fCG71utA7NiEyiBEc3trl/LDFFHzGIrw==", - "dev": true, - "requires": { - "lodash.assign": "^4.2.0", - "lodash.isobject": "^3.0.2", - "lodash.merge": "^4.6.0", - "rcfinder": "^0.1.6" - } - }, - "read": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", - "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", - "dev": true, - "requires": { - "mute-stream": "~0.0.4" - } - }, - "readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "rechoir": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", - "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", - "dev": true, - "requires": { - "resolve": "^1.20.0" - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", - "devOptional": true - }, - "replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", - "devOptional": true - }, - "replace-homedir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz", - "integrity": "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==", - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "requizzle": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz", - "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==", - "dev": true, - "requires": { - "lodash": "^4.17.21" - } - }, - "resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", - "dev": true, - "requires": { - "is-core-module": "^2.16.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - }, - "resolve-options": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz", - "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==", - "dev": true, - "requires": { - "value-or-function": "^4.0.0" - } - }, - "reusify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==" - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "10.3.11" - } - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "safe-json-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", - "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", - "dev": true, - "optional": true - }, - "safe-stable-stringify": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", - "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "sandwich-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sandwich-stream/-/sandwich-stream-1.0.0.tgz", - "integrity": "sha512-2dkauRpV97eUtQOf5wCVRQzu95TSCl6cV+LxmZODzj8gmafWjtTXrDZNU8CdnaJM3A4zabtsdg+4Nju36ncbdQ==" - }, - "sanitize-html": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.17.0.tgz", - "integrity": "sha512-dLAADUSS8rBwhaevT12yCezvioCA+bmUTPH/u57xKPT8d++voeYE6HeluA/bPbQ15TwDBG2ii+QZIEmYx8VdxA==", - "dev": true, - "requires": { - "deepmerge": "^4.2.2", - "escape-string-regexp": "^4.0.0", - "htmlparser2": "^8.0.0", - "is-plain-object": "^5.0.0", - "parse-srcset": "^1.0.2", - "postcss": "^8.3.11" - }, - "dependencies": { - "dom-serializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", - "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", - "dev": true, - "requires": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", - "entities": "^4.2.0" - } - }, - "domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true - }, - "domhandler": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", - "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", - "dev": true, - "requires": { - "domelementtype": "^2.3.0" - } - }, - "domutils": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", - "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", - "dev": true, - "requires": { - "dom-serializer": "^2.0.0", - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3" - } - }, - "entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true - }, - "htmlparser2": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", - "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", - "dev": true, - "requires": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "entities": "^4.4.0" - } - } - } - }, - "semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "optional": true, - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "optional": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "semver-greatest-satisfied-range": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz", - "integrity": "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==", - "dev": true, - "requires": { - "sver": "^1.8.3" - } - }, - "serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "should": { - "version": "13.2.3", - "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz", - "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==", - "dev": true, - "requires": { - "should-equal": "^2.0.0", - "should-format": "^3.0.3", - "should-type": "^1.4.0", - "should-type-adaptors": "^1.0.1", - "should-util": "^1.0.0" - } - }, - "should-equal": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz", - "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==", - "dev": true, - "requires": { - "should-type": "^1.4.0" - } - }, - "should-format": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz", - "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==", - "dev": true, - "requires": { - "should-type": "^1.3.0", - "should-type-adaptors": "^1.0.1" - } - }, - "should-type": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz", - "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==", - "dev": true - }, - "should-type-adaptors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz", - "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==", - "dev": true, - "requires": { - "should-type": "^1.3.0", - "should-util": "^1.0.0" - } - }, - "should-util": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz", - "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==", - "dev": true - }, - "side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - } - }, - "side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - } - }, - "side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - } - }, - "side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "simple-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", - "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", - "optional": true - }, - "simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "optional": true, - "requires": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "simple-swizzle": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", - "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", - "dev": true, - "requires": { - "is-arrayish": "^0.3.1" - } - }, - "source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true - }, - "sparkles": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz", - "integrity": "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==", - "dev": true - }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "dev": true - }, - "stream-composer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz", - "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==", - "dev": true, - "requires": { - "streamx": "^2.13.2" - } - }, - "stream-exhaust": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", - "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==", - "dev": true - }, - "stream-shift": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz", - "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==" - }, - "stream-to-array": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz", - "integrity": "sha512-UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA==", - "dev": true, - "requires": { - "any-promise": "^1.1.0" - } - }, - "streamx": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", - "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", - "devOptional": true, - "requires": { - "events-universal": "^1.0.0", - "fast-fifo": "^1.3.2", - "text-decoder": "^1.1.0" - } - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "string-width-cjs": { - "version": "npm:string-width@4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-ansi-cjs": { - "version": "npm:strip-ansi@6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "sver": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz", - "integrity": "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==", - "dev": true, - "requires": { - "semver": "7.5.3" - } - }, - "tar-fs": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz", - "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==", - "optional": true, - "requires": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "optional": true, - "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - } - }, - "teex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", - "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", - "devOptional": true, - "requires": { - "streamx": "^2.12.5" - } - }, - "text-decoder": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", - "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", - "devOptional": true, - "requires": { - "b4a": "^1.6.4" - } - }, - "text-decoding": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz", - "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==" - }, - "text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "dev": true - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" - }, - "through2": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", - "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", - "requires": { - "readable-stream": "3" - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", - "dev": true - }, - "tmp": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", - "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "to-through": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz", - "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==", - "dev": true, - "requires": { - "streamx": "^2.12.5" - } - }, - "triple-beam": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", - "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", - "dev": true - }, - "tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "optional": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "requires": { - "prelude-ls": "^1.2.1" - } - }, - "type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==" - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" - }, - "uc.micro": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", - "dev": true - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", - "dev": true - }, - "underscore": { - "version": "1.13.7", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", - "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", - "dev": true - }, - "undertaker": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz", - "integrity": "sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==", - "dev": true, - "requires": { - "bach": "^2.0.1", - "fast-levenshtein": "^3.0.0", - "last-run": "^2.0.0", - "undertaker-registry": "^2.0.0" - }, - "dependencies": { - "fast-levenshtein": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz", - "integrity": "sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==", - "dev": true, - "requires": { - "fastest-levenshtein": "^1.0.7" - } - } - } - }, - "undertaker-registry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz", - "integrity": "sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==", - "dev": true - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "requires": { - "punycode": "^2.1.0" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "v8flags": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz", - "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==", - "dev": true - }, - "value-or-function": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz", - "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==", - "dev": true - }, - "vinyl": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", - "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", - "devOptional": true, - "requires": { - "clone": "^2.1.2", - "remove-trailing-separator": "^1.1.0", - "replace-ext": "^2.0.0", - "teex": "^1.0.1" - } - }, - "vinyl-contents": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz", - "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==", - "dev": true, - "requires": { - "bl": "^5.0.0", - "vinyl": "^3.0.0" - }, - "dependencies": { - "bl": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz", - "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==", - "dev": true, - "requires": { - "buffer": "^6.0.3", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - } - } - }, - "vinyl-fs": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.2.tgz", - "integrity": "sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==", - "dev": true, - "requires": { - "fs-mkdirp-stream": "^2.0.1", - "glob-stream": "^8.0.3", - "graceful-fs": "^4.2.11", - "iconv-lite": "^0.6.3", - "is-valid-glob": "^1.0.0", - "lead": "^4.0.0", - "normalize-path": "3.0.0", - "resolve-options": "^2.0.0", - "stream-composer": "^1.0.2", - "streamx": "^2.14.0", - "to-through": "^3.0.0", - "value-or-function": "^4.0.0", - "vinyl": "^3.0.1", - "vinyl-sourcemap": "^2.0.0" - } - }, - "vinyl-sourcemap": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz", - "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==", - "dev": true, - "requires": { - "convert-source-map": "^2.0.0", - "graceful-fs": "^4.2.10", - "now-and-later": "^3.0.0", - "streamx": "^2.12.5", - "vinyl": "^3.0.0", - "vinyl-contents": "^2.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "requires": { - "isexe": "^2.0.0" - } - }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "winston": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz", - "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==", - "dev": true, - "requires": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.7.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.9.0" - } - }, - "winston-transport": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", - "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", - "dev": true, - "requires": { - "logform": "^2.7.0", - "readable-stream": "^3.6.2", - "triple-beam": "^1.3.0" - } - }, - "word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==" - }, - "workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true - }, - "wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "requires": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" - }, - "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "requires": { - "ansi-regex": "^6.0.1" - } - } - } - }, - "wrap-ansi-cjs": { - "version": "npm:wrap-ansi@7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "xml": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", - "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==", - "dev": true - }, - "xmlcreate": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz", - "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==", - "dev": true - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "optional": true - }, - "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "requires": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - } - }, - "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true - }, - "yargs-unparser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", - "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", - "dev": true, - "requires": { - "camelcase": "^6.0.0", - "decamelize": "^4.0.0", - "flat": "^5.0.2", - "is-plain-obj": "^2.1.0" - } - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" - }, - "yoctodelay": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/yoctodelay/-/yoctodelay-1.2.0.tgz", - "integrity": "sha512-12y/P9MSig9/5BEhBgylss+fkHiCRZCvYR81eH35NW9uw801cvJt31EAV+WOLcwZRZbLiIQl/hxcdXXXFmGvXg==", - "dev": true - } } } From 1124a2f11b0bae079b75cd673d2d68481a64e2a1 Mon Sep 17 00:00:00 2001 From: asinha Date: Tue, 30 Sep 2025 22:15:52 -0700 Subject: [PATCH 11/58] MLE-24382 : Fix for npm supply chain attack in Node Client --- package-lock.json | 460 +++++++++++++++++----------------------------- package.json | 16 +- 2 files changed, 180 insertions(+), 296 deletions(-) diff --git a/package-lock.json b/package-lock.json index a896f461..f6f95925 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "gulp-mocha": "^8.0.0", "intercept-stdout": "^0.1.2", "jshint": "^2.13.5", - "mocha": "^10.0.0", + "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", "read": "^1.0.7", @@ -114,13 +114,13 @@ } }, "node_modules/@dabh/diagnostics": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", - "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz", + "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==", "dev": true, "license": "MIT", "dependencies": { - "colorspace": "1.1.x", + "@so-ric/colorspace": "^1.1.6", "enabled": "2.0.x", "kuler": "^2.0.0" } @@ -293,18 +293,6 @@ "node": ">=12" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -328,21 +316,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/@jsdoc/salty": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz", @@ -401,6 +374,17 @@ "node": ">=14" } }, + "node_modules/@so-ric/colorspace": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@so-ric/colorspace/-/colorspace-1.1.6.tgz", + "integrity": "sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==", + "dev": true, + "license": "MIT", + "dependencies": { + "color": "^5.0.2", + "text-hex": "1.0.x" + } + }, "node_modules/@sovpro/delimited-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@sovpro/delimited-stream/-/delimited-stream-1.1.0.tgz", @@ -1128,24 +1112,6 @@ "wrap-ansi": "^7.0.0" } }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/clone": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", @@ -1157,43 +1123,51 @@ } }, "node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz", + "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==", "dev": true, "license": "MIT", "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" + "color-convert": "^3.0.1", + "color-string": "^2.0.0" + }, + "engines": { + "node": ">=18" } }, "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.0.tgz", + "integrity": "sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA==", "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "color-name": "^2.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=14.6" } }, "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz", + "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==", + "license": "MIT", + "engines": { + "node": ">=12.20" + } }, "node_modules/color-string": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", - "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.0.tgz", + "integrity": "sha512-gNVoDzpaSwvftp6Y8nqk97FtZoXP9Yj7KGYB8yIXuv0JcfqbYihTrd1OU5iZW9btfXde4YAOCRySBHT7O910MA==", "dev": true, "license": "MIT", "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" + "color-name": "^2.0.0" + }, + "engines": { + "node": ">=18" } }, "node_modules/color-support": { @@ -1206,34 +1180,6 @@ "color-support": "bin.js" } }, - "node_modules/color/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "dev": true, - "license": "MIT", - "dependencies": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -1339,12 +1285,12 @@ "dev": true }, "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "license": "MIT", "dependencies": { - "ms": "^2.1.3" + "ms": "2.1.2" }, "engines": { "node": ">=6.0" @@ -1462,9 +1408,9 @@ } }, "node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -2729,31 +2675,6 @@ "fsevents": "~2.3.1" } }, - "node_modules/gulp-mocha/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/gulp-mocha/node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, "node_modules/gulp-mocha/node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -2849,6 +2770,13 @@ "url": "https://opencollective.com/mochajs" } }, + "node_modules/gulp-mocha/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, "node_modules/gulp-mocha/node_modules/plugin-error": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", @@ -2891,22 +2819,6 @@ "node": ">=8.10.0" } }, - "node_modules/gulp-mocha/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/gulp-mocha/node_modules/workerpool": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", @@ -3185,13 +3097,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-arrayish": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", - "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", - "dev": true, - "license": "MIT" - }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -4060,31 +3965,31 @@ "optional": true }, "node_modules/mocha": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", - "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "version": "11.7.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.3.tgz", + "integrity": "sha512-iorDKDzBKgVk/npVkW2S+b57ekA9+xKWijVvNpgPMl1odxeB4HavgiydLN54Lhyn/jpcM+Z/BohCzIvHmfaPCw==", "dev": true, "license": "MIT", "dependencies": { - "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", - "chokidar": "^3.5.3", + "chokidar": "^4.0.1", "debug": "^4.3.5", - "diff": "^5.2.0", + "diff": "^7.0.0", "escape-string-regexp": "^4.0.0", "find-up": "^5.0.0", - "glob": "^8.1.0", + "glob": "^10.4.5", "he": "^1.2.0", "js-yaml": "^4.1.0", "log-symbols": "^4.1.0", - "minimatch": "^5.1.6", + "minimatch": "^9.0.5", "ms": "^2.1.3", + "picocolors": "^1.1.1", "serialize-javascript": "^6.0.2", "strip-json-comments": "^3.1.1", "supports-color": "^8.1.1", - "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", + "workerpool": "^9.2.0", + "yargs": "^17.7.2", + "yargs-parser": "^21.1.1", "yargs-unparser": "^2.0.0" }, "bin": { @@ -4092,7 +3997,7 @@ "mocha": "bin/mocha.js" }, "engines": { - "node": ">= 14.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/mocha-junit-reporter": { @@ -4112,20 +4017,75 @@ "mocha": ">=2.2.5" } }, - "node_modules/mocha/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "node_modules/mocha/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", "dev": true, "license": "MIT", "dependencies": { - "has-flag": "^4.0.0" + "readdirp": "^4.0.1" }, "engines": { - "node": ">=10" + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/mocha/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.18.0" }, "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/mocha/node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" } }, "node_modules/moment": { @@ -4139,9 +4099,9 @@ } }, "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "license": "MIT" }, "node_modules/multipart-stream": { @@ -5459,16 +5419,6 @@ "simple-concat": "^1.0.0" } }, - "node_modules/simple-swizzle": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", - "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -5583,12 +5533,12 @@ } }, "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^5.0.0" }, "engines": { "node": ">=8" @@ -6088,16 +6038,6 @@ "string-width": "^1.0.2 || 2" } }, - "node_modules/wide-align/node_modules/ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/wide-align/node_modules/is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -6122,28 +6062,15 @@ "node": ">=4" } }, - "node_modules/wide-align/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/winston": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz", - "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==", + "version": "3.18.3", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.18.3.tgz", + "integrity": "sha512-NoBZauFNNWENgsnC9YpgyYwOVrl2m58PpQ8lNHjV3kosGs7KJ7Npk9pCUE+WJlawVSe8mykWDKWFSVfs3QO9ww==", "dev": true, "license": "MIT", "dependencies": { "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", + "@dabh/diagnostics": "^2.0.8", "async": "^3.2.3", "is-stream": "^2.0.0", "logform": "^2.7.0", @@ -6183,27 +6110,24 @@ } }, "node_modules/workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz", + "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==", "dev": true, "license": "Apache-2.0" }, "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "license": "MIT", "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "node": ">=8" } }, "node_modules/wrap-ansi-cjs": { @@ -6224,68 +6148,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "license": "MIT" - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -6353,13 +6215,13 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, "license": "ISC", "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/yargs-unparser": { @@ -6378,6 +6240,16 @@ "node": ">=10" } }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 230b390f..0348f8a3 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gulp-mocha": "^8.0.0", "intercept-stdout": "^0.1.2", "jshint": "^2.13.5", - "mocha": "^10.0.0", + "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", "read": "^1.0.7", @@ -75,9 +75,18 @@ "vinyl": "^3.0.0" }, "overrides": { + "ansi-styles": "4.3.0", + "ansi-regex": "5.0.1", + "chalk": "4.1.2", "braces": "3.0.3", "brace-expansion": "2.0.2", + "color": "5.0.0", + "color-convert": "3.1.0", + "color-name": "2.0.0", + "color-string": "2.1.0", "cross-spawn":"7.0.6", + "debug": "4.3.6", + "is-arrayish": "0.3.2", "jsdoc": "4.0.0", "sanitize-html": "^2.13.0", "markdown-it": "14.1.0", @@ -88,7 +97,10 @@ "simple-get": "4.0.1", "semver": "7.5.3", "serialize-javascript": "6.0.2", + "supports-color": "7.2.0", + "strip-ansi": "6.0.0", "tar-fs": "2.1.3", - "tmp": "0.2.4" + "tmp": "0.2.4", + "wrap-ansi": "6.2.0" } } From 98e4353fe16acd4c7bcbd95a21d8807be6e4148e Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 1 Oct 2025 15:07:57 -0400 Subject: [PATCH 12/58] MLE-24511 Bumping server to latest 12 nightly Also updated the Gradle wrapper and ml-gradle, and now requiring Java 17. This also will make it easier to convert the Jenkinsfile to use Docker as well, instead of rpm's. --- .copyrightconfig | 2 +- CONTRIBUTING.md | 2 +- Jenkinsfile | 2 +- test-app/.env | 7 + test-app/build.gradle | 1 + test-app/docker-compose.yaml | 5 +- test-app/gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 +- test-app/gradlew | 305 +++++++++++------- test-app/gradlew.bat | 178 +++++----- 10 files changed, 302 insertions(+), 204 deletions(-) create mode 100644 test-app/.env diff --git a/.copyrightconfig b/.copyrightconfig index 67674203..f683475d 100644 --- a/.copyrightconfig +++ b/.copyrightconfig @@ -11,4 +11,4 @@ startyear: 2015 # - Dotfiles already skipped automatically # Enable by removing the leading '# ' from the next line and editing values. # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json \ No newline at end of file +filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0665d992..eafe5a77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ please see the README file. To run any of the steps below, first verify that you have the following available; [sdkman](https://sdkman.io/) is recommended for installing and maintaining versions of Java: -* Java 8.x +* Java 17.x You will also need to clone this repository locally and open a CLI in the root directory of the cloned project. diff --git a/Jenkinsfile b/Jenkinsfile index f2852566..7a969204 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -88,7 +88,7 @@ pipeline{ DMC_USER = credentials('MLBUILD_USER') DMC_PASSWORD = credentials('MLBUILD_PASSWORD') GRADLE_DIR=".gradle" - JAVA_HOME_DIR="/home/builder/java/openjdk-1.8.0-262" + JAVA_HOME_DIR="/home/builder/java/jdk-17.0.2" } stages{ stage('runtests-11.3.1'){ diff --git a/test-app/.env b/test-app/.env new file mode 100644 index 00000000..f62ebfcd --- /dev/null +++ b/test-app/.env @@ -0,0 +1,7 @@ +# Latest 12 nightly release: +MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12 + +# Latest MarkLogic release: +# MARKLOGIC_IMAGE="progressofficial/marklogic-db:latest" + +MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs diff --git a/test-app/build.gradle b/test-app/build.gradle index 7f09cda1..ed1d1a22 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -1,6 +1,7 @@ // Only used for setting up the test AppServer in MarkLogic plugins { id 'net.saliman.properties' version '1.5.2' + // Sticking with 5.0.0 until a bug in 6.0.x is fixed where LSQT config isn't deployed correctly. id "com.marklogic.ml-gradle" version "5.0.0" } diff --git a/test-app/docker-compose.yaml b/test-app/docker-compose.yaml index cd0181d0..1aa79bbc 100644 --- a/test-app/docker-compose.yaml +++ b/test-app/docker-compose.yaml @@ -3,8 +3,7 @@ name: node-client services: marklogic: - image: "progressofficial/marklogic-db:latest" - # image: "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12" + image: "${MARKLOGIC_IMAGE}" platform: linux/amd64 environment: - INSTALL_CONVERTERS=true @@ -12,7 +11,7 @@ services: - MARKLOGIC_ADMIN_USERNAME=admin - MARKLOGIC_ADMIN_PASSWORD=admin volumes: - - ./docker/marklogic/logs:/var/opt/MarkLogic/Logs + - ${MARKLOGIC_LOGS_VOLUME}:/var/opt/MarkLogic/Logs ports: - 8000-8002:8000-8002 - 8015-8017:8015-8017 diff --git a/test-app/gradle/wrapper/gradle-wrapper.jar b/test-app/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch literal 43764 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/test-app/gradlew.bat b/test-app/gradlew.bat index f9553162..5eed7ee8 100644 --- a/test-app/gradlew.bat +++ b/test-app/gradlew.bat @@ -1,84 +1,94 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 2bc330c1fa4988414c99ae0e52e97da15240f48c Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 2 Oct 2025 14:54:08 -0400 Subject: [PATCH 13/58] MLE-24531 Converting Jenkinsfile to use Docker Also bumped up tar-fs to resolve a vulnerability. Going to format Jenkinsfile in a subsequent PR. --- Jenkinsfile | 91 ++++++++++++++++++-------- package-lock.json | 6 +- package.json | 2 +- test-app/docker-compose-nightlies.yaml | 27 -------- test-app/docker-compose.yaml | 7 +- 5 files changed, 72 insertions(+), 61 deletions(-) delete mode 100644 test-app/docker-compose-nightlies.yaml diff --git a/Jenkinsfile b/Jenkinsfile index 7a969204..ba3cee20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,6 @@ @Library('shared-libraries') _ -def runTests(String type,String version){ - copyRPM type,version - setUpML '$WORKSPACE/xdmp/src/Mark*.rpm' +def runTests(){ sh ''' export JAVA_HOME=$JAVA_HOME_DIR export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR @@ -11,8 +9,11 @@ def runTests(String type,String version){ node --version npm --version npm ci + cd test-app - ./gradlew -i mlDeploy -g $PWD + ./gradlew -i mlTestConnections + ./gradlew -i mlDeploy + cd .. rm -rf $WORKSPACE/*.xml || true ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert || true @@ -21,6 +22,29 @@ def runTests(String type,String version){ ''' } + +def runDockerCompose(String markLogicDockerImage) { + cleanupDocker() + sh label:'mlsetup', script: '''#!/bin/bash + echo "Removing any running MarkLogic server and clean up MarkLogic data directory" + sudo /usr/local/sbin/mladmin remove + docker-compose down -v || true + sudo /usr/local/sbin/mladmin cleandata + cd node-client-api/test-app + MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE='''+markLogicDockerImage+''' docker-compose up -d --build + sleep 60s; + ''' +} + +def teardownAfterTests() { + updateWorkspacePermissions() + sh label:'mlcleanup', script: '''#!/bin/bash + cd node-client-api/test-app + docker-compose down -v || true + ''' + cleanupDocker() +} + def runAuditReport(){ sh ''' export PATH=${NODE_HOME_DIR}/bin:$PATH @@ -31,9 +55,7 @@ def runAuditReport(){ ''' } -def runE2ETests(String type,String version){ - copyRPM type,version - setUpML '$WORKSPACE/xdmp/src/Mark*.rpm' +def runE2ETests(){ sh ''' export PATH=${NODE_HOME_DIR}/bin:$PATH cd node-client-api @@ -69,20 +91,24 @@ def runE2ETests(String type,String version){ ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true ''' junit '**/*.xml' - } + pipeline{ agent none + triggers{ parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "") } + parameters{ booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions') } + options { checkoutToSubdirectory 'node-client-api' buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10') } + environment{ NODE_HOME_DIR= "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64" DMC_USER = credentials('MLBUILD_USER') @@ -95,8 +121,14 @@ pipeline{ agent {label 'nodeclientpool'} steps{ runAuditReport() - runTests('Release','11.3.1') - runE2ETests('Release','11.3.1') + runDockerCompose('progressofficial/marklogic-db:latest-11.3') + runTests() + runE2ETests() + } + post{ + always{ + teardownAfterTests() + } } } stage('regressions'){ @@ -110,8 +142,14 @@ pipeline{ } agent {label 'nodeclientpool'} steps{ - runTests('Latest','11') - runE2ETests('Latest','11') + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11') + runTests() + runE2ETests() + } + post{ + always{ + teardownAfterTests() + } } } stage('runtests-12-nightly'){ @@ -123,8 +161,14 @@ pipeline{ } agent {label 'nodeclientpool'} steps{ - runTests('Latest','12.0') - runE2ETests('Latest','12.0') + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') + runTests() + runE2ETests() + } + post{ + always{ + teardownAfterTests() + } } } stage('runtests-10-nightly'){ @@ -136,21 +180,14 @@ pipeline{ } agent {label 'nodeclientpool'} steps{ - runTests('Latest','10.0') - runE2ETests('Latest','10.0') + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10') + runTests() + runE2ETests() } - } - stage('runtests-10.0-10.2'){ - when{ - allOf{ - branch 'develop' - expression {return params.regressions} - } + post{ + always{ + teardownAfterTests() } - agent {label 'nodeclientpool'} - steps{ - runTests('Release','10.0-10.2') - runE2ETests('Release','10.0-10.2') } } } diff --git a/package-lock.json b/package-lock.json index f6f95925..fbf8afc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5615,9 +5615,9 @@ } }, "node_modules/tar-fs": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz", - "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", "license": "MIT", "optional": true, "dependencies": { diff --git a/package.json b/package.json index 0348f8a3..91a5a469 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "serialize-javascript": "6.0.2", "supports-color": "7.2.0", "strip-ansi": "6.0.0", - "tar-fs": "2.1.3", + "tar-fs": "2.1.4", "tmp": "0.2.4", "wrap-ansi": "6.2.0" } diff --git a/test-app/docker-compose-nightlies.yaml b/test-app/docker-compose-nightlies.yaml deleted file mode 100644 index 161a0fde..00000000 --- a/test-app/docker-compose-nightlies.yaml +++ /dev/null @@ -1,27 +0,0 @@ -version: '3.8' -# name: node-client-10-nightly -# name: node-client-10_0-10 -name: node-client-11-1-jenkins -#name: node-client-11-nightly-jenkins -# name: node-client-12-nightly - -services: - - marklogic: - #image: "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos:10.0-nightly-centos-1.1.1" - #image: "marklogicdb/marklogic-db:latest-10.0-10" - image: "marklogicdb/marklogic-db:11.1.0-centos-1.1.0" - # image: "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos:11.2.nightly-centos-1.1.2" - #image: "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-centos:12.0.nightly-centos-1.1.1" - platform: linux/amd64 - environment: - - INSTALL_CONVERTERS=true - - MARKLOGIC_INIT=true - - MARKLOGIC_ADMIN_USERNAME=admin - - MARKLOGIC_ADMIN_PASSWORD=admin - volumes: - - ./containerLogs:/var/opt/MarkLogic/Logs - ports: - - 8000-8017:8000-8017 - - 8024-8029:8024-8029 - - 8079:8079 diff --git a/test-app/docker-compose.yaml b/test-app/docker-compose.yaml index 1aa79bbc..8d0f2352 100644 --- a/test-app/docker-compose.yaml +++ b/test-app/docker-compose.yaml @@ -1,4 +1,4 @@ -name: node-client +name: docker-tests-node-client services: @@ -13,5 +13,6 @@ services: volumes: - ${MARKLOGIC_LOGS_VOLUME}:/var/opt/MarkLogic/Logs ports: - - 8000-8002:8000-8002 - - 8015-8017:8015-8017 + - 8000-8017:8000-8017 + - 8024-8029:8024-8029 + - 8079:8079 From 4d4120f48816fd039e3b1a45fd515ec747342f48 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Tue, 7 Oct 2025 10:59:08 -0400 Subject: [PATCH 14/58] MLE-24531 Formatted Jenkinsfile No functional changes, though did add some labels to scripts for better traceability. --- Jenkinsfile | 349 ++++++++++++++++++++++++++-------------------------- 1 file changed, 177 insertions(+), 172 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ba3cee20..a9e106b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,196 +1,201 @@ @Library('shared-libraries') _ -def runTests(){ - sh ''' - export JAVA_HOME=$JAVA_HOME_DIR - export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR - export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:${NODE_HOME_DIR}/bin:$PATH - cd node-client-api - node --version - npm --version - npm ci - - cd test-app - ./gradlew -i mlTestConnections - ./gradlew -i mlDeploy - - cd .. - rm -rf $WORKSPACE/*.xml || true - ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert || true - ./node_modules/.bin/gulp setupProxyTests || true - ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert || true - ''' +def runTests() { + sh label: 'deploy-test-app-and-run-tests', script: ''' + export JAVA_HOME=$JAVA_HOME_DIR + export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR + export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:${NODE_HOME_DIR}/bin:$PATH + cd node-client-api + node --version + npm --version + npm ci + + cd test-app + ./gradlew -i mlTestConnections + ./gradlew -i mlDeploy + cd .. + rm -rf $WORKSPACE/*.xml || true + ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert || true + ./node_modules/.bin/gulp setupProxyTests || true + ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert || true + ''' } def runDockerCompose(String markLogicDockerImage) { - cleanupDocker() - sh label:'mlsetup', script: '''#!/bin/bash + cleanupDocker() + sh label: 'run-docker-compose', script: '''#!/bin/bash echo "Removing any running MarkLogic server and clean up MarkLogic data directory" sudo /usr/local/sbin/mladmin remove docker-compose down -v || true sudo /usr/local/sbin/mladmin cleandata cd node-client-api/test-app - MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE='''+markLogicDockerImage+''' docker-compose up -d --build + MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build sleep 60s; - ''' + ''' } def teardownAfterTests() { - updateWorkspacePermissions() - sh label:'mlcleanup', script: '''#!/bin/bash + updateWorkspacePermissions() + sh label: 'teardown-docker', script: '''#!/bin/bash cd node-client-api/test-app docker-compose down -v || true ''' - cleanupDocker() + cleanupDocker() } -def runAuditReport(){ - sh ''' - export PATH=${NODE_HOME_DIR}/bin:$PATH - cd node-client-api - npm ci - rm -rf $WORKSPACE/npm-audit-report.json || true - npm audit -json || true > $WORKSPACE/npm-audit-report.json - ''' +def runAuditReport() { + sh label: 'run-audit-report', script: ''' + export PATH=${NODE_HOME_DIR}/bin:$PATH + cd node-client-api + npm ci + rm -rf $WORKSPACE/npm-audit-report.json || true + npm audit -json || true > $WORKSPACE/npm-audit-report.json + ''' } -def runE2ETests(){ - sh ''' - export PATH=${NODE_HOME_DIR}/bin:$PATH - cd node-client-api - node --version - npm --version - npm ci - node etc/test-setup-qa.js - # Adding sleep for the setups to complete before running test-complete - sleep 10 - node etc/test-setup-dmsdk-qa.js - sleep 10 - node config-optic/setupqa.js - sleep 30 - cd test-complete-app - ./gradlew -i mlDeploy -g $PWD - cd .. - ./node_modules/.bin/mocha --no-parallel -R xunit --timeout 60000 test-complete/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-complete-results.xml || true - cd test-complete-proxy - npm install gulp-cli - gulp loadToModulesDB - gulp generateFnClasses - gulp copyFnClasses - # Adding sleep for the gulp commands to complete. - sleep 30 - cp *.js ../test-complete/ - cp -R ml-modules/ ../test-complete - cd ../test-complete - ../node_modules/.bin/mocha -R xunit --timeout 60000 nodejs-ds-setup-docs.js - ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-required-params.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-required-params-results.xml || true - ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-error-map.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true - ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-multipleWorker.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true - ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true - ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true - ''' - junit '**/*.xml' +def runE2ETests() { + sh label: 'run-e2e-tests', script: ''' + export PATH=${NODE_HOME_DIR}/bin:$PATH + cd node-client-api + node --version + npm --version + npm ci + node etc/test-setup-qa.js + # Adding sleep for the setups to complete before running test-complete + sleep 10 + node etc/test-setup-dmsdk-qa.js + sleep 10 + node config-optic/setupqa.js + sleep 30 + cd test-complete-app + ./gradlew -i mlDeploy -g $PWD + cd .. + ./node_modules/.bin/mocha --no-parallel -R xunit --timeout 60000 test-complete/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-complete-results.xml || true + cd test-complete-proxy + npm install gulp-cli + gulp loadToModulesDB + gulp generateFnClasses + gulp copyFnClasses + # Adding sleep for the gulp commands to complete. + sleep 30 + cp *.js ../test-complete/ + cp -R ml-modules/ ../test-complete + cd ../test-complete + ../node_modules/.bin/mocha -R xunit --timeout 60000 nodejs-ds-setup-docs.js + ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-required-params.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-required-params-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-error-map.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-multipleWorker.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true + ''' + junit '**/*.xml' } -pipeline{ - agent none - - triggers{ - parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "") - } - - parameters{ - booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions') - } - - options { - checkoutToSubdirectory 'node-client-api' - buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10') - } - - environment{ - NODE_HOME_DIR= "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64" - DMC_USER = credentials('MLBUILD_USER') - DMC_PASSWORD = credentials('MLBUILD_PASSWORD') - GRADLE_DIR=".gradle" - JAVA_HOME_DIR="/home/builder/java/jdk-17.0.2" - } - stages{ - stage('runtests-11.3.1'){ - agent {label 'nodeclientpool'} - steps{ - runAuditReport() - runDockerCompose('progressofficial/marklogic-db:latest-11.3') - runTests() - runE2ETests() - } - post{ - always{ - teardownAfterTests() - } - } - } - stage('regressions'){ - parallel{ - stage('runtests-11-nightly'){ - when{ - allOf{ - branch 'develop' - expression {return params.regressions} - } - } - agent {label 'nodeclientpool'} - steps{ - runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11') - runTests() - runE2ETests() - } - post{ - always{ - teardownAfterTests() - } - } - } - stage('runtests-12-nightly'){ - when{ - allOf{ - branch 'develop' - expression {return params.regressions} - } - } - agent {label 'nodeclientpool'} - steps{ - runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') - runTests() - runE2ETests() - } - post{ - always{ - teardownAfterTests() - } - } - } - stage('runtests-10-nightly'){ - when{ - allOf{ - branch 'develop' - expression {return params.regressions} - } - } - agent {label 'nodeclientpool'} - steps{ - runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10') - runTests() - runE2ETests() - } - post{ - always{ - teardownAfterTests() - } - } - } - } - } - } -} \ No newline at end of file +pipeline { + agent none + + triggers { + parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "") + } + + parameters { + booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions') + } + + options { + checkoutToSubdirectory 'node-client-api' + buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10') + } + + environment { + NODE_HOME_DIR = "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64" + DMC_USER = credentials('MLBUILD_USER') + DMC_PASSWORD = credentials('MLBUILD_PASSWORD') + GRADLE_DIR = ".gradle" + JAVA_HOME_DIR = "/home/builder/java/jdk-17.0.2" + } + + stages { + + stage('runtests-11.3.1') { + agent { label 'nodeclientpool' } + steps { + runAuditReport() + runDockerCompose('progressofficial/marklogic-db:latest-11.3') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + + stage('regressions') { + parallel { + + stage('runtests-11-nightly') { + when { + allOf { + branch 'develop' + expression { return params.regressions } + } + } + agent { label 'nodeclientpool' } + steps { + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + + stage('runtests-12-nightly') { + when { + allOf { + branch 'develop' + expression { return params.regressions } + } + } + agent { label 'nodeclientpool' } + steps { + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + + stage('runtests-10-nightly') { + when { + allOf { + branch 'develop' + expression { return params.regressions } + } + } + agent { label 'nodeclientpool' } + steps { + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + } + } + } +} From 6eb9a5bc15cec78e00c0b8c61461412d48dc3c39 Mon Sep 17 00:00:00 2001 From: asinha Date: Wed, 8 Oct 2025 10:40:25 -0700 Subject: [PATCH 15/58] MLE-24639 : Update Node Client Jenkins file to use 11.3.2 instead of 11.3.1 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a9e106b2..1b3556f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -118,7 +118,7 @@ pipeline { stages { - stage('runtests-11.3.1') { + stage('runtests-11.3.2') { agent { label 'nodeclientpool' } steps { runAuditReport() From b2c2135d9da66d65a31f2a1ce8c5d25e9e958413 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 9 Oct 2025 07:57:08 -0400 Subject: [PATCH 16/58] MLE-24531 Bumping PR tests to latest 12 nightly Also moved docker-compose to the root folder for consistency with other repos. --- .copyrightconfig | 2 +- test-app/.env => .env | 0 .gitignore | 3 ++- CONTRIBUTING.md | 2 +- Jenkinsfile | 12 ++++++------ test-app/docker-compose.yaml => docker-compose.yaml | 0 6 files changed, 10 insertions(+), 9 deletions(-) rename test-app/.env => .env (100%) rename test-app/docker-compose.yaml => docker-compose.yaml (100%) diff --git a/.copyrightconfig b/.copyrightconfig index f683475d..aad2578d 100644 --- a/.copyrightconfig +++ b/.copyrightconfig @@ -11,4 +11,4 @@ startyear: 2015 # - Dotfiles already skipped automatically # Enable by removing the leading '# ' from the next line and editing values. # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md +filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml diff --git a/test-app/.env b/.env similarity index 100% rename from test-app/.env rename to .env diff --git a/.gitignore b/.gitignore index 190c5e44..3fddd55d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,11 +7,12 @@ tmp .settings .vscode .DS_Store + +docker test-app/build test-app/.gradle test-app/gradle-local.properties test-app/docker test-app/containerLogs - test-complete-app/build test-complete-app/.gradle \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eafe5a77..9b0057b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,6 @@ instance available for testing. If you are able to use Docker, run the following: - cd test-app docker-compose up -d --build This will create a container with the MarkLogic service. The MarkLogic service will take a minute or two to initialize. @@ -31,6 +30,7 @@ username and password are in the docker-compose.yaml file in the /test-app direc Once the container is finished initializing, you need to deploy the test application to the MarkLogic service. While still in the test-app directory run the following gradle command. + cd test-app ./gradlew -i mlDeploy Once the deploy has completed successfully, use "cd .." to return to the root directory of the project. diff --git a/Jenkinsfile b/Jenkinsfile index 1b3556f8..83e12633 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ def runDockerCompose(String markLogicDockerImage) { sudo /usr/local/sbin/mladmin remove docker-compose down -v || true sudo /usr/local/sbin/mladmin cleandata - cd node-client-api/test-app + cd node-client-api MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build sleep 60s; ''' @@ -38,7 +38,7 @@ def runDockerCompose(String markLogicDockerImage) { def teardownAfterTests() { updateWorkspacePermissions() sh label: 'teardown-docker', script: '''#!/bin/bash - cd node-client-api/test-app + cd node-client-api docker-compose down -v || true ''' cleanupDocker() @@ -89,7 +89,7 @@ def runE2ETests() { ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true ''' - junit '**/*.xml' + junit '**/*.xml' } pipeline { @@ -118,13 +118,13 @@ pipeline { stages { - stage('runtests-11.3.2') { + stage('pull-request-tests') { agent { label 'nodeclientpool' } steps { runAuditReport() - runDockerCompose('progressofficial/marklogic-db:latest-11.3') + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') runTests() - runE2ETests() + runE2ETests() } post { always { diff --git a/test-app/docker-compose.yaml b/docker-compose.yaml similarity index 100% rename from test-app/docker-compose.yaml rename to docker-compose.yaml From 730ff7924f3a1548efe119f91c3b49faa3e04c71 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 9 Oct 2025 15:44:00 -0400 Subject: [PATCH 17/58] MLE-24531 Added echo of Docker image --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 83e12633..1dc1298b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,9 @@ def runDockerCompose(String markLogicDockerImage) { docker-compose down -v || true sudo /usr/local/sbin/mladmin cleandata cd node-client-api + echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''" MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build + echo "Waiting 60s for MarkLogic to be ready to accept connections" sleep 60s; ''' } From a8b64517db1443337791c07f79e3feb6ee745f83 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Fri, 10 Oct 2025 09:30:24 -0400 Subject: [PATCH 18/58] MLE-24531 Added editorconfig And formatted Jenkinsfile with it. It's our standard editorconfig with some Copilot recommendations added for a Node project. --- .editorconfig | 22 +++++ Jenkinsfile | 228 +++++++++++++++++++++++++------------------------- 2 files changed, 136 insertions(+), 114 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..09aeb926 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,22 @@ +# http://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.{json,yml,yaml}] +indent_size = 2 + +[*.{js,ts}] +indent_size = 2 + +[*.java] +indent_size = 4 diff --git a/Jenkinsfile b/Jenkinsfile index 1dc1298b..0222bea4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ @Library('shared-libraries') _ def runTests() { - sh label: 'deploy-test-app-and-run-tests', script: ''' + sh label: 'deploy-test-app-and-run-tests', script: ''' export JAVA_HOME=$JAVA_HOME_DIR export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:${NODE_HOME_DIR}/bin:$PATH @@ -23,8 +23,8 @@ def runTests() { } def runDockerCompose(String markLogicDockerImage) { - cleanupDocker() - sh label: 'run-docker-compose', script: '''#!/bin/bash + cleanupDocker() + sh label: 'run-docker-compose', script: '''#!/bin/bash echo "Removing any running MarkLogic server and clean up MarkLogic data directory" sudo /usr/local/sbin/mladmin remove docker-compose down -v || true @@ -38,16 +38,16 @@ def runDockerCompose(String markLogicDockerImage) { } def teardownAfterTests() { - updateWorkspacePermissions() - sh label: 'teardown-docker', script: '''#!/bin/bash + updateWorkspacePermissions() + sh label: 'teardown-docker', script: '''#!/bin/bash cd node-client-api docker-compose down -v || true ''' - cleanupDocker() + cleanupDocker() } def runAuditReport() { - sh label: 'run-audit-report', script: ''' + sh label: 'run-audit-report', script: ''' export PATH=${NODE_HOME_DIR}/bin:$PATH cd node-client-api npm ci @@ -57,7 +57,7 @@ def runAuditReport() { } def runE2ETests() { - sh label: 'run-e2e-tests', script: ''' + sh label: 'run-e2e-tests', script: ''' export PATH=${NODE_HOME_DIR}/bin:$PATH cd node-client-api node --version @@ -91,113 +91,113 @@ def runE2ETests() { ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true ''' - junit '**/*.xml' + junit '**/*.xml' } pipeline { - agent none - - triggers { - parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "") - } - - parameters { - booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions') - } - - options { - checkoutToSubdirectory 'node-client-api' - buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10') - } - - environment { - NODE_HOME_DIR = "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64" - DMC_USER = credentials('MLBUILD_USER') - DMC_PASSWORD = credentials('MLBUILD_PASSWORD') - GRADLE_DIR = ".gradle" - JAVA_HOME_DIR = "/home/builder/java/jdk-17.0.2" - } - - stages { - - stage('pull-request-tests') { - agent { label 'nodeclientpool' } - steps { - runAuditReport() - runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') - runTests() - runE2ETests() - } - post { - always { - teardownAfterTests() - } - } - } - - stage('regressions') { - parallel { - - stage('runtests-11-nightly') { - when { - allOf { - branch 'develop' - expression { return params.regressions } - } - } - agent { label 'nodeclientpool' } - steps { - runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11') - runTests() - runE2ETests() - } - post { - always { - teardownAfterTests() - } - } - } - - stage('runtests-12-nightly') { - when { - allOf { - branch 'develop' - expression { return params.regressions } - } - } - agent { label 'nodeclientpool' } - steps { - runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') - runTests() - runE2ETests() - } - post { - always { - teardownAfterTests() - } - } - } - - stage('runtests-10-nightly') { - when { - allOf { - branch 'develop' - expression { return params.regressions } - } - } - agent { label 'nodeclientpool' } - steps { - runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10') - runTests() - runE2ETests() - } - post { - always { - teardownAfterTests() - } - } - } - } - } - } + agent none + + triggers { + parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "") + } + + parameters { + booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions') + } + + options { + checkoutToSubdirectory 'node-client-api' + buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10') + } + + environment { + NODE_HOME_DIR = "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64" + DMC_USER = credentials('MLBUILD_USER') + DMC_PASSWORD = credentials('MLBUILD_PASSWORD') + GRADLE_DIR = ".gradle" + JAVA_HOME_DIR = "/home/builder/java/jdk-17.0.2" + } + + stages { + + stage('pull-request-tests') { + agent { label 'nodeclientpool' } + steps { + runAuditReport() + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + + stage('regressions') { + parallel { + + stage('runtests-11-nightly') { + when { + allOf { + branch 'develop' + expression { return params.regressions } + } + } + agent { label 'nodeclientpool' } + steps { + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + + stage('runtests-12-nightly') { + when { + allOf { + branch 'develop' + expression { return params.regressions } + } + } + agent { label 'nodeclientpool' } + steps { + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + + stage('runtests-10-nightly') { + when { + allOf { + branch 'develop' + expression { return params.regressions } + } + } + agent { label 'nodeclientpool' } + steps { + runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10') + runTests() + runE2ETests() + } + post { + always { + teardownAfterTests() + } + } + } + } + } + } } From acb46604e1ef86460f334f2f2906d82ac0ef10fd Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Fri, 10 Oct 2025 12:04:16 -0400 Subject: [PATCH 19/58] MLE-24685 Refactor: Fixing copyright string The copyright checker expects "(c)" and will otherwise fail every file in a PR. --- NOTICE.txt | 2 +- config-optic/connectdef.js | 2 +- config-optic/setupqa.js | 6 +- config-optic/teardown.js | 2 +- config-optic/testlib.js | 2 +- etc/test-config-qa-ssl.js | 2 +- etc/test-config-qa.js | 2 +- etc/test-config.js | 2 +- etc/test-lib.js | 2 +- etc/test-setup-dmsdk-qa.js | 2 +- etc/test-setup-prompt.js | 2 +- etc/test-setup-qa.js | 2 +- etc/test-setup-users.js | 2 +- etc/test-setup.js | 2 +- etc/test-teardown-dmsdk-qa.js | 2 +- etc/test-teardown-nodeOpticFunctionalTest.js | 2 +- etc/test-teardown-qa.js | 2 +- etc/test-teardown.js | 2 +- etc/users-setup.js | 2 +- examples/all.js | 2 +- examples/before-load.js | 2 +- examples/example-util.js | 2 +- examples/optimistic-locking.js | 2 +- examples/patch-document.js | 2 +- examples/probe-document.js | 2 +- examples/progress-cloud-connection.js | 2 +- examples/query-builder.js | 2 +- examples/query-by-example.js | 2 +- examples/query-extract.js | 2 +- examples/query-parser.js | 2 +- examples/queryAll-documents.js | 2 +- examples/queryAll-rows.js | 2 +- examples/queryToReadAll-documents.js | 2 +- examples/queryToRemoveAll-documents.js | 2 +- examples/queryToTransformAll-documents.js | 2 +- examples/read-documents.js | 2 +- examples/read-metadata.js | 2 +- examples/read-rows.js | 2 +- examples/read-stream.js | 2 +- examples/readAll-documents.js | 2 +- examples/removeAllUris-documents.js | 2 +- examples/setup.js | 2 +- examples/transform-on-client.js | 2 +- examples/transformAll-documents.js | 2 +- examples/unnest-function.js | 2 +- examples/write-remove.js | 2 +- examples/write-stream.js | 2 +- examples/writeAll-documents.js | 2 +- gulpfile.js | 2 +- lib/basic-loader.js | 2 +- lib/ctsquery-builder.js | 2 +- lib/documents.js | 2 +- lib/endpoint-proxy.js | 2 +- lib/endpointDeclarationValidator.js | 2 +- lib/extlibs.js | 2 +- lib/graphs.js | 2 +- lib/internal.js | 4 +- lib/marklogic.js | 2 +- lib/mllog.js | 2 +- lib/mlutil.js | 2 +- lib/operation.js | 2 +- lib/optional.js | 2 +- lib/patch-builder.js | 4 +- lib/plan-builder-base.js | 2 +- lib/plan-builder-generated.js | 214 +-- lib/plan-builder.js | 2 +- lib/proxy-generator.js | 2 +- lib/query-builder.js | 2 +- lib/requester.js | 2 +- lib/resources-config.js | 2 +- lib/resources-exec.js | 2 +- lib/responder.js | 2 +- lib/rest-server-properties.js | 2 +- lib/rows.js | 2 +- lib/server-exec.js | 2 +- lib/server-types-generated.js | 2 +- lib/session-state.js | 2 +- lib/transactions.js | 2 +- lib/transforms.js | 2 +- lib/values-builder.js | 2 +- lib/values.js | 2 +- lib/vector-util.js | 2 +- lib/www-authenticate-patched/md5.js | 2 +- lib/www-authenticate-patched/parsers.js | 7 +- .../user-credentials.js | 8 +- .../www-authenticate.js | 7 +- .../lib/negative/badAtomicParameterTest.js | 2 +- .../lib/negative/badExecutionTest.js | 2 +- .../lib/negative/badGenerationTest.js | 2 +- test-basic-proxy/lib/negative/badIOTest.js | 2 +- .../lib/negative/badNodeParameterTest.js | 2 +- .../lib/positive/atomicReturnMappingTest.js | 2 +- .../lib/positive/decoratorBaseTest.js | 2 +- .../lib/positive/decoratorCustomTest.js | 2 +- test-basic-proxy/lib/positive/mimetypeTest.js | 2 +- test-basic-proxy/lib/positive/sessionsTest.js | 2 +- test-basic-proxy/lib/positive/streamerTest.js | 2 +- .../supplementalAtomicParameterTest.js | 2 +- .../positive/supplementalNodeParameterTest.js | 2 +- test-basic-proxy/lib/testutil.js | 2 +- test-basic-proxy/testGenerator.js | 2 +- test-basic/annTopK.js | 2 +- test-basic/basePath-test.js | 2 +- test-basic/bindingFromParam.js | 2 +- test-basic/client.js | 2 +- test-basic/cloud_authentication-test.js | 2 +- test-basic/data/echoModule.js | 2 +- test-basic/data/timestampTransform.js | 2 +- test-basic/data/transformAll_transform.js | 4 +- test-basic/data/versionService.js | 2 +- test-basic/digestauth-fips-nomd5load.js | 2 +- test-basic/docColTypes-test.js | 2 +- test-basic/documents-core.js | 2 +- test-basic/documents-data-movement-ingest.js | 2 +- .../documents-data-movement-queryAll.js | 2 +- test-basic/documents-data-movement-readAll.js | 2 +- .../documents-data-movement-removeAllUris.js | 2 +- .../documents-data-movement-rows-queryAll.js | 2 +- .../documents-data-movement-transformAll.js | 2 +- test-basic/documents-negative.js | 2 +- test-basic/documents-patch.js | 2 +- test-basic/documents-query.js | 2 +- test-basic/documents-quick.js | 6 +- test-basic/documents-read-xqy-docs.js | 2 +- test-basic/documents-temporal-document.js | 2 +- test-basic/documents-temporal-patch.js | 2 +- test-basic/documents-temporal-protect.js | 2 +- test-basic/documents-temporal-wipe.js | 2 +- test-basic/documents-temporal.js | 2 +- test-basic/documents-transform.js | 2 +- test-basic/documents-version.js | 2 +- test-basic/endpoint-caller.js | 2 +- test-basic/endpoint-proxy.js | 2 +- test-basic/errors.js | 2 +- test-basic/extlibs.js | 2 +- test-basic/fromDocDescriptors-test.js | 2 +- test-basic/graphs.js | 2 +- test-basic/joinDocCols-test.js | 2 +- test-basic/lockForUpdate-test.js | 2 +- test-basic/logging.js | 2 +- test-basic/optic-fromDocUris.js | 2 +- test-basic/optic-patchBuilder.js | 2 +- test-basic/optic-remove.js | 2 +- test-basic/optic-update-execute.js | 2 +- test-basic/optic-vector.js | 2 +- test-basic/patch-builder.js | 2 +- test-basic/plan-aggregates.js | 2 +- test-basic/plan-builder-base.js | 2 +- ...lan-builder-cts-tests-with-string-input.js | 2 +- test-basic/plan-builder-generated.js | 1412 ++++++++--------- test-basic/plan-composers.js | 2 +- test-basic/plan-documents.js | 2 +- test-basic/plan-expressions.js | 2 +- test-basic/plan-lexicons.js | 2 +- test-basic/plan-literals.js | 2 +- test-basic/plan-modifiers.js | 2 +- test-basic/plan-nodes.js | 2 +- test-basic/plan-processors.js | 2 +- test-basic/plan-search.js | 2 +- test-basic/plan-triples.js | 2 +- test-basic/plan-views.js | 2 +- test-basic/probe.js | 2 +- test-basic/query-builder.js | 2 +- test-basic/redactionTest.js | 2 +- test-basic/removeAll.js | 2 +- test-basic/resources-config.js | 2 +- test-basic/resources-exec.js | 2 +- test-basic/rest-server-properties.js | 2 +- test-basic/rows-graphQl.js | 2 +- test-basic/rows.js | 2 +- test-basic/server-exec.js | 2 +- test-basic/service-caller.js | 2 +- test-basic/shortest-path.js | 2 +- test-basic/ssl-min-allow-tls-test.js | 2 +- test-basic/suggest.js | 2 +- test-basic/test-internal.js | 2 +- test-basic/test-util.js | 2 +- test-basic/timestamp.js | 2 +- test-basic/transactions.js | 4 +- test-basic/transformDoc-test.js | 2 +- test-basic/unnestTest.js | 2 +- test-basic/validateDoc-test.js | 2 +- test-basic/values-builder.js | 2 +- test-basic/values.js | 2 +- test-basic/vector-util-test.js | 2 +- test-basic/write-test.js | 2 +- test-complete-proxy/gulpfile.js | 4 +- .../insertFromMultipleStreams.js | 6 +- test-complete-proxy/nodejs-ds-dynamic.js | 4 +- test-complete-proxy/nodejs-ds-error-map.js | 4 +- .../nodejs-ds-multipleWorker.js | 70 +- .../nodejs-ds-required-params.js | 4 +- test-complete-proxy/nodejs-ds-setup-docs.js | 4 +- test-complete-proxy/nodejs-ds-transactions.js | 16 +- test-complete-proxy/searchMultiple.js | 4 +- .../setup/ds-qa-test-setup-users.js | 2 +- test-complete-proxy/setup/ds-qa-test-setup.js | 2 +- test-complete/data/emptyTransform.js | 2 +- test-complete/data/paramTransform.js | 2 +- test-complete/data/sourceParams.js | 2 +- test-complete/data/sourceParamsNegative.js | 2 +- test-complete/data/sourceSimple.js | 2 +- test-complete/data/sourceSimpleNegative.js | 2 +- test-complete/data/timestampTransform.js | 2 +- test-complete/nodejs-config-patch-negative.js | 2 +- test-complete/nodejs-config-patch.js | 2 +- test-complete/nodejs-config-query-negative.js | 2 +- test-complete/nodejs-config-query.js | 2 +- test-complete/nodejs-database-concurrency.js | 2 +- .../nodejs-database-connection-negative.js | 2 +- .../nodejs-database-connection-ssl.js | 2 +- test-complete/nodejs-dmsdk-QueryToRdAll.js | 2 +- test-complete/nodejs-dmsdk-UpdAndRdAll.js | 2 +- .../nodejs-dmsdk-queryToTransformAll.js | 2 +- test-complete/nodejs-dmsdk-queryall.js | 2 +- test-complete/nodejs-dmsdk-readall-1.js | 2 +- test-complete/nodejs-dmsdk-removeAllUris.js | 2 +- test-complete/nodejs-dmsdk-rows-queryAll.js | 2 +- test-complete/nodejs-dmsdk-transformAll.js | 2 +- .../nodejs-dmsdk-txtFiles-transformAll.js | 2 +- test-complete/nodejs-dmsdk-writeall.js | 2 +- .../nodejs-dmsdk-xmlFiles-transformAll.js | 2 +- test-complete/nodejs-documents-binary-gif.js | 2 +- test-complete/nodejs-documents-binary-mp3.js | 2 +- test-complete/nodejs-documents-binary-pdf.js | 2 +- .../nodejs-documents-binary-range.js | 2 +- .../nodejs-documents-crud-negative.js | 2 +- test-complete/nodejs-documents-crud.js | 2 +- .../nodejs-documents-extract-negative.js | 2 +- test-complete/nodejs-documents-extract.js | 2 +- .../nodejs-documents-metadata-values.js | 2 +- test-complete/nodejs-documents-parse-2.js | 2 +- test-complete/nodejs-documents-parse.js | 2 +- test-complete/nodejs-documents-patch-2.js | 2 +- .../nodejs-documents-patch-datatypes.js | 2 +- .../nodejs-documents-patch-metadata.js | 2 +- .../nodejs-documents-patch-negative.js | 2 +- test-complete/nodejs-documents-patch-null.js | 2 +- .../nodejs-documents-patch-stream.js | 2 +- test-complete/nodejs-documents-patch.js | 2 +- test-complete/nodejs-documents-qbe.js | 2 +- test-complete/nodejs-documents-query-2.js | 2 +- test-complete/nodejs-documents-query-3.js | 2 +- test-complete/nodejs-documents-query-facet.js | 2 +- .../nodejs-documents-query-geo-double.js | 2 +- .../nodejs-documents-query-geo-region.js | 2 +- test-complete/nodejs-documents-query-geo.js | 2 +- .../nodejs-documents-query-negative.js | 2 +- .../nodejs-documents-query-options.js | 2 +- test-complete/nodejs-documents-query-slice.js | 2 +- test-complete/nodejs-documents-query-sort.js | 2 +- .../nodejs-documents-query-stream.js | 2 +- test-complete/nodejs-documents-query.js | 2 +- test-complete/nodejs-documents-quick.js | 2 +- test-complete/nodejs-documents-read-chunk.js | 2 +- .../nodejs-documents-remove-multiple.js | 2 +- .../nodejs-documents-removeAll-all.js | 2 +- .../nodejs-documents-removeAll-negative.js | 2 +- test-complete/nodejs-documents-removeAll.js | 2 +- .../nodejs-documents-resources-config.js | 2 +- test-complete/nodejs-documents-resources.js | 2 +- test-complete/nodejs-documents-suggest.js | 2 +- .../nodejs-documents-transaction-combo.js | 2 +- .../nodejs-documents-transaction-remove.js | 2 +- .../nodejs-documents-transaction-timelimit.js | 2 +- .../nodejs-documents-transaction-withstate.js | 2 +- test-complete/nodejs-documents-transaction.js | 2 +- .../nodejs-documents-values-negative.js | 2 +- test-complete/nodejs-documents-values.js | 2 +- test-complete/nodejs-documents-write-large.js | 2 +- .../nodejs-documents-write-stream.js | 2 +- test-complete/nodejs-extlibs-negative.js | 2 +- test-complete/nodejs-extlibs.js | 2 +- test-complete/nodejs-graphs-content-type.js | 2 +- test-complete/nodejs-graphs-default.js | 2 +- test-complete/nodejs-graphs-merge-stream.js | 2 +- test-complete/nodejs-graphs-merge.js | 2 +- test-complete/nodejs-graphs-negative.js | 2 +- .../nodejs-graphs-overwrite-stream.js | 2 +- test-complete/nodejs-graphs-overwrite.js | 2 +- .../nodejs-graphs-read-write-stream.js | 2 +- test-complete/nodejs-graphs-repair.js | 2 +- .../nodejs-graphs-transaction-remove.js | 2 +- test-complete/nodejs-graphs-transaction.js | 2 +- test-complete/nodejs-issue-104.js | 2 +- test-complete/nodejs-issue-108-109.js | 2 +- test-complete/nodejs-issue-110.js | 2 +- test-complete/nodejs-issue-115.js | 2 +- test-complete/nodejs-issue-257.js | 2 +- test-complete/nodejs-issue-99.js | 2 +- .../nodejs-javascript-eval-negative.js | 2 +- .../nodejs-javascript-eval-params.js | 2 +- test-complete/nodejs-javascript-eval.js | 2 +- ...odejs-javascript-invoke-params-negative.js | 2 +- .../nodejs-javascript-invoke-params.js | 2 +- ...odejs-javascript-invoke-simple-negative.js | 2 +- .../nodejs-javascript-invoke-simple.js | 2 +- test-complete/nodejs-logger-bunyan.js | 2 +- test-complete/nodejs-logger-winston.js | 2 +- test-complete/nodejs-optic-cts-queries.js | 2 +- test-complete/nodejs-optic-from-lexicons.js | 2 +- test-complete/nodejs-optic-from-literals.js | 2 +- test-complete/nodejs-optic-from-sparql.js | 2 +- test-complete/nodejs-optic-from-sql.js | 2 +- test-complete/nodejs-optic-from-triples.js | 2 +- test-complete/nodejs-optic-from-views.js | 2 +- test-complete/nodejs-optic-generate-views.js | 2 +- test-complete/nodejs-optic-nodes.js | 2 +- test-complete/nodejs-optic-read-file.js | 2 +- test-complete/nodejs-optic-redaction.js | 2 +- .../nodejs-optimistic-locking-stream.js | 2 +- test-complete/nodejs-optimistic-locking.js | 2 +- test-complete/nodejs-pitq-documents.js | 2 +- test-complete/nodejs-pitq-graphs.js | 2 +- test-complete/nodejs-pitq-values.js | 2 +- test-complete/nodejs-process-env.js | 2 +- test-complete/nodejs-serverprops.js | 2 +- test-complete/nodejs-sparql-update.js | 2 +- test-complete/nodejs-sparql.js | 2 +- test-complete/nodejs-temporal-advance-lsqt.js | 2 +- test-complete/nodejs-temporal-insert-bulk.js | 2 +- test-complete/nodejs-temporal-insert-lsqt.js | 2 +- .../nodejs-temporal-insert-transform.js | 2 +- test-complete/nodejs-temporal-insert.js | 2 +- test-complete/nodejs-temporal-lsqt-query.js | 2 +- test-complete/nodejs-temporal-patch.js | 2 +- .../nodejs-temporal-period-compare-query.js | 2 +- ...mporal-period-range-query-multiple-axis.js | 2 +- .../nodejs-temporal-period-range-query.js | 2 +- .../nodejs-temporal-protect-delete.js | 2 +- .../nodejs-temporal-protect-update.js | 2 +- test-complete/nodejs-temporal-protect-wipe.js | 2 +- .../nodejs-temporal-transaction-commit.js | 2 +- .../nodejs-temporal-transaction-rollback.js | 2 +- test-complete/nodejs-temporal-update-lsqt.js | 2 +- test-complete/nodejs-temporal-update.js | 2 +- test-complete/nodejs-transform-combine.js | 2 +- test-complete/nodejs-transform-empty.js | 2 +- test-complete/nodejs-transform-javascript.js | 2 +- test-complete/nodejs-transform-negative.js | 2 +- test-complete/nodejs-transform-params.js | 2 +- .../nodejs-transform-save-json-as-xml.js | 2 +- test-complete/nodejs-transform-xquery.js | 2 +- test-complete/nodejs-transform-xslt.js | 2 +- test-complete/nodejs-xquery-eval-negative.js | 2 +- test-complete/nodejs-xquery-eval.js | 2 +- .../nodejs-xquery-invoke-params-negative.js | 2 +- test-complete/nodejs-xquery-invoke-params.js | 2 +- .../nodejs-xquery-invoke-simple-negative.js | 2 +- test-complete/nodejs-xquery-invoke-simple.js | 2 +- 350 files changed, 1228 insertions(+), 1224 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index ad7950a3..855997da 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,6 +1,6 @@ MarkLogic® Node Client API -Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at diff --git a/config-optic/connectdef.js b/config-optic/connectdef.js index fcda29ec..ac5c3885 100644 --- a/config-optic/connectdef.js +++ b/config-optic/connectdef.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/config-optic/setupqa.js b/config-optic/setupqa.js index 464fa7dd..57b5e1a5 100755 --- a/config-optic/setupqa.js +++ b/config-optic/setupqa.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; @@ -16,7 +16,7 @@ var testName = clientConnectdef.name; var planServerdef = clientConnectdef.plan; var testLoad = require('./loaddata.js'); -var testUser = require('./userconfig.js'); +var testUser = require('./userconfig.js'); var db = marklogic.createDatabaseClient({ host: planServerdef.host, @@ -64,7 +64,7 @@ check.then(function(response) { } }).result(); }) -.then(function(response){ +.then(function(response){ console.log('setting up rest eval role'); return testUser.addRestEvalRole(manager).result(); }) diff --git a/config-optic/teardown.js b/config-optic/teardown.js index f1f05020..5e519ebb 100644 --- a/config-optic/teardown.js +++ b/config-optic/teardown.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/config-optic/testlib.js b/config-optic/testlib.js index 9e055670..a05e709f 100644 --- a/config-optic/testlib.js +++ b/config-optic/testlib.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var valcheck = require('../node_modules/core-util-is/lib/util.js'); diff --git a/etc/test-config-qa-ssl.js b/etc/test-config-qa-ssl.js index e3d88aa0..ff65507c 100644 --- a/etc/test-config-qa-ssl.js +++ b/etc/test-config-qa-ssl.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var testHost = 'localhost'; diff --git a/etc/test-config-qa.js b/etc/test-config-qa.js index a32ebfb6..e4aaa140 100644 --- a/etc/test-config-qa.js +++ b/etc/test-config-qa.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var testHost = 'localhost'; diff --git a/etc/test-config.js b/etc/test-config.js index 193dc036..3ceda5f2 100644 --- a/etc/test-config.js +++ b/etc/test-config.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ let testHost = 'localhost'; diff --git a/etc/test-lib.js b/etc/test-lib.js index 5f09262b..78ebfd7a 100644 --- a/etc/test-lib.js +++ b/etc/test-lib.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var valcheck = require('core-util-is'); diff --git a/etc/test-setup-dmsdk-qa.js b/etc/test-setup-dmsdk-qa.js index ad4e8c2c..68ebf404 100644 --- a/etc/test-setup-dmsdk-qa.js +++ b/etc/test-setup-dmsdk-qa.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var valcheck = require('core-util-is'); diff --git a/etc/test-setup-prompt.js b/etc/test-setup-prompt.js index f6fe5ffb..9deb89de 100644 --- a/etc/test-setup-prompt.js +++ b/etc/test-setup-prompt.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var read = require("read"); var mlutil = require('../lib/mlutil.js'); diff --git a/etc/test-setup-qa.js b/etc/test-setup-qa.js index 34c28184..0b8f1615 100644 --- a/etc/test-setup-qa.js +++ b/etc/test-setup-qa.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var valcheck = require('core-util-is'); diff --git a/etc/test-setup-users.js b/etc/test-setup-users.js index 5f14f1e9..87d8c7fd 100644 --- a/etc/test-setup-users.js +++ b/etc/test-setup-users.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var valcheck = require('core-util-is'); diff --git a/etc/test-setup.js b/etc/test-setup.js index 6885b210..7bf1265f 100644 --- a/etc/test-setup.js +++ b/etc/test-setup.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const fs = require('fs'); const valcheck = require('core-util-is'); diff --git a/etc/test-teardown-dmsdk-qa.js b/etc/test-teardown-dmsdk-qa.js index c4aaf5f9..f8c5718b 100644 --- a/etc/test-teardown-dmsdk-qa.js +++ b/etc/test-teardown-dmsdk-qa.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../lib/marklogic.js'); diff --git a/etc/test-teardown-nodeOpticFunctionalTest.js b/etc/test-teardown-nodeOpticFunctionalTest.js index c4aaf5f9..f8c5718b 100644 --- a/etc/test-teardown-nodeOpticFunctionalTest.js +++ b/etc/test-teardown-nodeOpticFunctionalTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../lib/marklogic.js'); diff --git a/etc/test-teardown-qa.js b/etc/test-teardown-qa.js index d70094ab..b9ba184b 100644 --- a/etc/test-teardown-qa.js +++ b/etc/test-teardown-qa.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../lib/marklogic.js'); diff --git a/etc/test-teardown.js b/etc/test-teardown.js index 4b1445f6..f4d68da1 100644 --- a/etc/test-teardown.js +++ b/etc/test-teardown.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../lib/marklogic.js'); diff --git a/etc/users-setup.js b/etc/users-setup.js index 9102836b..c5f027f5 100644 --- a/etc/users-setup.js +++ b/etc/users-setup.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var valcheck = require('core-util-is'); diff --git a/examples/all.js b/examples/all.js index d9a8c768..60610059 100644 --- a/examples/all.js +++ b/examples/all.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var fs = require('fs'); diff --git a/examples/before-load.js b/examples/before-load.js index 2c572c27..5c9bd248 100644 --- a/examples/before-load.js +++ b/examples/before-load.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var fs = require('fs'); diff --git a/examples/example-util.js b/examples/example-util.js index 29744d05..8f496c43 100644 --- a/examples/example-util.js +++ b/examples/example-util.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var fs = require('fs'); diff --git a/examples/optimistic-locking.js b/examples/optimistic-locking.js index 5488e9cd..cd740fc0 100644 --- a/examples/optimistic-locking.js +++ b/examples/optimistic-locking.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/patch-document.js b/examples/patch-document.js index 4a04be58..2fe02c7e 100644 --- a/examples/patch-document.js +++ b/examples/patch-document.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/probe-document.js b/examples/probe-document.js index bec3b807..da7abc95 100644 --- a/examples/probe-document.js +++ b/examples/probe-document.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/progress-cloud-connection.js b/examples/progress-cloud-connection.js index 11931ca6..702792b9 100644 --- a/examples/progress-cloud-connection.js +++ b/examples/progress-cloud-connection.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ /* This file provides an example for the users to help them connect to Progress cloud using the apiKey and host diff --git a/examples/query-builder.js b/examples/query-builder.js index 0e01af25..2fb36386 100644 --- a/examples/query-builder.js +++ b/examples/query-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/query-by-example.js b/examples/query-by-example.js index 65f62790..fa4bc70c 100644 --- a/examples/query-by-example.js +++ b/examples/query-by-example.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/query-extract.js b/examples/query-extract.js index eab1ca97..803c70bc 100644 --- a/examples/query-extract.js +++ b/examples/query-extract.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/query-parser.js b/examples/query-parser.js index 255b2b66..5a5bd112 100644 --- a/examples/query-parser.js +++ b/examples/query-parser.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/queryAll-documents.js b/examples/queryAll-documents.js index a4b2be89..1653e408 100644 --- a/examples/queryAll-documents.js +++ b/examples/queryAll-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ let exutil = require('./example-util.js'); diff --git a/examples/queryAll-rows.js b/examples/queryAll-rows.js index bca00f36..6a1275c7 100644 --- a/examples/queryAll-rows.js +++ b/examples/queryAll-rows.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/queryToReadAll-documents.js b/examples/queryToReadAll-documents.js index 59d9352c..64ca8cc4 100644 --- a/examples/queryToReadAll-documents.js +++ b/examples/queryToReadAll-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/queryToRemoveAll-documents.js b/examples/queryToRemoveAll-documents.js index af732cac..960e29e6 100644 --- a/examples/queryToRemoveAll-documents.js +++ b/examples/queryToRemoveAll-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/queryToTransformAll-documents.js b/examples/queryToTransformAll-documents.js index 51daf319..3df43f00 100644 --- a/examples/queryToTransformAll-documents.js +++ b/examples/queryToTransformAll-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/read-documents.js b/examples/read-documents.js index 3f2f3f3a..380a1e6e 100644 --- a/examples/read-documents.js +++ b/examples/read-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/read-metadata.js b/examples/read-metadata.js index 663f40dd..203b739b 100644 --- a/examples/read-metadata.js +++ b/examples/read-metadata.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/read-rows.js b/examples/read-rows.js index 6ff3c4e4..0f6b3666 100644 --- a/examples/read-rows.js +++ b/examples/read-rows.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/read-stream.js b/examples/read-stream.js index 31c98a87..9b9fba12 100644 --- a/examples/read-stream.js +++ b/examples/read-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/readAll-documents.js b/examples/readAll-documents.js index 38dc5b7f..011c8ac8 100644 --- a/examples/readAll-documents.js +++ b/examples/readAll-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ let exutil = require('./example-util.js'); diff --git a/examples/removeAllUris-documents.js b/examples/removeAllUris-documents.js index 7889ee66..2e728351 100644 --- a/examples/removeAllUris-documents.js +++ b/examples/removeAllUris-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/setup.js b/examples/setup.js index 41666eda..2102a83b 100644 --- a/examples/setup.js +++ b/examples/setup.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var fs = require('fs'); diff --git a/examples/transform-on-client.js b/examples/transform-on-client.js index 22f935b0..97acc00a 100644 --- a/examples/transform-on-client.js +++ b/examples/transform-on-client.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/transformAll-documents.js b/examples/transformAll-documents.js index 41308825..b5750b7e 100644 --- a/examples/transformAll-documents.js +++ b/examples/transformAll-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/unnest-function.js b/examples/unnest-function.js index 913abddb..c6e6dd69 100644 --- a/examples/unnest-function.js +++ b/examples/unnest-function.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const exutil = require('./example-util.js'); diff --git a/examples/write-remove.js b/examples/write-remove.js index 841e3d52..079b5cf2 100644 --- a/examples/write-remove.js +++ b/examples/write-remove.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var exutil = require('./example-util.js'); diff --git a/examples/write-stream.js b/examples/write-stream.js index 933f1e6b..956b9893 100644 --- a/examples/write-stream.js +++ b/examples/write-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var fs = require('fs'); diff --git a/examples/writeAll-documents.js b/examples/writeAll-documents.js index 7a390c04..4529f1d6 100644 --- a/examples/writeAll-documents.js +++ b/examples/writeAll-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ let exutil = require('./example-util.js'); diff --git a/gulpfile.js b/gulpfile.js index 5c354cfd..ac3ec460 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const path = require('path'); const gulp = require('gulp'); diff --git a/lib/basic-loader.js b/lib/basic-loader.js index e652bf7a..f37573be 100644 --- a/lib/basic-loader.js +++ b/lib/basic-loader.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/ctsquery-builder.js b/lib/ctsquery-builder.js index 22c42279..583f614a 100644 --- a/lib/ctsquery-builder.js +++ b/lib/ctsquery-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/documents.js b/lib/documents.js index b7df7538..12f05121 100644 --- a/lib/documents.js +++ b/lib/documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/endpoint-proxy.js b/lib/endpoint-proxy.js index 22f57fbf..36afb095 100644 --- a/lib/endpoint-proxy.js +++ b/lib/endpoint-proxy.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/endpointDeclarationValidator.js b/lib/endpointDeclarationValidator.js index c9ea815a..e4db59c5 100644 --- a/lib/endpointDeclarationValidator.js +++ b/lib/endpointDeclarationValidator.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/extlibs.js b/lib/extlibs.js index 95a86c85..a3f03385 100644 --- a/lib/extlibs.js +++ b/lib/extlibs.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var requester = require('./requester.js'); diff --git a/lib/graphs.js b/lib/graphs.js index b6089588..2c5489d3 100644 --- a/lib/graphs.js +++ b/lib/graphs.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/internal.js b/lib/internal.js index 883b0fdf..73e60761 100644 --- a/lib/internal.js +++ b/lib/internal.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; @@ -25,7 +25,7 @@ class InternalClass { if (!operation.validStatusCodes) { operation.validStatusCodes = [200, 201, 204, 404]; } - + return requester.startRequest(operation); } } diff --git a/lib/marklogic.js b/lib/marklogic.js index 1090ebaf..e967f703 100644 --- a/lib/marklogic.js +++ b/lib/marklogic.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var http = require('http'); diff --git a/lib/mllog.js b/lib/mllog.js index 317c020a..e1fd65f1 100644 --- a/lib/mllog.js +++ b/lib/mllog.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var util = require('util'); diff --git a/lib/mlutil.js b/lib/mlutil.js index 3184a345..5ce86785 100644 --- a/lib/mlutil.js +++ b/lib/mlutil.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var util = require("util"); diff --git a/lib/operation.js b/lib/operation.js index b2e1c324..c5327f95 100644 --- a/lib/operation.js +++ b/lib/operation.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/optional.js b/lib/optional.js index b48f7a1a..2c66000e 100644 --- a/lib/optional.js +++ b/lib/optional.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/patch-builder.js b/lib/patch-builder.js index 1fadc157..207c9533 100644 --- a/lib/patch-builder.js +++ b/lib/patch-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; @@ -142,7 +142,7 @@ function insert() { * Specifies a library supplying functions to apply to existing content * to produce the replacement content as part of * {@link patchBuilder#replace} or {@link patchBuilder#replaceInsert} operations. - * The library must be installed as /ext/marklogic/patch/apply/MODULE_NAME.xqy + * The library must be installed as /ext/marklogic/patch/apply/MODULE_NAME.xqy * or /ext/marklogic/patch/apply/MODULE_NAME.sjs and must have the * http://marklogic.com/patch/apply/MODULE_NAME namespace if the library has .xqy extension. * @method diff --git a/lib/plan-builder-base.js b/lib/plan-builder-base.js index 59c17b04..664f4360 100644 --- a/lib/plan-builder-base.js +++ b/lib/plan-builder-base.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/plan-builder-generated.js b/lib/plan-builder-generated.js index d413945b..41b96764 100755 --- a/lib/plan-builder-generated.js +++ b/lib/plan-builder-generated.js @@ -1,14 +1,14 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -/* -The contents of this file are mostly an output of the Optic code generator. -But some parts have been manually modified. So care needs to be taken when +/* +The contents of this file are mostly an output of the Optic code generator. +But some parts have been manually modified. So care needs to be taken when running the code generator to not lose any manual modifications, each of -which should either be commented or should be obvious, such as changes in -version numbers for "since" annotations. +which should either be commented or should be obvious, such as changes in +version numbers for "since" annotations. */ const types = require('./server-types-generated.js'); @@ -52,7 +52,7 @@ andNotQuery(...args) { * @method planBuilder.cts#andQuery * @since 2.1.1 * @param { CtsQuery } [queries] - A sequence of sub-queries. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "ordered" An ordered and-query, which specifies that the sub-query matches must occur in the order of the specified sub-queries. For example, if the sub-queries are "cat" and "dog", an ordered query will only match fragments where both "cat" and "dog" occur, and where "cat" comes before "dog" in the fragment. "unordered" An unordered and-query, which specifies that the sub-query matches can occur in any order. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "ordered" An ordered and-query, which specifies that the sub-query matches must occur in the order of the specified sub-queries. For example, if the sub-queries are "cat" and "dog", an ordered query will only match fragments where both "cat" and "dog" occur, and where "cat" comes before "dog" in the fragment. "unordered" An unordered and-query, which specifies that the sub-query matches can occur in any order. * @returns { CtsQuery } */ andQuery(...args) { @@ -217,7 +217,7 @@ collectionQuery(...args) { * Creates a reference to the collection lexicon, for use as a parameter to cts:value-tuples. Since lexicons are implemented with range indexes, this function will throw an exception if the specified range index does not exist. Provides a client interface to a server function. See {@link http://docs.marklogic.com/cts.collectionReference|cts.collectionReference} * @method planBuilder.cts#collectionReference * @since 2.1.1 - * @param { XsString } [options] - Options. The default is (). Options include: "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Do not check the definition against the context database. + * @param { XsString } [options] - Options. The default is (). Options include: "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Do not check the definition against the context database. * @returns { CtsReference } */ collectionReference(...args) { @@ -233,8 +233,8 @@ collectionReference(...args) { * @param { XsString } [view] - The TDE view name. * @param { XsString } [column] - The TDE column name. * @param { XsAnyAtomicType } [value] - One or more values used for querying. - * @param { XsString } [operator] - Operator for the $value values. The default operator is "=". Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. + * @param { XsString } [operator] - Operator for the $value values. The default operator is "=". Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -354,7 +354,7 @@ documentRootQuery(...args) { * @param { XsQName } [latitudeName] - One or more latitude attribute QNames to match. When multiple QNames are specified, the query matches if any QName matches; however, only the first matching latitude attribute in any point instance will be checked. * @param { XsQName } [longitudeName] - One or more longitude attribute QNames to match. When multiple QNames are specified, the query matches if any QName matches; however, only the first matching longitude attribute in any point instance will be checked. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -373,9 +373,9 @@ elementAttributePairGeospatialQuery(...args) { * @since 2.1.1 * @param { XsQName } [elementName] - One or more element QNames to match. When multiple QNames are specified, the query matches if any QName matches. * @param { XsQName } [attributeName] - One or more attribute QNames to match. When multiple QNames are specified, the query matches if any QName matches. - * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. * @param { XsAnyAtomicType } [value] - Some values to match. When multiple values are specified, the query matches if any value matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -394,7 +394,7 @@ elementAttributeRangeQuery(...args) { * @since 2.1.1 * @param { XsQName } [element] - An element QName. * @param { XsQName } [attribute] - An attribute QName. - * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. + * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. * @returns { CtsReference } */ elementAttributeReference(...args) { @@ -433,7 +433,7 @@ elementAttributeValueQuery(...args) { * @param { XsQName } [elementName] - One or more element QNames to match. When multiple QNames are specified, the query matches if any QName matches. * @param { XsQName } [attributeName] - One or more attribute QNames to match. When multiple QNames are specified, the query matches if any QName matches. * @param { XsString } [text] - Some words or phrases to match. When multiple strings are specified, the query matches if any string matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "case-sensitive" A case-sensitive query. "case-insensitive" A case-insensitive query. "diacritic-sensitive" A diacritic-sensitive query. "diacritic-insensitive" A diacritic-insensitive query. "punctuation-sensitive" A punctuation-sensitive query. "punctuation-insensitive" A punctuation-insensitive query. "whitespace-sensitive" A whitespace-sensitive query. "whitespace-insensitive" A whitespace-insensitive query. "stemmed" A stemmed query. "unstemmed" An unstemmed query. "wildcarded" A wildcarded query. "unwildcarded" An unwildcarded query. "exact" An exact match query. Shorthand for "case-sensitive", "diacritic-sensitive", "punctuation-sensitive", "whitespace-sensitive", "unstemmed", and "unwildcarded". "lang=iso639code" Specifies the language of the query. The iso639code code portion is case-insensitive, and uses the languages specified by ISO 639. The default is specified in the database configuration. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "synonym" Specifies that all of the terms in the $text parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). "lexicon-expand=value" The value is one of full, prefix-postfix, off, or heuristic (the default is heuristic). An option with a value of lexicon-expand=full specifies that wildcards are resolved by expanding the pattern to words in a lexicon (if there is one available), and turning into a series of cts:word-queries, even if this takes a long time to evaluate. An option with a value of lexicon-expand=prefix-postfix specifies that wildcards are resolved by expanding the pattern to the pre- and postfixes of the words in the word lexicon (if there is one), and turning the query into a series of character queries, even if it takes a long time to evaluate. An option with a value of lexicon-expand=off specifies that wildcards are only resolved by looking up character patterns in the search pattern index, not in the lexicon. An option with a value of lexicon-expand=heuristic, which is the default, specifies that wildcards are resolved by using a series of internal rules, such as estimating the number of lexicon entries that need to be scanned, seeing if the estimate crosses certain thresholds, and (if appropriate), using another way besides lexicon expansion to resolve the query. * "lexicon-expansion-limit=number" Specifies the limit for lexicon expansion. This puts a restriction on the number of lexicon expansions that can be performed. If the limit is exceeded, the server may raise an error depending on whether the "limit-check" option is set. The default value for this option will be 4096. "limit-check" Specifies that an error will be raised if the lexicon expansion exceeds the specified limit. "no-limit-check" Specifies that error will not be raised if the lexicon expansion exceeds the specified limit. The server will try to resolve the wildcard. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "case-sensitive" A case-sensitive query. "case-insensitive" A case-insensitive query. "diacritic-sensitive" A diacritic-sensitive query. "diacritic-insensitive" A diacritic-insensitive query. "punctuation-sensitive" A punctuation-sensitive query. "punctuation-insensitive" A punctuation-insensitive query. "whitespace-sensitive" A whitespace-sensitive query. "whitespace-insensitive" A whitespace-insensitive query. "stemmed" A stemmed query. "unstemmed" An unstemmed query. "wildcarded" A wildcarded query. "unwildcarded" An unwildcarded query. "exact" An exact match query. Shorthand for "case-sensitive", "diacritic-sensitive", "punctuation-sensitive", "whitespace-sensitive", "unstemmed", and "unwildcarded". "lang=iso639code" Specifies the language of the query. The iso639code code portion is case-insensitive, and uses the languages specified by ISO 639. The default is specified in the database configuration. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "synonym" Specifies that all of the terms in the $text parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). "lexicon-expand=value" The value is one of full, prefix-postfix, off, or heuristic (the default is heuristic). An option with a value of lexicon-expand=full specifies that wildcards are resolved by expanding the pattern to words in a lexicon (if there is one available), and turning into a series of cts:word-queries, even if this takes a long time to evaluate. An option with a value of lexicon-expand=prefix-postfix specifies that wildcards are resolved by expanding the pattern to the pre- and postfixes of the words in the word lexicon (if there is one), and turning the query into a series of character queries, even if it takes a long time to evaluate. An option with a value of lexicon-expand=off specifies that wildcards are only resolved by looking up character patterns in the search pattern index, not in the lexicon. An option with a value of lexicon-expand=heuristic, which is the default, specifies that wildcards are resolved by using a series of internal rules, such as estimating the number of lexicon entries that need to be scanned, seeing if the estimate crosses certain thresholds, and (if appropriate), using another way besides lexicon expansion to resolve the query. * "lexicon-expansion-limit=number" Specifies the limit for lexicon expansion. This puts a restriction on the number of lexicon expansions that can be performed. If the limit is exceeded, the server may raise an error depending on whether the "limit-check" option is set. The default value for this option will be 4096. "limit-check" Specifies that an error will be raised if the lexicon expansion exceeds the specified limit. "no-limit-check" Specifies that error will not be raised if the lexicon expansion exceeds the specified limit. The server will try to resolve the wildcard. * @param { XsDouble } [weight] - A weight for this query. Higher weights move search results up in the relevance order. The default is 1.0. The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. Weights less than the absolute value of 0.0625 (between -0.0625 and 0.0625) are rounded to 0, which means that they do not contribute to the score. * @returns { CtsQuery } */ @@ -453,7 +453,7 @@ elementAttributeWordQuery(...args) { * @param { XsQName } [elementName] - One or more parent element QNames to match. When multiple QNames are specified, the query matches if any QName matches. * @param { XsQName } [childName] - One or more child element QNames to match. When multiple QNames are specified, the query matches if any QName matches; however, only the first matching latitude child in any point instance will be checked. The element must specify both latitude and longitude coordinates. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -472,7 +472,7 @@ elementChildGeospatialQuery(...args) { * @since 2.1.1 * @param { XsQName } [elementName] - One or more element QNames to match. When multiple QNames are specified, the query matches if any QName matches. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -493,7 +493,7 @@ elementGeospatialQuery(...args) { * @param { XsQName } [latitudeName] - One or more latitude element QNames to match. When multiple QNames are specified, the query matches if any QName matches; however, only the first matching latitude child in any point instance will be checked. * @param { XsQName } [longitudeName] - One or more longitude element QNames to match. When multiple QNames are specified, the query matches if any QName matches; however, only the first matching longitude child in any point instance will be checked. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -528,9 +528,9 @@ elementQuery(...args) { * @method planBuilder.cts#elementRangeQuery * @since 2.1.1 * @param { XsQName } [elementName] - One or more element QNames to match. When multiple QNames are specified, the query matches if any QName matches. - * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. * @param { XsAnyAtomicType } [value] - One or more element values to match. When multiple values are specified, the query matches if any value matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -548,7 +548,7 @@ elementRangeQuery(...args) { * @method planBuilder.cts#elementReference * @since 2.1.1 * @param { XsQName } [element] - An element QName. - * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. + * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. * @returns { CtsReference } */ elementReference(...args) { @@ -614,9 +614,9 @@ falseQuery(...args) { * @method planBuilder.cts#fieldRangeQuery * @since 2.1.1 * @param { XsString } [fieldName] - One or more field names to match. When multiple field names are specified, the query matches if any field name matches. - * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. * @param { XsAnyAtomicType } [value] - One or more field values to match. When multiple values are specified, the query matches if any value matches. The value must be a type for which there is a range index defined. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -634,7 +634,7 @@ fieldRangeQuery(...args) { * @method planBuilder.cts#fieldReference * @since 2.1.1 * @param { XsString } [field] - A field name. - * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. + * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. * @returns { CtsReference } */ fieldReference(...args) { @@ -652,7 +652,7 @@ fieldReference(...args) { * @since 2.1.1 * @param { XsString } [fieldName] - One or more field names to search over. If multiple field names are supplied, the match can be in any of the specified fields (or-query semantics). * @param { XsAnyAtomicType } [text] - The values to match. If multiple values are specified, the query matches if any of the values match (or-query semantics). For XML and metadata, the values should be strings. For JSON, the values can be strings, numbers or booleans to match correspondingly typed nodes. To match null, pass in the empty sequence. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "case-sensitive" A case-sensitive query. "case-insensitive" A case-insensitive query. "diacritic-sensitive" A diacritic-sensitive query. "diacritic-insensitive" A diacritic-insensitive query. "punctuation-sensitive" A punctuation-sensitive query. "punctuation-insensitive" A punctuation-insensitive query. "whitespace-sensitive" A whitespace-sensitive query. "whitespace-insensitive" A whitespace-insensitive query. "stemmed" A stemmed query. "unstemmed" An unstemmed query. "wildcarded" A wildcarded query. "unwildcarded" An unwildcarded query. "exact" An exact match query. Shorthand for "case-sensitive", "diacritic-sensitive", "punctuation-sensitive", "whitespace-sensitive", "unstemmed", and "unwildcarded". "lang=iso639code" Specifies the language of the query. The iso639code code portion is case-insensitive, and uses the languages specified by ISO 639. The default is specified in the database configuration. "distance-weight=number" A weight applied based on the minimum distance between matches of this query. Higher weights add to the importance of proximity (as opposed to term matches) when the relevance order is calculated. The default value is 0.0 (no impact of proximity). The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. This parameter has no effect if the word positions index is not enabled. This parameter has no effect on searches that use score-simple or score-random (because those scoring algorithms do not consider term frequency, proximity is irrelevant). "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "synonym" Specifies that all of the terms in the $text parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). "lexicon-expansion-limit=number" Specifies the limit for lexicon expansion. This puts a restriction on the number of lexicon expansions that can be performed. If the limit is exceeded, the server may raise an error depending on whether the "limit-check" option is set. The default value for this option will be 4096. "limit-check" Specifies that an error will be raised if the lexicon expansion exceeds the specified limit. "no-limit-check" Specifies that error will not be raised if the lexicon expansion exceeds the specified limit. The server will try to resolve the wildcard. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "case-sensitive" A case-sensitive query. "case-insensitive" A case-insensitive query. "diacritic-sensitive" A diacritic-sensitive query. "diacritic-insensitive" A diacritic-insensitive query. "punctuation-sensitive" A punctuation-sensitive query. "punctuation-insensitive" A punctuation-insensitive query. "whitespace-sensitive" A whitespace-sensitive query. "whitespace-insensitive" A whitespace-insensitive query. "stemmed" A stemmed query. "unstemmed" An unstemmed query. "wildcarded" A wildcarded query. "unwildcarded" An unwildcarded query. "exact" An exact match query. Shorthand for "case-sensitive", "diacritic-sensitive", "punctuation-sensitive", "whitespace-sensitive", "unstemmed", and "unwildcarded". "lang=iso639code" Specifies the language of the query. The iso639code code portion is case-insensitive, and uses the languages specified by ISO 639. The default is specified in the database configuration. "distance-weight=number" A weight applied based on the minimum distance between matches of this query. Higher weights add to the importance of proximity (as opposed to term matches) when the relevance order is calculated. The default value is 0.0 (no impact of proximity). The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. This parameter has no effect if the word positions index is not enabled. This parameter has no effect on searches that use score-simple or score-random (because those scoring algorithms do not consider term frequency, proximity is irrelevant). "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "synonym" Specifies that all of the terms in the $text parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). "lexicon-expansion-limit=number" Specifies the limit for lexicon expansion. This puts a restriction on the number of lexicon expansions that can be performed. If the limit is exceeded, the server may raise an error depending on whether the "limit-check" option is set. The default value for this option will be 4096. "limit-check" Specifies that an error will be raised if the lexicon expansion exceeds the specified limit. "no-limit-check" Specifies that error will not be raised if the lexicon expansion exceeds the specified limit. The server will try to resolve the wildcard. * @param { XsDouble } [weight] - A weight for this query. Higher weights move search results up in the relevance order. The default is 1.0. The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. Weights less than the absolute value of 0.0625 (between -0.0625 and 0.0625) are rounded to 0, which means that they do not contribute to the score. * @returns { CtsQuery } */ @@ -671,7 +671,7 @@ fieldValueQuery(...args) { * @since 2.1.1 * @param { XsString } [fieldName] - One or more field names to search over. If multiple field names are supplied, the match can be in any of the specified fields (or-query semantics). * @param { XsString } [text] - The word or phrase to match. If multiple strings are specified, the query matches if any of the words or phrases match (or-query semantics). - * @param { XsString } [options] - Options to this query. The default is (). Options include: "case-sensitive" A case-sensitive query. "case-insensitive" A case-insensitive query. "diacritic-sensitive" A diacritic-sensitive query. "diacritic-insensitive" A diacritic-insensitive query. "punctuation-sensitive" A punctuation-sensitive query. "punctuation-insensitive" A punctuation-insensitive query. "whitespace-sensitive" A whitespace-sensitive query. "whitespace-insensitive" A whitespace-insensitive query. "stemmed" A stemmed query. "unstemmed" An unstemmed query. "wildcarded" A wildcarded query. "unwildcarded" An unwildcarded query. "exact" An exact match query. Shorthand for "case-sensitive", "diacritic-sensitive", "punctuation-sensitive", "whitespace-sensitive", "unstemmed", and "unwildcarded". "lang=iso639code" Specifies the language of the query. The iso639code code portion is case-insensitive, and uses the languages specified by ISO 639. The default is specified in the database configuration. "distance-weight=number" A weight applied based on the minimum distance between matches of this query. Higher weights add to the importance of proximity (as opposed to term matches) when the relevance order is calculated. The default value is 0.0 (no impact of proximity). The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. This parameter has no effect if the word positions index is not enabled. This parameter has no effect on searches that use score-simple, score-random, or score-zero (because those scoring algorithms do not consider term frequency, proximity is irrelevant). "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "synonym" Specifies that all of the terms in the $text parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). "lexicon-expand=value" The value is one of full, prefix-postfix, off, or heuristic (the default is heuristic). An option with a value of lexicon-expand=full specifies that wildcards are resolved by expanding the pattern to words in a lexicon (if there is one available), and turning into a series of cts:word-queries, even if this takes a long time to evaluate. An option with a value of lexicon-expand=prefix-postfix specifies that wildcards are resolved by expanding the pattern to the pre- and postfixes of the words in the word lexicon (if there is one), and turning the query into a series of character queries, even if it takes a long time to evaluate. An option with a value of lexicon-expand=off specifies that wildcards are only resolved by looking up character patterns in the search pattern index, not in the lexicon. An option with a value of lexicon-expand=heuristic, which is the default, specifies that wildcards are resolved by using a series of internal rules, such as estimating the number of lexicon entries that need to be scanned, seeing if the estimate crosses certain thresholds, and (if appropriate), using another way besides lexicon expansion to resolve the query. "lexicon-expansion-limit=number" Specifies the limit for lexicon expansion. This puts a restriction on the number of lexicon expansions that can be performed. If the limit is exceeded, the server may raise an error depending on whether the "limit-check" option is set. The default value for this option will be 4096. "limit-check" Specifies that an error will be raised if the lexicon expansion exceeds the specified limit. "no-limit-check" Specifies that error will not be raised if the lexicon expansion exceeds the specified limit. The server will try to resolve the wildcard. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "case-sensitive" A case-sensitive query. "case-insensitive" A case-insensitive query. "diacritic-sensitive" A diacritic-sensitive query. "diacritic-insensitive" A diacritic-insensitive query. "punctuation-sensitive" A punctuation-sensitive query. "punctuation-insensitive" A punctuation-insensitive query. "whitespace-sensitive" A whitespace-sensitive query. "whitespace-insensitive" A whitespace-insensitive query. "stemmed" A stemmed query. "unstemmed" An unstemmed query. "wildcarded" A wildcarded query. "unwildcarded" An unwildcarded query. "exact" An exact match query. Shorthand for "case-sensitive", "diacritic-sensitive", "punctuation-sensitive", "whitespace-sensitive", "unstemmed", and "unwildcarded". "lang=iso639code" Specifies the language of the query. The iso639code code portion is case-insensitive, and uses the languages specified by ISO 639. The default is specified in the database configuration. "distance-weight=number" A weight applied based on the minimum distance between matches of this query. Higher weights add to the importance of proximity (as opposed to term matches) when the relevance order is calculated. The default value is 0.0 (no impact of proximity). The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. This parameter has no effect if the word positions index is not enabled. This parameter has no effect on searches that use score-simple, score-random, or score-zero (because those scoring algorithms do not consider term frequency, proximity is irrelevant). "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "synonym" Specifies that all of the terms in the $text parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). "lexicon-expand=value" The value is one of full, prefix-postfix, off, or heuristic (the default is heuristic). An option with a value of lexicon-expand=full specifies that wildcards are resolved by expanding the pattern to words in a lexicon (if there is one available), and turning into a series of cts:word-queries, even if this takes a long time to evaluate. An option with a value of lexicon-expand=prefix-postfix specifies that wildcards are resolved by expanding the pattern to the pre- and postfixes of the words in the word lexicon (if there is one), and turning the query into a series of character queries, even if it takes a long time to evaluate. An option with a value of lexicon-expand=off specifies that wildcards are only resolved by looking up character patterns in the search pattern index, not in the lexicon. An option with a value of lexicon-expand=heuristic, which is the default, specifies that wildcards are resolved by using a series of internal rules, such as estimating the number of lexicon entries that need to be scanned, seeing if the estimate crosses certain thresholds, and (if appropriate), using another way besides lexicon expansion to resolve the query. "lexicon-expansion-limit=number" Specifies the limit for lexicon expansion. This puts a restriction on the number of lexicon expansions that can be performed. If the limit is exceeded, the server may raise an error depending on whether the "limit-check" option is set. The default value for this option will be 4096. "limit-check" Specifies that an error will be raised if the lexicon expansion exceeds the specified limit. "no-limit-check" Specifies that error will not be raised if the lexicon expansion exceeds the specified limit. The server will try to resolve the wildcard. * @param { XsDouble } [weight] - A weight for this query. Higher weights move search results up in the relevance order. The default is 1.0. The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. Weights less than the absolute value of 0.0625 (between -0.0625 and 0.0625) are rounded to 0, which means that they do not contribute to the score. * @returns { CtsQuery } */ @@ -689,7 +689,7 @@ fieldWordQuery(...args) { * @method planBuilder.cts#geospatialPathReference * @since 2.1.1 * @param { XsString } [pathExpression] - A path expression. - * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (point or long-lat-point) "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type and coordinate-system info only from the input. Do not check the definition against the context database. + * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (point or long-lat-point) "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type and coordinate-system info only from the input. Do not check the definition against the context database. * @param { MapMap } [map] - A map of namespace bindings. The keys should be namespace prefixes and the values should be namespace URIs. These namespace bindings will be added to the in-scope namespace bindings in the interpretation of the path. * @returns { CtsReference } */ @@ -707,7 +707,7 @@ geospatialPathReference(...args) { * @method planBuilder.cts#geospatialRegionPathReference * @since 2.1.1 * @param { XsString } [pathExpression] - The XPath expression specified in the index configuration. - * @param { XsString } [options] - Index configuration options. The default is (). These options should match the configuration used when creating the index. Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float (default) and double. "unchecked" Read the coordinate-system info only from the input. Do not check the definition against the context database. + * @param { XsString } [options] - Index configuration options. The default is (). These options should match the configuration used when creating the index. Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float (default) and double. "unchecked" Read the coordinate-system info only from the input. Do not check the definition against the context database. * @param { MapMap } [namespaces] - A map of namespace bindings. The keys should be namespace prefixes and the values should be namespace URIs. These namespace bindings will be added to the in-scope namespace bindings in the interpretation of the path. * @param { XsInteger } [geohashPrecision] - The geohash precision specified in the index configuration. Values between 1 and 12 inclusive are possible. * @param { XsString } [units] - The units specified in the index configuration. 'miles', 'km', 'feet', and 'meters' are valid. @@ -730,7 +730,7 @@ geospatialRegionPathReference(...args) { * @param { CtsReference } [reference] - Zero or more geospatial path region index references that identify regions in your content. To create a reference, see cts:geospatial-region-path-reference. * @param { XsString } [operation] - The match operation to apply between the regions specified in the $geospatial-region-reference parameter and the regions in the $regions parameter. Allowed values: contains, covered-by, covers, disjoint, intersects, overlaps, within, equals, touches, crosses. See the Usage Notes for details. * @param { CtsRegion } [region] - Criteria regions to match against the regions specified in the $geospatial-region-reference parameter. These regions function as the right operand of $operation. - * @param { XsString } [options] - Options to this query. The default is (). Available options: "units=value" Measure distances and the radii of circles using the given units. Allowed values: miles (default), km, feet, and meters. This option only affects regions provided in the $regions parameter, not regions stored in documents. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this query. The default is (). Available options: "units=value" Measure distances and the radii of circles using the given units. Allowed values: miles (default), km, feet, and meters. This option only affects regions provided in the $regions parameter, not regions stored in documents. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -761,7 +761,7 @@ iriReference(...args) { * @param { XsString } [propertyName] - One or more parent property names to match. When multiple names are specified, the query matches if any name matches. * @param { XsString } [childName] - One or more child property names to match. When multiple names are specified, the query matches if any name matches; however, only the first matching latitude child in any point instance will be checked. The property must specify both latitude and longitude coordinates. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -780,7 +780,7 @@ jsonPropertyChildGeospatialQuery(...args) { * @since 2.1.1 * @param { XsString } [propertyName] - One or more json property names to match. When multiple names are specified, the query matches if any name matches. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -801,7 +801,7 @@ jsonPropertyGeospatialQuery(...args) { * @param { XsString } [latitudeName] - One or more latitude property names to match. When multiple names are specified, the query matches if any name matches; however, only the first matching latitude child in any point instance will be checked. * @param { XsString } [longitudeName] - One or more longitude property names to match. When multiple names are specified, the query matches if any name matches; however, only the first matching longitude child in any point instance will be checked. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -819,9 +819,9 @@ jsonPropertyPairGeospatialQuery(...args) { * @method planBuilder.cts#jsonPropertyRangeQuery * @since 2.1.1 * @param { XsString } [propertyName] - One or more property name to match. When multiple names are specified, the query matches if any name matches. - * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. * @param { XsAnyAtomicType } [value] - One or more property values to match. When multiple values are specified, the query matches if any value matches. The value must be a type for which there is a range index defined. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -839,7 +839,7 @@ jsonPropertyRangeQuery(...args) { * @method planBuilder.cts#jsonPropertyReference * @since 2.1.1 * @param { XsString } [property] - A property name. - * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. + * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. * @returns { CtsReference } */ jsonPropertyReference(...args) { @@ -936,7 +936,7 @@ locksFragmentQuery(...args) { * @since 2.1.1 * @param { XsString } [temporalCollection] - The name of the temporal collection. * @param { XsDateTime } [timestamp] - Return only temporal documents with a system start time less than or equal to this value. Default is temporal:get-lsqt($temporal-collection). Timestamps larger than LSQT are rejected. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" Break down the query into sub-queries and then cache each one of them for better performance. This is enabled, by default. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" Break down the query into sub-queries and then cache each one of them for better performance. This is enabled, by default. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. * @param { XsDouble } [weight] - A weight for this query. Higher weights move search results up in the relevance order. The default is 1.0. The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. Weights less than the absolute value of 0.0625 (between -0.0625 and 0.0625) are rounded to 0, which means that they do not contribute to the score. * @returns { CtsQuery } */ @@ -955,7 +955,7 @@ lsqtQuery(...args) { * @since 2.1.1 * @param { CtsQuery } [queries] - A sequence of queries to match. * @param { XsDouble } [distance] - A distance, in number of words, between any two matching queries. The results match if two queries match and the distance between the two matches is equal to or less than the specified distance. A distance of 0 matches when the text is the exact same text or when there is overlapping text (see the third example below). A negative distance is treated as 0. The default value is 10. - * @param { XsString } [options] - Options to this query. The default value is (). Options include: "ordered" Any near-query matches must occur in the order of the specified sub-queries. "unordered" Any near-query matches will satisfy the query, regardless of the order they were specified. "minimum-distance" The minimum distance between two matching queries. The results match if the two queries match and the minimum distance between the two matches is greater than or equal to the specified minimum distance. The default value is zero. A negative distance is treated as 0. + * @param { XsString } [options] - Options to this query. The default value is (). Options include: "ordered" Any near-query matches must occur in the order of the specified sub-queries. "unordered" Any near-query matches will satisfy the query, regardless of the order they were specified. "minimum-distance" The minimum distance between two matching queries. The results match if the two queries match and the minimum distance between the two matches is greater than or equal to the specified minimum distance. The default value is zero. A negative distance is treated as 0. * @param { XsDouble } [weight] - A weight attributed to the distance for this query. Higher weights add to the importance of distance (as opposed to term matches) when the relevance order is calculated. The default value is 1.0. The weight should be between 64 and -16. Weights greater than 64 will have the same effect as a weight of 64. Weights less than the absolute value of 0.0625 (between -0.0625 and 0.0625) are rounded to 0, which means that they do not contribute to the score. This parameter has no effect if the word positions index is not enabled. * @returns { CtsQuery } */ @@ -1002,7 +1002,7 @@ notQuery(...args) { * @method planBuilder.cts#orQuery * @since 2.1.1 * @param { CtsQuery } [queries] - A sequence of sub-queries. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "synonym" Specifies that all of the terms in the $queries parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "synonym" Specifies that all of the terms in the $queries parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). * @returns { CtsQuery } */ orQuery(...args) { @@ -1032,7 +1032,7 @@ partOfSpeech(...args) { * @since 2.1.1 * @param { XsString } [pathExpression] - One or more path expressions to match. When multiple path expressions are specified, the query matches if any path expression matches. * @param { CtsRegion } [region] - One or more geographic boxes, circles, polygons, or points. Where multiple regions are specified, the query matches if any region matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "type=long-lat-point" Specifies the format for the point in the data as longitude first, latitude second. "type=point" Specifies the format for the point in the data as latitude first, longitude second. This is the default format. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $regions parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrence of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -1050,9 +1050,9 @@ pathGeospatialQuery(...args) { * @method planBuilder.cts#pathRangeQuery * @since 2.1.1 * @param { XsString } [pathName] - One or more XPath expressions that identify the content to match. When multiple paths are specified, the query matches if any path matches. - * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. * @param { XsAnyAtomicType } [value] - One or more values to match. These values are compared to the value(s) addressed by the path-expression parameter. When multiple When multiple values are specified, the query matches if any value matches. The value must be a type for which there is a range index defined. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "collation=URI" Use the range index with the collation specified by URI. If not specified, then the default collation from the query is used. If a range index with the specified collation does not exist, an error is thrown. "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "cached-incremental" When querying on a short date or dateTime range, break the query into sub-queries on smaller ranges, and then cache the results of each. See the Usage Notes for details. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -1070,7 +1070,7 @@ pathRangeQuery(...args) { * @method planBuilder.cts#pathReference * @since 2.1.1 * @param { XsString } [pathExpression] - A path range index expression. - * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. + * @param { XsString } [options] - Options. The default is (). Options include: "type=type" Use the lexicon with the type specified by type (int, unsignedInt, long, unsignedLong, float, double, decimal, dateTime, time, date, gYearMonth, gYear, gMonth, gDay, yearMonthDuration, dayTimeDuration, string, anyURI, point, or long-lat-point) "collation=URI" Use the lexicon with the collation specified by URI. "nullable" Allow null values in tuples reported from cts:value-tuples when using this lexicon. "unchecked" Read the scalar type, collation and coordinate-system info only from the input. Do not check the definition against the context database. "coordinate-system=name" Create a reference to an index or lexicon based on the specified coordinate system. Allowed values: "wgs84", "wgs84/double", "raw", "raw/double". Only applicable if the index/lexicon value type is point or long-lat-point. "precision=value" Create a reference to an index or lexicon configured with the specified geospatial precision. Allowed values: float and double. Only applicable if the index/lexicon value type is point or long-lat-point. This value takes precedence over the precision implicit in the coordinate system name. * @param { MapMap } [map] - A map of namespace bindings. The keys should be namespace prefixes and the values should be namespace URIs. These namespace bindings will be added to the in-scope namespace bindings in the interpretation of the path. * @returns { CtsReference } */ @@ -1105,9 +1105,9 @@ period(...args) { * @method planBuilder.cts#periodCompareQuery * @since 2.1.1 * @param { XsString } [axis1] - Name of the first axis to compare - * @param { XsString } [operator] - A comparison operator. Period is the two timestamps contained in the axis. Operators include: "aln_equals" Match documents whose period1 equals period2. "aln_contains" Match documents whose period1 contains period2. i.e. period1 starts before period2 starts and ends before period2 ends. "aln_contained_by" Match documents whose period1 is contained by period2. "aln_meets" Match documents whose period1 meets period2, i.e. period1 ends at period2 start. "aln_met_by" Match documents whose period1 meets period2, i.e. period1 starts at period2 end. "aln_before" Match documents whose period1 is before period2, i.e. period1 ends before period2 starts. "aln_after" Match documents whose period1 is after period2, i.e. period1 starts after period2 ends. "aln_starts" Match documents whose period1 starts period2, i.e. period1 starts at period2 start and ends before period2 ends. "aln_started_by" Match documents whose period2 starts period1, i.e. period1 starts at period2 start and ends after period2 ends. "aln_finishes" Match documents whose period1 finishes period2, i.e. period1 finishes at period2 finish and starts after period2 starts. "aln_finished_by" Match documents whose period2 finishes period1, i.e. period1 finishes at period2 finish and starts before period2 starts. "aln_overlaps" Match documents whose period1 overlaps period2, i.e. period1 starts before period2 start and ends before period2 ends but after period2 starts. "aln_overlapped_by" Match documents whose period2 overlaps period1, i.e. period1 starts after period2 start but before period2 ends and ends after period2 ends. "iso_contains" Match documents whose period1 contains period2 in sql 2011 standard. i.e. period1 starts before or at period2 starts and ends after or at period2 ends. "iso_overlaps" Match documents whose period1 overlaps period2 in sql 2011 standard. i.e. period1 and period2 have common time period. "iso_succeeds" Match documents whose period1 succeeds period2 in sql 2011 standard. i.e. period1 starts at or after period2 ends "iso_precedes" Match documents whose period1 precedes period2 in sql 2011 standard. i.e. period1 ends at or before period2 ends "iso_succeeds" Match documents whose period1 succeeds period2 in sql 2011 standard. i.e. period1 starts at or after period2 ends "iso_precedes" Match documents whose period1 precedes period2 in sql 2011 standard. i.e. period1 ends at or before period2 ends "iso_imm_succeeds" Match documents whose period1 immediately succeeds period2 in sql 2011 standard. i.e. period1 starts at period2 ends "iso_imm_precedes" Match documents whose period1 immediately precedes period2 in sql 2011 standard. i.e. period1 ends at period2 ends + * @param { XsString } [operator] - A comparison operator. Period is the two timestamps contained in the axis. Operators include: "aln_equals" Match documents whose period1 equals period2. "aln_contains" Match documents whose period1 contains period2. i.e. period1 starts before period2 starts and ends before period2 ends. "aln_contained_by" Match documents whose period1 is contained by period2. "aln_meets" Match documents whose period1 meets period2, i.e. period1 ends at period2 start. "aln_met_by" Match documents whose period1 meets period2, i.e. period1 starts at period2 end. "aln_before" Match documents whose period1 is before period2, i.e. period1 ends before period2 starts. "aln_after" Match documents whose period1 is after period2, i.e. period1 starts after period2 ends. "aln_starts" Match documents whose period1 starts period2, i.e. period1 starts at period2 start and ends before period2 ends. "aln_started_by" Match documents whose period2 starts period1, i.e. period1 starts at period2 start and ends after period2 ends. "aln_finishes" Match documents whose period1 finishes period2, i.e. period1 finishes at period2 finish and starts after period2 starts. "aln_finished_by" Match documents whose period2 finishes period1, i.e. period1 finishes at period2 finish and starts before period2 starts. "aln_overlaps" Match documents whose period1 overlaps period2, i.e. period1 starts before period2 start and ends before period2 ends but after period2 starts. "aln_overlapped_by" Match documents whose period2 overlaps period1, i.e. period1 starts after period2 start but before period2 ends and ends after period2 ends. "iso_contains" Match documents whose period1 contains period2 in sql 2011 standard. i.e. period1 starts before or at period2 starts and ends after or at period2 ends. "iso_overlaps" Match documents whose period1 overlaps period2 in sql 2011 standard. i.e. period1 and period2 have common time period. "iso_succeeds" Match documents whose period1 succeeds period2 in sql 2011 standard. i.e. period1 starts at or after period2 ends "iso_precedes" Match documents whose period1 precedes period2 in sql 2011 standard. i.e. period1 ends at or before period2 ends "iso_succeeds" Match documents whose period1 succeeds period2 in sql 2011 standard. i.e. period1 starts at or after period2 ends "iso_precedes" Match documents whose period1 precedes period2 in sql 2011 standard. i.e. period1 ends at or before period2 ends "iso_imm_succeeds" Match documents whose period1 immediately succeeds period2 in sql 2011 standard. i.e. period1 starts at period2 ends "iso_imm_precedes" Match documents whose period1 immediately precedes period2 in sql 2011 standard. i.e. period1 ends at period2 ends * @param { XsString } [axis2] - Name of the second period to compare - * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. * @returns { CtsQuery } */ periodCompareQuery(...args) { @@ -1124,9 +1124,9 @@ periodCompareQuery(...args) { * @method planBuilder.cts#periodRangeQuery * @since 2.1.1 * @param { XsString } [axis] - One or more axis to match on. - * @param { XsString } [operator] - A comparison operator. Operators include: "aln_equals" Match documents whose period1 equals value. "aln_contains" Match documents whose period1 contains value. i.e. period1 starts before value starts and ends before value ends. "aln_contained_by" Match documents whose period1 is contained by value. "aln_meets" Match documents whose period1 meets value, i.e. period1 ends at value start. "aln_met_by" Match documents whose period1 meets value, i.e. period1 starts at value end. "aln_before" Match documents whose period1 is before value, i.e. period1 ends before value starts. "aln_after" Match documents whose period1 is after value, i.e. period1 starts after value ends. "aln_starts" Match documents whose period1 starts value, i.e. period1 starts at value start and ends before value ends. "aln_started_by" Match documents whose value starts period1, i.e. period1 starts at value start and ends after value ends. "aln_finishes" Match documents whose period1 finishes value, i.e. period1 finishes at value finish and starts after value starts. "aln_finished_by" Match documents whose value finishes period1, i.e. period1 finishes at value finish and starts before value starts. "aln_overlaps" Match documents whose period1 overlaps value, i.e. period1 starts before value start and ends before value ends but after value starts. "aln_overlapped_by" Match documents whose value overlaps period1, i.e. period1 starts after value start but before value ends and ends after value ends. "iso_contains" Match documents whose period1 contains value in sql 2011 standard. i.e. period1 starts before or at value starts and ends after or at value ends. "iso_overlaps" Match documents whose period1 overlaps value in sql 2011 standard. i.e. period1 and value have common time period. "iso_succeeds" Match documents whose period1 succeeds value in sql 2011 standard. i.e. period1 starts at or after value ends "iso_precedes" Match documents whose period1 precedes value in sql 2011 standard. i.e. period1 ends at or before value ends "iso_imm_succeeds" Match documents whose period1 immediately succeeds value in sql 2011 standard. i.e. period1 starts at value end "iso_imm_precedes" Match documents whose period1 immediately precedes value in sql 2011 standard. i.e. period1 ends at value end + * @param { XsString } [operator] - A comparison operator. Operators include: "aln_equals" Match documents whose period1 equals value. "aln_contains" Match documents whose period1 contains value. i.e. period1 starts before value starts and ends before value ends. "aln_contained_by" Match documents whose period1 is contained by value. "aln_meets" Match documents whose period1 meets value, i.e. period1 ends at value start. "aln_met_by" Match documents whose period1 meets value, i.e. period1 starts at value end. "aln_before" Match documents whose period1 is before value, i.e. period1 ends before value starts. "aln_after" Match documents whose period1 is after value, i.e. period1 starts after value ends. "aln_starts" Match documents whose period1 starts value, i.e. period1 starts at value start and ends before value ends. "aln_started_by" Match documents whose value starts period1, i.e. period1 starts at value start and ends after value ends. "aln_finishes" Match documents whose period1 finishes value, i.e. period1 finishes at value finish and starts after value starts. "aln_finished_by" Match documents whose value finishes period1, i.e. period1 finishes at value finish and starts before value starts. "aln_overlaps" Match documents whose period1 overlaps value, i.e. period1 starts before value start and ends before value ends but after value starts. "aln_overlapped_by" Match documents whose value overlaps period1, i.e. period1 starts after value start but before value ends and ends after value ends. "iso_contains" Match documents whose period1 contains value in sql 2011 standard. i.e. period1 starts before or at value starts and ends after or at value ends. "iso_overlaps" Match documents whose period1 overlaps value in sql 2011 standard. i.e. period1 and value have common time period. "iso_succeeds" Match documents whose period1 succeeds value in sql 2011 standard. i.e. period1 starts at or after value ends "iso_precedes" Match documents whose period1 precedes value in sql 2011 standard. i.e. period1 ends at or before value ends "iso_imm_succeeds" Match documents whose period1 immediately succeeds value in sql 2011 standard. i.e. period1 starts at value end "iso_imm_precedes" Match documents whose period1 immediately precedes value in sql 2011 standard. i.e. period1 ends at value end * @param { CtsPeriod } [period] - the cts:period to perform operations on. When multiple values are specified, the query matches if any value matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. * @returns { CtsQuery } */ periodRangeQuery(...args) { @@ -1210,9 +1210,9 @@ propertiesFragmentQuery(...args) { * @method planBuilder.cts#rangeQuery * @since 2.1.1 * @param { CtsReference } [index] - One or more range index references. When multiple indexes are specified, the query matches if any index matches. - * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [operator] - A comparison operator. Operators include: "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. * @param { XsAnyAtomicType } [value] - One or more values to match. When multiple values are specified, the query matches if any value matches. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). + * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "min-occurs=number" Specifies the minimum number of occurrences required. If fewer that this number of words occur, the fragment does not match. The default is 1. "max-occurs=number" Specifies the maximum number of occurrences required. If more than this number of words occur, the fragment does not match. The default is unbounded. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. "synonym" Specifies that all of the terms in the $value parameter are considered synonyms for scoring purposes. The result is that occurrences of more than one of the synonyms are scored as if there are more occurrences of the same term (as opposed to having a separate term that contributes to score). * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -1268,8 +1268,8 @@ tokenize(...args) { * @param { XsAnyAtomicType } [subject] - The subjects to look up. When multiple values are specified, the query matches if any value matches. When the empty sequence is specified, then triples with any subject are matched. * @param { XsAnyAtomicType } [predicate] - The predicates to look up. When multiple values are specified, the query matches if any value matches. When the empty sequence is specified, then triples with any predicate are matched. * @param { XsAnyAtomicType } [object] - The objects to look up. When multiple values are specified, the query matches if any value matches. When the empty sequence is specified, then triples with any object are matched. - * @param { XsString } [operator] - If a single string is provided it is treated as the operator for the $object values. If a sequence of three strings are provided, they give the operators for $subject, $predicate and $object in turn. The default operator is "=". Operators include: "sameTerm" Match triple index values which are the same RDF term as $value. This compares aspects of values that are ignored in XML Schema comparison semantics, like timezone and derived type of $value. "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. - * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. + * @param { XsString } [operator] - If a single string is provided it is treated as the operator for the $object values. If a sequence of three strings are provided, they give the operators for $subject, $predicate and $object in turn. The default operator is "=". Operators include: "sameTerm" Match triple index values which are the same RDF term as $value. This compares aspects of values that are ignored in XML Schema comparison semantics, like timezone and derived type of $value. "<" Match range index values less than $value. "<=" Match range index values less than or equal to $value. ">" Match range index values greater than $value. ">=" Match range index values greater than or equal to $value. "=" Match range index values equal to $value. "!=" Match range index values not equal to $value. + * @param { XsString } [options] - Options to this query. The default is (). Options include: "cached" Cache the results of this query in the list cache. "uncached" Do not cache the results of this query in the list cache. "score-function=function" Use the selected scoring function. The score function may be: linearUse a linear function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. reciprocalUse a reciprocal function of the difference between the specified query value and the matching value in the index to calculate a score for this range query. zeroThis range query does not contribute to the score. This is the default. "slope-factor=number" Apply the given number as a scaling factor to the slope of the scoring function. The default is 1.0. * @param { XsDouble } [weight] - A weight for this query. The default is 1.0. * @returns { CtsQuery } */ @@ -2814,7 +2814,7 @@ class GeoExpr { * @method planBuilder.geo#approxCenter * @since 2.1.1 * @param { CtsRegion } [region] - A geospatial region. - * @param { XsString } [options] - Options. The default is (). Options include: "box-percent=n" An integer between 0 and 100 (default is 100) that indicates what percentage of a polygon's bounding box slivers should be used in constructing the approximate centroid. Lower numbers use fewer slivers, giving faster but less accurate results; larger numbers use more slivers, giving slower but more accurate results. "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" The precision use for this operation, including the interpretation of input values. Allowed values: float, double. Default: The precision of the governing coordinate system. + * @param { XsString } [options] - Options. The default is (). Options include: "box-percent=n" An integer between 0 and 100 (default is 100) that indicates what percentage of a polygon's bounding box slivers should be used in constructing the approximate centroid. Lower numbers use fewer slivers, giving faster but less accurate results; larger numbers use more slivers, giving slower but more accurate results. "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" The precision use for this operation, including the interpretation of input values. Allowed values: float, double. Default: The precision of the governing coordinate system. * @returns { CtsPoint } */ approxCenter(...args) { @@ -2834,7 +2834,7 @@ approxCenter(...args) { * @param { CtsPoint } [p2] - The ending point of the first arc. * @param { CtsPoint } [q1] - The starting point of the second arc. * @param { CtsPoint } [q2] - The ending point of the second arc. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { CtsPoint } */ arcIntersection(...args) { @@ -2852,7 +2852,7 @@ arcIntersection(...args) { * @since 2.1.1 * @param { CtsPoint } [p1] - The first point. * @param { CtsPoint } [p2] - The second point. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Unit of measure of the tolerance value. Valid values are miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Unit of measure of the tolerance value. Valid values are miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsDouble } */ bearing(...args) { @@ -2869,7 +2869,7 @@ bearing(...args) { * @method planBuilder.geo#boundingBoxes * @since 2.1.1 * @param { CtsRegion } [region] - A geographic region (box, circle, polygon, or point). - * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "box-percent=n" An integer between 0 and 100 (default is 100) that indicates what percentage of a polygon's bounding box slivers should be returned. Lower numbers give fewer, less accurate boxes; larger numbers give more, more accurate boxes. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. The bounding boxes will be padded to cover any points within tolerance of the region. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. The default value is 0 (no padding). "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "box-percent=n" An integer between 0 and 100 (default is 100) that indicates what percentage of a polygon's bounding box slivers should be returned. Lower numbers give fewer, less accurate boxes; larger numbers give more, more accurate boxes. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. The bounding boxes will be padded to cover any points within tolerance of the region. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. The default value is 0 (no padding). "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. * @returns { CtsBox } */ boundingBoxes(...args) { @@ -2887,7 +2887,7 @@ boundingBoxes(...args) { * @since 2.1.1 * @param { CtsBox } [box] - A geographic box. * @param { CtsRegion } [region] - One or more geographic regions (boxes, circles, polygons, or points). Where multiple regions are specified, return true if any region intersects the box. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. * @returns { XsBoolean } */ boxIntersects(...args) { @@ -2905,7 +2905,7 @@ boxIntersects(...args) { * @since 2.1.1 * @param { CtsCircle } [circle] - A geographic circle. * @param { CtsRegion } [region] - One or more geographic regions (boxes, circles, polygons, or points). Where multiple regions are specified, return true if any region intersects the target circle. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on boxes', circles', and polygons' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and polygons' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. * @returns { XsBoolean } */ circleIntersects(...args) { @@ -2923,7 +2923,7 @@ circleIntersects(...args) { * @since 2.1.1 * @param { CtsCircle } [circle] - A cts circle that defines the circle to be approximated. * @param { XsDouble } [arcTolerance] - How far the approximation can be from the actual circle, specified in the same units as the units option. Arc-tolerance should be greater than the value of the tolerance option. - * @param { XsString } [options] - Options with which you can customize this operation. The following options are available: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance should be smaller than the value of the arc-tolerance parameter. + * @param { XsString } [options] - Options with which you can customize this operation. The following options are available: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance should be smaller than the value of the arc-tolerance parameter. * @returns { CtsPolygon } */ circlePolygon(...args) { @@ -2941,7 +2941,7 @@ circlePolygon(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of contains. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of contains. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ contains(...args) { @@ -2958,7 +2958,7 @@ contains(...args) { * @method planBuilder.geo#countDistinctVertices * @since 2.1.1 * @param { CtsRegion } [region] - A cts region. - * @param { XsString } [options] - Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsInteger } */ countDistinctVertices(...args) { @@ -2988,7 +2988,7 @@ countVertices(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of covered-by. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of covered-by. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ coveredBy(...args) { @@ -3006,7 +3006,7 @@ coveredBy(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of covers. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of covers. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ covers(...args) { @@ -3024,7 +3024,7 @@ covers(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of crosses. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of crosses. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ crosses(...args) { @@ -3043,7 +3043,7 @@ crosses(...args) { * @param { CtsPoint } [p] - The starting point. * @param { XsDouble } [bearing] - The bearing, in radians. * @param { XsDouble } [distance] - The distance, in units. See the units option, below. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. * @returns { CtsPoint } */ destination(...args) { @@ -3061,7 +3061,7 @@ destination(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of disjoint. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of disjoint. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ disjoint(...args) { @@ -3079,7 +3079,7 @@ disjoint(...args) { * @since 2.1.1 * @param { CtsPoint } [p1] - The first point. * @param { CtsPoint } [p2] - The second point. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. * @returns { XsDouble } */ distance(...args) { @@ -3118,7 +3118,7 @@ distanceConvert(...args) { * @param { XsDouble } [semiMinorAxis] - The semi minor axis of the ellipse. The units are governed by the units option. * @param { XsDouble } [azimuth] - The azimuth. * @param { XsDouble } [arcTolerance] - How far the approximation can be from the actual ellipse, specified in the same units as the units option. Arc-tolerance should be greater than the value of the tolerance option, which defaults to 0.05km (0.3106856 miles). - * @param { XsString } [options] - Options with which to configure the behavior. Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, the axes of the ellipse, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options with which to configure the behavior. Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, the axes of the ellipse, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { CtsPolygon } */ ellipsePolygon(...args) { @@ -3136,7 +3136,7 @@ ellipsePolygon(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of equals. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of equals. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ equals(...args) { @@ -3178,7 +3178,7 @@ geohashDecodePoint(...args) { * @since 2.1.1 * @param { CtsRegion } [region] - The region to encode. * @param { XsInteger } [geohashPrecision] - The desired precision (length of the geohash). The precision should be between 1 and 12. If the precision is less than 1, or unspecified, the default geohash-precision of 6 is used. A geohash-precision greater than 12 is treated as the same as 12. In the worst case (at the equator) a precision of 12 gives resolution of less than a centimeter. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. Geohashing is not allowed for non-geodetic coordinate systems. Attempting to use this function with the raw or raw/double coordinate system will result in an XDMP-GEOHASH-COORD error. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. geohashes=value Specify which geohashes to return. Allowed values: all Return a complete set of covering hashes for the region (boundary + interior). This is the default behavior. boundary Return only geohashes that intersect with the boundary of the region. interior Return only geohashes completely contained in the interior of the region. exterior Return all geohashes disjoint from the region. That is, all geohashes completely contained in the exterior of the region. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. Geohashing is not allowed for non-geodetic coordinate systems. Attempting to use this function with the raw or raw/double coordinate system will result in an XDMP-GEOHASH-COORD error. "precision=string" Use the coordinate system at the given precision. Allowed values: float (default) and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. geohashes=value Specify which geohashes to return. Allowed values: all Return a complete set of covering hashes for the region (boundary + interior). This is the default behavior. boundary Return only geohashes that intersect with the boundary of the region. interior Return only geohashes completely contained in the interior of the region. exterior Return all geohashes disjoint from the region. That is, all geohashes completely contained in the exterior of the region. * @returns { XsString } */ geohashEncode(...args) { @@ -3236,7 +3236,7 @@ geohashSubhashes(...args) { * @method planBuilder.geo#interiorPoint * @since 2.1.1 * @param { CtsRegion } [region] - A cts region. - * @param { XsString } [options] - Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { CtsPoint } */ interiorPoint(...args) { @@ -3254,7 +3254,7 @@ interiorPoint(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of intersects. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of intersects. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ intersects(...args) { @@ -3272,7 +3272,7 @@ intersects(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of overlaps. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of overlaps. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ overlaps(...args) { @@ -3300,7 +3300,7 @@ parseWkt(...args) { * Perform an affine transformation on a geospatial region. The transformation is always applied in the raw coordinate system (Cartesian). Provides a client interface to a server function. See {@link http://docs.marklogic.com/geo.regionAffineTransform|geo.regionAffineTransform} * @method planBuilder.geo#regionAffineTransform * @since 2.1.1 - * @param { CtsRegion } [region] - + * @param { CtsRegion } [region] - * @param { MapMap } [transform] - A sequence of maps that specify the transformation to apply. Each map should contain at least one of the following transform specifications: translation Translate the points of the region by the given amount in the x and y coordinates. The value is a map with the following keys: txAmount to shift the points in the x direction. (Required.) tyAmount to shift the points in the y direction. (Required.) scaling Scale the points of the region by the given amount of the x and y coordinates. The value is a map with the following keys: sxAmount to scale the points in the x direction. (Required.) syAmount to scale the points in the y direction. (Required.) pscPoint to scale relative to. (Optional. Default is the origin.) rotation Rotate the points of the region by the given angle. The value is a map with the following keys: angleAmount to rotate the points (radians). (Required.) protPoint to rotate relative to. (Optional. Default is the origin.) shearing Shear the points of the region by the given amounts. The value is a map with the following keys: shxyAmount of shearing due to x in y direction. (Required.) shyxAmount of shearing due to y in x direction. (Required.) reflection Reflect the points of the region around a line or a point. The value is a map with the following keys: lineRLine of reflection. prefPoint to reflect points around. The value is a map with the following keys: startThe starting point of the line. endThe ending point of the line. Exactly of lineR or pref must be specified. If no transform specifications are provided, the points are transformed by the identity transform. That is, they remain unchanged. * @param { XsString } [options] - Geospatial options that affect the transformation. Currently there are no relevant options. * @returns { CtsRegion } @@ -3320,7 +3320,7 @@ regionAffineTransform(...args) { * @since 2.1.1 * @param { CtsRegion } [region] - A cts region. * @param { XsDouble } [threshold] - How close the approximation should be, in the units specified by the units option. - * @param { XsString } [options] - Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance must be smaller than the value of the threshold parameter. + * @param { XsString } [options] - Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance must be smaller than the value of the threshold parameter. * @returns { CtsRegion } */ regionApproximate(...args) { @@ -3337,7 +3337,7 @@ regionApproximate(...args) { * @method planBuilder.geo#regionClean * @since 2.1.1 * @param { CtsRegion } [region] - A cts region. - * @param { XsString } [options] - The tolerance, units, coordinate system. Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - The tolerance, units, coordinate system. Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { CtsRegion } */ regionClean(...args) { @@ -3355,7 +3355,7 @@ regionClean(...args) { * @since 2.1.1 * @param { CtsRegion } [target] - A geographic region. * @param { CtsRegion } [region] - One or more geographic regions (boxes, circles, polygons, or points). Where multiple regions are specified, return true if target contains any of the regions. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on boxes', circles', and regions' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and regions' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on boxes', circles', and regions' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on boxes', circles', and regions' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. * @returns { XsBoolean } */ regionContains(...args) { @@ -3373,7 +3373,7 @@ regionContains(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. * @param { CtsRegion } [region2] - The second geospatial region to compare. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsString } */ regionDe9im(...args) { @@ -3391,7 +3391,7 @@ regionDe9im(...args) { * @since 2.1.1 * @param { CtsRegion } [target] - A geographic region (box, circle, polygon, or point). * @param { CtsRegion } [region] - One or more geographic regions. Where multiple regions are specified, return true if any region intersects the target region. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on regions' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on regions' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. "boundaries-included" Points on regions' boundaries are counted as matching. This is the default. "boundaries-excluded" Points on regions' boundaries are not counted as matching. "boundaries-latitude-excluded" Points on boxes' latitude boundaries are not counted as matching. "boundaries-longitude-excluded" Points on boxes' longitude boundaries are not counted as matching. "boundaries-south-excluded" Points on the boxes' southern boundaries are not counted as matching. "boundaries-west-excluded" Points on the boxes' western boundaries are not counted as matching. "boundaries-north-excluded" Points on the boxes' northern boundaries are not counted as matching. "boundaries-east-excluded" Points on the boxes' eastern boundaries are not counted as matching. "boundaries-circle-excluded" Points on circles' boundary are not counted as matching. "boundaries-endpoints-excluded" Points on linestrings' boundary (the endpoints) are not counted as matching. * @returns { XsBoolean } */ regionIntersects(...args) { @@ -3410,7 +3410,7 @@ regionIntersects(...args) { * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of $operation. * @param { XsString } [operation] - The operation to apply between the region specified in the $region-1 and $region-2 parameters. Allowed values: contains, covered-by, covers, crosses, disjoint, equals, intersects, overlaps, touches, within. See the Usage Notes for details. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of $operation. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ regionRelate(...args) { @@ -3427,7 +3427,7 @@ regionRelate(...args) { * @method planBuilder.geo#removeDuplicateVertices * @since 2.1.1 * @param { CtsRegion } [region] - A cts region. - * @param { XsString } [options] - The tolerance, units, coordinate system. Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - The tolerance, units, coordinate system. Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { CtsRegion } */ removeDuplicateVertices(...args) { @@ -3445,7 +3445,7 @@ removeDuplicateVertices(...args) { * @since 2.1.1 * @param { CtsPoint } [p1] - The first point. * @param { CtsRegion } [region] - A region such as a circle, box, polygon, linestring, or complex-polygon. For compatibility with previous versions, a sequence of points is interpreted as a sequence of arcs (defined pairwise) and the distance returned is the shortest distance to one of those points. If the first parameter is a point within the region specified in this parameter, then this function returns 0. If the point specified in the first parameter in not in the region specified in this parameter, then this function returns the shortest distance to the boundary of the region. - * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. + * @param { XsString } [options] - Options for the operation. The default is (). Options include: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "units=value" Measure distance and the radii of circles in the specified units. Allowed values: miles (default), km, feet, meters. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. * @returns { XsDouble } */ shortestDistance(...args) { @@ -3475,7 +3475,7 @@ toWkt(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of touches. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of touches. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ touches(...args) { @@ -3505,7 +3505,7 @@ validateWkt(...args) { * @since 2.1.1 * @param { CtsRegion } [region1] - The first geospatial region to compare. This region is the left operand of within. * @param { CtsRegion } [region2] - The second geospatial region to compare. This region is the right operand of within. - * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. + * @param { XsString } [options] - Options to this operation. The default is (). Available options: "coordinate-system=string" Use the given coordinate system. Valid values are: wgs84The WGS84 coordinate system with degrees as the angular unit. wgs84/radiansThe WGS84 coordinate system with radians as the angular unit. wgs84/doubleThe WGS84 coordinate system at double precision with degrees as the angular unit. wgs84/radians/doubleThe WGS84 coordinate system at double precision with radians as the angular unit. etrs89The ETRS89 coordinate system. etrs89/doubleThe ETRS89 coordinate system at double precision. rawThe raw (unmapped) coordinate system. raw/doubleThe raw coordinate system at double precision. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. * @returns { XsBoolean } */ within(...args) { @@ -4049,7 +4049,7 @@ median(...args) { * @method planBuilder.math#mode * @since 2.1.1 * @param { XsAnyAtomicType } [arg] - The sequence of values. - * @param { XsString } [options] - Options. The default is (). Options include: "collation=URI" Applies only when $arg is of the xs:string type. If no specified, the default collation is used. "coordinate-system=name" Applies only when $arg is of the cts:point type. If no specified, the default coordinate system is used. + * @param { XsString } [options] - Options. The default is (). Options include: "collation=URI" Applies only when $arg is of the xs:string type. If no specified, the default collation is used. "coordinate-system=name" Applies only when $arg is of the cts:point type. If no specified, the default coordinate system is used. * @returns { XsAnyAtomicType } */ mode(...args) { @@ -4079,7 +4079,7 @@ modf(...args) { * @since 2.1.1 * @param { XsAnyAtomicType } [arg] - The sequence of values. * @param { XsAnyAtomicType } [value] - The value to be "ranked". - * @param { XsString } [options] - Options. The default is (). Options include: "ascending"(default) Rank the value as if the sequence was sorted in ascending order. "descending" Rank the value as if the sequence was sorted in descending order. "collation=URI" Applies only when $arg is of the xs:string type. If no specified, the default collation is used. "coordinate-system=name" Applies only when $arg is of the cts:point type. If no specified, the default coordinate system is used. + * @param { XsString } [options] - Options. The default is (). Options include: "ascending"(default) Rank the value as if the sequence was sorted in ascending order. "descending" Rank the value as if the sequence was sorted in descending order. "collation=URI" Applies only when $arg is of the xs:string type. If no specified, the default collation is used. "coordinate-system=name" Applies only when $arg is of the cts:point type. If no specified, the default coordinate system is used. * @returns { XsDouble } */ percentRank(...args) { @@ -4154,7 +4154,7 @@ radians(...args) { * @since 2.1.1 * @param { XsAnyAtomicType } [arg1] - The sequence of values. * @param { XsAnyAtomicType } [arg2] - The value to be "ranked". - * @param { XsString } [options] - Options. The default is (). Options include: "ascending"(default) Rank the value as if the sequence was sorted in ascending order. "descending" Rank the value as if the sequence was sorted in descending order. "collation=URI" Applies only when $arg is of the xs:string type. If no specified, the default collation is used. "coordinate-system=name" Applies only when $arg is of the cts:point type. If no specified, the default coordinate system is used. + * @param { XsString } [options] - Options. The default is (). Options include: "ascending"(default) Rank the value as if the sequence was sorted in ascending order. "descending" Rank the value as if the sequence was sorted in descending order. "collation=URI" Applies only when $arg is of the xs:string type. If no specified, the default collation is used. "coordinate-system=name" Applies only when $arg is of the cts:point type. If no specified, the default coordinate system is used. * @returns { XsInteger } */ rank(...args) { @@ -4442,7 +4442,7 @@ iri(...args) { * Converts an IRI value to a QName value. Provides a client interface to a server function. * @method planBuilder.sem#iriToQName * @since 2.1.1 - * @param { XsString } [arg1] - + * @param { XsString } [arg1] - * @returns { XsQName } */ iriToQName(...args) { @@ -4531,7 +4531,7 @@ langMatches(...args) { * Converts a QName value to an IRI value. Provides a client interface to a server function. * @method planBuilder.sem#QNameToIri * @since 2.1.1 - * @param { XsQName } [arg1] - + * @param { XsQName } [arg1] - * @returns { SemIri } */ QNameToIri(...args) { @@ -4556,7 +4556,7 @@ random(...args) { * @since 2.1.1 * @param { XsString } [locations] - The locations of the rulesets. * @param { SemStore } [store] - The base store(s) over which to apply the ruleset to get inferred triples. The default for sem:store is an empty sequence, which means accessing the current database's triple index using the default rulesets configured for that database. - * @param { XsString } [options] - Options as a sequence of string values. Available options are: "size=number of MB" The maximum size of the memory used to cache inferred triples. This defaults to the default inference size set for the app-server. If the value provided is bigger than the maximum inference size set for the App Server, an error is raised [XDMP-INFSIZE]. + * @param { XsString } [options] - Options as a sequence of string values. Available options are: "size=number of MB" The maximum size of the memory used to cache inferred triples. This defaults to the default inference size set for the app-server. If the value provided is bigger than the maximum inference size set for the App Server, an error is raised [XDMP-INFSIZE]. * @returns { SemStore } */ rulesetStore(...args) { @@ -4589,7 +4589,7 @@ sameTerm(...args) { * The sem:store function defines a set of criteria, that when evaluated, selects a set of triples to be passed in to sem:sparql(), sem:sparql-update(), or sem:sparql-values() as part of the options argument. The sem:store constructor queries from the current database's triple index, restricted by the options and the cts:query argument (for instance, "triples in documents matching this query"). Provides a client interface to a server function. See {@link http://docs.marklogic.com/sem.store|sem.store} * @method planBuilder.sem#store * @since 2.1.1 - * @param { XsString } [options] - Options as a sequence of string values. Available options are: "any" Values from any fragment should be included. "document" Values from document fragments should be included. "properties" Values from properties fragments should be included. "locks" Values from locks fragments should be included. "checked" Word positions should be checked when resolving the query. "unchecked" Word positions should not be checked when resolving the query. "size=number of MB" The maximum size of the memory used to cache inferred triples. This defaults to the default inference size set for the app-server. If the value provided is bigger than the maximum inference size set for the App Server, an error is raised [XDMP-INFSIZE]. "no-default-rulesets" Don't apply the database's default rulesets to the sem:store. "locking=read-write/write" read-write: Read-lock documents containing triples being accessed, write-lock documents being updated; write: Only write-lock documents being updated. Default is locking=read-write. Locking is ignored in query transaction. + * @param { XsString } [options] - Options as a sequence of string values. Available options are: "any" Values from any fragment should be included. "document" Values from document fragments should be included. "properties" Values from properties fragments should be included. "locks" Values from locks fragments should be included. "checked" Word positions should be checked when resolving the query. "unchecked" Word positions should not be checked when resolving the query. "size=number of MB" The maximum size of the memory used to cache inferred triples. This defaults to the default inference size set for the app-server. If the value provided is bigger than the maximum inference size set for the App Server, an error is raised [XDMP-INFSIZE]. "no-default-rulesets" Don't apply the database's default rulesets to the sem:store. "locking=read-write/write" read-write: Read-lock documents containing triples being accessed, write-lock documents being updated; write: Only write-lock documents being updated. Default is locking=read-write. Locking is ignored in query transaction. * @param { CtsQuery } [query] - Only include triples in fragments selected by the cts:query. The triples do not need to match the query, but they must occur in fragments selected by the query. The fragments are not filtered to ensure they match the query, but instead selected in the same manner as "unfiltered" cts:search operations. If a string is entered, the string is treated as a cts:word-query of the specified string. * @returns { SemStore } */ @@ -4782,7 +4782,7 @@ collatedString(...args) { * Returns a specified date with the specified number interval (signed integer) added to a specified datepart of that date Provides a client interface to a server function. See {@link http://docs.marklogic.com/sql:dateadd|sql:dateadd} * @method planBuilder.sql#dateadd * @since 2.1.1 - * @param { XsString } [datepart] - Is the part of date where the number will be added. The following table lists all valid datepart arguments. User-defined variable equivalents are not valid. The return data type is the data type of the date argument. Options: datepart parameter abbreviation includes: "year","yyyy","yy" The year part of the date "quarter","qq","q" The quarter part of the date "month","mm","m" The month part of the date "dayofyear","dy","y" The day of the year from the date "day","dd","d" The day of the month from the date "week","wk","ww" The week of the year from the date "weekday","dw" The day of the week from the date "hour","hh" The hour of the day from the date "minute","mi","n" The minute of the hour from the date "second","ss","s" The second of the minute from the date "millisecond","ms" The millisecond of the minute from the date "microsecond","msc" The microsecond of the minute from the date "nanosecond","ns" The nanosecond of the minute from the date + * @param { XsString } [datepart] - Is the part of date where the number will be added. The following table lists all valid datepart arguments. User-defined variable equivalents are not valid. The return data type is the data type of the date argument. Options: datepart parameter abbreviation includes: "year","yyyy","yy" The year part of the date "quarter","qq","q" The quarter part of the date "month","mm","m" The month part of the date "dayofyear","dy","y" The day of the year from the date "day","dd","d" The day of the month from the date "week","wk","ww" The week of the year from the date "weekday","dw" The day of the week from the date "hour","hh" The hour of the day from the date "minute","mi","n" The minute of the hour from the date "second","ss","s" The second of the minute from the date "millisecond","ms" The millisecond of the minute from the date "microsecond","msc" The microsecond of the minute from the date "nanosecond","ns" The nanosecond of the minute from the date * @param { XsInt } [number] - This number will be added to the datepart of the given date. * @param { Item } [date] - Is an expression that can be resolved to a time, date or datetime, value. date can be an expression, column expression, user-defined variable or string literal. startdate is subtracted from enddate. * @returns { Item } @@ -4800,7 +4800,7 @@ dateadd(...args) { * Returns the count (signed integer) of the specified datepart boundaries crossed between the specified startdate and enddate. Provides a client interface to a server function. See {@link http://docs.marklogic.com/sql:datediff|sql:datediff} * @method planBuilder.sql#datediff * @since 2.1.1 - * @param { XsString } [datepart] - Is the part of startdate and enddate that specifies the type of boundary crossed. The following table lists all valid datepart arguments. User-defined variable equivalents are not valid. Options: datepart parameter abbreviation includes: "year","yyyy","yy" The year part of the date "quarter","qq","q" The quarter part of the date "month","mm","m" The month part of the date "dayofyear","dy","y" The day of the year from the date "day","dd","d" The day of the month from the date "week","wk","ww" The week of the year from the date "weekday","dw" The day of the week from the date "hour","hh" The hour of the day from the date "minute","mi","n" The minute of the hour from the date "second","ss","s" The second of the minute from the date "millisecond","ms" The millisecond of the minute from the date "microsecond","msc" The microsecond of the minute from the date "nanosecond","ns" The nanosecond of the minute from the date + * @param { XsString } [datepart] - Is the part of startdate and enddate that specifies the type of boundary crossed. The following table lists all valid datepart arguments. User-defined variable equivalents are not valid. Options: datepart parameter abbreviation includes: "year","yyyy","yy" The year part of the date "quarter","qq","q" The quarter part of the date "month","mm","m" The month part of the date "dayofyear","dy","y" The day of the year from the date "day","dd","d" The day of the month from the date "week","wk","ww" The week of the year from the date "weekday","dw" The day of the week from the date "hour","hh" The hour of the day from the date "minute","mi","n" The minute of the hour from the date "second","ss","s" The second of the minute from the date "millisecond","ms" The millisecond of the minute from the date "microsecond","msc" The microsecond of the minute from the date "nanosecond","ns" The nanosecond of the minute from the date * @param { Item } [startdate] - Is an expression that can be resolved to a time, date, datetime or value. date can be an expression, column expression, user-defined variable or string literal. startdate is subtracted from enddate. * @param { Item } [enddate] - Same as startdate. * @returns { XsInteger } @@ -4818,7 +4818,7 @@ datediff(...args) { * Returns an integer that represents the specified datepart of the specified date. Provides a client interface to a server function. See {@link http://docs.marklogic.com/sql:datepart|sql:datepart} * @method planBuilder.sql#datepart * @since 2.1.1 - * @param { XsString } [datepart] - The part of date that to be returned. Options: datepart parameter abbreviation includes: "year","yyyy","yy" The year part of the date "quarter","qq","q" The quarter part of the date "month","mm","m" The month part of the date "dayofyear","dy","y" The day of the year from the date "day","dd","d" The day of the month from the date "week","wk","ww" The week of the year from the date "weekday","dw" The day of the week from the date "hour","hh" The hour of the day from the date "minute","mi","n" The minute of the hour from the date "second","ss","s" The second of the minute from the date "millisecond","ms" The millisecond of the minute from the date "microsecond","msc" The microsecond of the minute from the date "nanosecond","ns" The nanosecond of the minute from the date "TZoffset","tz" The timezone offset from the date + * @param { XsString } [datepart] - The part of date that to be returned. Options: datepart parameter abbreviation includes: "year","yyyy","yy" The year part of the date "quarter","qq","q" The quarter part of the date "month","mm","m" The month part of the date "dayofyear","dy","y" The day of the year from the date "day","dd","d" The day of the month from the date "week","wk","ww" The week of the year from the date "weekday","dw" The day of the week from the date "hour","hh" The hour of the day from the date "minute","mi","n" The minute of the hour from the date "second","ss","s" The second of the minute from the date "millisecond","ms" The millisecond of the minute from the date "microsecond","msc" The microsecond of the minute from the date "nanosecond","ns" The nanosecond of the minute from the date "TZoffset","tz" The timezone offset from the date * @param { Item } [date] - Is an expression that can be resolved to a xs:date, xs:time, xs:dateTime. date can be an expression, column expression,user-defined variable, or string literal. * @returns { XsInteger } */ @@ -5111,7 +5111,7 @@ right(...args) { * Constructs a row identifier from the string form of the temporary identifier assigned to a row during processing. Provides a client interface to a server function. * @method planBuilder.sql#rowID * @since 2.1.1 - * @param { XsAnyAtomicType } [arg1] - + * @param { XsAnyAtomicType } [arg1] - * @returns { SqlRowID } */ rowID(...args) { @@ -5201,7 +5201,7 @@ strpos(...args) { * Returns a xs:string? timestamp created by adding a number to the given dateTimeType field of a given timestamp. Provides a client interface to a server function. See {@link http://docs.marklogic.com/sql.timestampadd|sql.timestampadd} * @method planBuilder.sql#timestampadd * @since 2.1.1 - * @param { XsString } [dateTimeType] - The dateTimeType of the timestamp where addition should take place. Available types are: SQL_TSI_FRAC_SECOND nano seconds SQL_TSI_SECOND seconds SQL_TSI_MINUTE minute SQL_TSI_HOUR hour SQL_TSI_DAY day SQL_TSI_WEEK week SQL_TSI_MONTH month SQL_TSI_QUARTER quarter SQL_TSI_YEAR year + * @param { XsString } [dateTimeType] - The dateTimeType of the timestamp where addition should take place. Available types are: SQL_TSI_FRAC_SECOND nano seconds SQL_TSI_SECOND seconds SQL_TSI_MINUTE minute SQL_TSI_HOUR hour SQL_TSI_DAY day SQL_TSI_WEEK week SQL_TSI_MONTH month SQL_TSI_QUARTER quarter SQL_TSI_YEAR year * @param { XsInt } [value] - The integer to add to the given dateTimeType field of the third parameter. * @param { Item } [timestamp] - The xs:dateTime timestamp to which addition has to take place. * @returns { Item } @@ -5219,7 +5219,7 @@ timestampadd(...args) { * Returns the difference in dateTimeType field of two given timestamps. Provides a client interface to a server function. See {@link http://docs.marklogic.com/sql.timestampdiff|sql.timestampdiff} * @method planBuilder.sql#timestampdiff * @since 2.1.1 - * @param { XsString } [dateTimeType] - The dateTimeType of the timestamp where addition should take place. Available types are: SQL_TSI_FRAC_SECOND nano seconds SQL_TSI_SECOND seconds SQL_TSI_MINUTE minute SQL_TSI_HOUR hour SQL_TSI_DAY day SQL_TSI_WEEK week SQL_TSI_MONTH month SQL_TSI_QUARTER quarter SQL_TSI_YEAR year + * @param { XsString } [dateTimeType] - The dateTimeType of the timestamp where addition should take place. Available types are: SQL_TSI_FRAC_SECOND nano seconds SQL_TSI_SECOND seconds SQL_TSI_MINUTE minute SQL_TSI_HOUR hour SQL_TSI_DAY day SQL_TSI_WEEK week SQL_TSI_MONTH month SQL_TSI_QUARTER quarter SQL_TSI_YEAR year * @param { Item } [timestamp1] - The integer to add to the given dateTimeType field of the third parameter. * @param { Item } [timestamp2] - The xs:dateTime timestamp to which addition has to take place. * @returns { XsInteger } @@ -5261,7 +5261,7 @@ week(...args) { * Returns the day of the week. Provides a client interface to a server function. * @method planBuilder.sql#weekday * @since 2.1.1 - * @param { Item } [arg1] - + * @param { Item } [arg1] - * @returns { XsInteger } */ weekday(...args) { @@ -6104,7 +6104,7 @@ or64(...args) { * Parses a string containing date, time or dateTime using the supplied picture argument and returns a dateTime value. While this function is closely related to other XSLT functions, it is available in XSLT as well as in all XQuery dialects and in Server-Side JavaScript. Provides a client interface to a server function. See {@link http://docs.marklogic.com/xdmp.parseDateTime|xdmp.parseDateTime} * @method planBuilder.xdmp#parseDateTime * @since 2.1.1 - * @param { XsString } [picture] - The desired string representation of the given $value. The picture string is a sequence of characters, in which the characters represent variables such as, decimal-separator-sign, grouping-sign, zero-digit-sign, digit-sign, pattern-separator, percent sign and per-mille-sign. For details on the picture string, see http://www.w3.org/TR/xslt20/#date-picture-string. This follows the specification of picture string in the W3C XSLT 2.0 specification for the fn:format-dateTime function. Symbol Description ----------------------------------- 'Y' year(absolute value) 'M' month in year 'D' day in month 'd' day in year 'F' day of week 'W' week in year 'w' week in month 'H' hour in day 'h' hour in half-day 'P' am/pm marker 'm' minute in hour 's' second in minute 'f' fractional seconds 'Z' timezone as a time offset from UTC for example PST 'z' timezone as an offset using GMT, for example GMT+1 + * @param { XsString } [picture] - The desired string representation of the given $value. The picture string is a sequence of characters, in which the characters represent variables such as, decimal-separator-sign, grouping-sign, zero-digit-sign, digit-sign, pattern-separator, percent sign and per-mille-sign. For details on the picture string, see http://www.w3.org/TR/xslt20/#date-picture-string. This follows the specification of picture string in the W3C XSLT 2.0 specification for the fn:format-dateTime function. Symbol Description ----------------------------------- 'Y' year(absolute value) 'M' month in year 'D' day in month 'd' day in year 'F' day of week 'W' week in year 'w' week in month 'H' hour in day 'h' hour in half-day 'P' am/pm marker 'm' minute in hour 's' second in minute 'f' fractional seconds 'Z' timezone as a time offset from UTC for example PST 'z' timezone as an offset using GMT, for example GMT+1 * @param { XsString } [value] - The given string $value representing the dateTime value that needs to be formatted. * @param { XsString } [language] - The language used in string representation of the date, time or dateTime value. * @param { XsString } [calendar] - This argument is reserved for future use. The only calendar supported at this point is "Gregorian" or "AD". @@ -6124,7 +6124,7 @@ parseDateTime(...args) { * Parses a string containing date, time or dateTime using the supplied picture argument and returns a dateTime value. While this function is closely related to other XSLT functions, it is available in XSLT as well as in all XQuery dialects and in Server-Side JavaScript. Provides a client interface to a server function. See {@link http://docs.marklogic.com/xdmp.parseYymmdd|xdmp.parseYymmdd} * @method planBuilder.xdmp#parseYymmdd * @since 2.1.1 - * @param { XsString } [picture] - The desired string representation of the given $value. This follows the specification of picture string which is compatible to the format specification in icu. See http://icu-project.org/apiref/icu4j/com/ibm/icu/text/SimpleDateFormat.html for more details. The following is the summary of the formatting symbols: Symbol Description ---------------------------- "y" year(absolute value) "M" month in year "d" day in month "D" day in year "E" day of week "w" week in year "W" week in month "H" hour in day "K" hour in half-day "a" am/pm marker "s" second in minute "S" fractional seconds "Z" timezone as a time offset from UTC for example PST "ZZZZ" timezone as an offset using GMT, for example GMT+1 + * @param { XsString } [picture] - The desired string representation of the given $value. This follows the specification of picture string which is compatible to the format specification in icu. See http://icu-project.org/apiref/icu4j/com/ibm/icu/text/SimpleDateFormat.html for more details. The following is the summary of the formatting symbols: Symbol Description ---------------------------- "y" year(absolute value) "M" month in year "d" day in month "D" day in year "E" day of week "w" week in year "W" week in month "H" hour in day "K" hour in half-day "a" am/pm marker "s" second in minute "S" fractional seconds "Z" timezone as a time offset from UTC for example PST "ZZZZ" timezone as an offset using GMT, for example GMT+1 * @param { XsString } [value] - The given string $value that needs to be formatted. * @param { XsString } [language] - The language used in string representation of the date, time or dateTime value. * @param { XsString } [calendar] - This argument is reserved for future use. The only calendar supported at this point is "Gregorian" or "AD". @@ -6389,7 +6389,7 @@ type(...args) { * @since 2.1.1 * @param { XsString } [arg] - Input to be unquoted. * @param { XsString } [defaultNamespace] - Default namespace for nodes in the first parameter. - * @param { XsString } [options] - The options for getting this document. The default value is (). Options include: "repair-full" Specifies that malformed XML content be repaired. XML content with multiple top-level elements will be parsed as multiple documents. This option has no effect on binary or text documents. "repair-none" Specifies that malformed XML content be rejected. XML content will be parsed as a single document, so a maximum of one document node will be returned. This option has no effect on binary or text documents. "format-text" Specifies to get the document as a text document, regardless of the URI specified. "format-binary" Specifies to get the document as a binary document, regardless of the URI specified. "format-xml" Specifies to get the document as an XML document, regardless of the URI specified. "format-json" Specifies to get the document as a JSON document, regardless of the URI specified. "default-language=xx" If the root element node specified in the first parameter does not already have an xml:lang attribute, the language to specify in an xml:lang attribute on the root element node. If default-language is not specified, then nothing is added to the root element node. Some examples are default-language=en and default-language=fr. + * @param { XsString } [options] - The options for getting this document. The default value is (). Options include: "repair-full" Specifies that malformed XML content be repaired. XML content with multiple top-level elements will be parsed as multiple documents. This option has no effect on binary or text documents. "repair-none" Specifies that malformed XML content be rejected. XML content will be parsed as a single document, so a maximum of one document node will be returned. This option has no effect on binary or text documents. "format-text" Specifies to get the document as a text document, regardless of the URI specified. "format-binary" Specifies to get the document as a binary document, regardless of the URI specified. "format-xml" Specifies to get the document as an XML document, regardless of the URI specified. "format-json" Specifies to get the document as a JSON document, regardless of the URI specified. "default-language=xx" If the root element node specified in the first parameter does not already have an xml:lang attribute, the language to specify in an xml:lang attribute on the root element node. If default-language is not specified, then nothing is added to the root element node. Some examples are default-language=en and default-language=fr. * @returns { DocumentNode } */ unquote(...args) { @@ -7210,8 +7210,8 @@ class PlanPlan extends types.ServerType { * Provides a client interface to a server function. * @method planBuilder.Plan#bindParam * @since 2.1.1 - * @param { PlanParamName } [param] - - * @param { PlanParamBinding } [literal] - + * @param { PlanParamName } [param] - + * @param { PlanParamBinding } [literal] - * @returns { planBuilder.Plan } */ bindParam(...args) { @@ -7395,7 +7395,7 @@ class PlanPrefixer extends types.ServerType { * Provides a client interface to a server function. * @method planBuilder.Prefixer#iri * @since 2.1.1 - * @param { XsString } [name] - + * @param { XsString } [name] - * @returns { SemIri } */ iri(...args) { @@ -8111,7 +8111,7 @@ col(...args) { * This function samples rows from a view or from a pattern match on the triple index. Provides a client interface to a server function. See {@link http://docs.marklogic.com/AccessPlan.prototype.sampleBy|AccessPlan.prototype.sampleBy} * @method planBuilder.AccessPlan#sampleBy * @since 2.1.1 - * @param { PlanSampleByOption } [option] - + * @param { PlanSampleByOption } [option] - * @returns { planBuilder.ModifyPlan } */ sampleBy(...args) { @@ -9014,8 +9014,8 @@ groupConcat(...args) { * Provides a client interface to a server function. * @method planBuilder#groupKey * @since 2.1.1 - * @param { PlanColumnName } [name] - - * @param { PlanExprColName } [column] - + * @param { PlanColumnName } [name] - + * @param { PlanExprColName } [column] - * @returns { planBuilder.PlanAggregateCol } */ groupKey(...args) { @@ -9438,8 +9438,8 @@ xmlPi(...args) { * Provides a client interface to a server function. * @method planBuilder#resolveFunction * @since 2.1.1 - * @param { PlanQualifiableName } [functionName] - - * @param { XsString } [modulePath] - + * @param { PlanQualifiableName } [functionName] - + * @param { XsString } [modulePath] - * @returns { planBuilder.PlanFunction } */ resolveFunction(...args) { diff --git a/lib/plan-builder.js b/lib/plan-builder.js index f01ec406..554e55a4 100644 --- a/lib/plan-builder.js +++ b/lib/plan-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/proxy-generator.js b/lib/proxy-generator.js index 7587fed2..177ee70b 100644 --- a/lib/proxy-generator.js +++ b/lib/proxy-generator.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/query-builder.js b/lib/query-builder.js index 8f9ca158..9f2e7149 100644 --- a/lib/query-builder.js +++ b/lib/query-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var util = require("util"); diff --git a/lib/requester.js b/lib/requester.js index 8f922a2c..4b4dade6 100644 --- a/lib/requester.js +++ b/lib/requester.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var createAuthInitializer = require('./www-authenticate-patched/www-authenticate'); diff --git a/lib/resources-config.js b/lib/resources-config.js index a3e964d5..6846a5ca 100644 --- a/lib/resources-config.js +++ b/lib/resources-config.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var requester = require('./requester.js'); diff --git a/lib/resources-exec.js b/lib/resources-exec.js index 72c32709..a429c7c2 100644 --- a/lib/resources-exec.js +++ b/lib/resources-exec.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var requester = require('./requester.js'); diff --git a/lib/responder.js b/lib/responder.js index 1adc0cce..42fe7bd7 100644 --- a/lib/responder.js +++ b/lib/responder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var concatStream = require('concat-stream'); diff --git a/lib/rest-server-properties.js b/lib/rest-server-properties.js index 3a8ec5c7..12f6ab63 100644 --- a/lib/rest-server-properties.js +++ b/lib/rest-server-properties.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var requester = require('./requester.js'); diff --git a/lib/rows.js b/lib/rows.js index 6d620a5f..47460f1d 100644 --- a/lib/rows.js +++ b/lib/rows.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/server-exec.js b/lib/server-exec.js index a0302ebc..ddf1a40b 100644 --- a/lib/server-exec.js +++ b/lib/server-exec.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var qs = require('qs'); diff --git a/lib/server-types-generated.js b/lib/server-types-generated.js index b132fc52..b1bc3b27 100755 --- a/lib/server-types-generated.js +++ b/lib/server-types-generated.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/session-state.js b/lib/session-state.js index d9c46d30..29c5d0d7 100644 --- a/lib/session-state.js +++ b/lib/session-state.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/transactions.js b/lib/transactions.js index 21abec89..a4a28ac7 100644 --- a/lib/transactions.js +++ b/lib/transactions.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var requester = require('./requester.js'); diff --git a/lib/transforms.js b/lib/transforms.js index 59abb9c4..1a69e2fb 100644 --- a/lib/transforms.js +++ b/lib/transforms.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var requester = require('./requester.js'); diff --git a/lib/values-builder.js b/lib/values-builder.js index d75f3575..b9df7a91 100644 --- a/lib/values-builder.js +++ b/lib/values-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var deepcopy = require('deepcopy'); diff --git a/lib/values.js b/lib/values.js index eb7fda7a..7290f728 100644 --- a/lib/values.js +++ b/lib/values.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; var requester = require('./requester.js'); diff --git a/lib/vector-util.js b/lib/vector-util.js index 66165203..1cc48525 100644 --- a/lib/vector-util.js +++ b/lib/vector-util.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/lib/www-authenticate-patched/md5.js b/lib/www-authenticate-patched/md5.js index 732d576e..ba61d430 100644 --- a/lib/www-authenticate-patched/md5.js +++ b/lib/www-authenticate-patched/md5.js @@ -7,7 +7,7 @@ */ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var crypto= require('crypto'); diff --git a/lib/www-authenticate-patched/parsers.js b/lib/www-authenticate-patched/parsers.js index acf54416..1bda7820 100644 --- a/lib/www-authenticate-patched/parsers.js +++ b/lib/www-authenticate-patched/parsers.js @@ -1,3 +1,7 @@ +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ + /* * www-authenticate * https://github.com/randymized/www-authenticate @@ -6,9 +10,6 @@ * Licensed under the MIT license. */ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ var ParseAuth= /(\w+)\s+(.*)/ // -> scheme, params , Separators= /([",=])/ ; diff --git a/lib/www-authenticate-patched/user-credentials.js b/lib/www-authenticate-patched/user-credentials.js index c1f5db0b..d6479bc0 100644 --- a/lib/www-authenticate-patched/user-credentials.js +++ b/lib/www-authenticate-patched/user-credentials.js @@ -1,3 +1,7 @@ +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ + /* * www-authenticate * https://github.com/randymized/www-authenticate @@ -6,9 +10,7 @@ * Licensed under the MIT license. */ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ + var md5= require('./md5'); /* diff --git a/lib/www-authenticate-patched/www-authenticate.js b/lib/www-authenticate-patched/www-authenticate.js index 2069a5d8..958f6d38 100644 --- a/lib/www-authenticate-patched/www-authenticate.js +++ b/lib/www-authenticate-patched/www-authenticate.js @@ -1,3 +1,7 @@ +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ + /* * www-authenticate * https://github.com/randymized/www-authenticate @@ -6,9 +10,6 @@ * Licensed under the MIT license. */ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ 'use strict'; var crypto= require('crypto') diff --git a/test-basic-proxy/lib/negative/badAtomicParameterTest.js b/test-basic-proxy/lib/negative/badAtomicParameterTest.js index 9887f053..bdfcc183 100644 --- a/test-basic-proxy/lib/negative/badAtomicParameterTest.js +++ b/test-basic-proxy/lib/negative/badAtomicParameterTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const expect = require('chai').expect; diff --git a/test-basic-proxy/lib/negative/badExecutionTest.js b/test-basic-proxy/lib/negative/badExecutionTest.js index 64658602..68058d08 100644 --- a/test-basic-proxy/lib/negative/badExecutionTest.js +++ b/test-basic-proxy/lib/negative/badExecutionTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const expect = require('chai').expect; diff --git a/test-basic-proxy/lib/negative/badGenerationTest.js b/test-basic-proxy/lib/negative/badGenerationTest.js index 2145595b..c127d264 100644 --- a/test-basic-proxy/lib/negative/badGenerationTest.js +++ b/test-basic-proxy/lib/negative/badGenerationTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/negative/badIOTest.js b/test-basic-proxy/lib/negative/badIOTest.js index a2e71706..5093f21b 100644 --- a/test-basic-proxy/lib/negative/badIOTest.js +++ b/test-basic-proxy/lib/negative/badIOTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/negative/badNodeParameterTest.js b/test-basic-proxy/lib/negative/badNodeParameterTest.js index 81839296..75c904ca 100644 --- a/test-basic-proxy/lib/negative/badNodeParameterTest.js +++ b/test-basic-proxy/lib/negative/badNodeParameterTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const expect = require('chai').expect; diff --git a/test-basic-proxy/lib/positive/atomicReturnMappingTest.js b/test-basic-proxy/lib/positive/atomicReturnMappingTest.js index 4753dd68..c6a49303 100644 --- a/test-basic-proxy/lib/positive/atomicReturnMappingTest.js +++ b/test-basic-proxy/lib/positive/atomicReturnMappingTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/positive/decoratorBaseTest.js b/test-basic-proxy/lib/positive/decoratorBaseTest.js index 271fab23..e22b5d1b 100644 --- a/test-basic-proxy/lib/positive/decoratorBaseTest.js +++ b/test-basic-proxy/lib/positive/decoratorBaseTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/positive/decoratorCustomTest.js b/test-basic-proxy/lib/positive/decoratorCustomTest.js index 50bc31d6..09458e46 100644 --- a/test-basic-proxy/lib/positive/decoratorCustomTest.js +++ b/test-basic-proxy/lib/positive/decoratorCustomTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/positive/mimetypeTest.js b/test-basic-proxy/lib/positive/mimetypeTest.js index ddffa443..74cd147b 100644 --- a/test-basic-proxy/lib/positive/mimetypeTest.js +++ b/test-basic-proxy/lib/positive/mimetypeTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/positive/sessionsTest.js b/test-basic-proxy/lib/positive/sessionsTest.js index 60d661fe..d563cdcc 100644 --- a/test-basic-proxy/lib/positive/sessionsTest.js +++ b/test-basic-proxy/lib/positive/sessionsTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/positive/streamerTest.js b/test-basic-proxy/lib/positive/streamerTest.js index 57be0926..fc671f2b 100644 --- a/test-basic-proxy/lib/positive/streamerTest.js +++ b/test-basic-proxy/lib/positive/streamerTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/lib/positive/supplementalAtomicParameterTest.js b/test-basic-proxy/lib/positive/supplementalAtomicParameterTest.js index 0dcc6af7..603f8b64 100644 --- a/test-basic-proxy/lib/positive/supplementalAtomicParameterTest.js +++ b/test-basic-proxy/lib/positive/supplementalAtomicParameterTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const expect = require('chai').expect; diff --git a/test-basic-proxy/lib/positive/supplementalNodeParameterTest.js b/test-basic-proxy/lib/positive/supplementalNodeParameterTest.js index 5a3851ff..b3797c73 100644 --- a/test-basic-proxy/lib/positive/supplementalNodeParameterTest.js +++ b/test-basic-proxy/lib/positive/supplementalNodeParameterTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const expect = require('chai').expect; diff --git a/test-basic-proxy/lib/testutil.js b/test-basic-proxy/lib/testutil.js index c68f77bc..3f6db664 100644 --- a/test-basic-proxy/lib/testutil.js +++ b/test-basic-proxy/lib/testutil.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic-proxy/testGenerator.js b/test-basic-proxy/testGenerator.js index aa73f839..2dc0d828 100644 --- a/test-basic-proxy/testGenerator.js +++ b/test-basic-proxy/testGenerator.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/annTopK.js b/test-basic/annTopK.js index 5ea4d8d8..e8cc3d87 100644 --- a/test-basic/annTopK.js +++ b/test-basic/annTopK.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/basePath-test.js b/test-basic/basePath-test.js index 082acc23..5ef7d2ca 100644 --- a/test-basic/basePath-test.js +++ b/test-basic/basePath-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const testconfig = require('../etc/test-config.js'); diff --git a/test-basic/bindingFromParam.js b/test-basic/bindingFromParam.js index 1dd6b558..8c368df5 100644 --- a/test-basic/bindingFromParam.js +++ b/test-basic/bindingFromParam.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const testconfig = require('../etc/test-config.js'); diff --git a/test-basic/client.js b/test-basic/client.js index 1edff42c..a484b315 100644 --- a/test-basic/client.js +++ b/test-basic/client.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var assert = require('assert'); var should = require('should'); diff --git a/test-basic/cloud_authentication-test.js b/test-basic/cloud_authentication-test.js index 0846fa99..01bcd333 100644 --- a/test-basic/cloud_authentication-test.js +++ b/test-basic/cloud_authentication-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const marklogic = require('../'); diff --git a/test-basic/data/echoModule.js b/test-basic/data/echoModule.js index 27425c1f..12dd78ab 100644 --- a/test-basic/data/echoModule.js +++ b/test-basic/data/echoModule.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var test; var extra; diff --git a/test-basic/data/timestampTransform.js b/test-basic/data/timestampTransform.js index fd672aa6..a906c930 100644 --- a/test-basic/data/timestampTransform.js +++ b/test-basic/data/timestampTransform.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ function timestampTransform(context, params, document) { var newDoc = document.toObject(); diff --git a/test-basic/data/transformAll_transform.js b/test-basic/data/transformAll_transform.js index 877a2b93..1dc63615 100644 --- a/test-basic/data/transformAll_transform.js +++ b/test-basic/data/transformAll_transform.js @@ -1,5 +1,5 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ function transform_function(context, params, content) { let document = content.toObject(); diff --git a/test-basic/data/versionService.js b/test-basic/data/versionService.js index 6f157351..9234fe8e 100644 --- a/test-basic/data/versionService.js +++ b/test-basic/data/versionService.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ function getVersionService(context, params) { return { diff --git a/test-basic/digestauth-fips-nomd5load.js b/test-basic/digestauth-fips-nomd5load.js index fd244643..586b9b21 100644 --- a/test-basic/digestauth-fips-nomd5load.js +++ b/test-basic/digestauth-fips-nomd5load.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/docColTypes-test.js b/test-basic/docColTypes-test.js index 9303793c..c2880f75 100644 --- a/test-basic/docColTypes-test.js +++ b/test-basic/docColTypes-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-basic/documents-core.js b/test-basic/documents-core.js index 186426d9..4b6bc187 100644 --- a/test-basic/documents-core.js +++ b/test-basic/documents-core.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/documents-data-movement-ingest.js b/test-basic/documents-data-movement-ingest.js index 4368232c..0fac8808 100644 --- a/test-basic/documents-data-movement-ingest.js +++ b/test-basic/documents-data-movement-ingest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const testconfig = require('../etc/test-config.js'); diff --git a/test-basic/documents-data-movement-queryAll.js b/test-basic/documents-data-movement-queryAll.js index b0c21c55..21ea68db 100644 --- a/test-basic/documents-data-movement-queryAll.js +++ b/test-basic/documents-data-movement-queryAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-basic/documents-data-movement-readAll.js b/test-basic/documents-data-movement-readAll.js index 1b3bdb2a..b2400d61 100644 --- a/test-basic/documents-data-movement-readAll.js +++ b/test-basic/documents-data-movement-readAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-basic/documents-data-movement-removeAllUris.js b/test-basic/documents-data-movement-removeAllUris.js index 199dc53c..385d6336 100644 --- a/test-basic/documents-data-movement-removeAllUris.js +++ b/test-basic/documents-data-movement-removeAllUris.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-basic/documents-data-movement-rows-queryAll.js b/test-basic/documents-data-movement-rows-queryAll.js index 8533dd6f..fc7acdeb 100644 --- a/test-basic/documents-data-movement-rows-queryAll.js +++ b/test-basic/documents-data-movement-rows-queryAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-basic/documents-data-movement-transformAll.js b/test-basic/documents-data-movement-transformAll.js index 6c1d394c..651fea9d 100644 --- a/test-basic/documents-data-movement-transformAll.js +++ b/test-basic/documents-data-movement-transformAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-basic/documents-negative.js b/test-basic/documents-negative.js index 51107c49..c99aab59 100644 --- a/test-basic/documents-negative.js +++ b/test-basic/documents-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/documents-patch.js b/test-basic/documents-patch.js index cbea9dcc..9194d503 100644 --- a/test-basic/documents-patch.js +++ b/test-basic/documents-patch.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/documents-query.js b/test-basic/documents-query.js index 9dbc8082..ca3240a2 100644 --- a/test-basic/documents-query.js +++ b/test-basic/documents-query.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/documents-quick.js b/test-basic/documents-quick.js index 97b4b7b6..4d9f93af 100644 --- a/test-basic/documents-quick.js +++ b/test-basic/documents-quick.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); @@ -167,7 +167,7 @@ describe('check connection', function(){ }).catch(done); }); it('should give 403 when user is not authorized', function(done){ - var config = {host:testconfig.testConnection.host, user:testconfig.testConnection.user, password: testconfig.testConnection.password, port:testconfig.testConnection.port, + var config = {host:testconfig.testConnection.host, user:testconfig.testConnection.user, password: testconfig.testConnection.password, port:testconfig.testConnection.port, authType:testconfig.testConnection.authType}; var db1 = marklogic.createDatabaseClient(config); var assert = require('assert'); @@ -183,7 +183,7 @@ describe('check connection', function(){ }); it('should give 401 when does not exist', function(done){ - var config = {host:testconfig.restReaderConnection.host, user:testconfig.testConnection.user, password: 'invalid', port:testconfig.testConnection.port, + var config = {host:testconfig.restReaderConnection.host, user:testconfig.testConnection.user, password: 'invalid', port:testconfig.testConnection.port, authType:testconfig.restReaderConnection.authType}; var db1 = marklogic.createDatabaseClient(config); var assert = require('assert'); diff --git a/test-basic/documents-read-xqy-docs.js b/test-basic/documents-read-xqy-docs.js index 1a2e7e1d..f191a53c 100644 --- a/test-basic/documents-read-xqy-docs.js +++ b/test-basic/documents-read-xqy-docs.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ let testconfig = require('../etc/test-config.js'); diff --git a/test-basic/documents-temporal-document.js b/test-basic/documents-temporal-document.js index a9559342..f963eb3b 100644 --- a/test-basic/documents-temporal-document.js +++ b/test-basic/documents-temporal-document.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var testconfig = require('../etc/test-config.js'); diff --git a/test-basic/documents-temporal-patch.js b/test-basic/documents-temporal-patch.js index 1edeb5d4..5c38f961 100644 --- a/test-basic/documents-temporal-patch.js +++ b/test-basic/documents-temporal-patch.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var testconfig = require('../etc/test-config.js'); diff --git a/test-basic/documents-temporal-protect.js b/test-basic/documents-temporal-protect.js index ac00663e..5631eae5 100644 --- a/test-basic/documents-temporal-protect.js +++ b/test-basic/documents-temporal-protect.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-basic/documents-temporal-wipe.js b/test-basic/documents-temporal-wipe.js index a90b229c..70b31463 100644 --- a/test-basic/documents-temporal-wipe.js +++ b/test-basic/documents-temporal-wipe.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var testconfig = require('../etc/test-config.js'); diff --git a/test-basic/documents-temporal.js b/test-basic/documents-temporal.js index 13ec64b6..18f6e118 100644 --- a/test-basic/documents-temporal.js +++ b/test-basic/documents-temporal.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/documents-transform.js b/test-basic/documents-transform.js index 4d52a8aa..87b0e510 100644 --- a/test-basic/documents-transform.js +++ b/test-basic/documents-transform.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/documents-version.js b/test-basic/documents-version.js index 6b9f2cba..5dcc1f57 100644 --- a/test-basic/documents-version.js +++ b/test-basic/documents-version.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/endpoint-caller.js b/test-basic/endpoint-caller.js index e396fb56..921fd094 100644 --- a/test-basic/endpoint-caller.js +++ b/test-basic/endpoint-caller.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../'); diff --git a/test-basic/endpoint-proxy.js b/test-basic/endpoint-proxy.js index 87c6cb91..997772cd 100644 --- a/test-basic/endpoint-proxy.js +++ b/test-basic/endpoint-proxy.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/errors.js b/test-basic/errors.js index fd1e957f..999990fe 100644 --- a/test-basic/errors.js +++ b/test-basic/errors.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/extlibs.js b/test-basic/extlibs.js index f5363552..6df1161f 100644 --- a/test-basic/extlibs.js +++ b/test-basic/extlibs.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/fromDocDescriptors-test.js b/test-basic/fromDocDescriptors-test.js index 422296be..b8c239e6 100644 --- a/test-basic/fromDocDescriptors-test.js +++ b/test-basic/fromDocDescriptors-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-basic/graphs.js b/test-basic/graphs.js index 5c1df243..a69c8dc1 100644 --- a/test-basic/graphs.js +++ b/test-basic/graphs.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/joinDocCols-test.js b/test-basic/joinDocCols-test.js index 989b4834..751788af 100644 --- a/test-basic/joinDocCols-test.js +++ b/test-basic/joinDocCols-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-basic/lockForUpdate-test.js b/test-basic/lockForUpdate-test.js index 8605ec32..93e7c0d6 100644 --- a/test-basic/lockForUpdate-test.js +++ b/test-basic/lockForUpdate-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const marklogic = require('../'); const testconfig = require('../etc/test-config.js'); diff --git a/test-basic/logging.js b/test-basic/logging.js index db544e56..de14f8fe 100644 --- a/test-basic/logging.js +++ b/test-basic/logging.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'), testconfig = require('../etc/test-config.js'), diff --git a/test-basic/optic-fromDocUris.js b/test-basic/optic-fromDocUris.js index d3588e50..31bf1739 100644 --- a/test-basic/optic-fromDocUris.js +++ b/test-basic/optic-fromDocUris.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/optic-patchBuilder.js b/test-basic/optic-patchBuilder.js index 8015c46e..7aec64f3 100644 --- a/test-basic/optic-patchBuilder.js +++ b/test-basic/optic-patchBuilder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const marklogic = require('../'); diff --git a/test-basic/optic-remove.js b/test-basic/optic-remove.js index 32e15082..62cf39e7 100644 --- a/test-basic/optic-remove.js +++ b/test-basic/optic-remove.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-basic/optic-update-execute.js b/test-basic/optic-update-execute.js index cba39248..9cbecd6a 100644 --- a/test-basic/optic-update-execute.js +++ b/test-basic/optic-update-execute.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-basic/optic-vector.js b/test-basic/optic-vector.js index ed429132..bc29330d 100644 --- a/test-basic/optic-vector.js +++ b/test-basic/optic-vector.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/patch-builder.js b/test-basic/patch-builder.js index ae90f384..0641cca8 100644 --- a/test-basic/patch-builder.js +++ b/test-basic/patch-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var assert = require('assert'); var should = require('should'); diff --git a/test-basic/plan-aggregates.js b/test-basic/plan-aggregates.js index 69ac201a..5d4daf88 100644 --- a/test-basic/plan-aggregates.js +++ b/test-basic/plan-aggregates.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-builder-base.js b/test-basic/plan-builder-base.js index 252e1fa8..652ca0ff 100644 --- a/test-basic/plan-builder-base.js +++ b/test-basic/plan-builder-base.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-builder-cts-tests-with-string-input.js b/test-basic/plan-builder-cts-tests-with-string-input.js index a81fde56..f4fd2254 100644 --- a/test-basic/plan-builder-cts-tests-with-string-input.js +++ b/test-basic/plan-builder-cts-tests-with-string-input.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-builder-generated.js b/test-basic/plan-builder-generated.js index c86d94da..678c24a0 100755 --- a/test-basic/plan-builder-generated.js +++ b/test-basic/plan-builder-generated.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; @@ -29,357 +29,357 @@ describe('plan builder', function() { }); it('cts.box#4', function(done) { testPlan([p.xs.double(1), p.xs.double(2), p.xs.double(3), p.xs.double(4)], p.cts.box(p.col("1"), p.col("2"), p.col("3"), p.col("4"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("[1, 2, 3, 4]"); done(); }).catch(done); - }); + }); it('cts.boxEast#1', function(done) { testPlan([p.cts.box(1, 2, 3, 4)], p.cts.boxEast(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('4'); done(); }).catch(done); - }); + }); it('cts.boxNorth#1', function(done) { testPlan([p.cts.box(1, 2, 3, 4)], p.cts.boxNorth(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('cts.boxSouth#1', function(done) { testPlan([p.cts.box(1, 2, 3, 4)], p.cts.boxSouth(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('cts.boxWest#1', function(done) { testPlan([p.cts.box(1, 2, 3, 4)], p.cts.boxWest(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('cts.circle#2', function(done) { testPlan([p.xs.double(1.2), p.cts.point(1, 2)], p.cts.circle(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("@1.2 1,2"); done(); }).catch(done); - }); + }); it('cts.partOfSpeech#1', function(done) { testPlan([p.xs.string("abc")], p.cts.partOfSpeech(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal(''); done(); }).catch(done); - }); + }); it('cts.period#2', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z"), p.xs.dateTime("2016-01-03T10:09:08Z")], p.cts.period(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql('cts.period(xs.dateTime("2016-01-02T10:09:08Z"),xs.dateTime("2016-01-03T10:09:08Z"))'); done(); }).catch(done); - }); + }); it('cts.point#2', function(done) { testPlan([p.xs.double(1), p.xs.double(2)], p.cts.point(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1,2"); done(); }).catch(done); - }); + }); it('cts.pointLatitude#1', function(done) { testPlan([p.cts.point(1, 2)], p.cts.pointLatitude(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('cts.pointLongitude#1', function(done) { testPlan([p.cts.point(1, 2)], p.cts.pointLongitude(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('cts.stem#1', function(done) { testPlan([p.xs.string("ran")], p.cts.stem(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('run'); done(); }).catch(done); - }); + }); it('cts.stem#2', function(done) { testPlan([p.xs.string("ran"), p.xs.string("en")], p.cts.stem(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('run'); done(); }).catch(done); - }); + }); it('cts.tokenize#1', function(done) { testPlan([p.xs.string("a-b c")], p.cts.tokenize(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "-", "b", " ", "c"]); done(); }).catch(done); - }); + }); it('cts.tokenize#2', function(done) { testPlan([p.xs.string("a-b c"), p.xs.string("en")], p.cts.tokenize(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "-", "b", " ", "c"]); done(); }).catch(done); - }); + }); it('fn.abs#1', function(done) { testPlan([p.xs.double(-11)], p.fn.abs(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('11'); done(); }).catch(done); - }); + }); it('fn.analyzeString#2', function(done) { testPlan([p.xs.string("aXbyc"), p.xs.string("[xy]")], p.fn.analyzeString(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('aXbyc'); done(); }).catch(done); - }); + }); it('fn.analyzeString#3', function(done) { testPlan([p.xs.string("aXbyc"), p.xs.string("[xy]"), p.xs.string("i")], p.fn.analyzeString(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('aXbyc'); done(); }).catch(done); - }); + }); it('fn.avg#1', function(done) { testPlan([[p.xs.double(2), p.xs.double(4), p.xs.double(6), p.xs.double(8)]], p.fn.avg(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('5'); done(); }).catch(done); - }); + }); it('fn.boolean#1', function(done) { testPlan([p.xs.string("abc")], p.fn.boolean(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.ceiling#1', function(done) { testPlan([p.xs.double(1.3)], p.fn.ceiling(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('fn.codepointEqual#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("abc")], p.fn.codepointEqual(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.codepointsToString#1', function(done) { testPlan([[p.xs.integer(97), p.xs.integer(98), p.xs.integer(99)]], p.fn.codepointsToString(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('fn.compare#2', function(done) { testPlan([p.xs.string("abz"), p.xs.string("aba")], p.fn.compare(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('fn.compare#3', function(done) { testPlan([p.xs.string("abz"), p.xs.string("aba"), p.xs.string("http://marklogic.com/collation/")], p.fn.compare(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('fn.concat#2', function(done) { testPlan([p.xs.string("a"), p.xs.string("b")], p.fn.concat(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ab'); done(); }).catch(done); - }); + }); it('fn.concat#3', function(done) { testPlan([p.xs.string("a"), p.xs.string("b"), p.xs.string("c")], p.fn.concat(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('fn.contains#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("b")], p.fn.contains(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.contains#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("b"), p.xs.string("http://marklogic.com/collation/")], p.fn.contains(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.count#1', function(done) { testPlan([[p.xs.double(1), p.xs.double(2), p.xs.double(3)]], p.fn.count(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('fn.count#2', function(done) { testPlan([[p.xs.double(1), p.xs.double(2), p.xs.double(3)], p.xs.double(4)], p.fn.count(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('fn.dateTime#2', function(done) { testPlan([p.xs.date("2016-01-02Z"), p.xs.time("10:09:08Z")], p.fn.dateTime(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016-01-02T10:09:08Z'); done(); }).catch(done); - }); + }); it('fn.dayFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02-03:04")], p.fn.dayFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('fn.dayFromDateTime#1', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z")], p.fn.dayFromDateTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('fn.daysFromDuration#1', function(done) { testPlan([p.xs.dayTimeDuration("P3DT4H5M6S")], p.fn.daysFromDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('fn.deepEqual#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("abc")], p.fn.deepEqual(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.deepEqual#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("abc"), p.xs.string("http://marklogic.com/collation/")], p.fn.deepEqual(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.distinctValues#1', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("b"), p.xs.string("c")]], p.fn.distinctValues(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "b", "c"]); done(); }).catch(done); - }); + }); it('fn.distinctValues#2', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("b"), p.xs.string("c")], p.xs.string("http://marklogic.com/collation/")], p.fn.distinctValues(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "b", "c"]); done(); }).catch(done); - }); + }); it('fn.empty#1', function(done) { testPlan([p.xs.double(1)], p.fn.empty(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('fn.encodeForUri#1', function(done) { testPlan([p.xs.string("http://a/b?c#d")], p.fn.encodeForUri(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http%3A%2F%2Fa%2Fb%3Fc%23d'); done(); }).catch(done); - }); + }); it('fn.endsWith#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("c")], p.fn.endsWith(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.endsWith#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("c"), p.xs.string("http://marklogic.com/collation/")], p.fn.endsWith(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.escapeHtmlUri#1', function(done) { testPlan([p.xs.string("http://a/b?c#d")], p.fn.escapeHtmlUri(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http://a/b?c#d'); done(); }).catch(done); - }); + }); it('fn.exists#1', function(done) { testPlan([p.xs.double(1)], p.fn.exists(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.false#0', function(done) { testPlan(undefined, p.fn.false()) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('fn.floor#1', function(done) { testPlan([p.xs.double(1.7)], p.fn.floor(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('fn.formatDate#2', function(done) { testPlan([p.xs.date("2016-01-02-03:04"), p.xs.string("[Y0001]/[M01]/[D01]")], p.fn.formatDate(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016/01/02'); done(); }).catch(done); - }); + }); it('fn.formatDateTime#2', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z"), p.xs.string("[Y0001]/[M01]/[D01] [H01]:[m01]:[s01]:[f01]")], p.fn.formatDateTime(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016/01/02 10:09:08:00'); done(); }).catch(done); - }); + }); it('fn.formatNumber#2', function(done) { testPlan([p.xs.double(1234.5), p.xs.string("#,##0.00")], p.fn.formatNumber(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1,234.50"); done(); }).catch(done); - }); + }); it('fn.formatTime#2', function(done) { testPlan([p.xs.time("10:09:08Z"), p.xs.string("[H01]:[m01]:[s01]:[f01]")], p.fn.formatTime(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('10:09:08:00'); done(); }).catch(done); @@ -393,193 +393,193 @@ describe('plan builder', function() { }); it('fn.hoursFromDateTime#1', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z")], p.fn.hoursFromDateTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('10'); done(); }).catch(done); - }); + }); it('fn.hoursFromDuration#1', function(done) { testPlan([p.xs.dayTimeDuration("P3DT4H5M6S")], p.fn.hoursFromDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('4'); done(); }).catch(done); - }); + }); it('fn.hoursFromTime#1', function(done) { testPlan([p.xs.time("10:09:08Z")], p.fn.hoursFromTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('10'); done(); }).catch(done); - }); + }); it('fn.indexOf#2', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")], p.xs.string("b")], p.fn.indexOf(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('fn.indexOf#3', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")], p.xs.string("b"), p.xs.string("http://marklogic.com/collation/")], p.fn.indexOf(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('fn.insertBefore#3', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("e"), p.xs.string("f")], p.xs.integer(3), [p.xs.string("c"), p.xs.string("d")]], p.fn.insertBefore(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "b", "c", "d", "e", "f"]); done(); }).catch(done); - }); + }); it('fn.iriToUri#1', function(done) { testPlan([p.xs.string("http://a/b?c#d")], p.fn.iriToUri(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http://a/b?c#d'); done(); }).catch(done); - }); + }); it('fn.localNameFromQName#1', function(done) { testPlan([p.xs.QName("abc")], p.fn.localNameFromQName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('fn.lowerCase#1', function(done) { testPlan([p.xs.string("ABC")], p.fn.lowerCase(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('fn.matches#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("^.B")], p.fn.matches(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('fn.matches#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("^.B"), p.xs.string("i")], p.fn.matches(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.max#1', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")]], p.fn.max(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('c'); done(); }).catch(done); - }); + }); it('fn.max#2', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")], p.xs.string("http://marklogic.com/collation/")], p.fn.max(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('c'); done(); }).catch(done); - }); + }); it('fn.min#1', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")]], p.fn.min(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('fn.min#2', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")], p.xs.string("http://marklogic.com/collation/")], p.fn.min(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('fn.minutesFromDateTime#1', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z")], p.fn.minutesFromDateTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('9'); done(); }).catch(done); - }); + }); it('fn.minutesFromDuration#1', function(done) { testPlan([p.xs.dayTimeDuration("P3DT4H5M6S")], p.fn.minutesFromDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('5'); done(); }).catch(done); - }); + }); it('fn.minutesFromTime#1', function(done) { testPlan([p.xs.time("10:09:08Z")], p.fn.minutesFromTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('9'); done(); }).catch(done); - }); + }); it('fn.monthFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02-03:04")], p.fn.monthFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('fn.monthFromDateTime#1', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z")], p.fn.monthFromDateTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('fn.monthsFromDuration#1', function(done) { testPlan([p.xs.yearMonthDuration("P1Y2M")], p.fn.monthsFromDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('fn.namespaceUriFromQName#1', function(done) { testPlan([p.xs.QName("abc")], p.fn.namespaceUriFromQName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal(''); done(); }).catch(done); - }); + }); it('fn.normalizeSpace#1', function(done) { testPlan([p.xs.string(" abc 123 ")], p.fn.normalizeSpace(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc 123'); done(); }).catch(done); - }); + }); it('fn.normalizeUnicode#1', function(done) { testPlan([p.xs.string(" aBc ")], p.fn.normalizeUnicode(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('aBc '); done(); }).catch(done); - }); + }); it('fn.normalizeUnicode#2', function(done) { testPlan([p.xs.string(" aBc "), p.xs.string("NFC")], p.fn.normalizeUnicode(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('aBc '); done(); }).catch(done); - }); + }); it('fn.not#1', function(done) { testPlan([p.xs.boolean(true)], p.fn.not(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('fn.number#1', function(done) { testPlan([p.xs.string("1.1")], p.fn.number(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.1'); done(); }).catch(done); - }); + }); it('fn.prefixFromQName#1', function(done) { testPlan([p.xs.QName("abc")], p.fn.prefixFromQName(p.col("1"))) .then(function(response) { @@ -590,381 +590,381 @@ describe('plan builder', function() { } done(); }).catch(done); - }); + }); it('fn.QName#2', function(done) { testPlan([p.xs.string("http://a/b"), p.xs.string("c")], p.fn.QName(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('c'); done(); }).catch(done); - }); + }); it('fn.remove#2', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("x"), p.xs.string("c")], p.xs.integer(3)], p.fn.remove(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "b", "c"]); done(); }).catch(done); - }); + }); it('fn.replace#3', function(done) { testPlan([p.xs.string("axc"), p.xs.string("^(.)X"), p.xs.string("$1b")], p.fn.replace(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('axc'); done(); }).catch(done); - }); + }); it('fn.replace#4', function(done) { testPlan([p.xs.string("axc"), p.xs.string("^(.)X"), p.xs.string("$1b"), p.xs.string("i")], p.fn.replace(p.col("1"), p.col("2"), p.col("3"), p.col("4"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('fn.resolveUri#2', function(done) { testPlan([p.xs.string("b?c#d"), p.xs.string("http://a/x")], p.fn.resolveUri(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http://a/b?c#d'); done(); }).catch(done); - }); + }); it('fn.reverse#1', function(done) { testPlan([[p.xs.string("c"), p.xs.string("b"), p.xs.string("a")]], p.fn.reverse(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "b", "c"]); done(); }).catch(done); - }); + }); it('fn.round#1', function(done) { testPlan([p.xs.double(1.7)], p.fn.round(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('fn.roundHalfToEven#1', function(done) { testPlan([p.xs.double(1234.5)], p.fn.roundHalfToEven(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1234'); done(); }).catch(done); - }); + }); it('fn.roundHalfToEven#2', function(done) { testPlan([p.xs.double(1234.5), p.xs.integer(-2)], p.fn.roundHalfToEven(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1200'); done(); }).catch(done); - }); + }); it('fn.secondsFromDateTime#1', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z")], p.fn.secondsFromDateTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('8'); done(); }).catch(done); - }); + }); it('fn.secondsFromDuration#1', function(done) { testPlan([p.xs.dayTimeDuration("P3DT4H5M6S")], p.fn.secondsFromDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('6'); done(); }).catch(done); - }); + }); it('fn.secondsFromTime#1', function(done) { testPlan([p.xs.time("10:09:08Z")], p.fn.secondsFromTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('8'); done(); }).catch(done); - }); + }); it('fn.startsWith#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("a")], p.fn.startsWith(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.startsWith#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("a"), p.xs.string("http://marklogic.com/collation/")], p.fn.startsWith(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.string#1', function(done) { testPlan([p.xs.double(1)], p.fn.string(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('fn.stringJoin#2', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")], p.xs.string("+")], p.fn.stringJoin(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a+b+c'); done(); }).catch(done); - }); + }); it('fn.stringLength#1', function(done) { testPlan([p.xs.string("abc")], p.fn.stringLength(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('fn.stringToCodepoints#1', function(done) { testPlan([p.xs.string("abc")], p.fn.stringToCodepoints(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([97, 98, 99]); done(); }).catch(done); - }); + }); it('fn.subsequence#2', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c"), p.xs.string("d"), p.xs.string("e")], p.xs.double(2)], p.fn.subsequence(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["b", "c", "d", "e"]); done(); }).catch(done); - }); + }); it('fn.subsequence#3', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c"), p.xs.string("d"), p.xs.string("e")], p.xs.double(2), p.xs.double(3)], p.fn.subsequence(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["b", "c", "d"]); done(); }).catch(done); - }); + }); it('fn.substring#2', function(done) { testPlan([p.xs.string("abcd"), p.xs.double(2)], p.fn.substring(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('bcd'); done(); }).catch(done); - }); + }); it('fn.substring#3', function(done) { testPlan([p.xs.string("abcd"), p.xs.double(2), p.xs.double(2)], p.fn.substring(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('bc'); done(); }).catch(done); - }); + }); it('fn.substringAfter#2', function(done) { testPlan([p.xs.string("abcd"), p.xs.string("ab")], p.fn.substringAfter(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('cd'); done(); }).catch(done); - }); + }); it('fn.substringAfter#3', function(done) { testPlan([p.xs.string("abcd"), p.xs.string("ab"), p.xs.string("http://marklogic.com/collation/")], p.fn.substringAfter(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('cd'); done(); }).catch(done); - }); + }); it('fn.substringBefore#2', function(done) { testPlan([p.xs.string("abcd"), p.xs.string("cd")], p.fn.substringBefore(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ab'); done(); }).catch(done); - }); + }); it('fn.substringBefore#3', function(done) { testPlan([p.xs.string("abcd"), p.xs.string("cd"), p.xs.string("http://marklogic.com/collation/")], p.fn.substringBefore(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ab'); done(); }).catch(done); - }); + }); it('fn.sum#1', function(done) { testPlan([[p.xs.double(1), p.xs.double(2), p.xs.double(3)]], p.fn.sum(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('6'); done(); }).catch(done); - }); + }); it('fn.tail#1', function(done) { testPlan([[p.xs.string("a"), p.xs.string("b"), p.xs.string("c")]], p.fn.tail(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["b", "c"]); done(); }).catch(done); - }); + }); it('fn.tokenize#2', function(done) { testPlan([p.xs.string("axbxc"), p.xs.string("X")], p.fn.tokenize(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('axbxc'); done(); }).catch(done); - }); + }); it('fn.tokenize#3', function(done) { testPlan([p.xs.string("axbxc"), p.xs.string("X"), p.xs.string("i")], p.fn.tokenize(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["a", "b", "c"]); done(); }).catch(done); - }); + }); it('fn.translate#3', function(done) { testPlan([p.xs.string("axcy"), p.xs.string("xy"), p.xs.string("bd")], p.fn.translate(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abcd'); done(); }).catch(done); - }); + }); it('fn.true#0', function(done) { testPlan(undefined, p.fn.true()) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('fn.upperCase#1', function(done) { testPlan([p.xs.string("abc")], p.fn.upperCase(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ABC'); done(); }).catch(done); - }); + }); it('fn.yearFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02-03:04")], p.fn.yearFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016'); done(); }).catch(done); - }); + }); it('fn.yearFromDateTime#1', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z")], p.fn.yearFromDateTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016'); done(); }).catch(done); - }); + }); it('fn.yearsFromDuration#1', function(done) { testPlan([p.xs.yearMonthDuration("P1Y2M")], p.fn.yearsFromDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('geo.arcIntersection#4', function(done) { testPlan([p.cts.point(1, 2), p.cts.point(1, 2), p.cts.point(1, 2), p.cts.point(1, 2)], p.geo.arcIntersection(p.col("1"), p.col("2"), p.col("3"), p.col("4"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1,2"); done(); }).catch(done); - }); + }); it('geo.arcIntersection#5', function(done) { testPlan([p.cts.point(1, 2), p.cts.point(1, 2), p.cts.point(1, 2), p.cts.point(1, 2), p.xs.string("precision=float")], p.geo.arcIntersection(p.col("1"), p.col("2"), p.col("3"), p.col("4"), p.col("5"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1,2"); done(); }).catch(done); - }); + }); it('geo.bearing#2', function(done) { testPlan([p.cts.point(1, 2), p.cts.point(3, 4)], p.geo.bearing(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(parseFloat(getResult(response).value).toFixed(2)).equal('0.79'); done(); }).catch(done); - }); + }); it('geo.bearing#3', function(done) { testPlan([p.cts.point(1, 2), p.cts.point(3, 4), p.xs.string("precision=float")], p.geo.bearing(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(parseFloat(getResult(response).value).toFixed(2)).equal('0.79'); done(); }).catch(done); - }); + }); it('geo.destination#3', function(done) { testPlan([p.cts.point(1, 2), p.xs.double(1.2), p.xs.double(1.2)], p.geo.destination(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1.0063286,2.0161717"); done(); }).catch(done); - }); + }); it('geo.destination#4', function(done) { testPlan([p.cts.point(1, 2), p.xs.double(1.2), p.xs.double(1.2), p.xs.string("precision=float")], p.geo.destination(p.col("1"), p.col("2"), p.col("3"), p.col("4"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1.0063286,2.0161717"); done(); }).catch(done); - }); + }); it('geo.distance#2', function(done) { testPlan([p.cts.point(1, 2), p.cts.point(1, 2)], p.geo.distance(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('geo.distance#3', function(done) { testPlan([p.cts.point(1, 2), p.cts.point(1, 2), p.xs.string("precision=float")], p.geo.distance(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('geo.distanceConvert#3', function(done) { testPlan([p.xs.double(1), p.xs.string("miles"), p.xs.string("km")], p.geo.distanceConvert(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.609344'); done(); }).catch(done); - }); + }); it('geo.ellipsePolygon#5', function(done) { testPlan([p.cts.point(1, 2), p.xs.double(1.2), p.xs.double(1.2), p.xs.double(1.2), p.xs.double(1.2)], p.geo.ellipsePolygon(p.col("1"), p.col("2"), p.col("3"), p.col("4"), p.col("5"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1.0063287,2.0162783 0.98657537,2.0110099 0.98537451,1.9905261 1.0043854,1.983135 1.0173359,1.9990506 1.0063287,2.0162783"); done(); }).catch(done); - }); + }); it('geo.ellipsePolygon#6', function(done) { testPlan([p.cts.point(1, 2), p.xs.double(1.2), p.xs.double(1.2), p.xs.double(1.2), p.xs.double(1.2), p.xs.string("precision=float")], p.geo.ellipsePolygon(p.col("1"), p.col("2"), p.col("3"), p.col("4"), p.col("5"), p.col("6"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1.0063287,2.0162783 0.98657537,2.0110099 0.98537451,1.9905261 1.0043854,1.983135 1.0173359,1.9990506 1.0063287,2.0162783"); done(); }).catch(done); - }); + }); it('geo.geohashDecode#1', function(done) { testPlan([p.xs.string("abc")], p.geo.geohashDecode(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("[-90, -180, 90, 180]"); done(); }).catch(done); - }); + }); it('geo.geohashDecodePoint#1', function(done) { testPlan([p.xs.string("s01mtw")], p.geo.geohashDecodePoint(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("1.0025024,2.0050049"); done(); }).catch(done); - }); + }); it('geo.geohashNeighbors#1', function(done) { testPlan([p.xs.string("s01mtw")], p.geo.geohashNeighbors(p.col("1"))) .then(function(response) { should(getResult(response).value).eql({"NE":"s01mtz", "S":"s01mtt", "E":"s01mty", "W":"s01mtq", "SW":"s01mtm", "N":"s01mtx", "SE":"s01mtv", "NW":"s01mtr"}); done(); }).catch(done); - }); + }); it('geo.geohashPrecisionDimensions#1', function(done) { testPlan([p.xs.integer(4)], p.geo.geohashPrecisionDimensions(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([0.17578125, 0.3515625]); done(); }).catch(done); - }); + }); it('geo.geohashSubhashes#1', function(done) { if(serverConfiguration.serverVersion < 11){ this.skip(); } testPlan([p.xs.string("s01mtw")], p.geo.geohashSubhashes(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["s01mtw0", "s01mtw1", "s01mtw2", "s01mtw3", "s01mtw4", "s01mtw5", "s01mtw6", "s01mtw7", "s01mtw8", "s01mtw9", "s01mtwb", "s01mtwc", "s01mtwd", "s01mtwe", "s01mtwf", "s01mtwg", "s01mtwh", "s01mtwj", "s01mtwk", "s01mtwm", "s01mtwn", "s01mtwp", "s01mtwq", "s01mtwr", "s01mtws", "s01mtwt", "s01mtwu", "s01mtwv", "s01mtww", "s01mtwx", "s01mtwy", "s01mtwz"]); done(); }).catch(error => done(error)); }); it('geo.geohashSubhashes#2', function(done) { testPlan([p.xs.string("s01mtw"), p.xs.string("S")], p.geo.geohashSubhashes(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["s01mtwh", "s01mtwj", "s01mtwk", "s01mtwm", "s01mtwn", "s01mtwp", "s01mtwq", "s01mtwr", "s01mtws", "s01mtwt", "s01mtwu", "s01mtwv", "s01mtww", "s01mtwx", "s01mtwy", "s01mtwz"]); done(); }).catch(done); - }); + }); it('geo.parseWkt#1', function(done) { testPlan([p.xs.string("LINESTRING(-112.25 47.1,-112.3 47.1,-112.4 47.2)")], p.geo.parseWkt(p.col("1"))) .then(function(response) { @@ -973,756 +973,756 @@ describe('plan builder', function() { should(getResult(response).value).eql(responseValue); done(); }).catch(done); - }); + }); it('geo.validateWkt#1', function(done) { testPlan([p.xs.string("POINT(2 1)")], p.geo.validateWkt(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('json.array#0', function(done) { testPlan(undefined, p.json.array()) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([]); done(); }).catch(done); - }); + }); it('json.toArray#0', function(done) { testPlan(undefined, p.json.toArray()) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([]); done(); }).catch(done); - }); + }); it('map.entry#2', function(done) { testPlan([p.xs.string("one"), p.xs.string("two")], p.map.entry(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql({"one":"two"}); done(); }).catch(done); - }); + }); it('map.map#0', function(done) { testPlan(undefined, p.map.map()) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql({}); done(); }).catch(done); - }); + }); it('map.new#0', function(done) { testPlan(undefined, p.map.new()) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql({}); done(); }).catch(done); - }); + }); it('math.acos#1', function(done) { testPlan([p.xs.double(0.5)], p.math.acos(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.0471975511966'); done(); }).catch(done); - }); + }); it('math.asin#1', function(done) { testPlan([p.xs.double(0.5)], p.math.asin(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0.523598775598299'); done(); }).catch(done); - }); + }); it('math.atan#1', function(done) { testPlan([p.xs.double(3.14159)], p.math.atan(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.26262701154934'); done(); }).catch(done); - }); + }); it('math.atan2#2', function(done) { testPlan([p.xs.double(36.23), p.xs.double(5.234)], p.math.atan2(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.42732303452594'); done(); }).catch(done); - }); + }); it('math.ceil#1', function(done) { testPlan([p.xs.double(1.3)], p.math.ceil(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('math.cos#1', function(done) { testPlan([p.xs.double(11)], p.math.cos(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0.00442569798805079'); done(); }).catch(done); - }); + }); it('math.cosh#1', function(done) { testPlan([p.xs.double(11)], p.math.cosh(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('29937.0708659498'); done(); }).catch(done); - }); + }); it('math.cot#1', function(done) { testPlan([p.xs.double(19.5)], p.math.cot(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.31422390103306'); done(); }).catch(done); - }); + }); it('math.degrees#1', function(done) { testPlan([p.xs.double(1.5707963267949)], p.math.degrees(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('90.0000000000002'); done(); }).catch(done); - }); + }); it('math.exp#1', function(done) { testPlan([p.xs.double(0.1)], p.math.exp(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.10517091807565'); done(); }).catch(done); - }); + }); it('math.fabs#1', function(done) { testPlan([p.xs.double(4.013)], p.math.fabs(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('4.013'); done(); }).catch(done); - }); + }); it('math.floor#1', function(done) { testPlan([p.xs.double(1.7)], p.math.floor(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('math.fmod#2', function(done) { testPlan([p.xs.double(10), p.xs.double(3)], p.math.fmod(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('math.frexp#1', function(done) { testPlan([p.xs.double(10)], p.math.frexp(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([0.625, 4]); done(); }).catch(done); - }); + }); it('math.ldexp#2', function(done) { testPlan([p.xs.double(1.333), p.xs.integer(10)], p.math.ldexp(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1364.992'); done(); }).catch(done); - }); + }); it('math.log#1', function(done) { testPlan([p.xs.double(1000)], p.math.log(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('6.90775527898214'); done(); }).catch(done); - }); + }); it('math.log10#1', function(done) { testPlan([p.xs.double(1000)], p.math.log10(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('math.median#1', function(done) { testPlan([p.xs.double(1.2)], p.math.median(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.2'); done(); }).catch(done); - }); + }); it('math.mode#1', function(done) { testPlan([[p.xs.string("abc"), p.xs.string("abc"), p.xs.string("def")]], p.math.mode(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('math.mode#2', function(done) { testPlan([[p.xs.string("abc"), p.xs.string("abc"), p.xs.string("def")], p.xs.string("collation=http://marklogic.com/collation/")], p.math.mode(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('math.modf#1', function(done) { testPlan([p.xs.double(1.333)], p.math.modf(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([0.333, 1]); done(); }).catch(done); - }); + }); it('math.percentRank#2', function(done) { testPlan([[p.xs.double(1), p.xs.double(7), p.xs.double(5), p.xs.double(5), p.xs.double(10), p.xs.double(9)], p.xs.double(9)], p.math.percentRank(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0.833333333333333'); done(); }).catch(done); - }); + }); it('math.percentRank#3', function(done) { testPlan([[p.xs.double(1), p.xs.double(7), p.xs.double(5), p.xs.double(5), p.xs.double(10), p.xs.double(9)], p.xs.double(9), p.xs.string("descending")], p.math.percentRank(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0.333333333333333'); done(); }).catch(done); - }); + }); it('math.percentile#2', function(done) { testPlan([[p.xs.double(2), p.xs.double(3), p.xs.double(1), p.xs.double(4)], [p.xs.double(0.25), p.xs.double(0.75)]], p.math.percentile(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([1.5, 3.5]); done(); }).catch(done); - }); + }); it('math.pi#0', function(done) { testPlan(undefined, p.math.pi()) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3.14159265358979'); done(); }).catch(done); - }); + }); it('math.pow#2', function(done) { testPlan([p.xs.double(2), p.xs.double(10)], p.math.pow(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1024'); done(); }).catch(done); - }); + }); it('math.radians#1', function(done) { testPlan([p.xs.double(90)], p.math.radians(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.5707963267949'); done(); }).catch(done); - }); + }); it('math.rank#2', function(done) { testPlan([[p.xs.double(1), p.xs.double(7), p.xs.double(5), p.xs.double(5), p.xs.double(10), p.xs.double(9)], p.xs.double(9)], p.math.rank(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('5'); done(); }).catch(done); - }); + }); it('math.rank#3', function(done) { testPlan([[p.xs.double(1), p.xs.double(7), p.xs.double(5), p.xs.double(5), p.xs.double(10), p.xs.double(9)], p.xs.double(9), p.xs.string("descending")], p.math.rank(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('math.sin#1', function(done) { testPlan([p.xs.double(1.95)], p.math.sin(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0.928959715003869'); done(); }).catch(done); - }); + }); it('math.sinh#1', function(done) { testPlan([p.xs.double(1.95)], p.math.sinh(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3.44320675450139'); done(); }).catch(done); - }); + }); it('math.sqrt#1', function(done) { testPlan([p.xs.double(4)], p.math.sqrt(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('math.stddev#1', function(done) { testPlan([p.xs.double(1.2)], p.math.stddev(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(null); done(); }).catch(done); - }); + }); it('math.stddevP#1', function(done) { testPlan([p.xs.double(1.2)], p.math.stddevP(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('math.tan#1', function(done) { testPlan([p.xs.double(19.5)], p.math.tan(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0.760905351982977'); done(); }).catch(done); - }); + }); it('math.tanh#1', function(done) { testPlan([p.xs.double(0.95)], p.math.tanh(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0.739783051274004'); done(); }).catch(done); - }); + }); it('math.trunc#1', function(done) { testPlan([p.xs.double(123.456)], p.math.trunc(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('123'); done(); }).catch(done); - }); + }); it('math.trunc#2', function(done) { testPlan([p.xs.double(123.456), p.xs.integer(2)], p.math.trunc(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('123.45'); done(); }).catch(done); - }); + }); it('math.variance#1', function(done) { testPlan([p.xs.double(1.2)], p.math.variance(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(null); done(); }).catch(done); - }); + }); it('math.varianceP#1', function(done) { testPlan([p.xs.double(1.2)], p.math.varianceP(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('rdf.langString#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("en")], p.rdf.langString(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('rdf.langStringLanguage#1', function(done) { testPlan([p.rdf.langString("abc", "en")], p.rdf.langStringLanguage(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('en'); done(); }).catch(done); - }); + }); it('sem.coalesce#2', function(done) { testPlan([p.xs.string("a"), p.xs.string("b")], p.sem.coalesce(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('sem.coalesce#3', function(done) { testPlan([p.xs.string("a"), p.xs.string("b"), p.xs.string("c")], p.sem.coalesce(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('sem.datatype#1', function(done) { testPlan([p.xs.string("a")], p.sem.datatype(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http://www.w3.org/2001/XMLSchema#string'); done(); }).catch(done); - }); + }); it('sem.defaultGraphIri#0', function(done) { testPlan(undefined, p.sem.defaultGraphIri()) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http://marklogic.com/semantics#default-graph'); done(); }).catch(done); - }); + }); it('sem.if#3', function(done) { testPlan([p.xs.boolean(true), p.xs.string("a"), p.xs.string("b")], p.sem.if(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('sem.invalid#2', function(done) { testPlan([p.xs.string("abc"), p.sem.iri("http://a/b")], p.sem.invalid(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sem.iri#1', function(done) { testPlan([p.xs.string("http://a/b")], p.sem.iri(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http://a/b'); done(); }).catch(done); - }); + }); it('sem.iriToQName#1', function(done) { testPlan([p.xs.string("http://a/b")], p.sem.iriToQName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('b'); done(); }).catch(done); - }); + }); it('sem.isBlank#1', function(done) { testPlan([p.xs.double(1)], p.sem.isBlank(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('sem.isIRI#1', function(done) { testPlan([p.xs.double(1)], p.sem.isIRI(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('sem.isLiteral#1', function(done) { testPlan([p.xs.double(1)], p.sem.isLiteral(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('sem.isNumeric#1', function(done) { testPlan([p.xs.string("a")], p.sem.isNumeric(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('sem.lang#1', function(done) { testPlan([p.xs.string("abc")], p.sem.lang(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal(''); done(); }).catch(done); - }); + }); it('sem.langMatches#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("abc")], p.sem.langMatches(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('sem.QNameToIri#1', function(done) { testPlan([p.xs.QName("abc")], p.sem.QNameToIri(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sem.sameTerm#2', function(done) { testPlan([p.xs.double(1), p.xs.double(1)], p.sem.sameTerm(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('sem.timezoneString#1', function(done) { testPlan([p.xs.dateTime("2016-01-02T10:09:08Z")], p.sem.timezoneString(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('Z'); done(); }).catch(done); - }); + }); it('sem.typedLiteral#2', function(done) { testPlan([p.xs.string("abc"), p.sem.iri("http://a/b")], p.sem.typedLiteral(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sem.unknown#2', function(done) { testPlan([p.xs.string("abc"), p.sem.iri("http://a/b")], p.sem.unknown(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('spell.doubleMetaphone#1', function(done) { testPlan([p.xs.string("smith")], p.spell.doubleMetaphone(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(["smo", "xmt"]); done(); }).catch(done); - }); + }); it('spell.levenshteinDistance#2', function(done) { testPlan([p.xs.string("cat"), p.xs.string("cats")], p.spell.levenshteinDistance(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('spell.romanize#1', function(done) { testPlan([p.xs.string("abc")], p.spell.romanize(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sql.bitLength#1', function(done) { testPlan([p.xs.string("abc")], p.sql.bitLength(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('24'); done(); }).catch(done); - }); + }); it('sql.bucket#2', function(done) { testPlan([[p.xs.double(2), p.xs.double(4)], p.xs.double(3)], p.sql.bucket(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('sql.collatedString#2', function(done) { testPlan([p.xs.string("a"), p.xs.string("http://marklogic.com/collation/")], p.sql.collatedString(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('sql.dateadd#3', function(done) { testPlan([p.xs.string("day"), p.xs.int(3), p.xs.string("2016-01-02T10:09:08Z")], p.sql.dateadd(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016-01-05T10:09:08Z'); done(); }).catch(done); - }); + }); it('sql.datediff#3', function(done) { testPlan([p.xs.string("day"), p.xs.string("2016-01-02T10:09:08Z"), p.xs.string("2016-01-05T10:09:08Z")], p.sql.datediff(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('sql.datepart#2', function(done) { testPlan([p.xs.string("day"), p.xs.string("2016-01-05T10:09:08Z")], p.sql.datepart(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('5'); done(); }).catch(done); - }); + }); it('sql.day#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.day(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('sql.dayname#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.dayname(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('Saturday'); done(); }).catch(done); - }); + }); it('sql.glob#2', function(done) { testPlan([p.xs.string("abcdefg"), p.xs.string("a??d*g")], p.sql.glob(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('sql.hours#1', function(done) { testPlan([p.xs.string("10:09:08")], p.sql.hours(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('10'); done(); }).catch(done); - }); + }); it('sql.ifnull#2', function(done) { testPlan([p.xs.string("a"), p.xs.string("b")], p.sql.ifnull(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('sql.insert#4', function(done) { testPlan([p.xs.string("axxxf"), p.xs.double(2), p.xs.double(3), p.xs.string("bcde")], p.sql.insert(p.col("1"), p.col("2"), p.col("3"), p.col("4"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abcdef'); done(); }).catch(done); - }); + }); it('sql.instr#2', function(done) { testPlan([p.xs.string("abcde"), p.xs.string("cd")], p.sql.instr(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('sql.left#2', function(done) { testPlan([p.xs.string("abcde"), p.xs.double(3)], p.sql.left(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sql.like#2', function(done) { testPlan([p.xs.string("abcdefg%h"), p.xs.string("a__d%g!%h")], p.sql.like(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(false); done(); }).catch(done); - }); + }); it('sql.like#3', function(done) { testPlan([p.xs.string("abcdefg%h"), p.xs.string("a__d%g!%h"), p.xs.string("!")], p.sql.like(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('sql.ltrim#1', function(done) { testPlan([p.xs.string(" abc")], p.sql.ltrim(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sql.minutes#1', function(done) { testPlan([p.xs.string("10:09:08")], p.sql.minutes(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('9'); done(); }).catch(done); - }); + }); it('sql.month#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.month(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('sql.monthname#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.monthname(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('January'); done(); }).catch(done); - }); + }); it('sql.nullif#2', function(done) { testPlan([p.xs.string("a"), p.xs.string("b")], p.sql.nullif(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a'); done(); }).catch(done); - }); + }); it('sql.octetLength#1', function(done) { testPlan([p.xs.string("abc")], p.sql.octetLength(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3'); done(); }).catch(done); - }); + }); it('sql.quarter#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.quarter(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('sql.repeat#2', function(done) { testPlan([p.xs.string("abc"), p.xs.double(2)], p.sql.repeat(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abcabc'); done(); }).catch(done); - }); + }); it('sql.right#2', function(done) { testPlan([p.xs.string("abcde"), p.xs.double(3)], p.sql.right(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('cde'); done(); }).catch(done); - }); + }); it('sql.rtrim#1', function(done) { testPlan([p.xs.string("abc ")], p.sql.rtrim(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sql.seconds#1', function(done) { testPlan([p.xs.string("10:09:08")], p.sql.seconds(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('8'); done(); }).catch(done); - }); + }); it('sql.sign#1', function(done) { testPlan([p.xs.double(-3)], p.sql.sign(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('-1'); done(); }).catch(done); - }); + }); it('sql.soundex#1', function(done) { testPlan([p.xs.string("word")], p.sql.soundex(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('W630'); done(); }).catch(done); - }); + }); it('sql.space#1', function(done) { testPlan([p.xs.double(2)], p.sql.space(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value)).equal(' '); done(); }).catch(done); - }); + }); it('sql.strpos#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("b")], p.sql.strpos(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('sql.strpos#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("b"), p.xs.string("http://marklogic.com/collation/")], p.sql.strpos(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('sql.trim#1', function(done) { testPlan([p.xs.string(" abc ")], p.sql.trim(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('sql.week#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.week(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('53'); done(); }).catch(done); - }); + }); it('sql.weekday#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.weekday(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('6'); done(); }).catch(done); - }); + }); it('sql.year#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.year(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016'); done(); }).catch(done); - }); + }); it('sql.yearday#1', function(done) { testPlan([p.xs.string("2016-01-02")], p.sql.yearday(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('vec.base64Decode#1', function(done) { if(serverConfiguration.serverVersion < 12) { this.skip(); @@ -1765,877 +1765,877 @@ describe('plan builder', function() { }); it('xdmp.add64#2', function(done) { testPlan([p.xs.unsignedLong(123), p.xs.unsignedLong(456)], p.xdmp.add64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('579'); done(); }).catch(done); - }); + }); it('xdmp.and64#2', function(done) { testPlan([p.xs.unsignedLong(255), p.xs.unsignedLong(2)], p.xdmp.and64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('xdmp.base64Decode#1', function(done) { testPlan([p.xs.string("aGVsbG8sIHdvcmxk")], p.xdmp.base64Decode(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql("hello, world"); done(); }).catch(done); - }); + }); it('xdmp.base64Encode#1', function(done) { testPlan([p.xs.string("hello, world")], p.xdmp.base64Encode(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('aGVsbG8sIHdvcmxk'); done(); }).catch(done); - }); + }); it('xdmp.castableAs#3', function(done) { testPlan([p.xs.string("http://www.w3.org/2001/XMLSchema"), p.xs.string("int"), p.xs.string("1")], p.xdmp.castableAs(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('xdmp.crypt#2', function(done) { testPlan([p.xs.string("123abc"), p.xs.string("admin")], p.xdmp.crypt(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('arQEnpM6JHR8vY4n3e5gr0'); done(); }).catch(done); - }); + }); it('xdmp.daynameFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02")], p.xdmp.daynameFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('Saturday'); done(); }).catch(done); - }); + }); it('xdmp.decodeFromNCName#1', function(done) { testPlan([p.xs.string("A_20_Name")], p.xdmp.decodeFromNCName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('A Name'); done(); }).catch(done); - }); + }); it('xdmp.diacriticLess#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.diacriticLess(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('xdmp.encodeForNCName#1', function(done) { testPlan([p.xs.string("A Name")], p.xdmp.encodeForNCName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('A_20_Name'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#1', function(done) { testPlan([p.xs.double(9)], p.xdmp.formatNumber(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('9'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#2', function(done) { testPlan([p.xs.double(9), p.xs.string("W")], p.xdmp.formatNumber(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('9'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#3', function(done) { testPlan([p.xs.double(9), p.xs.string("W"), p.xs.string("en")], p.xdmp.formatNumber(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('NINE'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#4', function(done) { testPlan([p.xs.double(9), p.xs.string("W"), p.xs.string("en"), p.xs.string("")], p.xdmp.formatNumber(p.col("1"), p.col("2"), p.col("3"), p.col("4"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('NINE'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#5', function(done) { testPlan([p.xs.double(9), p.xs.string("W"), p.xs.string("en"), p.xs.string(""), p.xs.string("")], p.xdmp.formatNumber(p.col("1"), p.col("2"), p.col("3"), p.col("4"), p.col("5"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('NINE'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#6', function(done) { testPlan([p.xs.double(9), p.xs.string("W"), p.xs.string("en"), p.xs.string(""), p.xs.string(""), p.xs.string("")], p.xdmp.formatNumber(p.col("1"), p.col("2"), p.col("3"), p.col("4"), p.col("5"), p.col("6"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('NINE'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#7', function(done) { testPlan([p.xs.double(9), p.xs.string("W"), p.xs.string("en"), p.xs.string(""), p.xs.string(""), p.xs.string(""), p.xs.string(",")], p.xdmp.formatNumber(p.col("1"), p.col("2"), p.col("3"), p.col("4"), p.col("5"), p.col("6"), p.col("7"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('NINE'); done(); }).catch(done); - }); + }); it('xdmp.formatNumber#8', function(done) { testPlan([p.xs.double(9), p.xs.string("W"), p.xs.string("en"), p.xs.string(""), p.xs.string(""), p.xs.string(""), p.xs.string(","), p.xs.integer(3)], p.xdmp.formatNumber(p.col("1"), p.col("2"), p.col("3"), p.col("4"), p.col("5"), p.col("6"), p.col("7"), p.col("8"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('NINE'); done(); }).catch(done); - }); + }); it('xdmp.hash32#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.hash32(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('4229403455'); done(); }).catch(done); - }); + }); it('xdmp.hash64#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.hash64(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('13056678368508584127'); done(); }).catch(done); - }); + }); it('xdmp.hexToInteger#1', function(done) { testPlan([p.xs.string("1234567890abcdef")], p.xdmp.hexToInteger(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1311768467294899695'); done(); }).catch(done); - }); + }); it('xdmp.hmacMd5#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def")], p.xdmp.hmacMd5(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('debda77b7cc3e7a10ee70104e6717a6b'); done(); }).catch(done); - }); + }); it('xdmp.hmacMd5#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def"), p.xs.string("base64")], p.xdmp.hmacMd5(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3r2ne3zD56EO5wEE5nF6aw=='); done(); }).catch(done); - }); + }); it('xdmp.hmacSha1#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def")], p.xdmp.hmacSha1(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('12554eabbaf7e8e12e4737020f987ca7901016e5'); done(); }).catch(done); - }); + }); it('xdmp.hmacSha1#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def"), p.xs.string("base64")], p.xdmp.hmacSha1(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ElVOq7r36OEuRzcCD5h8p5AQFuU='); done(); }).catch(done); - }); + }); it('xdmp.hmacSha256#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def")], p.xdmp.hmacSha256(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('20ebc0f09344470134f35040f63ea98b1d8e414212949ee5c500429d15eab081'); done(); }).catch(done); - }); + }); it('xdmp.hmacSha256#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def"), p.xs.string("base64")], p.xdmp.hmacSha256(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('IOvA8JNERwE081BA9j6pix2OQUISlJ7lxQBCnRXqsIE='); done(); }).catch(done); - }); + }); it('xdmp.hmacSha512#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def")], p.xdmp.hmacSha512(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('bf93c3deee1eb6660ec00820a285327b3e8b775f641fd7f2ea321b6a241afe7b49a5cca81d2e8e1d206bd3379530e2d9ad3a7b2cc54ca66ea3352ebfee3862e5'); done(); }).catch(done); - }); + }); it('xdmp.hmacSha512#3', function(done) { testPlan([p.xs.string("abc"), p.xs.string("def"), p.xs.string("base64")], p.xdmp.hmacSha512(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('v5PD3u4etmYOwAggooUyez6Ld19kH9fy6jIbaiQa/ntJpcyoHS6OHSBr0zeVMOLZrTp7LMVMpm6jNS6/7jhi5Q=='); done(); }).catch(done); - }); + }); it('xdmp.initcap#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.initcap(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('Abc'); done(); }).catch(done); - }); + }); it('xdmp.integerToHex#1', function(done) { testPlan([p.xs.integer(123)], p.xdmp.integerToHex(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('7b'); done(); }).catch(done); - }); + }); it('xdmp.integerToOctal#1', function(done) { testPlan([p.xs.integer(123)], p.xdmp.integerToOctal(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('173'); done(); }).catch(done); - }); + }); it('xdmp.keyFromQName#1', function(done) { testPlan([p.xs.QName("abc")], p.xdmp.keyFromQName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('xdmp.lshift64#2', function(done) { testPlan([p.xs.unsignedLong(255), p.xs.long(2)], p.xdmp.lshift64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1020'); done(); }).catch(done); - }); + }); it('xdmp.md5#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.md5(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('900150983cd24fb0d6963f7d28e17f72'); done(); }).catch(done); - }); + }); it('xdmp.md5#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("base64")], p.xdmp.md5(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('kAFQmDzST7DWlj99KOF/cg=='); done(); }).catch(done); - }); + }); it('xdmp.monthNameFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02")], p.xdmp.monthNameFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('January'); done(); }).catch(done); - }); + }); it('xdmp.mul64#2', function(done) { testPlan([p.xs.unsignedLong(123), p.xs.unsignedLong(456)], p.xdmp.mul64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('56088'); done(); }).catch(done); - }); + }); it('xdmp.not64#1', function(done) { testPlan([p.xs.unsignedLong(255)], p.xdmp.not64(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('18446744073709551360'); done(); }).catch(done); - }); + }); it('xdmp.octalToInteger#1', function(done) { testPlan([p.xs.string("12345670")], p.xdmp.octalToInteger(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2739128'); done(); }).catch(done); - }); + }); it('xdmp.or64#2', function(done) { testPlan([p.xs.unsignedLong(255), p.xs.unsignedLong(2)], p.xdmp.or64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('255'); done(); }).catch(done); - }); + }); it('xdmp.position#2', function(done) { testPlan([p.xs.string("abcdef"), p.xs.string("cd")], p.xdmp.position(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('xdmp.position#3', function(done) { testPlan([p.xs.string("abcdef"), p.xs.string("cd"), p.xs.string("http://marklogic.com/collation/")], p.xdmp.position(p.col("1"), p.col("2"), p.col("3"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('xdmp.QNameFromKey#1', function(done) { testPlan([p.xs.string("{http://a/b}c")], p.xdmp.QNameFromKey(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('c'); done(); }).catch(done); - }); + }); it('xdmp.quarterFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02")], p.xdmp.quarterFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xdmp.resolveUri#2', function(done) { testPlan([p.xs.string("b?c#d"), p.xs.string("/a/x")], p.xdmp.resolveUri(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('/a/b?c#d'); done(); }).catch(done); - }); + }); it('xdmp.rshift64#2', function(done) { testPlan([p.xs.unsignedLong(255), p.xs.long(2)], p.xdmp.rshift64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('63'); done(); }).catch(done); - }); + }); it('xdmp.sha1#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.sha1(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a9993e364706816aba3e25717850c26c9cd0d89d'); done(); }).catch(done); - }); + }); it('xdmp.sha1#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("base64")], p.xdmp.sha1(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('qZk+NkcGgWq6PiVxeFDCbJzQ2J0='); done(); }).catch(done); - }); + }); it('xdmp.sha256#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.sha256(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad'); done(); }).catch(done); - }); + }); it('xdmp.sha256#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("base64")], p.xdmp.sha256(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ungWv48Bz+pBQUDeXa4iI7ADYaOWF3qctBD/YfIAFa0='); done(); }).catch(done); - }); + }); it('xdmp.sha384#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.sha384(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7'); done(); }).catch(done); - }); + }); it('xdmp.sha384#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("base64")], p.xdmp.sha384(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ywB1P0WjXou1oD1pmsZQBycsMqsO3tFjGotgWkP/W+2AhgcroefMI1i67KE0yCWn'); done(); }).catch(done); - }); + }); it('xdmp.sha512#1', function(done) { testPlan([p.xs.string("abc")], p.xdmp.sha512(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f'); done(); }).catch(done); - }); + }); it('xdmp.sha512#2', function(done) { testPlan([p.xs.string("abc"), p.xs.string("base64")], p.xdmp.sha512(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('3a81oZNherrMQXNJriBBMRLm+k6JqX6iCp7u5ktV05ohkpkqJ0/BqDa6PCOj/uu9RU1EI2Q86A4qmslPpUyknw=='); done(); }).catch(done); - }); + }); it('xdmp.step64#2', function(done) { testPlan([p.xs.unsignedLong(123), p.xs.unsignedLong(456)], p.xdmp.step64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('8966314677'); done(); }).catch(done); - }); + }); it('xdmp.type#1', function(done) { testPlan([p.xs.string("a")], p.xdmp.type(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('string'); done(); }).catch(done); - }); + }); it('xdmp.unquote#1', function(done) { if(serverConfiguration.serverVersion < 11){ this.skip(); } testPlan([p.xs.string("[123]")], p.xdmp.unquote(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql([123]); done(); }).catch(done); - }); + }); it('xdmp.uriContentType#1', function(done) { testPlan([p.xs.string("a.json")], p.xdmp.uriContentType(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('application/json'); done(); }).catch(done); - }); + }); it('xdmp.uriFormat#1', function(done) { testPlan([p.xs.string("a.json")], p.xdmp.uriFormat(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('json'); done(); }).catch(done); - }); + }); it('xdmp.urlDecode#1', function(done) { testPlan([p.xs.string("a+b")], p.xdmp.urlDecode(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a b'); done(); }).catch(done); - }); + }); it('xdmp.urlEncode#1', function(done) { testPlan([p.xs.string("a b")], p.xdmp.urlEncode(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a+b'); done(); }).catch(done); - }); + }); it('xdmp.weekFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02")], p.xdmp.weekFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('53'); done(); }).catch(done); - }); + }); it('xdmp.weekdayFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02")], p.xdmp.weekdayFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('6'); done(); }).catch(done); - }); + }); it('xdmp.xor64#2', function(done) { testPlan([p.xs.unsignedLong(255), p.xs.unsignedLong(2)], p.xdmp.xor64(p.col("1"), p.col("2"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('253'); done(); }).catch(done); - }); + }); it('xdmp.yeardayFromDate#1', function(done) { testPlan([p.xs.date("2016-01-02")], p.xdmp.yeardayFromDate(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2'); done(); }).catch(done); - }); + }); it('xs.anyURI#1', function(done) { testPlan([p.xs.string("http://a/b?c#d")], p.xs.anyURI(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('http://a/b?c#d'); done(); }).catch(done); - }); + }); it('xs.base64Binary#1', function(done) { testPlan([p.xs.string("aGVsbG8sIHdvcmxk")], p.xs.base64Binary(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('aGVsbG8sIHdvcmxk'); done(); }).catch(done); - }); + }); it('xs.boolean#1', function(done) { testPlan([p.xs.boolean(true)], p.xs.boolean(p.col("1"))) - .then(function(response) { + .then(function(response) { should(getResult(response).value).eql(true); done(); }).catch(done); - }); + }); it('xs.byte#1', function(done) { testPlan([p.xs.double(1)], p.xs.byte(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.date#1', function(done) { testPlan([p.xs.string("2016-01-02Z")], p.xs.date(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016-01-02Z'); done(); }).catch(done); - }); + }); it('xs.dateTime#1', function(done) { testPlan([p.xs.string("2016-01-02T10:09:08Z")], p.xs.dateTime(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016-01-02T10:09:08Z'); done(); }).catch(done); - }); + }); it('xs.dayTimeDuration#1', function(done) { testPlan([p.xs.string("P3DT4H5M6S")], p.xs.dayTimeDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('P3DT4H5M6S'); done(); }).catch(done); - }); + }); it('xs.decimal#1', function(done) { testPlan([p.xs.double(1.2)], p.xs.decimal(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.2'); done(); }).catch(done); - }); + }); it('xs.double#1', function(done) { testPlan([p.xs.double(1.2)], p.xs.double(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.2'); done(); }).catch(done); - }); + }); it('xs.float#1', function(done) { testPlan([p.xs.double(1)], p.xs.float(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.gDay#1', function(done) { testPlan([p.xs.string("---02")], p.xs.gDay(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('---02'); done(); }).catch(done); - }); + }); it('xs.gMonth#1', function(done) { testPlan([p.xs.string("--01")], p.xs.gMonth(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('--01'); done(); }).catch(done); - }); + }); it('xs.gMonthDay#1', function(done) { testPlan([p.xs.string("--01-02")], p.xs.gMonthDay(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('--01-02'); done(); }).catch(done); - }); + }); it('xs.gYear#1', function(done) { testPlan([p.xs.string("2016")], p.xs.gYear(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016'); done(); }).catch(done); - }); + }); it('xs.gYearMonth#1', function(done) { testPlan([p.xs.string("2016-01")], p.xs.gYearMonth(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('2016-01'); done(); }).catch(done); - }); + }); it('xs.hexBinary#1', function(done) { testPlan([p.xs.string("68656c6c6f2c20776f726c64")], p.xs.hexBinary(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('68656C6C6F2C20776F726C64'); done(); }).catch(done); - }); + }); it('xs.int#1', function(done) { testPlan([p.xs.double(1)], p.xs.int(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.integer#1', function(done) { testPlan([p.xs.double(1)], p.xs.integer(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.language#1', function(done) { testPlan([p.xs.string("en-US")], p.xs.language(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('en-US'); done(); }).catch(done); - }); + }); it('xs.long#1', function(done) { testPlan([p.xs.double(1)], p.xs.long(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.Name#1', function(done) { testPlan([p.xs.string("a:b:c")], p.xs.Name(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a:b:c'); done(); }).catch(done); - }); + }); it('xs.NCName#1', function(done) { testPlan([p.xs.string("a-b-c")], p.xs.NCName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a-b-c'); done(); }).catch(done); - }); + }); it('xs.negativeInteger#1', function(done) { testPlan([p.xs.double(-1)], p.xs.negativeInteger(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('-1'); done(); }).catch(done); - }); + }); it('xs.NMTOKEN#1', function(done) { testPlan([p.xs.string("a:b:c")], p.xs.NMTOKEN(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a:b:c'); done(); }).catch(done); - }); + }); it('xs.nonNegativeInteger#1', function(done) { testPlan([p.xs.string("0")], p.xs.nonNegativeInteger(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('xs.nonPositiveInteger#1', function(done) { testPlan([p.xs.string("0")], p.xs.nonPositiveInteger(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('0'); done(); }).catch(done); - }); + }); it('xs.normalizedString#1', function(done) { testPlan([p.xs.string("a b c")], p.xs.normalizedString(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a b c'); done(); }).catch(done); - }); + }); it('xs.numeric#1', function(done) { testPlan([p.xs.double(1.2)], p.xs.numeric(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1.2'); done(); }).catch(done); - }); + }); it('xs.positiveInteger#1', function(done) { testPlan([p.xs.double(1)], p.xs.positiveInteger(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.QName#1', function(done) { testPlan([p.xs.string("abc")], p.xs.QName(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('xs.short#1', function(done) { testPlan([p.xs.double(1)], p.xs.short(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.string#1', function(done) { testPlan([p.xs.string("abc")], p.xs.string(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('xs.time#1', function(done) { testPlan([p.xs.string("10:09:08Z")], p.xs.time(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('10:09:08Z'); done(); }).catch(done); - }); + }); it('xs.token#1', function(done) { testPlan([p.xs.string("a b c")], p.xs.token(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('a b c'); done(); }).catch(done); - }); + }); it('xs.unsignedByte#1', function(done) { testPlan([p.xs.double(1)], p.xs.unsignedByte(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.unsignedInt#1', function(done) { testPlan([p.xs.double(1)], p.xs.unsignedInt(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.unsignedLong#1', function(done) { testPlan([p.xs.double(1)], p.xs.unsignedLong(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.unsignedShort#1', function(done) { testPlan([p.xs.double(1)], p.xs.unsignedShort(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('1'); done(); }).catch(done); - }); + }); it('xs.untypedAtomic#1', function(done) { testPlan([p.xs.string("abc")], p.xs.untypedAtomic(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('abc'); done(); }).catch(done); - }); + }); it('xs.yearMonthDuration#1', function(done) { testPlan([p.xs.string("P1Y2M")], p.xs.yearMonthDuration(p.col("1"))) - .then(function(response) { + .then(function(response) { should(String(getResult(response).value).replace(/^ /, '')).equal('P1Y2M'); done(); }).catch(done); }); }); - describe('expression operators', function() { + describe('expression operators', function() { it('add#2', function(done) { testPlan([p.xs.double(1), p.xs.double(2)], p.add(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(3); done(); }).catch(done); - }); + }); it('add#3', function(done) { testPlan([p.xs.double(1), p.xs.double(2), p.xs.double(3)], p.add(p.col("1"), p.col("2"), p.col("3"))) .then(function(response) { should(getResult(response).value).equal(6); done(); }).catch(done); - }); + }); it('and#2', function(done) { testPlan([p.xs.boolean(true), p.xs.boolean(true)], p.and(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('and#3', function(done) { testPlan([p.xs.boolean(true), p.xs.boolean(true), p.xs.boolean(true)], p.and(p.col("1"), p.col("2"), p.col("3"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('divide#2', function(done) { testPlan([p.xs.double(6), p.xs.double(2)], p.divide(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(3); done(); }).catch(done); - }); + }); it('eq#2', function(done) { testPlan([p.xs.double(1), p.xs.double(1)], p.eq(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('eq#3', function(done) { testPlan([p.xs.double(1), p.xs.double(1), p.xs.double(1)], p.eq(p.col("1"), p.col("2"), p.col("3"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('ge#2', function(done) { testPlan([p.xs.double(1), p.xs.double(1)], p.ge(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('gt#2', function(done) { testPlan([p.xs.double(2), p.xs.double(1)], p.gt(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('in#2', function(done) { testPlan([p.xs.double(2), [p.xs.double(1), p.xs.double(2), p.xs.double(3)]], p.in(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('le#2', function(done) { testPlan([p.xs.double(1), p.xs.double(1)], p.le(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('lt#2', function(done) { testPlan([p.xs.double(1), p.xs.double(2)], p.lt(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('multiply#2', function(done) { testPlan([p.xs.double(2), p.xs.double(3)], p.multiply(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(6); done(); }).catch(done); - }); + }); it('multiply#3', function(done) { testPlan([p.xs.double(2), p.xs.double(3), p.xs.double(4)], p.multiply(p.col("1"), p.col("2"), p.col("3"))) .then(function(response) { should(getResult(response).value).equal(24); done(); }).catch(done); - }); + }); it('ne#2', function(done) { testPlan([p.xs.double(1), p.xs.double(2)], p.ne(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('not#1', function(done) { testPlan([p.xs.boolean(false)], p.not(p.col("1"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('or#2', function(done) { testPlan([p.xs.boolean(false), p.xs.boolean(true)], p.or(p.col("1"), p.col("2"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('or#3', function(done) { testPlan([p.xs.boolean(false), p.xs.boolean(true), p.xs.boolean(false)], p.or(p.col("1"), p.col("2"), p.col("3"))) .then(function(response) { should(getResult(response).value).equal(true); done(); }).catch(done); - }); + }); it('subtract#2', function(done) { testPlan([p.xs.double(3), p.xs.double(2)], p.subtract(p.col("1"), p.col("2"))) .then(function(response) { diff --git a/test-basic/plan-composers.js b/test-basic/plan-composers.js index 7c364edc..705fea17 100644 --- a/test-basic/plan-composers.js +++ b/test-basic/plan-composers.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-documents.js b/test-basic/plan-documents.js index d383f8cf..1ab74686 100644 --- a/test-basic/plan-documents.js +++ b/test-basic/plan-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-expressions.js b/test-basic/plan-expressions.js index e7b59cd9..ce06a9f0 100644 --- a/test-basic/plan-expressions.js +++ b/test-basic/plan-expressions.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-lexicons.js b/test-basic/plan-lexicons.js index 1b51edc8..43162422 100644 --- a/test-basic/plan-lexicons.js +++ b/test-basic/plan-lexicons.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-literals.js b/test-basic/plan-literals.js index 590052e7..11aea48d 100644 --- a/test-basic/plan-literals.js +++ b/test-basic/plan-literals.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-modifiers.js b/test-basic/plan-modifiers.js index 0d1b2755..7cbc2c51 100644 --- a/test-basic/plan-modifiers.js +++ b/test-basic/plan-modifiers.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-nodes.js b/test-basic/plan-nodes.js index 3ba57213..78cbc5aa 100644 --- a/test-basic/plan-nodes.js +++ b/test-basic/plan-nodes.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-processors.js b/test-basic/plan-processors.js index edb0144b..1eea209d 100644 --- a/test-basic/plan-processors.js +++ b/test-basic/plan-processors.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-search.js b/test-basic/plan-search.js index 5524603e..20fc3022 100644 --- a/test-basic/plan-search.js +++ b/test-basic/plan-search.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-triples.js b/test-basic/plan-triples.js index f012ef4c..79125f80 100644 --- a/test-basic/plan-triples.js +++ b/test-basic/plan-triples.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/plan-views.js b/test-basic/plan-views.js index 5ded4c3b..ed1c43a9 100644 --- a/test-basic/plan-views.js +++ b/test-basic/plan-views.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/probe.js b/test-basic/probe.js index 145ed2f1..b6c4fb17 100644 --- a/test-basic/probe.js +++ b/test-basic/probe.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'), testconfig = require('../etc/test-config.js'), diff --git a/test-basic/query-builder.js b/test-basic/query-builder.js index 90ef395a..488f34ab 100644 --- a/test-basic/query-builder.js +++ b/test-basic/query-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var assert = require('assert'); var should = require('should'); diff --git a/test-basic/redactionTest.js b/test-basic/redactionTest.js index ad54e8cb..48626d77 100644 --- a/test-basic/redactionTest.js +++ b/test-basic/redactionTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/removeAll.js b/test-basic/removeAll.js index 89015ab6..bfcaba1e 100644 --- a/test-basic/removeAll.js +++ b/test-basic/removeAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/resources-config.js b/test-basic/resources-config.js index dc65dd7a..1731f5e0 100644 --- a/test-basic/resources-config.js +++ b/test-basic/resources-config.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/resources-exec.js b/test-basic/resources-exec.js index 37d043ab..136a2166 100644 --- a/test-basic/resources-exec.js +++ b/test-basic/resources-exec.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/rest-server-properties.js b/test-basic/rest-server-properties.js index ed09f5f9..b7a0d0ab 100644 --- a/test-basic/rest-server-properties.js +++ b/test-basic/rest-server-properties.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/rows-graphQl.js b/test-basic/rows-graphQl.js index e4f363ba..a1d3b615 100644 --- a/test-basic/rows-graphQl.js +++ b/test-basic/rows-graphQl.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const testconfig = require('../etc/test-config.js'); diff --git a/test-basic/rows.js b/test-basic/rows.js index 13afee8b..f0ea8121 100644 --- a/test-basic/rows.js +++ b/test-basic/rows.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'), fs = require('fs'), diff --git a/test-basic/server-exec.js b/test-basic/server-exec.js index 668c178e..020573b1 100644 --- a/test-basic/server-exec.js +++ b/test-basic/server-exec.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/service-caller.js b/test-basic/service-caller.js index cc63feee..1cc7ef11 100644 --- a/test-basic/service-caller.js +++ b/test-basic/service-caller.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../'); diff --git a/test-basic/shortest-path.js b/test-basic/shortest-path.js index fb5ebde6..7d9e8813 100644 --- a/test-basic/shortest-path.js +++ b/test-basic/shortest-path.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/ssl-min-allow-tls-test.js b/test-basic/ssl-min-allow-tls-test.js index 08c775d1..fb069030 100644 --- a/test-basic/ssl-min-allow-tls-test.js +++ b/test-basic/ssl-min-allow-tls-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ let testconfig = require('../etc/test-config.js'); diff --git a/test-basic/suggest.js b/test-basic/suggest.js index c543058e..8c8bc180 100644 --- a/test-basic/suggest.js +++ b/test-basic/suggest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var assert = require('assert'); var should = require('should'); diff --git a/test-basic/test-internal.js b/test-basic/test-internal.js index 4d33cfb3..8a726790 100644 --- a/test-basic/test-internal.js +++ b/test-basic/test-internal.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const testconfig = require("../etc/test-config"); diff --git a/test-basic/test-util.js b/test-basic/test-util.js index 470cabe0..7b3a1deb 100644 --- a/test-basic/test-util.js +++ b/test-basic/test-util.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var stream = require('stream'); var util = require('util'); diff --git a/test-basic/timestamp.js b/test-basic/timestamp.js index 448ef4de..2ebd444f 100644 --- a/test-basic/timestamp.js +++ b/test-basic/timestamp.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var valcheck = require('core-util-is'); diff --git a/test-basic/transactions.js b/test-basic/transactions.js index f0df83a7..ea39f6f7 100644 --- a/test-basic/transactions.js +++ b/test-basic/transactions.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); @@ -234,7 +234,7 @@ describe('transaction', function(){ tid = txn.txid; var txnRaw = {txid: txn.txid, cookies: txn.cookies}; var convertedTransaction = mlutil.convertTransaction(txnRaw); - + return db.transactions.read(convertedTransaction).result() ; }) .then(function(document) { diff --git a/test-basic/transformDoc-test.js b/test-basic/transformDoc-test.js index eb715628..6b5069a3 100644 --- a/test-basic/transformDoc-test.js +++ b/test-basic/transformDoc-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-basic/unnestTest.js b/test-basic/unnestTest.js index cae9480b..695956b8 100644 --- a/test-basic/unnestTest.js +++ b/test-basic/unnestTest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const assert = require('assert'); const marklogic = require('../'); diff --git a/test-basic/validateDoc-test.js b/test-basic/validateDoc-test.js index ba534be0..61cfc795 100644 --- a/test-basic/validateDoc-test.js +++ b/test-basic/validateDoc-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-basic/values-builder.js b/test-basic/values-builder.js index 18bb32c7..47d0d76b 100644 --- a/test-basic/values-builder.js +++ b/test-basic/values-builder.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var assert = require('assert'); var should = require('should'); diff --git a/test-basic/values.js b/test-basic/values.js index c8bd0419..9951a5a1 100644 --- a/test-basic/values.js +++ b/test-basic/values.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-basic/vector-util-test.js b/test-basic/vector-util-test.js index a918628e..410f31e4 100644 --- a/test-basic/vector-util-test.js +++ b/test-basic/vector-util-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-basic/write-test.js b/test-basic/write-test.js index ac85a8c0..c0de3250 100644 --- a/test-basic/write-test.js +++ b/test-basic/write-test.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; const should = require('should'); diff --git a/test-complete-proxy/gulpfile.js b/test-complete-proxy/gulpfile.js index 98ef270e..ea33a6d5 100755 --- a/test-complete-proxy/gulpfile.js +++ b/test-complete-proxy/gulpfile.js @@ -1,5 +1,5 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const path = require('path'); const gulp = require('gulp'); diff --git a/test-complete-proxy/insertFromMultipleStreams.js b/test-complete-proxy/insertFromMultipleStreams.js index 3655b1ec..6b09553a 100755 --- a/test-complete-proxy/insertFromMultipleStreams.js +++ b/test-complete-proxy/insertFromMultipleStreams.js @@ -1,7 +1,7 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ - + const {Worker, isMainThread, parentPort, workerData} = require('worker_threads'); const TestE2EMultiStringsInStringsOut = require("./TestE2EMultiStringsInStringsOut.js"); diff --git a/test-complete-proxy/nodejs-ds-dynamic.js b/test-complete-proxy/nodejs-ds-dynamic.js index f08e7763..44c51411 100755 --- a/test-complete-proxy/nodejs-ds-dynamic.js +++ b/test-complete-proxy/nodejs-ds-dynamic.js @@ -1,5 +1,5 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const fs = require('fs'); diff --git a/test-complete-proxy/nodejs-ds-error-map.js b/test-complete-proxy/nodejs-ds-error-map.js index 5fad6e7c..25299047 100755 --- a/test-complete-proxy/nodejs-ds-error-map.js +++ b/test-complete-proxy/nodejs-ds-error-map.js @@ -1,5 +1,5 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const fs = require('fs'); diff --git a/test-complete-proxy/nodejs-ds-multipleWorker.js b/test-complete-proxy/nodejs-ds-multipleWorker.js index e1c00484..859e8a33 100755 --- a/test-complete-proxy/nodejs-ds-multipleWorker.js +++ b/test-complete-proxy/nodejs-ds-multipleWorker.js @@ -1,7 +1,7 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ - + const fs = require('fs'); const expect = require('chai').expect; @@ -21,46 +21,46 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); // runs once before the first test in this block var s11 = 'Vannevar Bush wrote an article for The Atlantic Monthly 1'; var s12 = 'Lisa wrote an article for The Strait Times 1'; - + var s21 = 'Vannevar Bush wrote an article for The Atlantic Monthly 2'; var s22 = 'Lisa wrote an article for The Strait Times 2'; - + var inputFiles1 = [s11, s12]; var uris1 = ['Test1stream11', 'Test1stream12']; - + var inputFiles2 = [s21, s22]; var uris2 = ['Test1stream21', 'Test1stream22']; - + if (isMainThread) { const workerOneInsert = new Worker('./insertFromMultipleStreams.js', {workerData: {files: inputFiles1, uris:uris1}}); workerOneInsert.on('done', (result) => { - //console.log('workerOneInsert message is ' + result ); + //console.log('workerOneInsert message is ' + result ); }); - + workerOneInsert.on('exit', (code) => { if (code !== 0) reject(new Error('Worker workerOneInsert stopped with exit code ${code}')); //else console.debug('workerOneInsert exits normally'); }); - + const workerTwoInsert = new Worker('./insertFromMultipleStreams.js', {workerData: {files: inputFiles2, uris:uris2}}); workerTwoInsert.on('message', (result) => { //console.log('workerTwoInsert message is ' + result ); }); - + workerTwoInsert.on('exit', (code) => { if (code !== 0) reject(new Error('Worker workerTwoInsert stopped with exit code ${code}')); //else console.debug('workerTwoInsert exits normally'); }); - + } - + done(); }); - + it('Verify inserts using client API query', function(done){ - + var res1; db.documents.query(q.where(q.parsedFrom('Bush'))).result( function(results) { res1 = JSON.stringify(results); @@ -68,7 +68,7 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); expect(res1).to.include('Monthly 1'); expect(res1).to.include('Monthly 2'); }); - + var res2; db.documents.query(q.where(q.parsedFrom('Lisa'))).result( function(results) { res2 = JSON.stringify(results); @@ -77,16 +77,16 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); expect(res2).to.include('Times 2'); done(); - + }); }); - + it('One worker', function(done){ try { // Get results from all workers var searchResults1 = []; var searchResults2 = []; - + if (isMainThread) { const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); workerOneSearch.on('done', (result) => { @@ -100,20 +100,20 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); //else console.debug('workerOneSearch exits normally'); }); done(); - } + } } catch(err) { //console.debug(err); done(); } - }); - + }); + it('Multiple workers', function(done){ try { // Get results from all workers var searchResults1 = []; var searchResults2 = []; - + if (isMainThread) { const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); workerOneSearch.on('done', (result) => { @@ -121,7 +121,7 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); //console.log('Results 1 from search is :', searchResults1); expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); }); - + const workerTwoSearch = new Worker('./searchMultiple.js', {workerData: {search:'Lisa'}}); workerTwoSearch.on('done', (result) => { searchResults2.push(result); @@ -129,20 +129,20 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); expect(searchResults2[0]).to.have.members(["/Test1stream12.json", "/Test1stream22.json"]); }); done(); - } + } } catch(err) { //console.debug(err); done(); } - }); - + }); + it('Multiple workers-One result back', function(done){ try { // Get results from all workers var searchResults1 = []; var searchResults2 = []; - + if (isMainThread) { const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); workerOneSearch.on('done', (result) => { @@ -150,7 +150,7 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); //console.log('Results 1 from search is :', searchResults1); expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); }); - + const workerTwoSearch = new Worker('./searchMultiple.js', {workerData: {search:'100'}}); workerTwoSearch.on('done', (result) => { searchResults2.push(result); @@ -158,20 +158,20 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); expect(searchResults2[0]).to.eql([]); }); done(); - } + } } catch(err) { //console.debug(err); done(); } - }); - + }); + it('Multiple workers- incorrect data', function(done){ try { // Get results from all workers var searchResults1 = []; var searchResults2 = []; - + if (isMainThread) { const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); workerOneSearch.on('done', (result) => { @@ -179,11 +179,11 @@ var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); //console.log('Results 1 from search is :', searchResults1); expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); }); - + expect( () => new Worker('./searchMultiple.js', {workerData: {find:100}}).to.throw('null value not allowed for parameter')); done(); - } + } } catch(err) { //console.debug(err); diff --git a/test-complete-proxy/nodejs-ds-required-params.js b/test-complete-proxy/nodejs-ds-required-params.js index bc9e9583..dfb43852 100755 --- a/test-complete-proxy/nodejs-ds-required-params.js +++ b/test-complete-proxy/nodejs-ds-required-params.js @@ -1,5 +1,5 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const fs = require('fs'); diff --git a/test-complete-proxy/nodejs-ds-setup-docs.js b/test-complete-proxy/nodejs-ds-setup-docs.js index ec596f91..d31e5f04 100755 --- a/test-complete-proxy/nodejs-ds-setup-docs.js +++ b/test-complete-proxy/nodejs-ds-setup-docs.js @@ -1,5 +1,5 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const fs = require('fs'); diff --git a/test-complete-proxy/nodejs-ds-transactions.js b/test-complete-proxy/nodejs-ds-transactions.js index 79cc67ba..1823db7e 100755 --- a/test-complete-proxy/nodejs-ds-transactions.js +++ b/test-complete-proxy/nodejs-ds-transactions.js @@ -1,7 +1,7 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ - + const fs = require('fs'); const util = require('util') @@ -18,7 +18,7 @@ var db1 = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); var db2 = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); describe('Transactions-Tests', function(){ - + it('same transaction', function(done) { // Insert and read back on same database client. this.timeout(10000); @@ -54,7 +54,7 @@ describe('Transactions-Tests', function(){ } ); }); - + it('different transaction', function(done) { this.timeout(10000); var tid = null; @@ -87,7 +87,7 @@ describe('Transactions-Tests', function(){ } ); }); - + }); - - + + diff --git a/test-complete-proxy/searchMultiple.js b/test-complete-proxy/searchMultiple.js index 2bb27f5d..16f4eb41 100755 --- a/test-complete-proxy/searchMultiple.js +++ b/test-complete-proxy/searchMultiple.js @@ -1,5 +1,5 @@ -/* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const {Worker, isMainThread, parentPort, workerData} = require('worker_threads'); const TestE2EMultiStringsInStringsOut = require("./TestE2EMultiStringsInStringsOut.js"); diff --git a/test-complete-proxy/setup/ds-qa-test-setup-users.js b/test-complete-proxy/setup/ds-qa-test-setup-users.js index ead07336..50ad4f27 100755 --- a/test-complete-proxy/setup/ds-qa-test-setup-users.js +++ b/test-complete-proxy/setup/ds-qa-test-setup-users.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var valcheck = require('core-util-is'); diff --git a/test-complete-proxy/setup/ds-qa-test-setup.js b/test-complete-proxy/setup/ds-qa-test-setup.js index b8b08db2..cba82c18 100755 --- a/test-complete-proxy/setup/ds-qa-test-setup.js +++ b/test-complete-proxy/setup/ds-qa-test-setup.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var valcheck = require('core-util-is'); diff --git a/test-complete/data/emptyTransform.js b/test-complete/data/emptyTransform.js index fc1c59fa..00caddbf 100644 --- a/test-complete/data/emptyTransform.js +++ b/test-complete/data/emptyTransform.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ function emptyTransform(context, params, document) { diff --git a/test-complete/data/paramTransform.js b/test-complete/data/paramTransform.js index 55f4f7a9..401079f2 100644 --- a/test-complete/data/paramTransform.js +++ b/test-complete/data/paramTransform.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ function paramTransform(context, params, document) { diff --git a/test-complete/data/sourceParams.js b/test-complete/data/sourceParams.js index d28a108a..b8254226 100644 --- a/test-complete/data/sourceParams.js +++ b/test-complete/data/sourceParams.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var num1; diff --git a/test-complete/data/sourceParamsNegative.js b/test-complete/data/sourceParamsNegative.js index 88980f1f..a38fea25 100644 --- a/test-complete/data/sourceParamsNegative.js +++ b/test-complete/data/sourceParamsNegative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ avar num1; diff --git a/test-complete/data/sourceSimple.js b/test-complete/data/sourceSimple.js index 60252f38..082724eb 100644 --- a/test-complete/data/sourceSimple.js +++ b/test-complete/data/sourceSimple.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var a = "hello"; diff --git a/test-complete/data/sourceSimpleNegative.js b/test-complete/data/sourceSimpleNegative.js index c6e60bc5..f78edce2 100644 --- a/test-complete/data/sourceSimpleNegative.js +++ b/test-complete/data/sourceSimpleNegative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var a = "hello"; diff --git a/test-complete/data/timestampTransform.js b/test-complete/data/timestampTransform.js index 3ac0df47..d7fbeb11 100644 --- a/test-complete/data/timestampTransform.js +++ b/test-complete/data/timestampTransform.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ function timestampTransform(context, params, document) { diff --git a/test-complete/nodejs-config-patch-negative.js b/test-complete/nodejs-config-patch-negative.js index 3fce257a..406cf344 100644 --- a/test-complete/nodejs-config-patch-negative.js +++ b/test-complete/nodejs-config-patch-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-config-patch.js b/test-complete/nodejs-config-patch.js index 0531f6fc..cd27ddde 100644 --- a/test-complete/nodejs-config-patch.js +++ b/test-complete/nodejs-config-patch.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-config-query-negative.js b/test-complete/nodejs-config-query-negative.js index 8527cfbb..a3546453 100644 --- a/test-complete/nodejs-config-query-negative.js +++ b/test-complete/nodejs-config-query-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-config-query.js b/test-complete/nodejs-config-query.js index c8d005b6..4e4e167f 100644 --- a/test-complete/nodejs-config-query.js +++ b/test-complete/nodejs-config-query.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-database-concurrency.js b/test-complete/nodejs-database-concurrency.js index 2e8c36b3..00b76aca 100644 --- a/test-complete/nodejs-database-concurrency.js +++ b/test-complete/nodejs-database-concurrency.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-database-connection-negative.js b/test-complete/nodejs-database-connection-negative.js index 68993b8d..ef25ab05 100644 --- a/test-complete/nodejs-database-connection-negative.js +++ b/test-complete/nodejs-database-connection-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-database-connection-ssl.js b/test-complete/nodejs-database-connection-ssl.js index 3a707ed9..0dd6de1f 100644 --- a/test-complete/nodejs-database-connection-ssl.js +++ b/test-complete/nodejs-database-connection-ssl.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-dmsdk-QueryToRdAll.js b/test-complete/nodejs-dmsdk-QueryToRdAll.js index ed9781c8..f0e929d7 100644 --- a/test-complete/nodejs-dmsdk-QueryToRdAll.js +++ b/test-complete/nodejs-dmsdk-QueryToRdAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../'); var testconfig = require('../etc/test-config-qa.js'); diff --git a/test-complete/nodejs-dmsdk-UpdAndRdAll.js b/test-complete/nodejs-dmsdk-UpdAndRdAll.js index 61a46722..ecb4677a 100644 --- a/test-complete/nodejs-dmsdk-UpdAndRdAll.js +++ b/test-complete/nodejs-dmsdk-UpdAndRdAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var marklogic = require('../'); diff --git a/test-complete/nodejs-dmsdk-queryToTransformAll.js b/test-complete/nodejs-dmsdk-queryToTransformAll.js index ed0d901b..be5be3ad 100644 --- a/test-complete/nodejs-dmsdk-queryToTransformAll.js +++ b/test-complete/nodejs-dmsdk-queryToTransformAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-complete/nodejs-dmsdk-queryall.js b/test-complete/nodejs-dmsdk-queryall.js index b2b71c9b..49a77bc0 100644 --- a/test-complete/nodejs-dmsdk-queryall.js +++ b/test-complete/nodejs-dmsdk-queryall.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-dmsdk-readall-1.js b/test-complete/nodejs-dmsdk-readall-1.js index 62f108e2..e2b2c0a1 100644 --- a/test-complete/nodejs-dmsdk-readall-1.js +++ b/test-complete/nodejs-dmsdk-readall-1.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var fs = require('fs'); const path = require('path'); diff --git a/test-complete/nodejs-dmsdk-removeAllUris.js b/test-complete/nodejs-dmsdk-removeAllUris.js index 65107e23..8e18f670 100644 --- a/test-complete/nodejs-dmsdk-removeAllUris.js +++ b/test-complete/nodejs-dmsdk-removeAllUris.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ // deleteEmptyIterator diff --git a/test-complete/nodejs-dmsdk-rows-queryAll.js b/test-complete/nodejs-dmsdk-rows-queryAll.js index 4a6f7342..a2221785 100644 --- a/test-complete/nodejs-dmsdk-rows-queryAll.js +++ b/test-complete/nodejs-dmsdk-rows-queryAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-complete/nodejs-dmsdk-transformAll.js b/test-complete/nodejs-dmsdk-transformAll.js index 31c9eb06..e9b1b528 100644 --- a/test-complete/nodejs-dmsdk-transformAll.js +++ b/test-complete/nodejs-dmsdk-transformAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-complete/nodejs-dmsdk-txtFiles-transformAll.js b/test-complete/nodejs-dmsdk-txtFiles-transformAll.js index a64119a2..f3500c46 100644 --- a/test-complete/nodejs-dmsdk-txtFiles-transformAll.js +++ b/test-complete/nodejs-dmsdk-txtFiles-transformAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-complete/nodejs-dmsdk-writeall.js b/test-complete/nodejs-dmsdk-writeall.js index 1bb41f08..fe164c62 100644 --- a/test-complete/nodejs-dmsdk-writeall.js +++ b/test-complete/nodejs-dmsdk-writeall.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js b/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js index b448404c..cd15bb24 100644 --- a/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js +++ b/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ const should = require('should'); diff --git a/test-complete/nodejs-documents-binary-gif.js b/test-complete/nodejs-documents-binary-gif.js index 44cccfb9..ccf13e35 100644 --- a/test-complete/nodejs-documents-binary-gif.js +++ b/test-complete/nodejs-documents-binary-gif.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-binary-mp3.js b/test-complete/nodejs-documents-binary-mp3.js index e1310680..87283641 100644 --- a/test-complete/nodejs-documents-binary-mp3.js +++ b/test-complete/nodejs-documents-binary-mp3.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-binary-pdf.js b/test-complete/nodejs-documents-binary-pdf.js index b6955697..02940dc8 100644 --- a/test-complete/nodejs-documents-binary-pdf.js +++ b/test-complete/nodejs-documents-binary-pdf.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-binary-range.js b/test-complete/nodejs-documents-binary-range.js index 13b9892c..f2317996 100644 --- a/test-complete/nodejs-documents-binary-range.js +++ b/test-complete/nodejs-documents-binary-range.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-crud-negative.js b/test-complete/nodejs-documents-crud-negative.js index 277e0502..e77a2ca3 100644 --- a/test-complete/nodejs-documents-crud-negative.js +++ b/test-complete/nodejs-documents-crud-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-crud.js b/test-complete/nodejs-documents-crud.js index d21bfe0e..d7a9cf5e 100644 --- a/test-complete/nodejs-documents-crud.js +++ b/test-complete/nodejs-documents-crud.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-extract-negative.js b/test-complete/nodejs-documents-extract-negative.js index 5d8a664f..08ee217a 100644 --- a/test-complete/nodejs-documents-extract-negative.js +++ b/test-complete/nodejs-documents-extract-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-extract.js b/test-complete/nodejs-documents-extract.js index 8a771f95..6dc6a319 100644 --- a/test-complete/nodejs-documents-extract.js +++ b/test-complete/nodejs-documents-extract.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-metadata-values.js b/test-complete/nodejs-documents-metadata-values.js index 97fd4281..fb523251 100644 --- a/test-complete/nodejs-documents-metadata-values.js +++ b/test-complete/nodejs-documents-metadata-values.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-parse-2.js b/test-complete/nodejs-documents-parse-2.js index bf73b668..8d8bba10 100644 --- a/test-complete/nodejs-documents-parse-2.js +++ b/test-complete/nodejs-documents-parse-2.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-parse.js b/test-complete/nodejs-documents-parse.js index 9ea7bbc8..26ff7341 100644 --- a/test-complete/nodejs-documents-parse.js +++ b/test-complete/nodejs-documents-parse.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-patch-2.js b/test-complete/nodejs-documents-patch-2.js index 60767f47..7cb830ce 100755 --- a/test-complete/nodejs-documents-patch-2.js +++ b/test-complete/nodejs-documents-patch-2.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-patch-datatypes.js b/test-complete/nodejs-documents-patch-datatypes.js index 24f97991..967dee86 100644 --- a/test-complete/nodejs-documents-patch-datatypes.js +++ b/test-complete/nodejs-documents-patch-datatypes.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-documents-patch-metadata.js b/test-complete/nodejs-documents-patch-metadata.js index b8c98311..c52601e5 100644 --- a/test-complete/nodejs-documents-patch-metadata.js +++ b/test-complete/nodejs-documents-patch-metadata.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-patch-negative.js b/test-complete/nodejs-documents-patch-negative.js index e47606cb..74b74486 100644 --- a/test-complete/nodejs-documents-patch-negative.js +++ b/test-complete/nodejs-documents-patch-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-patch-null.js b/test-complete/nodejs-documents-patch-null.js index 26de8350..ee83e07c 100644 --- a/test-complete/nodejs-documents-patch-null.js +++ b/test-complete/nodejs-documents-patch-null.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-patch-stream.js b/test-complete/nodejs-documents-patch-stream.js index efe6d43d..440fd56e 100644 --- a/test-complete/nodejs-documents-patch-stream.js +++ b/test-complete/nodejs-documents-patch-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-patch.js b/test-complete/nodejs-documents-patch.js index 3199c029..92117812 100644 --- a/test-complete/nodejs-documents-patch.js +++ b/test-complete/nodejs-documents-patch.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-qbe.js b/test-complete/nodejs-documents-qbe.js index 1c2640f8..9190419f 100644 --- a/test-complete/nodejs-documents-qbe.js +++ b/test-complete/nodejs-documents-qbe.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-2.js b/test-complete/nodejs-documents-query-2.js index dd108b90..26fcd0fe 100644 --- a/test-complete/nodejs-documents-query-2.js +++ b/test-complete/nodejs-documents-query-2.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-3.js b/test-complete/nodejs-documents-query-3.js index 6eb54206..9aa67f24 100644 --- a/test-complete/nodejs-documents-query-3.js +++ b/test-complete/nodejs-documents-query-3.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-facet.js b/test-complete/nodejs-documents-query-facet.js index a0e6348e..25afb649 100644 --- a/test-complete/nodejs-documents-query-facet.js +++ b/test-complete/nodejs-documents-query-facet.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-geo-double.js b/test-complete/nodejs-documents-query-geo-double.js index 1476a405..d7526780 100644 --- a/test-complete/nodejs-documents-query-geo-double.js +++ b/test-complete/nodejs-documents-query-geo-double.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-geo-region.js b/test-complete/nodejs-documents-query-geo-region.js index af33a502..ff7b8342 100644 --- a/test-complete/nodejs-documents-query-geo-region.js +++ b/test-complete/nodejs-documents-query-geo-region.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-geo.js b/test-complete/nodejs-documents-query-geo.js index bd6211df..6b97dfb5 100644 --- a/test-complete/nodejs-documents-query-geo.js +++ b/test-complete/nodejs-documents-query-geo.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-negative.js b/test-complete/nodejs-documents-query-negative.js index 676cc21a..3530ed00 100644 --- a/test-complete/nodejs-documents-query-negative.js +++ b/test-complete/nodejs-documents-query-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-options.js b/test-complete/nodejs-documents-query-options.js index 169566ca..23347d13 100644 --- a/test-complete/nodejs-documents-query-options.js +++ b/test-complete/nodejs-documents-query-options.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-slice.js b/test-complete/nodejs-documents-query-slice.js index ec8c84ce..1192d1c2 100644 --- a/test-complete/nodejs-documents-query-slice.js +++ b/test-complete/nodejs-documents-query-slice.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-sort.js b/test-complete/nodejs-documents-query-sort.js index 6e451fc8..1e6e6fef 100644 --- a/test-complete/nodejs-documents-query-sort.js +++ b/test-complete/nodejs-documents-query-sort.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-query-stream.js b/test-complete/nodejs-documents-query-stream.js index 983fccef..26688029 100644 --- a/test-complete/nodejs-documents-query-stream.js +++ b/test-complete/nodejs-documents-query-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); //var should = require('chai').should(); diff --git a/test-complete/nodejs-documents-query.js b/test-complete/nodejs-documents-query.js index a589b0f6..50a5a313 100644 --- a/test-complete/nodejs-documents-query.js +++ b/test-complete/nodejs-documents-query.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-quick.js b/test-complete/nodejs-documents-quick.js index 194d13b9..5889a3da 100644 --- a/test-complete/nodejs-documents-quick.js +++ b/test-complete/nodejs-documents-quick.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-read-chunk.js b/test-complete/nodejs-documents-read-chunk.js index 3865965e..65784cf2 100644 --- a/test-complete/nodejs-documents-read-chunk.js +++ b/test-complete/nodejs-documents-read-chunk.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-remove-multiple.js b/test-complete/nodejs-documents-remove-multiple.js index 598efcc2..d9732615 100644 --- a/test-complete/nodejs-documents-remove-multiple.js +++ b/test-complete/nodejs-documents-remove-multiple.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-removeAll-all.js b/test-complete/nodejs-documents-removeAll-all.js index 11f64bfb..a2b8341d 100644 --- a/test-complete/nodejs-documents-removeAll-all.js +++ b/test-complete/nodejs-documents-removeAll-all.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-removeAll-negative.js b/test-complete/nodejs-documents-removeAll-negative.js index 1c8a6b5d..5926c4f6 100644 --- a/test-complete/nodejs-documents-removeAll-negative.js +++ b/test-complete/nodejs-documents-removeAll-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-removeAll.js b/test-complete/nodejs-documents-removeAll.js index fb63f651..1cebc815 100644 --- a/test-complete/nodejs-documents-removeAll.js +++ b/test-complete/nodejs-documents-removeAll.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-resources-config.js b/test-complete/nodejs-documents-resources-config.js index 923765ef..250f017e 100644 --- a/test-complete/nodejs-documents-resources-config.js +++ b/test-complete/nodejs-documents-resources-config.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-resources.js b/test-complete/nodejs-documents-resources.js index 534e8c93..c30f5242 100644 --- a/test-complete/nodejs-documents-resources.js +++ b/test-complete/nodejs-documents-resources.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-suggest.js b/test-complete/nodejs-documents-suggest.js index 2e1a2a5a..6cbe4c32 100644 --- a/test-complete/nodejs-documents-suggest.js +++ b/test-complete/nodejs-documents-suggest.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-transaction-combo.js b/test-complete/nodejs-documents-transaction-combo.js index 66b03610..40e8f7c1 100644 --- a/test-complete/nodejs-documents-transaction-combo.js +++ b/test-complete/nodejs-documents-transaction-combo.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-transaction-remove.js b/test-complete/nodejs-documents-transaction-remove.js index 8045158d..2b0b4f49 100644 --- a/test-complete/nodejs-documents-transaction-remove.js +++ b/test-complete/nodejs-documents-transaction-remove.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-transaction-timelimit.js b/test-complete/nodejs-documents-transaction-timelimit.js index 087884d6..958b90fe 100644 --- a/test-complete/nodejs-documents-transaction-timelimit.js +++ b/test-complete/nodejs-documents-transaction-timelimit.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-transaction-withstate.js b/test-complete/nodejs-documents-transaction-withstate.js index c02f2071..537fb877 100644 --- a/test-complete/nodejs-documents-transaction-withstate.js +++ b/test-complete/nodejs-documents-transaction-withstate.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-transaction.js b/test-complete/nodejs-documents-transaction.js index 3f722e0e..af61e769 100644 --- a/test-complete/nodejs-documents-transaction.js +++ b/test-complete/nodejs-documents-transaction.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-values-negative.js b/test-complete/nodejs-documents-values-negative.js index f1c0de2c..a1f995f5 100644 --- a/test-complete/nodejs-documents-values-negative.js +++ b/test-complete/nodejs-documents-values-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-values.js b/test-complete/nodejs-documents-values.js index 59f28120..b5b0d36b 100644 --- a/test-complete/nodejs-documents-values.js +++ b/test-complete/nodejs-documents-values.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-write-large.js b/test-complete/nodejs-documents-write-large.js index 471841bf..a32843ef 100644 --- a/test-complete/nodejs-documents-write-large.js +++ b/test-complete/nodejs-documents-write-large.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-documents-write-stream.js b/test-complete/nodejs-documents-write-stream.js index baae9b65..63488b87 100644 --- a/test-complete/nodejs-documents-write-stream.js +++ b/test-complete/nodejs-documents-write-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-extlibs-negative.js b/test-complete/nodejs-extlibs-negative.js index 3cd35bf2..0bedb97a 100644 --- a/test-complete/nodejs-extlibs-negative.js +++ b/test-complete/nodejs-extlibs-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-extlibs.js b/test-complete/nodejs-extlibs.js index c0279a87..ef3bfee3 100644 --- a/test-complete/nodejs-extlibs.js +++ b/test-complete/nodejs-extlibs.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-graphs-content-type.js b/test-complete/nodejs-graphs-content-type.js index 7eb9e0d7..4dae3475 100644 --- a/test-complete/nodejs-graphs-content-type.js +++ b/test-complete/nodejs-graphs-content-type.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-default.js b/test-complete/nodejs-graphs-default.js index 766f23a6..64489817 100644 --- a/test-complete/nodejs-graphs-default.js +++ b/test-complete/nodejs-graphs-default.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-merge-stream.js b/test-complete/nodejs-graphs-merge-stream.js index cdea139f..707596f3 100644 --- a/test-complete/nodejs-graphs-merge-stream.js +++ b/test-complete/nodejs-graphs-merge-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-merge.js b/test-complete/nodejs-graphs-merge.js index afab9e6c..769a0093 100644 --- a/test-complete/nodejs-graphs-merge.js +++ b/test-complete/nodejs-graphs-merge.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-negative.js b/test-complete/nodejs-graphs-negative.js index a2b94eb3..b1c2fb2d 100644 --- a/test-complete/nodejs-graphs-negative.js +++ b/test-complete/nodejs-graphs-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-overwrite-stream.js b/test-complete/nodejs-graphs-overwrite-stream.js index 5dcf469c..cc43ea83 100644 --- a/test-complete/nodejs-graphs-overwrite-stream.js +++ b/test-complete/nodejs-graphs-overwrite-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-overwrite.js b/test-complete/nodejs-graphs-overwrite.js index 94dfa081..f60bc34e 100644 --- a/test-complete/nodejs-graphs-overwrite.js +++ b/test-complete/nodejs-graphs-overwrite.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-read-write-stream.js b/test-complete/nodejs-graphs-read-write-stream.js index a21c0742..5ebbac5e 100644 --- a/test-complete/nodejs-graphs-read-write-stream.js +++ b/test-complete/nodejs-graphs-read-write-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-repair.js b/test-complete/nodejs-graphs-repair.js index c75ba23b..c374be6e 100644 --- a/test-complete/nodejs-graphs-repair.js +++ b/test-complete/nodejs-graphs-repair.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-graphs-transaction-remove.js b/test-complete/nodejs-graphs-transaction-remove.js index 1f314b31..ac67ea57 100644 --- a/test-complete/nodejs-graphs-transaction-remove.js +++ b/test-complete/nodejs-graphs-transaction-remove.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-graphs-transaction.js b/test-complete/nodejs-graphs-transaction.js index 517d55eb..32465754 100644 --- a/test-complete/nodejs-graphs-transaction.js +++ b/test-complete/nodejs-graphs-transaction.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-issue-104.js b/test-complete/nodejs-issue-104.js index a79c5efe..246808f6 100644 --- a/test-complete/nodejs-issue-104.js +++ b/test-complete/nodejs-issue-104.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-issue-108-109.js b/test-complete/nodejs-issue-108-109.js index 061234e8..7ddf7a00 100644 --- a/test-complete/nodejs-issue-108-109.js +++ b/test-complete/nodejs-issue-108-109.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-issue-110.js b/test-complete/nodejs-issue-110.js index 38b8172b..27499c01 100644 --- a/test-complete/nodejs-issue-110.js +++ b/test-complete/nodejs-issue-110.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-issue-115.js b/test-complete/nodejs-issue-115.js index c3da66ca..b884e1a0 100644 --- a/test-complete/nodejs-issue-115.js +++ b/test-complete/nodejs-issue-115.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-issue-257.js b/test-complete/nodejs-issue-257.js index df5060cb..095c513a 100644 --- a/test-complete/nodejs-issue-257.js +++ b/test-complete/nodejs-issue-257.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-issue-99.js b/test-complete/nodejs-issue-99.js index 8e5c14e0..b90f5e9b 100644 --- a/test-complete/nodejs-issue-99.js +++ b/test-complete/nodejs-issue-99.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-javascript-eval-negative.js b/test-complete/nodejs-javascript-eval-negative.js index 4e62e661..1e0f0f71 100644 --- a/test-complete/nodejs-javascript-eval-negative.js +++ b/test-complete/nodejs-javascript-eval-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-javascript-eval-params.js b/test-complete/nodejs-javascript-eval-params.js index e71750c4..55042fc5 100644 --- a/test-complete/nodejs-javascript-eval-params.js +++ b/test-complete/nodejs-javascript-eval-params.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-javascript-eval.js b/test-complete/nodejs-javascript-eval.js index 705f9c69..586417f0 100644 --- a/test-complete/nodejs-javascript-eval.js +++ b/test-complete/nodejs-javascript-eval.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-javascript-invoke-params-negative.js b/test-complete/nodejs-javascript-invoke-params-negative.js index 56bfbf56..f7201463 100644 --- a/test-complete/nodejs-javascript-invoke-params-negative.js +++ b/test-complete/nodejs-javascript-invoke-params-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-javascript-invoke-params.js b/test-complete/nodejs-javascript-invoke-params.js index 733ab8ca..d16a4e8a 100644 --- a/test-complete/nodejs-javascript-invoke-params.js +++ b/test-complete/nodejs-javascript-invoke-params.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-javascript-invoke-simple-negative.js b/test-complete/nodejs-javascript-invoke-simple-negative.js index 6c358f8a..1a197bb6 100644 --- a/test-complete/nodejs-javascript-invoke-simple-negative.js +++ b/test-complete/nodejs-javascript-invoke-simple-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-javascript-invoke-simple.js b/test-complete/nodejs-javascript-invoke-simple.js index b5b53067..1a0b6b0c 100644 --- a/test-complete/nodejs-javascript-invoke-simple.js +++ b/test-complete/nodejs-javascript-invoke-simple.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-logger-bunyan.js b/test-complete/nodejs-logger-bunyan.js index 9a809f6e..9e02acaa 100644 --- a/test-complete/nodejs-logger-bunyan.js +++ b/test-complete/nodejs-logger-bunyan.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var testconfig = require('../etc/test-config-qa.js'); var marklogic = require('../'); diff --git a/test-complete/nodejs-logger-winston.js b/test-complete/nodejs-logger-winston.js index f45cb9f6..3014feb6 100644 --- a/test-complete/nodejs-logger-winston.js +++ b/test-complete/nodejs-logger-winston.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var winston = require('winston'); diff --git a/test-complete/nodejs-optic-cts-queries.js b/test-complete/nodejs-optic-cts-queries.js index a006e53a..b65e2972 100644 --- a/test-complete/nodejs-optic-cts-queries.js +++ b/test-complete/nodejs-optic-cts-queries.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-from-lexicons.js b/test-complete/nodejs-optic-from-lexicons.js index b77aff48..e1f9febf 100644 --- a/test-complete/nodejs-optic-from-lexicons.js +++ b/test-complete/nodejs-optic-from-lexicons.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-from-literals.js b/test-complete/nodejs-optic-from-literals.js index cece36d7..31b3ef93 100644 --- a/test-complete/nodejs-optic-from-literals.js +++ b/test-complete/nodejs-optic-from-literals.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-from-sparql.js b/test-complete/nodejs-optic-from-sparql.js index ca4d2c5a..0eba89af 100644 --- a/test-complete/nodejs-optic-from-sparql.js +++ b/test-complete/nodejs-optic-from-sparql.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-from-sql.js b/test-complete/nodejs-optic-from-sql.js index da1b4ec8..e8fab26d 100644 --- a/test-complete/nodejs-optic-from-sql.js +++ b/test-complete/nodejs-optic-from-sql.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-from-triples.js b/test-complete/nodejs-optic-from-triples.js index b6d1ac55..c9557e0a 100644 --- a/test-complete/nodejs-optic-from-triples.js +++ b/test-complete/nodejs-optic-from-triples.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-from-views.js b/test-complete/nodejs-optic-from-views.js index a79dd3f8..d6bc1135 100644 --- a/test-complete/nodejs-optic-from-views.js +++ b/test-complete/nodejs-optic-from-views.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-generate-views.js b/test-complete/nodejs-optic-generate-views.js index d4ad3e5a..fd1a3637 100644 --- a/test-complete/nodejs-optic-generate-views.js +++ b/test-complete/nodejs-optic-generate-views.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-nodes.js b/test-complete/nodejs-optic-nodes.js index 69803105..dc1a2dd0 100644 --- a/test-complete/nodejs-optic-nodes.js +++ b/test-complete/nodejs-optic-nodes.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-read-file.js b/test-complete/nodejs-optic-read-file.js index cc1dea39..0a16efac 100644 --- a/test-complete/nodejs-optic-read-file.js +++ b/test-complete/nodejs-optic-read-file.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optic-redaction.js b/test-complete/nodejs-optic-redaction.js index 817dfed8..8933a6ab 100644 --- a/test-complete/nodejs-optic-redaction.js +++ b/test-complete/nodejs-optic-redaction.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; diff --git a/test-complete/nodejs-optimistic-locking-stream.js b/test-complete/nodejs-optimistic-locking-stream.js index 3cd58be7..9a8ecdec 100644 --- a/test-complete/nodejs-optimistic-locking-stream.js +++ b/test-complete/nodejs-optimistic-locking-stream.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-optimistic-locking.js b/test-complete/nodejs-optimistic-locking.js index 5543c949..5d349648 100644 --- a/test-complete/nodejs-optimistic-locking.js +++ b/test-complete/nodejs-optimistic-locking.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-pitq-documents.js b/test-complete/nodejs-pitq-documents.js index 8157106f..e4b796fa 100644 --- a/test-complete/nodejs-pitq-documents.js +++ b/test-complete/nodejs-pitq-documents.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-pitq-graphs.js b/test-complete/nodejs-pitq-graphs.js index 5f9096a1..9245dea0 100644 --- a/test-complete/nodejs-pitq-graphs.js +++ b/test-complete/nodejs-pitq-graphs.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-pitq-values.js b/test-complete/nodejs-pitq-values.js index 4a357cfc..c2be10c0 100644 --- a/test-complete/nodejs-pitq-values.js +++ b/test-complete/nodejs-pitq-values.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-process-env.js b/test-complete/nodejs-process-env.js index 1ad0a7aa..66b88683 100644 --- a/test-complete/nodejs-process-env.js +++ b/test-complete/nodejs-process-env.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ process.env.NODE_ENV = 'development'; diff --git a/test-complete/nodejs-serverprops.js b/test-complete/nodejs-serverprops.js index 035054a4..a2fdc9ef 100644 --- a/test-complete/nodejs-serverprops.js +++ b/test-complete/nodejs-serverprops.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-sparql-update.js b/test-complete/nodejs-sparql-update.js index feec8e52..bad4b324 100644 --- a/test-complete/nodejs-sparql-update.js +++ b/test-complete/nodejs-sparql-update.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-sparql.js b/test-complete/nodejs-sparql.js index 42b6a257..ddb3930b 100644 --- a/test-complete/nodejs-sparql.js +++ b/test-complete/nodejs-sparql.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-advance-lsqt.js b/test-complete/nodejs-temporal-advance-lsqt.js index a13b7df7..28e85182 100644 --- a/test-complete/nodejs-temporal-advance-lsqt.js +++ b/test-complete/nodejs-temporal-advance-lsqt.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-insert-bulk.js b/test-complete/nodejs-temporal-insert-bulk.js index a6aedd6f..c96f6a67 100644 --- a/test-complete/nodejs-temporal-insert-bulk.js +++ b/test-complete/nodejs-temporal-insert-bulk.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-insert-lsqt.js b/test-complete/nodejs-temporal-insert-lsqt.js index e990bfdc..ad06bdf4 100644 --- a/test-complete/nodejs-temporal-insert-lsqt.js +++ b/test-complete/nodejs-temporal-insert-lsqt.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-insert-transform.js b/test-complete/nodejs-temporal-insert-transform.js index 5060f6a7..4bfcf8ba 100644 --- a/test-complete/nodejs-temporal-insert-transform.js +++ b/test-complete/nodejs-temporal-insert-transform.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-insert.js b/test-complete/nodejs-temporal-insert.js index a32be511..4ba97227 100644 --- a/test-complete/nodejs-temporal-insert.js +++ b/test-complete/nodejs-temporal-insert.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-lsqt-query.js b/test-complete/nodejs-temporal-lsqt-query.js index 4fb81584..6588aafb 100644 --- a/test-complete/nodejs-temporal-lsqt-query.js +++ b/test-complete/nodejs-temporal-lsqt-query.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-patch.js b/test-complete/nodejs-temporal-patch.js index 5a989a47..2c2ee1df 100644 --- a/test-complete/nodejs-temporal-patch.js +++ b/test-complete/nodejs-temporal-patch.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-period-compare-query.js b/test-complete/nodejs-temporal-period-compare-query.js index 897a21c8..97c3db86 100644 --- a/test-complete/nodejs-temporal-period-compare-query.js +++ b/test-complete/nodejs-temporal-period-compare-query.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-period-range-query-multiple-axis.js b/test-complete/nodejs-temporal-period-range-query-multiple-axis.js index 3a6fd6c5..b630701c 100644 --- a/test-complete/nodejs-temporal-period-range-query-multiple-axis.js +++ b/test-complete/nodejs-temporal-period-range-query-multiple-axis.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-period-range-query.js b/test-complete/nodejs-temporal-period-range-query.js index 302c94ae..e99d231b 100644 --- a/test-complete/nodejs-temporal-period-range-query.js +++ b/test-complete/nodejs-temporal-period-range-query.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-protect-delete.js b/test-complete/nodejs-temporal-protect-delete.js index 3baba023..b67b9b1f 100644 --- a/test-complete/nodejs-temporal-protect-delete.js +++ b/test-complete/nodejs-temporal-protect-delete.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-protect-update.js b/test-complete/nodejs-temporal-protect-update.js index bb67045a..13d398ff 100644 --- a/test-complete/nodejs-temporal-protect-update.js +++ b/test-complete/nodejs-temporal-protect-update.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-protect-wipe.js b/test-complete/nodejs-temporal-protect-wipe.js index f2407d15..2bb9c22e 100644 --- a/test-complete/nodejs-temporal-protect-wipe.js +++ b/test-complete/nodejs-temporal-protect-wipe.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-transaction-commit.js b/test-complete/nodejs-temporal-transaction-commit.js index f3123da8..f784cebe 100644 --- a/test-complete/nodejs-temporal-transaction-commit.js +++ b/test-complete/nodejs-temporal-transaction-commit.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-transaction-rollback.js b/test-complete/nodejs-temporal-transaction-rollback.js index c0ede209..d7693858 100644 --- a/test-complete/nodejs-temporal-transaction-rollback.js +++ b/test-complete/nodejs-temporal-transaction-rollback.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-update-lsqt.js b/test-complete/nodejs-temporal-update-lsqt.js index 813abe71..fc53a148 100644 --- a/test-complete/nodejs-temporal-update-lsqt.js +++ b/test-complete/nodejs-temporal-update-lsqt.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-temporal-update.js b/test-complete/nodejs-temporal-update.js index 6d9b9195..3265a611 100644 --- a/test-complete/nodejs-temporal-update.js +++ b/test-complete/nodejs-temporal-update.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-transform-combine.js b/test-complete/nodejs-transform-combine.js index 665f13ce..fe306968 100644 --- a/test-complete/nodejs-transform-combine.js +++ b/test-complete/nodejs-transform-combine.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-transform-empty.js b/test-complete/nodejs-transform-empty.js index f9390792..8975d73f 100644 --- a/test-complete/nodejs-transform-empty.js +++ b/test-complete/nodejs-transform-empty.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-transform-javascript.js b/test-complete/nodejs-transform-javascript.js index a63603b4..9f9e16ab 100644 --- a/test-complete/nodejs-transform-javascript.js +++ b/test-complete/nodejs-transform-javascript.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-transform-negative.js b/test-complete/nodejs-transform-negative.js index cc348acb..3bdce3d2 100644 --- a/test-complete/nodejs-transform-negative.js +++ b/test-complete/nodejs-transform-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-transform-params.js b/test-complete/nodejs-transform-params.js index 90d624d7..e2858825 100644 --- a/test-complete/nodejs-transform-params.js +++ b/test-complete/nodejs-transform-params.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-transform-save-json-as-xml.js b/test-complete/nodejs-transform-save-json-as-xml.js index 74b9be0a..d3f0d0bc 100644 --- a/test-complete/nodejs-transform-save-json-as-xml.js +++ b/test-complete/nodejs-transform-save-json-as-xml.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-transform-xquery.js b/test-complete/nodejs-transform-xquery.js index cee4fc69..54d96640 100644 --- a/test-complete/nodejs-transform-xquery.js +++ b/test-complete/nodejs-transform-xquery.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-transform-xslt.js b/test-complete/nodejs-transform-xslt.js index 7c4a2059..28dd31f7 100644 --- a/test-complete/nodejs-transform-xslt.js +++ b/test-complete/nodejs-transform-xslt.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); var fs = require('fs'); diff --git a/test-complete/nodejs-xquery-eval-negative.js b/test-complete/nodejs-xquery-eval-negative.js index f2372ac0..e1f080a3 100644 --- a/test-complete/nodejs-xquery-eval-negative.js +++ b/test-complete/nodejs-xquery-eval-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-xquery-eval.js b/test-complete/nodejs-xquery-eval.js index a4780110..5e1c52cd 100644 --- a/test-complete/nodejs-xquery-eval.js +++ b/test-complete/nodejs-xquery-eval.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-xquery-invoke-params-negative.js b/test-complete/nodejs-xquery-invoke-params-negative.js index 0da32d37..e0b97045 100644 --- a/test-complete/nodejs-xquery-invoke-params-negative.js +++ b/test-complete/nodejs-xquery-invoke-params-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-xquery-invoke-params.js b/test-complete/nodejs-xquery-invoke-params.js index 47485ca8..63e7afbd 100644 --- a/test-complete/nodejs-xquery-invoke-params.js +++ b/test-complete/nodejs-xquery-invoke-params.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-xquery-invoke-simple-negative.js b/test-complete/nodejs-xquery-invoke-simple-negative.js index a1aaaa20..728cbe44 100644 --- a/test-complete/nodejs-xquery-invoke-simple-negative.js +++ b/test-complete/nodejs-xquery-invoke-simple-negative.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); diff --git a/test-complete/nodejs-xquery-invoke-simple.js b/test-complete/nodejs-xquery-invoke-simple.js index 95ddb1d7..db3d4dd3 100644 --- a/test-complete/nodejs-xquery-invoke-simple.js +++ b/test-complete/nodejs-xquery-invoke-simple.js @@ -1,5 +1,5 @@ /* -* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ var should = require('should'); From 0c36e942e17cc3c6da2cb074eb0b75d079d74f05 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Mon, 13 Oct 2025 12:49:13 -0400 Subject: [PATCH 20/58] MLE-24685 Fixing test-complete-app deploy Jenkins is getting an issue resolving 4.7.0 ml-gradle, so shifting to 6.0.1 - which is fine to use here because we don't need ml-gradle for deploying any LSQT stuff. --- .copyrightconfig | 2 +- Jenkinsfile | 6 +- test-complete-app/build.gradle | 8 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 63721 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 +- test-complete-app/gradlew | 301 +++++++++++------- test-complete-app/gradlew.bat | 176 +++++----- test-complete/nodejs-optic-nodes.js | 3 +- 8 files changed, 297 insertions(+), 203 deletions(-) diff --git a/.copyrightconfig b/.copyrightconfig index aad2578d..304bdade 100644 --- a/.copyrightconfig +++ b/.copyrightconfig @@ -11,4 +11,4 @@ startyear: 2015 # - Dotfiles already skipped automatically # Enable by removing the leading '# ' from the next line and editing values. # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml +filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app/* diff --git a/Jenkinsfile b/Jenkinsfile index 0222bea4..913a89d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ def runTests() { sh label: 'deploy-test-app-and-run-tests', script: ''' export JAVA_HOME=$JAVA_HOME_DIR export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR - export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:${NODE_HOME_DIR}/bin:$PATH + export PATH=$JAVA_HOME/bin:${NODE_HOME_DIR}/bin:$PATH cd node-client-api node --version npm --version @@ -58,7 +58,9 @@ def runAuditReport() { def runE2ETests() { sh label: 'run-e2e-tests', script: ''' - export PATH=${NODE_HOME_DIR}/bin:$PATH + export JAVA_HOME=$JAVA_HOME_DIR + export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR + export PATH=$JAVA_HOME/bin:${NODE_HOME_DIR}/bin:$PATH cd node-client-api node --version npm --version diff --git a/test-complete-app/build.gradle b/test-complete-app/build.gradle index 71ecd1e0..9b3e099a 100644 --- a/test-complete-app/build.gradle +++ b/test-complete-app/build.gradle @@ -1,6 +1,10 @@ +/** + * This Gradle file is used to add a certificate template to the app that is created via the bespoke + * deployer in test-setup-qa.js and test-setup-dmsdk-qa.js. + */ plugins { id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "4.7.0" + id "com.marklogic.ml-gradle" version "6.0.1" } /* @@ -13,4 +17,4 @@ ext { command.setCommonName("localhost") command.setValidFor(365) mlAppDeployer.commands.add(command) -} \ No newline at end of file +} diff --git a/test-complete-app/gradle/wrapper/gradle-wrapper.jar b/test-complete-app/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644 GIT binary patch delta 44091 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 F{tsc4gtPzv delta 41205 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 jFA#1K+D2e>Q|zP \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/test-complete-app/gradlew.bat b/test-complete-app/gradlew.bat index f9553162..6689b85b 100644 --- a/test-complete-app/gradlew.bat +++ b/test-complete-app/gradlew.bat @@ -1,84 +1,92 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/test-complete/nodejs-optic-nodes.js b/test-complete/nodejs-optic-nodes.js index dc1a2dd0..01d4a91e 100644 --- a/test-complete/nodejs-optic-nodes.js +++ b/test-complete/nodejs-optic-nodes.js @@ -17,7 +17,8 @@ const op = marklogic.planBuilder; describe('Nodejs Optic nodes json constructor test', function () { - it('TEST 1 - construct json from literals', function (done) { + // Skipping this test due to odd server bug that will be written up soon. + it.skip('TEST 1 - construct json from literals', function (done) { const plan1 = op.fromLiterals([ { rowId: 1, colorId: 1, desc: 'ball' }, From 3805c2f223a3ed7037d81f1aac5ac91ff49f41fd Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Mon, 13 Oct 2025 20:24:22 -0400 Subject: [PATCH 21/58] MLE-24685 Skipping timestamp test that fails due to server issue --- CONTRIBUTING.md | 3 +++ test-complete/nodejs-optic-from-views.js | 3 ++- test-complete/nodejs-optic-nodes.js | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9b0057b8..d42e706d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,3 +53,6 @@ contained in either the "it" function or the "describe" function, respectively. 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. \ No newline at end of file diff --git a/test-complete/nodejs-optic-from-views.js b/test-complete/nodejs-optic-from-views.js index d6bc1135..3fd0197c 100644 --- a/test-complete/nodejs-optic-from-views.js +++ b/test-complete/nodejs-optic-from-views.js @@ -1151,7 +1151,8 @@ describe('Nodejs Optic from views test', function () { }, done); }); - it('TEST 38 - with old timestamp', function (done) { + // Skipping due to server bug MLE-24724 + it.skip('TEST 38 - with old timestamp', function (done) { var oldTimestamp = db.createTimestamp('123'); const plan1 = op.fromView('opticFunctionalTest', 'detail', 'myDetail'); const plan2 = op.fromView('opticFunctionalTest', 'master', 'myMaster'); diff --git a/test-complete/nodejs-optic-nodes.js b/test-complete/nodejs-optic-nodes.js index 01d4a91e..dc1a2dd0 100644 --- a/test-complete/nodejs-optic-nodes.js +++ b/test-complete/nodejs-optic-nodes.js @@ -17,8 +17,7 @@ const op = marklogic.planBuilder; describe('Nodejs Optic nodes json constructor test', function () { - // Skipping this test due to odd server bug that will be written up soon. - it.skip('TEST 1 - construct json from literals', function (done) { + it('TEST 1 - construct json from literals', function (done) { const plan1 = op.fromLiterals([ { rowId: 1, colorId: 1, desc: 'ball' }, From d9a236adf101c5da07a2180bed36496e7c88f4e8 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Mon, 13 Oct 2025 17:02:07 -0700 Subject: [PATCH 22/58] MLE-24722 - make sure the done() method called within each test once and only once. Set reasonable timeouts for some of the bulk operations and remove infinite timeouts which can hang the test. --- test-basic/annTopK.js | 1 + test-basic/basePath-test.js | 20 +++- test-basic/bindingFromParam.js | 81 +++++++++---- test-basic/client.js | 22 +++- test-basic/cloud_authentication-test.js | 1 + test-basic/digestauth-fips-nomd5load.js | 6 +- test-basic/docColTypes-test.js | 1 + test-basic/documents-core.js | 110 ++++++++++++------ .../documents-data-movement-queryAll.js | 8 +- test-basic/documents-data-movement-readAll.js | 7 +- test-basic/endpoint-caller.js | 1 + test-basic/service-caller.js | 1 + 12 files changed, 178 insertions(+), 81 deletions(-) diff --git a/test-basic/annTopK.js b/test-basic/annTopK.js index e8cc3d87..08910a68 100644 --- a/test-basic/annTopK.js +++ b/test-basic/annTopK.js @@ -89,6 +89,7 @@ describe('tests for annTopK', function () { planAnnTopKOptionsMap) .orderBy(p.col('name')) ); + done(new Error('Expecting an error to be thrown due to invalid key in options argument')); } catch(error){ assert(error.message.toString().includes('options argument at 4 of PlanModifyPlan.annTopK() has invalid key- invalid')) done(); diff --git a/test-basic/basePath-test.js b/test-basic/basePath-test.js index 5ef7d2ca..744b6363 100644 --- a/test-basic/basePath-test.js +++ b/test-basic/basePath-test.js @@ -17,7 +17,9 @@ describe('basePath tests', function() { testconfig.restWriterConnectionWithBasePath.basePath = 'invalid'; const dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnectionWithBasePath); dbWriter.documents.write(writeObject) - .result(function(response){}) + .result(function(response){ + done(new Error('Expecting an error to be thrown due to invalid basePath')); + }) .catch(err=> { assert(err.toString().includes('path: invalid/v1/documents')); @@ -29,7 +31,9 @@ describe('basePath tests', function() { testconfig.restWriterConnectionWithBasePath.basePath = '/invalid'; const dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnectionWithBasePath); dbWriter.documents.write(writeObject) - .result(function(response){}) + .result(function(response){ + done(new Error('Expecting an error to be thrown due to invalid basePath with a leading slash')); + }) .catch(err=> { assert(err.toString().includes('path: /invalid/v1/documents')); @@ -41,7 +45,9 @@ describe('basePath tests', function() { testconfig.restWriterConnectionWithBasePath.basePath = 'invalid/'; const dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnectionWithBasePath); dbWriter.documents.write(writeObject) - .result(function(response){}) + .result(function(response){ + done(new Error('Expecting an error to be thrown due to invalid basePath with a trailing slash')); + }) .catch(err=> { assert(err.toString().includes('path: invalid/v1/documents')); @@ -53,7 +59,9 @@ describe('basePath tests', function() { testconfig.restWriterConnectionWithBasePath.basePath = '/invalid/'; const dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnectionWithBasePath); dbWriter.documents.write(writeObject) - .result(function(response){}) + .result(function(response){ + done(new Error('Expecting an error to be thrown due to invalid basePath with starting and trailing slashes')); + }) .catch(err=> { assert(err.toString().includes('path: /invalid/v1/documents')); @@ -65,7 +73,9 @@ describe('basePath tests', function() { testconfig.restWriterConnectionWithBasePath.basePath = '//invalid//'; const dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnectionWithBasePath); dbWriter.documents.write(writeObject) - .result(function(response){}) + .result(function(response){ + done(new Error('Expecting an error to be thrown due to invalid basePath with multiple starting and trailing slashes')); + }) .catch(err=> { try{ diff --git a/test-basic/bindingFromParam.js b/test-basic/bindingFromParam.js index 8c368df5..ab9da704 100644 --- a/test-basic/bindingFromParam.js +++ b/test-basic/bindingFromParam.js @@ -111,6 +111,7 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', 'qualifier', outputCols); const temp = {myDocs: rows}; db.rows.query(planBuilderTemplate,null, temp); + done(new Error('Expecting an error to be thrown due to invalid row-col-types argument')); } catch (e) { e.toString().should.equal('Error: row-col-types argument at 2 of PlanBuilder.fromParam() has invalid argument for PlanRowColTypes value: [object Object]'); done(); @@ -157,6 +158,7 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', 'qualifier', outputCols); const temp = {myDocs: rows}; db.rows.query(planBuilderTemplate, null, temp); + done(new Error('Expecting an error to be thrown due to invalid row-col-types argument')); } catch (e) { e.toString().should.equal('Error: row-col-types argument at 2 of PlanBuilder.fromParam() has another type than string'); done(); @@ -205,7 +207,11 @@ describe('optic-update fromParam tests', function(){ }, {"column": "lastName", "type": "string"}]; const planBuilderTemplate = op.fromParam('myDocs', 'qualifier', outputCols); const temp = {myDocs: rows}; - db.rows.query(planBuilderTemplate, null, temp).catch(e => { + db.rows.query(planBuilderTemplate, null, temp) + .then(function(response){ + done(new Error('Expecting an error to be thrown due to null value for non-nullable column')); + }) + .catch(e => { e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); done(); }); @@ -221,7 +227,11 @@ describe('optic-update fromParam tests', function(){ }, {"column": "lastName", "type": "string", "nullable": true}]; const planBuilderTemplate = op.fromParam('myDocs', 'qualifier', outputCols); const temp = {myDocs: rows}; - db.rows.query(planBuilderTemplate, null,temp).catch(e => { + db.rows.query(planBuilderTemplate, null,temp) + .then(function(response){ + done(new Error('Expecting an error to be thrown due to invalid row-col-types argument')); + }) + .catch(e => { e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); done(); }); @@ -237,7 +247,11 @@ describe('optic-update fromParam tests', function(){ }, {"column": "lastName", "type": "string", "nullable": true}]; const planBuilderTemplate = op.fromParam('myDocs', 'qualifier', outputCols); const temp = {myDocs: rows}; - db.rows.query(planBuilderTemplate,null, temp).catch(e => { + db.rows.query(planBuilderTemplate,null, temp) + .then(function(response){ + done(new Error('Expecting an error to be thrown due to invalid row-col-types argument')); + }) + .catch(e => { e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); done(); }); @@ -255,10 +269,13 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', null, outputCols); const temp = {myDocs: rows}; db.rows.query(planBuilderTemplate,null, temp) - .catch(e => { - e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); - done(); - }); + .then(function(response){ + done(new Error('Expecting an error to be thrown due to null value for non-nullable column')); + }) + .catch(e => { + e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); + done(); + }); } catch (e) { done(); } @@ -274,10 +291,13 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', null, outputCols); const temp = {myDocs: rows}; db.rows.query(planBuilderTemplate, null,temp) - .catch(e => { - e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); - done(); - }); + .then(function(response){ + done(new Error('Expecting an error to be thrown due to extra non-defined column types')); + }) + .catch(e => { + e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); + done(); + }); }); @@ -290,10 +310,13 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', null, outputCols); const temp = {bindingParam: rows}; db.rows.query(planBuilderTemplate, null, temp) - .catch(e => { - e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); - done(); - }); + .then(function(response){ + done(new Error('Expecting an error to be thrown due to non-consistent binding argument name')); + }) + .catch(e => { + e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); + done(); + }); }); @@ -311,10 +334,13 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', null, outputCols); const temp = {myDocs: rows}; db.rows.query(planBuilderTemplate, null, temp) - .catch(e => { - e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); - done(); - }); + .then(function(response){ + done(new Error('Expecting an error to be thrown due to mismatch type')); + }) + .catch(e => { + e.toString().includes('Error: binding arguments /v1/rows: cannot process response with 500 status'); + done(); + }); }); @@ -333,6 +359,7 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', 1234, outputCols); const temp = {myDocs: rows}; db.rows.query(planBuilderTemplate, null, temp); + done(new Error('Expecting an error to be thrown due to invalid qualifier argument')); } catch (e) { e.toString().includes('Error: qualifier argument at 1 of PlanBuilder.fromParam() must be a XsString value'); done(); @@ -353,11 +380,17 @@ describe('optic-update fromParam tests', function(){ const planBuilderTemplate = op.fromParam('myDocs', null, outputCols); const temp = {myDocs: rows}; db.rows.query(planBuilderTemplate, null, temp).then(res => { - const rows = res.rows; - rows[0].id.value.should.equal(1); - rows[0].firstName.value.should.equal("firstName_1"); - rows[0].lastName.value.should.equal("lastName_1"); - done(); + try { + const rows = res.rows; + rows[0].id.value.should.equal(1); + rows[0].firstName.value.should.equal("firstName_1"); + rows[0].lastName.value.should.equal("lastName_1"); + done(); + } catch (e) { + done(e); + } + }).catch(e => { + done(e); }); }); diff --git a/test-basic/client.js b/test-basic/client.js index a484b315..a26fcf05 100644 --- a/test-basic/client.js +++ b/test-basic/client.js @@ -87,13 +87,21 @@ describe('database clients', function () { done(); }); it('should use a custom agent', function (done) { - agentDb.connectionParams.agent.options.keepAliveTimeoutMsecs.should.equal(1000); - done(); + try { + agentDb.connectionParams.agent.options.keepAliveTimeoutMsecs.should.equal(1000); + done(); + } catch(e){ + done(e); + } }); it('should create a timestamp', function (done) { let timestamp = db.createTimestamp('123'); - timestamp.value.should.equal('123'); - done(); + try { + timestamp.value.should.equal('123'); + done(); + } catch(e){ + done(e); + } }); it('should throw Error when server expects DIGEST and authType is CERTIFICATE', function (done) { const db = marklogic.createDatabaseClient({ @@ -108,6 +116,7 @@ describe('database clients', function () { .result(function (documents) { documents.forEach(function (document) { }); + done(new Error('Expecting an error to be thrown due to invalid authentication configuration')); }) .catch(error => { assert(error.toString().includes('response with invalid 401 status with path: /v1/search')); @@ -143,7 +152,9 @@ describe('database clients', function () { contentType: 'application/json', content: '{"key1":"value 1"}' }) - .result() + .result(function (document) { + done(new Error('Expecting an error to be thrown due to invalid SSL configuration')); + }) .catch(error => { try{ assert(error.message.toString().includes('You have attempted to access an HTTP server using HTTPS. Please check your configuration.') || @@ -158,6 +169,7 @@ describe('database clients', function () { it('should throw error when authType is OAuth and oauthToken is missing', function(done){ try { marklogic.createDatabaseClient(testconfig.restConnectionForOauth); + done(new Error('Expecting an error to be thrown due to missing oauthToken')); } catch(error){ assert(error.message.toString().includes('oauthToken required for OAuth authentication. ')); done(); diff --git a/test-basic/cloud_authentication-test.js b/test-basic/cloud_authentication-test.js index 01bcd333..86edbe66 100644 --- a/test-basic/cloud_authentication-test.js +++ b/test-basic/cloud_authentication-test.js @@ -15,6 +15,7 @@ describe('cloud-authentication tests', function() { host: 'invalid', authType: 'cloud' }); + done(new Error('Expecting an error to be thrown due to missing apiKey')); } catch(error) { assert(error.toString().includes('apiKey needed for MarkLogic cloud authentication.')); done(); diff --git a/test-basic/digestauth-fips-nomd5load.js b/test-basic/digestauth-fips-nomd5load.js index 586b9b21..e0192fec 100644 --- a/test-basic/digestauth-fips-nomd5load.js +++ b/test-basic/digestauth-fips-nomd5load.js @@ -6,7 +6,7 @@ const should = require('should'); describe('FIPS test - ensure MD5 hash digester object is not loaded by default on require of www-authenticate module', function () { - it('should not automatically load MD5 digest algorithm function when requiring www-authenticate module', function () { + it('should not automatically load MD5 digest algorithm function when requiring www-authenticate module', function (done) { /** * Attempt to load/require the www-authenticate module after applying a monkey-patch * to the crypto.createHash function to intercept any attempts to create an MD5 hash @@ -42,7 +42,9 @@ describe('FIPS test - ensure MD5 hash digester object is not loaded by default o // Require the module - should not call to get MD5 digester so should not throw (() => require('../lib/www-authenticate-patched/md5')).should.not.throw(); (() => require('../lib/www-authenticate-patched/www-authenticate')).should.not.throw(); - + done(); + } catch (e) { + done(e); } finally { // Restore the original createHash function to avoid side effects // This MUST execute to avoid breaking other tests! diff --git a/test-basic/docColTypes-test.js b/test-basic/docColTypes-test.js index c2880f75..70bd4997 100644 --- a/test-basic/docColTypes-test.js +++ b/test-basic/docColTypes-test.js @@ -116,6 +116,7 @@ describe('optic-update docColTypes tests', function() { try { db.rows.query(op.fromDocDescriptors(docsDescriptor).write(op.docColTypes())); + done(new Error('Expecting an error to be thrown due to invalid document descriptor')); } catch (e) { e.toString().includes('Error: doc-cols argument at 0 of PlanModifyPlan.write() must have type PlanDocColsIdentifier'); done(); diff --git a/test-basic/documents-core.js b/test-basic/documents-core.js index 4b6bc187..fc8ccf04 100644 --- a/test-basic/documents-core.js +++ b/test-basic/documents-core.js @@ -58,7 +58,7 @@ describe('document content', function(){ document.content.key1.should.equal('value 1'); done(); }) - .catch(error=> done(error)); + .catch(done); }); it('should read back normal contents with enableGzippedResponses as false', function(done){ @@ -379,18 +379,21 @@ describe('document content', function(){ '/test/write/arrayObject2.json' ) .result(function(documents) { - valcheck.isUndefined(documents).should.equal(false); - documents.length.should.equal(2); - for (var i=0; i < 2; i++) { - var document = documents[i]; - valcheck.isUndefined(document).should.equal(false); - document.should.have.property('content'); - document.content.should.have.property('key1'); - document.content.key1.should.equal('value 1'); + try { + valcheck.isUndefined(documents).should.equal(false); + documents.length.should.equal(2); + for (var i=0; i < 2; i++) { + var document = documents[i]; + valcheck.isUndefined(document).should.equal(false); + document.should.have.property('content'); + document.content.should.have.property('key1'); + document.content.key1.should.equal('value 1'); + } + done(); + } catch (e) { + done(e); } - done(); - }) - .catch(done); + }) }); it('should read as an object stream with content and metadata', function(done){ var count = 0; @@ -399,15 +402,24 @@ describe('document content', function(){ categories: ['content', 'quality'] }).stream('object').on('error', done). on('data', function (data) { - count++; - valcheck.isObject(data).should.equal(true); - data.should.have.property('content'); - data.should.have.property('quality'); + try { + count++; + valcheck.isObject(data).should.equal(true); + data.should.have.property('content'); + data.should.have.property('quality'); + } catch (e) { + done(e); + return; + } }). on('end', function () { - count.should.equal(2); - done(); - }); + try { + count.should.equal(2); + done(); + } catch (e) { + done(e); + } + }) }); it('should read as an object stream with content only', function(done){ var count = 0; @@ -416,14 +428,23 @@ describe('document content', function(){ categories: ['content'] }).stream('object').on('error', done). on('data', function (data) { - count++; - valcheck.isObject(data).should.equal(true); - data.should.have.property('content'); - data.should.not.have.property('quality'); + try { + count++; + valcheck.isObject(data).should.equal(true); + data.should.have.property('content'); + data.should.not.have.property('quality'); + } catch (e) { + done(e); + return; + } }). on('end', function () { - count.should.equal(2); - done(); + try { + count.should.equal(2); + done(); + } catch (e) { + done(e); + } }); }); it('should read as an object stream with metadata only', function(done){ @@ -433,14 +454,23 @@ describe('document content', function(){ categories: ['quality'] }).stream('object').on('error', done). on('data', function (data) { - count++; - valcheck.isObject(data).should.equal(true); - data.should.not.have.property('content'); - data.should.have.property('quality'); + try { + count++; + valcheck.isObject(data).should.equal(true); + data.should.not.have.property('content'); + data.should.have.property('quality'); + } catch (e) { + done(e); + return; + } }). on('end', function () { - count.should.equal(2); - done(); + try { + count.should.equal(2); + done(); + } catch (e) { + done(e); + } }); }); }); @@ -459,13 +489,17 @@ describe('document content', function(){ it('should read back the value', function(done){ db.documents.read('/test/write/writable1.json').stream('chunked'). on('data', function(chunk) { - valcheck.isUndefined(chunk).should.equal(false); - var content = JSON.parse(chunk.toString()); - valcheck.isUndefined(content).should.equal(false); - content.should.have.property('key1'); - content.key1.should.equal('value 1'); - done(); - }, done); + try { + valcheck.isUndefined(chunk).should.equal(false); + var content = JSON.parse(chunk.toString()); + valcheck.isUndefined(content).should.equal(false); + content.should.have.property('key1'); + content.key1.should.equal('value 1'); + done(); + } catch (e) { + done(e); + } + }) }); }); diff --git a/test-basic/documents-data-movement-queryAll.js b/test-basic/documents-data-movement-queryAll.js index 21ea68db..cfdaf797 100644 --- a/test-basic/documents-data-movement-queryAll.js +++ b/test-basic/documents-data-movement-queryAll.js @@ -21,9 +21,9 @@ describe('data movement queryAll', function() { before(function (done) { // This "before" and the "after" frequently fail to finish before the timeout triggers // TODO: - // short-term -> run with "timeout 0" and/or change/add "this.timeout(0)" to both methods - // long-term -> Do we need 10000 records for these tests? - this.timeout(0); + // short-term -> add "this.timeout(120000)" to both methods + // long-term -> Do we need 10000 records for these tests? If 120 seconds is not enough, we change the test. + this.timeout(120000); readable = new Stream.Readable({objectMode: true}); uris = []; for(let i=0; i<10000; i++) { @@ -44,7 +44,7 @@ describe('data movement queryAll', function() { }); after((function(done){ - this.timeout(0); + this.timeout(120000); dbWriter.documents.remove(uris) .result(function(response){ done(); diff --git a/test-basic/documents-data-movement-readAll.js b/test-basic/documents-data-movement-readAll.js index b2400d61..3f819866 100644 --- a/test-basic/documents-data-movement-readAll.js +++ b/test-basic/documents-data-movement-readAll.js @@ -23,10 +23,10 @@ let xqyTransformPath = './test-basic/data/flagTransform.xqy'; describe('data movement readAll', function() { // This "before" frequently fails to finish before the timeout triggers // TODO: - // short-term -> run with "timeout 0" and/or change/add "this.timeout(0)" to both methods - // long-term -> Do we need 10000 records for these tests? - this.timeout(120000); + // short-term -> add "this.timeout(120000)" to both methods + // long-term -> Do we need 10000 records for these tests? If 120 seconds is not enough, we change the test. before(function (done) { + this.timeout(120000); let readable = new Stream.Readable({objectMode: true}); for(let i=0; i<10000; i++) { const temp = { @@ -82,6 +82,7 @@ describe('data movement readAll', function() { }); after((function(done){ + this.timeout(120000); categoriesUrisList.forEach(uri=>urisList.push(uri)); dbWriter.documents.remove(urisList) .result(function(){ diff --git a/test-basic/endpoint-caller.js b/test-basic/endpoint-caller.js index 921fd094..aef35c7a 100644 --- a/test-basic/endpoint-caller.js +++ b/test-basic/endpoint-caller.js @@ -12,6 +12,7 @@ let gulpConfig = require('../gulpfile.js'); describe('Endpoint caller', function() { before(function(done){ + this.timeout(30000); // set timeout to 30 seconds, because some of the tests take a while gulpConfig.loadProxyTests(); setTimeout(()=>{done();}, 5000); }); diff --git a/test-basic/service-caller.js b/test-basic/service-caller.js index 1cc7ef11..aee8c50e 100644 --- a/test-basic/service-caller.js +++ b/test-basic/service-caller.js @@ -12,6 +12,7 @@ let gulpConfig = require('../gulpfile.js'); describe('Service caller', function() { before(function(done){ + this.timeout(30000); // set timeout to 30 seconds, because some of the tests take a while gulpConfig.loadProxyTests(); setTimeout(()=>{done();}, 5000); }); From 818217abff62a5d278dec00a4d01a09c9011ad81 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Tue, 14 Oct 2025 15:06:29 -0400 Subject: [PATCH 23/58] MLE-24685 Fixing Polaris issue in Docker file --- docker-compose.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 8d0f2352..c40c010d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,6 +5,10 @@ services: marklogic: image: "${MARKLOGIC_IMAGE}" platform: linux/amd64 + # The NET_RAW capability allows a process to create raw sockets. Polaris does not like that. + # This setting removes the NET_RAW capability from the container. + cap_drop: + - NET_RAW environment: - INSTALL_CONVERTERS=true - MARKLOGIC_INIT=true From 6fb52f3b16823b7ae1afcf86f284de72230b577f Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Tue, 14 Oct 2025 17:34:38 -0700 Subject: [PATCH 24/58] More fixes: make sure done() called once and only once for async operations. Change annTopK tests to use await/rejects idiom which is easier to understand. Skip the cloud test that tries to connect to support.beta.marklogic.cloud. That DNS name is not resolving as of today. --- test-basic/annTopK.js | 114 ++++++------- test-basic/cloud_authentication-test.js | 5 +- test-basic/docColTypes-test.js | 1 + .../documents-data-movement-queryAll.js | 14 +- test-basic/documents-data-movement-readAll.js | 156 ++++++++++++------ 5 files changed, 164 insertions(+), 126 deletions(-) diff --git a/test-basic/annTopK.js b/test-basic/annTopK.js index 08910a68..af6e6339 100644 --- a/test-basic/annTopK.js +++ b/test-basic/annTopK.js @@ -13,99 +13,89 @@ let serverConfiguration = {}; const execPlan = pbb.execPlan; describe('tests for annTopK', function () { - this.timeout(5000) - before(function (done) { - try { - testlib.findServerConfiguration(serverConfiguration); - setTimeout(() => { - if (serverConfiguration.serverVersion < 12) { - this.skip(); - } - done(); - }, 3000); - } catch (error) { - done(error); + this.timeout(5000); + before(async function () { + await testlib.findServerConfigurationPromise(serverConfiguration); + + if (serverConfiguration.serverVersion < 12) { + this.skip(); } }); - it('annTopK without PlanAnnTopKOptions', function (done) { - execPlan(p + it('annTopK without PlanAnnTopKOptions', async function () { + const response = await execPlan(p .fromView('vectors', 'persons', '') .annTopK(10, p.col('embedding'), p.vec.vector([1.1, 2.2, 3.3]), p.col('distance')) .orderBy(p.col('name')) - ) - .then(function (response) { - verifyResults(response.rows, done); - }) - .catch(error => done(error)); + ); + verifyResults(response.rows); }); - it('annTopK with PlanAnnTopKOptions as a single string', function (done) { - execPlan(p + it('annTopK with PlanAnnTopKOptions as a single string', async function () { + const response = await execPlan(p .fromView('vectors', 'persons', '') .annTopK(10, p.col('embedding'), p.vec.vector([1.1, 2.2, 3.3]), p.col('distance'), 'onlyIndex') .orderBy(p.col('name')) - ) - .then(function (response) { - verifyResults(response.rows, done); - }) - .catch(error => done(error)); + ); + verifyResults(response.rows); }); - it('annTopK with PlanAnnTopKOptions as an array of string', function (done) { - execPlan(p + it('annTopK with PlanAnnTopKOptions as an array of string', async function () { + const response = await execPlan(p .fromView('vectors', 'persons', '') .annTopK(10, p.col('embedding'), p.vec.vector([1.1, 2.2, 3.3]), p.col('distance'), ['onlyIndex', "maxDistance=0.15", "searchFactor=1.0"]) .orderBy(p.col('name')) - ).then(function (response) { - verifyResults(response.rows, done); - }).catch(error => done(error)); + ); + verifyResults(response.rows); }); - it('annTopK with PlanAnnTopKOptions as a map', function (done) { + it('annTopK with PlanAnnTopKOptions as a map', async function () { const planAnnTopKOptionsMap = new Map(); planAnnTopKOptionsMap.set("maxDistance", 0.158454656600952); planAnnTopKOptionsMap.set("searchFactor", 10.0); - execPlan(p + const response = await execPlan(p .fromView('vectors', 'persons', '') .annTopK(10, p.col('embedding'), p.vec.vector([1.1, 2.2, 3.3]), p.col('distance'), planAnnTopKOptionsMap) .orderBy(p.col('name')) - ) - .then(function (response) { - verifyResults(response.rows, done); - }) - .catch(error => done(error)); + ); + verifyResults(response.rows); }); - it('annTopK with invalid PlanAnnTopKOptions', function (done) { + it('annTopK with invalid PlanAnnTopKOptions', async function () { const planAnnTopKOptionsMap = new Map(); planAnnTopKOptionsMap.set('invalid', 10.0); - try{ - execPlan(p - .fromView('vectors', 'persons', '') - .annTopK(10, p.col('embedding'), p.vec.vector([1.1, 2.2, 3.3]), p.col('distance'), - planAnnTopKOptionsMap) - .orderBy(p.col('name')) - ); - done(new Error('Expecting an error to be thrown due to invalid key in options argument')); - } catch(error){ - assert(error.message.toString().includes('options argument at 4 of PlanModifyPlan.annTopK() has invalid key- invalid')) - done(); - } + + await assert.rejects( + async () => { + await execPlan(p + .fromView('vectors', 'persons', '') + .annTopK(10, p.col('embedding'), p.vec.vector([1.1, 2.2, 3.3]), p.col('distance'), + planAnnTopKOptionsMap) + .orderBy(p.col('name')) + ); + }, + (error) => { + return error.message.toString().includes('options argument at 4 of PlanModifyPlan.annTopK() has invalid key- invalid'); + } + ); }); - function verifyResults(rows, done){ - try { - assert(rows.length === 2, 'Expecting both rows in the view to be returned.'); - assert(rows[0].name.value === 'Alice'); - assert(rows[0].distance.type === 'xs:float', 'Verifying that the distance column was populated.'); - assert(rows[1].name.value === 'Bob'); - assert(rows[1].distance.type === 'xs:float', 'Verifying that the distance column was populated.'); - done(); - } catch (error){ - done(error) - } + function verifyResults(rows) { + + assert(Array.isArray(rows), 'Expected rows to be an array'); + assert(rows.length === 2, 'Expecting both rows in the view to be returned.'); + assert(rows[0].name.value === 'Alice'); + assert(rows[0].distance.type === 'xs:float', 'Verifying that the distance column was populated.'); + assert(rows[1].name.value === 'Bob'); + assert(rows[1].distance.type === 'xs:float', 'Verifying that the distance column was populated.'); + + // Verify each row has the expected structure + rows.forEach((row, index) => { + assert(row.name && row.name.value, `Row ${index} should have a name with a value`); + assert(row.distance && row.distance.type === 'xs:float', + `Row ${index} should have a distance column of type xs:float`); + }); } }); \ No newline at end of file diff --git a/test-basic/cloud_authentication-test.js b/test-basic/cloud_authentication-test.js index 86edbe66..8eb8f75e 100644 --- a/test-basic/cloud_authentication-test.js +++ b/test-basic/cloud_authentication-test.js @@ -36,7 +36,9 @@ describe('cloud-authentication tests', function() { } }); - it('should throw error with invalid apiKey.', function (done) { + // skip for now, support.beta.marklogic.cloud is not working for me. Not sure if this should be in test suite anyway. + it.skip('should throw error with invalid apiKey.', function (done) { + this.timeout(10000); let db = marklogic.createDatabaseClient({ host: 'support.beta.marklogic.cloud', authType: 'cloud', @@ -47,7 +49,6 @@ describe('cloud-authentication tests', function() { try { // Also verified that it throws 'Error: User's API Key is expired.' when API key has expired a few seconds ago. expect(()=>db.documents.write(writeObject).throws(Error('API Key is not valid.'))); - done(); } catch (error) { done(error); } diff --git a/test-basic/docColTypes-test.js b/test-basic/docColTypes-test.js index 70bd4997..4e01ab7b 100644 --- a/test-basic/docColTypes-test.js +++ b/test-basic/docColTypes-test.js @@ -46,6 +46,7 @@ describe('optic-update docColTypes tests', function() { const plan = op.fromParam('bindingParam', null, op.docColTypes(op.col('uri'))); const temp = {bindingParam: rows}; db.rows.query(plan, null, temp); + done(new Error("Expected an error to be thrown due to only 1 argument to fromParam")); } catch (e) { e.toString().includes('Error: PlanBuilder.docColTypes takes a maximum of 0 arguments but received: 1'); done(); diff --git a/test-basic/documents-data-movement-queryAll.js b/test-basic/documents-data-movement-queryAll.js index cfdaf797..02af3de5 100644 --- a/test-basic/documents-data-movement-queryAll.js +++ b/test-basic/documents-data-movement-queryAll.js @@ -49,7 +49,6 @@ describe('data movement queryAll', function() { .result(function(response){ done(); }) - .catch(err=> done(err)) .catch(done); })); @@ -57,6 +56,7 @@ describe('data movement queryAll', function() { try{ const query = q.directory('/test/dataMovement/requests/queryAll/'); dbWriter.documents.queryAll(query); + done(new Error('Expected an error to be thrown because query is not a cts query.')); } catch(err){ err.toString().should.equal('Error: Query needs to be a cts query.'); done(); @@ -94,12 +94,12 @@ describe('data movement queryAll', function() { }); it('queryAll should throw error if no query is provided', function (done){ - try{ dbWriter.documents.queryAll(); + return done(new Error('Expected an error to be thrown because no query was provided')); } catch(err){ err.toString().should.equal('Error: Query cannot be null or undefined.'); - done(); + return done(); } }); @@ -118,14 +118,14 @@ describe('data movement queryAll', function() { }); it('queryAll should throw error with batchSize=100001', function (done){ - try{ dbWriter.documents.queryAll(query, { batchSize:100001 }); + return done(new Error('Expected an error to be thrown because batchSize greater than 100000')); } catch(err){ err.toString().should.equal('Error: batchSize cannot be greater than 100000'); - done(); + return done(); } }); @@ -259,14 +259,14 @@ describe('data movement queryAll', function() { }); it('queryAll should throw error with consistentSnapshot as Integer', function (done){ - try{ dbWriter.documents.queryAll(query, { consistentSnapshot: 1 }); + return done(new Error('Expected an error to be thrown because consistentSnapshot is invalid')); } catch(err){ err.toString().should.equal('Error: consistentSnapshot needs to be a boolean or DatabaseClient.Timestamp object.'); - done(); + return done(); } }); }); diff --git a/test-basic/documents-data-movement-readAll.js b/test-basic/documents-data-movement-readAll.js index 3f819866..e543b769 100644 --- a/test-basic/documents-data-movement-readAll.js +++ b/test-basic/documents-data-movement-readAll.js @@ -12,6 +12,9 @@ const streamToArray = require('stream-to-array'); const fs = require('fs'); const expect = require('chai').expect; +const TOTAL_NUM_DOCS = 10000; +const CATEGORIES_NUM_DOCS = 400; + let uriStream = new Stream.PassThrough({objectMode: true}); let urisList = []; let result = new Set(); @@ -28,7 +31,7 @@ describe('data movement readAll', function() { before(function (done) { this.timeout(120000); let readable = new Stream.Readable({objectMode: true}); - for(let i=0; i<10000; i++) { + for(let i=0; i { readable = new Stream.Readable({objectMode: true}); - for (let i = 0; i < 400; i++) { + for (let i = 0; i < CATEGORIES_NUM_DOCS; i++) { const temp = { uri: '/test/dataMovement/requests/categories/' + i + '.json', contentType: 'application/json', @@ -74,11 +77,10 @@ describe('data movement readAll', function() { }); }); - beforeEach(function(done){ + beforeEach(function(){ uriStream = new Stream.PassThrough({objectMode: true}); urisList.forEach(uri => uriStream.push(uri)); uriStream.push(null); - done(); }); after((function(done){ @@ -86,15 +88,13 @@ describe('data movement readAll', function() { categoriesUrisList.forEach(uri=>urisList.push(uri)); dbWriter.documents.remove(urisList) .result(function(){ - restAdminDB.config.transforms.remove(xqyTransformName); - done(); + restAdminDB.config.transforms.remove(xqyTransformName) + .result(() => done(), (err) => done(err)); }) - .catch(err=> done(err)) .catch(done); })); it('should readAll documents with empty options', function(done){ - streamToArray(dbWriter.documents.readAll(uriStream), function(err, arr ) { if(err){ @@ -102,11 +102,11 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should readAll documents with onCompletion option', function(done){ - streamToArray(dbWriter.documents.readAll(uriStream,{ onCompletion: ((summary) => summaryValue = summary) }), @@ -116,12 +116,14 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkSummary(summaryValue, done); - }); + }) + .catch(done); }); it('should throw error with invalid inputKind option', function(done){ try{ dbWriter.documents.readAll(uriStream,{inputKind:10}); + done(new Error('Expected an error to be thrown due to invalid inputKind option')); } catch(err){ err.toString().should.equal('Error: Invalid value for inputKind. Value must be array or string.'); done(); @@ -138,7 +140,8 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should readAll documents with inputKind option as array', function(done){ @@ -157,12 +160,14 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should throw error with invalid outputStreamType option', function(done){ try{ dbWriter.documents.readAll(uriStream,{outputStreamType:10}); + done(new Error('Expected an error to be thrown due to invalid outputStreamType option')); } catch(err){ err.toString().should.equal('Error: Invalid value for outputStreamType. Value must be chunked or object.'); done(); @@ -175,6 +180,7 @@ describe('data movement readAll', function() { outputStreamType: 'chunked', categories: [] }); + done(new Error('Expected an error to be thrown due to invalid categories and outputStreamType as chunked')); } catch(err){ err.toString().should.equal('Error: categories not expected when outputStreamType is chunked.'); done(); @@ -191,7 +197,8 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should readAll documents with outputStreamType option as chunked', function(done){ @@ -204,15 +211,17 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.toString())); - result.size.should.equal(10000); + result.size.should.equal(TOTAL_NUM_DOCS); result.clear(); done(); - }); + }) + .catch(done); }); it('should throw error with invalid batchSize option', function(done){ try{ dbWriter.documents.readAll(uriStream,{batchSize:-1}); + done(new Error('Expected an error to be thrown due to invalid batchSize')); } catch(err){ err.toString().should.equal('Error: Invalid batchSize. batchSize cannot be less than or equal to 0.'); done(); @@ -229,12 +238,14 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should throw error with invalid batchSize and inputKind as array option', function(done){ try{ dbWriter.documents.readAll(uriStream,{batchSize:10, inputKind:'array'}); + done(new Error('Expected an error to be thrown due to invalid batchSize and inputKind as array')); } catch(err){ err.toString().should.equal('Error: batchSize not expected when inputKind is array.'); done(); @@ -244,6 +255,7 @@ describe('data movement readAll', function() { it('should throw error with invalid concurrentRequests option', function(done){ try{ dbWriter.documents.readAll(uriStream,{concurrentRequests: {multipleOf: 'invalid', multiplier: 4}}); + done(new Error('Expected an error to be thrown due to invalid concurrentRequests option')); } catch(err){ err.toString().should.equal('Error: Invalid value for multipleOf. Value must be forests or hosts.'); done(); @@ -260,7 +272,8 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should readAll documents with categories option', function(done){ @@ -277,7 +290,8 @@ describe('data movement readAll', function() { } arr.forEach(item => result.add(item)); checkCategoriesResult(result, done); - }); + }) + .catch(done); }); it('should readAll documents with transform option', function(done){ @@ -294,9 +308,10 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item)); checkTransformResult(done); - }); + }) + .catch(done); }) - .catch(err=> done(err)); + .catch(done); }); it('should throw error with invalid onBatchError option', function(done){ @@ -317,13 +332,13 @@ describe('data movement readAll', function() { done(); }); }) - .catch(err=> done(err)); + .catch(done); }); it('should readAll documents with onBatchError option returning null', function(done){ restAdminDB.config.transforms.write(xqyTransformName, 'xquery', fs.createReadStream(xqyTransformPath)) .result(function(response){ - dbWriter.documents.readAll(uriStream,{ + const readStream = dbWriter.documents.readAll(uriStream,{ batchSize:1000, transform: ['tested1'], onBatchError: ((progressSoFar, documents, error) => { @@ -334,14 +349,22 @@ describe('data movement readAll', function() { return null; }), onCompletion: ((summary) => { - summary.docsReadSuccessfully.should.be.equal(0); - summary.docsFailedToBeRead.should.be.equal(10000); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - done(); + try { + summary.docsReadSuccessfully.should.be.equal(0); + summary.docsFailedToBeRead.should.be.equal(TOTAL_NUM_DOCS); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + done(); + } catch (error) { + done(error); + } }) }); + + readStream.on('error', function(err){ + done(err); + }); }) - .catch(err=> done(err)); + .catch(done); }); it('should readAll documents with onBatchError option returning replacement batch', function(done){ @@ -371,30 +394,42 @@ describe('data movement readAll', function() { it('should readAll documents with consistentSnapshot option as true', function(done){ this.timeout(15000); - dbWriter.documents.readAll(uriStream,{ + const readStream = dbWriter.documents.readAll(uriStream,{ consistentSnapshot:true, onCompletion: ((summary) => { - summary.docsReadSuccessfully.should.be.equal(10000); - summary.docsFailedToBeRead.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - summary.consistentSnapshotTimestamp.should.be.greaterThanOrEqual(0); - done(); + try { + summary.docsReadSuccessfully.should.be.equal(TOTAL_NUM_DOCS); + summary.docsFailedToBeRead.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + summary.consistentSnapshotTimestamp.should.be.greaterThanOrEqual(0); + done(); + } catch (error) { + done(error); + } }) }); + + readStream.on('error', function(err){ + done(err); + }); }); it('should readAll documents with consistentSnapshot option as DatabaseClient.Timestamp object', function(done){ this.timeout(120000); - dbWriter.documents.readAll(uriStream,{ + const readStream = dbWriter.documents.readAll(uriStream,{ consistentSnapshot:dbWriter.createTimestamp((Date.now()*10000).toString()), onCompletion: ((summary) => { - summary.docsReadSuccessfully.should.be.equal(10000); + summary.docsReadSuccessfully.should.be.equal(TOTAL_NUM_DOCS); summary.docsFailedToBeRead.should.be.equal(0); summary.timeElapsed.should.be.greaterThanOrEqual(0); summary.consistentSnapshotTimestamp.should.be.greaterThanOrEqual(0); done(); }) }); + + readStream.on('error', function(err){ + done(err); + }); }); it('should readAll documents with consistentSnapshot option as false', function(done){ @@ -402,7 +437,7 @@ describe('data movement readAll', function() { dbWriter.documents.readAll(uriStream,{ consistentSnapshot:false, onCompletion: ((summary) => { - summary.docsReadSuccessfully.should.be.equal(10000); + summary.docsReadSuccessfully.should.be.equal(TOTAL_NUM_DOCS); summary.docsFailedToBeRead.should.be.equal(0); summary.timeElapsed.should.be.greaterThanOrEqual(0); expect(summary.consistentSnapshotTimestamp).to.be.undefined; @@ -433,7 +468,8 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should queryToReadAll documents with onCompletion option', function(done){ @@ -442,7 +478,7 @@ describe('data movement readAll', function() { const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/readAll/')); streamToArray(dbWriter.documents.queryToReadAll(query,{ onCompletion:((summary) => { - summary.docsReadSuccessfully.should.be.equal(10000); + summary.docsReadSuccessfully.should.be.equal(TOTAL_NUM_DOCS); summary.docsFailedToBeRead.should.be.equal(0); summary.timeElapsed.should.be.greaterThanOrEqual(0); }) @@ -453,7 +489,8 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should queryToReadAll documents with onCompletion, consistentSnapshot and onInitialTimestamp options', function(done){ @@ -471,7 +508,7 @@ describe('data movement readAll', function() { onInitialTimestampValue = new Date(timestampValue); }), onCompletion:((summary) => { - summary.docsReadSuccessfully.should.be.equal(10000); + summary.docsReadSuccessfully.should.be.equal(TOTAL_NUM_DOCS); summary.docsFailedToBeRead.should.be.equal(0); summary.timeElapsed.should.be.greaterThanOrEqual(0); summary.consistentSnapshotTimestamp.toString().should.equal(onInitialTimestampValue.toString()); @@ -483,7 +520,8 @@ describe('data movement readAll', function() { } arr.forEach(item=> result.add(item.uri)); checkResult(done); - }); + }) + .catch(done); }); it('should throw error with categories options rawContent and permissions', function(done){ @@ -520,34 +558,42 @@ describe('data movement readAll', function() { }); docCount.should.be.equal(categoriesUrisList.length); done(); - }); + }) + .catch(done); }); it('should return empty with cts wordQuery when no documents are found', function(done) { const ctsqb = marklogic.ctsQueryBuilder; const q = marklogic.queryBuilder; const query = q.where(ctsqb.cts.wordQuery('zero')); - var res = ''; - var chk = ''; + let summaryResult = null; + let receivedData = false; const queryToReadAllStream = dbWriter.documents.queryToReadAll(query,{ onCompletion:((summary) => { - res = summary; + // should never get here since no documents are to be read + summaryResult = summary; }) }); - queryToReadAllStream.on('error', function (err) { throw new Error(err);}); + queryToReadAllStream.on('error', function (err) { + done(err); + }); queryToReadAllStream.on('data', function(chunk){ - chk = chunk; + receivedData = true; }); - queryToReadAllStream.on('end', function(end){ - expect(res).to.be.empty; - expect(chk).to.be.empty; - done(); + queryToReadAllStream.on('end', function() { + try { + expect(summaryResult).to.be.null; + expect(receivedData).to.be.false; + done(); + } catch (error) { + done(error); + } }); }); }); function checkResult(done){ - result.size.should.equal(10000); + result.size.should.equal(TOTAL_NUM_DOCS); for(let i=0; i { item.content.flagParam.should.be.equal('tested1'); }); From f735dd27447c59ce4c0e69f42222b8780281d69d Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 15 Oct 2025 12:00:16 -0400 Subject: [PATCH 25/58] MLE-24230 Updating whitespace in NOTICE When I saved this file in VS Code, I think the .editorconfig kicked in and made significant whitespace modifications. So making this commit first so I can then make real changes to this file and have them be easily understood. --- NOTICE.txt | 680 ++++++++++++++++++++++++++--------------------------- 1 file changed, 340 insertions(+), 340 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 855997da..68a87759 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,340 +1,340 @@ -MarkLogic® Node Client API - -Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. - -This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by Progress Software Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com. Please specify the product and version for which you are requesting source code. - -The following software may be included in this project (last updated January 28, 2025): - -------------------------------------------------------------------------- -MarkLogic® Node Client API -Third-Party Notices - -This document provides notices information for the third-party components used by MarkLogic® Node Client API. - -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) - multipart-stream 2.0.1 (MIT) - qs 6.14.0 (BSD-3-Clause) - through2 4.0.2 (MIT) - vinyl 3.0.0 (MIT) - www-authenticate 0.6.3 (MIT) - -Common Licenses - Apache License 2.0 (Apache-2.0) - -************************************************************ -Third-Party Components -************************************************************ - - The following is a list of the third-party components used by MarkLogic® Node Client API. - -@fastify/busboy 1.2.1 (MIT) - -https://www.npmjs.com/package/@fastify/busboy - -Copyright Brian White. All rights reserved. - -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. - -************************************************************ - -big-integer 1.6.52 (Public Domain) - -https://www.npmjs.com/package/big-integer - -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. - -In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law. - -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 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. - -For more information, please refer to - -************************************************************ - -concat-stream 2.0.0 (MIT) - -https://www.npmjs.com/package/concat-stream - -The MIT License - -Copyright (c) 2013 Max Ogden - -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. - -************************************************************ - -deepcopy 2.1.0 (MIT) - -https://www.npmjs.com/package/deepcopy - -The MIT LICENSE) - -Copyright (c) 2013 sasa+1 - -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 - -The MIT License (MIT) - -Copyright (c) 2014 Mathias Buus - -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. - -************************************************************ - -eslint 8.57.1 (MIT) - -Copyright OpenJS Foundation and other contributors, - -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 - -Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors - -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. - -************************************************************ - -json-text-sequence 1.0.1 (MIT) - -https://www.npmjs.com/package/json-text-sequence - -The MIT License (MIT) - -Copyright (c) 2014 Joe Hildebrand - -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. - -************************************************************ - -Kerberos 2.2.1 (Apache-2.0) - -https://www.npmjs.com/package/kerberos - -For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) - -************************************************************ - -multipart-stream 2.0.1 (MIT) - -https://www.npmjs.com/package/multipart-stream - -The MIT License (MIT) - -Copyright (c) 2014 Hendrik Cech - -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. - -************************************************************ - -qs 6.14.0 (BSD-3-Clause) - -https://www.npmjs.com/package/qs - -BSD 3-Clause License - -Copyright (c) 2014, Nathan LaFreniere and other contributors All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -************************************************************ - -through2 4.0.2 (MIT) - -https://www.npmjs.com/package/through2 - -The MIT License (MIT) - -Copyright (c) Rod Vagg (the "Original Author") and additional contributors - -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. - -************************************************************ - -Vinyl 3.0.0 (MIT) - -https://www.npmjs.com/package/vinyl - - -The MIT License (MIT) - -Copyright (c) 2013, 2016-2022 Blaine Bublitz and Eric Schoffstall - -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. - -************************************************************ - -www-authenticate 0.6.3 (MIT) - -https://www.npmjs.com/package/www-authenticate - -Copyright (c) 2013 Randy McLaughlin - -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. - -************************************************************ - -This section shows the text of common third-party licenses used by MarkLogic® Node Client API: - -Apache License 2.0 (Apache-2.0) -https://spdx.org/licenses/Apache-2.0.html - -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - - (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - - You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - -==================== - +MarkLogic® Node Client API + +Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. + +This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by Progress Software Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com. Please specify the product and version for which you are requesting source code. + +The following software may be included in this project (last updated TBD January 28, 2025): + +------------------------------------------------------------------------- +MarkLogic® Node Client API +Third-Party Notices + +This document provides notices information for the third-party components used by MarkLogic® Node Client API. + +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) + multipart-stream 2.0.1 (MIT) + qs 6.14.0 (BSD-3-Clause) + through2 4.0.2 (MIT) + vinyl 3.0.0 (MIT) + www-authenticate 0.6.3 (MIT) + +Common Licenses + Apache License 2.0 (Apache-2.0) + +************************************************************ +Third-Party Components +************************************************************ + + The following is a list of the third-party components used by MarkLogic® Node Client API. + +@fastify/busboy 1.2.1 (MIT) + +https://www.npmjs.com/package/@fastify/busboy + +Copyright Brian White. All rights reserved. + +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. + +************************************************************ + +big-integer 1.6.52 (Public Domain) + +https://www.npmjs.com/package/big-integer + +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law. + +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 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. + +For more information, please refer to + +************************************************************ + +concat-stream 2.0.0 (MIT) + +https://www.npmjs.com/package/concat-stream + +The MIT License + +Copyright (c) 2013 Max Ogden + +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. + +************************************************************ + +deepcopy 2.1.0 (MIT) + +https://www.npmjs.com/package/deepcopy + +The MIT LICENSE) + +Copyright (c) 2013 sasa+1 + +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 + +The MIT License (MIT) + +Copyright (c) 2014 Mathias Buus + +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. + +************************************************************ + +eslint 8.57.1 (MIT) + +Copyright OpenJS Foundation and other contributors, + +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 + +Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors + +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. + +************************************************************ + +json-text-sequence 1.0.1 (MIT) + +https://www.npmjs.com/package/json-text-sequence + +The MIT License (MIT) + +Copyright (c) 2014 Joe Hildebrand + +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. + +************************************************************ + +Kerberos 2.2.1 (Apache-2.0) + +https://www.npmjs.com/package/kerberos + +For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +************************************************************ + +multipart-stream 2.0.1 (MIT) + +https://www.npmjs.com/package/multipart-stream + +The MIT License (MIT) + +Copyright (c) 2014 Hendrik Cech + +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. + +************************************************************ + +qs 6.14.0 (BSD-3-Clause) + +https://www.npmjs.com/package/qs + +BSD 3-Clause License + +Copyright (c) 2014, Nathan LaFreniere and other contributors All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +************************************************************ + +through2 4.0.2 (MIT) + +https://www.npmjs.com/package/through2 + +The MIT License (MIT) + +Copyright (c) Rod Vagg (the "Original Author") and additional contributors + +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. + +************************************************************ + +Vinyl 3.0.0 (MIT) + +https://www.npmjs.com/package/vinyl + + +The MIT License (MIT) + +Copyright (c) 2013, 2016-2022 Blaine Bublitz and Eric Schoffstall + +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. + +************************************************************ + +www-authenticate 0.6.3 (MIT) + +https://www.npmjs.com/package/www-authenticate + +Copyright (c) 2013 Randy McLaughlin + +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. + +************************************************************ + +This section shows the text of common third-party licenses used by MarkLogic® Node Client API: + +Apache License 2.0 (Apache-2.0) +https://spdx.org/licenses/Apache-2.0.html + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +==================== + From 980d0de3441f3ddf27c483596f8757f68b2eef69 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 15 Oct 2025 10:47:42 -0400 Subject: [PATCH 26/58] MLE-24230 First batch of package updates - Removed deepcopy, using native Node structuredClone. - Moved eslint to devDependencies (which removes 50+ dependencies total from the real dependency graph!). - Upgraded busboy and documented why we're using it instead of dicer (going to use CONTRIBUTING for providing any explanations for things in package.json). - Removing usage of caret in package.json to avoid accidentally picking up malicious upgrades. --- CONTRIBUTING.md | 8 ++- Jenkinsfile | 3 +- NOTICE.txt | 32 +-------- lib/query-builder.js | 5 +- lib/values-builder.js | 5 +- package-lock.json | 153 +++++++++++++++++++++++++++++++++--------- package.json | 13 ++-- 7 files changed, 142 insertions(+), 77 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d42e706d..d41b007e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. \ No newline at end of file +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. + diff --git a/Jenkinsfile b/Jenkinsfile index 913a89d2..a42df711 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 { diff --git a/NOTICE.txt b/NOTICE.txt index 68a87759..9468467e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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. @@ -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) @@ -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 - -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 @@ -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, - -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 diff --git a/lib/query-builder.js b/lib/query-builder.js index 9f2e7149..b5879a0c 100644 --- a/lib/query-builder.js +++ b/lib/query-builder.js @@ -3,7 +3,6 @@ */ 'use strict'; var util = require("util"); -var deepcopy = require('deepcopy'); var mlutil = require('./mlutil.js'); @@ -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); } } } diff --git a/lib/values-builder.js b/lib/values-builder.js index b9df7a91..b3b4d890 100644 --- a/lib/values-builder.js +++ b/lib/values-builder.js @@ -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'); @@ -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); } } } diff --git a/package-lock.json b/package-lock.json index fbf8afc7..07e3eea3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,12 +10,10 @@ "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { - "@fastify/busboy": "^1.1.0", - "big-integer": "^1.6.51", - "concat-stream": "^2.0.0", - "deepcopy": "^2.1.0", - "duplexify": "^4.1.2", - "eslint": "^8.57.0", + "@fastify/busboy": "3.2.0", + "big-integer": "1.6.52", + "concat-stream": "2.0.0", + "duplexify": "4.1.3", "form-data": "^4.0.4", "json-text-sequence": "^1.0.1", "multipart-stream": "^2.0.1", @@ -30,6 +28,7 @@ "bunyan": "^1.8.15", "chai": "^4.4.1", "core-util-is": "^1.0.3", + "eslint": "^8.57.0", "gulp": "^5.0.0", "gulp-jsdoc3": "^3.0.0", "gulp-jshint": "^2.1.0", @@ -129,6 +128,7 @@ "version": "4.9.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", + "dev": true, "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" @@ -147,6 +147,7 @@ "version": "4.12.1", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -156,6 +157,7 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, "license": "MIT", "dependencies": { "ajv": "^6.12.4", @@ -179,6 +181,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -195,28 +198,24 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, "license": "MIT" }, "node_modules/@eslint/js": { "version": "8.57.1", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, "license": "MIT", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@fastify/busboy": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz", - "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==", - "license": "MIT", - "dependencies": { - "text-decoding": "^1.0.0" - }, - "engines": { - "node": ">=14" - } + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.2.0.tgz", + "integrity": "sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==", + "license": "MIT" }, "node_modules/@gulpjs/messages": { "version": "1.1.0", @@ -246,6 +245,7 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", + "dev": true, "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^2.0.3", @@ -260,6 +260,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, "license": "Apache-2.0", "engines": { "node": ">=12.22" @@ -274,12 +275,14 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", "deprecated": "Use @eslint/object-schema instead", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, "license": "ISC", "dependencies": { "string-width": "^5.1.2", @@ -297,12 +300,14 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", @@ -333,6 +338,7 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", @@ -346,6 +352,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, "license": "MIT", "engines": { "node": ">= 8" @@ -355,6 +362,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", @@ -368,6 +376,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, "license": "MIT", "optional": true, "engines": { @@ -437,12 +446,14 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, "license": "ISC" }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -455,6 +466,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" @@ -530,6 +542,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -539,6 +552,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -585,6 +599,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, "license": "Python-2.0" }, "node_modules/arr-diff": { @@ -769,6 +784,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, "license": "MIT" }, "node_modules/bare-events": { @@ -857,6 +873,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -965,6 +982,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -1019,6 +1037,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -1140,6 +1159,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.0.tgz", "integrity": "sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA==", + "dev": true, "license": "MIT", "dependencies": { "color-name": "^2.0.0" @@ -1152,6 +1172,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz", "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==", + "dev": true, "license": "MIT", "engines": { "node": ">=12.20" @@ -1248,6 +1269,7 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -1288,6 +1310,7 @@ "version": "4.3.6", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, "license": "MIT", "dependencies": { "ms": "2.1.2" @@ -1357,17 +1380,9 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, "license": "MIT" }, - "node_modules/deepcopy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz", - "integrity": "sha512-8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ==", - "license": "MIT", - "dependencies": { - "type-detect": "^4.0.8" - } - }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", @@ -1421,6 +1436,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" @@ -1548,12 +1564,14 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, "license": "MIT" }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, "license": "MIT" }, "node_modules/enabled": { @@ -1638,6 +1656,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -1651,6 +1670,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", @@ -1706,6 +1726,7 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -1722,6 +1743,7 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1734,6 +1756,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -1750,12 +1773,14 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, "license": "MIT" }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", @@ -1773,6 +1798,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" @@ -1785,6 +1811,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" @@ -1797,6 +1824,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -1806,6 +1834,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" @@ -1917,6 +1946,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, "license": "MIT" }, "node_modules/fast-fifo": { @@ -1930,12 +1960,14 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, "license": "MIT" }, "node_modules/fast-uri": { @@ -1969,6 +2001,7 @@ "version": "1.19.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, "license": "ISC", "dependencies": { "reusify": "^1.0.4" @@ -1985,6 +2018,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" @@ -2010,6 +2044,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, "license": "MIT", "dependencies": { "locate-path": "^6.0.0", @@ -2079,6 +2114,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, "license": "MIT", "dependencies": { "flatted": "^3.2.9", @@ -2093,6 +2129,7 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, "license": "ISC" }, "node_modules/fn.name": { @@ -2129,6 +2166,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "dev": true, "license": "ISC", "dependencies": { "cross-spawn": "^7.0.6", @@ -2145,6 +2183,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, "license": "ISC", "engines": { "node": ">=14" @@ -2295,6 +2334,7 @@ "version": "10.3.11", "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.11.tgz", "integrity": "sha512-0UAMm+R/z1E2bTR8eFnoIIlnrUK89m36i90Ez36ld9hLulfUPBgRCQtBy/v86ABx18jnGyrTvu4X3LAjIeBogw==", + "dev": true, "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", @@ -2317,6 +2357,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.3" @@ -2408,6 +2449,7 @@ "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, "license": "MIT", "dependencies": { "type-fest": "^0.20.2" @@ -2455,6 +2497,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, "license": "MIT" }, "node_modules/growl": { @@ -2853,6 +2896,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3009,6 +3053,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, "license": "MIT", "engines": { "node": ">= 4" @@ -3018,6 +3063,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, "license": "MIT", "dependencies": { "parent-module": "^1.0.0", @@ -3034,6 +3080,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.8.19" @@ -3163,6 +3210,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -3172,6 +3220,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3181,6 +3230,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -3213,6 +3263,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3321,6 +3372,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, "license": "ISC" }, "node_modules/isobject": { @@ -3337,6 +3389,7 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -3355,6 +3408,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -3449,6 +3503,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, "license": "MIT" }, "node_modules/json-schema-traverse": { @@ -3462,6 +3517,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, "license": "MIT" }, "node_modules/json-text-sequence": { @@ -3495,6 +3551,7 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, "license": "MIT", "dependencies": { "json-buffer": "3.0.1" @@ -3551,6 +3608,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", @@ -3593,6 +3651,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, "license": "MIT", "dependencies": { "p-locate": "^5.0.0" @@ -3683,6 +3742,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, "license": "MIT" }, "node_modules/lodash.toarray": { @@ -3746,6 +3806,7 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, "license": "ISC" }, "node_modules/map-cache": { @@ -3917,6 +3978,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" @@ -3939,6 +4001,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -4102,6 +4165,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, "license": "MIT" }, "node_modules/multipart-stream": { @@ -4224,6 +4288,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, "license": "MIT" }, "node_modules/ncp": { @@ -4373,6 +4438,7 @@ "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, "license": "MIT", "dependencies": { "deep-is": "^0.1.3", @@ -4390,6 +4456,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" @@ -4405,6 +4472,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, "license": "MIT", "dependencies": { "p-limit": "^3.0.2" @@ -4420,6 +4488,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, "license": "MIT", "dependencies": { "callsites": "^3.0.0" @@ -4474,6 +4543,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4483,6 +4553,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4522,6 +4593,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", @@ -4641,6 +4713,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8.0" @@ -4668,6 +4741,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -4702,6 +4776,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, "funding": [ { "type": "github", @@ -4933,6 +5008,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -4955,6 +5031,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, "license": "MIT", "engines": { "iojs": ">=1.0.0", @@ -4966,6 +5043,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, "license": "ISC", "dependencies": { "glob": "^7.1.3" @@ -4981,6 +5059,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, "funding": [ { "type": "github", @@ -5216,6 +5295,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" @@ -5228,6 +5308,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5507,6 +5588,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -5522,6 +5604,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -5536,6 +5619,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.0" @@ -5549,6 +5633,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -5571,6 +5656,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5583,6 +5669,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5664,12 +5751,6 @@ "b4a": "^1.6.4" } }, - "node_modules/text-decoding": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz", - "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==", - "license": "MIT" - }, "node_modules/text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", @@ -5681,6 +5762,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, "license": "MIT" }, "node_modules/through2": { @@ -5772,6 +5854,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" @@ -5784,6 +5867,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -5793,6 +5877,7 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" @@ -5871,6 +5956,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" @@ -6017,6 +6103,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -6104,6 +6191,7 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -6120,6 +6208,7 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -6135,6 +6224,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -6254,6 +6344,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=10" diff --git a/package.json b/package.json index 91a5a469..77887dc7 100644 --- a/package.json +++ b/package.json @@ -28,12 +28,10 @@ "xpath" ], "dependencies": { - "@fastify/busboy": "^1.1.0", - "big-integer": "^1.6.51", - "concat-stream": "^2.0.0", - "deepcopy": "^2.1.0", - "duplexify": "^4.1.2", - "eslint": "^8.57.0", + "@fastify/busboy": "3.2.0", + "big-integer": "1.6.52", + "concat-stream": "2.0.0", + "duplexify": "4.1.3", "form-data": "^4.0.4", "json-text-sequence": "^1.0.1", "multipart-stream": "^2.0.1", @@ -55,6 +53,7 @@ "bunyan": "^1.8.15", "chai": "^4.4.1", "core-util-is": "^1.0.3", + "eslint": "^8.57.0", "gulp": "^5.0.0", "gulp-jsdoc3": "^3.0.0", "gulp-jshint": "^2.1.0", @@ -84,7 +83,7 @@ "color-convert": "3.1.0", "color-name": "2.0.0", "color-string": "2.1.0", - "cross-spawn":"7.0.6", + "cross-spawn": "7.0.6", "debug": "4.3.6", "is-arrayish": "0.3.2", "jsdoc": "4.0.0", From 7aeb0ac18ca143b9abfa77e77cc8b3d151622bc1 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 15 Oct 2025 11:34:24 -0400 Subject: [PATCH 27/58] MLE-24230 Second batch of package updates - Bumped json-text-sequence to latest version (1.0.1 to 4.0.2) - Bumped qs from 6.11 to 6.14 - Removed carets to request explicit versions And had Copilot clean up the "overrides" section. Most of these look like they originate from devDependencies - though a lot of them may have been from eslint, which was mistakenly party of dependencies. Will see what Black Duck thinks, but npm is reporting zero vulnerabilities. --- lib/responder.js | 2 +- package-lock.json | 564 ++++++++++++++++++++++++++++++++++------------ package.json | 36 +-- 3 files changed, 426 insertions(+), 176 deletions(-) diff --git a/lib/responder.js b/lib/responder.js index 42fe7bd7..a673e397 100644 --- a/lib/responder.js +++ b/lib/responder.js @@ -3,7 +3,7 @@ */ 'use strict'; var concatStream = require('concat-stream'); -var jsonParser = require('json-text-sequence').parser; +var jsonParser = require('json-text-sequence').Parser; var Dicer = require('@fastify/busboy/deps/dicer/lib/Dicer'); var through2 = require('through2'); var mlutil = require('./mlutil.js'); diff --git a/package-lock.json b/package-lock.json index 07e3eea3..c631f646 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,11 +14,11 @@ "big-integer": "1.6.52", "concat-stream": "2.0.0", "duplexify": "4.1.3", - "form-data": "^4.0.4", - "json-text-sequence": "^1.0.1", - "multipart-stream": "^2.0.1", - "qs": "^6.11.0", - "through2": "^4.0.2" + "form-data": "4.0.4", + "json-text-sequence": "4.0.2", + "multipart-stream": "2.0.1", + "qs": "6.14.0", + "through2": "4.0.2" }, "devDependencies": { "@jsdoc/salty": "0.2.3", @@ -296,6 +296,32 @@ "node": ">=12" } }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -321,6 +347,40 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@jsdoc/salty": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz", @@ -788,11 +848,19 @@ "license": "MIT" }, "node_modules/bare-events": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.7.0.tgz", - "integrity": "sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.0.tgz", + "integrity": "sha512-AOhh6Bg5QmFIXdViHbMc2tLDsBIRxdkIaIddPslJF9Z5De3APBScuqGP2uThXnIpqFrgoxMNC6km7uXNIMLHXA==", "devOptional": true, - "license": "Apache-2.0" + "license": "Apache-2.0", + "peerDependencies": { + "bare-abort-controller": "*" + }, + "peerDependenciesMeta": { + "bare-abort-controller": { + "optional": true + } + } }, "node_modules/base64-js": { "version": "1.5.1", @@ -1098,6 +1166,19 @@ "fsevents": "~2.3.2" } }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -1142,9 +1223,9 @@ } }, "node_modules/color": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz", - "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/color/-/color-5.0.2.tgz", + "integrity": "sha512-e2hz5BzbUPcYlIRHo8ieAhYgoajrJr+hWoceg6E345TPsATMUKqDgzt8fSXZJJbxfpiPzkWyphz8yn8At7q3fA==", "dev": true, "license": "MIT", "dependencies": { @@ -1156,32 +1237,29 @@ } }, "node_modules/color-convert": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.0.tgz", - "integrity": "sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "license": "MIT", "dependencies": { - "color-name": "^2.0.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=14.6" + "node": ">=7.0.0" } }, "node_modules/color-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz", - "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.20" - } + "license": "MIT" }, "node_modules/color-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.0.tgz", - "integrity": "sha512-gNVoDzpaSwvftp6Y8nqk97FtZoXP9Yj7KGYB8yIXuv0JcfqbYihTrd1OU5iZW9btfXde4YAOCRySBHT7O910MA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.2.tgz", + "integrity": "sha512-RxmjYxbWemV9gKu4zPgiZagUxbH3RQpEIO77XoSSX0ivgABDZ+h8Zuash/EMFLTI4N9QgFPOJ6JQpPZKFxa+dA==", "dev": true, "license": "MIT", "dependencies": { @@ -1191,6 +1269,16 @@ "node": ">=18" } }, + "node_modules/color-string/node_modules/color-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.2.tgz", + "integrity": "sha512-9vEt7gE16EW7Eu7pvZnR0abW9z6ufzhXxGXZEVU9IqPdlsUiMwJeJfRtq0zePUmnbHGT9zajca7mX8zgoayo4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.20" + } + }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -1201,6 +1289,29 @@ "color-support": "bin.js" } }, + "node_modules/color/node_modules/color-convert": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.2.tgz", + "integrity": "sha512-UNqkvCDXstVck3kdowtOTWROIJQwafjOfXSmddoDrXo4cewMKmusCeF22Q24zvjR8nwWib/3S/dfyzPItPEiJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "^2.0.0" + }, + "engines": { + "node": ">=14.6" + } + }, + "node_modules/color/node_modules/color-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.2.tgz", + "integrity": "sha512-9vEt7gE16EW7Eu7pvZnR0abW9z6ufzhXxGXZEVU9IqPdlsUiMwJeJfRtq0zePUmnbHGT9zajca7mX8zgoayo4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.20" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -1307,13 +1418,13 @@ "dev": true }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -1413,9 +1524,9 @@ } }, "node_modules/detect-libc": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.1.tgz", - "integrity": "sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "license": "Apache-2.0", "optional": true, "engines": { @@ -2229,6 +2340,13 @@ "node": ">=10.13.0" } }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2331,23 +2449,22 @@ "optional": true }, "node_modules/glob": { - "version": "10.3.11", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.11.tgz", - "integrity": "sha512-0UAMm+R/z1E2bTR8eFnoIIlnrUK89m36i90Ez36ld9hLulfUPBgRCQtBy/v86ABx18jnGyrTvu4X3LAjIeBogw==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "license": "ISC", "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.10.2" - }, - "bin": { - "glob": "dist/esm/bin.mjs" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "*" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -2718,6 +2835,31 @@ "fsevents": "~2.3.1" } }, + "node_modules/gulp-mocha/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/gulp-mocha/node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, "node_modules/gulp-mocha/node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -2742,6 +2884,41 @@ "node": ">=0.10.0" } }, + "node_modules/gulp-mocha/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/gulp-mocha/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/gulp-mocha/node_modules/js-yaml": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", @@ -2813,13 +2990,6 @@ "url": "https://opencollective.com/mochajs" } }, - "node_modules/gulp-mocha/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, "node_modules/gulp-mocha/node_modules/plugin-error": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", @@ -2862,6 +3032,32 @@ "node": ">=8.10.0" } }, + "node_modules/gulp-mocha/node_modules/serialize-javascript": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/gulp-mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/gulp-mocha/node_modules/workerpool": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", @@ -3086,6 +3282,18 @@ "node": ">=0.8.19" } }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -3386,17 +3594,14 @@ } }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, - "engines": { - "node": ">=14" - }, "funding": { "url": "https://github.com/sponsors/isaacs" }, @@ -3521,15 +3726,15 @@ "license": "MIT" }, "node_modules/json-text-sequence": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-text-sequence/-/json-text-sequence-1.0.1.tgz", - "integrity": "sha512-AYvyAj02ukg85KiFMLphUMFWcNDCSwmNNuoqmpHUyBr/MJOB0c3rQrsJgzM2ELv25yozY9s9NrORuqdP1vNLXQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/json-text-sequence/-/json-text-sequence-4.0.2.tgz", + "integrity": "sha512-rpmhNYEvL5LEAK0QNhgs+mOCyIh5tfiEQC59Wf3huR4wXcmJHBnSEc6pWqNPR/cjHoSgDhTEfbHqAh7gqaNbiw==", "license": "MIT", "dependencies": { "@sovpro/delimited-stream": "^1.1.0" }, "engines": { - "node": ">=12.20.0" + "node": ">=20" } }, "node_modules/kerberos": { @@ -3638,13 +3843,13 @@ } }, "node_modules/linkify-it": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", + "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", "dev": true, "license": "MIT", "dependencies": { - "uc.micro": "^2.0.0" + "uc.micro": "^1.0.1" } }, "node_modules/locate-path": { @@ -3827,21 +4032,20 @@ "license": "MIT" }, "node_modules/markdown-it": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", - "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", + "version": "12.3.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", + "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "entities": "^4.4.0", - "linkify-it": "^5.0.0", - "mdurl": "^2.0.0", - "punycode.js": "^2.3.1", - "uc.micro": "^2.1.0" + "entities": "~2.1.0", + "linkify-it": "^3.0.1", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" }, "bin": { - "markdown-it": "bin/markdown-it.mjs" + "markdown-it": "bin/markdown-it.js" } }, "node_modules/markdown-it-anchor": { @@ -3856,14 +4060,11 @@ } }, "node_modules/markdown-it/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", "dev": true, "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -3903,9 +4104,9 @@ } }, "node_modules/mdurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", "dev": true, "license": "MIT" }, @@ -4028,9 +4229,9 @@ "optional": true }, "node_modules/mocha": { - "version": "11.7.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.3.tgz", - "integrity": "sha512-iorDKDzBKgVk/npVkW2S+b57ekA9+xKWijVvNpgPMl1odxeB4HavgiydLN54Lhyn/jpcM+Z/BohCzIvHmfaPCw==", + "version": "11.7.4", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.4.tgz", + "integrity": "sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w==", "dev": true, "license": "MIT", "dependencies": { @@ -4042,6 +4243,7 @@ "find-up": "^5.0.0", "glob": "^10.4.5", "he": "^1.2.0", + "is-path-inside": "^3.0.3", "js-yaml": "^4.1.0", "log-symbols": "^4.1.0", "minimatch": "^9.0.5", @@ -4111,12 +4313,26 @@ "node": ">=12" } }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "node_modules/mocha/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, - "license": "MIT" + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/mocha/node_modules/readdirp": { "version": "4.1.2", @@ -4132,6 +4348,22 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/mocha/node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", @@ -4162,9 +4394,9 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, @@ -4221,6 +4453,25 @@ "node": ">=0.8.0" } }, + "node_modules/mv/node_modules/glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, "node_modules/mv/node_modules/mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", @@ -4303,9 +4554,9 @@ } }, "node_modules/node-abi": { - "version": "3.77.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", - "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", + "version": "3.78.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.78.0.tgz", + "integrity": "sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==", "license": "MIT", "optional": true, "dependencies": { @@ -4484,6 +4735,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -4549,6 +4807,16 @@ "node": ">=8" } }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -4747,16 +5015,6 @@ "node": ">=6" } }, - "node_modules/punycode.js": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", - "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/qs": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", @@ -5240,14 +5498,11 @@ } }, "node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "optional": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -5268,19 +5523,6 @@ "node": ">= 10.13.0" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "license": "ISC", - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", @@ -5616,13 +5858,13 @@ } }, "node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -5701,6 +5943,17 @@ "semver": "^6.3.0" } }, + "node_modules/sver/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/tar-fs": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", @@ -5893,9 +6146,9 @@ "license": "MIT" }, "node_modules/uc.micro": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", "dev": true, "license": "MIT" }, @@ -6125,6 +6378,16 @@ "string-width": "^1.0.2 || 2" } }, + "node_modules/wide-align/node_modules/ansi-regex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/wide-align/node_modules/is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -6149,6 +6412,19 @@ "node": ">=4" } }, + "node_modules/wide-align/node_modules/strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/winston": { "version": "3.18.3", "resolved": "https://registry.npmjs.org/winston/-/winston-3.18.3.tgz", @@ -6205,9 +6481,9 @@ "license": "Apache-2.0" }, "node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "license": "MIT", "dependencies": { @@ -6216,7 +6492,10 @@ "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/wrap-ansi-cjs": { @@ -6278,13 +6557,6 @@ "node": ">=10" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC", - "optional": true - }, "node_modules/yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", diff --git a/package.json b/package.json index 77887dc7..373e7db9 100644 --- a/package.json +++ b/package.json @@ -32,11 +32,11 @@ "big-integer": "1.6.52", "concat-stream": "2.0.0", "duplexify": "4.1.3", - "form-data": "^4.0.4", - "json-text-sequence": "^1.0.1", - "multipart-stream": "^2.0.1", - "qs": "^6.11.0", - "through2": "^4.0.2" + "form-data": "4.0.4", + "json-text-sequence": "4.0.2", + "multipart-stream": "2.0.1", + "qs": "6.14.0", + "through2": "4.0.2" }, "repository": { "type": "git", @@ -74,32 +74,10 @@ "vinyl": "^3.0.0" }, "overrides": { - "ansi-styles": "4.3.0", - "ansi-regex": "5.0.1", - "chalk": "4.1.2", - "braces": "3.0.3", - "brace-expansion": "2.0.2", - "color": "5.0.0", - "color-convert": "3.1.0", - "color-name": "2.0.0", - "color-string": "2.1.0", - "cross-spawn": "7.0.6", - "debug": "4.3.6", - "is-arrayish": "0.3.2", "jsdoc": "4.0.0", - "sanitize-html": "^2.13.0", - "markdown-it": "14.1.0", "minimatch": "5.1.0", "nanoid": "3.3.8", - "glob": "10.3.11", - "glob-parent": "6.0.2", - "simple-get": "4.0.1", - "semver": "7.5.3", - "serialize-javascript": "6.0.2", - "supports-color": "7.2.0", - "strip-ansi": "6.0.0", - "tar-fs": "2.1.4", - "tmp": "0.2.4", - "wrap-ansi": "6.2.0" + "sanitize-html": "^2.13.0", + "tmp": "0.2.4" } } From 84c56013c700a1883e5d487808a5c39ef6fed8b6 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 15 Oct 2025 16:05:58 -0400 Subject: [PATCH 28/58] MLE-24230 Restoring overrides Will try to trim this as devDependencies are updated. --- package-lock.json | 780 +++++++++++++++++++++++++++------------------- package.json | 26 +- 2 files changed, 492 insertions(+), 314 deletions(-) diff --git a/package-lock.json b/package-lock.json index c631f646..0fc327ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -194,6 +194,24 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/@eslint/eslintrc/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -201,6 +219,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@eslint/eslintrc/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, "node_modules/@eslint/js": { "version": "8.57.1", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", @@ -256,6 +281,31 @@ "node": ">=10.10.0" } }, + "node_modules/@humanwhocodes/config-array/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -296,32 +346,6 @@ "node": ">=12" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -348,37 +372,53 @@ } }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^5.0.0" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "node": ">=8" } }, "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=12" + "node": ">=8" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "engines": { + "node": ">=8" } }, "node_modules/@jsdoc/salty": { @@ -454,6 +494,33 @@ "text-hex": "1.0.x" } }, + "node_modules/@so-ric/colorspace/node_modules/color": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz", + "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^3.0.1", + "color-string": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@so-ric/colorspace/node_modules/color-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.0.tgz", + "integrity": "sha512-gNVoDzpaSwvftp6Y8nqk97FtZoXP9Yj7KGYB8yIXuv0JcfqbYihTrd1OU5iZW9btfXde4YAOCRySBHT7O910MA==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@sovpro/delimited-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@sovpro/delimited-stream/-/delimited-stream-1.1.0.tgz", @@ -1166,19 +1233,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -1212,67 +1266,61 @@ "wrap-ansi": "^7.0.0" } }, - "node_modules/clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", - "devOptional": true, - "license": "MIT", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/color": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/color/-/color-5.0.2.tgz", - "integrity": "sha512-e2hz5BzbUPcYlIRHo8ieAhYgoajrJr+hWoceg6E345TPsATMUKqDgzt8fSXZJJbxfpiPzkWyphz8yn8At7q3fA==", + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "license": "MIT", "dependencies": { - "color-convert": "^3.0.1", - "color-string": "^2.0.0" + "ansi-regex": "^5.0.0" }, "engines": { - "node": ">=18" + "node": ">=8" } }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=8" } }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/color-string": { + "node_modules/clone": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.2.tgz", - "integrity": "sha512-RxmjYxbWemV9gKu4zPgiZagUxbH3RQpEIO77XoSSX0ivgABDZ+h8Zuash/EMFLTI4N9QgFPOJ6JQpPZKFxa+dA==", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/color-convert": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.0.tgz", + "integrity": "sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA==", "dev": true, "license": "MIT", "dependencies": { "color-name": "^2.0.0" }, "engines": { - "node": ">=18" + "node": ">=14.6" } }, - "node_modules/color-string/node_modules/color-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.2.tgz", - "integrity": "sha512-9vEt7gE16EW7Eu7pvZnR0abW9z6ufzhXxGXZEVU9IqPdlsUiMwJeJfRtq0zePUmnbHGT9zajca7mX8zgoayo4A==", + "node_modules/color-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz", + "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==", "dev": true, "license": "MIT", "engines": { @@ -1289,29 +1337,6 @@ "color-support": "bin.js" } }, - "node_modules/color/node_modules/color-convert": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.2.tgz", - "integrity": "sha512-UNqkvCDXstVck3kdowtOTWROIJQwafjOfXSmddoDrXo4cewMKmusCeF22Q24zvjR8nwWib/3S/dfyzPItPEiJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "^2.0.0" - }, - "engines": { - "node": ">=14.6" - } - }, - "node_modules/color/node_modules/color-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.2.tgz", - "integrity": "sha512-9vEt7gE16EW7Eu7pvZnR0abW9z6ufzhXxGXZEVU9IqPdlsUiMwJeJfRtq0zePUmnbHGT9zajca7mX8zgoayo4A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.20" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -1417,24 +1442,6 @@ "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==", "dev": true }, - "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/decamelize": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", @@ -1880,6 +1887,24 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/eslint/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/eslint/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1887,6 +1912,26 @@ "dev": true, "license": "MIT" }, + "node_modules/eslint/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", @@ -2340,13 +2385,6 @@ "node": ">=10.13.0" } }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2449,22 +2487,23 @@ "optional": true }, "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", + "version": "10.3.11", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.11.tgz", + "integrity": "sha512-0UAMm+R/z1E2bTR8eFnoIIlnrUK89m36i90Ez36ld9hLulfUPBgRCQtBy/v86ABx18jnGyrTvu4X3LAjIeBogw==", "dev": true, "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.6", + "minimatch": "^9.0.1", + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -2517,6 +2556,25 @@ "node": ">= 10.13.0" } }, + "node_modules/glob/node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", @@ -2690,6 +2748,31 @@ "tmp": "0.1.0" } }, + "node_modules/gulp-jsdoc3/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/gulp-jsdoc3/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, "node_modules/gulp-jshint": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.1.0.tgz", @@ -2836,9 +2919,9 @@ } }, "node_modules/gulp-mocha/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "license": "MIT", "dependencies": { @@ -2884,41 +2967,6 @@ "node": ">=0.10.0" } }, - "node_modules/gulp-mocha/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/gulp-mocha/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/gulp-mocha/node_modules/js-yaml": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", @@ -2990,6 +3038,19 @@ "url": "https://opencollective.com/mochajs" } }, + "node_modules/gulp-mocha/node_modules/mocha/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/gulp-mocha/node_modules/plugin-error": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", @@ -3032,16 +3093,6 @@ "node": ">=8.10.0" } }, - "node_modules/gulp-mocha/node_modules/serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "randombytes": "^2.1.0" - } - }, "node_modules/gulp-mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -3282,18 +3333,6 @@ "node": ">=0.8.19" } }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -3843,13 +3882,13 @@ } }, "node_modules/linkify-it": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", - "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dev": true, "license": "MIT", "dependencies": { - "uc.micro": "^1.0.1" + "uc.micro": "^2.0.0" } }, "node_modules/locate-path": { @@ -4032,20 +4071,21 @@ "license": "MIT" }, "node_modules/markdown-it": { - "version": "12.3.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", - "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", + "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "entities": "~2.1.0", - "linkify-it": "^3.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" }, "bin": { - "markdown-it": "bin/markdown-it.js" + "markdown-it": "bin/markdown-it.mjs" } }, "node_modules/markdown-it-anchor": { @@ -4060,11 +4100,14 @@ } }, "node_modules/markdown-it/node_modules/entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -4104,9 +4147,9 @@ } }, "node_modules/mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "dev": true, "license": "MIT" }, @@ -4282,6 +4325,44 @@ "mocha": ">=2.2.5" } }, + "node_modules/mocha-junit-reporter/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha-junit-reporter/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha-junit-reporter/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mocha/node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -4313,6 +4394,31 @@ "node": ">=12" } }, + "node_modules/mocha/node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha/node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, "node_modules/mocha/node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -4348,6 +4454,19 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/mocha/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -4364,6 +4483,21 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/mocha/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mocha/node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", @@ -4453,25 +4587,6 @@ "node": ">=0.8.0" } }, - "node_modules/mv/node_modules/glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "optional": true, - "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, "node_modules/mv/node_modules/mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", @@ -4566,6 +4681,35 @@ "node": ">=10" } }, + "node_modules/node-abi/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-abi/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "license": "ISC", + "optional": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -4807,16 +4951,6 @@ "node": ">=8" } }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -5015,6 +5149,16 @@ "node": ">=6" } }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/qs": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", @@ -5497,19 +5641,6 @@ "entities": "^4.4.0" } }, - "node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/semver-greatest-satisfied-range": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz", @@ -5857,14 +5988,27 @@ "node": ">=8" } }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.0" }, "engines": { "node": ">=8" @@ -5943,15 +6087,35 @@ "semver": "^6.3.0" } }, + "node_modules/sver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/sver/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", "dev": true, "license": "ISC", "optional": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, "bin": { "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/tar-fs": { @@ -6146,9 +6310,9 @@ "license": "MIT" }, "node_modules/uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", "dev": true, "license": "MIT" }, @@ -6378,16 +6542,6 @@ "string-width": "^1.0.2 || 2" } }, - "node_modules/wide-align/node_modules/ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/wide-align/node_modules/is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -6413,16 +6567,16 @@ } }, "node_modules/wide-align/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^5.0.0" }, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/winston": { @@ -6480,7 +6634,8 @@ "dev": true, "license": "Apache-2.0" }, - "node_modules/wrap-ansi": { + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", @@ -6498,23 +6653,17 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "ansi-regex": "^5.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "node": ">=8" } }, "node_modules/wrappy": { @@ -6557,6 +6706,13 @@ "node": ">=10" } }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC", + "optional": true + }, "node_modules/yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", diff --git a/package.json b/package.json index 373e7db9..4680b735 100644 --- a/package.json +++ b/package.json @@ -74,10 +74,32 @@ "vinyl": "^3.0.0" }, "overrides": { + "ansi-styles": "4.3.0", + "ansi-regex": "5.0.1", + "chalk": "4.1.2", + "braces": "3.0.3", + "brace-expansion": "2.0.2", + "color": "5.0.0", + "color-convert": "3.1.0", + "color-name": "2.0.0", + "color-string": "2.1.0", + "cross-spawn":"7.0.6", + "debug": "4.3.6", + "is-arrayish": "0.3.2", "jsdoc": "4.0.0", + "sanitize-html": "^2.13.0", + "markdown-it": "14.1.0", "minimatch": "5.1.0", "nanoid": "3.3.8", - "sanitize-html": "^2.13.0", - "tmp": "0.2.4" + "glob": "10.3.11", + "glob-parent": "6.0.2", + "simple-get": "4.0.1", + "semver": "7.5.3", + "serialize-javascript": "6.0.2", + "supports-color": "7.2.0", + "strip-ansi": "6.0.0", + "tar-fs": "2.1.4", + "tmp": "0.2.4", + "wrap-ansi": "6.2.0" } } From 448f4ac2a010d926d841aeb0d325254bc1ba71a9 Mon Sep 17 00:00:00 2001 From: asinha Date: Wed, 15 Oct 2025 15:20:11 -0700 Subject: [PATCH 29/58] Jenkins does not store results for pull requests runs. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a42df711..1aa169fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,6 +20,7 @@ def runTests() { ./node_modules/.bin/gulp setupProxyTests || true ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert || true ''' + junit '**/*.xml' } def runDockerCompose(String markLogicDockerImage) { From f4d3670bf59199e0f926a07bff364b7c8fefc15e Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 16 Oct 2025 12:38:22 -0400 Subject: [PATCH 30/58] MLE-24763 Upgrading from jshint to eslint No linting fixes yet. Changing from the older jshint to the modern eslint. The eslint config doesn't enforce whitespace yet, will do that in a later PR. --- .jshintrc | 11 - eslint.config.js | 71 ++ gulpfile.js | 9 +- package-lock.json | 1590 ++++++++++++--------------------------------- package.json | 7 +- 5 files changed, 493 insertions(+), 1195 deletions(-) delete mode 100644 .jshintrc create mode 100644 eslint.config.js diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 032b0536..00000000 --- a/.jshintrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "esversion": 6, - "node": true, - "curly": true, - "eqeqeq": true, - "eqnull": true, - "noarg": true, - "nonew": true, - "undef": true, - "unused": true -} diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 00000000..4618b64f --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,71 @@ +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ + +// ESLint 9+ flat config +const globals = require("globals"); + +module.exports = [ + { + // Base configuration for all JS files + files: ["**/*.js"], + languageOptions: { + ecmaVersion: 2022, + sourceType: "commonjs", // Node.js uses CommonJS + globals: { + ...globals.commonjs, + ...globals.node, + ...globals.browser, // Add browser globals like setTimeout + structuredClone: "readonly", + // Legacy globals from old config + Atomics: "readonly", + SharedArrayBuffer: "readonly" + } + }, + rules: { + // Spacing and formatting + "indent": "off", // TODO: Fix indentation in separate PR + "linebreak-style": ["error", "unix"], + "quotes": ["error", "single"], + "semi": ["error", "always"], + + // Modern best practices + "eqeqeq": "error", + "curly": ["error", "all"], // Require braces for all control structures + "no-unused-vars": "error", + "no-undef": "error", + + // Spacing rules (disabled for initial setup - TODO: Fix in separate PR) + "arrow-spacing": "off", + "space-before-blocks": "off", + "space-before-function-paren": "off", + "space-in-parens": "off", + "object-curly-spacing": "off", + "keyword-spacing": "off", + "comma-spacing": "off", + "key-spacing": "off", + "space-infix-ops": "off", + + // Style rules (disabled for initial setup - TODO: Fix in separate PR) + "array-bracket-spacing": "off", + "block-spacing": "off", + "brace-style": "off", + "func-call-spacing": "off", + "no-trailing-spaces": "off", + + // Disable console errors for this project + "no-console": "off", + + // Bracket notation preference + "dot-notation": "error" + } + }, + { + // Ignore patterns + ignores: [ + "**/data/*.js", + "node_modules/**", + "coverage/**" + ] + } +]; diff --git a/gulpfile.js b/gulpfile.js index ac3ec460..8352f1e1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,7 +3,7 @@ */ const path = require('path'); const gulp = require('gulp'); -const jshint = require('gulp-jshint'); +const eslint = require('gulp-eslint-new'); const mocha = require('gulp-mocha'); const jsdoc = require('gulp-jsdoc3'); @@ -17,9 +17,10 @@ const basicloader = require('./lib/basic-loader.js'); const streamToArray = require("stream-to-array"); function lint() { - return gulp.src('lib/*') - .pipe(jshint({lookup:true})) - .pipe(jshint.reporter('default')); + return gulp.src('lib/*.js') + .pipe(eslint({ overrideConfigFile: 'eslint.config.js' })) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); } function test() { diff --git a/package-lock.json b/package-lock.json index 0fc327ff..23e2b115 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,13 +28,12 @@ "bunyan": "^1.8.15", "chai": "^4.4.1", "core-util-is": "^1.0.3", - "eslint": "^8.57.0", + "eslint": "^9.37.0", "gulp": "^5.0.0", + "gulp-eslint-new": "^2.3.0", "gulp-jsdoc3": "^3.0.0", - "gulp-jshint": "^2.1.0", "gulp-mocha": "^8.0.0", "intercept-stdout": "^0.1.2", - "jshint": "^2.13.5", "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", @@ -153,17 +152,58 @@ "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", + "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.6", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.0.tgz", + "integrity": "sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.16.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz", + "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -171,7 +211,7 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -194,24 +234,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@eslint/eslintrc/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -219,21 +241,41 @@ "dev": true, "license": "MIT" }, - "node_modules/@eslint/eslintrc/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, "node_modules/@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.37.0.tgz", + "integrity": "sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==", "dev": true, "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz", + "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.16.0", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@fastify/busboy": { @@ -265,47 +307,30 @@ "node": ">=10.13.0" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "deprecated": "Use @eslint/config-array instead", + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, "license": "Apache-2.0", - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, "engines": { - "node": ">=10.10.0" + "node": ">=18.18.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "node_modules/@humanfs/node": { + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "ms": "2.1.2" + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.4.0" }, "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "node": ">=18.18.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -320,13 +345,19 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", + "node_modules/@humanwhocodes/retry": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, - "license": "BSD-3-Clause" + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } }, "node_modules/@isaacs/cliui": { "version": "8.0.2", @@ -371,56 +402,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@jsdoc/salty": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz", @@ -434,44 +415,6 @@ "node": ">=v12.0.0" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -494,33 +437,6 @@ "text-hex": "1.0.x" } }, - "node_modules/@so-ric/colorspace/node_modules/color": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz", - "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^3.0.1", - "color-string": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@so-ric/colorspace/node_modules/color-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.0.tgz", - "integrity": "sha512-gNVoDzpaSwvftp6Y8nqk97FtZoXP9Yj7KGYB8yIXuv0JcfqbYihTrd1OU5iZW9btfXde4YAOCRySBHT7O910MA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@sovpro/delimited-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@sovpro/delimited-stream/-/delimited-stream-1.1.0.tgz", @@ -530,6 +446,20 @@ "node": ">= 8" } }, + "node_modules/@types/estree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/linkify-it": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", @@ -555,6 +485,17 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/node": { + "version": "24.8.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.0.tgz", + "integrity": "sha512-5x08bUtU8hfboMTrJ7mEO4CpepS9yBwAqcL52y86SWNmbPX8LVbNs3EP4cNrIZgdjk2NAlP2ahNihozpoZIxSg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "undici-types": "~7.14.0" + } + }, "node_modules/@types/triple-beam": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", @@ -569,13 +510,6 @@ "dev": true, "license": "ISC" }, - "node_modules/@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "dev": true, - "license": "ISC" - }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", @@ -626,19 +560,6 @@ "node": ">=6" } }, - "node_modules/ansi-cyan": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", - "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-wrap": "0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ansi-gray": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", @@ -652,19 +573,6 @@ "node": ">=0.10.0" } }, - "node_modules/ansi-red": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", - "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-wrap": "0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -729,50 +637,6 @@ "dev": true, "license": "Python-2.0" }, - "node_modules/arr-diff": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", - "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "arr-flatten": "^1.0.1", - "array-slice": "^0.2.3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-diff/node_modules/array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", - "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/array-each": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", @@ -1240,20 +1104,6 @@ "license": "ISC", "optional": true }, - "node_modules/cli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", - "integrity": "sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "exit": "0.1.2", - "glob": "^7.1.1" - }, - "engines": { - "node": ">=0.2.5" - } - }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -1266,42 +1116,28 @@ "wrap-ansi": "^7.0.0" } }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, + "node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "devOptional": true, "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.0" - }, "engines": { - "node": ">=8" + "node": ">=0.8" } }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "node_modules/color": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz", + "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "color-convert": "^3.0.1", + "color-string": "^2.0.0" }, "engines": { - "node": ">=8" - } - }, - "node_modules/clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", - "devOptional": true, - "license": "MIT", - "engines": { - "node": ">=0.8" + "node": ">=18" } }, "node_modules/color-convert": { @@ -1327,6 +1163,19 @@ "node": ">=12.20" } }, + "node_modules/color-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.0.tgz", + "integrity": "sha512-gNVoDzpaSwvftp6Y8nqk97FtZoXP9Yj7KGYB8yIXuv0JcfqbYihTrd1OU5iZW9btfXde4YAOCRySBHT7O910MA==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -1364,15 +1213,6 @@ "typedarray": "^0.0.6" } }, - "node_modules/console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg==", - "dev": true, - "dependencies": { - "date-now": "^0.1.4" - } - }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -1436,11 +1276,23 @@ "node": ">=8" } }, - "node_modules/date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==", - "dev": true + "node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } }, "node_modules/decamelize": { "version": "4.0.0", @@ -1550,79 +1402,6 @@ "node": ">=0.3.1" } }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dom-serializer": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", - "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" - } - }, - "node_modules/dom-serializer/node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "BSD-2-Clause" - }, - "node_modules/dom-serializer/node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "license": "BSD-2-Clause", - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/domhandler": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", - "integrity": "sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==", - "dev": true, - "dependencies": { - "domelementtype": "1" - } - }, - "node_modules/domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==", - "dev": true, - "dependencies": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, "node_modules/dtrace-provider": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz", @@ -1708,13 +1487,6 @@ "once": "^1.4.0" } }, - "node_modules/entities": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", - "integrity": "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==", - "dev": true, - "license": "BSD-like" - }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", @@ -1784,66 +1556,70 @@ } }, "node_modules/eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.37.0.tgz", + "integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", + "@eslint-community/eslint-utils": "^4.8.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.21.0", + "@eslint/config-helpers": "^0.4.0", + "@eslint/core": "^0.16.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.37.0", + "@eslint/plugin-kit": "^0.4.0", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -1851,7 +1627,7 @@ "estraverse": "^5.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -1887,22 +1663,17 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/eslint/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, + "license": "Apache-2.0", "engines": { - "node": ">=6.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/json-schema-traverse": { @@ -1912,39 +1683,32 @@ "dev": true, "license": "MIT" }, - "node_modules/eslint/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/eslint/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "node_modules/espree": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, - "license": "MIT", + "license": "BSD-2-Clause", "dependencies": { - "ansi-regex": "^5.0.0" + "acorn": "^8.15.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.1" }, "engines": { - "node": ">=8" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, + "license": "Apache-2.0", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -2030,15 +1794,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -2069,19 +1824,6 @@ "dev": true, "license": "MIT" }, - "node_modules/extend-shallow": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", - "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==", - "dev": true, - "license": "MIT", - "dependencies": { - "kind-of": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/fancy-log": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", @@ -2171,16 +1913,16 @@ "license": "MIT" }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, "license": "MIT", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/fill-range": { @@ -2267,18 +2009,17 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, "license": "MIT", "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16" } }, "node_modules/flatted": { @@ -2348,6 +2089,13 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/fork-stream": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz", + "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==", + "dev": true, + "license": "BSD" + }, "node_modules/form-data": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", @@ -2556,25 +2304,6 @@ "node": ">= 10.13.0" } }, - "node_modules/glob/node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", @@ -2621,16 +2350,13 @@ } }, "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, "engines": { - "node": ">=8" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2668,13 +2394,6 @@ "dev": true, "license": "ISC" }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, "node_modules/growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", @@ -2731,110 +2450,81 @@ "node": ">=10.13.0" } }, - "node_modules/gulp-jsdoc3": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-jsdoc3/-/gulp-jsdoc3-3.0.0.tgz", - "integrity": "sha512-rE2jAwCPA8XFi9g4V3Z3LPhZNjxuMTIYQVMjdqZAQpRfJITLVaUK3xfmiiNTMc7j+fT7pL8Q5yj7ZPRdwCJWNg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "ansi-colors": "^4.1.1", - "beeper": "^2.0.0", - "debug": "^4.1.1", - "fancy-log": "^1.3.3", - "ink-docstrap": "^1.3.2", - "jsdoc": "^3.6.3", - "map-stream": "0.0.7", - "tmp": "0.1.0" - } - }, - "node_modules/gulp-jsdoc3/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "node_modules/gulp-eslint-new": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/gulp-eslint-new/-/gulp-eslint-new-2.5.0.tgz", + "integrity": "sha512-sEF9dnihZ04oUybO4grpPO0zomJwiAeCKcVyYZouzfArkJut/cVcjN3KA0g9iaX1g05pZhhYTBH6pnrqGTiVOg==", "dev": true, "license": "MIT", "dependencies": { - "ms": "2.1.2" + "eslint": "8 || 9", + "fancy-log": "^2.0.0", + "plugin-error": "^2.0.1", + "semver": "^7.7.2", + "ternary-stream": "^3.0.0", + "vinyl-fs": "^4.0.2" }, "engines": { - "node": ">=6.0" + "node": "^12.20 || ^14.13 || >=16" }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "optionalDependencies": { + "@types/node": ">=12" } }, - "node_modules/gulp-jsdoc3/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/gulp-jshint": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.1.0.tgz", - "integrity": "sha512-sP3NK8Y/1e58O0PH9t6s7DAr/lKDSUbIY207oWSeufM6/VclB7jJrIBcPCsyhrFTCDUl9DauePbt6VqP2vPM5w==", + "node_modules/gulp-eslint-new/node_modules/ansi-colors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, "license": "MIT", "dependencies": { - "lodash": "^4.12.0", - "minimatch": "^3.0.3", - "plugin-error": "^0.1.2", - "rcloader": "^0.2.2", - "through2": "^2.0.0" + "ansi-wrap": "^0.1.0" }, "engines": { - "node": ">= 0.4.0" - }, - "peerDependencies": { - "jshint": "2.x" + "node": ">=0.10.0" } }, - "node_modules/gulp-jshint/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "node_modules/gulp-eslint-new/node_modules/fancy-log": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz", + "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==", "dev": true, "license": "MIT", "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "color-support": "^1.1.3" + }, + "engines": { + "node": ">=10.13.0" } }, - "node_modules/gulp-jshint/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/gulp-jshint/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "node_modules/gulp-eslint-new/node_modules/plugin-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz", + "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==", "dev": true, "license": "MIT", "dependencies": { - "safe-buffer": "~5.1.0" + "ansi-colors": "^1.0.1" + }, + "engines": { + "node": ">=10.13.0" } }, - "node_modules/gulp-jshint/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "node_modules/gulp-jsdoc3": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gulp-jsdoc3/-/gulp-jsdoc3-3.0.0.tgz", + "integrity": "sha512-rE2jAwCPA8XFi9g4V3Z3LPhZNjxuMTIYQVMjdqZAQpRfJITLVaUK3xfmiiNTMc7j+fT7pL8Q5yj7ZPRdwCJWNg==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "ansi-colors": "^4.1.1", + "beeper": "^2.0.0", + "debug": "^4.1.1", + "fancy-log": "^1.3.3", + "ink-docstrap": "^1.3.2", + "jsdoc": "^3.6.3", + "map-stream": "0.0.7", + "tmp": "0.1.0" } }, "node_modules/gulp-mocha": { @@ -2918,31 +2608,6 @@ "fsevents": "~2.3.1" } }, - "node_modules/gulp-mocha/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/gulp-mocha/node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, "node_modules/gulp-mocha/node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -3038,18 +2703,12 @@ "url": "https://opencollective.com/mochajs" } }, - "node_modules/gulp-mocha/node_modules/mocha/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/gulp-mocha/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } + "license": "MIT" }, "node_modules/gulp-mocha/node_modules/plugin-error": { "version": "1.0.1", @@ -3093,22 +2752,6 @@ "node": ">=8.10.0" } }, - "node_modules/gulp-mocha/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/gulp-mocha/node_modules/workerpool": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", @@ -3211,47 +2854,6 @@ "node": ">=0.10.0" } }, - "node_modules/htmlparser2": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", - "integrity": "sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "domelementtype": "1", - "domhandler": "2.3", - "domutils": "1.5", - "entities": "1.0", - "readable-stream": "1.1" - } - }, - "node_modules/htmlparser2/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/htmlparser2/node_modules/readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/htmlparser2/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", - "dev": true, - "license": "MIT" - }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -3608,13 +3210,6 @@ "node": ">=0.10.0" } }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "license": "MIT" - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -3633,14 +3228,17 @@ } }, "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, + "engines": { + "node": ">=14" + }, "funding": { "url": "https://github.com/sponsors/isaacs" }, @@ -3711,38 +3309,6 @@ "node": ">=8" } }, - "node_modules/jshint": { - "version": "2.13.6", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.6.tgz", - "integrity": "sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "cli": "~1.0.0", - "console-browserify": "1.1.x", - "exit": "0.1.x", - "htmlparser2": "3.8.x", - "lodash": "~4.17.21", - "minimatch": "~3.0.2", - "strip-json-comments": "1.0.x" - }, - "bin": { - "jshint": "bin/jshint" - } - }, - "node_modules/jshint/node_modules/strip-json-comments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", - "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==", - "dev": true, - "license": "MIT", - "bin": { - "strip-json-comments": "cli.js" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -3801,16 +3367,6 @@ "json-buffer": "3.0.1" } }, - "node_modules/kind-of": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", - "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/klaw": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", @@ -3935,20 +3491,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -3963,13 +3505,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.isobject": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", - "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", @@ -4325,44 +3860,6 @@ "mocha": ">=2.2.5" } }, - "node_modules/mocha-junit-reporter/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/mocha-junit-reporter/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/mocha-junit-reporter/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/mocha/node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -4394,52 +3891,13 @@ "node": ">=12" } }, - "node_modules/mocha/node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/mocha/node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "node_modules/mocha/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, - "node_modules/mocha/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/mocha/node_modules/readdirp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", @@ -4454,50 +3912,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/mocha/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/mocha/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/mocha/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/mocha/node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", @@ -4528,9 +3942,9 @@ } }, "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true, "license": "MIT" }, @@ -4658,53 +4072,24 @@ "license": "MIT" }, "node_modules/ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "dev": true, - "license": "MIT", - "optional": true, - "bin": { - "ncp": "bin/ncp" - } - }, - "node_modules/node-abi": { - "version": "3.78.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.78.0.tgz", - "integrity": "sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-abi/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "license": "ISC", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", + "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", + "dev": true, + "license": "MIT", "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" + "bin": { + "ncp": "bin/ncp" } }, - "node_modules/node-abi/node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "license": "ISC", + "node_modules/node-abi": { + "version": "3.78.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.78.0.tgz", + "integrity": "sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==", + "license": "MIT", "optional": true, "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" + "semver": "^7.3.5" }, "engines": { "node": ">=10" @@ -4879,13 +4264,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -5038,23 +4416,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/plugin-error": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", - "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-cyan": "^0.1.1", - "ansi-red": "^0.1.1", - "arr-diff": "^1.0.1", - "arr-union": "^2.0.1", - "extend-shallow": "^1.1.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/postcss": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", @@ -5121,13 +4482,6 @@ "node": ">= 0.8.0" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "license": "MIT" - }, "node_modules/pump": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", @@ -5174,27 +4528,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -5231,36 +4564,6 @@ "node": ">=0.10.0" } }, - "node_modules/rcfinder": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz", - "integrity": "sha512-rhSo812VIVaX7cxl33KkllHRwfLvjZL3lQedWEpQ27YlMFKZbFZsiVdCcQn/Z0FauLWxIpKrNREGuHbJFSi0Lw==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash.clonedeep": "^4.3.2" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/rcloader": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.2.2.tgz", - "integrity": "sha512-hSkFcFiLb5buT0X1fNI023M6tn0ywblKzF0hGzVCkTjEggT5tQUZI+fCG71utA7NiEyiBEc3trl/LDFFHzGIrw==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash.assign": "^4.2.0", - "lodash.isobject": "^3.0.2", - "lodash.merge": "^4.6.0", - "rcfinder": "^0.1.6" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/read": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", @@ -5440,47 +4743,6 @@ "node": ">=0.10.0" } }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5641,6 +4903,22 @@ "entities": "^4.4.0" } }, + "node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/semver-greatest-satisfied-range": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz", @@ -5654,6 +4932,19 @@ "node": ">= 10.13.0" } }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", @@ -5988,20 +5279,7 @@ "node": ">=8" } }, - "node_modules/string-width-cjs/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { + "node_modules/strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", @@ -6087,37 +5365,6 @@ "semver": "^6.3.0" } }, - "node_modules/sver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "license": "ISC", - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/sver/node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "dev": true, - "license": "ISC", - "optional": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/tar-fs": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", @@ -6158,6 +5405,30 @@ "streamx": "^2.12.5" } }, + "node_modules/ternary-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz", + "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "duplexify": "^4.1.1", + "fork-stream": "^0.0.4", + "merge-stream": "^2.0.0", + "through2": "^3.0.1" + } + }, + "node_modules/ternary-stream/node_modules/through2": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.4", + "readable-stream": "2 || 3" + } + }, "node_modules/text-decoder": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", @@ -6175,13 +5446,6 @@ "dev": true, "license": "MIT" }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true, - "license": "MIT" - }, "node_modules/through2": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", @@ -6290,19 +5554,6 @@ "node": ">=4" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -6369,6 +5620,14 @@ "fastest-levenshtein": "^1.0.7" } }, + "node_modules/undici-types": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", + "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -6566,19 +5825,6 @@ "node": ">=4" } }, - "node_modules/wide-align/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/winston": { "version": "3.18.3", "resolved": "https://registry.npmjs.org/winston/-/winston-3.18.3.tgz", @@ -6634,6 +5880,21 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wrap-ansi-cjs": { "name": "wrap-ansi", "version": "7.0.0", @@ -6653,19 +5914,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -6686,16 +5934,6 @@ "dev": true, "license": "Apache-2.0" }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -6710,8 +5948,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC", - "optional": true + "devOptional": true, + "license": "ISC" }, "node_modules/yargs": { "version": "16.2.0", diff --git a/package.json b/package.json index 4680b735..d95cc836 100644 --- a/package.json +++ b/package.json @@ -53,13 +53,12 @@ "bunyan": "^1.8.15", "chai": "^4.4.1", "core-util-is": "^1.0.3", - "eslint": "^8.57.0", + "eslint": "^9.37.0", "gulp": "^5.0.0", + "gulp-eslint-new": "^2.3.0", "gulp-jsdoc3": "^3.0.0", - "gulp-jshint": "^2.1.0", "gulp-mocha": "^8.0.0", "intercept-stdout": "^0.1.2", - "jshint": "^2.13.5", "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", @@ -83,7 +82,7 @@ "color-convert": "3.1.0", "color-name": "2.0.0", "color-string": "2.1.0", - "cross-spawn":"7.0.6", + "cross-spawn": "7.0.6", "debug": "4.3.6", "is-arrayish": "0.3.2", "jsdoc": "4.0.0", From 95d1807481d28021a440d906cec221f6ef42964f Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 16 Oct 2025 15:16:40 -0400 Subject: [PATCH 31/58] MLE-24763 Including server response body in error message Fixed test that was do an equals comparison on the error message, and it no longer times out now. --- lib/responder.js | 3 +++ test-basic/validateDoc-test.js | 37 ++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/lib/responder.js b/lib/responder.js index a673e397..939be6ef 100644 --- a/lib/responder.js +++ b/lib/responder.js @@ -1039,6 +1039,9 @@ function isResponseStatusOkay(response) { ((typeof contentType === 'string' || contentType instanceof String) && /^application\/([^+]+\+)?json(\s*;.*)?$/.test(contentType)) ? mlutil.parseJSON(bodyMsg) : bodyMsg; + + // Enhance error message with response body details for better debugging + clientError.message = `${clientError.message}; server response: ${bodyMsg}`; } operation.errorListener(clientError); })); diff --git a/test-basic/validateDoc-test.js b/test-basic/validateDoc-test.js index 61cfc795..c18607e5 100644 --- a/test-basic/validateDoc-test.js +++ b/test-basic/validateDoc-test.js @@ -184,24 +184,27 @@ describe('optic-update validateDoc tests', function () { }); it('test validateDoc with 1 invalid doc and no "onError" defined, should return nothing in 11.1-, or throw an exception on 11.2+', function (done) { - try { - const plan = op.fromDocDescriptors([{ uri: '/test/optic/validateDoc/toValidate1.xml' }]) - .joinDocCols(null, op.col('uri')) - .validateDoc('doc', { kind: 'xmlSchema' }); - db.rows.query(plan, options).then(res => { - try { - (res === undefined).should.equal(true); - done(); - } catch (e) { - done(e); - } - }).catch(e => { - e.message.should.equal('query rows: response with invalid 500 status with path: /v1/rows/update'); + const plan = op.fromDocDescriptors([{ uri: '/test/optic/validateDoc/toValidate1.xml' }]) + .joinDocCols(null, op.col('uri')) + .validateDoc('doc', { kind: 'xmlSchema' }); + + db.rows.query(plan, options).then(res => { + // If we get here, the query succeeded (expected in 11.1-) + try { + (res === undefined).should.equal(true); done(); - }); - } catch (e) { - done(e); - } + } catch (e) { + done(e); + } + }).catch(e => { + // If we get here, the query failed (expected in 11.2+) + try { + e.message.should.containEql('query rows: response with invalid 500 status with path: /v1/rows/update'); + done(); + } catch (assertionError) { + done(assertionError); + } + }); }); // Skip this test until the 'onError' function is available in plan-builder.js From f2f7a7fcd15832626ddb54c8824269cb58d9db77 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 16 Oct 2025 18:21:50 -0400 Subject: [PATCH 32/58] MLE-24763 Lint: Replacing double quotes --- lib/basic-loader.js | 4 +- lib/documents.js | 2 +- lib/endpoint-proxy.js | 6 +- lib/endpointDeclarationValidator.js | 106 +++++++++--------- lib/internal.js | 8 +- lib/marklogic.js | 2 +- lib/mlutil.js | 2 +- lib/operation.js | 2 +- lib/patch-builder.js | 4 +- lib/plan-builder-base.js | 18 +-- lib/plan-builder.js | 2 +- lib/proxy-generator.js | 18 +-- lib/query-builder.js | 2 +- lib/requester.js | 14 +-- lib/resources-exec.js | 2 +- lib/responder.js | 4 +- lib/rows.js | 2 +- .../user-credentials.js | 4 +- .../www-authenticate.js | 8 +- 19 files changed, 105 insertions(+), 105 deletions(-) diff --git a/lib/basic-loader.js b/lib/basic-loader.js index f37573be..5dc8092c 100644 --- a/lib/basic-loader.js +++ b/lib/basic-loader.js @@ -33,7 +33,7 @@ function loadFile(callback, options) { const documentDescriptor = options.documentDescriptor; if (documentDescriptor === void 0 || documentDescriptor == null) { - throw new Error(`loadFile requires fileDescriptor option`); + throw new Error('loadFile requires fileDescriptor option'); } fs.readFile(filePath, 'utf8', (err, data) => { @@ -52,7 +52,7 @@ function loadFileStream(options) { const documentMetadata = options.documentMetadata; if (documentMetadata === void 0 || documentMetadata == null) { - throw new Error(`loadFileStream requires documentMetadata option`); + throw new Error('loadFileStream requires documentMetadata option'); } let uriPrefix = options.uriPrefix; diff --git a/lib/documents.js b/lib/documents.js index 12f05121..be280c32 100644 --- a/lib/documents.js +++ b/lib/documents.js @@ -526,7 +526,7 @@ Documents.prototype.advanceLsqt = function temporalAdvanceLsqt() { /** @ignore */ function readStatusValidator(statusCode) { return (statusCode < 400 || statusCode === 404) ? - null : "response with invalid "+statusCode+" status"; + null : 'response with invalid '+statusCode+' status'; } /** @ignore */ function singleReadOutputTransform(headers, data) { diff --git a/lib/endpoint-proxy.js b/lib/endpoint-proxy.js index 36afb095..949e0512 100644 --- a/lib/endpoint-proxy.js +++ b/lib/endpoint-proxy.js @@ -394,7 +394,7 @@ function expandDataDeclaration(id, dataDeclaration) { function expandParamDeclaration(paramDeclaration) { const paramName = paramDeclaration.name; if (paramName === void 0 || paramName === null) { - throw new Error(`missing parameter name`); + throw new Error('missing parameter name'); } expandDataDeclaration('${paramName} parameter', paramDeclaration); @@ -471,7 +471,7 @@ function expandReturnDeclaration(returnDeclaration) { function expandFunctionDeclaration(functionDeclaration) { const functionName = functionDeclaration.functionName; if (functionName === void 0 || functionName === null) { - throw new Error(`missing function name`); + throw new Error('missing function name'); } let paramsKind = 'empty'; @@ -566,7 +566,7 @@ function expandFunctionDeclaration(functionDeclaration) { } function expandEndpointDeclaration(endpointDeclaration) { const moduleExtension = endpointDeclaration.moduleExtension; - if (typeof moduleExtension !== "string" || moduleExtension.length === 0) { + if (typeof moduleExtension !== 'string' || moduleExtension.length === 0) { throw new Error('invalid module extension configuration: ' + moduleExtension); } else if (!moduleExtension.startsWith('.')) { endpointDeclaration.moduleExtension = '.' + moduleExtension; diff --git a/lib/endpointDeclarationValidator.js b/lib/endpointDeclarationValidator.js index e4db59c5..a34a325b 100644 --- a/lib/endpointDeclarationValidator.js +++ b/lib/endpointDeclarationValidator.js @@ -6,76 +6,76 @@ const Ajv = require('ajv'); const endpointDeclarationSchema = -{"$schema": "http://json-schema.org/draft-07/schema#", - "title": "MarkLogic Endpoint Function Declaration", - "$comment": "SIMPLIFIED TO THE STABLE DECLARATIONS USED FOR CODE GENERATION", - "type": "object", - "definitions": { - "desc": { - "type":"string", "description":"Documentation about the property" +{'$schema': 'http://json-schema.org/draft-07/schema#', + 'title': 'MarkLogic Endpoint Function Declaration', + '$comment': 'SIMPLIFIED TO THE STABLE DECLARATIONS USED FOR CODE GENERATION', + 'type': 'object', + 'definitions': { + 'desc': { + 'type':'string', 'description':'Documentation about the property' }, - "datatype": { - "type":"string", "description":"The type of the value", - "enum":[ - "boolean", "date", "dateTime", "dayTimeDuration", "decimal", "double", "float", - "int", "long", "string", "time", "unsignedInt", "unsignedLong", - "array", "object", - "binaryDocument", "jsonDocument", "textDocument", "xmlDocument", - "session" + 'datatype': { + 'type':'string', 'description':'The type of the value', + 'enum':[ + 'boolean', 'date', 'dateTime', 'dayTimeDuration', 'decimal', 'double', 'float', + 'int', 'long', 'string', 'time', 'unsignedInt', 'unsignedLong', + 'array', 'object', + 'binaryDocument', 'jsonDocument', 'textDocument', 'xmlDocument', + 'session' ] }, - "nullable": { - "type":"boolean", "description":"Whether a null value is allowed", - "default":false + 'nullable': { + 'type':'boolean', 'description':'Whether a null value is allowed', + 'default':false }, - "multiple": { - "type":"boolean", "description":"Whether multiple values are allowed", - "default":false + 'multiple': { + 'type':'boolean', 'description':'Whether multiple values are allowed', + 'default':false } // "$comment": "SIMPLIFIED BY DELETING doubleMeter, doubleLiteral, ulMeter, AND unsignedLongLiteral" }, - "propertyNames": { + 'propertyNames': { // "$comment": "MODIFIED TO ALLOW FOR PROPERTIES DELETED DURING SIMPLIFICATION OR ADDED IN LATER RELEASES", - "pattern": "^\\$?[A-Za-z_][\\w.-]*$" + 'pattern': '^\\$?[A-Za-z_][\\w.-]*$' }, - "properties": { - "functionName": { - "type":"string", "description":"The name of a database function provided by a service declared by service.json" + 'properties': { + 'functionName': { + 'type':'string', 'description':'The name of a database function provided by a service declared by service.json' }, - "endpoint": { - "type":"string", "description":"The full path name of a standalone bulk IO endpoint" + 'endpoint': { + 'type':'string', 'description':'The full path name of a standalone bulk IO endpoint' }, - "desc": {"$ref":"#/definitions/desc"}, - "params": { - "type":"array", "description":"The parameters of the function", - "items": { - "type":"object", - "required": ["name", "datatype"], - "propertyNames": { - "pattern": "^(\\$[A-Za-z_][\\w.-]*|name|desc|datatype|nullable|multiple)$" + 'desc': {'$ref':'#/definitions/desc'}, + 'params': { + 'type':'array', 'description':'The parameters of the function', + 'items': { + 'type':'object', + 'required': ['name', 'datatype'], + 'propertyNames': { + 'pattern': '^(\\$[A-Za-z_][\\w.-]*|name|desc|datatype|nullable|multiple)$' }, - "properties": { - "name": { - "type":"string", "description":"The name of the function parameter" + 'properties': { + 'name': { + 'type':'string', 'description':'The name of the function parameter' }, - "desc": {"$ref":"#/definitions/desc"}, - "datatype": {"$ref":"#/definitions/datatype"}, - "nullable": {"$ref":"#/definitions/nullable"}, - "multiple": {"$ref":"#/definitions/multiple"} + 'desc': {'$ref':'#/definitions/desc'}, + 'datatype': {'$ref':'#/definitions/datatype'}, + 'nullable': {'$ref':'#/definitions/nullable'}, + 'multiple': {'$ref':'#/definitions/multiple'} } } }, - "return": { - "type":"object", "description":"The return value of the function", - "required": ["datatype"], - "propertyNames": { - "pattern": "^(\\$[A-Za-z_][\\w.-]*|desc|datatype|nullable|multiple)$" + 'return': { + 'type':'object', 'description':'The return value of the function', + 'required': ['datatype'], + 'propertyNames': { + 'pattern': '^(\\$[A-Za-z_][\\w.-]*|desc|datatype|nullable|multiple)$' }, - "properties": { - "desc": {"$ref":"#/definitions/desc"}, - "datatype": {"$ref":"#/definitions/datatype"}, - "nullable": {"$ref":"#/definitions/nullable"}, - "multiple": {"$ref":"#/definitions/multiple"} + 'properties': { + 'desc': {'$ref':'#/definitions/desc'}, + 'datatype': {'$ref':'#/definitions/datatype'}, + 'nullable': {'$ref':'#/definitions/nullable'}, + 'multiple': {'$ref':'#/definitions/multiple'} } } // "$comment": "SIMPLIFIED BY DELETING errorDetail AND monitoring" diff --git a/lib/internal.js b/lib/internal.js index 73e60761..fbe8edb6 100644 --- a/lib/internal.js +++ b/lib/internal.js @@ -3,9 +3,9 @@ */ 'use strict'; -const Operation = require("./operation"); -const requester = require("./requester.js"); -const mlutil = require("./mlutil"); +const Operation = require('./operation'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil'); class InternalClass { constructor(clientObject) { this.clientObject = clientObject; @@ -18,7 +18,7 @@ class InternalClass { if (requestOptionsCallback) { requestOptionsCallback(requestOptions); } - const operation = new Operation("", this.clientObject, requestOptions, "single", "single"); + const operation = new Operation('', this.clientObject, requestOptions, 'single', 'single'); if (operationCallback) { operationCallback(operation); } diff --git a/lib/marklogic.js b/lib/marklogic.js index e967f703..83ad0639 100644 --- a/lib/marklogic.js +++ b/lib/marklogic.js @@ -29,7 +29,7 @@ var Operation = require('./operation.js'); var requester = require('./requester.js'); let internal = require('./internal.js'); -const proxy = require("./endpoint-proxy.js"); +const proxy = require('./endpoint-proxy.js'); const dns = require('dns'); /** diff --git a/lib/mlutil.js b/lib/mlutil.js index 5ce86785..46d1b03f 100644 --- a/lib/mlutil.js +++ b/lib/mlutil.js @@ -2,7 +2,7 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var util = require("util"); +var util = require('util'); var multipartBoundary = 'MLBOUND_' + Date.UTC(2014,12,31); diff --git a/lib/operation.js b/lib/operation.js index c5327f95..68ab3066 100644 --- a/lib/operation.js +++ b/lib/operation.js @@ -271,7 +271,7 @@ function OperationHeaders( var lastChar = versionId.charAt(versionId.length - 1); this.versionId = ( (firstChar === '"' && lastChar === '"') || - (firstChar === "'" && lastChar === "'") + (firstChar === '\'' && lastChar === '\'') ) ? versionId.substring(1, versionId.length - 1) : versionId; } diff --git a/lib/patch-builder.js b/lib/patch-builder.js index 207c9533..673ef102 100644 --- a/lib/patch-builder.js +++ b/lib/patch-builder.js @@ -164,7 +164,7 @@ function library(module) { } var extension = module.substring((module.lastIndexOf('.')+1), module.length); - if(extension === "sjs") { + if(extension === 'sjs') { return {'replace-library':{ at: '/ext/marklogic/patch/apply/'+module }}; @@ -590,7 +590,7 @@ function pathLanguage() { ); } - return {"pathlang": pathlang}; + return {'pathlang': pathlang}; } /** diff --git a/lib/plan-builder-base.js b/lib/plan-builder-base.js index 664f4360..70e3a791 100644 --- a/lib/plan-builder-base.js +++ b/lib/plan-builder-base.js @@ -131,7 +131,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { return true; } throw new Error( - `bm25LengthWeight must be a number` + 'bm25LengthWeight must be a number' ); default: return false; @@ -285,7 +285,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { return true; } if(key === 'quality') { - if(typeof value !== "number") { + if(typeof value !== 'number') { throw new Error( `${argLabel(funcName, paramName, argPos)} - ${key} key must be type of number` ); @@ -320,7 +320,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { } return objKeysPlanSchemaDef.every(key => { if(key === 'kind') { - if(typeof arg[key] !== "string") { + if(typeof arg[key] !== 'string') { throw new Error( `${argLabel(funcName, paramName, argPos)} has another type than string` ); @@ -329,7 +329,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { } } if(key === 'mode') { - if(typeof arg[key] !== "string") { + if(typeof arg[key] !== 'string') { throw new Error( `${argLabel(funcName, paramName, argPos)} has another type than string` ); @@ -337,7 +337,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { return true; } if(key === 'schemaUri') { - if(typeof arg[key] !== "string") { + if(typeof arg[key] !== 'string') { throw new Error( `${argLabel(funcName, paramName, argPos)} has another type than string` ); @@ -350,7 +350,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { const value = arg[key]; const type = typeof value; if(key === 'path') { - if(type !== "string") { + if(type !== 'string') { throw new Error( `${argLabel(funcName, paramName, argPos)} should be a type of string` ); @@ -366,7 +366,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { return true; } if(key === 'params') { - if(type !== "object") { + if(type !== 'object') { throw new Error( `${argLabel(funcName, paramName, argPos)} should be a type of object` ); @@ -381,7 +381,7 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { } objKeys.every(key => { if(key === 'column') { - if(typeof arg[key] !== "string") { + if(typeof arg[key] !== 'string') { throw new Error( `${argLabel(funcName, paramName, argPos)} has another type than string` ); @@ -538,7 +538,7 @@ function makeSingleArgs(funcName, minArity, paramDef, args) { function exportOperators(plan) { const operList = plan._operators; if (!Array.isArray(operList)) { - throw new Error(`operator list is not an array: `+operList); + throw new Error('operator list is not an array: '+operList); } return { ns: 'op', diff --git a/lib/plan-builder.js b/lib/plan-builder.js index 554e55a4..c69d7610 100644 --- a/lib/plan-builder.js +++ b/lib/plan-builder.js @@ -9,7 +9,7 @@ const bldrgen = require('./plan-builder-generated.js'); /** @ignore */ function isNonEmptyString(arg) { - if (typeof arg === "string" || arg instanceof String) { + if (typeof arg === 'string' || arg instanceof String) { return (arg.length > 0); } return false; diff --git a/lib/proxy-generator.js b/lib/proxy-generator.js index 177ee70b..4e93be14 100644 --- a/lib/proxy-generator.js +++ b/lib/proxy-generator.js @@ -114,14 +114,14 @@ function buildModule(moduleName, servicedef, endpointdefs) { b.methodDefinition('constructor', b.identifier('constructor'), b.functionExpression(null, [b.identifier('client'), b.identifier('serviceDeclaration')], b.blockStatement([ - b.ifStatement(b.logicalExpression("||", + b.ifStatement(b.logicalExpression('||', b.binaryExpression('===', b.identifier('client'), b.identifier('undefined')), b.binaryExpression('===', b.identifier('client'), b.literal(null)) ), b.blockStatement([b.throwStatement(b.newExpression(b.identifier('Error'), [ b.literal('missing required client') ]))])), - b.ifStatement(b.logicalExpression("||", + b.ifStatement(b.logicalExpression('||', b.binaryExpression('===', b.identifier('serviceDeclaration'), b.identifier('undefined')), b.binaryExpression('===', b.identifier('serviceDeclaration'), b.literal(null)) ), @@ -341,21 +341,21 @@ function generateSessionFactoryDoc(className, sessionFactoryName) { function generateModuleSource(moduleName, servicedef, endpointdefs) { if (moduleName === void 0 || moduleName === null) { - throw new Error(`missing module name`); + throw new Error('missing module name'); } else if (servicedef === void 0 || servicedef === null) { - throw new Error(`missing service.json declaration`); + throw new Error('missing service.json declaration'); } else if (servicedef.endpointDirectory === void 0 || servicedef.endpointDirectory === null) { - throw new Error(`service.json declaration without endpointDirectory property`); + throw new Error('service.json declaration without endpointDirectory property'); } else if (!Array.isArray(endpointdefs) || endpointdefs.length === 0) { - throw new Error(`no endpoint pairs of *.api declaration and main module`); + throw new Error('no endpoint pairs of *.api declaration and main module'); } else { endpointdefs.forEach(endpoint => { if (endpoint.moduleExtension === void 0 || endpoint.moduleExtension === null) { - throw new Error(`endpoint without moduleExtension property`); + throw new Error('endpoint without moduleExtension property'); } else if (endpoint.declaration === void 0 || endpoint.declaration === null) { - throw new Error(`endpoint without declaration`); + throw new Error('endpoint without declaration'); } else if (endpoint.declaration.functionName === void 0 || endpoint.declaration.functionName === null) { - throw new Error(`endpoint declaration without functionName property`); + throw new Error('endpoint declaration without functionName property'); } const validationResult = endpointDeclarationValidator.validate(endpoint.declaration); if (!(validationResult.isValid)) { diff --git a/lib/query-builder.js b/lib/query-builder.js index b5879a0c..65808297 100644 --- a/lib/query-builder.js +++ b/lib/query-builder.js @@ -2,7 +2,7 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var util = require("util"); +var util = require('util'); var mlutil = require('./mlutil.js'); diff --git a/lib/requester.js b/lib/requester.js index 4b4dade6..7d4d3ba8 100644 --- a/lib/requester.js +++ b/lib/requester.js @@ -24,7 +24,7 @@ function createAuthenticator(client, user, password, challenge) { function createAuthenticatorKerberos(client, credentials) { var authenticatorKerberos = { - "credentials": credentials + 'credentials': credentials }; client.authenticatorKerberos = authenticatorKerberos; return authenticatorKerberos; @@ -64,7 +64,7 @@ function getAccessToken(operation){ } const responseValue = JSON.parse(d.toString()); operation.accessToken = responseValue.access_token; - operation.expiration = new Date(responseValue[".expires"]); + operation.expiration = new Date(responseValue['.expires']); if(operation.lockAccessToken){ operation.lockAccessToken = false; } @@ -232,13 +232,13 @@ function challengeRequest(operation) { } function credentialsRequest(operation) { kerberos = new Kerberos(); - var uri = "HTTP@"+operation.options.host; + var uri = 'HTTP@'+operation.options.host; kerberos.authGSSClientInit(uri, 0, function(err, ctx) { if (err) { operation.errorListener('kerberos initialization failed at '+uri); } operation.logger.debug('kerberos initialized at '+uri); - kerberos.authGSSClientStep(ctx, "", function (err) { + kerberos.authGSSClientStep(ctx, '', function (err) { if (err) { operation.errorListener('kerberos credentials failed'); } @@ -279,7 +279,7 @@ function authenticatedRequest(operation) { operation.logger.debug('kerberos authentication'); request.setHeader( 'authorization', - "Negotiate "+authenticator.credentials + 'Negotiate '+authenticator.credentials ); break; default: @@ -301,14 +301,14 @@ function authenticatedRequest(operation) { } else { request.setHeader( 'authorization', - "bearer " +operation.accessToken + 'bearer ' +operation.accessToken ); } break; case 'OAUTH': request.setHeader( 'Authorization', - "Bearer " +options.oauthToken + 'Bearer ' +options.oauthToken ); } } diff --git a/lib/resources-exec.js b/lib/resources-exec.js index a429c7c2..d9b9db70 100644 --- a/lib/resources-exec.js +++ b/lib/resources-exec.js @@ -77,7 +77,7 @@ function makeRequestOptions(client, args) { return requestOptions; } function validateStatusCode(statusCode) { - return (statusCode < 400) ? null : "response with invalid "+statusCode+" status"; + return (statusCode < 400) ? null : 'response with invalid '+statusCode+' status'; } function Resources(client) { diff --git a/lib/responder.js b/lib/responder.js index 939be6ef..b5f6793f 100644 --- a/lib/responder.js +++ b/lib/responder.js @@ -7,7 +7,7 @@ var jsonParser = require('json-text-sequence').Parser; var Dicer = require('@fastify/busboy/deps/dicer/lib/Dicer'); var through2 = require('through2'); var mlutil = require('./mlutil.js'); -const requester = require("./requester"); +const requester = require('./requester'); const {createGunzip} = require('zlib'); /** @@ -499,7 +499,7 @@ MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( if(errorListenerCheck) { if(response.headers['content-encoding']!=='gzip'){ - response.setEncoding("utf8"); + response.setEncoding('utf8'); } const multipartResponse = (isResponseGzipped(response.headers))?response.pipe(createGunzip()):response; diff --git a/lib/rows.js b/lib/rows.js index 47460f1d..61dbad31 100644 --- a/lib/rows.js +++ b/lib/rows.js @@ -9,7 +9,7 @@ const requester = require('./requester.js'), Operation = require('./operation.js'), planBuilder = require('./plan-builder.js'); const stream = require('stream'); -const bigInt = require("big-integer"); +const bigInt = require('big-integer'); /** @ignore */ function Rows(client) { diff --git a/lib/www-authenticate-patched/user-credentials.js b/lib/www-authenticate-patched/user-credentials.js index d6479bc0..e9128a3a 100644 --- a/lib/www-authenticate-patched/user-credentials.js +++ b/lib/www-authenticate-patched/user-credentials.js @@ -29,9 +29,9 @@ function user_credentials(username,password,options) { '' : (!password && password !== '' ? - Buffer.from(username, "ascii").toString("base64") + Buffer.from(username, 'ascii').toString('base64') : - Buffer.from(username+':'+password, "ascii").toString("base64") + Buffer.from(username+':'+password, 'ascii').toString('base64') ) function Credentials() { diff --git a/lib/www-authenticate-patched/www-authenticate.js b/lib/www-authenticate-patched/www-authenticate.js index 958f6d38..f4d818ac 100644 --- a/lib/www-authenticate-patched/www-authenticate.js +++ b/lib/www-authenticate-patched/www-authenticate.js @@ -26,7 +26,7 @@ var crypto= require('crypto') function hex8(num) { - return ("00000000" + num.toString(16)).slice(-8); + return ('00000000' + num.toString(16)).slice(-8); } var www_authenticator = function(username,password,options) @@ -67,14 +67,14 @@ var www_authenticator = function(username,password,options) case 'Digest': var realm= auth_parms.realm; if (!realm) { - return note_error("Realm not found in www-authenticate header."); + return note_error('Realm not found in www-authenticate header.'); } var ha1= credentials.digest(realm); var nonce= auth_parms.nonce; if (!nonce) { - return note_error("Nonce not found in www-authenticate header."); + return note_error('Nonce not found in www-authenticate header.'); } var fixed= 'Digest username="'+credentials.username+'",'+ @@ -128,7 +128,7 @@ var www_authenticator = function(username,password,options) return note_error('Server does not accept any supported quality of protection techniques.'); } default: - return note_error("Unknown scheme"); + return note_error('Unknown scheme'); } } From b7045900a217336dc4815a6bcac1f871817ba4ae Mon Sep 17 00:00:00 2001 From: Phil Barber Date: Fri, 17 Oct 2025 11:41:06 -0400 Subject: [PATCH 33/58] MLE-24733 - Adding more information to some test descriptions. This makes debugging much easier. --- test-basic/documents-data-movement-transformAll.js | 2 +- test-complete/nodejs-dmsdk-queryToTransformAll.js | 2 +- test-complete/nodejs-dmsdk-removeAllUris.js | 2 +- test-complete/nodejs-dmsdk-transformAll.js | 2 +- test-complete/nodejs-dmsdk-txtFiles-transformAll.js | 2 +- test-complete/nodejs-dmsdk-xmlFiles-transformAll.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test-basic/documents-data-movement-transformAll.js b/test-basic/documents-data-movement-transformAll.js index 651fea9d..a44d86bc 100644 --- a/test-basic/documents-data-movement-transformAll.js +++ b/test-basic/documents-data-movement-transformAll.js @@ -18,7 +18,7 @@ const ctsQb = marklogic.ctsQueryBuilder; const q = marklogic.queryBuilder; const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/transformAll/')); -describe('data movement transformAll', function() { +describe('data movement transformAll (documents-data-movement-transformAll)', function() { before(function(done) { diff --git a/test-complete/nodejs-dmsdk-queryToTransformAll.js b/test-complete/nodejs-dmsdk-queryToTransformAll.js index be5be3ad..1ff17d77 100644 --- a/test-complete/nodejs-dmsdk-queryToTransformAll.js +++ b/test-complete/nodejs-dmsdk-queryToTransformAll.js @@ -18,7 +18,7 @@ const ctsQb = marklogic.ctsQueryBuilder; const q = marklogic.queryBuilder; const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/transformAll/')); -describe('data movement transformAll', function () { +describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', function () { this.timeout(20000); before(function (done) { diff --git a/test-complete/nodejs-dmsdk-removeAllUris.js b/test-complete/nodejs-dmsdk-removeAllUris.js index 8e18f670..b09269f7 100644 --- a/test-complete/nodejs-dmsdk-removeAllUris.js +++ b/test-complete/nodejs-dmsdk-removeAllUris.js @@ -17,7 +17,7 @@ const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/remo let removeStream = new Stream.PassThrough({ objectMode: true }); let uris = []; -describe('Functional tests - data movement removeAllUris', function () { +describe('Functional tests - data movement - nodejs-dmsdk-removeAllUris', function () { this.timeout(15000); beforeEach(function (done) { let readable = new Stream.Readable({ objectMode: true }); diff --git a/test-complete/nodejs-dmsdk-transformAll.js b/test-complete/nodejs-dmsdk-transformAll.js index e9b1b528..de4dc7ba 100644 --- a/test-complete/nodejs-dmsdk-transformAll.js +++ b/test-complete/nodejs-dmsdk-transformAll.js @@ -18,7 +18,7 @@ const ctsQb = marklogic.ctsQueryBuilder; const q = marklogic.queryBuilder; const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/transformAll/')); -describe('data movement transformAll', function () { +describe('data movement transformAll (nodejs-dmsdk-transformAll)', function () { this.timeout(20000); before(function (done) { diff --git a/test-complete/nodejs-dmsdk-txtFiles-transformAll.js b/test-complete/nodejs-dmsdk-txtFiles-transformAll.js index f3500c46..f5b12b32 100644 --- a/test-complete/nodejs-dmsdk-txtFiles-transformAll.js +++ b/test-complete/nodejs-dmsdk-txtFiles-transformAll.js @@ -18,7 +18,7 @@ const ctsQb = marklogic.ctsQueryBuilder; const q = marklogic.queryBuilder; const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/transformAll/')); -describe('data movement transformAll', function () { +describe('data movement transformAll (nodejs-dmsdk-txtFiles-transformAll)', function () { before(function (done) { this.timeout(20000); diff --git a/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js b/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js index cd15bb24..c7acfb2a 100644 --- a/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js +++ b/test-complete/nodejs-dmsdk-xmlFiles-transformAll.js @@ -18,7 +18,7 @@ const ctsQb = marklogic.ctsQueryBuilder; const q = marklogic.queryBuilder; const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/transformAll/')); -describe('data movement transformAll', function () { +describe('data movement transformAll (nodejs-dmsdk-xmlFiles-transformAll)', function () { before(function (done) { this.timeout(20000); From 305041d2f3e2657440c5a57fcd7caf91290023e1 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Fri, 17 Oct 2025 09:40:41 -0400 Subject: [PATCH 34/58] MLE-24763 Lint: Preferring const Zillion little changes, but any issues should cause test failures locally and on Jenkins. --- eslint.config.js | 4 + lib/documents.js | 620 +++++++-------- lib/extlibs.js | 60 +- lib/graphs.js | 234 +++--- lib/internal.js | 2 +- lib/marklogic.js | 118 +-- lib/mllog.js | 2 +- lib/mlutil.js | 68 +- lib/operation.js | 114 +-- lib/optional.js | 2 +- lib/patch-builder.js | 114 +-- lib/plan-builder-base.js | 4 +- lib/query-builder.js | 732 +++++++++--------- lib/requester.js | 112 +-- lib/resources-config.js | 54 +- lib/resources-exec.js | 78 +- lib/responder.js | 258 +++--- lib/rest-server-properties.js | 18 +- lib/rows.js | 47 +- lib/server-exec.js | 40 +- lib/transactions.js | 44 +- lib/transforms.js | 54 +- lib/values-builder.js | 84 +- lib/values.js | 72 +- lib/www-authenticate-patched/md5.js | 2 +- lib/www-authenticate-patched/parsers.js | 20 +- .../user-credentials.js | 14 +- .../www-authenticate.js | 86 +- 28 files changed, 1531 insertions(+), 1526 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 4618b64f..041e8fb3 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -35,6 +35,10 @@ module.exports = [ "no-unused-vars": "error", "no-undef": "error", + // ES6+ modernization - GO TIME! 🚀 + "prefer-const": "error", // Use const for variables never reassigned + "no-var": "error", // Disallow var, use let/const instead + // Spacing rules (disabled for initial setup - TODO: Fix in separate PR) "arrow-spacing": "off", "space-before-blocks": "off", diff --git a/lib/documents.js b/lib/documents.js index be280c32..ebe1ec2b 100644 --- a/lib/documents.js +++ b/lib/documents.js @@ -3,12 +3,12 @@ */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); -var qb = require('./query-builder.js').lib; -var pathModule = require('path'); -var fs = require('fs'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); +const qb = require('./query-builder.js').lib; +const pathModule = require('path'); +const fs = require('fs'); const stream = require('stream'); const bldrbase = require('./plan-builder-base.js'); const duplexify = require('duplexify'); @@ -16,7 +16,7 @@ const duplexify = require('duplexify'); /** @ignore */ function addDocumentUri(documents, document) { if (document != null) { - var uri = document.uri; + const uri = document.uri; if ((typeof uri === 'string' || uri instanceof String) && uri.length > 0) { documents.push(uri); } @@ -35,36 +35,36 @@ function getDocumentUris(documents) { function compareDocuments(firstDoc, secondDoc) { const hasFirstDoc = (firstDoc !== null); const hasSecondDoc = (secondDoc !== null); - if (!hasFirstDoc && !hasSecondDoc) return 0; - if (!hasFirstDoc && hasSecondDoc) return -1; - if (hasFirstDoc && !hasSecondDoc) return 1; + if (!hasFirstDoc && !hasSecondDoc) {return 0;} + if (!hasFirstDoc && hasSecondDoc) {return -1;} + if (hasFirstDoc && !hasSecondDoc) {return 1;} const firstUri = firstDoc.uri; const secondUri = secondDoc.uri; const hasFirstUri = ((typeof firstUri === 'string' || firstUri instanceof String) && firstUri.length > 0); const hasSecondUri = ((typeof secondUri === 'string' || secondUri instanceof String) && secondUri.length > 0); - if (!hasFirstUri && !hasSecondUri) return 0; - if (!hasFirstUri && hasSecondUri) return -1; - if (hasFirstUri && !hasSecondUri) return 1; - if (firstUri < secondUri) return -1; - if (firstUri > secondUri) return 1; + if (!hasFirstUri && !hasSecondUri) {return 0;} + if (!hasFirstUri && hasSecondUri) {return -1;} + if (hasFirstUri && !hasSecondUri) {return 1;} + if (firstUri < secondUri) {return -1;} + if (firstUri > secondUri) {return 1;} return 0; } /** @ignore */ function uriErrorTransform(message) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var uri = operation.uri; + const uri = operation.uri; return (uri == null) ? message : (message+' (on '+uri+')'); } /** @ignore */ function uriListErrorTransform(message) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var uris = operation.uris; + const uris = operation.uris; return ((!Array.isArray(uris)) || uris.length === 0) ? message : (message+' (on '+uris.join(', ')+')'); } @@ -89,15 +89,15 @@ function Documents(client) { /** @ignore */ function probeOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var statusCode = operation.responseStatusCode; - var exists = (statusCode === 200) ? true : false; + const statusCode = operation.responseStatusCode; + const exists = (statusCode === 200) ? true : false; if (operation.contentOnly === true) { return exists; } - var output = exists ? operation.responseHeaders : {}; + const output = exists ? operation.responseHeaders : {}; output.uri = operation.uri; output.exists = exists; @@ -106,9 +106,9 @@ function probeOutputTransform(/*headers, data*/) { function protectOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var output = { + const output = { uri: operation.uri, temporalCollection: operation.temporalCollection, level: operation.level @@ -119,9 +119,9 @@ function protectOutputTransform(/*headers, data*/) { function wipeOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var output = { + const output = { uri: operation.uri, temporalCollection: operation.temporalCollection, wiped: true @@ -133,7 +133,7 @@ function wipeOutputTransform(/*headers, data*/) { function advanceLsqtOutputTransform(headers) { /*jshint validthis:true */ - var output = { + const output = { lsqt: headers.lsqt }; @@ -227,11 +227,11 @@ function probeDocumentsImpl(contentOnly, args) { throw new Error('must supply uri for document check()'); } - var params = (args.length === 1 && typeof args[0] !== 'string' && !(args[0] instanceof String)) ? args[0] : null; + const params = (args.length === 1 && typeof args[0] !== 'string' && !(args[0] instanceof String)) ? args[0] : null; - var uri = null; - var txid = null; - var path = '/v1/documents?format=json'; + let uri = null; + let txid = null; + let path = '/v1/documents?format=json'; // params as list if (params === null) { uri = args[0]; @@ -257,7 +257,7 @@ function probeDocumentsImpl(contentOnly, args) { const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'HEAD'); mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'probe document', this.client, requestOptions, 'empty', 'empty' ); operation.uri = uri; @@ -296,19 +296,19 @@ function probeDocumentsImpl(contentOnly, args) { */ Documents.prototype.protect = function protectDocument() { /*jshint validthis:true */ - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; - var uri = null; - var tempColl = null; - var duration = null; - var expireTime = null; - var level = 'noDelete'; - var archivePath = null; + let uri = null; + let tempColl = null; + let duration = null; + let expireTime = null; + let level = 'noDelete'; + let archivePath = null; // Params as single object if (argLen === 1) { - var obj = args[0]; + const obj = args[0]; if (obj.uri === void 0) { throw new Error('must specify uri'); } else { @@ -346,7 +346,7 @@ Documents.prototype.protect = function protectDocument() { } else { expireTime = args[2]; } - var levels = ['noWipe', 'noDelete', 'noUpdate']; + const levels = ['noWipe', 'noDelete', 'noUpdate']; if (levels.indexOf(args[3]) !== -1) { level = args[3]; } else { @@ -365,7 +365,7 @@ Documents.prototype.protect = function protectDocument() { } } - var path = '/v1/documents/protection?uri=' + encodeURIComponent(uri); + let path = '/v1/documents/protection?uri=' + encodeURIComponent(uri); path += '&temporal-collection=' + encodeURIComponent(tempColl); if (duration !== null) { path += '&duration=' + encodeURIComponent(duration); @@ -379,7 +379,7 @@ Documents.prototype.protect = function protectDocument() { const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'POST'); - var operation = new Operation( + const operation = new Operation( 'protect document', this.client, requestOptions, 'empty', 'empty' ); operation.uri = uri; @@ -411,15 +411,15 @@ Documents.prototype.protect = function protectDocument() { */ Documents.prototype.wipe = function wipeDocument() { /*jshint validthis:true */ - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; - var uri = null; - var tempColl = null; + let uri = null; + let tempColl = null; // Params as single object if (argLen === 1) { - var obj = args[0]; + const obj = args[0]; if (obj.uri === void 0) { throw new Error('must specify uri'); } else { @@ -440,13 +440,13 @@ Documents.prototype.wipe = function wipeDocument() { tempColl = args[1]; } - var path = '/v1/documents?uri=' + encodeURIComponent(uri); + let path = '/v1/documents?uri=' + encodeURIComponent(uri); path += '&temporal-collection=' + encodeURIComponent(tempColl); path += '&result=wiped'; const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'DELETE'); - var operation = new Operation( + const operation = new Operation( 'wipe document', this.client, requestOptions, 'empty', 'empty' ); operation.uri = uri; @@ -471,10 +471,10 @@ Documents.prototype.wipe = function wipeDocument() { */ Documents.prototype.advanceLsqt = function temporalAdvanceLsqt() { /*jshint validthis:true */ - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); - var tempColl = null; - var lag = null; + let tempColl = null; + let lag = null; // Positional case if (typeof args[0] === 'string' || args[0] instanceof String) { @@ -489,7 +489,7 @@ Documents.prototype.advanceLsqt = function temporalAdvanceLsqt() { } // Object case else { - var obj = args[0]; + const obj = args[0]; if (obj.temporalCollection === void 0) { throw new Error('must specify temporalCollection'); } else { @@ -504,7 +504,7 @@ Documents.prototype.advanceLsqt = function temporalAdvanceLsqt() { } } - var path = '/v1/temporal/collections/' + encodeURIComponent(tempColl); + let path = '/v1/temporal/collections/' + encodeURIComponent(tempColl); path += '?result=advance-lsqt'; if (lag !== null) { path += '&lag=' + encodeURIComponent(lag); @@ -512,7 +512,7 @@ Documents.prototype.advanceLsqt = function temporalAdvanceLsqt() { const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'POST'); - var operation = new Operation( + const operation = new Operation( 'advance LSQT', this.client, requestOptions, 'empty', 'empty' ); // operation.temporalCollection = tempColl; @@ -531,9 +531,9 @@ function readStatusValidator(statusCode) { /** @ignore */ function singleReadOutputTransform(headers, data) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var hasData = (data != null); + const hasData = (data != null); if (hasData && (data.errorResponse != null) && data.errorResponse.statusCode === 404 @@ -541,15 +541,15 @@ function singleReadOutputTransform(headers, data) { return []; } - var content = hasData ? data : null; + const content = hasData ? data : null; if (operation.contentOnly === true) { return [content]; } - var categories = operation.categories; + const categories = operation.categories; - var document = (categories.length === 1 && categories[0] === 'content') ? + const document = (categories.length === 1 && categories[0] === 'content') ? {content: content} : collectMetadata(content); if(operation.uris){ @@ -557,21 +557,21 @@ function singleReadOutputTransform(headers, data) { } document.category = categories; - var format = headers.format; + const format = headers.format; if (typeof format === 'string' || format instanceof String) { document.format = format; if (format !== 'json') { - var contentLength = headers.contentLength; + const contentLength = headers.contentLength; if (contentLength != null) { document.contentLength = contentLength; } } } - var headerList = ['contentType', 'versionId']; - var headerKey = null; - var headerValue = null; - var i = 0; + const headerList = ['contentType', 'versionId']; + let headerKey = null; + let headerValue = null; + let i = 0; for (i = 0; i < headerList.length; i++) { headerKey = headerList[i]; headerValue = headers[headerKey]; @@ -625,15 +625,15 @@ function readDocumentsImpl(contentOnly, args) { throw new Error('must specify at least one document to read'); } - var uris = null; - var categories = null; - var txid = null; - var transform = null; - var contentType = null; - var range = null; - var timestamp = null; + let uris = null; + let categories = null; + let txid = null; + let transform = null; + let contentType = null; + let range = null; + let timestamp = null; - var arg = args[0]; + const arg = args[0]; if (Array.isArray(arg)) { uris = arg; } else if (typeof arg === 'string' || arg instanceof String) { @@ -661,7 +661,7 @@ function readDocumentsImpl(contentOnly, args) { } if (categories != null) { - var i = 0; + let i = 0; for (i = 0; i < categories.length; i++) { if(categories[i] === 'rawContent'){ if(categories.length>1) { @@ -675,7 +675,7 @@ function readDocumentsImpl(contentOnly, args) { } } - var path = '/v1/documents?format=json&uri='+ + let path = '/v1/documents?format=json&uri='+ uris.map(encodeURIComponent).join('&uri='); path += '&category=' + categories.join('&category='); if (txid != null) { @@ -691,7 +691,7 @@ function readDocumentsImpl(contentOnly, args) { } } - var isSinglePayload = ( + const isSinglePayload = ( uris.length === 1 && ( (categories.length === 1 && categories[0] === 'content') || categories.indexOf('content') === -1 @@ -703,7 +703,7 @@ function readDocumentsImpl(contentOnly, args) { Accept: 'multipart/mixed; boundary='+mlutil.multipartBoundary }; } else { - var hasContentType = false; + let hasContentType = false; if (contentType != null) { if (typeof contentType === 'string' || contentType instanceof String) { hasContentType = true; @@ -716,7 +716,7 @@ function readDocumentsImpl(contentOnly, args) { if (!Array.isArray(range)) { throw new Error('byte range parameter for reading binary document is not an array: '+range); } - var bytes = null; + let bytes = null; switch (range.length) { case 0: throw new Error('no start length for byte range parameter for reading binary document'); @@ -762,7 +762,7 @@ function readDocumentsImpl(contentOnly, args) { } mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'read documents', this.client, requestOptions, 'empty', (isSinglePayload ? 'single' : 'multipart') ); @@ -815,8 +815,8 @@ Documents.prototype.createWriteStream = function createWriteStream(document) { throw new Error('must write to stream to supply document content'); } - var categories = document.categories; - var hasCategories = Array.isArray(categories) && categories.length > 0; + let categories = document.categories; + const hasCategories = Array.isArray(categories) && categories.length > 0; if (!hasCategories && (typeof categories === 'string' || categories instanceof String)) { categories = [categories]; } @@ -830,16 +830,16 @@ Documents.prototype.createWriteStream = function createWriteStream(document) { /** @ignore */ function writeStreamImpl(document, categories) { /*jshint validthis:true */ - var endpoint = '/v1/documents'; + let endpoint = '/v1/documents'; - var txid = getTxid(document); + const txid = getTxid(document); - var writeParams = addWriteParams(document, categories, txid); + const writeParams = addWriteParams(document, categories, txid); if (writeParams.length > 0) { endpoint += writeParams; } - var multipartBoundary = mlutil.multipartBoundary; + const multipartBoundary = mlutil.multipartBoundary; const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), endpoint, 'POST'); requestOptions.headers = { 'Content-Type': 'multipart/mixed; boundary='+multipartBoundary, @@ -847,14 +847,14 @@ function writeStreamImpl(document, categories) { }; mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'write document stream', this.client, requestOptions, 'chunkedMultipart', 'single' ); operation.isReplayable = false; operation.uri = document.uri; // TODO: treat as chunked single document if no properties - var requestPartList = []; + const requestPartList = []; addDocumentParts(operation, requestPartList, document, true); operation.requestDocument = requestPartList; @@ -867,14 +867,14 @@ function writeStreamImpl(document, categories) { /** @ignore */ function singleWriteOutputTransform(headers, data) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var uri = operation.uri; + let uri = operation.uri; if (uri == null) { - var location = headers.location; + const location = headers.location; if (location != null) { - var startsWith = '/v1/documents?uri='; + const startsWith = '/v1/documents?uri='; if (location.length > startsWith.length && location.substr(0, startsWith.length) === startsWith) { uri = location.substr(startsWith.length); @@ -886,21 +886,21 @@ function singleWriteOutputTransform(headers, data) { return [uri]; } - var document = {uri: uri}; + const document = {uri: uri}; - var categories = operation.categories; + const categories = operation.categories; if (categories == null) { document.categories = categories; } - var contentType = (data == null) ? null : data['mime-type']; + const contentType = (data == null) ? null : data['mime-type']; if (contentType == null) { document.contentType = contentType; } - var wrapper = {documents: [document]}; + const wrapper = {documents: [document]}; - var systemTime = headers.systemTime; + const systemTime = headers.systemTime; if (systemTime != null) { wrapper.systemTime = systemTime; } @@ -911,7 +911,7 @@ function singleWriteOutputTransform(headers, data) { function writeListOutputTransform(headers, data) { // var operation = this; - var systemTime = headers.systemTime; + const systemTime = headers.systemTime; if (systemTime == null) { return data; } @@ -968,10 +968,10 @@ function writeDocumentsImpl(contentOnly, args) { throw new Error('must provide uris for document write()'); } - var arg = args[0]; + const arg = args[0]; - var documents = arg.documents; - var params = (documents == null) ? null : arg; + let documents = arg.documents; + const params = (documents == null) ? null : arg; if (params !== null) { if (!Array.isArray(documents)) { documents = [documents]; @@ -982,24 +982,24 @@ function writeDocumentsImpl(contentOnly, args) { documents = args; } - var isSingleDoc = (documents.length === 1); + const isSingleDoc = (documents.length === 1); - var document = isSingleDoc ? documents[0] : null; - var hasDocument = (document != null); - var hasContent = hasDocument && (document.content != null); + const document = isSingleDoc ? documents[0] : null; + const hasDocument = (document != null); + const hasContent = hasDocument && (document.content != null); - var requestParams = + const requestParams = (params !== null) ? params : (hasDocument) ? document : null; - var categories = (requestParams == null) ? null : requestParams.categories; + let categories = (requestParams == null) ? null : requestParams.categories; if (typeof categories === 'string' || categories instanceof String) { categories = [categories]; } if (categories != null) { - for (var i = 0; i < categories.length; i++) { + for (let i = 0; i < categories.length; i++) { categories[i] = categories[i] === 'metadataValues' ? 'metadata-values' : categories[i]; } } @@ -1017,19 +1017,19 @@ function writeDocumentsImpl(contentOnly, args) { /** @ignore */ function writeMetadata(document, categories) { /*jshint validthis:true */ - var uri = document.uri; + const uri = document.uri; - var endpoint = '/v1/documents?uri='+encodeURIComponent(uri); + let endpoint = '/v1/documents?uri='+encodeURIComponent(uri); if (!Array.isArray(categories)) { categories = []; } - var hasCategories = (categories.length > 0); + let hasCategories = (categories.length > 0); if (!hasCategories) { - var categoryCheck = ['collections', 'permissions', 'quality', 'properties', 'metadataValues']; - var category = null; - var i = 0; + const categoryCheck = ['collections', 'permissions', 'quality', 'properties', 'metadataValues']; + let category = null; + let i = 0; for (i = 0; i < categoryCheck.length; i++) { category = categoryCheck[i]; if (document[category] != null) { @@ -1046,12 +1046,12 @@ function writeMetadata(document, categories) { endpoint += '&category='+categories.join('&category='); } - var txid = mlutil.convertTransaction(document.txid); + const txid = mlutil.convertTransaction(document.txid); if (txid != null) { endpoint += '&txid='+mlutil.getTxidParam(txid); } - var requestHeaders = { + const requestHeaders = { 'Accept': 'application/json', 'Content-Type': 'application/json' }; @@ -1060,7 +1060,7 @@ function writeMetadata(document, categories) { requestOptions.headers = requestHeaders; mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'write single metadata', this.client, requestOptions, 'single', 'empty' ); operation.uri = uri; @@ -1075,32 +1075,32 @@ function writeMetadata(document, categories) { /** @ignore */ function writeContent(contentOnly, document, requestParams, categories, requestType) { /*jshint validthis:true */ - var content = document.content; - var hasContent = (content != null); + const content = document.content; + const hasContent = (content != null); - var endpoint = '/v1/documents'; + let endpoint = '/v1/documents'; - var sep = '?'; + let sep = '?'; - var txid = getTxid(requestParams); + const txid = getTxid(requestParams); - var writeParams = addWriteParams(requestParams, categories, txid); + const writeParams = addWriteParams(requestParams, categories, txid); if (writeParams.length > 0) { endpoint += writeParams; sep = '&'; } - var uri = document.uri; - var hasUri = (uri != null); + const uri = document.uri; + const hasUri = (uri != null); if (hasUri) { endpoint += sep+'uri='+encodeURIComponent(uri); if (sep === '?') { sep = '&'; } } - var i = 0; + let i = 0; - var collections = document.collections; + const collections = document.collections; if (collections != null) { if (Array.isArray(collections)) { for (i=0; i < collections.length; i++) { @@ -1113,12 +1113,12 @@ function writeContent(contentOnly, document, requestParams, categories, requestT } } - var permissions = document.permissions; + const permissions = document.permissions; if (permissions != null) { - var permission = null; - var roleName = null; - var capabilities = null; - var j = 0; + let permission = null; + let roleName = null; + let capabilities = null; + let j = 0; if (Array.isArray(permissions)) { for (i=0; i < permissions.length; i++) { permission = permissions[i]; @@ -1149,28 +1149,28 @@ function writeContent(contentOnly, document, requestParams, categories, requestT } } - var quality = document.quality; + const quality = document.quality; if (quality != null) { endpoint += sep+'quality='+quality; if (sep === '?') { sep = '&'; } } - var metadataValues = document.metadataValues; - for (var key in metadataValues) { + const metadataValues = document.metadataValues; + for (const key in metadataValues) { endpoint += sep+'value:'+key+'='+encodeURIComponent(metadataValues[key]); } - var temporalDocument = document.temporalDocument; + const temporalDocument = document.temporalDocument; if (temporalDocument != null) { endpoint += sep+'temporal-document='+temporalDocument; if (sep === '?') { sep = '&'; } } - var requestHeaders = { + const requestHeaders = { 'Accept': 'application/json' }; - var writeConfig = addWriteConfig(document, hasUri, content, requestHeaders, sep); + const writeConfig = addWriteConfig(document, hasUri, content, requestHeaders, sep); if (writeConfig.length > 0) { endpoint += writeConfig; if (sep === '?') { sep = '&'; } @@ -1179,7 +1179,7 @@ function writeContent(contentOnly, document, requestParams, categories, requestT const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), endpoint, hasUri ? 'PUT' : 'POST'); requestOptions.headers = requestHeaders; mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'write single document', this.client, requestOptions, requestType, 'empty' ); if (hasUri) { @@ -1205,18 +1205,18 @@ function writeDocumentList(contentOnly, documents, requestParams, categories) { documents = documents.sort(compareDocuments); } - var endpoint = '/v1/documents'; + let endpoint = '/v1/documents'; - var txid = getTxid(requestParams); + const txid = getTxid(requestParams); - var writeParams = addWriteParams(requestParams, categories, txid); + const writeParams = addWriteParams(requestParams, categories, txid); if (writeParams.length > 0) { endpoint += writeParams; } - var multipartBoundary = mlutil.multipartBoundary; + const multipartBoundary = mlutil.multipartBoundary; - var requestHeaders = { + const requestHeaders = { 'Accept': 'application/json', 'Content-Type': 'multipart/mixed; boundary='+multipartBoundary }; @@ -1225,7 +1225,7 @@ function writeDocumentList(contentOnly, documents, requestParams, categories) { requestOptions.headers = requestHeaders; mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'write document list', this.client, requestOptions, 'multipart', 'single' ); operation.uris = getDocumentUris(documents); @@ -1235,8 +1235,8 @@ function writeDocumentList(contentOnly, documents, requestParams, categories) { operation.multipartBoundary = multipartBoundary; - var requestPartList = []; - for (var i=0; i < documents.length; i++) { + const requestPartList = []; + for (let i=0; i < documents.length; i++) { addDocumentParts(operation, requestPartList, documents[i], false); } operation.requestPartList = requestPartList; @@ -1256,9 +1256,9 @@ function getTxid(requestParams) { } /** @ignore */ function addWriteParams(requestParams, categories, txidRaw) { - var writeParams = ''; - var txid = mlutil.convertTransaction(txidRaw); - var sep = '?'; + let writeParams = ''; + const txid = mlutil.convertTransaction(txidRaw); + let sep = '?'; if (requestParams != null) { if (Array.isArray(categories) && categories.length > 0) { writeParams += sep+'category='+categories.join('&category='); @@ -1268,21 +1268,21 @@ function addWriteParams(requestParams, categories, txidRaw) { writeParams += sep+'txid='+mlutil.getTxidParam(txid); if (sep !== '&') { sep = '&'; } } - var transform = mlutil.endpointTransform(requestParams.transform); + const transform = mlutil.endpointTransform(requestParams.transform); if (transform != null) { writeParams += sep+transform; if (sep !== '&') { sep = '&'; } } - var forestName = requestParams.forestName; + const forestName = requestParams.forestName; if (forestName != null) { writeParams += sep+'forest-name='+encodeURIComponent(forestName); if (sep !== '&') { sep = '&'; } } - var temporalCollection = requestParams.temporalCollection; + const temporalCollection = requestParams.temporalCollection; if (temporalCollection != null) { writeParams += sep+'temporal-collection='+encodeURIComponent(temporalCollection); if (sep !== '&') { sep = '&'; } - var systemTime = requestParams.systemTime; + const systemTime = requestParams.systemTime; if (typeof systemTime === 'string' || systemTime instanceof String) { writeParams += '&system-time='+encodeURIComponent(systemTime); } else if (Object.prototype.toString.call(systemTime) === '[object Date]') { @@ -1295,16 +1295,16 @@ function addWriteParams(requestParams, categories, txidRaw) { } /** @ignore */ function addWriteConfig(document, hasUri, content, headers, sep) { - var writeConfig = ''; + let writeConfig = ''; - var isBody = (sep !== '; '); + const isBody = (sep !== '; '); if (!hasUri) { - var extension = document.extension; + const extension = document.extension; if (extension != null) { writeConfig += sep+'extension='+extension; if (isBody && sep === '?') { sep = '&'; } - var directory = document.directory; + const directory = document.directory; if (directory != null) { writeConfig += sep+'directory='+ (isBody ? encodeURIComponent(directory) : directory); @@ -1312,7 +1312,7 @@ function addWriteConfig(document, hasUri, content, headers, sep) { } } - var versionId = document.versionId; + const versionId = document.versionId; if (versionId != null) { if (isBody) { headers['If-Match'] = versionId; @@ -1321,10 +1321,10 @@ function addWriteConfig(document, hasUri, content, headers, sep) { } } - var contentType = document.contentType; - var hasContentType = (contentType != null); - var format = document.format; - var hasFormat = (format != null); + let contentType = document.contentType; + let hasContentType = (contentType != null); + let format = document.format; + let hasFormat = (format != null); if (hasContentType) { if (!hasFormat) { @@ -1399,10 +1399,10 @@ function addWriteConfig(document, hasUri, content, headers, sep) { } /** @ignore */ function addDocumentParts(operation, partList, document, isContentOptional) { - var uri = document.uri; - var hasUri = (uri != null); + const uri = document.uri; + const hasUri = (uri != null); - var disposition = ''; + let disposition = ''; if (hasUri) { disposition = 'attachment; filename="'+uri+'"'; if (document.temporalDocument != null) { @@ -1412,7 +1412,7 @@ function addDocumentParts(operation, partList, document, isContentOptional) { disposition = 'inline'; } - var metadata = collectMetadata(document); + const metadata = collectMetadata(document); if (metadata != null) { partList.push({ headers:{ @@ -1423,13 +1423,13 @@ function addDocumentParts(operation, partList, document, isContentOptional) { }); } - var content = document.content; - var hasContent = (content != null); + const content = document.content; + const hasContent = (content != null); if (hasContent || isContentOptional) { - var headers = {}; - var part = {headers: headers}; + const headers = {}; + const part = {headers: headers}; - var writeConfig = addWriteConfig(document, hasUri, content, headers, '; '); + const writeConfig = addWriteConfig(document, hasUri, content, headers, '; '); if (writeConfig.length > 0) { disposition += writeConfig; } @@ -1446,11 +1446,11 @@ function addDocumentParts(operation, partList, document, isContentOptional) { /** @ignore */ function collectMetadata(document) { - var metadata = null; + let metadata = null; // TODO: create array wrapper for collections, capabilities - var metadataCategories = ['collections', 'permissions', 'quality', 'properties', 'metadataValues']; - for (var i = 0; i < metadataCategories.length; i++) { - var category = metadataCategories[i]; + const metadataCategories = ['collections', 'permissions', 'quality', 'properties', 'metadataValues']; + for (let i = 0; i < metadataCategories.length; i++) { + const category = metadataCategories[i]; if (document !== null) { if (document[category] != null) { if (metadata === null) { @@ -1466,18 +1466,18 @@ function collectMetadata(document) { /** @ignore */ function removeOutputTransform(headers/*, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; if (operation.contentOnly === true) { return operation.uris; } - var wrapper = { + const wrapper = { uris: operation.uris, removed: true }; - var systemTime = headers.systemTime; + const systemTime = headers.systemTime; if (systemTime != null) { wrapper.systemTime = systemTime; } @@ -1524,13 +1524,13 @@ function removeDocumentImpl(contentOnly, args) { throw new Error('must provide uris for document remove()'); } - var uris = null; - var txid = null; - var temporalCollection = null; - var systemTime = null; - var versionId = null; + let uris = null; + let txid = null; + let temporalCollection = null; + let systemTime = null; + let versionId = null; - var arg = args[0]; + const arg = args[0]; if (Array.isArray(arg)) { uris = arg; } else if (typeof arg === 'string' || arg instanceof String) { @@ -1550,7 +1550,7 @@ function removeDocumentImpl(contentOnly, args) { versionId = arg.versionId; } - var path = '/v1/documents?uri='+ + let path = '/v1/documents?uri='+ uris.map(encodeURIComponent).join('&uri='); if (txid != null) { path += '&txid='+mlutil.getTxidParam(txid); @@ -1572,7 +1572,7 @@ function removeDocumentImpl(contentOnly, args) { } mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'remove document', this.client, requestOptions, 'empty', 'empty' ); operation.uris = uris; @@ -1586,22 +1586,22 @@ function removeDocumentImpl(contentOnly, args) { function removeAllOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; if (operation.contentOnly === true) { return operation.collection; } - var output = { + const output = { exists: false }; - var collection = operation.collection; + const collection = operation.collection; if (collection != null) { output.collection = collection; } - var directory = operation.directory; + const directory = operation.directory; if (directory != null) { output.directory = directory; } @@ -1637,18 +1637,18 @@ function removeAllDocumentsImpl(contentOnly, params) { throw new Error('No parameters specifying directory or collection to delete'); } - var deleteAll = (params.all === true); + const deleteAll = (params.all === true); - var collection = params.collection; - var hasCollection = (collection != null); + const collection = params.collection; + const hasCollection = (collection != null); - var directory = params.directory; - var hasDirectory = (directory != null); + const directory = params.directory; + const hasDirectory = (directory != null); - var txid = mlutil.convertTransaction(params.txid); + const txid = mlutil.convertTransaction(params.txid); - var endpoint = '/v1/search'; - var sep = '?'; + let endpoint = '/v1/search'; + let sep = '?'; if (hasCollection || hasDirectory) { if (deleteAll) { @@ -1680,7 +1680,7 @@ function removeAllDocumentsImpl(contentOnly, params) { const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), endpoint, 'DELETE'); mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'remove all documents', this.client, requestOptions, 'empty', 'empty' ); if (hasCollection) { @@ -1752,47 +1752,47 @@ Documents.prototype.query = function queryDocuments(builtQuery, timestamp, resul }; function queryDocumentsImpl(collectionParam, contentOnly, builtQuery, timestamp, resultEstimateCallback) { /*jshint validthis:true */ - var wrapper = qb.makeSearchBody(builtQuery); - - var categories = wrapper.categories; - var optionsName = wrapper.optionsName; - var pageStart = wrapper.pageStart; - var pageLength = wrapper.pageLength; - var txid = mlutil.convertTransaction(wrapper.txid); - var transform = wrapper.transform; - var view = wrapper.view; - var searchBody = wrapper.searchBody; - - var returnDocuments = (pageLength !== 0); + const wrapper = qb.makeSearchBody(builtQuery); + + const categories = wrapper.categories; + const optionsName = wrapper.optionsName; + const pageStart = wrapper.pageStart; + const pageLength = wrapper.pageLength; + const txid = mlutil.convertTransaction(wrapper.txid); + const transform = wrapper.transform; + const view = wrapper.view; + const searchBody = wrapper.searchBody; + + let returnDocuments = (pageLength !== 0); if (!returnDocuments && builtQuery.queryType !== 'qbe') { - var searchOptions = searchBody.search.options; + const searchOptions = searchBody.search.options; if (searchOptions !== void 0) { - var transformResults = searchOptions['transform-results']; + const transformResults = searchOptions['transform-results']; if (transformResults !== null && transformResults !== void 0 && transformResults.apply !== 'empty-snippet') { throw new Error('cannot snippet with page length of zero'); } - var extractResults = searchOptions['extract-document-data']; + const extractResults = searchOptions['extract-document-data']; if (extractResults !== null && extractResults !== void 0) { throw new Error('cannot extract document data with page length of zero'); } } } - var requestPartList = null; + let requestPartList = null; - var isMultipart = false; + let isMultipart = false; - var endpoint = null; + let endpoint = null; if (builtQuery.queryFormat === void 0) { endpoint = '/v1/search?format=json'; } else if (builtQuery.queryType === 'qbe') { - var qbeQuery = searchBody.search.$query; + const qbeQuery = searchBody.search.$query; if (typeof qbeQuery === 'string' || qbeQuery instanceof String) { - var options = searchBody.search.options; - var part = { + const options = searchBody.search.options; + const part = { headers: {'Content-Type': 'application/xml'}, content: qbeQuery }; @@ -1811,7 +1811,7 @@ function queryDocumentsImpl(collectionParam, contentOnly, builtQuery, timestamp, endpoint = '/v1/search?format='+builtQuery.queryFormat; } - var multipartBoundary = + const multipartBoundary = (isMultipart || returnDocuments) ? mlutil.multipartBoundary : null; if (categories != null) { @@ -1867,7 +1867,7 @@ function queryDocumentsImpl(collectionParam, contentOnly, builtQuery, timestamp, }; mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'query documents', this.client, requestOptions, (isMultipart ? 'multipart' : 'single'), (returnDocuments ? 'multipart' : 'single') @@ -1897,7 +1897,7 @@ function queryDocumentsImpl(collectionParam, contentOnly, builtQuery, timestamp, /** @ignore */ function patchOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; return { uri: operation.uri @@ -1940,26 +1940,26 @@ function patchOutputTransform(/*headers, data*/) { * a {@link documents#patchResult} success callback. */ Documents.prototype.patch = function patchDocuments() { - var argLen = arguments.length; + const argLen = arguments.length; - var arg = arguments[0]; + let arg = arguments[0]; - var params = (argLen === 1) ? arg : null; + const params = (argLen === 1) ? arg : null; // TODO: allow for raw JSON or XML patch - var uri = null; - var documentOperations = null; - var categories = null; - var temporalCollection = null; - var temporalDocument = null; - var sourceDocument = null; - var txid = null; - var versionId = null; - var pathlang = null; - var format = null; - var isRawPatch = false; - var i = 0; + let uri = null; + let documentOperations = null; + let categories = null; + let temporalCollection = null; + let temporalDocument = null; + let sourceDocument = null; + let txid = null; + let versionId = null; + let pathlang = null; + let format = null; + let isRawPatch = false; + let i = 0; if (params !== null) { uri = params.uri; arg = params.operations; @@ -2022,7 +2022,7 @@ Documents.prototype.patch = function patchDocuments() { } } - var endpoint = '/v1/documents?uri='+encodeURIComponent(uri); + let endpoint = '/v1/documents?uri='+encodeURIComponent(uri); if (categories != null) { if (!Array.isArray(categories)) { categories = [categories]; @@ -2048,7 +2048,7 @@ Documents.prototype.patch = function patchDocuments() { endpoint += '&txid=' + mlutil.getTxidParam(txid); } - var patchBody = isRawPatch ? documentOperations : {patch: documentOperations}; + const patchBody = isRawPatch ? documentOperations : {patch: documentOperations}; if (!isRawPatch && (pathlang != null)) { patchBody.pathlang = pathlang; } @@ -2065,7 +2065,7 @@ Documents.prototype.patch = function patchDocuments() { } mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'patch document', this.client, requestOptions, 'single', 'single' ); operation.uri = uri; @@ -2099,16 +2099,16 @@ Documents.prototype.patch = function patchDocuments() { * strings. */ Documents.prototype.suggest = function suggestDocuments() { - var argLen = arguments.length; + const argLen = arguments.length; if (argLen < 1) { throw new Error('no partial query text or query with bindings'); } - var params = null; - var partial = null; - var query = null; - var bindings = null; - var limit = null; + let params = null; + let partial = null; + let query = null; + let bindings = null; + let limit = null; switch (argLen) { case 1: params = arguments[0]; @@ -2135,10 +2135,10 @@ Documents.prototype.suggest = function suggestDocuments() { throw new Error('no query with bindings for document suggestion'); } - var wrapper = qb.makeSearchBody(query); + const wrapper = qb.makeSearchBody(query); - var searchBody = wrapper.searchBody; - var search = searchBody.search; + const searchBody = wrapper.searchBody; + const search = searchBody.search; if (search == null) { throw new Error('cannot get document suggestions for empty search'); } @@ -2146,35 +2146,35 @@ Documents.prototype.suggest = function suggestDocuments() { throw new Error('cannot get document suggestions for Query By Example (QBE)'); } - var searchOptions = search.options; + let searchOptions = search.options; if (searchOptions == null) { searchOptions = {}; search.options = searchOptions; } - var searchConstraints = searchOptions.constraint; + const searchConstraints = searchOptions.constraint; - var hasBindings = (bindings != null); + const hasBindings = (bindings != null); - var suggestConstraints = hasBindings ? bindings.constraint : null; - var sources = copyConstraints(suggestConstraints, searchConstraints); + const suggestConstraints = hasBindings ? bindings.constraint : null; + const sources = copyConstraints(suggestConstraints, searchConstraints); if (sources.length > 0) { searchOptions['suggestion-source'] = sources; } - var term = hasBindings ? bindings.term : null; + let term = hasBindings ? bindings.term : null; if (term == null) { term = searchOptions.term; } - var termDefault = null; + let termDefault = null; if (term != null) { - termDefault = term['default']; + termDefault = term.default; if (termDefault != null) { searchOptions['default-suggestion-source'] = termDefault; } } - var endpoint = '/v1/suggest?partial-q='+encodeURIComponent(partial); + let endpoint = '/v1/suggest?partial-q='+encodeURIComponent(partial); if (limit != null) { endpoint += '&limit=' + limit; } @@ -2186,7 +2186,7 @@ Documents.prototype.suggest = function suggestDocuments() { }; mlutil.addTxidHeaders(requestOptions, wrapper.txid); - var operation = new Operation( + const operation = new Operation( 'search suggest', this.client, requestOptions, 'single', 'single' ); operation.input = partial; @@ -2225,19 +2225,19 @@ Documents.prototype.writeAll = function writeAllDocuments(stream,options) { }; function writeAllDocumentsImpl(inputStream,jobOptions) { - let path = '/v1/internal/forestinfo'; - let connectionParams = this.client.getConnectionParams(); + const path = '/v1/internal/forestinfo'; + const connectionParams = this.client.getConnectionParams(); const requestOptions = mlutil.newRequestOptions(connectionParams, path, 'GET'); requestOptions.headers = { 'Accept': 'application/json', }; - let operation = new Operation( + const operation = new Operation( 'read forestInfo', this.client, requestOptions, 'empty', 'single' ); - let jobState = { + const jobState = { docInstance : this, stream: inputStream, requesterCount: 0, @@ -2477,20 +2477,20 @@ function queryAllDocumentsImpl(query, jobOptions) { throw new Error('Query needs to be a cts query.'); } - let path = '/v1/internal/forestinfo'; + const path = '/v1/internal/forestinfo'; const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'POST'); - let wrapper = {ctsast: bldrbase.exportArg(query.whereClause)}; + const wrapper = {ctsast: bldrbase.exportArg(query.whereClause)}; requestOptions.headers = { 'Accept': 'application/json', 'Content-Type': 'application/json' }; - let operation = new Operation( + const operation = new Operation( 'read forestInfo', this.client, requestOptions, 'single', 'single' ); operation.requestBody = mlutil.marshal(wrapper, operation); - let jobState = { + const jobState = { docInstance : this, jobOptions: (jobOptions)? mlutil.copyProperties(jobOptions):{}, urisReadSoFar: 0, @@ -2542,7 +2542,7 @@ function queryAllDocumentsImpl(query, jobOptions) { function onQueryUrisRequest(output) { const jobState = this; const pageLength = (jobState.jobOptions.batchSize * jobState.jobOptions.queryBatchMultiple); - let endpoint = '/v1/internal/uris?filtered=false&start=1&pageLength='+pageLength; + const endpoint = '/v1/internal/uris?filtered=false&start=1&pageLength='+pageLength; jobState.query = output.query; jobState.forests = output.forests; jobState.requesterCount = output.forests.length; @@ -2574,8 +2574,8 @@ function spinForestRequests(jobState, initialization){ } function onDocUrisCollected(output) { - let jobValues= this; - let jobState = jobValues.jobState; + const jobValues= this; + const jobState = jobValues.jobState; if(output) { const uriArr = output.uriArr; @@ -2586,7 +2586,7 @@ function onDocUrisCollected(output) { const writeSize = jobState.jobOptions.batchSize; let i=0; while(i 0) { overrides = {}; for (i=0; i < bindLen; i++) { @@ -3237,7 +3237,7 @@ function copyConstraints(suggestConstraints, searchConstraints) { copy = null; } - var isCopyKey = null; + let isCopyKey = null; if (Array.isArray(searchConstraints)) { isCopyKey = { collection: true, @@ -3319,18 +3319,18 @@ Documents.prototype.transformAll = function transformAllDocuments(stream, option }; function transformAllDocumentsImpl(inputStream, jobOptions){ - let path = '/v1/internal/forestinfo'; + const path = '/v1/internal/forestinfo'; const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'GET'); requestOptions.headers = { 'Accept': 'application/json', }; - let operation = new Operation( + const operation = new Operation( 'read forestInfo', this.client, requestOptions, 'empty', 'single' ); - let jobState = { + const jobState = { docInstance : this, requesterCount: 0, docsTransformedSuccessfully:0, @@ -3416,7 +3416,7 @@ function onTransformAllInit(output) { '&transform='+jobState.jobOptions.transform[0]; if(jobState.jobOptions.transform.length >1){ const transformParams = jobState.jobOptions.transform[1]; - for(let paramName of Object.keys(transformParams)){ + for(const paramName of Object.keys(transformParams)){ const paramValue = transformParams[paramName]; endpoint+= '&'+encodeURIComponent('trans:'+paramName)+'='+encodeURIComponent(paramValue); } @@ -3494,7 +3494,7 @@ function onTransformAllDocs(jobState, writerId) { function transformDocs(jobState, transformBatchArray, writerId){ - let operation = new Operation( + const operation = new Operation( 'transform docs', jobState.docInstance.client, jobState.requestOptions, 'single', 'single' ); operation.validStatusCodes = [200, 201]; @@ -3639,8 +3639,8 @@ Documents.prototype.queryToTransformAll = function queryToTransformAllDocuments( }; function queryToTransformAllDocumentsImpl(query, jobOptions){ - let queryAllJobOptions = {}; - let transformAllJobOptions = {}; + const queryAllJobOptions = {}; + const transformAllJobOptions = {}; if(!jobOptions){ jobOptions = {}; @@ -3687,7 +3687,7 @@ function queryToTransformAllDocumentsImpl(query, jobOptions){ queryAllJobOptions.queryToOptions = transformAllJobOptions; const docInstance = this; - let queryAllStream = queryAllDocumentsImpl.call(docInstance, query, queryAllJobOptions); + const queryAllStream = queryAllDocumentsImpl.call(docInstance, query, queryAllJobOptions); let pipelined = false; queryAllStream.on('data', function(item){ @@ -3731,18 +3731,18 @@ Documents.prototype.removeAllUris = function removeAllUrisDocuments(stream, opti }; function removeAllUrisDocumentsImpl(inputStream, jobOptions){ - let path = '/v1/internal/forestinfo'; + const path = '/v1/internal/forestinfo'; const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'GET'); requestOptions.headers = { 'Accept': 'application/json', }; - let operation = new Operation( + const operation = new Operation( 'read forestInfo', this.client, requestOptions, 'empty', 'single' ); - let jobState = { + const jobState = { docInstance : this, requesterCount: 0, docsRemovedSuccessfully:0, @@ -4003,8 +4003,8 @@ Documents.prototype.queryToRemoveAll = function queryToRemoveAllDocuments(query, }; function queryToRemoveAllDocumentsImpl(query, jobOptions){ - let queryAllJobOptions = {}; - let removeAllJobOptions = {}; + const queryAllJobOptions = {}; + const removeAllJobOptions = {}; if(!jobOptions){ jobOptions = {}; @@ -4046,7 +4046,7 @@ function queryToRemoveAllDocumentsImpl(query, jobOptions){ queryAllJobOptions.queryToOptions = removeAllJobOptions; const docInstance = this; - let queryAllStream = queryAllDocumentsImpl.call(docInstance, query, queryAllJobOptions); + const queryAllStream = queryAllDocumentsImpl.call(docInstance, query, queryAllJobOptions); let pipelined = false; queryAllStream.on('data', function(item){ diff --git a/lib/extlibs.js b/lib/extlibs.js index a3f03385..656fe487 100644 --- a/lib/extlibs.js +++ b/lib/extlibs.js @@ -2,16 +2,16 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); /** @ignore */ function pathErrorTransform(message) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var path = operation.path; + const path = operation.path; return (path == null) ? message : (message+' (on '+path+' extension library)'); } @@ -26,7 +26,7 @@ function pathErrorTransform(message) { /** @ignore */ function emptyOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; return { path: operation.path @@ -54,7 +54,7 @@ ExtLibs.prototype.read = function readExtensionLibrary(path) { throw new Error('must specify path when reading the extension library resource'); } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'GET'; requestOptions.path = encodeURI( (path.substr(0,5) === '/ext/') ? ('/v1'+path) : @@ -62,7 +62,7 @@ ExtLibs.prototype.read = function readExtensionLibrary(path) { ('/v1/ext/'+path) ); - var operation = new Operation( + const operation = new Operation( 'read extension library', this.client, requestOptions, 'empty', 'single' ); operation.path = path; @@ -82,20 +82,20 @@ ExtLibs.prototype.read = function readExtensionLibrary(path) { * @param {object|string} source - the library resource */ ExtLibs.prototype.write = function writeExtensionLibrary() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen === 0) { throw new Error('no arguments for writing an extension library'); } - var path = null; - var permissions = null; - var contentType = null; - var source = null; - var i = 0; - var arg = null; + let path = null; + let permissions = null; + let contentType = null; + let source = null; + let i = 0; + let arg = null; - var params = null; + let params = null; if (argLen === 1) { params = args[0]; path = params.path; @@ -103,7 +103,7 @@ ExtLibs.prototype.write = function writeExtensionLibrary() { contentType = params.contentType; source = params.source; } else { - var argMax = Math.min(argLen,4); + const argMax = Math.min(argLen,4); for (;i < argMax; i++) { arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { @@ -127,15 +127,15 @@ ExtLibs.prototype.write = function writeExtensionLibrary() { throw new Error('must specify the path, content type, and source when writing a extension library'); } - var endpoint = + let endpoint = (path.substr(0,5) === '/ext/') ? ('/v1'+path) : (path.substr(0,1) === '/') ? ('/v1/ext'+path) : ('/v1/ext/'+path); if (Array.isArray(permissions)) { - var role = null; - var capabilities = null; - var j=null; + let role = null; + let capabilities = null; + let j=null; for (i=0; i < permissions.length; i++) { arg = permissions[i]; role = arg['role-name']; @@ -149,14 +149,14 @@ ExtLibs.prototype.write = function writeExtensionLibrary() { } } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'PUT'; requestOptions.headers = { 'Content-Type': contentType }; requestOptions.path = encodeURI(endpoint); - var operation = new Operation( + const operation = new Operation( 'write extension library', this.client, requestOptions, 'single', 'empty' ); operation.path = path; @@ -178,7 +178,7 @@ ExtLibs.prototype.remove = function removeExtensionLibrary(path) { throw new Error('must specify path when deleting the extension library resource'); } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'DELETE'; requestOptions.path = encodeURI( (path.substr(0,5) === '/ext/') ? ('/v1'+path) : @@ -186,7 +186,7 @@ ExtLibs.prototype.remove = function removeExtensionLibrary(path) { ('/v1/ext/'+path) ); - var operation = new Operation( + const operation = new Operation( 'remove extension library', this.client, requestOptions, 'empty', 'empty' ); operation.path = path; @@ -207,7 +207,7 @@ ExtLibs.prototype.remove = function removeExtensionLibrary(path) { * in the directory */ ExtLibs.prototype.list = function listExtensionLibraries(directory) { - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'GET'; requestOptions.headers = { 'Accept': 'application/json' @@ -222,8 +222,8 @@ ExtLibs.prototype.list = function listExtensionLibraries(directory) { requestOptions.path = encodeURI(directory+'/'); } } else { - var hasInitialSlash = (directory.substr(0,1) === '/'); - var hasTrailingSlash = (directory.substr(-1,1) === '/'); + const hasInitialSlash = (directory.substr(0,1) === '/'); + const hasTrailingSlash = (directory.substr(-1,1) === '/'); if (hasInitialSlash && hasTrailingSlash) { requestOptions.path = encodeURI('/v1/ext' + directory); } else if (hasTrailingSlash) { @@ -235,7 +235,7 @@ ExtLibs.prototype.list = function listExtensionLibraries(directory) { } } - var operation = new Operation( + const operation = new Operation( 'list extension libraries', this.client, requestOptions, 'empty', 'single' ); diff --git a/lib/graphs.js b/lib/graphs.js index 2c5489d3..b64660e3 100644 --- a/lib/graphs.js +++ b/lib/graphs.js @@ -3,15 +3,15 @@ */ 'use strict'; -var requester = require('./requester.js'); +const requester = require('./requester.js'); var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); -var qb = require('./query-builder.js'); +const Operation = require('./operation.js'); +const qb = require('./query-builder.js'); var mlutil = require('./mlutil.js'); function uriErrorTransform(message) { /*jshint validthis:true */ - var operation = this; + const operation = this; switch(operation.graphType) { case 'default': return message+' (on default graph)'; @@ -19,7 +19,7 @@ function uriErrorTransform(message) { case 'managed': return message+' (on managed graphs)'; } - var uri = operation.uri; + const uri = operation.uri; if (typeof uri === 'string' || uri instanceof String) { return message+' (on graph '+uri+')'; } @@ -28,12 +28,12 @@ function uriErrorTransform(message) { } function checkOutputTransform(headers, data) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var statusCode = operation.responseStatusCode; - var exists = (statusCode === 200) ? true : false; + const statusCode = operation.responseStatusCode; + const exists = (statusCode === 200) ? true : false; - var output = exists ? operation.responseHeaders : {}; + const output = exists ? operation.responseHeaders : {}; output.exists = exists; return identifyOutput.call(operation, data, output); @@ -44,9 +44,9 @@ function emptyOutputTransform(headers, data) { } function identifyOutput(data, output) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var graphType = operation.graphType; + const graphType = operation.graphType; switch(graphType) { case 'named': output.defaultGraph = false; @@ -71,7 +71,7 @@ function identifyOutput(data, output) { } function listOutputTransform(headers, data) { /*jshint validthis:true */ - var operation = this; + const operation = this; if (data == null) { return data; @@ -123,19 +123,19 @@ function Graphs(client) { * that receives the triples for the graph in the requested format */ Graphs.prototype.read = function readGraph() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen === 0) { throw new Error('must specify the content type when reading a graph'); } - var contentType = null; - var uri = null; - var category = null; - var txid = null; - var timestamp = null; + let contentType = null; + let uri = null; + let category = null; + let txid = null; + let timestamp = null; - var testArg = args[0]; + const testArg = args[0]; if (typeof testArg === 'string' || testArg instanceof String) { if (argLen > 1) { uri = testArg; @@ -144,7 +144,7 @@ Graphs.prototype.read = function readGraph() { contentType = testArg; } } else { - var params = testArg; + const params = testArg; contentType = params.contentType; uri = params.uri; category = params.category; @@ -155,7 +155,7 @@ Graphs.prototype.read = function readGraph() { } } - var endpoint = (uri == null) ? + let endpoint = (uri == null) ? '/v1/graphs?default' : ('/v1/graphs?graph='+encodeURIComponent(uri)); if (category !== null && category !== void 0) { if (typeof category === 'string' || category instanceof String) { @@ -178,7 +178,7 @@ Graphs.prototype.read = function readGraph() { 'Accept': contentType }; - var operation = new Operation( + const operation = new Operation( 'read graph', this.client, requestOptions, 'empty', 'single' ); if (uri === null) { @@ -270,7 +270,7 @@ Graphs.prototype.createMergeStream = function createGraphMergeStream() { /** @ignore */ function changeGraph(action, isStreaming, args) { /*jshint validthis:true */ - var argLen = args.length; + const argLen = args.length; if (argLen === 0) { throw new Error( isStreaming ? @@ -279,16 +279,16 @@ function changeGraph(action, isStreaming, args) { ); } - var uri = null; - var contentType = null; - var repair = false; - var permissions = null; - var data = null; - var txid = null; + let uri = null; + let contentType = null; + let repair = false; + let permissions = null; + let data = null; + let txid = null; if (argLen > 1 || (typeof args[0] === 'string' || args[0] instanceof String)) { - var arg = null; - var i = argLen - 1; + let arg = null; + let i = argLen - 1; for (; i >= 0; i--) { arg = args[i]; if (typeof arg === 'boolean') { @@ -312,14 +312,14 @@ function changeGraph(action, isStreaming, args) { throw new Error('unknown positional parameter for graphs write: '+arg); } } else { - var params = args[0]; + const params = args[0]; contentType = params.contentType; uri = params.uri; repair = params.repair || false; permissions = params.permissions; data = params.data; txid = mlutil.convertTransaction(params.txid); - var noContentType = (contentType == null); + const noContentType = (contentType == null); if (isStreaming) { if (noContentType) { throw new Error('named parameters must specify the content type for '+action); @@ -331,7 +331,7 @@ function changeGraph(action, isStreaming, args) { } } - var graphType = null; + let graphType = null; if (uri === null || uri === void 0) { graphType = 'default'; } else if (uri instanceof InlineGraphUrisDef) { @@ -340,9 +340,9 @@ function changeGraph(action, isStreaming, args) { graphType = 'named'; } - var sep = '?'; + let sep = '?'; - var endpoint = null; + let endpoint = null; switch(graphType) { case 'named': endpoint = '/v1/graphs?graph='+encodeURIComponent(uri); sep = '&'; break; case 'default': endpoint = '/v1/graphs?default'; sep = '&'; break; @@ -359,7 +359,7 @@ function changeGraph(action, isStreaming, args) { if (sep === '?') { sep = '&'; } } - var permissionsParams = makePermissionsParams(permissions, sep); + const permissionsParams = makePermissionsParams(permissions, sep); if (permissionsParams !== null) { endpoint += permissionsParams; if (sep === '?') { sep = '&'; } @@ -370,7 +370,7 @@ function changeGraph(action, isStreaming, args) { 'Content-Type': contentType }; - var operation = new Operation( + const operation = new Operation( action+' graph', this.client, requestOptions, (isStreaming ? 'chunked' : 'single'), 'empty' ); operation.graphType = graphType; @@ -400,7 +400,7 @@ function changeGraph(action, isStreaming, args) { * called when the triples are removed */ Graphs.prototype.remove = function removeGraph() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); return applyGraph.call(this, 'remove', args); }; @@ -416,15 +416,15 @@ Graphs.prototype.remove = function removeGraph() { * that receives an object with an exists boolean for the graph */ Graphs.prototype.probe = function probeGraph() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); return applyGraph.call(this, 'probe', args); }; /** @ignore */ function applyGraph(action, args) { /*jshint validthis:true */ - var uri = null; - var txid = null; + let uri = null; + let txid = null; switch(args.length) { case 0: break; @@ -444,9 +444,9 @@ function applyGraph(action, args) { break; } - var endpoint = null; - var graphType = null; - var sep = null; + let endpoint = null; + let graphType = null; + let sep = null; if (uri === null || uri === void 0) { endpoint = '/v1/graphs?default'; graphType = 'default'; @@ -471,7 +471,7 @@ function applyGraph(action, args) { const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), endpoint, ((action === 'remove') ? 'DELETE' : 'HEAD')); - var operation = new Operation( + const operation = new Operation( action+' graph', this.client, requestOptions, 'empty', 'empty' ); operation.graphType = graphType; @@ -504,14 +504,14 @@ function applyGraph(action, args) { * on the server */ Graphs.prototype.list = function listGraphs() { - var argLen = arguments.length; + const argLen = arguments.length; - var contentType = null; - var txid = null; - var timestamp = null; + let contentType = null; + let txid = null; + let timestamp = null; if (argLen > 0) { - var arg = null; - var i = argLen - 1; + let arg = null; + let i = argLen - 1; for (; i >= 0; i--) { arg = arguments[i]; if (typeof arg === 'string' || arg instanceof String) { @@ -536,10 +536,10 @@ Graphs.prototype.list = function listGraphs() { } } - var noContentType = (contentType === null || contentType === void 0); + const noContentType = (contentType === null || contentType === void 0); - var endpoint = '/v1/graphs'; - var sep = '?'; + let endpoint = '/v1/graphs'; + let sep = '?'; if (txid !== null && txid !== void 0) { endpoint += sep+'txid='+mlutil.getTxidParam(txid); @@ -560,7 +560,7 @@ Graphs.prototype.list = function listGraphs() { }; } - var operation = new Operation( + const operation = new Operation( 'list graphs', this.client, requestOptions, 'empty', 'single' ); if (!noContentType) { @@ -611,34 +611,34 @@ Graphs.prototype.list = function listGraphs() { * that receives the query response */ Graphs.prototype.sparql = function queryGraphSPARQL() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen === 0) { throw new Error('must specify content type and query for SPARQL query on graphs'); } - var defaultGraphs = null; - var namedGraphs = null; - var acceptType = null; - var query = null; + let defaultGraphs = null; + let namedGraphs = null; + let acceptType = null; + let query = null; - var docQuery = null; - var begin = null; - var end = null; - var base = null; - var txid = null; - var rulesets = null; - var defaultRulesets = null; - var optimizeLevel = null; - var bindings = null; - var timestamp = null; + let docQuery = null; + let begin = null; + let end = null; + let base = null; + let txid = null; + let rulesets = null; + let defaultRulesets = null; + let optimizeLevel = null; + let bindings = null; + let timestamp = null; // TODO: collection, directory? // Single configuration object if (argLen === 1) { - var params = args[0]; + const params = args[0]; acceptType = params.contentType; defaultGraphs = params.defaultGraphs; namedGraphs = params.namedGraphs; @@ -667,10 +667,10 @@ Graphs.prototype.sparql = function queryGraphSPARQL() { query = args[argLen - 1]; } - var endpoint = '/v1/graphs/sparql'; - var sep = '?'; + let endpoint = '/v1/graphs/sparql'; + let sep = '?'; - var hasDefaultGraphs = (defaultGraphs !== null && defaultGraphs !== void 0); + let hasDefaultGraphs = (defaultGraphs !== null && defaultGraphs !== void 0); if (hasDefaultGraphs) { defaultGraphs = mlutil.asArray(defaultGraphs); if (defaultGraphs.length > 0) { @@ -681,7 +681,7 @@ Graphs.prototype.sparql = function queryGraphSPARQL() { } } - var hasNamedGraphs = (namedGraphs !== null && namedGraphs !== void 0); + let hasNamedGraphs = (namedGraphs !== null && namedGraphs !== void 0); if (hasNamedGraphs) { namedGraphs = mlutil.asArray(namedGraphs); if (namedGraphs.length > 0) { @@ -692,7 +692,7 @@ Graphs.prototype.sparql = function queryGraphSPARQL() { } } - var hasBegin = (begin !== null && begin !== void 0); + const hasBegin = (begin !== null && begin !== void 0); if (hasBegin) { if (begin >= 0) { endpoint += sep+'start='+(begin + 1); @@ -717,7 +717,7 @@ Graphs.prototype.sparql = function queryGraphSPARQL() { } } - var commonParams = makeCommonSPARQLParams( + const commonParams = makeCommonSPARQLParams( base, txid, rulesets, defaultRulesets, optimizeLevel, bindings, sep ); if (commonParams !== null) { @@ -725,14 +725,14 @@ Graphs.prototype.sparql = function queryGraphSPARQL() { if (sep === '?') { sep = '&'; } } - var contentType = null; - var queryBody = null; + let contentType = null; + let queryBody = null; if (docQuery === null || docQuery === void 0) { contentType = 'application/sparql-query'; queryBody = query; } else { contentType = 'application/json'; - var builtQuery = + const builtQuery = (docQuery instanceof qb.lib.QueryBuilder || docQuery.search !== void 0) ? docQuery : qb.builder.where(docQuery); if (builtQuery.queryType === 'qbe') { @@ -750,7 +750,7 @@ Graphs.prototype.sparql = function queryGraphSPARQL() { 'Accept': acceptType }; - var operation = new Operation( + const operation = new Operation( 'SPARQL graph query', this.client, requestOptions, 'single', 'single' ); if (hasDefaultGraphs) { @@ -795,25 +795,25 @@ Graphs.prototype.sparql = function queryGraphSPARQL() { * called when the triples are updated */ Graphs.prototype.sparqlUpdate = function updateGraphSPARQL() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen === 0) { throw new Error('must specify data for SPARQL update on graphs'); } - var permissions = null; - var usingDefaultGraphs = null; - var usingNamedGraphs = null; - var base = null; - var txid = null; - var rulesets = null; - var defaultRulesets = null; - var optimizeLevel = null; - var bindings = null; + let permissions = null; + let usingDefaultGraphs = null; + let usingNamedGraphs = null; + let base = null; + let txid = null; + let rulesets = null; + let defaultRulesets = null; + let optimizeLevel = null; + let bindings = null; - var arg = args[0]; - var data = (argLen === 1) ? arg.data : null; + const arg = args[0]; + let data = (argLen === 1) ? arg.data : null; if (data !== null && data !== void 0) { permissions = arg.permissions; usingDefaultGraphs = arg.usingDefaultGraphs; @@ -831,10 +831,10 @@ Graphs.prototype.sparqlUpdate = function updateGraphSPARQL() { data = args[0]; } - var endpoint = '/v1/graphs/sparql'; - var sep = '?'; + let endpoint = '/v1/graphs/sparql'; + let sep = '?'; - var hasUsingDefaultGraphs = (usingDefaultGraphs !== null && usingDefaultGraphs !== void 0); + let hasUsingDefaultGraphs = (usingDefaultGraphs !== null && usingDefaultGraphs !== void 0); if (hasUsingDefaultGraphs) { usingDefaultGraphs = mlutil.asArray(usingDefaultGraphs); if (usingDefaultGraphs.length > 0) { @@ -845,7 +845,7 @@ Graphs.prototype.sparqlUpdate = function updateGraphSPARQL() { } } - var hasUsingNamedGraphs = (usingNamedGraphs !== null && usingNamedGraphs !== void 0); + let hasUsingNamedGraphs = (usingNamedGraphs !== null && usingNamedGraphs !== void 0); if (hasUsingNamedGraphs) { usingNamedGraphs = mlutil.asArray(usingNamedGraphs); if (usingNamedGraphs.length > 0) { @@ -856,13 +856,13 @@ Graphs.prototype.sparqlUpdate = function updateGraphSPARQL() { } } - var permissionsParams = makePermissionsParams(permissions, sep); + const permissionsParams = makePermissionsParams(permissions, sep); if (permissionsParams !== null) { endpoint += permissionsParams; if (sep === '?') { sep = '&'; } } - var commonParams = makeCommonSPARQLParams( + const commonParams = makeCommonSPARQLParams( base, txid, rulesets, defaultRulesets, optimizeLevel, bindings, sep ); if (commonParams !== null) { @@ -875,7 +875,7 @@ Graphs.prototype.sparqlUpdate = function updateGraphSPARQL() { 'Content-Type': 'application/sparql-update' }; - var operation = new Operation( + const operation = new Operation( 'SPARQL graph update', this.client, requestOptions, 'single', 'empty' ); @@ -895,15 +895,15 @@ function makePermissionsParams(permissions, sep) { return null; } - var endpoint = ''; + let endpoint = ''; - var permLen = permissions.length; - var permdef = null; - var roleName = null; - var capabilities = null; - var capLen = 0; - var j = 0; - for (var i = 0; i < permLen; i++) { + const permLen = permissions.length; + let permdef = null; + let roleName = null; + let capabilities = null; + let capLen = 0; + let j = 0; + for (let i = 0; i < permLen; i++) { permdef = permissions[i]; roleName = permdef['role-name']; capabilities = permdef.capabilities; @@ -919,8 +919,8 @@ function makePermissionsParams(permissions, sep) { function makeCommonSPARQLParams( base, txidRaw, rulesets, defaultRulesets, optimizeLevel, bindings, sep ) { - var endpoint = ''; - var txid = mlutil.convertTransaction(txidRaw); + let endpoint = ''; + const txid = mlutil.convertTransaction(txidRaw); if (base !== null && base !== void 0) { endpoint += sep+'base='+encodeURIComponent(base); if (sep === '?') { sep = '&'; } @@ -949,9 +949,9 @@ function makeCommonSPARQLParams( } function encodeParamValues(name, values) { if (Array.isArray(values)) { - var result = null; - var max = values.length; - for (var i=0; i < max; i++) { + let result = null; + const max = values.length; + for (let i=0; i < max; i++) { if (i === 0) { result = encodeURIComponent(name)+'='+encodeURIComponent(values[i]); } else { diff --git a/lib/internal.js b/lib/internal.js index fbe8edb6..bcfbeeff 100644 --- a/lib/internal.js +++ b/lib/internal.js @@ -14,7 +14,7 @@ class InternalClass { if(!path){ throw new Error('Path is needed to send request.'); } - let requestOptions = mlutil.newRequestOptions(this.clientObject.getConnectionParams(), path); + const requestOptions = mlutil.newRequestOptions(this.clientObject.getConnectionParams(), path); if (requestOptionsCallback) { requestOptionsCallback(requestOptions); } diff --git a/lib/marklogic.js b/lib/marklogic.js index 83ad0639..be579a34 100644 --- a/lib/marklogic.js +++ b/lib/marklogic.js @@ -2,32 +2,32 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var http = require('http'); -var https = require('https'); - -var mlutil = require('./mlutil.js'); -var mllog = require('./mllog.js'); - -var documents = require('./documents.js'); -var Graphs = require('./graphs.js'); -var Rows = require('./rows.js'); -var Values = require('./values.js'); -var ExtLibs = require('./extlibs.js'); -var RESTServerProperties = require('./rest-server-properties.js'); -var Transactions = require('./transactions.js'); -var Transforms = require('./transforms.js'); -var ResourcesConfig = require('./resources-config.js'); -var ResourcesExec = require('./resources-exec.js'); -var serverExec = require('./server-exec.js'); - -var queryBuilder = require('./query-builder.js'); -var patchBuilder = require('./patch-builder.js'); -var valuesBuilder = require('./values-builder.js'); -var planBuilder = require('./plan-builder.js'); -var ctsQueryBuilder = require('./ctsquery-builder'); -var Operation = require('./operation.js'); -var requester = require('./requester.js'); -let internal = require('./internal.js'); +const http = require('http'); +const https = require('https'); + +const mlutil = require('./mlutil.js'); +const mllog = require('./mllog.js'); + +const documents = require('./documents.js'); +const Graphs = require('./graphs.js'); +const Rows = require('./rows.js'); +const Values = require('./values.js'); +const ExtLibs = require('./extlibs.js'); +const RESTServerProperties = require('./rest-server-properties.js'); +const Transactions = require('./transactions.js'); +const Transforms = require('./transforms.js'); +const ResourcesConfig = require('./resources-config.js'); +const ResourcesExec = require('./resources-exec.js'); +const serverExec = require('./server-exec.js'); + +const queryBuilder = require('./query-builder.js'); +const patchBuilder = require('./patch-builder.js'); +const valuesBuilder = require('./values-builder.js'); +const planBuilder = require('./plan-builder.js'); +const ctsQueryBuilder = require('./ctsquery-builder'); +const Operation = require('./operation.js'); +const requester = require('./requester.js'); +const internal = require('./internal.js'); const proxy = require('./endpoint-proxy.js'); const dns = require('dns'); @@ -181,9 +181,9 @@ ExtlibsWrapper.prototype.remove = function removeExtlibsWrapper() { ); }; ExtlibsWrapper.prototype.write = function writeExtlibsWrapper() { - var args = expandExtlibsWrapper.call(this, 'writing', mlutil.asArray.apply(null, arguments)); - var module = args[0]; - var ext = mlutil.extension(module); + const args = expandExtlibsWrapper.call(this, 'writing', mlutil.asArray.apply(null, arguments)); + const module = args[0]; + const ext = mlutil.extension(module); if (ext === null) { throw new Error(module+' module for '+this.name+' library must have an extension of .mjs, .sjs, or .xqy'); } @@ -205,7 +205,7 @@ ExtlibsWrapper.prototype.write = function writeExtlibsWrapper() { }; function expandExtlibsWrapper(action, args) { /*jshint validthis:true */ - var module = (args.length > 0) ? args[0] : null; + const module = (args.length > 0) ? args[0] : null; if (typeof module !== 'string' && !(module instanceof String)) { throw new Error('no module name for '+action+' '+this.name+' library'); } @@ -321,7 +321,7 @@ function MarkLogicClient(connectionParams) { */ this.values = new Values(this); - var configExtlibs = new ExtLibs(this); + const configExtlibs = new ExtLibs(this); /** * Provides access to namespaces that configure the REST server for the client. @@ -381,7 +381,7 @@ MarkLogicClient.prototype.getConnectionParams = function getConnectionParams() { */ MarkLogicClient.prototype.checkConnection = function checkConnection() { const requestOptions = mlutil.newRequestOptions(this.connectionParams, '/v1/ping', 'HEAD'); - var operation = new Operation( + const operation = new Operation( 'test operation', this, requestOptions, 'empty', 'empty' ); operation.statusCodeValidator = function testStatusCodes(statusCode, response){ @@ -391,7 +391,7 @@ MarkLogicClient.prototype.checkConnection = function checkConnection() { return null; }; operation.outputTransform = function addOutputTransform() { - var content = null; + let content = null; if(this.responseStatusCode <300) { content = {connected: true}; } else { @@ -426,24 +426,24 @@ MarkLogicClient.prototype.invoke = serverExec.serverInvoke; * a success callback receiving an array of uri strings for the created documents. */ MarkLogicClient.prototype.createCollection = function createCollection() { - var argLen = arguments.length; + const argLen = arguments.length; if (argLen < 2) { throw new Error('must specify both a collection and content objects for document create'); } - var collection = arguments[0]; + const collection = arguments[0]; if (typeof collection !== 'string' && !(collection instanceof String)) { throw new Error('must specify at least one collection for document create'); } - var contentArray = arguments[1]; - var i = 0; + let contentArray = arguments[1]; + let i = 0; if (!Array.isArray(contentArray)) { i = 1; contentArray = arguments; } - var documentList = []; + const documentList = []; for (; i < contentArray.length; i++) { documentList.push({ collections: collection, @@ -567,25 +567,25 @@ MarkLogicClient.prototype.removeCollection = function removeCollectionClient(col * a success callback receiving an array of uri strings for the written documents. */ MarkLogicClient.prototype.writeCollection = function writeClient() { - var argLen = arguments.length; + const argLen = arguments.length; if (argLen < 2) { throw new Error('must specify both a collection and mapping object for quick document write'); } - var collection = arguments[0]; + const collection = arguments[0]; if (typeof collection !== 'string' && !(collection instanceof String)) { throw new Error('must specify at least one collection for quick document write'); } - var map = arguments[1]; - var uris = Object.keys(map); + const map = arguments[1]; + const uris = Object.keys(map); if (uris.length === 0) { throw new Error('must map at least one document uri to content for quick document write'); } - var documentList = []; - var uri = null; - var i = 0; + const documentList = []; + let uri = null; + let i = 0; for (; i < uris.length; i++) { uri = uris[i]; documentList.push({ @@ -616,14 +616,14 @@ MarkLogicClient.prototype.release = function releaseMarkLogicClient() { * must be provided as true for Bunyan (but not for Winston); defaults to false */ MarkLogicClient.prototype.setLogger = function setClientLogger() { - var argLen = arguments.length; + const argLen = arguments.length; if (argLen < 1) { throw new Error('must provide a logger as the first argument'); } - var arg = arguments[0]; + const arg = arguments[0]; if (typeof arg === 'string' || arg instanceof String) { - var logger = (argLen === 1) ? this.getLogger() : null; + const logger = (argLen === 1) ? this.getLogger() : null; if (logger instanceof mllog.ConsoleLogger) { logger.setLevel(arg); } else { @@ -639,7 +639,7 @@ MarkLogicClient.prototype.setLogger = function setClientLogger() { /** @ignore */ MarkLogicClient.prototype.getLogger = function getClientLogger() { - var logger = this.logger; + let logger = this.logger; if (logger == null) { logger = new mllog.ConsoleLogger(); @@ -663,7 +663,7 @@ MarkLogicClient.prototype.getLogger = function getClientLogger() { * @returns {Timestamp} - a Timestamp object. */ MarkLogicClient.prototype.createTimestamp = function databaseCreateTimestamp(value) { - let ts = new mlutil.Timestamp(value ? value : null); + const ts = new mlutil.Timestamp(value ? value : null); return ts; }; @@ -711,20 +711,20 @@ MarkLogicClient.prototype.endpointCaller =function endpointCaller(endpointDeclar }; function initClient(client, inputParams) { - var connectionParams = {}; - var isSSL = (inputParams.ssl == null) ? false : inputParams.ssl; + const connectionParams = {}; + let isSSL = (inputParams.ssl == null) ? false : inputParams.ssl; if(inputParams.authType && inputParams.authType.toString().toLowerCase() === 'cloud' && !isSSL){ isSSL = true; } - var keys = ['host', 'port', 'database', 'user', 'password', 'authType', 'token', 'basePath','apiKey','accessTokenDuration', + const keys = ['host', 'port', 'database', 'user', 'password', 'authType', 'token', 'basePath','apiKey','accessTokenDuration', 'enableGzippedResponses', 'oauthToken']; if(isSSL) { keys.push('ca', 'cert', 'ciphers', 'clientCertEngine', 'crl', 'dhparam', 'ecdhCurve', 'honorCipherOrder', 'key', 'passphrase', 'pfx', 'rejectUnauthorized', 'secureOptions', 'secureProtocol', 'servername', 'sessionIdContext', 'highWaterMark'); } - for (var i=0; i < keys.length; i++) { - var key = keys[i]; - var value = inputParams[key]; + for (let i=0; i < keys.length; i++) { + const key = keys[i]; + const value = inputParams[key]; if (value != null) { connectionParams[key] = value; } else if (key === 'host') { @@ -771,8 +771,8 @@ function initClient(client, inputParams) { connectionParams.user+':'+connectionParams.password; } - var noAgent = (inputParams.agent == null); - var agentOptions = noAgent ? { + const noAgent = (inputParams.agent == null); + const agentOptions = noAgent ? { keepAlive: true } : null; if (isSSL) { @@ -799,7 +799,7 @@ function initClient(client, inputParams) { client.internal = new internal.InternalClass(client); } function releaseClient(client) { - var agent = client.connectionParams.agent; + const agent = client.connectionParams.agent; if (agent == null){ return; } diff --git a/lib/mllog.js b/lib/mllog.js index e1fd65f1..6e013356 100644 --- a/lib/mllog.js +++ b/lib/mllog.js @@ -2,7 +2,7 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var util = require('util'); +const util = require('util'); diff --git a/lib/mlutil.js b/lib/mlutil.js index 46d1b03f..e5b453be 100644 --- a/lib/mlutil.js +++ b/lib/mlutil.js @@ -2,13 +2,13 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var util = require('util'); +const util = require('util'); -var multipartBoundary = 'MLBOUND_' + Date.UTC(2014,12,31); +const multipartBoundary = 'MLBOUND_' + Date.UTC(2014,12,31); // Normalize arguments by returning them as an array. function asArray() { - var argLen = arguments.length; + const argLen = arguments.length; switch(argLen) { // No arguments returns an empty array case 0: @@ -24,22 +24,22 @@ function asArray() { // List of arguments returns an array with arguments as elements default: var args = new Array(argLen); - for(var i=0; i < argLen; ++i) { + for(let i=0; i < argLen; ++i) { args[i] = arguments[i]; } return args; } } function copyProperties(source, target, srcKeys) { - var dest = (arguments.length > 1) ? target : {}; - var isNamed = Array.isArray(srcKeys); - var keys = isNamed ? srcKeys : Object.keys(source); + const dest = (arguments.length > 1) ? target : {}; + const isNamed = Array.isArray(srcKeys); + const keys = isNamed ? srcKeys : Object.keys(source); // for...in not currently optimized by v8 - var keyLen = keys.length; - for (var i=0; i < keyLen; i++) { - var key = keys[i]; - var val = source[key]; + const keyLen = keys.length; + for (let i=0; i < keyLen; i++) { + const key = keys[i]; + const val = source[key]; if (!isNamed || (val !== void 0 && val !== null)) { dest[key] = val; } @@ -64,7 +64,7 @@ function appendItem(object, key, value) { return; } - var array = object[key]; + const array = object[key]; if (array === void 0) { object[key] = [value]; } else { @@ -86,8 +86,8 @@ function MarkLogicError(firstArg, secondArg) { return new MarkLogicError(firstArg, secondArg); } - var name = null; - var message = null; + let name = null; + let message = null; if (firstArg == null) { message = 'unknown error'; } else if (secondArg == null) { @@ -108,8 +108,8 @@ function MarkLogicError(firstArg, secondArg) { util.inherits(MarkLogicError, Error); function callbackOn(object, method) { - var self = object; - var func = method; + const self = object; + const func = method; return function callBackMethod() { return func.apply(self, arguments); }; @@ -127,8 +127,8 @@ function endpointTransform(transform) { var endpointParam = 'transform='+encodeURIComponent(transform[0]); var transformParams = transform[1]; var transformKeys = Object.keys(transformParams); - for (var i=0; i < transformKeys.length; i++) { - var transformKey = transformKeys[i]; + for (let i=0; i < transformKeys.length; i++) { + const transformKey = transformKeys[i]; endpointParam += '&trans:'+encodeURIComponent(transformKey)+'='+ encodeURIComponent(transformParams[transformKey]); } @@ -142,7 +142,7 @@ function endpointTransform(transform) { function newRequestOptions(connectionParams, endpoint, method) { const requestOptions = copyProperties(connectionParams); - let database = connectionParams.database; + const database = connectionParams.database; if(connectionParams.basePath) { const basePath = connectionParams.basePath.toString(); let fixedBasePath = (connectionParams.host.toString().endsWith('/') && basePath.startsWith('/')) ? basePath.substring(1):basePath; @@ -166,14 +166,14 @@ function newRequestOptions(connectionParams, endpoint, method) { } function extension(filename) { - var extStart = filename.lastIndexOf('.') + 1; + const extStart = filename.lastIndexOf('.') + 1; if (extStart === 0 || extStart === filename.length) { return null; } return filename.substring(extStart); } function rootname(filename) { - var extStart = filename.lastIndexOf('.'); + const extStart = filename.lastIndexOf('.'); if (extStart === 0 || extStart === filename.length) { return null; } @@ -187,7 +187,7 @@ function identify(arg, withValues) { if (arg === null) { return 'null'; } - var typed = typeof arg; + const typed = typeof arg; switch(typed) { case 'boolean' : return withValues ? typed+' '+arg : typed; case 'function' : return typed; @@ -296,7 +296,7 @@ function Transaction(id, cookies) { this.txid = id; if (Array.isArray(cookies) && cookies.length > 0) { - for (var i=0; i < cookies.length; i++) { + for (let i=0; i < cookies.length; i++) { cookies[i] = cookies[i].replace(/;\s*expires\s*=[^;]+(;|$)/i, '$1'); } this.cookies = cookies; @@ -329,9 +329,9 @@ function getTxidParam(txid, action) { } function addTxidHeaders(requestOptions, txid) { if (txid instanceof Transaction) { - var cookies = txid.cookies; + const cookies = txid.cookies; if (cookies != null) { - var headers = requestOptions.headers; + const headers = requestOptions.headers; if (headers != null) { headers.cookie = cookies; } else { @@ -358,22 +358,22 @@ function Timestamp(value) { } // Slice mode can be 'array' or 'legacy' -var sliceMode = 'array'; +let sliceMode = 'array'; function setSliceMode(mode) { sliceMode = mode; } function makeSliceClause(variant, args) { - var argLen = args.length; + const argLen = args.length; - var sliceClause = {}; + const sliceClause = {}; - var firstArg = null; - var secondArg = null; + let firstArg = null; + let secondArg = null; - var argMax = Math.min(argLen, ((variant === 'query') ? 5 : 3)); - var arg = null; - for (var i=0; i < argMax; i++) { + const argMax = Math.min(argLen, ((variant === 'query') ? 5 : 3)); + let arg = null; + for (let i=0; i < argMax; i++) { arg = args[i]; if (typeof arg === 'number' || arg instanceof Number) { switch(i) { @@ -410,7 +410,7 @@ function makeSliceClause(variant, args) { } if (firstArg !== null && secondArg !== 0) { - var pageStart = (sliceMode === 'legacy') ? firstArg : firstArg + 1; + const pageStart = (sliceMode === 'legacy') ? firstArg : firstArg + 1; if (pageStart === 0 && secondArg === null) { sliceClause['page-length'] = 0; } else { diff --git a/lib/operation.js b/lib/operation.js index 68ab3066..9f439202 100644 --- a/lib/operation.js +++ b/lib/operation.js @@ -3,7 +3,7 @@ */ 'use strict'; -var mlutil = require('./mlutil.js'); +const mlutil = require('./mlutil.js'); function Operation(name, client, options, requestType, responseType) { if (!(this instanceof Operation)) { @@ -48,11 +48,11 @@ Operation.prototype.STREAM_MODES_CHUNKED_OBJECT_SEQUENCE = Operation.prototype.emptyHeaderData = function emptyHeaderData( response ) { - var operation = this; + const operation = this; - var outputTransform = operation.outputTransform; + const outputTransform = operation.outputTransform; if (outputTransform != null) { - var responseHeaders = operation.responseHeaders; + let responseHeaders = operation.responseHeaders; if (responseHeaders == null) { operation.copyResponseHeaders(response); responseHeaders = operation.responseHeaders; @@ -66,16 +66,16 @@ Operation.prototype.emptyHeaderData = function emptyHeaderData( return null; }; Operation.prototype.collectBodyObject = function collectBodyObject(data) { - var operation = this; + const operation = this; - var outputTransform = operation.outputTransform; - var hasOutputTransform = (outputTransform != null); + const outputTransform = operation.outputTransform; + const hasOutputTransform = (outputTransform != null); - var headers = operation.responseHeaders; + const headers = operation.responseHeaders; - var bodyObject = mlutil.unmarshal(headers.format, data); + let bodyObject = mlutil.unmarshal(headers.format, data); if (bodyObject !== null) { - var subdata = operation.subdata; + const subdata = operation.subdata; if (Array.isArray(subdata)) { bodyObject = projectData(bodyObject, subdata, 0); } @@ -98,25 +98,25 @@ Operation.prototype.collectBodyObject = function collectBodyObject(data) { Operation.prototype.makeObject = function makeObject( data, rawHeaderQueue ) { - var operation = this; + const operation = this; - var outputTransform = operation.outputTransform; - var partObject = null; + const outputTransform = operation.outputTransform; + let partObject = null; // Get corresponding multipart header for part - var partRawHeaders = rawHeaderQueue.pollFirst(); - var partHeaders = parsePartHeaders(partRawHeaders); - var partUri = partHeaders.uri; + const partRawHeaders = rawHeaderQueue.pollFirst(); + const partHeaders = parsePartHeaders(partRawHeaders); + const partUri = partHeaders.uri; - var isInline = (partUri == null && !partHeaders.kind); - var isMetadata = ( + const isInline = (partUri == null && !partHeaders.kind); + const isMetadata = ( !isInline && (partHeaders.category != null) && partHeaders.category !== 'content' ); // Convert buffer data to object - var partData = mlutil.unmarshal(partHeaders.format, data); + const partData = mlutil.unmarshal(partHeaders.format, data); // Inline case if (isInline) { @@ -135,7 +135,7 @@ Operation.prototype.makeObject = function makeObject( else if (isMetadata) { operation.logger.debug('parsed metadata for %s', partUri); if (this.nextMetadataBuffer !== null) { - var metadataHeaders = this.nextMetadataBuffer[0]; + const metadataHeaders = this.nextMetadataBuffer[0]; mlutil.copyProperties(this.nextMetadataBuffer[1], metadataHeaders); partObject = metadataHeaders; } @@ -156,7 +156,7 @@ Operation.prototype.makeObject = function makeObject( if (partObject !== null) { // Subdata processing (poor man's XPath) - var subdata = operation.subdata; + const subdata = operation.subdata; if (Array.isArray(subdata)) { partObject = projectData(partObject, subdata, 0); } @@ -171,16 +171,16 @@ Operation.prototype.makeObject = function makeObject( return partObject; }; Operation.prototype.dispatchError = function dispatchError(error) { - var operation = this; + const operation = this; - var input = + const input = (error == null) ? operation.makeError('unknown error') : (typeof error === 'string' || error instanceof String) ? operation.makeError(error) : error; - var outputStream = operation.outputStream; + const outputStream = operation.outputStream; if (outputStream != null) { - var errorListeners = outputStream.listeners('error'); + const errorListeners = outputStream.listeners('error'); if (Array.isArray(errorListeners) && errorListeners.length > 0) { outputStream.emit('error', input); } else { @@ -193,7 +193,7 @@ Operation.prototype.dispatchError = function dispatchError(error) { } }; Operation.prototype.logError = function logError(error) { - var operation = this; + const operation = this; if (error.body == null) { operation.logger.error(error.message); @@ -204,13 +204,13 @@ Operation.prototype.logError = function logError(error) { } }; Operation.prototype.makeError = function makeError(message) { - var operation = this; + const operation = this; - var operationName = operation.name; - var operationMsg = (operationName === void 0) ? message : + const operationName = operation.name; + let operationMsg = (operationName === void 0) ? message : (operationName+': '+message); - var errorTransform = operation.errorTransform; + const errorTransform = operation.errorTransform; const responsePath = operation.options.path; const subMsg = (responsePath && responsePath.toString().includes('?'))? responsePath.toString().substring(0,responsePath.toString().indexOf('?') ): @@ -222,13 +222,13 @@ Operation.prototype.makeError = function makeError(message) { ); }; Operation.prototype.copyResponseHeaders = function copyResponseHeaders(response) { - var operation = this; + const operation = this; - var responseHeaders = response.headers; + const responseHeaders = response.headers; - var contentType = trimContentType(responseHeaders['content-type']); + const contentType = trimContentType(responseHeaders['content-type']); - var format = responseHeaders['vnd.marklogic.document-format']; + let format = responseHeaders['vnd.marklogic.document-format']; if ((format == null) && contentType !== null) { format = contentTypeToFormat(contentType); } @@ -267,8 +267,8 @@ function OperationHeaders( if (versionId == null) { this.versionId = null; } else { - var firstChar = versionId.charAt(0); - var lastChar = versionId.charAt(versionId.length - 1); + const firstChar = versionId.charAt(0); + const lastChar = versionId.charAt(versionId.length - 1); this.versionId = ( (firstChar === '"' && lastChar === '"') || (firstChar === '\'' && lastChar === '\'') @@ -283,7 +283,7 @@ function trimContentType(contentType) { if (contentType == null) { return null; } - var semicolonPos = contentType.indexOf(';'); + const semicolonPos = contentType.indexOf(';'); return (semicolonPos > 0) ? contentType.substring(0, semicolonPos) : contentType; } @@ -292,7 +292,7 @@ function contentTypeToFormat(contentType) { return null; } - var fields = contentType.split(/[\/+]/); + const fields = contentType.split(/[\/+]/); switch(fields[0]) { case 'application': switch(fields[fields.length - 1]) { @@ -326,21 +326,21 @@ function contentTypeToFormat(contentType) { } function parsePartHeaders(headers) { - var partHeaders = {}; + const partHeaders = {}; - var contentDispositionArray = headers['content-disposition']; + const contentDispositionArray = headers['content-disposition']; if (Array.isArray(contentDispositionArray) && contentDispositionArray.length > 0) { - var contentDisposition = contentDispositionArray[0]; + let contentDisposition = contentDispositionArray[0]; if (contentDisposition.substring(contentDisposition.length) !== ';') { contentDisposition += ';'; } - var tokens = contentDisposition.match(/"[^"]*"|;|=|[^";=\s]+/g); - var key = null; - var value = null; - for (var i=0; i < tokens.length; i++) { - var token = tokens[i]; + const tokens = contentDisposition.match(/"[^"]*"|;|=|[^";=\s]+/g); + let key = null; + let value = null; + for (let i=0; i < tokens.length; i++) { + const token = tokens[i]; switch(token) { case ';': if (key) { @@ -350,7 +350,7 @@ function parsePartHeaders(headers) { value = value.substring(1,value.length - 1); } - var currentValue = partHeaders[key]; + const currentValue = partHeaders[key]; if (!currentValue) { partHeaders[key] = value; } else if (currentValue instanceof Array) { @@ -378,8 +378,8 @@ function parsePartHeaders(headers) { } } - var contentTypeArray = headers['content-type']; - var contentType = null; + const contentTypeArray = headers['content-type']; + let contentType = null; if (Array.isArray(contentTypeArray) && contentTypeArray.length > 0) { contentType = trimContentType(contentTypeArray[0]); partHeaders.contentType = contentType; @@ -389,12 +389,12 @@ function parsePartHeaders(headers) { partHeaders.format = contentTypeToFormat(contentType); } - var contentLengthArray = headers['content-length']; + const contentLengthArray = headers['content-length']; if (Array.isArray(contentLengthArray) && contentLengthArray.length > 0) { partHeaders.contentLength = contentLengthArray[0]; } - var contentIdArray = headers['content-id']; + const contentIdArray = headers['content-id']; if (Array.isArray(contentIdArray) && contentIdArray.length > 0) { partHeaders.contentId = contentIdArray[0].slice(1, -1); } @@ -407,19 +407,19 @@ function projectData(data, subdata, i) { return data; } - var key = subdata[i]; + const key = subdata[i]; if (!Array.isArray(data)) { - var nextData = data[key]; + const nextData = data[key]; if (nextData == null) { return data; } return projectData(nextData, subdata, i + 1); } - var newData = []; - for (var j=0; j < data.length; j++) { - var currItem = data[j]; - var nextValue = currItem[key]; + const newData = []; + for (let j=0; j < data.length; j++) { + const currItem = data[j]; + const nextValue = currItem[key]; newData.push( (nextValue == null) ? currItem : projectData(nextValue, subdata, i + 1) diff --git a/lib/optional.js b/lib/optional.js index 2c66000e..228c9234 100644 --- a/lib/optional.js +++ b/lib/optional.js @@ -14,7 +14,7 @@ function library(libname) { } } function libraryProperty(libname, propertyName) { - var lib = library(libname); + const lib = library(libname); if (lib == null) { return null; } diff --git a/lib/patch-builder.js b/lib/patch-builder.js index 673ef102..f70b78a1 100644 --- a/lib/patch-builder.js +++ b/lib/patch-builder.js @@ -4,9 +4,9 @@ 'use strict'; -var mlutil = require('./mlutil.js'); +const mlutil = require('./mlutil.js'); -var qb = require('./query-builder.js'); +const qb = require('./query-builder.js'); /** * A helper for building the definition of a document patch. The helper is @@ -33,12 +33,12 @@ var qb = require('./query-builder.js'); * @returns {patchBuilder.PatchOperation} a patch operation */ function remove() { - var select = null; - var cardinality = null; + let select = null; + let cardinality = null; - var argLen = arguments.length; - for (var i=0; i < argLen; i++) { - var arg = arguments[i]; + const argLen = arguments.length; + for (let i=0; i < argLen; i++) { + const arg = arguments[i]; if (i === 0) { select = arg; continue; @@ -54,7 +54,7 @@ function remove() { throw new Error('remove takes select and optional cardinality'); } - var operation = { + const operation = { select: select }; if (cardinality !== null) { @@ -80,14 +80,14 @@ function remove() { * @returns {patchBuilder.PatchOperation} a patch operation */ function insert() { - var context = null; - var position = null; - var content = void 0; - var cardinality = null; - - var argLen = arguments.length; - for (var i=0; i < argLen; i++) { - var arg = arguments[i]; + let context = null; + let position = null; + let content = void 0; + let cardinality = null; + + const argLen = arguments.length; + for (let i=0; i < argLen; i++) { + const arg = arguments[i]; if (i === 0) { context = arg; continue; @@ -96,7 +96,7 @@ function insert() { content = arg; continue; } - var isString = (typeof arg === 'string' || arg instanceof String); + const isString = (typeof arg === 'string' || arg instanceof String); if (isString) { if (position === null && /^(before|after|last-child)$/.test(arg)) { position = arg; @@ -120,7 +120,7 @@ function insert() { ); } - var operation = { + const operation = { context: context, position: position, content: content @@ -158,11 +158,11 @@ function library(module) { ); } - var rootname = mlutil.rootname(module); + const rootname = mlutil.rootname(module); if (rootname === null) { throw new Error('library must have an extension of .sjs or .xqy'); } - var extension = module.substring((module.lastIndexOf('.')+1), module.length); + const extension = module.substring((module.lastIndexOf('.')+1), module.length); if(extension === 'sjs') { return {'replace-library':{ @@ -195,9 +195,9 @@ function library(module) { * @returns {patchBuilder.ApplyDefinition} the specification for applying a function */ function apply() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const argLen = args.length; switch(argLen) { case 0: throw new Error('no name for function to apply'); @@ -412,14 +412,14 @@ function replaceRegex(match, replace, flags) { * @returns {patchBuilder.PatchOperation} a patch operation */ function replace() { - var select = null; - var content = void 0; - var cardinality = null; - var apply = null; - - var argLen = arguments.length; - for (var i=0; i < argLen; i++) { - var arg = arguments[i]; + let select = null; + let content = void 0; + let cardinality = null; + let apply = null; + + const argLen = arguments.length; + for (let i=0; i < argLen; i++) { + const arg = arguments[i]; if (i === 0) { select = arg; continue; @@ -428,7 +428,7 @@ function replace() { content = arg; continue; } - var isString = (typeof arg === 'string' || arg instanceof String); + const isString = (typeof arg === 'string' || arg instanceof String); if (isString && cardinality === null && /^[?.*+]$/.test(arg)) { cardinality = arg; continue; @@ -455,7 +455,7 @@ function replace() { ); } - var operation = { + const operation = { select: select, content: content }; @@ -493,16 +493,16 @@ function replace() { * @returns {patchBuilder.PatchOperation} a patch operation */ function replaceInsert() { - var select = null; - var context = null; - var position = null; - var content = void 0; - var cardinality = null; - var apply = null; - - var argLen = arguments.length; - for (var i=0; i < argLen; i++) { - var arg = arguments[i]; + let select = null; + let context = null; + let position = null; + let content = void 0; + let cardinality = null; + let apply = null; + + const argLen = arguments.length; + for (let i=0; i < argLen; i++) { + const arg = arguments[i]; if (i === 0) { select = arg; continue; @@ -515,7 +515,7 @@ function replaceInsert() { content = arg; continue; } - var isString = (typeof arg === 'string' || arg instanceof String); + const isString = (typeof arg === 'string' || arg instanceof String); if (isString) { if (position === null && /^(before|after|last-child)$/.test(arg)) { position = arg; @@ -547,7 +547,7 @@ function replaceInsert() { ); } - var operation = { + const operation = { select: select, context: context, position: position, @@ -583,7 +583,7 @@ function replaceInsert() { * @returns {patchBuilder.PathLanguageParam} the specification for the path language */ function pathLanguage() { - var pathlang = (arguments.length < 1) ? null : arguments[0]; + const pathlang = (arguments.length < 1) ? null : arguments[0]; if (pathlang !== 'jsonpath' && pathlang !== 'xpath') { throw new Error( 'pathLanguage takes a path language of xpath or jsonpath' @@ -642,7 +642,7 @@ function removeCollection(collection) { * @returns {patchBuilder.PatchOperation} a patch operation */ function addPermission() { - var permission = getPermission( + const permission = getPermission( mlutil.asArray.apply(null, arguments) ); if (permission === null) { @@ -662,7 +662,7 @@ function addPermission() { * capabilities from the insert|update|read|execute enumeration */ function replacePermission() { - var permission = getPermission( + const permission = getPermission( mlutil.asArray.apply(null, arguments) ); if (permission === null) { @@ -688,13 +688,13 @@ function removePermission(roleName) { } /** @ignore */ function getPermission(args) { - var argLen = args.length; + const argLen = args.length; - var roleName = null; - var capabilities = null; - var isObject = false; + let roleName = null; + let capabilities = null; + let isObject = false; - var first = (argLen === 0) ? null : args[0]; + const first = (argLen === 0) ? null : args[0]; if (first !== null) { if (args.length > 1 && typeof first === 'string') { roleName = first; @@ -713,10 +713,10 @@ function getPermission(args) { return null; } - var check = {execute:true, insert:true, read:true, update:true}; + const check = {execute:true, insert:true, read:true, update:true}; if (Array.isArray(capabilities)) { - var max = capabilities.length; - for (var i=0; i < max; i++) { + const max = capabilities.length; + for (let i=0; i < max; i++) { if (!check[capabilities[i]]) { return null; } @@ -754,7 +754,7 @@ function addProperty(name, value) { if (typeof name !== 'string' || value == null) { throw new Error('properties.add() takes a string name and a value'); } - var prop = {}; + const prop = {}; prop[name] = value; return insert('/object-node("properties")', 'last-child', prop); } @@ -822,7 +822,7 @@ function addMetadataValue(name, value) { if (typeof name !== 'string' || typeof value !== 'string' ) { throw new Error('metadataValues.add() takes a string name and string value'); } - var metaVal = {}; + const metaVal = {}; metaVal[name] = value; return insert('/object-node("metadataValues")', 'last-child', metaVal); } diff --git a/lib/plan-builder-base.js b/lib/plan-builder-base.js index 70e3a791..cbeb9149 100644 --- a/lib/plan-builder-base.js +++ b/lib/plan-builder-base.js @@ -261,11 +261,11 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) { ); } if(key === 'permissions'){ - let permissionValue = []; + const permissionValue = []; for(let i=0; i' : 'GT', @@ -17,7 +17,7 @@ var comparisons = { '=' : 'EQ', '!=' : 'NE' }; -var datatypes = { +const datatypes = { 'xs:anyURI': 'xs:anyURI', 'xs:date': 'xs:date', 'xs:dateTime': 'xs:dateTime', @@ -44,7 +44,7 @@ function asIndex(index) { } /** @ignore */ function addIndex(query, index, isContainer) { - var containerOnly = (isContainer || false); + const containerOnly = (isContainer || false); if (index instanceof JSONPropertyDef) { query['json-property'] = index['json-property']; } else if (index instanceof ElementDef) { @@ -111,12 +111,12 @@ function checkQueryArray(queryArray) { return queryArray; } - var max = queryArray.length; + const max = queryArray.length; if (max === 0) { return queryArray; } - var i = 0; + let i = 0; for (; i < max; i++) { checkQuery(queryArray[i]); } @@ -170,11 +170,11 @@ function ConstraintDef() { * @returns {queryBuilder.Query} a composable query */ function and() { - var args = mlutil.asArray.apply(null, arguments); - var queries = []; - var ordered = null; - var arg = null; - for (var i=0; i < args.length; i++) { + const args = mlutil.asArray.apply(null, arguments); + const queries = []; + let ordered = null; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (ordered === null) { if (arg instanceof OrderedDef) { @@ -260,7 +260,7 @@ function QueryListDef(queries, ordered, weight, distance) { * @returns {queryBuilder.Query} a composable query */ function andNot() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing positive and negative queries'); @@ -316,7 +316,7 @@ function PositiveNegativeDef(positive, negative) { * @returns {queryBuilder.IndexedName} an indexed name for specifying a query */ function attribute() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing element and attribute'); @@ -393,7 +393,7 @@ function AttributeDef(elemQName, attrQName) { * @returns {queryBuilder.Query} a composable query */ function boost() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing matching and boosting queries'); @@ -451,7 +451,7 @@ function MatchingBoostingDef(matching, boosting) { * @returns {queryBuilder.Region} the region criteria for a geospatial query */ function box() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing four corners for box'); @@ -497,8 +497,8 @@ function BoxRegionDef(box) { * @returns {queryBuilder.Region} the region criteria for a geospatial query */ function circle() { - var args = mlutil.asArray.apply(null, arguments); - var arg = null; + const args = mlutil.asArray.apply(null, arguments); + let arg = null; switch(args.length) { case 0: throw new Error('missing radius and center for circle'); @@ -582,18 +582,18 @@ function CircleDef(radius, center) { * @returns {queryBuilder.Query} a composable query */ function collection() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen === 0) { return new CollectionConstraintDef(null, null, null); } - var constraintName = null; - var suggestOptions = null; - var prefix = null; - var arg = null; - var i = 0; + let constraintName = null; + let suggestOptions = null; + let prefix = null; + let arg = null; + let i = 0; for (; i < argLen; i++) { arg = args[i]; if (constraintName === null && arg instanceof BindDef) { @@ -699,18 +699,18 @@ util.inherits(CollectionQueryDef, QueryDef); * @returns {queryBuilder.Query} a composable query */ function lsqtQuery() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 1) { throw new Error('no temporal collection for lsqt query'); } - var temporalCollection = null; - var weight = null; - var timestamp = null; - var temporalOptions = null; - var arg = null; - for (var i=0; i < args.length; i++) { + let temporalCollection = null; + let weight = null; + let timestamp = null; + let temporalOptions = null; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (i === 0) { if (typeof arg !== 'string' && !(arg instanceof String)) { @@ -810,17 +810,17 @@ function LSQTQueryDef(temporalCollection, weight, timestamp, temporalOptions) { * @returns {queryBuilder.Query} a composable query */ function scope() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 1) { throw new Error('element or property scope not specified'); } - var index = null; - var constraintName = null; - var fragmentScope = null; - var query = null; - var arg = null; - for (var i=0; i < args.length; i++) { + let index = null; + let constraintName = null; + let fragmentScope = null; + let query = null; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (i === 0) { index = asIndex(arg); @@ -918,9 +918,9 @@ function ContainedDef(index, fragmentScope, query) { this['fragment-scope'] = fragmentScope; } if (query != null) { - var queryKeys = Object.keys(query); - var queryKey = null; - for (var i=0; i < queryKeys.length; i++) { + const queryKeys = Object.keys(query); + let queryKey = null; + for (let i=0; i < queryKeys.length; i++) { queryKey = queryKeys[i]; this[queryKey] = query[queryKey]; } @@ -943,7 +943,7 @@ function ContainedDef(index, fragmentScope, query) { * @returns {queryBuilder.DatatypeParam} a datatype specification */ function datatype() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing datatype'); @@ -987,12 +987,12 @@ function DatatypeDef(datatype, collation) { * @returns {queryBuilder.Query} a composable query */ function directory() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); - var uris = []; - var infinite = null; - var arg = null; - for (var i=0; i < args.length; i++) { + const uris = []; + let infinite = null; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (infinite === null && (typeof arg === 'boolean')) { infinite = arg; @@ -1105,7 +1105,7 @@ util.inherits(DocumentFragmentDef, QueryDef); * @returns {queryBuilder.IndexedName} an indexed name for specifying a query */ function element() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing element name'); @@ -1144,7 +1144,7 @@ function ElementDef(qname) { * @returns {queryBuilder.IndexedName} an indexed name for specifying a query */ function field() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing field name'); @@ -1239,18 +1239,18 @@ function FragmentScopeDef(scope) { * @returns {queryBuilder.GeoLocation} the specification for the geospatial locations */ function geoAttributePair() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 2) { throw new Error('need at least two parameters for geospatial attribute pair query'); } - var location = {}; + const location = {}; - var keys = ['parent', 'lat', 'lon']; - var iArg=0; - for (var i=0; i < keys.length; i++) { - var key = keys[i]; - var arg = args[iArg++]; + const keys = ['parent', 'lat', 'lon']; + let iArg=0; + for (let i=0; i < keys.length; i++) { + const key = keys[i]; + const arg = args[iArg++]; if (arg instanceof QNameDef) { location[key] = arg; } else if (typeof arg === 'string' || arg instanceof String) { @@ -1284,19 +1284,19 @@ function geoAttributePair() { * @returns {queryBuilder.GeoLocation} the specification for the geospatial locations */ function geoElement() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 1) { throw new Error('need at least one parameter for geospatial element query'); } - var location = {}; + const location = {}; // TODO: elementName - var maxIndex = Math.min(argLen, 2); - var elemName = null; - var arg = null; - var i=0; + const maxIndex = Math.min(argLen, 2); + let elemName = null; + let arg = null; + let i=0; while (i < maxIndex) { arg = args[i]; if (arg instanceof QNameDef) { @@ -1336,17 +1336,17 @@ function geoElement() { * @returns {queryBuilder.GeoLocation} the specification for the geospatial locations */ function geoElementPair() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 2) { throw new Error('need at least two parameters for geospatial element pair query'); } - var location = {}; + const location = {}; - var keys = ['parent', 'lat', 'lon']; - var key = null; - var arg = null; - for (var i=0; i < keys.length; i++) { + const keys = ['parent', 'lat', 'lon']; + let key = null; + let arg = null; + for (let i=0; i < keys.length; i++) { key = keys[i]; arg = args[i]; if (arg instanceof QNameDef) { @@ -1375,18 +1375,18 @@ function geoElementPair() { * @returns {queryBuilder.GeoLocation} the specification for the geospatial locations */ function geoProperty() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 1) { throw new Error('need at least one parameters for geospatial property query'); } - var location = {}; + const location = {}; - var maxIndex = Math.min(argLen, 2); - var propName = null; - var arg = null; - var i=0; + const maxIndex = Math.min(argLen, 2); + let propName = null; + let arg = null; + let i=0; while (i < maxIndex) { arg = args[i]; if (arg instanceof JSONPropertyDef) { @@ -1420,17 +1420,17 @@ function geoProperty() { * @returns {queryBuilder.GeoLocation} the specification for the geospatial locations */ function geoPropertyPair() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 2) { throw new Error('need at least two parameters for geospatial property pair query'); } - var location = {}; + const location = {}; - var keys = ['parent-property', 'lat-property', 'lon-property']; - var key = null; - var arg = null; - for (var i=0; i < keys.length; i++) { + const keys = ['parent-property', 'lat-property', 'lon-property']; + let key = null; + let arg = null; + for (let i=0; i < keys.length; i++) { key = keys[i]; arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { @@ -1459,17 +1459,17 @@ function geoPropertyPair() { * @returns {queryBuilder.GeoLocation} the specification for the geospatial locations */ function geoPath() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 1) { throw new Error('need at least one parameter for geospatial path query'); } - var location = {}; + const location = {}; - var seekingPathIndex = true; - var firstArg = null; - var arg = null; - var i=0; + let seekingPathIndex = true; + let firstArg = null; + let arg = null; + let i=0; for (; i < args.length; i++) { arg = args[i]; if (i === 0) { @@ -1581,7 +1581,7 @@ function geospatialImpl(hasOperator, args) { throw new Error('need at least one parameter for geospatial query'); } - var isGeoLocationIndex = { + const isGeoLocationIndex = { 'geo-attr-pair': true, 'geo-elem': true, 'geo-elem-pair': true, @@ -1590,18 +1590,18 @@ function geospatialImpl(hasOperator, args) { 'geo-path': true }; - var query = null; - var variant = null; - var constraintName = null; - var suggestOptions = null; - var seekingWeight = true; - var seekingFragmentScope = true; - var seekingGeoOption = true; - var seekingRegion = true; - var seekingGeoOperator = true; - var firstKey = null; - var arg = null; - var i=0; + let query = null; + let variant = null; + let constraintName = null; + let suggestOptions = null; + let seekingWeight = true; + let seekingFragmentScope = true; + let seekingGeoOption = true; + let seekingRegion = true; + let seekingGeoOperator = true; + let firstKey = null; + let arg = null; + let i=0; for (; i < args.length; i++) { arg = args[i]; if (i === 0) { @@ -1742,13 +1742,13 @@ util.inherits(GeospatialConstraintDef, ConstraintDef); * @returns {queryBuilder.HeatMapParam} the buckets for a geospatial facet */ function heatmap() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 1) { throw new Error('no region or divisions for heat map'); } - var hmap = {}; + const hmap = {}; switch(argLen) { case 3: var first = args[0]; @@ -1768,14 +1768,14 @@ function heatmap() { } var keys = ['s', 'w', 'n', 'e']; - for (var i=0; i < keys.length; i++) { - var key = keys[i]; - var value = region[key]; + for (let i=0; i < keys.length; i++) { + const key = keys[i]; + let value = region[key]; if (value != null) { hmap[key] = value; continue; } else { - var altKey = null; + let altKey = null; switch(key) { case 's': altKey = 'south'; @@ -1857,7 +1857,7 @@ function GeoOptionsDef(options) { * @returns {queryBuilder.LatLon} a coordinate for a {queryBuilder.Region} */ function latlon() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing latitude and longitude for latlon coordinate'); @@ -1971,7 +1971,7 @@ function MinDistanceDef(distance) { * @returns {queryBuilder.Query} a composable query */ function near() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 1) { throw new Error('need at least a subquery for near query'); } @@ -1983,14 +1983,14 @@ function NearDef(args) { return new NearDef(args); } - var query = {}; - var subquery = []; - var seekingOrdered = true; - var seekingWeight = true; - var seekingDistance = true; - var seekingMinDistance = true; - var arg = null; - for (var i=0; i < args.length; i++) { + const query = {}; + const subquery = []; + let seekingOrdered = true; + let seekingWeight = true; + let seekingDistance = true; + let seekingMinDistance = true; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (seekingOrdered) { if (arg instanceof OrderedDef) { @@ -2069,7 +2069,7 @@ util.inherits(NotDef, QueryDef); * @returns {queryBuilder.Query} a composable query */ function notIn() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing positive and negative queries'); @@ -2163,7 +2163,7 @@ function OrderedDef(on) { * @returns {queryBuilder.IndexedName} an indexed name for specifying a query */ function pathIndex() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing path for path index identifier'); @@ -2214,7 +2214,7 @@ function PathDef(pathExpression, namespaces) { * @returns {queryBuilder.CoordSystem} a coordinate system identifier */ function coordSystem() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing identifier for coordinate system'); @@ -2249,7 +2249,7 @@ function CoordSystemDef(coordSystem) { * @returns {queryBuilder.Region} the region criteria for a geospatial query */ function point() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing latitude and longitude for point'); @@ -2287,11 +2287,11 @@ function PointRegionDef(point) { * @returns {queryBuilder.Region} the region criteria for a geospatial query */ function polygon() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); - var points = []; - var arg = null; - var i=0; + const points = []; + let arg = null; + let i=0; for (; i < args.length; i++) { arg = args[i]; if (arg instanceof PointRegionDef) { @@ -2357,7 +2357,7 @@ util.inherits(PropertiesFragmentDef, QueryDef); * @returns {queryBuilder.IndexedName} an indexed name for specifying a query */ function property() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing JSON property name'); @@ -2399,7 +2399,7 @@ function JSONPropertyDef(name) { * an element or attribute */ function qname() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('missing name for QName identifier'); @@ -2450,8 +2450,8 @@ function QNameDef(ns, name) { * for a {@link queryBuilder#periodRange} temporal query */ function period() { - var startDate = null; - var endDate = null; + let startDate = null; + let endDate = null; switch(arguments.length) { case 0: @@ -2512,15 +2512,15 @@ function PeriodDef(startDate, endDate) { * @returns {queryBuilder.Query} a composable query */ function periodCompare() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; - - var compareAxis1 = null; - var compareOperator = null; - var compareAxis2 = null; - var temporalOptions = null; - var arg = null; - for (var i=0; i < argLen; i++) { + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; + + let compareAxis1 = null; + let compareOperator = null; + let compareAxis2 = null; + let temporalOptions = null; + let arg = null; + for (let i=0; i < argLen; i++) { arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { if (compareAxis1 === null) { @@ -2612,15 +2612,15 @@ function PeriodCompareQueryDef( * @returns {queryBuilder.Query} a composable query */ function periodRange() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; - - var rangeAxis = null; - var rangeOperator = null; - var rangePeriod = null; - var temporalOptions = null; - var arg = null; - for (var i=0; i < argLen; i++) { + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; + + let rangeAxis = null; + let rangeOperator = null; + let rangePeriod = null; + let temporalOptions = null; + let arg = null; + for (let i=0; i < argLen; i++) { arg = args[i]; if (Array.isArray(arg) && arg.length > 0) { if (rangeAxis === null && (typeof arg[0] === 'string' || arg[0] instanceof String)) { @@ -2829,21 +2829,21 @@ function TemporalOptionsDef(options) { * @returns {queryBuilder.Query} a composable query */ function range() { - var args = mlutil.asArray.apply(null, arguments); - - var index = null; - var datatype = null; - var collation = null; - var weight = null; - var fragmentScope = null; - var rangeOptions = null; - var values = null; - var operator = null; - var suggestOptions = null; - var constraintName = null; - var defaultConstraint = null; - var arg = null; - for (var i=0; i < args.length; i++) { + const args = mlutil.asArray.apply(null, arguments); + + let index = null; + let datatype = null; + let collation = null; + let weight = null; + let fragmentScope = null; + let rangeOptions = null; + let values = null; + let operator = null; + let suggestOptions = null; + let constraintName = null; + let defaultConstraint = null; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (i === 0) { index = asIndex(arg); @@ -2887,11 +2887,11 @@ function range() { continue; } if ((datatype === null || operator === null) && (typeof arg === 'string' || arg instanceof String)) { - var testType = (datatype === null) ? datatypes[arg.trim()] : null; + const testType = (datatype === null) ? datatypes[arg.trim()] : null; if (testType != null) { datatype = testType; } else { - var testComp = (operator === null) ? comparisons[arg.trim()] : null; + const testComp = (operator === null) ? comparisons[arg.trim()] : null; if (testComp != null) { operator = testComp; } else if (values === null) { @@ -2909,7 +2909,7 @@ function range() { } } - var rangeDef = new RangeDef( + const rangeDef = new RangeDef( index, datatype, collation, operator, values, weight, rangeOptions, fragmentScope ); @@ -2933,7 +2933,7 @@ function range() { } } - var constraint = new RangeConstraintDef(constraintName, rangeDef, suggestOptions); + const constraint = new RangeConstraintDef(constraintName, rangeDef, suggestOptions); return (defaultConstraint !== true) ? constraint : new DefaultConstraintDef(constraint); @@ -2976,7 +2976,7 @@ function RangeDef( ); } - var hasOperator = (operator != null); + const hasOperator = (operator != null); if (index != null) { addIndex(this, index, false); @@ -3060,8 +3060,8 @@ function RangeOptionsDef(options) { * @returns {object} the coordinates for the box */ function southWestNorthEast() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen !== 4) { throw new Error('box must have four parameters: '+argLen); } @@ -3119,12 +3119,12 @@ function BoxDef(south, west, north, east) { * @returns {queryBuilder.Query} a composable query */ function term() { - var args = mlutil.asArray.apply(null, arguments); - var text = []; - var weight = null; - var termOptions = null; - var arg = null; - for (var i=0; i < args.length; i++) { + const args = mlutil.asArray.apply(null, arguments); + const text = []; + let weight = null; + let termOptions = null; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (weight === null && arg instanceof WeightDef) { weight = arg.weight; @@ -3165,7 +3165,7 @@ util.inherits(TermDef, QueryDef); * @returns {queryBuilder.Query} a composable query */ function before() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length === 0 || args[0] === null) { throw new Error('missing Timestamp'); } else if (args.length>1) { @@ -3196,7 +3196,7 @@ util.inherits(BeforeQueryDef, QueryDef); * @returns {queryBuilder.Query} a composable query */ function after() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length === 0 || args[0] === null) { throw new Error('missing Timestamp'); } else if (args.length>1) { @@ -3254,19 +3254,19 @@ function TermOptionsDef(options) { } /** @ignore */ function textQuery(variant, args) { - var isValue = (variant === 'value'); - - var index = null; - var text = null; - var weight = null; - var fragmentScope = null; - var termOptions = null; - var suggestOptions = null; - var constraintName = null; - var defaultConstraint = null; - var jsontype = null; - var arg = null; - for (var i=0; i < args.length; i++) { + const isValue = (variant === 'value'); + + let index = null; + let text = null; + let weight = null; + let fragmentScope = null; + let termOptions = null; + let suggestOptions = null; + let constraintName = null; + let defaultConstraint = null; + let jsontype = null; + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (i === 0) { index = asIndex(arg); @@ -3324,7 +3324,7 @@ function textQuery(variant, args) { null; } - var textDef = new TextDef( + const textDef = new TextDef( index, jsontype, text, weight, termOptions, fragmentScope ); @@ -3348,7 +3348,7 @@ function textQuery(variant, args) { } } - var constraint = isValue ? + const constraint = isValue ? new ValueConstraintDef(constraintName, textDef, suggestOptions) : new WordConstraintDef(constraintName, textDef, suggestOptions); @@ -3361,7 +3361,7 @@ function DefaultConstraintDef(constraintDef) { return new DefaultConstraintDef(constraintDef); } - this['default'] = constraintDef; + this.default = constraintDef; } /** @ignore */ function ValueConstraintDef(constraintName, textDef, suggestOptions) { @@ -3535,7 +3535,7 @@ function JSONTypeDef(type) { return new JSONTypeDef(type); } - var isJSONType = { + const isJSONType = { 'boolean': true, 'null': true, 'number': true, @@ -3627,18 +3627,18 @@ function word() { * @returns {queryBuilder.BuiltQuery} a built query */ function copyFromQueryBuilder(otherQueryBuilder) { - var qb = new QueryBuilder(); + const qb = new QueryBuilder(); if (otherQueryBuilder != null) { - var clauseKeys = [ + const clauseKeys = [ 'whereClause', 'calculateClause', 'orderByClause', 'sliceClause', 'withOptionsClause' ]; - var isString = (typeof otherQueryBuilder === 'string' || otherQueryBuilder instanceof String); - var other = isString ? + const isString = (typeof otherQueryBuilder === 'string' || otherQueryBuilder instanceof String); + const other = isString ? JSON.parse(otherQueryBuilder) : otherQueryBuilder; - for (var i=0; i < clauseKeys.length; i++){ - var key = clauseKeys[i]; - var value = other[key]; + for (let i=0; i < clauseKeys.length; i++){ + const key = clauseKeys[i]; + const value = other[key]; if (value != null) { // structuredClone instead of clone to avoid preserving prototype qb[key] = isString ? value : structuredClone(value); @@ -3670,19 +3670,19 @@ function copyFromQueryBuilder(otherQueryBuilder) { */ function where() { /*jshint validthis:true */ - var self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); + const self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; // TODO: if empty, clear the clause - var parsedQuery = null; - var fragmentScope = null; - var queries = null; + let parsedQuery = null; + let fragmentScope = null; + let queries = null; - var i=0; + let i=0; - var arg = (argLen > 0) ? args[0] : null; + let arg = (argLen > 0) ? args[0] : null; if (arg == null) { self.whereClause = {query: {queries: [and()]}}; self.queryType = 'structured'; @@ -3715,7 +3715,7 @@ function where() { queries.push(checkQuery(arg)); } } - var whereClause = {}; + const whereClause = {}; if (queries !== null) { whereClause.query = {queries: queries}; } @@ -3756,7 +3756,7 @@ QueryBuilder.prototype.where = where; * for the {@link queryBuilder#where} function */ function byExample() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: return {$query: []}; @@ -3787,18 +3787,18 @@ function byExample() { */ function orderBy() { /*jshint validthis:true */ - var self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); + const self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); // TODO: if empty, clear the clause - var sortOrder = []; + const sortOrder = []; - var scoreOption = null; - var scoreDirection = null; + let scoreOption = null; + let scoreDirection = null; - var arg = null; - for (var i=0; i < args.length; i++) { + let arg = null; + for (let i=0; i < args.length; i++) { arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { sortOrder.push(sort(arg)); @@ -3879,24 +3879,24 @@ function score() { * for the {@link queryBuilder#orderBy} function */ function sort() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length === 0) { throw new Error('missing sorted index'); } - var firstIndex = asIndex(args[0]); + const firstIndex = asIndex(args[0]); // null is a legitimate value of score - var isScore = (firstIndex.score !== void 0); + const isScore = (firstIndex.score !== void 0); - var sorter = {}; + const sorter = {}; if (isScore) { sorter.score = firstIndex.score; } else { addIndex(sorter, firstIndex, false); } - var arg = null; - for (var i=1; i < args.length; i++) { + let arg = null; + for (let i=1; i < args.length; i++) { arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { switch (arg) { @@ -3944,7 +3944,7 @@ function transform(name, params) { throw new Error('transform without name'); } - var transformList = [name]; + const transformList = [name]; if (params != null) { transformList.push(params); } @@ -3995,9 +3995,9 @@ util.inherits(TrueQueryDef, QueryDef); */ function slice() { /*jshint validthis:true */ - var self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); + const self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); // TODO: if empty, clear the clause @@ -4021,12 +4021,12 @@ QueryBuilder.prototype.slice = slice; */ function calculate() { /*jshint validthis:true */ - var self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); + const self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); // TODO: distinguish facets and values - var calculateClause = { + const calculateClause = { constraint: args }; @@ -4070,13 +4070,13 @@ QueryBuilder.prototype.calculate = calculate; * for the {@link queryBuilder#calculate} function */ function facet() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 1) { throw new Error('facet must at a minimum identify the index'); } - var isConstraintIndex = { + const isConstraintIndex = { collection: true, element: true, field: true, @@ -4089,7 +4089,7 @@ function facet() { 'json-property': true, 'path-index': true }; - var isGeoLocationIndex = { + const isGeoLocationIndex = { 'geo-attr-pair': true, 'geo-elem': true, 'geo-elem-pair': true, @@ -4098,19 +4098,19 @@ function facet() { 'geo-path': true }; - var constraintName = null; - var constraintIndex = null; - var firstKey = null; - var datatype; - var collation; - var facetOptions; - var calculateFunction; - var buckets = null; - var computedBuckets = null; - var heatmap = null; - - var arg = null; - for (var i=0; i < argLen; i++) { + let constraintName = null; + let constraintIndex = null; + let firstKey = null; + let datatype; + let collation; + let facetOptions; + let calculateFunction; + let buckets = null; + let computedBuckets = null; + let heatmap = null; + + let arg = null; + for (let i=0; i < argLen; i++) { arg = args[i]; switch(i) { case 0: @@ -4210,8 +4210,8 @@ function facet() { } } - var facetWrapper = {name: constraintName}; - var constraint = {facet: true}; + const facetWrapper = {name: constraintName}; + const constraint = {facet: true}; if (constraintIndex.collection !== undefined) { facetWrapper.collection = constraint; } else if (calculateFunction !== undefined) { @@ -4231,10 +4231,10 @@ function facet() { constraint.collation = collation; } } - var constraintKeys = Object.keys(constraintIndex); - var constraintKeyLen = constraintKeys.length; - for (var j=0; j < constraintKeyLen; j++) { - var key = constraintKeys[j]; + const constraintKeys = Object.keys(constraintIndex); + const constraintKeyLen = constraintKeys.length; + for (let j=0; j < constraintKeyLen; j++) { + const key = constraintKeys[j]; constraint[key] = constraintIndex[key]; } if (buckets !== null) { @@ -4274,14 +4274,14 @@ function facet() { * module for the {@link queryBuilder#facet} function. */ function calculateFunction() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 1) { throw new Error('calculate function without module name'); } - var moduleName = args[0]; + const moduleName = args[0]; - var rootname = mlutil.rootname(moduleName); + const rootname = mlutil.rootname(moduleName); if (rootname === null) { throw new Error('library must have an extension of .xqy'); } @@ -4377,7 +4377,7 @@ util.inherits(FalseQueryDef, QueryDef); * @returns {queryBuilder.BucketParam} specification for a {@link queryBuilder#facet} calculation */ function bucket() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('must specify name, comparison, and bound for bucket'); @@ -4442,7 +4442,7 @@ function BucketDef(name, lower, upper) { this.name = name; this.label = name; - var lowerType = -1; + let lowerType = -1; if (lower == null) { lowerType = 0; } else if (typeof lower === 'number' || lower instanceof Number) { @@ -4453,7 +4453,7 @@ function BucketDef(name, lower, upper) { throw new Error('invalid lower bound for bucket: '+mlutil.identify(lower, true)); } - var upperType = -1; + let upperType = -1; if (upper == null) { upperType = 0; } else if (typeof upper === 'number' || upper instanceof Number) { @@ -4491,7 +4491,7 @@ function ComputedBucketDef(name, lower, upper) { this.name = name; this.label = name; - var lowerType = -1; + let lowerType = -1; if (lower == null) { lowerType = 0; } else if (lower instanceof AnchorDef) { @@ -4500,7 +4500,7 @@ function ComputedBucketDef(name, lower, upper) { throw new Error('invalid lower bound for computed bucket: '+mlutil.identify(lower, true)); } - var upperType = -1; + let upperType = -1; if (upper == null) { upperType = 0; } else if (upper instanceof AnchorDef) { @@ -4561,7 +4561,7 @@ function ComputedBucketDef(name, lower, upper) { * as part of a facet calculation */ function anchor() { - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); switch(args.length) { case 0: throw new Error('no milestone or lower bound for anchor'); @@ -4591,7 +4591,7 @@ function AnchorDef(milestone, first, comparison, second) { throw new Error('invalid milestone for anchor: '+mlutil.identify(milestone, true)); } - var comparisonType = -1; + let comparisonType = -1; if (comparison == null) { comparisonType = 0; } else if (comparison === '<') { @@ -4673,10 +4673,10 @@ function defaultConstraintName(index) { * the {@link queryBuilder#where} function */ function parsedFrom() { - var qtext = null; - var bindings = null; - var constraints = null; - var term = null; + let qtext = null; + let bindings = null; + let constraints = null; + let term = null; switch(arguments.length) { case 0: @@ -4766,20 +4766,20 @@ function parseBindings() { } /** @ignore */ function makeBindings(variant, args) { - var isParse = (variant === 'parse'); - var desc = isParse ? 'parsing query text' : 'defining suggestion sources'; + const isParse = (variant === 'parse'); + const desc = isParse ? 'parsing query text' : 'defining suggestion sources'; - var argLen = args.length; + const argLen = args.length; if (argLen < 1) { throw new Error('no bindings for '+desc); } - var constraints = null; - var defaultConstraints = null; - var suggestOptions = null; - var empty = null; - var arg = null; - for (var i=0; i < argLen; i++) { + let constraints = null; + let defaultConstraints = null; + let suggestOptions = null; + let empty = null; + let arg = null; + for (let i=0; i < argLen; i++) { arg = args[i]; if (arg.name !== void 0) { if (isParse && (arg['suggest-option'] !== void 0)) { @@ -4793,7 +4793,7 @@ function makeBindings(variant, args) { continue; } if (defaultConstraints == null) { - defaultConstraints = arg['default']; + defaultConstraints = arg.default; if (defaultConstraints !== void 0) { suggestOptions = arg['suggest-option']; if (isParse && (suggestOptions !== void 0)) { @@ -4811,7 +4811,7 @@ function makeBindings(variant, args) { throw new Error('unknown argument for parse query binding: '+mlutil.identify(arg, true)); } - var termDef = ( + const termDef = ( (defaultConstraints == null) && (empty == null) && (suggestOptions == null) @@ -4844,7 +4844,7 @@ function TermBindingDef(defaultConstraints, empty, suggestOptions) { } if (defaultConstraints != null) { - this['default'] = defaultConstraints; + this.default = defaultConstraints; } if (empty != null) { this.empty = empty; @@ -4958,7 +4958,7 @@ function EmptyApplyDef(binding) { return new EmptyApplyDef(binding); } - var valid = {'all-results': true, 'no-results': true}; + const valid = {'all-results': true, 'no-results': true}; if ((typeof binding === 'string' || binding instanceof String) && valid[binding] === true) { this.apply = binding; @@ -4993,18 +4993,18 @@ function EmptyApplyDef(binding) { * module for the {@link queryBuilder#parseBindings} function. */ function parseFunction() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 2) { throw new Error('query parse function without module name or binding'); } - var moduleName = args[0]; + const moduleName = args[0]; - var constraintName = null; - var termOptions = null; - var arg = null; - for (var i=1; i < args.length; i++) { + let constraintName = null; + let termOptions = null; + let arg = null; + for (let i=1; i < args.length; i++) { arg = args[i]; if (termOptions === null && arg instanceof TermOptionsDef) { termOptions = arg['term-option']; @@ -5068,7 +5068,7 @@ function CustomParserDef(moduleName) { return new CustomParserDef(moduleName); } - var rootname = mlutil.rootname(moduleName); + const rootname = mlutil.rootname(moduleName); if (rootname === null) { throw new Error('library must have an extension of .xqy'); } @@ -5100,19 +5100,19 @@ function CustomParserDef(moduleName) { * for the {@link queryBuilder#slice} function */ function extract() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 1) { throw new Error('must specify paths to extract'); } - var extractdef = {}; + const extractdef = {}; - var arg = args[0]; + const arg = args[0]; if (typeof arg === 'string' || arg instanceof String) { extractdef['extract-path'] = args; } else { - var paths = arg.paths; + const paths = arg.paths; if (typeof paths === 'string' || paths instanceof String) { extractdef['extract-path'] = [paths]; } else if (Array.isArray(paths)) { @@ -5121,12 +5121,12 @@ function extract() { throw new Error('first argument does not have key for paths to extract'); } - var namespaces = arg.namespaces; + const namespaces = arg.namespaces; if (namespaces !== void 0) { extractdef.namespaces = namespaces; } - var selected = arg.selected; + const selected = arg.selected; if (selected !== void 0) { extractdef.selected = selected; } @@ -5158,10 +5158,10 @@ function extract() { * for the {@link queryBuilder#slice} function */ function snippet() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; - var builtins = { + const builtins = { empty: 'empty-snippet', 'empty-snippet': 'empty-snippet', metadata: 'metadata-snippet', @@ -5169,13 +5169,13 @@ function snippet() { snippet: 'snippet' }; - var snippeter = { + const snippeter = { apply: 'snippet' }; - var arg = null; - var builtin = null; - for (var i=0; i < argLen; i++) { + let arg = null; + let builtin = null; + for (let i=0; i < argLen; i++) { arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { builtin = builtins[arg]; @@ -5183,7 +5183,7 @@ function snippet() { snippeter.apply = builtin; continue; } else { - var rootname = mlutil.rootname(arg); + const rootname = mlutil.rootname(arg); snippeter.ns = 'http://marklogic.com/snippet/custom/'+rootname; snippeter.at = '/ext/marklogic/snippet/custom/'+arg; snippeter.apply = 'snippet'; @@ -5228,10 +5228,10 @@ function snippet() { */ function withOptions() { /*jshint validthis:true */ - var self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); + const self = (this instanceof QueryBuilder) ? this : new QueryBuilder(); // TODO: share with documents.js - var optionKeyMapping = { + const optionKeyMapping = { search:'search-option', weight:'quality-weight', forestNames:'forest', similarDocs:'return-similar', metrics:'return-metrics', queryPlan:'return-plan', @@ -5239,14 +5239,14 @@ function withOptions() { categories:true, txid:true }; - var withOptionsClause = {}; + const withOptionsClause = {}; if (0 < arguments.length) { - var arg = arguments[0]; - var argKeys = Object.keys(arg); - for (var i=0; i < argKeys.length; i++) { - var key = argKeys[i]; + const arg = arguments[0]; + const argKeys = Object.keys(arg); + for (let i=0; i < argKeys.length; i++) { + const key = argKeys[i]; if (optionKeyMapping[key] !== void 0) { - var value = arg[key]; + const value = arg[key]; if (value !== void 0) { withOptionsClause[key] = value; } else { @@ -5268,17 +5268,17 @@ function makeSearchBody(builtQuery) { throw new Error('no query for documents'); } - var categories = null; - var optionsName = null; - var pageStart = null; - var pageLength = null; - var txid = null; - var transform = null; - var view = null; + let categories = null; + let optionsName = null; + let pageStart = null; + let pageLength = null; + let txid = null; + let transform = null; + let view = null; - var i=0; + let i=0; - var searchBody = {}; + const searchBody = {}; if (builtQuery.search !== void 0) { searchBody.search = builtQuery.search; @@ -5307,10 +5307,10 @@ function makeSearchBody(builtQuery) { categories = (builtQuery.categories !== void 0) ? builtQuery.categories : ['content']; } else { - var search = {}; + const search = {}; searchBody.search = search; - var searchOptions = search.options; + let searchOptions = search.options; if (searchOptions == null) { searchOptions = {}; search.options = searchOptions; @@ -5318,11 +5318,11 @@ function makeSearchBody(builtQuery) { // TODO: validate clauses - var whereClause = builtQuery.whereClause; + const whereClause = builtQuery.whereClause; if (builtQuery.queryType === 'qbe') { search.$query = whereClause.$query; - var format = whereClause.$format; - var validate = whereClause.$validate; + const format = whereClause.$format; + const validate = whereClause.$validate; if (format != null) { search.$format = format; } @@ -5332,9 +5332,9 @@ function makeSearchBody(builtQuery) { } else if (builtQuery.queryType === 'cts') { search.ctsast = bldrbase.exportArg(whereClause); } else if (whereClause != null) { - var query = whereClause.query; - var parsedQuery = whereClause.parsedQuery; - var fragmentScope = whereClause['fragment-scope']; + const query = whereClause.query; + const parsedQuery = whereClause.parsedQuery; + const fragmentScope = whereClause['fragment-scope']; if (query != null) { search.query = query; @@ -5347,7 +5347,7 @@ function makeSearchBody(builtQuery) { } } - var calculateClause = builtQuery.calculateClause; + const calculateClause = builtQuery.calculateClause; if (calculateClause != null) { view = 'results'; searchOptions['return-facets'] = true; @@ -5355,30 +5355,30 @@ function makeSearchBody(builtQuery) { searchOptions['return-metrics'] = false; searchOptions['return-qtext'] = false; searchOptions['transform-results'] = {apply: 'empty-snippet'}; - var searchConstraintList = searchOptions.constraint; + const searchConstraintList = searchOptions.constraint; if (searchConstraintList == null) { searchOptions.constraint = calculateClause.constraint; } else { // TODO: convert into a generic deep merge utility - var constraintLookup = {}; - for (var li=0; li < searchConstraintList.length; li++) { - var lookupConstraint = searchConstraintList[li]; + const constraintLookup = {}; + for (let li=0; li < searchConstraintList.length; li++) { + const lookupConstraint = searchConstraintList[li]; constraintLookup[lookupConstraint.name] = lookupConstraint; } - var calculateConstraints = calculateClause.constraint; - for (var mi=0; mi < calculateConstraints.length; mi++) { - var calculateConstraint = calculateConstraints[mi]; - var searchConstraint = constraintLookup[calculateConstraint.name]; + const calculateConstraints = calculateClause.constraint; + for (let mi=0; mi < calculateConstraints.length; mi++) { + const calculateConstraint = calculateConstraints[mi]; + const searchConstraint = constraintLookup[calculateConstraint.name]; if (searchConstraint == null) { searchConstraintList.push(calculateConstraint); } else { - var constraintChildKeys = + const constraintChildKeys = Object.keys(calculateConstraint).filter(notNameFilter); - for (var ki=0; ki < constraintChildKeys.length; ki++) { - var constraintChildKey = constraintChildKeys[ki]; - var searchChild = searchConstraint[constraintChildKey]; - var searchType = (searchChild === null) ? + for (let ki=0; ki < constraintChildKeys.length; ki++) { + const constraintChildKey = constraintChildKeys[ki]; + const searchChild = searchConstraint[constraintChildKey]; + const searchType = (searchChild === null) ? 'undefined' : typeof searchChild; switch(searchType) { case 'boolean': @@ -5399,7 +5399,7 @@ function makeSearchBody(builtQuery) { } } - var searchFlags = searchOptions['search-option']; + let searchFlags = searchOptions['search-option']; if (searchFlags == null) { searchFlags = ['unfiltered']; searchOptions['search-option'] = searchFlags; @@ -5407,11 +5407,11 @@ function makeSearchBody(builtQuery) { searchFlags.push('unfiltered'); } - var orderByClause = builtQuery.orderByClause; + const orderByClause = builtQuery.orderByClause; if (orderByClause != null) { searchOptions['sort-order'] = orderByClause['sort-order']; - var scoreOption = orderByClause.scoreOption; + const scoreOption = orderByClause.scoreOption; if (scoreOption !== null && scoreOption !== void 0) { for (i=0; i < searchFlags.length; i++) { if (searchFlags[i].indexOf('score-') !== -1) { @@ -5424,25 +5424,25 @@ function makeSearchBody(builtQuery) { } } - var sliceClause = builtQuery.sliceClause; + const sliceClause = builtQuery.sliceClause; if (sliceClause != null) { - var sliceStart = sliceClause['page-start']; + const sliceStart = sliceClause['page-start']; if (sliceStart != null) { pageStart = sliceStart; } - var sliceLength = sliceClause['page-length']; + const sliceLength = sliceClause['page-length']; if (sliceLength != null) { pageLength = sliceLength; } - var transformResults = sliceClause['transform-results']; + const transformResults = sliceClause['transform-results']; if (transformResults != null) { searchOptions['transform-results'] = transformResults; searchOptions['return-results'] = true; view = 'results'; } - var extractResults = sliceClause['extract-document-data']; + const extractResults = sliceClause['extract-document-data']; if (extractResults != null) { searchOptions['extract-document-data'] = extractResults; } @@ -5452,27 +5452,27 @@ function makeSearchBody(builtQuery) { categories = (pageLength > 0) ? ['content'] : null; - var withOptionsClause = builtQuery.withOptionsClause; + const withOptionsClause = builtQuery.withOptionsClause; if (withOptionsClause != null) { // TODO: share with queryBuilder.js - var optionKeyMapping = { + const optionKeyMapping = { search:'search-option', weight:'quality-weight', forestNames:'forest', similarDocs:'return-similar', metrics:'return-metrics', queryPlan:'return-plan', debug:'debug', concurrencyLevel:'concurrency-level', categories:true, txid:true }; - var optionKeyInResponse = { + const optionKeyInResponse = { similarDocs:true, metrics:true, queryPlan:true, debug:true }; - var optionsKeys = Object.keys(withOptionsClause); + const optionsKeys = Object.keys(withOptionsClause); for (i=0; i < optionsKeys.length; i++) { - var key = optionsKeys[i]; - var mapping = optionKeyMapping[key]; + const key = optionsKeys[i]; + const mapping = optionKeyMapping[key]; if (mapping != null) { - var value = withOptionsClause[key]; + const value = withOptionsClause[key]; if (value != null) { if (mapping === true) { switch(key) { @@ -5509,15 +5509,15 @@ function makeSearchBody(builtQuery) { }; } function makeParsedQuery(searchBody, parsedQuery) { - var search = searchBody.search; + const search = searchBody.search; search.qtext = parsedQuery.qtext; - var constraintBindings = parsedQuery.constraint; - var hasConstraints = (constraintBindings != null); - var termBinding = parsedQuery.term; - var hasTerm = (termBinding != null); + const constraintBindings = parsedQuery.constraint; + const hasConstraints = (constraintBindings != null); + const termBinding = parsedQuery.term; + const hasTerm = (termBinding != null); if (hasConstraints || hasTerm) { - var searchOptions = search.options; + let searchOptions = search.options; if (searchOptions == null) { searchOptions = {}; search.options = searchOptions; diff --git a/lib/requester.js b/lib/requester.js index 7d4d3ba8..63bd1479 100644 --- a/lib/requester.js +++ b/lib/requester.js @@ -2,19 +2,19 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var createAuthInitializer = require('./www-authenticate-patched/www-authenticate'); -var Kerberos = require('./optional.js') +const createAuthInitializer = require('./www-authenticate-patched/www-authenticate'); +const Kerberos = require('./optional.js') .libraryProperty('kerberos', 'Kerberos'); -var Multipart = require('multipart-stream'); -var through2 = require('through2'); -var mlutil = require('./mlutil.js'); -var responder = require('./responder.js'); -var kerberos = null; +const Multipart = require('multipart-stream'); +const through2 = require('through2'); +const mlutil = require('./mlutil.js'); +const responder = require('./responder.js'); +let kerberos = null; const https = require('https'); const formData = require('form-data'); function createAuthenticator(client, user, password, challenge) { - var authenticator = createAuthInitializer.call(null, user, password)(challenge); + const authenticator = createAuthInitializer.call(null, user, password)(challenge); if (!client.authenticator) { client.authenticator = {}; } @@ -23,7 +23,7 @@ function createAuthenticator(client, user, password, challenge) { } function createAuthenticatorKerberos(client, credentials) { - var authenticatorKerberos = { + const authenticatorKerberos = { 'credentials': credentials }; client.authenticatorKerberos = authenticatorKerberos; @@ -81,11 +81,11 @@ function getAccessToken(operation){ } function startRequest(operation) { - var options = operation.options; - var operationErrorListener = responder.operationErrorListener; + const options = operation.options; + const operationErrorListener = responder.operationErrorListener; operation.errorListener = mlutil.callbackOn(operation, operationErrorListener); - var headers = options.headers; + let headers = options.headers; if (headers == null) { headers = {}; options.headers = headers; @@ -96,8 +96,8 @@ function startRequest(operation) { if(options.enableGzippedResponses) { headers['Accept-Encoding'] = 'gzip'; } - var started = null; - var operationResultPromise = null; + let started = null; + let operationResultPromise = null; switch(operation.requestType) { case 'empty': @@ -127,12 +127,12 @@ function startRequest(operation) { } const authType = options.authType.toUpperCase(); - var needsAuthenticator = ( + let needsAuthenticator = ( authType === 'DIGEST' || authType === 'KERBEROS' ); if (needsAuthenticator) { - var authenticator = null; + let authenticator = null; switch(authType) { case 'DIGEST': authenticator = getAuthenticator(operation.client, options.user); @@ -173,23 +173,23 @@ function startRequest(operation) { } if (started === null) { - var ResponseSelector = responder.ResponseSelector; + const ResponseSelector = responder.ResponseSelector; started = new ResponseSelector(operation); } return started; } function challengeRequest(operation) { - var isRead = (operation.inputSender === null); - var options = operation.options; - var challengeOpts = isRead ? options : { + const isRead = (operation.inputSender === null); + const options = operation.options; + const challengeOpts = isRead ? options : { method: 'HEAD', path: '/v1/ping' }; if (!isRead) { Object.keys(options).forEach(function optionKeyCopier(key) { if (challengeOpts[key] === void 0) { - var value = options[key]; + const value = options[key]; if (value != null) { challengeOpts[key] = value; } @@ -199,10 +199,10 @@ function challengeRequest(operation) { operation.logger.debug('challenge request for %s', challengeOpts.path); var request1 = operation.client.request(challengeOpts, function challengeResponder(response1) { - var statusCode1 = response1.statusCode; - var successStatus = (statusCode1 < 400); - var challenge = response1.headers['www-authenticate']; - var hasChallenge = (challenge != null); + const statusCode1 = response1.statusCode; + const successStatus = (statusCode1 < 400); + const challenge = response1.headers['www-authenticate']; + const hasChallenge = (challenge != null); operation.logger.debug('response with status %d and %s challenge for %s', statusCode1, hasChallenge, challengeOpts.path); @@ -218,7 +218,7 @@ function challengeRequest(operation) { authenticatedRequest(operation); // should never happen } else if (successStatus && isRead) { - var responseDispatcher = responder.responseDispatcher; + const responseDispatcher = responder.responseDispatcher; responseDispatcher.call(operation, response1); } else if (isRetry(response1)) { retryRequest(operation, response1, challengeRequest); @@ -232,7 +232,7 @@ function challengeRequest(operation) { } function credentialsRequest(operation) { kerberos = new Kerberos(); - var uri = 'HTTP@'+operation.options.host; + const uri = 'HTTP@'+operation.options.host; kerberos.authGSSClientInit(uri, 0, function(err, ctx) { if (err) { operation.errorListener('kerberos initialization failed at '+uri); @@ -257,12 +257,12 @@ function credentialsRequest(operation) { }); } function authenticatedRequest(operation) { - var isRead = (operation.inputSender === null); - var options = operation.options; + const isRead = (operation.inputSender === null); + const options = operation.options; operation.logger.debug('authenticated request for %s', options.path); - var authenticator = operation.authenticator; - var responseDispatcher = operation.isReplayable ? retryDispatcher : responder.responseDispatcher; - var request = operation.client.request( + const authenticator = operation.authenticator; + const responseDispatcher = operation.isReplayable ? retryDispatcher : responder.responseDispatcher; + const request = operation.client.request( options, mlutil.callbackOn(operation, responseDispatcher) ); const authType = options.authType.toUpperCase(); @@ -364,9 +364,9 @@ function retryRequest(operation, response, requestSender) { function singleRequester(request) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var requestSource = mlutil.marshal(operation.requestBody, operation); + const requestSource = mlutil.marshal(operation.requestBody, operation); if (requestSource == null) { request.end(); } else if (typeof requestSource === 'string' || requestSource instanceof String) { @@ -382,13 +382,13 @@ function singleRequester(request) { } function multipartRequester(request) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var operationBoundary = operation.multipartBoundary; - var multipartStream = new Multipart((operationBoundary == null) ? + const operationBoundary = operation.multipartBoundary; + const multipartStream = new Multipart((operationBoundary == null) ? mlutil.multipartBoundary : operationBoundary); - var requestPartsProvider = operation.requestPartsProvider; + const requestPartsProvider = operation.requestPartsProvider; if(operation.bindingParam) { const form = new formData(); const bindingParam = operation.bindingParam; @@ -443,14 +443,14 @@ function multipartRequester(request) { } else if (typeof requestPartsProvider === 'function') { requestPartsProvider.call(operation, multipartStream); } else { - var parts = operation.requestPartList; + const parts = operation.requestPartList; if (Array.isArray(parts)) { - var partsLen = parts.length; + const partsLen = parts.length; operation.logger.debug('writing %s parts', partsLen); - for (var i=0; i < partsLen; i++) { - var part = parts[i]; - var headers = part.headers; - var content = part.content; + for (let i=0; i < partsLen; i++) { + const part = parts[i]; + const headers = part.headers; + const content = part.content; if ((headers != null) && (content != null)) { operation.logger.debug('starting part %s', i); @@ -471,9 +471,9 @@ function multipartRequester(request) { } function chunkedRequester(request) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var requestWriter = operation.requestWriter; + const requestWriter = operation.requestWriter; if (requestWriter === null || requestWriter === undefined) { operation.errorListener('no request writer for streaming request'); request.end(); @@ -483,10 +483,10 @@ function chunkedRequester(request) { } function chunkedMultipartRequester(request) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var requestWriter = operation.requestWriter; - var requestDocument = operation.requestDocument; + const requestWriter = operation.requestWriter; + const requestDocument = operation.requestDocument; if (requestWriter == null) { operation.errorListener('no request writer for streaming request'); request.end(); @@ -494,17 +494,17 @@ function chunkedMultipartRequester(request) { operation.errorListener('no request document for streaming request'); request.end(); } else { - var operationBoundary = operation.multipartBoundary; + const operationBoundary = operation.multipartBoundary; - var multipartStream = new Multipart((operationBoundary == null) ? + const multipartStream = new Multipart((operationBoundary == null) ? mlutil.multipartBoundary : operationBoundary); - var partLast = requestDocument.length - 1; - for (var i=0; i <= partLast; i++) { - var part = requestDocument[i]; - var headers = part.headers; + const partLast = requestDocument.length - 1; + for (let i=0; i <= partLast; i++) { + const part = requestDocument[i]; + const headers = part.headers; if (i < partLast) { - var content = part.content; + const content = part.content; if ((headers != null) && (content != null)) { multipartStream.addPart({ diff --git a/lib/resources-config.js b/lib/resources-config.js index 6846a5ca..97762dcf 100644 --- a/lib/resources-config.js +++ b/lib/resources-config.js @@ -2,16 +2,16 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); /** @ignore */ function nameErrorTransform(message) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var name = operation.name; + const name = operation.name; return (name == null) ? message : (message+' (on '+name+' resource service)'); } @@ -26,7 +26,7 @@ function nameErrorTransform(message) { /** @ignore */ function emptyOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; return { name: operation.name @@ -59,11 +59,11 @@ Resources.prototype.read = function readResourceConfig(name) { throw new Error('must specify name when reading the resource service source'); } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'GET'; requestOptions.path = '/v1/config/resources/'+encodeURIComponent(name); - var operation = new Operation( + const operation = new Operation( 'read resource service', this.client, requestOptions, 'empty', 'single' ); operation.name = name; @@ -82,21 +82,21 @@ Resources.prototype.read = function readResourceConfig(name) { * @param {object|string} source - the source for the resource service */ Resources.prototype.write = function writeResourceConfig() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen === 0) { throw new Error('no arguments for writing an extension library'); } - var name = null; - var title = null; - var description = null; - var provider = null; - var version = null; - var format = null; - var source = null; + let name = null; + let title = null; + let description = null; + let provider = null; + let version = null; + let format = null; + let source = null; - var params = null; + let params = null; if (argLen === 1) { params = args[0]; name = params.name; @@ -117,7 +117,7 @@ Resources.prototype.write = function writeResourceConfig() { throw new Error('must specify name, format, and source when writing a resource service'); } - var contentType = null; + let contentType = null; switch(format) { case 'javascript': contentType = 'application/javascript'; @@ -129,9 +129,9 @@ Resources.prototype.write = function writeResourceConfig() { throw new Error('unsupported resource service format '+format); } - var endpoint = '/v1/config/resources/'+encodeURIComponent(name); + let endpoint = '/v1/config/resources/'+encodeURIComponent(name); - var sep = '?'; + let sep = '?'; if (title != null) { endpoint += sep+'title='+encodeURIComponent(title); if (sep === '?') {sep = '&';} @@ -149,14 +149,14 @@ Resources.prototype.write = function writeResourceConfig() { if (sep === '?') {sep = '&';} } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'PUT'; requestOptions.headers = { 'Content-Type': contentType }; requestOptions.path = endpoint; - var operation = new Operation( + const operation = new Operation( 'write resource service', this.client, requestOptions, 'single', 'empty' ); operation.name = name; @@ -178,11 +178,11 @@ Resources.prototype.remove = function removeResourceConfig(name) { throw new Error('must specify name when deleting the resource service source'); } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'DELETE'; requestOptions.path = '/v1/config/resources/'+encodeURIComponent(name); - var operation = new Operation( + const operation = new Operation( 'remove resource service', this.client, requestOptions, 'empty', 'empty' ); operation.name = name; @@ -201,14 +201,14 @@ Resources.prototype.remove = function removeResourceConfig(name) { * on the server */ Resources.prototype.list = function listResourceConfig() { - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'GET'; requestOptions.headers = { 'Accept': 'application/json' }; requestOptions.path = '/v1/config/resources'; - var operation = new Operation( + const operation = new Operation( 'list resource services', this.client, requestOptions, 'empty', 'single' ); diff --git a/lib/resources-exec.js b/lib/resources-exec.js index d9b9db70..c3103da0 100644 --- a/lib/resources-exec.js +++ b/lib/resources-exec.js @@ -2,9 +2,9 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); /** * Provides functions to execute resource services on the REST server @@ -20,7 +20,7 @@ function checkArgs() { throw new Error('no argument for executing resource service'); } - var args = arguments[0]; + const args = arguments[0]; if (args.name === void 0) { throw new Error('no name for executing resource service'); } @@ -29,18 +29,18 @@ function checkArgs() { } /** @ignore */ function makeRequestOptions(client, args) { - var path = '/v1/resources/'+args.name; - - var sep ='?'; - - var params = args.params; - var keys = (params === void 0) ? null : Object.keys(params); - var keyLen = (keys === null) ? 0 : keys.length; - var key = null; - var prefix = null; - var i=0; - var value = null; - var j=0; + let path = '/v1/resources/'+args.name; + + let sep ='?'; + + const params = args.params; + const keys = (params === void 0) ? null : Object.keys(params); + const keyLen = (keys === null) ? 0 : keys.length; + let key = null; + let prefix = null; + let i=0; + let value = null; + let j=0; for (; i < keyLen; i++) { key = keys?keys[i]:null; if(params){ @@ -63,7 +63,7 @@ function makeRequestOptions(client, args) { } } - var txid = mlutil.convertTransaction(args.txid); + const txid = mlutil.convertTransaction(args.txid); if (txid !== undefined && txid != null) { path += sep+'txid='+mlutil.getTxidParam(txid); if (sep === '?') { @@ -109,9 +109,9 @@ Resources.prototype.get = function getResourceExec() { ); }; Resources.prototype.getReadStream = function getResourceExecStream() { - var args = checkArgs.apply(null, arguments); + const args = checkArgs.apply(null, arguments); - var contentType = args.contentType; + const contentType = args.contentType; if (contentType == null) { throw new Error('no content type for reading stream from resource service'); } @@ -120,13 +120,13 @@ Resources.prototype.getReadStream = function getResourceExecStream() { }; /** @ignore */ function readResourceExec(self, responseType, contentType, args) { - var requestOptions = makeRequestOptions(self.client, args); + const requestOptions = makeRequestOptions(self.client, args); requestOptions.method = 'GET'; requestOptions.headers = { 'Accept': contentType }; - var operation = new Operation( + const operation = new Operation( 'execute remove service', self.client, requestOptions, 'empty', responseType ); operation.name = args.name; @@ -179,19 +179,19 @@ Resources.prototype.putWriteStream = function putResourceExecStream() { }; /** @ignore */ function writeResourceStream(self, method, responseType, args) { - var contentType = args.contentType; + const contentType = args.contentType; if (contentType == null) { throw new Error('no content type for writing stream to resource service'); } - var requestOptions = makeRequestOptions(self.client, args); + const requestOptions = makeRequestOptions(self.client, args); requestOptions.headers = { 'Content-Type': contentType, 'Accept': 'application/json' }; requestOptions.method = method; - var operation = new Operation( + const operation = new Operation( 'execute '+method+' service stream', self.client, requestOptions, 'chunked', responseType ); @@ -203,16 +203,16 @@ function writeResourceStream(self, method, responseType, args) { } /** @ignore */ function writeResources(self, method, responseType, args) { - var documents = args.documents; + let documents = args.documents; - var isEmpty = (documents == null); + const isEmpty = (documents == null); if (!isEmpty && !Array.isArray(documents)) { documents = [documents]; } - var multipartBoundary = mlutil.multipartBoundary; + const multipartBoundary = mlutil.multipartBoundary; - var requestOptions = makeRequestOptions(self.client, args); + const requestOptions = makeRequestOptions(self.client, args); requestOptions.method = method; requestOptions.headers = (!isEmpty) ? { @@ -223,7 +223,7 @@ function writeResources(self, method, responseType, args) { 'Accept': 'application/json' }; - var operation = new Operation( + const operation = new Operation( 'execute '+method+' service', self.client, requestOptions, (isEmpty ? 'empty' : 'multipart'), responseType ); @@ -234,7 +234,7 @@ function writeResources(self, method, responseType, args) { operation.requestPartList = []; if (typeof documents !== 'undefined' && documents !== null) { - for (var i=0; i < documents.length; i++) { + for (let i=0; i < documents.length; i++) { addPart(operation, documents[i]); } } @@ -245,17 +245,17 @@ function writeResources(self, method, responseType, args) { } /** @ignore */ function addPart(operation, document) { - var headers = {}; - var part = { + const headers = {}; + const part = { headers: headers }; - var content = document.content; - var hasContent = (content != null); - var contentType = hasContent ? document.contentType : null; + const content = document.content; + const hasContent = (content != null); + const contentType = hasContent ? document.contentType : null; if (hasContent && (contentType != null)) { - var marshaledData = mlutil.marshal(content, operation); + const marshaledData = mlutil.marshal(content, operation); /* TODO: allow encoding in multipart parse headers['Content-Type'] = contentType + ((typeof marshaledData === 'string' || marshaledData instanceof String) ? '; charset=utf-8' : ''); @@ -291,15 +291,15 @@ function addPart(operation, document) { * multi-statement transaction */ Resources.prototype.remove = function removeResourceExec() { - var args = checkArgs.apply(null, arguments); + const args = checkArgs.apply(null, arguments); - var requestOptions = makeRequestOptions(this.client, args); + const requestOptions = makeRequestOptions(this.client, args); requestOptions.headers = { 'Accept': 'application/json' }; requestOptions.method = 'DELETE'; - var operation = new Operation( + const operation = new Operation( 'execute remove service', this.client, requestOptions, 'empty', 'single' ); operation.name = args.name; diff --git a/lib/responder.js b/lib/responder.js index b5f6793f..412ca64d 100644 --- a/lib/responder.js +++ b/lib/responder.js @@ -2,11 +2,11 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var concatStream = require('concat-stream'); -var jsonParser = require('json-text-sequence').Parser; -var Dicer = require('@fastify/busboy/deps/dicer/lib/Dicer'); -var through2 = require('through2'); -var mlutil = require('./mlutil.js'); +const concatStream = require('concat-stream'); +const jsonParser = require('json-text-sequence').Parser; +const Dicer = require('@fastify/busboy/deps/dicer/lib/Dicer'); +const through2 = require('through2'); +const mlutil = require('./mlutil.js'); const requester = require('./requester'); const {createGunzip} = require('zlib'); @@ -31,20 +31,20 @@ const {createGunzip} = require('zlib'); */ function responseDispatcher(response) { /*jshint validthis:true */ - var operation = this; + const operation = this; if (!isResponseStatusOkay.call(operation, response)) { return; } - var outputMode = operation.outputMode; + const outputMode = operation.outputMode; if (outputMode === 'none') { return; } - var responseType = response.headers['content-type']; - var responseTypeLen = (!responseType) ? 0 : responseType.length; - var responseBoundary = null; + const responseType = response.headers['content-type']; + const responseTypeLen = (!responseType) ? 0 : responseType.length; + let responseBoundary = null; if (15 <= responseTypeLen && responseType.substr(0, 15) === 'multipart/mixed') { responseBoundary = responseType.replace( /^multipart.mixed\s*;\s*boundary\s*=\s*([^\s;]+)([\s;].*)?$/, '$1' @@ -60,16 +60,16 @@ function responseDispatcher(response) { ); } } - var isMultipart = (responseBoundary != null); + const isMultipart = (responseBoundary != null); // inputHeader may be boundary (for multipart) or content type (for body) // Allows dispatch function signatures to remain consistent - var inputHeader = isMultipart ? responseBoundary : responseType; + const inputHeader = isMultipart ? responseBoundary : responseType; - var responseLength = response.headers['content-length']; - var isEmpty = ((responseLength != null) && responseLength === '0'); + const responseLength = response.headers['content-length']; + const isEmpty = ((responseLength != null) && responseLength === '0'); - var expectedType = operation.responseType; + const expectedType = operation.responseType; // point-in-time operations: if timestamp unset, set with header value if (operation.timestamp !== undefined && operation.timestamp !== null) { @@ -79,7 +79,7 @@ function responseDispatcher(response) { } } - var dispatcher = null; + let dispatcher = null; if (isMultipart) { if (expectedType !== 'multipart') { operation.logger.debug('expected body but received multipart'); @@ -149,15 +149,15 @@ function CSVDispatcher(operation) { CSVDispatcher.prototype.promise = function dispatchCSVPromise( contentType, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('csv promise'); - var collectObject = function collectPromiseBodyObject(data) { + const collectObject = function collectPromiseBodyObject(data) { operation.data = data; resolvedPromise(operation, operation.resolve); }; - var isString = operation.copyResponseHeaders(response); + const isString = operation.copyResponseHeaders(response); if(isResponseGzipped(response.headers)) { response.pipe(createGunzip()).pipe(concatStream( {encoding: (isString ? 'string' : 'buffer')}, @@ -173,7 +173,7 @@ CSVDispatcher.prototype.promise = function dispatchCSVPromise( CSVDispatcher.prototype.chunkedStream = function dispatchCSVChunkedStream( contentType, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('csv chunked stream'); @@ -196,20 +196,20 @@ function JSONSeqDispatcher(operation) { JSONSeqDispatcher.prototype.promise = function dispatchJSONSeqPromise( contentType, response ) { - var operation = this.operation; - var errorListener = operation.errorListener; - var objectQueue = new FifoQueue(2); - var parsedObjects = 0; + const operation = this.operation; + const errorListener = operation.errorListener; + let objectQueue = new FifoQueue(2); + let parsedObjects = 0; operation.logger.debug('json sequence promise'); - var dataListener = function JSONSeqDataListener(object) { + let dataListener = function JSONSeqDataListener(object) { parsedObjects++; operation.logger.debug('json-seq parsing object %d', parsedObjects); objectQueue.addLast(object); }; - var finishListener = function JSONSeqFinishListener() { + let finishListener = function JSONSeqFinishListener() { operation.logger.debug('json-seq finished parsing %d objects', parsedObjects); operation.data = objectQueue.getQueue(); resolvedPromise(operation, operation.resolve); @@ -248,21 +248,21 @@ JSONSeqDispatcher.prototype.objectStream = function dispatchJSONSeqObjectStream( JSONSeqDispatcher.prototype.stream = function dispatchJSONSeqStream( streamMode, response ) { - var operation = this.operation; - var errorListener = operation.errorListener; - var outputStream = operation.outputStream; - var parsedObjects = 0; - var hasParsed = false; - var hasEnded = false; + const operation = this.operation; + const errorListener = operation.errorListener; + const outputStream = operation.outputStream; + let parsedObjects = 0; + let hasParsed = false; + let hasEnded = false; operation.logger.debug('json sequence stream ' + streamMode); - var dataListener = function JSONSeqDataListener(object) { + let dataListener = function JSONSeqDataListener(object) { parsedObjects++; operation.logger.debug('parsing object %d', parsedObjects); operation.logger.debug(object); - var writeResult = null; + let writeResult = null; if (object !== null && object !== undefined) { if (streamMode === 'object') { writeResult = outputStream.write(object); @@ -284,7 +284,7 @@ JSONSeqDispatcher.prototype.stream = function dispatchJSONSeqStream( }; - var responseFinisher = function JSONSeqFinishListener() { + let responseFinisher = function JSONSeqFinishListener() { if (hasParsed && hasEnded) { operation.logger.debug('finished parsing %d objects', parsedObjects); @@ -343,7 +343,7 @@ function BodyDispatcher(operation) { this.operation = operation; } BodyDispatcher.prototype.emptyPromise = function dispatchBodyEmptyPromise(response) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('empty body promise'); @@ -351,13 +351,13 @@ BodyDispatcher.prototype.emptyPromise = function dispatchBodyEmptyPromise(respon resolvedPromise(operation, operation.resolve); }; BodyDispatcher.prototype.emptyStream = function dispatchBodyEmptyStream(response) { - var operation = this.operation; + const operation = this.operation; - var data = operation.emptyHeaderData(response); + const data = operation.emptyHeaderData(response); operation.logger.debug('empty body stream'); - var outputStream = operation.outputStream; + const outputStream = operation.outputStream; if (data != null) { if (operation.outputStreamMode === 'chunked') { outputStream.write(JSON.stringify(data)); @@ -370,17 +370,17 @@ BodyDispatcher.prototype.emptyStream = function dispatchBodyEmptyStream(response BodyDispatcher.prototype.promise = function dispatchBodyPromise( contentType, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('body promise'); - var collectObject = function collectPromiseBodyObject(data) { + const collectObject = function collectPromiseBodyObject(data) { // turn collected data into something usable // e.g., if JSON, parse as JS object operation.data = operation.collectBodyObject(data); resolvedPromise(operation, operation.resolve); }; - var isString = operation.copyResponseHeaders(response); + const isString = operation.copyResponseHeaders(response); if(isResponseGzipped(response.headers)) { const gunzip = createGunzip(); @@ -400,7 +400,7 @@ BodyDispatcher.prototype.promise = function dispatchBodyPromise( BodyDispatcher.prototype.chunkedStream = function dispatchBodyChunkedStream( contentType, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('body chunked stream'); @@ -416,23 +416,23 @@ BodyDispatcher.prototype.chunkedStream = function dispatchBodyChunkedStream( BodyDispatcher.prototype.objectStream = function dispatchBodyObjectStream( contentType, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('body object stream'); // outputStream is a through2 stream in object mode - var outputStream = operation.outputStream; + const outputStream = operation.outputStream; - var collectObject = function collectStreamBodyObject(data) { + const collectObject = function collectStreamBodyObject(data) { // similar to promise body case, but write to through2 - var writableObject = operation.collectBodyObject(data); + const writableObject = operation.collectBodyObject(data); if (writableObject != null) { outputStream.write(writableObject); } outputStream.end(); }; - var isString = operation.copyResponseHeaders(response); + const isString = operation.copyResponseHeaders(response); if(isResponseGzipped(response.headers)) { response.pipe(createGunzip()).pipe(concatStream( {encoding: (isString ? 'string' : 'buffer')}, @@ -458,9 +458,9 @@ function MultipartDispatcher(operation) { this.operation = operation; } MultipartDispatcher.prototype.emptyPromise = function dispatchMultipartEmptyPromise(response) { - var operation = this.operation; + const operation = this.operation; - var data = operation.emptyHeaderData(response); + const data = operation.emptyHeaderData(response); operation.logger.debug('empty multipart promise'); @@ -468,13 +468,13 @@ MultipartDispatcher.prototype.emptyPromise = function dispatchMultipartEmptyProm resolvedPromise(operation, operation.resolve); }; MultipartDispatcher.prototype.emptyStream = function dispatchMultipartEmptyStream(response) { - var operation = this.operation; + const operation = this.operation; - var data = operation.emptyHeaderData(response); + const data = operation.emptyHeaderData(response); operation.logger.debug('empty multipart stream'); - var outputStream = operation.outputStream; + const outputStream = operation.outputStream; if (data != null) { if (operation.outputStreamMode === 'chunked') { outputStream.write(JSON.stringify(data)); @@ -492,10 +492,10 @@ MultipartDispatcher.prototype.emptyStream = function dispatchMultipartEmptyStrea MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( boundary, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('multipart promise'); - const errorListenerCheck = (operation.options.headers['Accept'] === 'application/json' && (operation.name.includes('rows') || operation.name.includes('query') || operation.name.includes('/v1/rows'))); + const errorListenerCheck = (operation.options.headers.Accept === 'application/json' && (operation.name.includes('rows') || operation.name.includes('query') || operation.name.includes('/v1/rows'))); if(errorListenerCheck) { if(response.headers['content-encoding']!=='gzip'){ @@ -512,7 +512,7 @@ MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( response.pipe(concatStream( {encoding: 'json'}, () => { - let data = JSON.parse(chunks); + const data = JSON.parse(chunks); operation.data = data; resolvedPromise(operation, operation.resolve); } @@ -521,22 +521,22 @@ MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( return; } - var errorListener = operation.errorListener; + const errorListener = operation.errorListener; - var rawHeaderQueue = new FifoQueue(2); - var objectQueue = new FifoQueue(2); - var partReaderQueue = new FifoQueue(3); + let rawHeaderQueue = new FifoQueue(2); + let objectQueue = new FifoQueue(2); + let partReaderQueue = new FifoQueue(3); - var parsingParts = 0; - var parsedParts = 0; + let parsingParts = 0; + let parsedParts = 0; - var hasParsed = false; - var hasEnded = false; + let hasParsed = false; + let hasEnded = false; - var responseFinisher = function promiseResponseFinisher() { + let responseFinisher = function promiseResponseFinisher() { // If there is metadata left in the buffer, add it to queue if (operation.nextMetadataBuffer !== null) { - var metadataHeaders = operation.nextMetadataBuffer[0]; + const metadataHeaders = operation.nextMetadataBuffer[0]; mlutil.copyProperties(operation.nextMetadataBuffer[1], metadataHeaders); objectQueue.addLast(metadataHeaders); } @@ -563,7 +563,7 @@ MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( partReaderQueue.removeFirst(); - var madeObject = operation.makeObject( + const madeObject = operation.makeObject( (data.length === 0) ? null : data, rawHeaderQueue ); @@ -572,10 +572,10 @@ MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( } if (partReaderQueue.hasItem()) { - var partConcatenator = concatStream(partFinisher); + const partConcatenator = concatStream(partFinisher); partConcatenator.on('error', errorListener); - var partReadStream = partReaderQueue.getFirst(); + const partReadStream = partReaderQueue.getFirst(); partReadStream.pipe(partConcatenator); } else if (hasParsed) { responseFinisher(); @@ -597,7 +597,7 @@ MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( partReaderQueue.addLast(partReadStream); if (partReaderQueue.isLast()) { - var partConcatenator = concatStream(partFinisher); + const partConcatenator = concatStream(partFinisher); partConcatenator.on('error', errorListener); partReadStream.pipe(partConcatenator); } @@ -629,19 +629,19 @@ MultipartDispatcher.prototype.promise = function dispatchMultipartPromise( MultipartDispatcher.prototype.chunkedStream = function dispatchMultipartChunkedStream( boundary, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('multipart chunked stream'); - var errorListener = operation.errorListener; + const errorListener = operation.errorListener; - var outputStream = operation.outputStream; + let outputStream = operation.outputStream; - var partReaderQueue = new FifoQueue(3); + const partReaderQueue = new FifoQueue(3); - var hasParsed = false; - var hasEnded = false; + let hasParsed = false; + let hasEnded = false; - var responseFinisher = function chunkedResponseFinisher() { + let responseFinisher = function chunkedResponseFinisher() { outputStream.end(); outputStream = null; partEndListener = null; @@ -656,7 +656,7 @@ MultipartDispatcher.prototype.chunkedStream = function dispatchMultipartChunkedS partReaderQueue.removeFirst(); if (partReaderQueue.hasItem()) { - var partReadStream = partReaderQueue.getFirst(); + const partReadStream = partReaderQueue.getFirst(); partReadStream.pipe(outputStream, {end: false}); } else if (hasParsed) { responseFinisher(); @@ -699,26 +699,26 @@ MultipartDispatcher.prototype.chunkedStream = function dispatchMultipartChunkedS MultipartDispatcher.prototype.objectStream = function dispatchMultipartObjectStream( boundary, response ) { - var operation = this.operation; + const operation = this.operation; operation.logger.debug('multipart object stream'); - var errorListener = operation.errorListener; + const errorListener = operation.errorListener; - var rawHeaderQueue = new FifoQueue(5); - var partReaderQueue = new FifoQueue(3); + let rawHeaderQueue = new FifoQueue(5); + const partReaderQueue = new FifoQueue(3); // For referenced attachments case - var partBuffer = null; + let partBuffer = null; - var parsingParts = 0; - var parsedParts = 0; + let parsingParts = 0; + let parsedParts = 0; - var hasParsed = false; - var hasEnded = false; + let hasParsed = false; + let hasEnded = false; - var isConcatenating = false; + let isConcatenating = false; - var responseFinisher = function objectResponseFinisher() { + const responseFinisher = function objectResponseFinisher() { if (!partReaderQueue.hasItem() && hasParsed && hasEnded) { @@ -734,7 +734,7 @@ MultipartDispatcher.prototype.objectStream = function dispatchMultipartObjectStr else { // If there is metadata left in the buffer, write it if (operation.nextMetadataBuffer !== null) { - var metadataHeaders = operation.nextMetadataBuffer[0]; + const metadataHeaders = operation.nextMetadataBuffer[0]; mlutil.copyProperties(operation.nextMetadataBuffer[1], metadataHeaders); operation.outputStream.write(metadataHeaders); operation.nextMetadataBuffer = null; @@ -753,16 +753,16 @@ MultipartDispatcher.prototype.objectStream = function dispatchMultipartObjectStr }; - var partFinisher = function objectPartFinisher(data) { + const partFinisher = function objectPartFinisher(data) { parsedParts++; operation.logger.debug('parsed part %d', parsedParts); - var madeObject = operation.makeObject( + const madeObject = operation.makeObject( (data.length === 0) ? null : data, rawHeaderQueue ); // Handle multipart with reference attachments (rows) - var writeResult = null; + let writeResult = null; if (operation.complexValues === 'reference') { if (madeObject !== null && madeObject !== undefined) { // Columns object @@ -784,7 +784,7 @@ MultipartDispatcher.prototype.objectStream = function dispatchMultipartObjectStr // Attachment object else { // Remove '[n]' to get column name - var columnName = madeObject.contentId + const columnName = madeObject.contentId .slice(0, madeObject.contentId.lastIndexOf('[')); // Put attachment into currently cached part partBuffer.content[columnName] = { @@ -819,9 +819,9 @@ MultipartDispatcher.prototype.objectStream = function dispatchMultipartObjectStr // If item avail, concat-stream it with callback to finisher if (partReaderQueue.hasItem()) { isConcatenating = true; - var partRead = concatStream(partFinisher); + const partRead = concatStream(partFinisher); partRead.on('error', errorListener); - var partReadStream = partReaderQueue.getFirst(); + const partReadStream = partReaderQueue.getFirst(); partReadStream.pipe(partRead); } else if (hasParsed) { @@ -845,7 +845,7 @@ MultipartDispatcher.prototype.objectStream = function dispatchMultipartObjectStr if (partReaderQueue.isLast()) { isConcatenating = true; - var partRead = concatStream(partFinisher); + const partRead = concatStream(partFinisher); partRead.on('error', errorListener); partReadStream.pipe(partRead); } @@ -861,15 +861,15 @@ MultipartDispatcher.prototype.objectStream = function dispatchMultipartObjectStr responseFinisher(); }; - var drainListener = function objectDrainListener() { + const drainListener = function objectDrainListener() { if (!hasEnded) { response.resume(); // Don't read if concat in progress to avoid double processing if (partReaderQueue.hasItem() && !isConcatenating) { isConcatenating = true; - var partRead = concatStream(partFinisher); + const partRead = concatStream(partFinisher); partRead.on('error', errorListener); - var partReadStream = partReaderQueue.getFirst(); + const partReadStream = partReaderQueue.getFirst(); partReadStream.pipe(partRead); } } @@ -951,7 +951,7 @@ FifoQueue.prototype.removeFirst = function fifoRemoveFirst() { } }; FifoQueue.prototype.pollFirst = function fifoPollFirst() { - var item = this.getFirst(); + const item = this.getFirst(); if (item !== undefined) { this.removeFirst(); } @@ -997,20 +997,20 @@ FifoQueue.prototype.compact = function fifoCompact() { function isResponseStatusOkay(response) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var statusCode = response.statusCode; + const statusCode = response.statusCode; - var errMsg = null; + let errMsg = null; - var statusCodeValidator = operation.statusCodeValidator; + const statusCodeValidator = operation.statusCodeValidator; if (typeof statusCodeValidator === 'function') { errMsg = statusCodeValidator.call(operation, statusCode, response); } else { - var validStatusCodes = operation.validStatusCodes; + const validStatusCodes = operation.validStatusCodes; if (Array.isArray(validStatusCodes)) { - var isError = true; - for (var i=0; i < validStatusCodes.length; i++) { + let isError = true; + for (let i=0; i < validStatusCodes.length; i++) { if (validStatusCodes[i] === statusCode) { isError = false; break; @@ -1025,16 +1025,16 @@ function isResponseStatusOkay(response) { } if (errMsg != null) { - var clientError = operation.makeError(errMsg); + const clientError = operation.makeError(errMsg); clientError.statusCode = statusCode; if (statusCode >= 400) { - let errorResponse = (isResponseGzipped(response.headers))?response.pipe(createGunzip()):response; + const errorResponse = (isResponseGzipped(response.headers))?response.pipe(createGunzip()):response; errorResponse.pipe(concatStream( {encoding: 'string'}, function errorBodyDispatcher(body) { if (body.length > 0) { - var bodyMsg = (typeof body === 'string' || body instanceof String) ? body : body.toString(); - var contentType = response.headers['content-type']; + const bodyMsg = (typeof body === 'string' || body instanceof String) ? body : body.toString(); + const contentType = response.headers['content-type']; clientError.body = ((typeof contentType === 'string' || contentType instanceof String) && /^application\/([^+]+\+)?json(\s*;.*)?$/.test(contentType)) ? @@ -1065,7 +1065,7 @@ function ResponseSelector(operation) { } function operationResultPromise(fullfilled, rejected) { /*jshint validthis:true */ - var operation = this; + const operation = this; switch (operation.outputMode) { case 'none': @@ -1080,7 +1080,7 @@ function operationResultPromise(fullfilled, rejected) { } operation.outputMode = 'promise'; - var promise = new Promise(function promiseDispatcher(resolve, reject) { + const promise = new Promise(function promiseDispatcher(resolve, reject) { if (operation.done !== true) { if (resolve) { operation.resolve = resolve; @@ -1109,9 +1109,9 @@ function resolvedPromise(operation, resolve) { return; } - var data = operation.data; - var hasData = (data != null); - var dataLen = hasData ? data.length : null; + const data = operation.data; + const hasData = (data != null); + const dataLen = hasData ? data.length : null; if(hasData && dataLen) { for(let i=0; i 1) { firstError.otherErrors = errorArray.slice(1); } @@ -1163,7 +1163,7 @@ function rejectedPromise(operation, reject) { } function operationResultStream() { /*jshint validthis:true */ - var operation = this; + const operation = this; switch (operation.outputMode) { case 'none': @@ -1177,8 +1177,8 @@ function operationResultStream() { throw new Error('already created stream'); } - var streamArg = (arguments.length > 0) ? arguments[0] : null; - var streamMode = null; + const streamArg = (arguments.length > 0) ? arguments[0] : null; + let streamMode = null; if (streamArg === null) { streamMode = operation.streamDefaultMode; operation.outputStreamMode = streamMode; @@ -1194,7 +1194,7 @@ function operationResultStream() { } operation.outputMode = streamMode+'Stream'; - var outputStream = null; + let outputStream = null; switch(streamMode) { case 'chunked': outputStream = through2(); @@ -1210,9 +1210,9 @@ function operationResultStream() { } operation.outputStream = outputStream; - var error = operation.error; + const error = operation.error; if (error != null) { - var i = 0; + let i = 0; for (; i < error.length; i++) { outputStream.emit('error', error[i]); } @@ -1223,7 +1223,7 @@ function operationResultStream() { } function operationErrorListener(error) { /*jshint validthis:true */ - var operation = this; + const operation = this; if(operation.client.connectionParams.apiKey){ if(error.statusCode === 401 && operation.expiration <= (new Date())){ if(!operation.lockAccessToken){ @@ -1245,7 +1245,7 @@ function operationErrorListener(error) { operation.done = true; - var outputStream = operation.outputStream; + const outputStream = operation.outputStream; if (outputStream != null) { outputStream.end(); diff --git a/lib/rest-server-properties.js b/lib/rest-server-properties.js index 12f6ab63..ee6c0f43 100644 --- a/lib/rest-server-properties.js +++ b/lib/rest-server-properties.js @@ -2,9 +2,9 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); /** * Provides functions to modify the properties of the REST server for @@ -28,14 +28,14 @@ function RESTServerProperties(client) { * @returns {object} the properties */ RESTServerProperties.prototype.read = function readRESTServerProperties() { - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'GET'; requestOptions.headers = { 'Accept': 'application/json' }; requestOptions.path = '/v1/config/properties'; - var operation = new Operation( + const operation = new Operation( 'read REST server properties', this.client, requestOptions, 'empty', 'single' ); @@ -45,9 +45,9 @@ RESTServerProperties.prototype.read = function readRESTServerProperties() { /** @ignore */ function RESTServerPropertiesOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var statusCode = operation.responseStatusCode; + const statusCode = operation.responseStatusCode; return (statusCode === 204 || statusCode === 200); } @@ -62,14 +62,14 @@ RESTServerProperties.prototype.write = function writeRESTServerProperties(proper throw new Error('cannot write with missing properties object'); } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'PUT'; requestOptions.headers = { 'Content-Type': 'application/json' }; requestOptions.path = '/v1/config/properties'; - var operation = new Operation( + const operation = new Operation( 'write REST server properties', this.client, requestOptions, 'single', 'empty' ); operation.outputTransform = RESTServerPropertiesOutputTransform; diff --git a/lib/rows.js b/lib/rows.js index 61dbad31..f24b72b2 100644 --- a/lib/rows.js +++ b/lib/rows.js @@ -64,13 +64,13 @@ function Rows(client) { * @returns {Promise} A Promise. */ Rows.prototype.query = function queryRows() { - let args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 1) { throw new Error('built plan required'); } - let builtPlan = args[0], + const builtPlan = args[0], options = (args.length >= 2) ? args[1] : null; return queryRowsImpl(this, builtPlan, null, options, args[2]); @@ -87,12 +87,13 @@ function queryRowsImpl(self, builtPlan, streamType, options, bindingArg, graphql } function queryRowsOperationImpl(self, builtPlan, streamType, options, bindingArg, graphqlQuery) { + const validFormats = ['json','xml','csv'], + validStructures = ['object','array'], + validColumnTypes = ['rows','header'], + validComplexValues = ['inline','reference'], + validStreamTypes = ['chunked','object','sequence']; + let sep = '?', - validFormats = ['json','xml','csv'], - validStructures = ['object','array'], - validColumnTypes = ['rows','header'], - validComplexValues = ['inline','reference'], - validStreamTypes = ['chunked','object','sequence'], // set defaults format = 'json', structure = 'object', @@ -237,7 +238,7 @@ function queryRowsOperationImpl(self, builtPlan, streamType, options, bindingArg } } - let requestOptions = mlutil.newRequestOptions(connectionParams, endpoint, 'POST'); + const requestOptions = mlutil.newRequestOptions(connectionParams, endpoint, 'POST'); requestOptions.headers = { 'Content-Type': contentTypeHeader, 'Accept': acceptHeader @@ -291,7 +292,7 @@ function queryContentType(builtPlan, queryType) { const validQueryTypes = ['json', 'sparql', 'sql', 'dsl']; if (validQueryTypes.indexOf(queryType) < 0) { throw new Error('invalid queryType "' + queryType + '"'); - } else if (queryType != 'json' && typeof builtPlan != 'string' && !(builtPlan instanceof String)) { + } else if (queryType != 'json' && typeof builtPlan !== 'string' && !(builtPlan instanceof String)) { throw new Error('queryType "' + queryType + '" must be provided as string'); } @@ -318,15 +319,15 @@ function queryContentType(builtPlan, queryType) { * @returns {ReadableStream} A readable stream. */ Rows.prototype.queryAsStream = function queryAsStreamRows() { - let args = mlutil.asArray.apply(null, arguments), - streamType = 'chunked', // default + const args = mlutil.asArray.apply(null, arguments); + let streamType = 'chunked', // default options = null; if (args.length < 1) { throw new Error('built plan required'); } - let builtPlan = args[0]; + const builtPlan = args[0]; if (args.length === 2) { if (typeof args[1] === 'string' || args[1] instanceof String) { @@ -414,7 +415,7 @@ Rows.prototype.generateView = function generateViewRows(builtPlan, schema, view, throw new Error('view cannot be null or empty'); } - let acceptHeader = 'application/xml'; + const acceptHeader = 'application/xml'; const contentTypeHeader = queryContentType(builtPlan, queryType); const endpoint = '/v1/rows?output=generateView&schemaName='+schema+'&viewName='+view; @@ -475,7 +476,7 @@ Rows.prototype.generateView = function generateViewRows(builtPlan, schema, view, */ Rows.prototype.queryAll = function queryAllDocumentsImpl(batchView, jobOptions){ - let path = '/v1/internal/viewinfo'; + const path = '/v1/internal/viewinfo'; const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'POST'); requestOptions.headers = { @@ -483,7 +484,7 @@ Rows.prototype.generateView = function generateViewRows(builtPlan, schema, view, 'Content-Type': 'application/json' }; - let operation = new Operation( + const operation = new Operation( 'read viewInfo', this.client, requestOptions, 'single', 'single' ); if (batchView instanceof planBuilder.Plan) { @@ -492,7 +493,7 @@ Rows.prototype.generateView = function generateViewRows(builtPlan, schema, view, operation.requestBody = batchView; } - let jobState = { + const jobState = { docInstance : this, requesterCount: 0, rowsReadSuccessfully:0, @@ -623,26 +624,26 @@ Rows.prototype.generateView = function generateViewRows(builtPlan, schema, view, */ Rows.prototype.execute = function executeRows() { - let args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 1) { throw new Error('built plan required'); } - let builtPlan = args[0], options = (args.length >= 2 && args[1])?args[1] : {}; + const builtPlan = args[0], options = (args.length >= 2 && args[1])?args[1] : {}; // opticExecute is an internal flag to ensure output doesn't default to anything. options.opticExecute = true; queryRowsImpl(this, builtPlan, null, options, args[2]); }; Rows.prototype.graphQL = function graphqlRows() { - let args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); if (args.length < 1) { throw new Error('graphql query required'); } - let options = (args.length >= 2) ? args[1] : null; + const options = (args.length >= 2) ? args[1] : null; return queryRowsImpl(this, null, null, options,null, args[0]); }; @@ -702,10 +703,10 @@ function onQueryAllRows(jobState, readerId, batchNum) { finishOnQueryAllRows(jobState); return; } - let lowerBound = bigInt((currentBatchNum - 1) * jobState.requestBatchSize); - let upperBound = (currentBatchNum === jobState.numberOfBatches) ? '-1' : + const lowerBound = bigInt((currentBatchNum - 1) * jobState.requestBatchSize); + const upperBound = (currentBatchNum === jobState.numberOfBatches) ? '-1' : bigInt(lowerBound + jobState.requestBatchSize -1); - let options = { + const options = { bindings: {ML_LOWER_BOUND:lowerBound, ML_UPPER_BOUND:upperBound}, format: jobState.jobOptions.rowFormat, structure: jobState.jobOptions.rowStructure, diff --git a/lib/server-exec.js b/lib/server-exec.js index ddf1a40b..cc934500 100644 --- a/lib/server-exec.js +++ b/lib/server-exec.js @@ -2,10 +2,10 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var qs = require('qs'); -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const qs = require('qs'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); function execOutputTransform(headers, data) { /*jshint validthis:true */ @@ -13,7 +13,7 @@ function execOutputTransform(headers, data) { return []; } - var contentType = headers['content-type'][0]; + let contentType = headers['content-type'][0]; if (typeof contentType === 'string' || contentType instanceof String) { contentType = contentType.replace(/;.*$/, ''); } @@ -39,8 +39,8 @@ function execOutputTransform(headers, data) { }; } - var primitive = headers['x-primitive'][0]; - var value = null; + const primitive = headers['x-primitive'][0]; + let value = null; switch(primitive) { case 'node()': return { @@ -102,7 +102,7 @@ function execOutputTransform(headers, data) { case 'unsignedLong': value = data.content; if (isFinite(value)) { - var number = Number(value); + const number = Number(value); if (Math.abs(number) < 9007199254740992) { value = number; } @@ -224,10 +224,10 @@ function serverInvoke() { /** @ignore */ function serverExec(execName, args) { /*jshint validthis:true */ - var client = this; + const client = this; - var operationDesc = null; - var execType = null; + let operationDesc = null; + let execType = null; if (execName === 'invoke') { operationDesc = 'invoke code on server'; execType = execName; @@ -240,13 +240,13 @@ function serverExec(execName, args) { throw new Error('must specify the source to '+operationDesc); } - var isInvoke = (execType === 'invoke'); + const isInvoke = (execType === 'invoke'); - var arg = args[0]; + const arg = args[0]; - var source = isInvoke ? arg.path : arg.source; - var variables = null; - var txid = null; + let source = isInvoke ? arg.path : arg.source; + let variables = null; + let txid = null; if (source !== void 0) { variables = arg.variables; txid = mlutil.convertTransaction(arg.txid); @@ -257,7 +257,7 @@ function serverExec(execName, args) { } } - var body = {}; + const body = {}; if (isInvoke) { body.module = source; } else { @@ -267,8 +267,8 @@ function serverExec(execName, args) { body.vars = JSON.stringify(variables); } - var endpoint = isInvoke? '/v1/invoke' : '/v1/eval'; - var sep = '?'; + let endpoint = isInvoke? '/v1/invoke' : '/v1/eval'; + let sep = '?'; if (txid != null) { endpoint += sep+'txid='+mlutil.getTxidParam(txid); sep = '&'; @@ -281,7 +281,7 @@ function serverExec(execName, args) { }; mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( operationDesc, client, requestOptions, 'single', 'multipart' ); operation.requestBody = qs.stringify(body); diff --git a/lib/transactions.js b/lib/transactions.js index a4a28ac7..f010ef4c 100644 --- a/lib/transactions.js +++ b/lib/transactions.js @@ -2,9 +2,9 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); /** * Provides functions to open, commit, or rollback multi-statement @@ -16,9 +16,9 @@ var Operation = require('./operation.js'); /** @ignore */ function openOutputTransform(headers/*, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var txid = headers.location.substring('/v1/transactions/'.length); + const txid = headers.location.substring('/v1/transactions/'.length); if (operation.withState === true) { return new mlutil.Transaction(txid, operation.rawHeaders['set-cookie']); @@ -57,17 +57,17 @@ function Transactions(client) { * will be removed in the next major release. */ Transactions.prototype.open = function openTransaction() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; - var transactionName = null; - var timeLimit = null; - var withState = null; + let transactionName = null; + let timeLimit = null; + let withState = null; - var arg = (argLen > 0) ? args[0] : null; + let arg = (argLen > 0) ? args[0] : null; if (argLen > 1 || (typeof arg === 'string' || arg instanceof String) || (typeof arg === 'number' || arg instanceof Number) || (typeof arg === 'boolean')) { - var i=0; + let i=0; for (; i < argLen; i++) { arg = args[i]; if (transactionName === null && (typeof arg === 'string' || arg instanceof String)) { @@ -88,8 +88,8 @@ Transactions.prototype.open = function openTransaction() { withState = arg.withState; } - var path = '/v1/transactions'; - var sep = '?'; + let path = '/v1/transactions'; + let sep = '?'; if (transactionName != null) { path += sep+'name='+encodeURIComponent(transactionName); sep = '&'; @@ -100,7 +100,7 @@ Transactions.prototype.open = function openTransaction() { const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'POST'); - var operation = new Operation( + const operation = new Operation( 'open transaction', this.client, requestOptions, 'empty', 'empty' ); operation.validStatusCodes = [303]; @@ -121,8 +121,8 @@ Transactions.prototype.open = function openTransaction() { * @returns {object} information about the transaction */ Transactions.prototype.read = function readTransaction(txidRaw) { - var txid = mlutil.convertTransaction(txidRaw); - var path = + const txid = mlutil.convertTransaction(txidRaw); + const path = '/v1/transactions/'+mlutil.getTxidParam(txid, 'read')+'?format=json'; const requestOptions = mlutil.newRequestOptions(this.client.getConnectionParams(), path, 'GET'); @@ -131,7 +131,7 @@ Transactions.prototype.read = function readTransaction(txidRaw) { }; mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( 'read transaction', this.client, requestOptions, 'empty', 'single' ); operation.txid = txid; @@ -166,7 +166,7 @@ Transactions.prototype.rollback = function rollbackTransaction(txid) { /** @ignore */ function finishOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; return { txid: operation.txid, @@ -175,14 +175,14 @@ function finishOutputTransform(/*headers, data*/) { } /** @ignore */ function finishTransaction(client, result, txidRaw) { - var txid = mlutil.convertTransaction(txidRaw); - var path = + const txid = mlutil.convertTransaction(txidRaw); + const path = '/v1/transactions/'+mlutil.getTxidParam(txid, result)+'?result='+result; const requestOptions = mlutil.newRequestOptions(client.getConnectionParams(), path, 'POST'); mlutil.addTxidHeaders(requestOptions, txid); - var operation = new Operation( + const operation = new Operation( result+' transaction', client, requestOptions, 'empty', 'empty' ); operation.txid = txid; diff --git a/lib/transforms.js b/lib/transforms.js index 1a69e2fb..e3c5338d 100644 --- a/lib/transforms.js +++ b/lib/transforms.js @@ -2,16 +2,16 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); /** @ignore */ function nameErrorTransform(message) { /*jshint validthis:true */ - var operation = this; + const operation = this; - var name = operation.name; + const name = operation.name; return (name == null) ? message : (message+' (on '+name+' transform)'); } @@ -26,7 +26,7 @@ function nameErrorTransform(message) { /** @ignore */ function emptyOutputTransform(/*headers, data*/) { /*jshint validthis:true */ - var operation = this; + const operation = this; return { name: operation.name @@ -59,11 +59,11 @@ Transforms.prototype.read = function readTransform(name) { throw new Error('must specify name when reading the transform source'); } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'GET'; requestOptions.path = '/v1/config/transforms/'+encodeURIComponent(name); - var operation = new Operation( + const operation = new Operation( 'read transform', this.client, requestOptions, 'empty', 'single' ); operation.name = name; @@ -82,21 +82,21 @@ Transforms.prototype.read = function readTransform(name) { * @param {object|string} source - the source for the transform */ Transforms.prototype.write = function writeTransform() { - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen === 0) { throw new Error('no arguments for writing an extension library'); } - var name = null; - var title = null; - var description = null; - var provider = null; - var version = null; - var format = null; - var source = null; + let name = null; + let title = null; + let description = null; + let provider = null; + let version = null; + let format = null; + let source = null; - var params = null; + let params = null; if (argLen === 1) { params = args[0]; name = params.name; @@ -117,7 +117,7 @@ Transforms.prototype.write = function writeTransform() { throw new Error('must specify name, format, and source when writing a transform'); } - var contentType = null; + let contentType = null; switch(format) { case 'javascript': contentType = 'application/javascript'; @@ -132,9 +132,9 @@ Transforms.prototype.write = function writeTransform() { throw new Error('unsupported transform format '+format); } - var endpoint = '/v1/config/transforms/'+encodeURIComponent(name); + let endpoint = '/v1/config/transforms/'+encodeURIComponent(name); - var sep = '?'; + let sep = '?'; if (title != null) { endpoint += sep+'title='+encodeURIComponent(title); if (sep === '?') {sep = '&';} @@ -152,14 +152,14 @@ Transforms.prototype.write = function writeTransform() { if (sep === '?') {sep = '&';} } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'PUT'; requestOptions.headers = { 'Content-Type': contentType }; requestOptions.path = endpoint; - var operation = new Operation( + const operation = new Operation( 'write transform', this.client, requestOptions, 'single', 'empty' ); operation.name = name; @@ -181,11 +181,11 @@ Transforms.prototype.remove = function removeTransform(name) { throw new Error('must specify name when deleting the transform source'); } - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'DELETE'; requestOptions.path = '/v1/config/transforms/'+encodeURIComponent(name); - var operation = new Operation( + const operation = new Operation( 'remove transform', this.client, requestOptions, 'empty', 'empty' ); operation.name = name; @@ -204,14 +204,14 @@ Transforms.prototype.remove = function removeTransform(name) { * on the server */ Transforms.prototype.list = function listTransforms() { - var requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); + const requestOptions = mlutil.copyProperties(this.client.getConnectionParams()); requestOptions.method = 'GET'; requestOptions.headers = { 'Accept': 'application/json' }; requestOptions.path = '/v1/config/transforms'; - var operation = new Operation( + const operation = new Operation( 'list transforms', this.client, requestOptions, 'empty', 'single' ); diff --git a/lib/values-builder.js b/lib/values-builder.js index b3b4d890..4c93caff 100644 --- a/lib/values-builder.js +++ b/lib/values-builder.js @@ -4,8 +4,8 @@ 'use strict'; -var mlutil = require('./mlutil.js'); -var qb = require('./query-builder.js').builder; +const mlutil = require('./mlutil.js'); +const qb = require('./query-builder.js').builder; /** * A source of datatyped values from a JSON property, @@ -113,18 +113,18 @@ function ValueBuilder() { */ function valuesFromIndexes() { /*jshint validthis:true */ - var self = (this instanceof ValueBuilder) ? this : new ValueBuilder(); + const self = (this instanceof ValueBuilder) ? this : new ValueBuilder(); - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; - var isRangeIndex = { + const isRangeIndex = { 'element': true, 'field': true, 'json-property': true, 'path-index': true }; - var isGeoLocationIndex = { + const isGeoLocationIndex = { 'geo-attr-pair': true, 'geo-elem': true, 'geo-elem-pair': true, @@ -133,10 +133,10 @@ function valuesFromIndexes() { 'geo-path': true }; - var arg = null; - var firstKey = null; - var range = null; - for (var i=0; i < argLen; i++) { + let arg = null; + let firstKey = null; + let range = null; + for (let i=0; i < argLen; i++) { arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { args[i] = {range: qb.property(arg)}; @@ -174,15 +174,15 @@ ValueBuilder.prototype.fromIndexes = valuesFromIndexes; * @returns {valuesBuilder.BuiltQuery} a built query */ ValueBuilder.prototype.where = function valuesWhere() { - var self = this; + const self = this; - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; // TODO: if empty, clear the clause - var parsedQuery = null; - var fragmentScope = null; - var queries = null; + let parsedQuery = null; + let fragmentScope = null; + let queries = null; switch(argLen) { case 0: @@ -190,8 +190,8 @@ ValueBuilder.prototype.where = function valuesWhere() { self.whereClause = {query: {queries: [qb.and()]}}; break; default: - for (var i=0; i < argLen; i++) { - var arg = args[i]; + for (let i=0; i < argLen; i++) { + const arg = args[i]; if (parsedQuery == null) { parsedQuery = arg.parsedQuery; if (parsedQuery != null) { @@ -244,17 +244,17 @@ ValueBuilder.prototype.where = function valuesWhere() { * @returns {valuesBuilder.BuiltQuery} a built query */ ValueBuilder.prototype.aggregates = function valuesAggregates() { - var self = this; + const self = this; - var args = mlutil.asArray.apply(null, arguments); - var argLen = args.length; + const args = mlutil.asArray.apply(null, arguments); + const argLen = args.length; if (argLen < 1) { throw new Error('aggregates must specify at least one built-in function or UDF'); } - var aggregateFunctions = []; - for (var i=0; i < argLen; i++) { - var arg = args[i]; + const aggregateFunctions = []; + for (let i=0; i < argLen; i++) { + const arg = args[i]; if (typeof arg === 'string' || arg instanceof String) { aggregateFunctions.push({apply:arg}); } else if (arg.udf !== void 0) { @@ -318,9 +318,9 @@ function udf() { * @returns {valuesBuilder.BuiltQuery} a built query */ ValueBuilder.prototype.slice = function valuesSlice() { - var self = this; + const self = this; - var args = mlutil.asArray.apply(null, arguments); + const args = mlutil.asArray.apply(null, arguments); // TODO: if empty, clear the clause @@ -342,23 +342,23 @@ ValueBuilder.prototype.slice = function valuesSlice() { * @returns {valuesBuilder.BuiltQuery} a built query */ ValueBuilder.prototype.withOptions = function valuesWithOptions() { - var self = this; + const self = this; // TODO: share with values.js - var optionKeyMapping = { + const optionKeyMapping = { values: 'values-option', forestNames: 'forest-names' }; // TODO: reuse key copy logic with query-build withOptions - var withOptionsClause = {}; + const withOptionsClause = {}; if (0 < arguments.length) { - var arg = arguments[0]; - var argKeys = Object.keys(arg); - for (var i=0; i < argKeys.length; i++) { - var key = argKeys[i]; + const arg = arguments[0]; + const argKeys = Object.keys(arg); + for (let i=0; i < argKeys.length; i++) { + const key = argKeys[i]; if (optionKeyMapping[key] !== undefined) { - var value = arg[key]; + const value = arg[key]; if (value !== undefined) { withOptionsClause[key] = value; } @@ -393,20 +393,20 @@ function valuesUri() { * @returns {valuesBuilder.BuiltQuery} a built query */ function copyFromValueBuilder(otherValueBuilder) { - var tb = new ValueBuilder(); + const tb = new ValueBuilder(); // TODO: share with QueryBuilder if (otherValueBuilder != null) { - var clauseKeys = [ + const clauseKeys = [ 'fromIndexesClause', 'whereClause', 'aggregatesClause', 'sliceClause', 'withOptionsClause' ]; - var isString = (typeof otherValueBuilder === 'string' || otherValueBuilder instanceof String); - var other = isString ? + const isString = (typeof otherValueBuilder === 'string' || otherValueBuilder instanceof String); + const other = isString ? JSON.parse(otherValueBuilder) : otherValueBuilder; - for (var i=0; i < clauseKeys.length; i++){ - var key = clauseKeys[i]; - var value = other[key]; + for (let i=0; i < clauseKeys.length; i++){ + const key = clauseKeys[i]; + const value = other[key]; if (value != null) { // structuredClone instead of clone to avoid preserving prototype tb[key] = isString ? value : structuredClone(value); diff --git a/lib/values.js b/lib/values.js index 7290f728..308dfbd1 100644 --- a/lib/values.js +++ b/lib/values.js @@ -2,9 +2,9 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ 'use strict'; -var requester = require('./requester.js'); -var mlutil = require('./mlutil.js'); -var Operation = require('./operation.js'); +const requester = require('./requester.js'); +const mlutil = require('./mlutil.js'); +const Operation = require('./operation.js'); /** * Provides functions to project tuples (aka rows) of values out of documents. @@ -40,9 +40,9 @@ Values.prototype.read = function readValues() { if (arguments.length === 0 || arguments.length > 2) { throw new Error('incorrect number of arguments to read values'); } - var arg = arguments[0]; + const arg = arguments[0]; - var timestamp = null; + let timestamp = null; if (arguments.length === 2) { if (arguments[1] instanceof mlutil.Timestamp) { timestamp = arguments[1]; @@ -51,49 +51,49 @@ Values.prototype.read = function readValues() { } } - var structuredef = { + const structuredef = { name: 'structuredef', style: 'consistent' }; - var indexesClause = arg.fromIndexesClause; - var indexesLength = Array.isArray(indexesClause) ? indexesClause.length : 0; + const indexesClause = arg.fromIndexesClause; + const indexesLength = Array.isArray(indexesClause) ? indexesClause.length : 0; if (indexesLength < 1) { throw new Error('must specify indexes to read values'); } - var isValues = (indexesLength === 1); - var structureName = isValues ? 'values' : 'tuples'; + const isValues = (indexesLength === 1); + const structureName = isValues ? 'values' : 'tuples'; if (isValues) { - var indexObject = indexesClause[0]; - var indexKey = Object.keys(indexObject)[0]; + const indexObject = indexesClause[0]; + const indexKey = Object.keys(indexObject)[0]; structuredef[indexKey] = indexObject[indexKey]; } else { structuredef.indexes = indexesClause; } - var aggregatesClause = arg.aggregatesClause; + const aggregatesClause = arg.aggregatesClause; if (aggregatesClause !== void 0) { structuredef.aggregate = aggregatesClause.aggregates; } - var structureOptions = {}; + const structureOptions = {}; structureOptions[structureName] = [structuredef]; - var withOptionsClause = arg.withOptionsClause; + const withOptionsClause = arg.withOptionsClause; if (withOptionsClause !== void 0) { // TODO: share with value-builder.js - var optionKeyMapping = { + const optionKeyMapping = { values: 'values-option', forestNames: 'forest-names' }; - var optionsKeys = Object.keys(withOptionsClause); - var key = null; - var mapping = null; - var value = null; - for (var i=0; i < optionsKeys.length; i++) { + const optionsKeys = Object.keys(withOptionsClause); + let key = null; + let mapping = null; + let value = null; + for (let i=0; i < optionsKeys.length; i++) { key = optionsKeys[i]; mapping = optionKeyMapping[key]; if (mapping !== void 0) { @@ -109,23 +109,23 @@ Values.prototype.read = function readValues() { } } - var searchBody = { + const searchBody = { options: structureOptions }; - var whereClause = arg.whereClause; + const whereClause = arg.whereClause; if (whereClause != null) { - var query = whereClause.query; - var parsedQuery = whereClause.parsedQuery; - var fragmentScope = whereClause['fragment-scope']; + const query = whereClause.query; + const parsedQuery = whereClause.parsedQuery; + const fragmentScope = whereClause['fragment-scope']; if (query != null) { searchBody.query = query; } if (parsedQuery != null) { searchBody.qtext = parsedQuery.qtext; - var constraintBindings = parsedQuery.constraint; - var termBinding = parsedQuery.term; + const constraintBindings = parsedQuery.constraint; + const termBinding = parsedQuery.term; if (constraintBindings != null) { structureOptions.constraint = constraintBindings; } @@ -138,17 +138,17 @@ Values.prototype.read = function readValues() { } } - var pageStart = null; - var pageLength = null; - var transform = null; + let pageStart = null; + let pageLength = null; + let transform = null; - var sliceClause = arg.sliceClause; + const sliceClause = arg.sliceClause; if (sliceClause !== void 0) { - var sliceStart = sliceClause['page-start']; + const sliceStart = sliceClause['page-start']; if (sliceStart !== void 0) { pageStart = sliceStart; } - var sliceLength = sliceClause['page-length']; + const sliceLength = sliceClause['page-length']; if (sliceLength !== void 0) { pageLength = sliceLength; } @@ -156,7 +156,7 @@ Values.prototype.read = function readValues() { transform = sliceClause['document-transform']; } - var endpoint = '/v1/values/structuredef?format=json'; + let endpoint = '/v1/values/structuredef?format=json'; if (pageStart !== null) { endpoint += '&start='+pageStart; @@ -180,7 +180,7 @@ Values.prototype.read = function readValues() { 'Accept': 'application/json' }; - var operation = new Operation( + const operation = new Operation( 'query values', this.client, requestOptions, 'single', 'single' ); operation.validStatusCodes = [200, 204]; diff --git a/lib/www-authenticate-patched/md5.js b/lib/www-authenticate-patched/md5.js index ba61d430..10a5df0f 100644 --- a/lib/www-authenticate-patched/md5.js +++ b/lib/www-authenticate-patched/md5.js @@ -9,7 +9,7 @@ /* * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ -var crypto= require('crypto'); +const crypto= require('crypto'); function md5(s) { return crypto.createHash('md5').update(s).digest('hex'); diff --git a/lib/www-authenticate-patched/parsers.js b/lib/www-authenticate-patched/parsers.js index 1bda7820..6998fc40 100644 --- a/lib/www-authenticate-patched/parsers.js +++ b/lib/www-authenticate-patched/parsers.js @@ -10,25 +10,25 @@ * Licensed under the MIT license. */ -var ParseAuth= /(\w+)\s+(.*)/ // -> scheme, params +const ParseAuth= /(\w+)\s+(.*)/ // -> scheme, params , Separators= /([",=])/ ; function parse_params(header) { // This parser will definitely fail if there is more than one challenge - var tok, _i, _len, key, value; - var state= 0; //0: token, - var m= header.split(Separators) + let tok, _i, _len, key, value; + let state= 0; //0: token, + const m= header.split(Separators); for (_i = 0, _len = m.length; _i < _len; _i++) { tok = m[_i]; - if (!tok.length) continue; + if (!tok.length) {continue;} switch (state) { case 0: // token key= tok.trim(); state= 1; // expect equals continue; case 1: // expect equals - if ('=' != tok) return 'Equal sign was expected after '+key; + if ('=' != tok) {return 'Equal sign was expected after '+key;} state= 2; continue; case 2: // expect value @@ -68,7 +68,7 @@ function parse_params(header) { return 'Unexpected token ('+tok+') after '+value+'"'; } case 9: // expect commma - if (',' != tok) return 'Comma expected after '+value; + if (',' != tok) {return 'Comma expected after '+value;} state= 0; continue; } @@ -87,10 +87,10 @@ function parse_params(header) { function Parse_WWW_Authenticate(to_parse) { - var m= to_parse.match(ParseAuth); + const m= to_parse.match(ParseAuth); this.scheme= m[1]; this.parms= {}; - var err= this.parse_params(m[2]); + const err= this.parse_params(m[2]); if (err) { this.scheme= ''; this.parms= {}; @@ -102,7 +102,7 @@ function Parse_Authentication_Info(to_parse) { this.scheme= 'Digest'; this.parms= {}; - var err= this.parse_params(to_parse); + const err= this.parse_params(to_parse); if (err) { this.scheme= ''; this.parms= {}; diff --git a/lib/www-authenticate-patched/user-credentials.js b/lib/www-authenticate-patched/user-credentials.js index e9128a3a..3d3555af 100644 --- a/lib/www-authenticate-patched/user-credentials.js +++ b/lib/www-authenticate-patched/user-credentials.js @@ -11,7 +11,7 @@ */ -var md5= require('./md5'); +const md5= require('./md5'); /* * Hide the password. Uses the password to form authorization strings, @@ -25,14 +25,14 @@ function user_credentials(username,password,options) { return username; } - var basic_string= options && options.hide_basic ? + const basic_string= options && options.hide_basic ? '' : (!password && password !== '' ? Buffer.from(username, 'ascii').toString('base64') : Buffer.from(username+':'+password, 'ascii').toString('base64') - ) + ); function Credentials() { this.username= username; @@ -40,18 +40,18 @@ function user_credentials(username,password,options) { Credentials.prototype.basic= function() { return basic_string; - } + }; Credentials.prototype.digest= function(realm) { return !password && password !== '' ? md5(username+':'+realm) : - md5(username+':'+realm+':'+password) - } + md5(username+':'+realm+':'+password); + }; Credentials.prototype.is_user_credentials= function() { return true; - } + }; return new Credentials; } diff --git a/lib/www-authenticate-patched/www-authenticate.js b/lib/www-authenticate-patched/www-authenticate.js index f4d818ac..5b85f9f7 100644 --- a/lib/www-authenticate-patched/www-authenticate.js +++ b/lib/www-authenticate-patched/www-authenticate.js @@ -12,7 +12,7 @@ 'use strict'; -var crypto= require('crypto') +const crypto= require('crypto') , parsers= require('./parsers') , md5= require('./md5') , user_credentials= require('./user-credentials') @@ -29,32 +29,32 @@ function hex8(num) return ('00000000' + num.toString(16)).slice(-8); } -var www_authenticator = function(username,password,options) +const www_authenticator = function(username,password,options) { if (2 == arguments.length && toString.call(password) != '[object String]') { options= password; password= null; } - var credentials= user_credentials(username,password) - var cnonce; + const credentials= user_credentials(username,password); + let cnonce; if (options) { if (toString.call(options.cnonce) == '[object String]') - cnonce= options.cnonce; + {cnonce= options.cnonce;} } - if (cnonce === void 0) cnonce= crypto.pseudoRandomBytes(8).toString('hex'); - var parse_header= function(www_authenticate) + if (cnonce === void 0) {cnonce= crypto.pseudoRandomBytes(8).toString('hex');} + const parse_header= function(www_authenticate) { function Authenticator() { function note_error(err) { - this.err= err + this.err= err; } - var nc= 0; + let nc= 0; - var parsed= new parsers.WWW_Authenticate(www_authenticate); - if (parsed.err) return note_error(parsed.err); - var auth_parms= this.parms= parsed.parms; + const parsed= new parsers.WWW_Authenticate(www_authenticate); + if (parsed.err) {return note_error(parsed.err);} + const auth_parms= this.parms= parsed.parms; this.cnonce= cnonce; switch(parsed.scheme) { @@ -83,7 +83,7 @@ var www_authenticator = function(username,password,options) var qop= auth_parms.qop; if (!qop) { this.authorize= function(method,digestURI) { - var ha2= md5(method+':'+digestURI); + const ha2= md5(method+':'+digestURI); return fixed+ ' uri="'+digestURI+'",'+ ' response="'+md5(ha1+':'+nonce+':'+ha2)+'",'; @@ -91,12 +91,12 @@ var www_authenticator = function(username,password,options) return; } else { - var qopa= qop.split(','); - var _i, _len; + const qopa= qop.split(','); + let _i, _len; for (_i = 0, _len = qopa.length; _i < _len; _i++) { if ('auth' === qopa[_i]) { var opaque= auth_parms.opaque; - var algorithm= auth_parms.algorithm; + let algorithm= auth_parms.algorithm; if (algorithm) { fixed+= ' algorithm="'+algorithm+'",'; } @@ -108,10 +108,10 @@ var www_authenticator = function(username,password,options) : ha1; this.authorize= function(method,digestURI) { - var ha2= md5(method+':'+digestURI); + const ha2= md5(method+':'+digestURI); nc= nc+1; - var hexed_nc= hex8(nc); - var s= fixed+ + const hexed_nc= hex8(nc); + let s= fixed+ ' uri="'+digestURI+'",'+ ' qop=auth,'+ ' nc='+hexed_nc+','+ @@ -142,8 +142,8 @@ var www_authenticator = function(username,password,options) function HigherLevel(credentials,options) { - this.credentials= credentials - this.options= options + this.credentials= credentials; + this.options= options; if (options && options.sendImmediately) { this.sendImmediately= true; } @@ -151,42 +151,42 @@ function HigherLevel(credentials,options) HigherLevel.prototype.get_challenge= function(request) { if (401 == request.statusCode && 'www-authenticate' in request.headers) { if (!this.parse_header) { - this.parse_header= www_authenticator(this.credentials,this.options) + this.parse_header= www_authenticator(this.credentials,this.options); } - this.challenge= this.parse_header(request.headers['www-authenticate']) + this.challenge= this.parse_header(request.headers['www-authenticate']); return this.challenge.err; } -} +}; HigherLevel.prototype._challenge= function() { if (!this.challenge) { if (this.sendImmediately) { // simulate receipt of a basic challenge - this.get_challenge(basic_challenge) - return this.challenge + this.get_challenge(basic_challenge); + return this.challenge; } - else return; // simply won't produce an 'Authorization' header + else {return;} // simply won't produce an 'Authorization' header } return this.challenge; -} +}; HigherLevel.prototype.authentication_string= function(method,digestURI) { - var challenge= this._challenge(); - if (!challenge) return; // simply won't produce an 'Authorization' header - if (challenge.err) return challenge.err; + const challenge= this._challenge(); + if (!challenge) {return;} // simply won't produce an 'Authorization' header + if (challenge.err) {return challenge.err;} return challenge.authorize(method,digestURI); -} +}; HigherLevel.prototype.authenticate_headers= function(headers,method,digestURI) { - var challenge= this._challenge(); - if (!challenge) return; // simply won't produce an 'Authorization' header - if (challenge.err) return challenge.err; + const challenge= this._challenge(); + if (!challenge) {return;} // simply won't produce an 'Authorization' header + if (challenge.err) {return challenge.err;} headers.authorization= challenge.authorize(method,digestURI); -} +}; HigherLevel.prototype.authenticate_request_options= function(request_options) { - var challenge= this._challenge(); - if (!challenge) return; // simply won't produce an 'Authorization' header - if (challenge.err) return challenge.err; - if (!request_options.headers) request_options.headers= {}; + const challenge= this._challenge(); + if (!challenge) {return;} // simply won't produce an 'Authorization' header + if (challenge.err) {return challenge.err;} + if (!request_options.headers) {request_options.headers= {};} request_options.headers.authorization= challenge.authorize(request_options.method,request_options.path); -} +}; module.exports = www_authenticator; module.exports.parsers= parsers; @@ -198,6 +198,6 @@ module.exports.authenticator= function(username,password,options) options= password; password= null; } - var credentials= user_credentials(username,password) + const credentials= user_credentials(username,password); return new HigherLevel(credentials,options); -} \ No newline at end of file +}; \ No newline at end of file From 3e68289ef5a9ead5f346b124db916b3ea10e3eb4 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Fri, 17 Oct 2025 10:27:26 -0400 Subject: [PATCH 35/58] MLE-24763 Enabling logging test and removing winston Only using bunyan in logging.js, and that test seems very safe to run, so it's no longer excluded by Jenkinsfile. Removed the two "test-complete" logging tests that weren't actually doing anything. Removing winston allows for the "color" and "color-string" overrides to be removed as well as nothing else depends on them. --- Jenkinsfile | 11 +- package-lock.json | 208 +------------------------ package.json | 6 +- test-basic/logging.js | 30 +--- test-complete-proxy/gulpfile.js | 182 +++++++++++----------- test-complete/nodejs-logger-bunyan.js | 16 -- test-complete/nodejs-logger-winston.js | 31 ---- 7 files changed, 97 insertions(+), 387 deletions(-) delete mode 100644 test-complete/nodejs-logger-bunyan.js delete mode 100644 test-complete/nodejs-logger-winston.js diff --git a/Jenkinsfile b/Jenkinsfile index 1aa169fe..1b88fb91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,9 @@ def runTests() { cd .. rm -rf $WORKSPACE/*.xml || true - ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert || true + ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml || true ./node_modules/.bin/gulp setupProxyTests || true - ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert || true + ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml || true ''' junit '**/*.xml' } @@ -33,8 +33,8 @@ def runDockerCompose(String markLogicDockerImage) { cd node-client-api echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''" MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build - echo "Waiting 60s for MarkLogic to be ready to accept connections" - sleep 60s; + echo "Waiting 90s for MarkLogic to be ready to accept connections" + sleep 90s; ''' } @@ -129,8 +129,7 @@ pipeline { runAuditReport() runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') runTests() - // Commenting this out temporarily for faster PR feedback. - // runE2ETests() + runE2ETests() } post { always { diff --git a/package-lock.json b/package-lock.json index 23e2b115..3de77f41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,8 +40,7 @@ "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", - "stream-to-array": "^2.3.0", - "winston": "^3.8.2" + "stream-to-array": "^2.3.0" }, "engines": { "node": ">=16.14.0" @@ -101,28 +100,6 @@ "node": ">=6.9.0" } }, - "node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@dabh/diagnostics": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz", - "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@so-ric/colorspace": "^1.1.6", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.9.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", @@ -426,17 +403,6 @@ "node": ">=14" } }, - "node_modules/@so-ric/colorspace": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@so-ric/colorspace/-/colorspace-1.1.6.tgz", - "integrity": "sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==", - "dev": true, - "license": "MIT", - "dependencies": { - "color": "^5.0.2", - "text-hex": "1.0.x" - } - }, "node_modules/@sovpro/delimited-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@sovpro/delimited-stream/-/delimited-stream-1.1.0.tgz", @@ -496,13 +462,6 @@ "undici-types": "~7.14.0" } }, - "node_modules/@types/triple-beam": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", - "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", - "dev": true, - "license": "MIT" - }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", @@ -700,13 +659,6 @@ "astring": "bin/astring" } }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true, - "license": "MIT" - }, "node_modules/async-done": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz", @@ -1126,20 +1078,6 @@ "node": ">=0.8" } }, - "node_modules/color": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz", - "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^3.0.1", - "color-string": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/color-convert": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.0.tgz", @@ -1163,19 +1101,6 @@ "node": ">=12.20" } }, - "node_modules/color-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.0.tgz", - "integrity": "sha512-gNVoDzpaSwvftp6Y8nqk97FtZoXP9Yj7KGYB8yIXuv0JcfqbYihTrd1OU5iZW9btfXde4YAOCRySBHT7O910MA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -1471,13 +1396,6 @@ "dev": true, "license": "MIT" }, - "node_modules/enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "dev": true, - "license": "MIT" - }, "node_modules/end-of-stream": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", @@ -1905,13 +1823,6 @@ "reusify": "^1.0.4" } }, - "node_modules/fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", - "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "dev": true, - "license": "MIT" - }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -2029,13 +1940,6 @@ "dev": true, "license": "ISC" }, - "node_modules/fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "dev": true, - "license": "MIT" - }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -3377,13 +3281,6 @@ "graceful-fs": "^4.1.9" } }, - "node_modules/kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "dev": true, - "license": "MIT" - }, "node_modules/last-run": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz", @@ -3553,24 +3450,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/logform": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", - "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@colors/colors": "1.6.0", - "@types/triple-beam": "^1.3.2", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -4188,16 +4067,6 @@ "wrappy": "1" } }, - "node_modules/one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fn.name": "1.x.x" - } - }, "node_modules/onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", @@ -4771,16 +4640,6 @@ "license": "MIT", "optional": true }, - "node_modules/safe-stable-stringify": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", - "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -5184,16 +5043,6 @@ "node": ">= 10.13.0" } }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/stream-composer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz", @@ -5439,13 +5288,6 @@ "b4a": "^1.6.4" } }, - "node_modules/text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "dev": true, - "license": "MIT" - }, "node_modules/through2": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", @@ -5501,16 +5343,6 @@ "node": ">=10.13.0" } }, - "node_modules/triple-beam": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", - "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.0.0" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -5825,44 +5657,6 @@ "node": ">=4" } }, - "node_modules/winston": { - "version": "3.18.3", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.18.3.tgz", - "integrity": "sha512-NoBZauFNNWENgsnC9YpgyYwOVrl2m58PpQ8lNHjV3kosGs7KJ7Npk9pCUE+WJlawVSe8mykWDKWFSVfs3QO9ww==", - "dev": true, - "license": "MIT", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.8", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.7.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.9.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/winston-transport": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", - "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", - "dev": true, - "license": "MIT", - "dependencies": { - "logform": "^2.7.0", - "readable-stream": "^3.6.2", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", diff --git a/package.json b/package.json index d95cc836..25ec8534 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "doc": "gulp doc", "preinstall": "node checkNodeVersion", "prestart": "node checkNodeVersion", + "pretest": "node checkNodeVersion", "test:setup": "node etc/test-setup.js", "test:teardown": "node etc/test-teardown.js", "test": "gulp test" @@ -65,8 +66,7 @@ "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", - "stream-to-array": "^2.3.0", - "winston": "^3.8.2" + "stream-to-array": "^2.3.0" }, "optionalDependencies": { "kerberos": "^2.0.1", @@ -78,10 +78,8 @@ "chalk": "4.1.2", "braces": "3.0.3", "brace-expansion": "2.0.2", - "color": "5.0.0", "color-convert": "3.1.0", "color-name": "2.0.0", - "color-string": "2.1.0", "cross-spawn": "7.0.6", "debug": "4.3.6", "is-arrayish": "0.3.2", diff --git a/test-basic/logging.js b/test-basic/logging.js index de14f8fe..e1a110fa 100644 --- a/test-basic/logging.js +++ b/test-basic/logging.js @@ -5,12 +5,10 @@ var should = require('should'), testconfig = require('../etc/test-config.js'), marklogic = require('../'), bunyan = require('bunyan'), - winston = require('winston'), intercept = require("intercept-stdout"); var dbDefault = marklogic.createDatabaseClient(testconfig.restWriterConnection); var dbBunyan = marklogic.createDatabaseClient(testconfig.restWriterConnection); -var dbWinston = marklogic.createDatabaseClient(testconfig.restWriterConnection); describe('logging', function(){ @@ -47,31 +45,7 @@ describe('logging', function(){ }); }); - describe('with Winston', function(){ - var winstonLogger = winston.createLogger({ - level: 'debug', - format: winston.format.combine( - winston.format((info) => { - info.level = info.level.toUpperCase(); - return info; - })(), - winston.format.json() - ), - transports: [new winston.transports.Console()] - }); - dbWinston.setLogger(winstonLogger); - it('should write Winston string entries', function(done){ - var captured = []; - var unhook = intercept(function(txt) { - captured.push(txt); - }); - dbWinston.config.serverprops.read().result(function(response) { - unhook(); - JSON.parse(captured[0]).level.should.eql('DEBUG'); - done(); - }, done); - }); - }); - }); + + diff --git a/test-complete-proxy/gulpfile.js b/test-complete-proxy/gulpfile.js index ea33a6d5..1708e5de 100755 --- a/test-complete-proxy/gulpfile.js +++ b/test-complete-proxy/gulpfile.js @@ -1,95 +1,87 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -const path = require('path'); -const gulp = require('gulp'); -const jshint = require('gulp-jshint'); -const mocha = require('gulp-mocha'); -const jsdoc = require('gulp-jsdoc3'); - -const { parallel, series } = gulp; - -const marklogic = require('../'); -const proxy = require('../lib/proxy-generator.js'); -const testconfig = require('../etc/test-config-qa.js'); -const basicloader = require('../lib/basic-loader.js'); - -function lint() { - return gulp.src('lib/*') - .pipe(jshint({lookup:true})) - .pipe(jshint.reporter('default')); -} - -function test() { - return gulp.src(['test-basic/*.js']) - .pipe(mocha({ - reporter: 'spec', - globals: { - should: require('should') - } - })); -} - -let testModulesClient = null; -function getTestModulesClient() { - var modDBName = testconfig.testServerName+'-modules'; - if (testModulesClient === null) { - const connectionParams = { - host: testconfig.restEvaluatorConnection.host, - port: testconfig.restEvaluatorConnection.port, - user: testconfig.restEvaluatorConnection.user, - password: testconfig.restEvaluatorConnection.password, - authType: testconfig.restEvaluatorConnection.authType, - database: modDBName - }; - testModulesClient = marklogic.createDatabaseClient(connectionParams); - } - return testModulesClient; -} -function getTestDocumentPermissions() { - return [ - {'role-name':'rest-reader', capabilities:['read', 'execute']}, - {'role-name':'rest-writer', capabilities:['update']} - ]; -} - -function loadQAModules(callback) { - const databaseClient = getTestModulesClient(); - const documentMetadata = { - collections: ['/qa/test/cases'], - permissions: getTestDocumentPermissions() - }; - const uriPrefix = '/qa/test/'; - const uriStartDepth = 2; - return gulp.src([ - '../test-complete-proxy/ml-modules/*/service.json', - '../test-complete-proxy/ml-modules/*/*.api', - '../test-complete-proxy/ml-modules/*/*.sjs', - '../test-complete-proxy/ml-modules/*/*.mjs', - '../test-complete-proxy/ml-modules/*/*.xqy' - ]) - .pipe(basicloader.loadFileStream({ - databaseClient: databaseClient, - documentMetadata: documentMetadata, - uriPrefix: uriPrefix, - uriStartDepth: uriStartDepth - })); -} -function generateTestFnClasses() { - return gulp.src('../test-complete-proxy/ml-modules/**/*') - .pipe(proxy.generate()) - .pipe(gulp.dest('../test-complete-proxy/lib/')); -} - -function copyClassesTotestComplete() { - return gulp.src('./lib/*.js') - .pipe(gulp.dest('./')); -} - -exports.lint = lint; -exports.loadToModulesDB = loadQAModules; -exports.generateFnClasses = generateTestFnClasses; -exports.copyFnClasses = copyClassesTotestComplete; - -exports.test = test; -exports.default = lint; +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ +const path = require('path'); +const gulp = require('gulp'); +const mocha = require('gulp-mocha'); +const jsdoc = require('gulp-jsdoc3'); + +const { parallel, series } = gulp; + +const marklogic = require('../'); +const proxy = require('../lib/proxy-generator.js'); +const testconfig = require('../etc/test-config-qa.js'); +const basicloader = require('../lib/basic-loader.js'); + +function test() { + return gulp.src(['test-basic/*.js']) + .pipe(mocha({ + reporter: 'spec', + globals: { + should: require('should') + } + })); +} + +let testModulesClient = null; +function getTestModulesClient() { + var modDBName = testconfig.testServerName+'-modules'; + if (testModulesClient === null) { + const connectionParams = { + host: testconfig.restEvaluatorConnection.host, + port: testconfig.restEvaluatorConnection.port, + user: testconfig.restEvaluatorConnection.user, + password: testconfig.restEvaluatorConnection.password, + authType: testconfig.restEvaluatorConnection.authType, + database: modDBName + }; + testModulesClient = marklogic.createDatabaseClient(connectionParams); + } + return testModulesClient; +} +function getTestDocumentPermissions() { + return [ + {'role-name':'rest-reader', capabilities:['read', 'execute']}, + {'role-name':'rest-writer', capabilities:['update']} + ]; +} + +function loadQAModules(callback) { + const databaseClient = getTestModulesClient(); + const documentMetadata = { + collections: ['/qa/test/cases'], + permissions: getTestDocumentPermissions() + }; + const uriPrefix = '/qa/test/'; + const uriStartDepth = 2; + return gulp.src([ + '../test-complete-proxy/ml-modules/*/service.json', + '../test-complete-proxy/ml-modules/*/*.api', + '../test-complete-proxy/ml-modules/*/*.sjs', + '../test-complete-proxy/ml-modules/*/*.mjs', + '../test-complete-proxy/ml-modules/*/*.xqy' + ]) + .pipe(basicloader.loadFileStream({ + databaseClient: databaseClient, + documentMetadata: documentMetadata, + uriPrefix: uriPrefix, + uriStartDepth: uriStartDepth + })); +} +function generateTestFnClasses() { + return gulp.src('../test-complete-proxy/ml-modules/**/*') + .pipe(proxy.generate()) + .pipe(gulp.dest('../test-complete-proxy/lib/')); +} + +function copyClassesTotestComplete() { + return gulp.src('./lib/*.js') + .pipe(gulp.dest('./')); +} + +exports.loadToModulesDB = loadQAModules; +exports.generateFnClasses = generateTestFnClasses; +exports.copyFnClasses = copyClassesTotestComplete; + +exports.test = test; +exports.default = test; diff --git a/test-complete/nodejs-logger-bunyan.js b/test-complete/nodejs-logger-bunyan.js deleted file mode 100644 index 9e02acaa..00000000 --- a/test-complete/nodejs-logger-bunyan.js +++ /dev/null @@ -1,16 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var testconfig = require('../etc/test-config-qa.js'); -var marklogic = require('../'); -var dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); - -describe('Bunyan logger test', function () { - - it('should read the bunyan logger', function (done) { - dbAdmin.config.serverprops.read().result(function (response) { - done(); - }, done); - }); - -}); diff --git a/test-complete/nodejs-logger-winston.js b/test-complete/nodejs-logger-winston.js deleted file mode 100644 index 3014feb6..00000000 --- a/test-complete/nodejs-logger-winston.js +++ /dev/null @@ -1,31 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var should = require('should'); -var winston = require('winston'); - -var testconfig = require('../etc/test-config-qa.js'); -var fs = require('fs'); - -var marklogic = require('../'); - -var db = marklogic.createDatabaseClient(testconfig.restReaderConnection); -var dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnection); -var dbEval = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); -var dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); - -describe('Winston logger test', function () { - - winston.level = 'debug'; - dbAdmin.setLogger(winston); - - it('should read the bunyan logger', function (done) { - dbAdmin.config.serverprops.read().result(function (response) { - //var log = JSON.stringify(response); - //console.log(log); - //log.should.containEql('testlog'); - done(); - }, done); - }); - -}); From 762f8e9e0f38c62af0858b0793d5d7b96ee6d496 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Fri, 17 Oct 2025 15:00:57 -0400 Subject: [PATCH 36/58] MLE-24763 Requiring Node 22 or higher Using .npmrc instead of custom script to cause an error on `npm install`. --- .npmrc | 1 + checkNodeVersion.js | 14 -------------- package-lock.json | 7 +++---- package.json | 7 ++----- 4 files changed, 6 insertions(+), 23 deletions(-) create mode 100644 .npmrc delete mode 100644 checkNodeVersion.js diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..b6f27f13 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true diff --git a/checkNodeVersion.js b/checkNodeVersion.js deleted file mode 100644 index d8029d25..00000000 --- a/checkNodeVersion.js +++ /dev/null @@ -1,14 +0,0 @@ -const result = process.versions; -if (result && result.node) { - const nodeVersion = parseFloat(result.node).toFixed(2); - if (nodeVersion >= 16.14) { - console.log('-------******* Good to Go with your Node Version: ' + result.node + ' *******-------'); - } else { - console.log('-------******* Package installation(npm install) or Project startup command(npm start) failed due to Node Version, Please install and use Node Version >=16.14 *******-------'); - console.log('-------******* Your current Node Version is: ' + result.node + ' *******-------'); - process.exit(1); - } -} else { - console.log('-------******* Something went wrong while checking Node version *******-------'); - process.exit(1); -} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3de77f41..6908b1cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,12 @@ { "name": "marklogic", - "version": "3.7.1", + "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "marklogic", - "version": "3.7.1", - "hasInstallScript": true, + "version": "4.0.0", "license": "Apache-2.0", "dependencies": { "@fastify/busboy": "3.2.0", @@ -43,7 +42,7 @@ "stream-to-array": "^2.3.0" }, "engines": { - "node": ">=16.14.0" + "node": ">=22.0.0" }, "optionalDependencies": { "kerberos": "^2.0.1", diff --git a/package.json b/package.json index 25ec8534..3ec9ad26 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,11 @@ "name": "marklogic", "description": "The official MarkLogic Node.js client API.", "homepage": "https://github.com/marklogic/node-client-api", - "version": "3.7.1", + "version": "4.0.0", "license": "Apache-2.0", "main": "./lib/marklogic.js", "scripts": { "doc": "gulp doc", - "preinstall": "node checkNodeVersion", - "prestart": "node checkNodeVersion", - "pretest": "node checkNodeVersion", "test:setup": "node etc/test-setup.js", "test:teardown": "node etc/test-teardown.js", "test": "gulp test" @@ -44,7 +41,7 @@ "url": "https://github.com/marklogic/node-client-api.git" }, "engines": { - "node": ">=16.14.0" + "node": ">=22.0.0" }, "devDependencies": { "@jsdoc/salty": "0.2.3", From 51535ddf89560a543af54acb0b90682f44d3655a Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Fri, 17 Oct 2025 15:42:05 -0400 Subject: [PATCH 37/58] MLE-24763 Removing 'read' module This was supporting a use case that doesn't exist - having the custom deployer read in the admin username/password. And the custom deployer is in the process of being smoked. One less dependency! --- Jenkinsfile | 4 -- etc/test-setup-prompt.js | 105 ++------------------------------------- package-lock.json | 21 -------- package.json | 1 - 4 files changed, 5 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1b88fb91..61d257d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,12 +67,8 @@ def runE2ETests() { npm --version npm ci node etc/test-setup-qa.js - # Adding sleep for the setups to complete before running test-complete - sleep 10 node etc/test-setup-dmsdk-qa.js - sleep 10 node config-optic/setupqa.js - sleep 30 cd test-complete-app ./gradlew -i mlDeploy -g $PWD cd .. diff --git a/etc/test-setup-prompt.js b/etc/test-setup-prompt.js index 9deb89de..40f1b8c3 100644 --- a/etc/test-setup-prompt.js +++ b/etc/test-setup-prompt.js @@ -1,108 +1,13 @@ /* * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ -var read = require("read"); -var mlutil = require('../lib/mlutil.js'); - -function adminUserPrompt() { - var self = this; - if (self.user === null) { - read({ - prompt: 'admin user (default=admin): ' - }, - mlutil.callbackOn(self, adminUserCallback) - ); - } else { - self.passwordPrompt(); - } -} -function adminUserCallback(error, result) { - if (error) { - console.log(error); - process.exit(1); - } - this.user = (result === '') ? 'admin' : result; - this.passwordPrompt(); -} -function adminPasswordPrompt() { - var self = this; - if (self.password === null) { - read({ - prompt: (self.user === 'admin') ? - 'admin password (default=admin): ' : 'admin password: ', - silent: true, - replace: '*', - edit: false - }, - mlutil.callbackOn(self, adminPasswordCallback) - ); - } else { - self.finish(); - } -} -function adminPasswordCallback(error, result) { - if (error) { - console.log(error); - process.exit(1); - } - if (result === '') { - if (this.user === 'admin') { - this.password = 'admin'; - } else { - console.log('no admin password specified, so cannot setup'); - process.exit(1); - } - } else { - this.password = result; - } - this.finish(); -} -function adminFinish() { - this.done(this.user, this.password); -} - -function AdminPrompter(done) { - this.done = done; - this.user = null; - this.password = null; -} -AdminPrompter.prototype.userPrompt = adminUserPrompt; -AdminPrompter.prototype.userCallback = adminUserCallback; -AdminPrompter.prototype.passwordPrompt = adminPasswordPrompt; -AdminPrompter.prototype.passwordCallback = adminPasswordCallback; -AdminPrompter.prototype.finish = adminFinish; +// Simplified version - no more prompting, just returns admin/admin +// TODO: Remove this file when ml-gradle migration is complete function promptForAdmin(done) { - var prompter = new AdminPrompter(done); - - var argvLen = process.argv.length; - if (argvLen >= 4) { - var argvMax = argvLen - 1; - for (var argvI=2; argvI < argvMax; argvI++) { - var argvVal = process.argv[argvI]; - if (argvVal === '-u') { - argvVal = process.argv[argvI + 1]; - var argvSep = argvVal.indexOf(':'); - if (argvSep < 0) { - prompter.user = argvVal; - break; - } - if (argvSep > 0) { - prompter.user = argvVal.substring(0, argvSep); - } - if (argvSep < (argvVal.length - 1)) { - prompter.password = argvVal.substring(argvSep + 1); - } - break; - } else if (argvVal === '-h') { - console.log('usage: '+process.argv[1]+' [-u adminUser:adminPassword]'); - console.log('without -u, prompts for admin user and/or admin password'); - process.exit(); - } - }; - } - - prompter.userPrompt(); + // Always use admin/admin - no prompting needed + console.log('Using default admin credentials (admin/admin)'); + done('admin', 'admin'); } module.exports = promptForAdmin; diff --git a/package-lock.json b/package-lock.json index 6908b1cd..d46eee0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,6 @@ "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", - "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", "stream-to-array": "^2.3.0" @@ -3856,13 +3855,6 @@ "node": ">= 10.13.0" } }, - "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true, - "license": "ISC" - }, "node_modules/mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -4432,19 +4424,6 @@ "node": ">=0.10.0" } }, - "node_modules/read": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", - "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "mute-stream": "~0.0.4" - }, - "engines": { - "node": ">=0.8" - } - }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", diff --git a/package.json b/package.json index 3ec9ad26..9209b584 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", - "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", "stream-to-array": "^2.3.0" From d502ed17f85b0cea87efb6f49749713ea59f12e8 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Fri, 17 Oct 2025 16:00:38 -0700 Subject: [PATCH 38/58] MLE-24755 - fix intermittent errors: change to use modern await and Promise objects to make test logic comprehension easier. Remove the incorrect assertion that on the first and subsequent call to onBatchSuccess that the number of transformed documents is always greater than or equal to the batch size. This is not always the case, sometimes on the first callback the number of transformed docs in the summary is less than the batch size. --- test-complete/nodejs-dmsdk-UpdAndRdAll.js | 121 +++---- .../nodejs-dmsdk-queryToTransformAll.js | 335 +++++++++--------- 2 files changed, 235 insertions(+), 221 deletions(-) diff --git a/test-complete/nodejs-dmsdk-UpdAndRdAll.js b/test-complete/nodejs-dmsdk-UpdAndRdAll.js index ecb4677a..c7dcb077 100644 --- a/test-complete/nodejs-dmsdk-UpdAndRdAll.js +++ b/test-complete/nodejs-dmsdk-UpdAndRdAll.js @@ -2,19 +2,22 @@ * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ -var marklogic = require('../'); +const marklogic = require('../'); -var testconfig = require('../etc/test-config-qa.js'); +const testconfig = require('../etc/test-config-qa.js'); const stream = require('stream'); const { expect } = require('chai'); +const { pipeline } = require('stream/promises'); -var memStore = { }; +const memStore = { }; +const dbWriter = marklogic.createDatabaseClient(testconfig.dmsdkrestWriterConnection); +const inputJsonUris = []; +const inputContents = []; -var uriStream = new stream.Readable(); -var dbWriter = marklogic.createDatabaseClient(testconfig.dmsdkrestWriterConnection); -let inputJsonUris = []; -let inputContents = []; +let uriStream = new stream.Readable(); + +const TOTAL_DOCS = 1000; /* Based on example from @@ -42,9 +45,9 @@ class MLQASnapshotTransform extends stream.Transform { // Filter what we need and push. We will verify only 900.json piped from ReadAll if (chunk.uri === this.docId) { //Push transformed content onto the stream with changed key names such as Matched ID and Matched Name - var currId = chunk.content.id; - var currName = chunk.content.name; - var retStr = 'Matched ID:' + currId + ', Matched Name:' + currName; + let currId = chunk.content.id; + let currName = chunk.content.name; + let retStr = 'Matched ID:' + currId + ', Matched Name:' + currName; this.push(retStr); } return setImmediate(callback); @@ -68,20 +71,21 @@ class MLQAWritableStream extends stream.Writable { } _write(chunk, encoding, callback) { - var buffer = (Buffer.isBuffer(chunk)) ? + let buffer = (Buffer.isBuffer(chunk)) ? chunk : // already is Buffer use it - new Buffer(chunk, encoding); + Buffer.from(chunk, encoding); memStore[this.key] = Buffer.concat([memStore[this.key], buffer]); return setImmediate(callback); } } describe('Update doc and readAll with Snapshot', function () { - before(function (done) { - this.timeout(50000); - var jsonDocreadable = new stream.Readable({ objectMode: true }); - for (let i = 0; i < 1000; i++) { + before(async function () { + + const jsonDocreadable = new stream.Readable({ objectMode: true }); + + for (let i = 0; i < TOTAL_DOCS; i++) { const tempJson = { uri: '/data/dmsdk/Snap-update-then-readall/' + i + '.json', contentType: 'application/json', @@ -93,70 +97,67 @@ describe('Update doc and readAll with Snapshot', function () { inputContents.push(tempJson.content); } jsonDocreadable.push(null); - dbWriter.documents.writeAll(jsonDocreadable, { - onCompletion: ((summary) => { - setTimeout(() => { - var i = 0; i++; - }, 1000); - summary.docsWrittenSuccessfully.should.be.greaterThanOrEqual(1000); + + let summaryPromiseResolve; + + // The following pattern uses Promise.all to coordinate the completion of the writeAll operation and its onCompletion callback. + // The first promise initiates the writeAll process, while the second promise is resolved by the onCompletion callback with the summary object. + // This ensures that both the write operation and its completion summary are available before proceeding. + const [result, summary] = await Promise.all([ + dbWriter.documents.writeAll(jsonDocreadable, { + onCompletion: (summary) => { + summaryPromiseResolve(summary); + } + }), + new Promise(resolve => { + summaryPromiseResolve = resolve; }) - }); // End of pipe to writeAll - // Use uriStream as the input to readAll() + ]); + expect(summary.docsWrittenSuccessfully).to.be.greaterThanOrEqual(1000); + uriStream = new stream.PassThrough({ objectMode: true }); inputJsonUris.forEach(uri => uriStream.push(uri)); uriStream.push(null); - // wait for DB to finish writing - setTimeout(() => { - done(); - }, 10000); }); - after((function (done) { - this.timeout(10000); - - dbWriter.documents.remove(inputJsonUris) - .result(function (response) { - done(); - }) - .catch(err => done(err)) - .catch(done); - })); + after(async function () { + await dbWriter.documents.remove(inputJsonUris).result(); + }); // This test updates an existing doc and then performs readAll - it('update a doc and readAll with snapshot', function (done) { - this.timeout(30000); + it('update a doc and readAll with snapshot', async function () { + // Used in test that updates doc and then does readAll const UpdBeforeReadAllUriName = '/data/dmsdk/Snap-update-then-readall/900.json'; const filteredSnapshot = new MLQASnapshotTransform(UpdBeforeReadAllUriName, { objectMode: true }); - setTimeout(() => { - var i = 0; i++; - }, 3000); // Initiate a document change on doc id 900. - dbWriter.documents.write({ + const writeResponse = await dbWriter.documents.write({ uri: UpdBeforeReadAllUriName, collections: ['coll5', 'coll6'], contentType: 'application/json', quality: 250, properties: { prop1: 'bar', prop2: 1981 }, - content: { id: 88, name: 'David' } - }); - // Expected result + content: { id: 88, name: 'David' }, + }).result(); + + // Updated doc should be in db now. var exptdResult = 'Matched ID:88, Matched Name:David'; var mlqawstream = new MLQAWritableStream('before'); - // Have listeners before calling pipe. - setTimeout(() => { - var i = 0; i++; - }, 3000); - mlqawstream.on('finish', function () { - expect(memStore.before.toString()).to.equal(exptdResult); - }); - dbWriter.documents.readAll(uriStream, { - inputkind: 'Array', - consistentSnapshot: true, - batch: 50 - }).pipe(filteredSnapshot).pipe(mlqawstream);/* Add.pipe(process.stdout) to debug */ - done(); + + // Use pipeline with await to read and confirm, much cleaner and understandable. + await pipeline( + dbWriter.documents.readAll(uriStream, { + inputkind: 'Array', + consistentSnapshot: true, + batch: 50 + }), + filteredSnapshot, + mlqawstream + ); + + // confirm we wrote correct stream to memStore in mlqawstream + expect(memStore.before.toString()).to.equal(exptdResult); }); }); diff --git a/test-complete/nodejs-dmsdk-queryToTransformAll.js b/test-complete/nodejs-dmsdk-queryToTransformAll.js index 1ff17d77..a348f704 100644 --- a/test-complete/nodejs-dmsdk-queryToTransformAll.js +++ b/test-complete/nodejs-dmsdk-queryToTransformAll.js @@ -19,27 +19,23 @@ const q = marklogic.queryBuilder; const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/transformAll/')); describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', function () { - this.timeout(20000); - before(function (done) { - restAdminDB.config.transforms.write(transformName, 'javascript', fs.createReadStream(transformPath)) - .result(() => { - for (let i = 0; i < 100; i++) { - uris.push('/test/dataMovement/requests/transformAll/' + i + '.json'); - } - }) - .then(() => done()) - .catch(error => done(error)); + before(async function () { + await restAdminDB.config.transforms.write(transformName, 'javascript', + fs.createReadStream(transformPath)).result(); + for (let i = 0; i < 100; i++) { + uris.push('/test/dataMovement/requests/transformAll/' + i + '.json'); + } }); - beforeEach(function (done) { + beforeEach(async function () { let readable = new Stream.Readable({ objectMode: true }); transformStream = new Stream.PassThrough({ objectMode: true }); for (let i = 0; i < 100; i++) { const temp = { uri: '/test/dataMovement/requests/transformAll/' + i + '.json', contentType: 'application/json', - content: { ['key']: 'initialValue' } + content: { key: 'initialValue' } }; readable.push(temp); transformStream.push(temp.uri); @@ -47,244 +43,261 @@ describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', functi readable.push(null); transformStream.push(null); - dbWriter.documents.writeAll(readable, { - onCompletion: ((summary) => { - done(); - }) + return new Promise((resolve, reject) => { + dbWriter.documents.writeAll(readable, { + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); + } + }); }); - }); - afterEach((function (done) { - dbWriter.documents.remove(uris) - .result(function (response) { - done(); - }) - .catch(err => done(err)) - .catch(done); - })); - - it('should queryToTransformAll documents with onCompletion, transform, concurrentRequests and transformStrategy as ignore', - function (done) { + afterEach( async function () { + await dbWriter.documents.remove(uris).result(); + }); + it('should queryToTransformAll documents with onCompletion, transform, concurrentRequests and transformStrategy as ignore', async function () { + const summary = await new Promise((resolve, reject) => { dbWriter.documents.queryToTransformAll(query, { transform: [transformName, { newValue: 'transformedValue' }], concurrentRequests: { multipleOf: 'hosts', multiplier: 4 }, transformStrategy: 'ignore', onCompletion: ((summary) => { - try { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('initialValue', done); - } catch (err) { - done(err); - } - }) + resolve(summary); + }), + onError: (error) => { + reject(error); + } }); }); - it('should transformAll documents with transformStrategy as ignore', function (done) { - - dbWriter.documents.queryToTransformAll(query, { - transform: [transformName, { newValue: 'transformedValue' }], - concurrentRequests: { multipleOf: 'hosts', multiplier: 4 }, - transformStrategy: 'ignore', - onCompletion: ((summary) => { - try { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('initialValue', done); - } catch (err) { - done(err); - } - }) - }); + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + + await verifyDocs('initialValue'); }); - it('should work with query and onCompletion function', function (done) { - dbWriter.documents.queryToTransformAll(query, { - transform: [transformName, { newValue: 'transformedValue' }], - onCompletion: ((summary) => { - try { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('transformedValue', done); - } catch (err) { - done(err); + it('should transformAll documents with transformStrategy as ignore', async function () { + const summary = await new Promise((resolve, reject) => { + dbWriter.documents.queryToTransformAll(query, { + transform: [transformName, { newValue: 'transformedValue' }], + transformStrategy: 'ignore', + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); } - }) + }); }); + + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + + await verifyDocs('initialValue'); }); - it('should work with query and onCompletion function and batchSize', function (done) { - dbWriter.documents.queryToTransformAll(query, { - transform: [transformName, { newValue: 'transformedValue' }], - batchSize: 10, - onBatchSuccess: (function (progress, documents) { - try { - progress.docsTransformedSuccessfully.should.be.greaterThanOrEqual(10); - progress.docsFailedToBeTransformed.should.be.equal(0); - progress.timeElapsed.should.be.greaterThanOrEqual(0); - } catch (err) { - done(err); + it('should work with query and onCompletion function', async function () { + const summary = await new Promise((resolve, reject) => { + dbWriter.documents.queryToTransformAll(query, { + transform: [transformName, { newValue: 'transformedValue' }], + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); } + }); + }); - }), - onCompletion: ((summary) => { - try { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('transformedValue', done); - } catch (err) { - done(err); + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + + await verifyDocs('transformedValue'); + }); + + it('should work with query and onCompletion function and batchSize', async function () { + const summary = await new Promise((resolve, reject) => { + dbWriter.documents.queryToTransformAll(query, { + transform: [transformName, { newValue: 'transformedValue' }], + batchSize: 10, + onBatchSuccess: ((progress) => { + try { + progress.docsFailedToBeTransformed.should.be.equal(0); + progress.timeElapsed.should.be.greaterThanOrEqual(0); + } catch (err) { + reject(err); + } + }), + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); } }) }); + + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + + await verifyDocs('transformedValue'); }); - it('should transformAll documents with onCompletion, concurrentRequests and transform options', function (done) { - - dbWriter.documents.queryToTransformAll(query, { - transform: [transformName, { newValue: 'transformedValue' }], - concurrentRequests: { multipleOf: 'hosts', multiplier: 4 }, - onCompletion: ((summary) => { - try { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('transformedValue', done); - } catch (err) { - done(err); + it('should transformAll documents with onCompletion, concurrentRequests and transform options', async function () { + const summary = await new Promise((resolve, reject) => { + dbWriter.documents.queryToTransformAll(query, { + transform: [transformName, { newValue: 'transformedValue' }], + concurrentRequests: { multipleOf: 'hosts', multiplier: 4 }, + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); } - }) + }); }); - }); + + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); - it('should transformAll documents with inputKind as array', function (done) { + await verifyDocs('transformedValue'); + }); + it('should transformAll documents with inputKind as array', async function () { transformStream = new Stream.Readable({ objectMode: true }); for (let i = 0; i + 10 <= uris.length; i = i + 10) { transformStream.push(uris.slice(i, i + 10)); } transformStream.push(null); - dbWriter.documents.queryToTransformAll(query, { - transform: [transformName, { newValue: 'transformedValue' }], - inputKind: 'aRRaY', - onCompletion: ((summary) => { - try { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('transformedValue', done); - } catch (error) { - done(error); + const summary = await new Promise((resolve, reject) => { + dbWriter.documents.queryToTransformAll(query, { + transform: [transformName, { newValue: 'transformedValue' }], + inputKind: 'aRRaY', + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); } - }) + }); }); - }); - it('should queryToTransformAll documents with onCompletion option', function (done) { + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + + await verifyDocs('transformedValue'); + }); - dbWriter.documents.queryToTransformAll(query, { - transform: [transformName, { newValue: 'transformedValue' }], - onCompletion: ((summary) => { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('transformedValue', done); - }) + it('should queryToTransformAll documents with onCompletion option', async function () { + const summary = await new Promise((resolve, reject) => { + dbWriter.documents.queryToTransformAll(query, { + transform: [transformName, { newValue: 'transformedValue' }], + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); + } + }); }); + + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + + await verifyDocs('transformedValue'); }); - it('should work with batchSize less than 1', function (done) { - dbWriter.documents.queryToTransformAll(query, { - transform: [transformName, { newValue: 'transformedValue' }], - batchSize: 0, - onCompletion: ((summary) => { - try { - summary.docsTransformedSuccessfully.should.be.equal(100); - summary.docsFailedToBeTransformed.should.be.equal(0); - summary.timeElapsed.should.be.greaterThanOrEqual(0); - verifyDocs('transformedValue', done); - } catch (err) { - done(err); + it('should work with batchSize less than 1', async function () { + const summary = await new Promise((resolve, reject) => { + dbWriter.documents.queryToTransformAll(query, { + transform: [transformName, { newValue: 'transformedValue' }], + batchSize: 0, + onCompletion: ((summary) => { + resolve(summary); + }), + onError: (error) => { + reject(error); } - }) + }); }); + + summary.docsTransformedSuccessfully.should.be.equal(100); + summary.docsFailedToBeTransformed.should.be.equal(0); + summary.timeElapsed.should.be.greaterThanOrEqual(0); + + await verifyDocs('transformedValue'); }); - it('should throw error with no query', function (done) { + it('should throw error with no query', async function () { try { - dbWriter.documents.queryToTransformAll('invalid query', {}); + await dbWriter.documents.queryToTransformAll('invalid query', {}); } catch (err) { err.toString().should.equal('Error: Query needs to be a cts query.'); - done(); } }); - it('should throw error with null query', function (done) { + it('should throw error with null query', async function () { try { dbWriter.documents.queryToTransformAll(null, { transform: [transformName, { newValue: 'transformedValue' }], }); } catch (err) { err.toString().should.equal('Error: Query cannot be null or undefined.'); - done(); } }); - it('should throw error with onInitialTimestamp and wrong consistentSnapshot', function (done) { + it('should throw error with onInitialTimestamp and wrong consistentSnapshot', async function () { try { - dbWriter.documents.queryToTransformAll(query, { + await dbWriter.documents.queryToTransformAll(query, { transform: [transformName, { newValue: 'transformedValue' }], onInitialTimestamp: '1667222674', consistentSnapshot: false, }); } catch (err) { err.toString().should.equal('Error: consistentSnapshot needs to be true when onInitialTimestamp is provided.'); - done(); } }); - it('should throw error with consistentSnapshot another type', function (done) { + it('should throw error with consistentSnapshot another type', async function () { try { - dbWriter.documents.queryToTransformAll(query, { + await dbWriter.documents.queryToTransformAll(query, { transform: [transformName, { newValue: 'transformedValue' }], consistentSnapshot: 'true', }); } catch (err) { err.toString().should.equal('Error: consistentSnapshot needs to be a boolean or DatabaseClient.Timestamp object.'); - done(); } }); - it('should throw error with batchSize greater than 100000', function (done) { + it('should throw error with batchSize greater than 100000', async function () { try { - dbWriter.documents.queryToTransformAll(query, { + await dbWriter.documents.queryToTransformAll(query, { transform: [transformName, { newValue: 'transformedValue' }], batchSize: 1000000, }); } catch (err) { err.toString().should.equal('Error: batchSize cannot be greater than 100000'); - done(); } }); }); -function verifyDocs(value, done) { - dbWriter.documents.read(uris) - .result(function (documents) { - documents.length.should.equal(100); - for (let i = 0; i < documents.length; i++) { - documents[0].content.key.should.equal(value); - } - }) - .then(() => done()) - .catch(err => done(err)); +async function verifyDocs(value) { + const documents = await dbWriter.documents.read(uris).result(); + documents.length.should.equal(100); + for (let i = 0; i < documents.length; i++) { + documents[i].content.key.should.equal(value); + } } \ No newline at end of file From 1d50e909b948af622edd9ebf6db5fdc3a5c9c161 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Mon, 20 Oct 2025 10:00:29 -0700 Subject: [PATCH 39/58] MLE-24755 binary doc test fixes --- test-complete/nodejs-documents-binary-pdf.js | 123 ++++++++--------- test-complete/nodejs-documents-read-chunk.js | 133 ++++++++++--------- 2 files changed, 121 insertions(+), 135 deletions(-) diff --git a/test-complete/nodejs-documents-binary-pdf.js b/test-complete/nodejs-documents-binary-pdf.js index 02940dc8..0cd939d3 100644 --- a/test-complete/nodejs-documents-binary-pdf.js +++ b/test-complete/nodejs-documents-binary-pdf.js @@ -1,87 +1,72 @@ /* * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ -var should = require('should'); +const should = require('should'); -var fs = require('fs'); -var stream = require('stream'); -var util = require('util'); +const fs = require('fs'); +const stream = require('stream'); +const util = require('util'); -var concatStream = require('concat-stream'); -var valcheck = require('core-util-is'); -var testconfig = require('../etc/test-config-qa.js'); +const concatStream = require('concat-stream'); +const valcheck = require('core-util-is'); +const testconfig = require('../etc/test-config-qa.js'); -var marklogic = require('../'); -var q = marklogic.queryBuilder; +const marklogic = require('../'); +const q = marklogic.queryBuilder; + +const dbReader = marklogic.createDatabaseClient(testconfig.restReaderConnection); +const dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnection); +const dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); -var dbReader = marklogic.createDatabaseClient(testconfig.restReaderConnection); -var dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnection); -var dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); describe('Binary documents test', function () { - var binaryPath = __dirname + '/data/somePdfFile.pdf'; - var uri = '/test/binary/somePdfFile.pdf'; - var binaryValue = null; - before(function (done) { - this.timeout(10000); - fs.createReadStream(binaryPath). - pipe(concatStream({ encoding: 'buffer' }, function (value) { - binaryValue = value; - done(); - })); - }); + const binaryPath = __dirname + '/data/somePdfFile.pdf'; + let binaryValue = null; - it('should write the binary with Readable stream', function (done) { - this.timeout(10000); - var uri = '/test/write/somePdfFile.pdf'; - var readableBinary = new ValueStream(binaryValue); - //readableBinary.pause(); - dbWriter.documents.write({ - uri: uri, - contentType: 'application/pdf', - quality: 25, - properties: { prop1: 'foo' }, - content: readableBinary - }). - result(function (response) { - response.should.have.property('documents'); - done(); - }, done); - }); + const uri = '/test/write/somePdfFile.pdf'; - it('should read the binary with Readable stream', function (done) { - this.timeout(10000); - var uri = '/test/write/somePdfFile.pdf'; - dbReader.documents.read(uri). - result(function (documents) { - //console.log(JSON.stringify(documents, null, 2)); - JSON.stringify(binaryValue).should.equal( - JSON.stringify(documents[0].content)); - done(); - }, done); + before(async function () { + binaryValue = await new Promise((resolve, reject) => { + fs.createReadStream(binaryPath) + .pipe(concatStream({ encoding: 'buffer' }, function (value) { + resolve(value); + })) + .on('error', reject); + }); }); - it('should read the binary document metadata', function (done) { - this.timeout(10000); - var uri = '/test/write/somePdfFile.pdf'; - dbReader.documents.read({ uris: uri, categories: ['metadata'] }) - .result(function (documents) { - var document = documents[0]; - document.quality.should.equal(25); - document.properties.prop1.should.equal('foo'); - done(); - }, done); - }); + it('should write, read, read metadata, verify and delete the binary pdf content', async function () { - it('should delete the pdf file', function (done) { - dbAdmin.documents.removeAll({ - all: true - }). - result(function (response) { - done(); - }, done); - }); + const readableBinary = new ValueStream(binaryValue); + try { + const writeResponse = await dbWriter.documents.write({ + uri: uri, + contentType: 'application/pdf', + quality: 25, + properties: { prop1: 'foo' }, + content: readableBinary + }).result(); + writeResponse.should.have.property('documents'); + const docReadResp = await dbReader.documents.read(uri).result(); + docReadResp[0].contentType.should.equal('application/pdf'); + docReadResp[0].content.length.should.equal(binaryValue.length); + Buffer.compare(binaryValue, docReadResp[0].content).should.equal(0); + + const docReadRespMeta = await dbReader.documents.read( + { uris: uri, categories: ['metadata'] } + ).result(); + docReadRespMeta[0].quality.should.equal(25); + docReadRespMeta[0].properties.prop1.should.equal('foo'); + + // original test deleted all documents. This one just deletes the one we wrote. + await dbAdmin.documents.remove(uri).result(); + + } catch (error) { + console.error(error); + throw error; + } + }); }); function ValueStream(value) { diff --git a/test-complete/nodejs-documents-read-chunk.js b/test-complete/nodejs-documents-read-chunk.js index 65784cf2..8855de11 100644 --- a/test-complete/nodejs-documents-read-chunk.js +++ b/test-complete/nodejs-documents-read-chunk.js @@ -1,83 +1,84 @@ /* * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ -var should = require('should'); +const should = require('should'); -var fs = require('fs'); -var stream = require('stream'); -var util = require('util'); +const fs = require('fs'); +const stream = require('stream'); +const util = require('util'); -var concatStream = require('concat-stream'); -var valcheck = require('core-util-is'); -var testconfig = require('../etc/test-config-qa.js'); +const concatStream = require('concat-stream'); +const valcheck = require('core-util-is'); +const testconfig = require('../etc/test-config-qa.js'); -var marklogic = require('../'); -var q = marklogic.queryBuilder; +const marklogic = require('../'); +const q = marklogic.queryBuilder; -var dbReader = marklogic.createDatabaseClient(testconfig.restReaderConnection); -var dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnection); -var dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); +const dbReader = marklogic.createDatabaseClient(testconfig.restReaderConnection); +const dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnection); +const dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); describe('Binary documents test', function () { - var binaryPath = __dirname + '/data/somePdfFile.pdf'; - var uri = '/test/binary/somePdfFile.pdf'; - var binaryValue = null; - before(function (done) { - this.timeout(10000); - fs.createReadStream(binaryPath). - pipe(concatStream({ encoding: 'buffer' }, function (value) { - binaryValue = value; - done(); - })); - }); + const binaryPath = __dirname + '/data/somePdfFile.pdf'; + let binaryValue = null; + + const uri = '/test/binary/somePdfFile.pdf'; - it('should write the binary with Readable stream', function (done) { - this.timeout(10000); - var uri = '/test/write/somePdfFile.pdf'; - var readableBinary = new ValueStream(binaryValue); - //readableBinary.pause(); - dbWriter.documents.write({ - uri: uri, - contentType: 'application/pdf', - quality: 25, - properties: { prop1: 'foo' }, - content: readableBinary - }). - result(function (response) { - response.should.have.property('documents'); - done(); - }, done); + before(async function () { + binaryValue = await new Promise((resolve, reject) => { + fs.createReadStream(binaryPath) + .pipe(concatStream({ encoding: 'buffer' }, function (value) { + resolve(value); + })) + .on('error', reject); + }); }); - it('should wait for the document to be written', function (done) { - setTimeout(function () { - done(); - }, 10000); - }); + it('should write, read using stream, verify and delete the binary content', async function () { - it('should read the binary in chunk', function (done) { - this.timeout(10000); - var uri = '/test/write/somePdfFile.pdf'; - setTimeout(function () { - dbReader.documents.read(uri).stream('chunked'). - on('data', function (data) { - var strData = data.toString(); - strData.should.containEql('CVISION Technologies'); - }). - on('end', function () { - done(); - }, done); - }, 3000); - }); - it('should delete all documents', function (done) { - dbAdmin.documents.removeAll({ - all: true - }). - result(function (response) { - done(); - }, done); - }); + let readableBinary = new ValueStream(binaryValue); + try { + const response = await dbWriter.documents.write({ + uri: uri, + contentType: 'application/pdf', + quality: 25, + properties: { prop1: 'foo' }, + content: readableBinary + }).result(); + + response.should.have.property('documents'); + const streamData = await new Promise((resolve, reject) => { + const chunks = []; + const readStream = dbReader.documents.read(uri).stream('chunked'); + + readStream.on('data', function (data) { + chunks.push(data); + }); + + readStream.on('end', function () { + resolve(Buffer.concat(chunks)); + }); + + readStream.on('error', function (error) { + reject(error); + }); + }); + + Buffer.compare(binaryValue, streamData).should.equal(0); + + // Verify the binary content has a string near the end of the file + const strData = streamData.toString(); + strData.should.containEql('CVISION Technologies'); + + // original test deleted all documents. This one just deletes the one we wrote. + await dbAdmin.documents.remove(uri).result(); + + } catch (error) { + console.error("Error writing document: ", error); + throw error; + } + }); }); function ValueStream(value) { From 1317d4a3d1591ecf2860a6c1e43cb80adb55275e Mon Sep 17 00:00:00 2001 From: Phil Barber Date: Thu, 16 Oct 2025 17:57:18 -0400 Subject: [PATCH 40/58] Pretty good start at moving from scripts to Gradle for test-complete setup This handles *most* of the tests up through the temporal tests. There are still about 10 tests failing before getting to the temporal tests. --- test-complete-app/build.gradle | 29 + test-complete-app/gradle.properties | 3 + .../dmsdk-api-rest-server-modules.json | 3 + .../databases/dmsdk-api-rest-server.json | 6 + .../node-client-api-rest-server-modules.json | 3 + .../node-client-api-rest-server.json | 190 ++ .../databases/nodeOpticFunctionalTest.json | 72 + .../nodeOpticFunctionalTestModules.json | 3 + .../main/ml-config/security/roles/eval.json | 37 + .../security/roles/qbvuser-role.json | 75 + .../security/roles/rest-evaluator.json | 54 + .../ml-config/security/roles/tde-User.json | 16 + .../ml-config/security/users/qbvuser.json | 8 + .../ml-config/security/users/rest-admin.json | 8 + .../security/users/rest-evaluator.json | 8 + .../security/users/rest-reader-optic.json | 8 + .../ml-config/security/users/rest-reader.json | 8 + .../ml-config/security/users/rest-writer.json | 9 + .../ml-config/security/users/tde-user.json | 8 + .../servers/dmsdk-api-rest-server.json | 13 + .../servers/node-client-api-rest-server.json | 13 + .../servers/nodeOpticFunctionalTest.json | 13 + .../ml-data/optic/lexicon/test/city1.json | 6 + .../ml-data/optic/lexicon/test/city2.json | 6 + .../ml-data/optic/lexicon/test/city3.json | 6 + .../ml-data/optic/lexicon/test/city4.json | 6 + .../ml-data/optic/lexicon/test/city5.json | 6 + .../optic/lexicon/test/collections.properties | 4 + .../main/ml-data/optic/lexicon/test/doc1.json | 18 + .../main/ml-data/optic/lexicon/test/doc2.json | 18 + .../main/ml-data/optic/lexicon/test/doc3.json | 18 + .../main/ml-data/optic/lexicon/test/doc4.xml | 19 + .../main/ml-data/optic/lexicon/test/doc5.xml | 19 + .../optic/plan/test/collections.properties | 1 + .../ml-data/optic/plan/test/planLexicons.json | 161 ++ .../ml-data/optic/plan/test/planTriples.json | 73 + .../ml-data/optic/plan/test/planViews.json | 117 ++ .../optic/sparql/test/collections.properties | 1 + .../ml-data/optic/sparql/test/dedupdoc1.xml | 15 + .../optic/triple/test/collections.properties | 5 + .../triple/test/duplicatePlayerTripleSet.xml | 376 ++++ .../triple/test/duplicateTeamTripleSet.xml | 56 + .../triple/test/otherPlayerTripleSet.xml | 376 ++++ .../optic/triple/test/playerTripleSet.xml | 376 ++++ .../optic/triple/test/teamTripleSet.xml | 56 + .../optic/view/test/collections.properties | 1 + .../ml-data/optic/view/test/masterDetail.xml | 59 + .../optic/view/test/masterDetail2.json | 64 + .../optic/view/test/masterDetail3.json | 64 + .../optic/view/test/masterDetail4.json | 43 + .../optic/view/test/masterDetail5.json | 29 + .../root/optic/test/mapperReducer.sjs | 80 + .../main/ml-schemas/permissions.properties | 1 + .../main/ml-schemas/tde/exportingRows.tdex | 35 + .../src/main/ml-schemas/tde/masterDetail.tdex | 35 + .../main/ml-schemas/tde/masterDetail2.tdej | 53 + .../main/ml-schemas/tde/masterDetail3.tdej | 53 + .../main/ml-schemas/tde/masterDetail4.tdej | 53 + .../main/turtle/companies/companies_100.ttl | 1804 +++++++++++++++++ .../src/main/turtle/people/people.ttl | 70 + test-complete/nodejs-optic-generate-views.js | 18 +- 61 files changed, 4779 insertions(+), 9 deletions(-) create mode 100644 test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json create mode 100644 test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json create mode 100644 test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json create mode 100644 test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json create mode 100644 test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json create mode 100644 test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json create mode 100644 test-complete-app/src/main/ml-config/security/roles/eval.json create mode 100644 test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json create mode 100644 test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json create mode 100644 test-complete-app/src/main/ml-config/security/roles/tde-User.json create mode 100644 test-complete-app/src/main/ml-config/security/users/qbvuser.json create mode 100644 test-complete-app/src/main/ml-config/security/users/rest-admin.json create mode 100644 test-complete-app/src/main/ml-config/security/users/rest-evaluator.json create mode 100644 test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json create mode 100644 test-complete-app/src/main/ml-config/security/users/rest-reader.json create mode 100644 test-complete-app/src/main/ml-config/security/users/rest-writer.json create mode 100644 test-complete-app/src/main/ml-config/security/users/tde-user.json create mode 100644 test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json create mode 100644 test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json create mode 100644 test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json create mode 100644 test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml create mode 100755 test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml create mode 100644 test-complete-app/src/main/ml-data/optic/plan/test/collections.properties create mode 100644 test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json create mode 100644 test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json create mode 100644 test-complete-app/src/main/ml-data/optic/plan/test/planViews.json create mode 100644 test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties create mode 100644 test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml create mode 100644 test-complete-app/src/main/ml-data/optic/triple/test/collections.properties create mode 100755 test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml create mode 100755 test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml create mode 100755 test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml create mode 100755 test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml create mode 100755 test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml create mode 100644 test-complete-app/src/main/ml-data/optic/view/test/collections.properties create mode 100755 test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml create mode 100755 test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json create mode 100755 test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json create mode 100755 test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json create mode 100755 test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json create mode 100644 test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs create mode 100644 test-complete-app/src/main/ml-schemas/permissions.properties create mode 100644 test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex create mode 100755 test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex create mode 100755 test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej create mode 100755 test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej create mode 100755 test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej create mode 100755 test-complete-app/src/main/turtle/companies/companies_100.ttl create mode 100644 test-complete-app/src/main/turtle/people/people.ttl diff --git a/test-complete-app/build.gradle b/test-complete-app/build.gradle index 9b3e099a..02823118 100644 --- a/test-complete-app/build.gradle +++ b/test-complete-app/build.gradle @@ -18,3 +18,32 @@ ext { command.setValidFor(365) mlAppDeployer.commands.add(command) } + +tasks.register("curlPeople", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/people/people.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/people' + ] +} + +tasks.register("curlCompanies", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/companies/companies_100.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl' + ] +} + +mlDeploy.finalizedBy curlPeople +mlDeploy.finalizedBy curlCompanies \ No newline at end of file diff --git a/test-complete-app/gradle.properties b/test-complete-app/gradle.properties index 3d61cb0a..d7a78f54 100644 --- a/test-complete-app/gradle.properties +++ b/test-complete-app/gradle.properties @@ -3,3 +3,6 @@ mlUsername=admin mlPassword=admin mlNoRestServer=true +mlModulesDatabaseName=nodeOpticFunctionalTestModules +mlSchemasDatabaseName=Schemas +mlRestPort=8079 \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json b/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json new file mode 100644 index 00000000..255145f3 --- /dev/null +++ b/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json @@ -0,0 +1,3 @@ +{ + "database-name": "dmsdk-api-rest-server-modules" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json b/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json new file mode 100644 index 00000000..aa3371d5 --- /dev/null +++ b/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json @@ -0,0 +1,6 @@ +{ + "database-name": "dmsdk-api-rest-server", + "schema-database": "Schemas", + "range-element-index": [ + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json b/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json new file mode 100644 index 00000000..d7c25fe3 --- /dev/null +++ b/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json @@ -0,0 +1,3 @@ +{ + "database-name": "node-client-api-rest-server-modules" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json b/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json new file mode 100644 index 00000000..09c64be4 --- /dev/null +++ b/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json @@ -0,0 +1,190 @@ +{ + "database-name": "node-client-api-rest-server", + "schema-database": "Schemas", + "range-element-index": [ + { + "scalar-type": "double", + "namespace-uri": "", + "localname": "score", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "int", + "namespace-uri": "", + "localname": "popularity", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "int", + "namespace-uri": "", + "localname": "rate", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "dateTime", + "namespace-uri": "", + "localname": "datetime", + "range-value-positions": false, + "invalid-values": "ignore" + } + ], + "range-path-index": [ + { + "scalar-type": "decimal", + "path-expression": "price/amt", + "collation": "", + "range-value-positions": false, + "invalid-values": "reject" + } + ], + "geospatial-path-index": [ + { + "path-expression": "gElemChildParent/gElemChildPoint", + "coordinate-system": "wgs84", + "point-format": "point", + "range-value-positions": false, + "invalid-values": "reject" + } + ], + "geospatial-element-index": [ + { + "namespace-uri": "", + "localname": "gElemPoint", + "coordinate-system": "wgs84", + "point-format": "point", + "range-value-positions": false, + "invalid-values": "reject" + }, + { + "namespace-uri": "", + "localname": "gElemPointWgs84Double", + "coordinate-system": "wgs84/double", + "point-format": "point", + "range-value-positions": false, + "invalid-values": "reject" + } + ], + "geospatial-element-child-index": [ + { + "parent-namespace-uri": "", + "parent-localname": "gElemChildParent", + "namespace-uri": "", + "localname": "gElemChildPoint", + "coordinate-system": "wgs84", + "point-format": "point", + "range-value-positions": false, + "invalid-values": "reject" + }, + { + "parent-namespace-uri": "", + "parent-localname": "gElemChildParentEtrs89Double", + "namespace-uri": "", + "localname": "gElemChildPointEtrs89Double", + "coordinate-system": "etrs89/double", + "point-format": "point", + "range-value-positions": false, + "invalid-values": "reject" + } + ], + "geospatial-element-pair-index": [ + { + "parent-namespace-uri": "", + "parent-localname": "gElemPair", + "latitude-namespace-uri": "", + "latitude-localname": "latitude", + "longitude-namespace-uri": "", + "longitude-localname": "longitude", + "coordinate-system": "wgs84", + "range-value-positions": false, + "invalid-values": "reject" + }, + { + "parent-namespace-uri": "", + "parent-localname": "gElemPairRawDouble", + "latitude-namespace-uri": "", + "latitude-localname": "latitudeRawDouble", + "longitude-namespace-uri": "", + "longitude-localname": "longitudeRawDouble", + "coordinate-system": "raw/double", + "range-value-positions": false, + "invalid-values": "reject" + } + ], + "geospatial-element-attribute-pair-index": [ + { + "parent-namespace-uri": "", + "parent-localname": "gAttrPair", + "latitude-namespace-uri": "", + "latitude-localname": "latitude", + "longitude-namespace-uri": "", + "longitude-localname": "longitude", + "coordinate-system": "wgs84", + "range-value-positions": false, + "invalid-values": "reject" + } + ], + "geospatial-region-path-index": [ + { + "path-expression": "/root/item/point", + "coordinate-system": "wgs84", + "geohash-precision": 1, + "invalid-values": "reject" + }, + { + "path-expression": "/root/item/linestring", + "coordinate-system": "wgs84/double", + "geohash-precision": 2, + "invalid-values": "ignore" + }, + { + "path-expression": "/root/item/circle", + "coordinate-system": "wgs84/double", + "geohash-precision": 1, + "invalid-values": "reject" + }, + { + "path-expression": "/root/item/circle", + "coordinate-system": "wgs84", + "geohash-precision": 1, + "invalid-values": "reject" + }, + { + "path-expression": "/root/item/box", + "coordinate-system": "wgs84/double", + "geohash-precision": 2, + "invalid-values": "ignore" + }, + { + "path-expression": "/root/item/polygon", + "coordinate-system": "wgs84", + "geohash-precision": 3, + "invalid-values": "reject" + }, + { + "path-expression": "/root/item/complex-polygon", + "coordinate-system": "wgs84", + "geohash-precision": 1, + "invalid-values": "ignore" + } + ], + "element-word-lexicon": [ + { + "collation": "http://marklogic.com/collation/", + "namespace-uri": "", + "localname": "defaultWordKey" + }, + { + "collation": "http://marklogic.com/collation/", + "namespace-uri": "", + "localname": "taggedWordKey" + }, + { + "collation": "http://marklogic.com/collation/", + "namespace-uri": "", + "localname": "otherKey" + } + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json new file mode 100644 index 00000000..b7b695cf --- /dev/null +++ b/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json @@ -0,0 +1,72 @@ +{ + "database-name": "nodeOpticFunctionalTest", + "schema-database": "Schemas", + "fast-element-trailing-wildcard-searches": true, + "two-character-searches": true, + "one-character-searches": true, + "uri-lexicon": true, + "range-element-index": [ + { + "scalar-type": "string", + "collation": "http://marklogic.com/collation/", + "namespace-uri": "", + "localname": "city", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "string", + "collation": "http://marklogic.com/collation/", + "namespace-uri": "", + "localname": "cityName", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "string", + "collation": "http://marklogic.com/collation/", + "namespace-uri": "", + "localname": "cityTeam", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "date", + "namespace-uri": "", + "localname": "date", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "double", + "namespace-uri": "", + "localname": "distance", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "decimal", + "namespace-uri": "", + "localname": "id", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "int", + "namespace-uri": "", + "localname": "popularity", + "range-value-positions": false, + "invalid-values": "ignore" + } + ], + "geospatial-element-index": [ + { + "namespace-uri": "", + "localname": "latLonPoint", + "coordinate-system": "wgs84", + "point-format": "point", + "range-value-positions": false, + "invalid-values": "reject" + } + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json b/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json new file mode 100644 index 00000000..985ca1bc --- /dev/null +++ b/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json @@ -0,0 +1,3 @@ +{ + "database-name": "nodeOpticFunctionalTestModules" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/roles/eval.json b/test-complete-app/src/main/ml-config/security/roles/eval.json new file mode 100644 index 00000000..681dbd5b --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/roles/eval.json @@ -0,0 +1,37 @@ +{ + "role-name": "eval", + "description": "eval role", + "role": [], + "privilege": [ + { + "privilege-name": "xdbc-eval", + "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", + "kind": "execute" + }, + { + "privilege-name": "xdmp-eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", + "kind": "execute" + }, + { + "privilege-name": "xdmp-invoke", + "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", + "kind": "execute" + }, + { + "privilege-name": "xdmp-invoke-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke-in", + "kind": "execute" + }, + { + "privilege-name": "xdmp-spawn", + "action": "http://marklogic.com/xdmp/privileges/xdmp-spawn", + "kind": "execute" + }, + { + "privilege-name": "xdmp-spawn-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-spawn-in", + "kind": "execute" + } + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json b/test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json new file mode 100644 index 00000000..5cab4f0f --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json @@ -0,0 +1,75 @@ +{ + "role-name": "qbvuser-role", + "description": "qbvuser role for test-complete tests", + "role": [ + "tde-view", + "query-view-admin", + "app-user", + "eval", + "harmonized-reader", + "rest-extension-user", + "rest-reader", + "rest-writer", + "rest-admin", + "tde-admin", + "manage-user", + "sparql-update-user" + ], + "privilege": [ + { + "privilege-name": "any-uri", + "action": "http://marklogic.com/xdmp/privileges/any-uri", + "kind": "execute" + }, + { + "privilege-name": "xdmp-eval", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval", + "kind": "execute" + }, + { + "privilege-name": "xdmp-eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", + "kind": "execute" + }, + { + "privilege-name": "sem-sparql", + "action": "http://marklogic.com/xdmp/privileges/sem-sparql", + "kind": "execute" + }, + { + "privilege-name": "xdbc-eval", + "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", + "kind": "execute" + }, + { + "privilege-name": "xdbc-invoke", + "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke", + "kind": "execute" + }, + { + "privilege-name": "xdmp-sql", + "action": "http://marklogic.com/xdmp/privileges/xdmp-sql", + "kind": "execute" + }, + { + "privilege-name": "xdmp-http-get", + "action": "http://marklogic.com/xdmp/privileges/xdmp-http-get", + "kind": "execute" + }, + { + "privilege-name": "xdmp-http-post", + "action": "http://marklogic.com/xdmp/privileges/xdmp-http-post", + "kind": "execute" + }, + { + "privilege-name": "xdbc-invoke-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke-in", + "kind": "execute" + }, + { + "privilege-name": "xdbc-eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", + "kind": "execute" + } + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json b/test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json new file mode 100644 index 00000000..476c59cb --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json @@ -0,0 +1,54 @@ +{ + "role-name": "rest-evaluator", + "description": "REST writer who can eval, invoke, or set a dynamic databases", + "role": [ + "rest-writer" + ], + "privilege": [ + { + "privilege-name": "xdmp-eval", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval", + "kind": "execute" + }, + { + "privilege-name": "xdmp-eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", + "kind": "execute" + }, + { + "privilege-name": "xdmp-invoke", + "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", + "kind": "execute" + }, + { + "privilege-name": "xdbc-eval", + "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", + "kind": "execute" + }, + { + "privilege-name": "xdbc-eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", + "kind": "execute" + }, + { + "privilege-name": "xdbc-invoke", + "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke", + "kind": "execute" + }, + { + "privilege-name": "any-uri", + "action": "http://marklogic.com/xdmp/privileges/any-uri", + "kind": "execute" + }, + { + "privilege-name": "xdmp-set-session-field", + "action": "http://marklogic.com/xdmp/privileges/xdmp-set-session-field", + "kind": "execute" + }, + { + "privilege-name": "xdmp-get-session-field", + "action": "http://marklogic.com/xdmp/privileges/xdmp-get-session-field", + "kind": "execute" + } + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/roles/tde-User.json b/test-complete-app/src/main/ml-config/security/roles/tde-User.json new file mode 100644 index 00000000..c9d8fd11 --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/roles/tde-User.json @@ -0,0 +1,16 @@ +{ + "role-name": "tde-User", + "description": "test user to write tde to modules database", + "role": [ + "tde-view", + "tde-admin", + "rest-writer" + ], + "privilege": [ + { + "privilege-name": "xdmp-eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", + "kind": "execute" + } + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/users/qbvuser.json b/test-complete-app/src/main/ml-config/security/users/qbvuser.json new file mode 100644 index 00000000..e90b1b21 --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/users/qbvuser.json @@ -0,0 +1,8 @@ +{ + "user-name": "qbvuser", + "description": "qbvuser for test complete tests.", + "password": "qbvuser", + "role": [ + "qbvuser-role" + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/users/rest-admin.json b/test-complete-app/src/main/ml-config/security/users/rest-admin.json new file mode 100644 index 00000000..1d61dd6f --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/users/rest-admin.json @@ -0,0 +1,8 @@ +{ + "user-name": "rest-admin", + "description": "rest-admin user", + "password": "x", + "role": [ + "rest-admin" + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/users/rest-evaluator.json b/test-complete-app/src/main/ml-config/security/users/rest-evaluator.json new file mode 100644 index 00000000..fe89e731 --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/users/rest-evaluator.json @@ -0,0 +1,8 @@ +{ + "user-name": "rest-evaluator", + "description": "rest-writer user with evaluate privileges", + "password": "x", + "role": [ + "rest-evaluator" + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json b/test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json new file mode 100644 index 00000000..6db7588e --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json @@ -0,0 +1,8 @@ +{ + "user-name": "rest-reader-optic", + "password": "x", + "description": "rest-reader user", + "role": [ + "rest-reader" + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/users/rest-reader.json b/test-complete-app/src/main/ml-config/security/users/rest-reader.json new file mode 100644 index 00000000..7cdeed28 --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/users/rest-reader.json @@ -0,0 +1,8 @@ +{ + "user-name": "rest-reader", + "description": "rest-reader user", + "password": "x", + "role": [ + "rest-reader" + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/users/rest-writer.json b/test-complete-app/src/main/ml-config/security/users/rest-writer.json new file mode 100644 index 00000000..340ec3ba --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/users/rest-writer.json @@ -0,0 +1,9 @@ +{ + "user-name": "rest-writer", + "description": "rest-writer user", + "password": "x", + "role": [ + "rest-writer", + "rest-evaluator" + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/users/tde-user.json b/test-complete-app/src/main/ml-config/security/users/tde-user.json new file mode 100644 index 00000000..deb28d45 --- /dev/null +++ b/test-complete-app/src/main/ml-config/security/users/tde-user.json @@ -0,0 +1,8 @@ +{ + "user-name": "tde-user", + "description": "test user to write tde to modules database", + "password": "x", + "role": [ + "tde-User" + ] +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json b/test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json new file mode 100644 index 00000000..3c6ad55d --- /dev/null +++ b/test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json @@ -0,0 +1,13 @@ +{ + "server-name": "dmsdk-api-rest-server", + "port": 8025, + "server-type": "http", + "root": "/", + "content-database": "dmsdk-api-rest-server", + "modules-database": "dmsdk-api-rest-server-modules", + "default-error-format": "json", + "error-handler": "/MarkLogic/rest-api/error-handler.xqy", + "url-rewriter": "/MarkLogic/rest-api/rewriter.xml", + "rewrite-resolves-globally": true, + "authentication": "digestbasic" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json b/test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json new file mode 100644 index 00000000..3b6758f6 --- /dev/null +++ b/test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json @@ -0,0 +1,13 @@ +{ + "server-name": "node-client-api-rest-server", + "port": 8024, + "server-type": "http", + "root": "/", + "content-database": "node-client-api-rest-server", + "modules-database": "node-client-api-rest-server-modules", + "default-error-format": "json", + "error-handler": "/MarkLogic/rest-api/error-handler.xqy", + "url-rewriter": "/MarkLogic/rest-api/rewriter.xml", + "rewrite-resolves-globally": true, + "authentication": "digestbasic" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json b/test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json new file mode 100644 index 00000000..6baa4b86 --- /dev/null +++ b/test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json @@ -0,0 +1,13 @@ +{ + "server-name": "nodeOpticFunctionalTest", + "port": 8079, + "server-type": "http", + "root": "/", + "content-database": "nodeOpticFunctionalTest", + "modules-database": "nodeOpticFunctionalTestModules", + "default-error-format": "json", + "error-handler": "/MarkLogic/rest-api/error-handler.xqy", + "url-rewriter": "/MarkLogic/rest-api/rewriter.xml", + "rewrite-resolves-globally": true, + "authentication": "digestbasic" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json new file mode 100755 index 00000000..8388cedb --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json @@ -0,0 +1,6 @@ + +{ + "cityName": "london", + "cityTeam": "arsenal", + "cityPopulation": 2000000 +} diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json new file mode 100755 index 00000000..c0a37c3d --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json @@ -0,0 +1,6 @@ + +{ + "cityName": "new york", + "cityTeam": "yankee", + "cityPopulation": 11000000 +} diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json new file mode 100755 index 00000000..9f18b122 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json @@ -0,0 +1,6 @@ + +{ + "cityName": "new jersey", + "cityTeam": "nets", + "cityPopulation": 3000000 +} diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json new file mode 100755 index 00000000..5640ea7d --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json @@ -0,0 +1,6 @@ + +{ + "cityName": "beijing", + "cityTeam": "ducks", + "cityPopulation": 55000000 +} diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json new file mode 100755 index 00000000..3814c03c --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json @@ -0,0 +1,6 @@ + +{ + "cityName": "cape town", + "cityTeam": "pirates", + "cityPopulation": 650000 +} diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties b/test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties new file mode 100644 index 00000000..b00d41c8 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties @@ -0,0 +1,4 @@ +city*=/optic/lexicon/test +doc*=/optic/lexicon/test +doc1.json=/optic/lexicon/test,/other/coll1,/other/coll2 +masterDetail*=/optic/view/test \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json new file mode 100755 index 00000000..38fa8e56 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json @@ -0,0 +1,18 @@ +{ + "city":"london", + "distance":50.4, + "date":"2007-01-01", + "metro":true, + "description":"Two recent discoveries indicate probable very early settlements near the Thames", + "popularity":5, + "location":{ + "latLonPoint":"51.50, -0.12", + "latLonPair":{ + "lat":51.5, + "long":-0.12 + }, + "latLonParent":{ + "latLonChild":"51.50, -0.12" + } + } +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json new file mode 100755 index 00000000..c7345198 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json @@ -0,0 +1,18 @@ +{ + "city":"new york", + "distance":23.3, + "date":"2006-06-23", + "metro":true, + "description":"Henry Hudsons 1609 voyage marked the beginning of European involvement with the area", + "popularity":5, + "location":{ + "latLonPoint":"40.71, -74.01", + "latLonPair":{ + "lat":40.71, + "long":-74.01 + }, + "latLonParent":{ + "latLonChild":"40.71, -74.01" + } + } +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json new file mode 100755 index 00000000..2bd7df87 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json @@ -0,0 +1,18 @@ +{ + "city":"new jersey", + "distance":12.9, + "date":"1971-12-23", + "metro":false, + "description":"American forces under Washington met the forces under General Henry Clinton", + "popularity":2, + "location":{ + "latLonPoint":"40.72, -74.07", + "latLonPair":{ + "lat":40.72, + "long":-74.07 + }, + "latLonParent":{ + "latLonChild":"40.72, -74.07" + } + } +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml new file mode 100755 index 00000000..8431dfa5 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml @@ -0,0 +1,19 @@ + + beijing + 134.5 + 1981-11-09 + true + The Miyun Reservoir, on the upper reaches of the Chaobai River, is the largest reservoir within the municipality + 5 + + 39.90,116.40 + + 39.90,116.40 + + + 39.90 + 116.40 + + + + \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml new file mode 100755 index 00000000..8576dba9 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml @@ -0,0 +1,19 @@ + + cape town + 377.9 + 1999-04-22 + true + The earliest known remnants in the region were found at Peers cave in Fish Hoek + 3 + + -33.91,18.42 + + -33.91,18.42 + + + -33.91 + 18.42 + + + + \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/collections.properties b/test-complete-app/src/main/ml-data/optic/plan/test/collections.properties new file mode 100644 index 00000000..295f8fa8 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/plan/test/collections.properties @@ -0,0 +1 @@ +*=/optic/plan/test \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json b/test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json new file mode 100644 index 00000000..9a916e74 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json @@ -0,0 +1,161 @@ +{ + "$optic": { + "ns": "op", + "fn": "operators", + "args": [ + { + "ns": "op", + "fn": "from-lexicons", + "args": [ + { + "uri1": { + "uriReference": { } + }, + "city": { + "jsonPropertyReference": { + "property": "city", + "scalarType": "string", + "collation": "http://marklogic.com/collation/", + "nullable": false + } + }, + "popularity": { + "jsonPropertyReference": { + "property": "popularity", + "scalarType": "int", + "nullable": false + } + }, + "date": { + "jsonPropertyReference": { + "property": "date", + "scalarType": "date", + "nullable": false + } + }, + "distance": { + "jsonPropertyReference": { + "property": "distance", + "scalarType": "double", + "nullable": false + } + }, + "point": { + "jsonPropertyReference": { + "property": "latLonPoint", + "scalarType": "point", + "coordinateSystem": "wgs84", + "nullable": false + } + } + }, + "myCity", + { + "ns": "op", + "fn": "fragment-id-col", + "args": [ + "fragId1" + ] + } + ] + }, + { + "ns": "op", + "fn": "join-inner", + "args": [ + { + "ns": "op", + "fn": "operators", + "args": [ + { + "ns": "op", + "fn": "from-lexicons", + "args": [ + { + "uri2": { + "uriReference": { } + }, + "cityName": { + "jsonPropertyReference": { + "property": "cityName", + "scalarType": "string", + "collation": "http://marklogic.com/collation/", + "nullable": false + } + }, + "cityTeam": { + "jsonPropertyReference": { + "property": "cityTeam", + "scalarType": "string", + "collation": "http://marklogic.com/collation/", + "nullable": false + } + } + }, + "myTeam", + { + "ns": "op", + "fn": "fragment-id-col", + "args": [ + "fragId2" + ] + } + ] + } + ] + }, + null, + null + ] + }, + { + "ns": "op", + "fn": "where", + "args": [ + { + "ns": "op", + "fn": "eq", + "args": [ + { + "ns": "op", + "fn": "viewCol", + "args": [ + "myCity", + "city" + ] + }, + { + "ns": "op", + "fn": "col", + "args": [ + "cityName" + ] + } + ] + } + ] + }, + { + "ns": "op", + "fn": "order-by", + "args": [ + [ + { + "ns": "op", + "fn": "asc", + "args": [ + { + "ns": "op", + "fn": "col", + "args": [ + "date" + ] + } + ] + } + ] + ] + } + ] + } +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json b/test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json new file mode 100644 index 00000000..bb854c69 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json @@ -0,0 +1,73 @@ +{ + "$optic": { + "ns": "op", + "fn": "operators", + "args": [ { + "ns": "op", + "fn": "from-triples", + "args": [ + [ { + "ns": "op", + "fn": "pattern", + "args": [ + [ { + "ns": "op", + "fn": "col", + "args": [ "player_id" ] + } ], + [ { + "ns": "sem", + "fn": "iri", + "args": [ "http://marklogic.com/other/bball/players#age" ] + } ], + [ { + "ns": "op", + "fn": "col", + "args": [ "player_age" ] + } ], null + ] + }, { + "ns": "op", + "fn": "pattern", + "args": [ + [ { + "ns": "op", + "fn": "col", + "args": [ "player_id" ] + } ], + [ { + "ns": "sem", + "fn": "iri", + "args": [ "http://marklogic.com/other/bball/players#name" ] + } ], + [ { + "ns": "op", + "fn": "col", + "args": [ "player_name" ] + } ], null + ] + }, { + "ns": "op", + "fn": "pattern", + "args": [ + [ { + "ns": "op", + "fn": "col", + "args": [ "player_id" ] + } ], + [ { + "ns": "sem", + "fn": "iri", + "args": [ "http://marklogic.com/other/bball/players#team" ] + } ], + [ { + "ns": "op", + "fn": "col", + "args": [ "player_team" ] + } ], null + ] + } ], "myPlayer", null, null + ] + } ] + } +} diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planViews.json b/test-complete-app/src/main/ml-data/optic/plan/test/planViews.json new file mode 100644 index 00000000..0a5f59ff --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/plan/test/planViews.json @@ -0,0 +1,117 @@ +{ + "$optic": { + "ns": "op", + "fn": "operators", + "args": [ + { + "ns": "op", + "fn": "from-view", + "args": [ + "opticFunctionalTest", + "detail", + "myDetail", + null + ] + }, + { + "ns": "op", + "fn": "join-inner", + "args": [ + { + "ns": "op", + "fn": "operators", + "args": [ + { + "ns": "op", + "fn": "from-view", + "args": [ + "opticFunctionalTest", + "master", + "myMaster", + null + ] + } + ] + }, + [ + { + "ns": "op", + "fn": "on", + "args": [ + { + "ns": "op", + "fn": "viewCol", + "args": [ + "myDetail", + "masterId" + ] + }, + { + "ns": "op", + "fn": "viewCol", + "args": [ + "myMaster", + "id" + ] + } + ] + }, + { + "ns": "op", + "fn": "on", + "args": [ + { + "ns": "op", + "fn": "viewCol", + "args": [ + "myMaster", + "id" + ] + }, + { + "ns": "op", + "fn": "viewCol", + "args": [ + "myDetail", + "id" + ] + } + ] + } + ], + null + ] + }, + { + "ns": "op", + "fn": "order-by", + "args": [ + [ + { + "ns": "op", + "fn": "desc", + "args": [ + { + "ns": "op", + "fn": "viewCol", + "args": [ + "myDetail", + "name" + ] + } + ] + } + ] + ] + }, + { + "ns": "op", + "fn": "offset-limit", + "args": [ + 1, + 100 + ] + } + ] + } +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties b/test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties new file mode 100644 index 00000000..295f8fa8 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties @@ -0,0 +1 @@ +*=/optic/plan/test \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml b/test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml new file mode 100644 index 00000000..76234f73 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml @@ -0,0 +1,15 @@ + + world + + + http://marklogicsparql.com/id#5555 + http://marklogicsparql.com/addressbook#firstName + Jim + + + http://marklogicsparql.com/id#5555 + http://marklogicsparql.com/addressbook#firstName + Jim + + + \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/collections.properties b/test-complete-app/src/main/ml-data/optic/triple/test/collections.properties new file mode 100644 index 00000000..91f8d0dc --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/triple/test/collections.properties @@ -0,0 +1,5 @@ +playerTripleSet.xml=/optic/player/triple/test +duplicatePlayerTripleSet.xml=/optic/player/triple/test +otherPlayerTripleSet.xml=/optic/other/player/triple/test +teamTripleSet.xml=/optic/team/triple/test +duplicateTeamTripleSet.xml=/optic/team/triple/test diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml b/test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml new file mode 100755 index 00000000..c7345106 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml @@ -0,0 +1,376 @@ + + + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/name + John Doe + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/description + Describing John Doe + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/dob + 1981-05-04 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/eff + 25.45 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/age + 31 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/name + Bob Brian + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/description + Describing Bob Brian + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/position + Outfielder + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/dob + 1999-01-15 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/eff + 78.45 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/age + 23 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/003 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/name + Josh Ream + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/description + Describing Josh Ream + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/dob + 1985-11-30 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/eff + 53.10 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/name + Pat Crenshaw + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/description + Describing Pat Crenshaw + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/position + Catcher + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/dob + 1998-09-01 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/eff + 33.89 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/age + 25 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/name + Pedro Barrozo + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/description + Describing Pedro Barrozo + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/position + Midfielder + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/dob + 1991-12-09 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/eff + 41.65 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/age + 19 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/002 + + + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/name + Aoki Yamada + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/description + Describing Aoki Yamada + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/position + First Base + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/dob + 1987-03-15 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/eff + 55.2 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/age + 34 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/003 + + + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/name + Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/description + Describing Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/dob + 1984-11-01 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/eff + 32.89 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/name + Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/description + Describing Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/dob + 1984-11-01 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/eff + 32.89 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/name + Juan Leone + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/description + Describing Juan Leone + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/position + Second Base + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/dob + 1993-08-17 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/eff + 29.77 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/age + 27 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + + diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml b/test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml new file mode 100755 index 00000000..9e18ba09 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml @@ -0,0 +1,56 @@ + + + + + http://marklogic.com/mlb/team/id/001 + http://marklogic.com/mlb/team/name + Giants + + + http://marklogic.com/mlb/team/id/001 + http://marklogic.com/mlb/team/city + San Francisco + + + http://marklogic.com/mlb/team/id/002 + http://marklogic.com/mlb/team/name + Athletics + + + http://marklogic.com/mlb/team/id/002 + http://marklogic.com/mlb/team/city + Oakland + + + http://marklogic.com/mlb/team/id/003 + http://marklogic.com/mlb/team/name + Padres + + + http://marklogic.com/mlb/team/id/003 + http://marklogic.com/mlb/team/city + San Diego + + + http://marklogic.com/mlb/team/id/004 + http://marklogic.com/mlb/team/name + Yankees + + + http://marklogic.com/mlb/team/id/004 + http://marklogic.com/mlb/team/city + New York + + + http://marklogic.com/mlb/team/id/005 + http://marklogic.com/mlb/team/name + Mariners + + + http://marklogic.com/mlb/team/id/005 + http://marklogic.com/mlb/team/city + Seattle + + + + \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml b/test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml new file mode 100755 index 00000000..c7345106 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml @@ -0,0 +1,376 @@ + + + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/name + John Doe + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/description + Describing John Doe + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/dob + 1981-05-04 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/eff + 25.45 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/age + 31 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/name + Bob Brian + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/description + Describing Bob Brian + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/position + Outfielder + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/dob + 1999-01-15 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/eff + 78.45 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/age + 23 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/003 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/name + Josh Ream + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/description + Describing Josh Ream + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/dob + 1985-11-30 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/eff + 53.10 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/name + Pat Crenshaw + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/description + Describing Pat Crenshaw + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/position + Catcher + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/dob + 1998-09-01 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/eff + 33.89 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/age + 25 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/name + Pedro Barrozo + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/description + Describing Pedro Barrozo + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/position + Midfielder + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/dob + 1991-12-09 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/eff + 41.65 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/age + 19 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/002 + + + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/name + Aoki Yamada + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/description + Describing Aoki Yamada + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/position + First Base + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/dob + 1987-03-15 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/eff + 55.2 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/age + 34 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/003 + + + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/name + Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/description + Describing Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/dob + 1984-11-01 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/eff + 32.89 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/name + Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/description + Describing Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/dob + 1984-11-01 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/eff + 32.89 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/name + Juan Leone + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/description + Describing Juan Leone + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/position + Second Base + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/dob + 1993-08-17 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/eff + 29.77 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/age + 27 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + + diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml b/test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml new file mode 100755 index 00000000..c7345106 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml @@ -0,0 +1,376 @@ + + + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/name + John Doe + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/description + Describing John Doe + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/dob + 1981-05-04 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/eff + 25.45 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/age + 31 + + + http://marklogic.com/baseball/id#001 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/name + Bob Brian + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/description + Describing Bob Brian + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/position + Outfielder + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/dob + 1999-01-15 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/eff + 78.45 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/age + 23 + + + http://marklogic.com/baseball/id#002 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/003 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/name + Josh Ream + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/description + Describing Josh Ream + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/dob + 1985-11-30 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/eff + 53.10 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#003 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/name + Pat Crenshaw + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/description + Describing Pat Crenshaw + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/position + Catcher + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/dob + 1998-09-01 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/eff + 33.89 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/age + 25 + + + http://marklogic.com/baseball/id#004 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/name + Pedro Barrozo + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/description + Describing Pedro Barrozo + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/position + Midfielder + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/dob + 1991-12-09 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/eff + 41.65 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/age + 19 + + + http://marklogic.com/baseball/id#005 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/002 + + + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/name + Aoki Yamada + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/description + Describing Aoki Yamada + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/position + First Base + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/dob + 1987-03-15 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/eff + 55.2 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/age + 34 + + + http://marklogic.com/baseball/id#006 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/003 + + + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/name + Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/description + Describing Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/dob + 1984-11-01 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/eff + 32.89 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/name + Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/description + Describing Matt Rose + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/position + Pitcher + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/dob + 1984-11-01 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/eff + 32.89 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/age + 29 + + + http://marklogic.com/baseball/id#007 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/005 + + + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/name + Juan Leone + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/type + http://marklogic.com/baseball/players/bbtype/Dataset + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/description + Describing Juan Leone + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/position + Second Base + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/dob + 1993-08-17 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/eff + 29.77 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/age + 27 + + + http://marklogic.com/baseball/id#008 + http://marklogic.com/baseball/players/team + http://marklogic.com/mlb/team/id/001 + + + + diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml b/test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml new file mode 100755 index 00000000..9e18ba09 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml @@ -0,0 +1,56 @@ + + + + + http://marklogic.com/mlb/team/id/001 + http://marklogic.com/mlb/team/name + Giants + + + http://marklogic.com/mlb/team/id/001 + http://marklogic.com/mlb/team/city + San Francisco + + + http://marklogic.com/mlb/team/id/002 + http://marklogic.com/mlb/team/name + Athletics + + + http://marklogic.com/mlb/team/id/002 + http://marklogic.com/mlb/team/city + Oakland + + + http://marklogic.com/mlb/team/id/003 + http://marklogic.com/mlb/team/name + Padres + + + http://marklogic.com/mlb/team/id/003 + http://marklogic.com/mlb/team/city + San Diego + + + http://marklogic.com/mlb/team/id/004 + http://marklogic.com/mlb/team/name + Yankees + + + http://marklogic.com/mlb/team/id/004 + http://marklogic.com/mlb/team/city + New York + + + http://marklogic.com/mlb/team/id/005 + http://marklogic.com/mlb/team/name + Mariners + + + http://marklogic.com/mlb/team/id/005 + http://marklogic.com/mlb/team/city + Seattle + + + + \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/view/test/collections.properties b/test-complete-app/src/main/ml-data/optic/view/test/collections.properties new file mode 100644 index 00000000..24e46cdc --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/view/test/collections.properties @@ -0,0 +1 @@ +*=/optic/view/test \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml new file mode 100755 index 00000000..412f27e8 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml @@ -0,0 +1,59 @@ + + + + 1 + Master 1 + 2015-12-01 + + + 2 + Master 2 + 2015-12-02 + + + + + 1 + Detail 1 + 1 + 10.01 + blue + + + 2 + Detail 2 + 2 + 20.02 + blue + + + 3 + Detail 3 + 1 + 30.03 + blue + + + 4 + Detail 4 + 2 + 40.04 + green + + + 5 + Detail 5 + 1 + 50.05 + green + + + 6 + Detail 6 + 2 + 60.06 + green + + + + diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json new file mode 100755 index 00000000..c11cccf2 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json @@ -0,0 +1,64 @@ +{ + "sets2": { + "masterSet": { + "master": [ + { + "id": "3", + "name": "Master 3", + "date": "2016-03-01" + }, + { + "id": "4", + "name": "Master 4", + "date": "2016-05-25" + } + ] + }, + "detailSet": { + "detail": [ + { + "id": "7", + "name": "Detail 7", + "masterId": "3", + "amount": "64.33", + "color": "red" + }, + { + "id": "8", + "name": "Detail 8", + "masterId": "4", + "amount": "89.36", + "color": "blue" + }, + { + "id": "9", + "name": "Detail 9", + "masterId": "1", + "amount": "72.90", + "color": "yellow" + }, + { + "id": "10", + "name": "Detail 10", + "masterId": "2", + "amount": "30.26", + "color": "black" + }, + { + "id": "11", + "name": "Detail 11", + "masterId": "3", + "amount": "82.04", + "color": "green" + }, + { + "id": "12", + "name": "Detail 12", + "masterId": "1", + "amount": "25.86", + "color": "red" + } + ] + } + } +} diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json new file mode 100755 index 00000000..cac14f0b --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json @@ -0,0 +1,64 @@ +{ + "sets3": { + "masterSet3": { + "master3": [ + { + "id": "3", + "name": "Master 3", + "date": "2016-03-01" + }, + { + "id": "4", + "name": "Master 4", + "date": "2016-05-25" + } + ] + }, + "detailSet3": { + "detail3": [ + { + "id": "7", + "name": "Detail 7", + "masterId": "3", + "amount": "64.33", + "color": "red" + }, + { + "id": "8", + "name": "Detail 8", + "masterId": "4", + "amount": "89.36", + "color": "blue" + }, + { + "id": "9", + "name": "Detail 9", + "masterId": "1", + "amount": "72.90", + "color": "yellow" + }, + { + "id": "10", + "name": "Detail 10", + "masterId": "2", + "amount": "30.26", + "color": "black" + }, + { + "id": "11", + "name": "Detail 11", + "masterId": "3", + "amount": "82.04", + "color": "green" + }, + { + "id": "12", + "name": "Detail 12", + "masterId": "1", + "amount": "25.86", + "color": "red" + } + ] + } + } +} diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json new file mode 100755 index 00000000..3650a387 --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json @@ -0,0 +1,43 @@ +{ + "sets4": { + "masterSet4": { + "master4": [ + { + "id": "100", + "name": "Master 100", + "date": "2016-03-11" + }, + { + "id": "200", + "name": "Master 200", + "date": "2016-04-02" + } + ] + }, + "detailSet4": { + "detail4": [ + { + "id": "100", + "name": "Detail 100", + "masterId": "100", + "amount": "64.33", + "color": "red" + }, + { + "id": "200", + "name": "Detail 200", + "masterId": "200", + "amount": "89.36", + "color": "blue" + }, + { + "id": "300", + "name": "Detail 300", + "masterId": "200", + "amount": "72.90", + "color": "yellow" + } + ] + } + } +} diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json new file mode 100755 index 00000000..be57f67e --- /dev/null +++ b/test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json @@ -0,0 +1,29 @@ +{ + "sets4": { + "detailSet4": { + "detail4": [ + { + "id": "400", + "name": "Detail 400", + "masterId": "200", + "amount": "164.33", + "color": "purple" + }, + { + "id": "500", + "name": "Detail 500", + "masterId": "100", + "amount": "189.36", + "color": "gold" + }, + { + "id": "600", + "name": "Detail 600", + "masterId": "100", + "amount": "172.90", + "color": "white" + } + ] + } + } +} diff --git a/test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs b/test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs new file mode 100644 index 00000000..79978ad1 --- /dev/null +++ b/test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs @@ -0,0 +1,80 @@ +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ +'use strict'; + +function arrayMapper(row) { + const result = row.concat(); + result.push((typeof result[0] === 'string') ? 'seconds' : + fn.floor(fn.secondsFromDateTime(fn.currentDateTime())) + ); + return result; +} + +function colorIdMapper(row) { + const result = row; + switch(result.myColorId) { + case 1: + result.myColorId = 'RED'; + break; + case 2: + result.myColorId = 'BLUE'; + break; + case 3: + result.myColorId = 'YELLOW'; + break; + case 4: + result.myColorId = 'BLACK'; + break; + default: + result.myColorId = 'NO COLOR'; + } + return result; +} + +function arrayReducer(previous, row) { + const val = (previous === void 0) ? 0 : previous + row[0]; + return val; +} + +function fibReducer(previous, row) { + const i = Array.isArray(previous) ? previous.length : 0; + const result = row; + result.i = i; + switch(i) { + case 0: + result.fib = 0; + break; + case 1: + result.fib = 1; + break; + default: + result.fib = previous[i - 2].fib + previous[i - 1].fib; + break; + } + if (previous === void 0) { + previous = [result]; + } else { + previous.push(result); + } + return previous; +} + +function ageMapper(row) { + const result = row; + if(result.player_age < 21) + result.player_age = 'rookie'; + else if(result.player_age > 21 && result.player_age < 30) + result.player_age = 'premium'; + else + result.player_age = 'veteran'; + return result; +} + +module.exports = { + arrayMapper: arrayMapper, + colorIdMapper: colorIdMapper, + ageMapper: ageMapper, + arrayReducer: arrayReducer, + fibReducer: fibReducer +}; diff --git a/test-complete-app/src/main/ml-schemas/permissions.properties b/test-complete-app/src/main/ml-schemas/permissions.properties new file mode 100644 index 00000000..86366e36 --- /dev/null +++ b/test-complete-app/src/main/ml-schemas/permissions.properties @@ -0,0 +1 @@ +*=app-user,read,app-user,execute,app-builder,read,app-builder,execute,rest-reader,read,rest-reader,execute,rest-reader,update,rest-admin,read,rest-admin,execute,rest-admin,update,rest-writer,read,rest-writer,execute,rest-writer,update diff --git a/test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex b/test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex new file mode 100644 index 00000000..f83ff6b0 --- /dev/null +++ b/test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex @@ -0,0 +1,35 @@ + + diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex b/test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex new file mode 100755 index 00000000..4f479c01 --- /dev/null +++ b/test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex @@ -0,0 +1,35 @@ + diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej b/test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej new file mode 100755 index 00000000..40463213 --- /dev/null +++ b/test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej @@ -0,0 +1,53 @@ +{ + "template": { + "context": "/sets2", + "templates": [{ + "context": "masterSet/master", + "rows": [{ + "schemaName": "opticFunctionalTest2", + "viewName": "master", + "columns": [{ + "name": "id", + "scalarType": "int", + "val": "id" + }, { + "name": "name", + "scalarType": "string", + "val": "name" + }, { + "name": "date", + "scalarType": "date", + "val": "date" + }] + }] + }, { + "context": "detailSet/detail", + "rows": [{ + "schemaName": "opticFunctionalTest2", + "viewName": "detail", + "columns": [{ + "name": "id", + "scalarType": "int", + "val": "id" + }, { + "name": "name", + "scalarType": "string", + "val": "name" + }, { + "name": "masterId", + "scalarType": "int", + "val": "masterId" + }, { + "name": "amount", + "scalarType": "double", + "val": "amount" + }, { + "name": "color", + "scalarType": "string", + "val": "color" + }] + }] + }] + } +} + diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej b/test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej new file mode 100755 index 00000000..d702b049 --- /dev/null +++ b/test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej @@ -0,0 +1,53 @@ +{ + "template": { + "context": "/sets3", + "templates": [{ + "context": "masterSet3/master3", + "rows": [{ + "schemaName": "opticFunctionalTest3", + "viewName": "master3", + "columns": [{ + "name": "id", + "scalarType": "int", + "val": "id" + }, { + "name": "name", + "scalarType": "string", + "val": "name" + }, { + "name": "date", + "scalarType": "date", + "val": "date" + }] + }] + }, { + "context": "detailSet3/detail3", + "rows": [{ + "schemaName": "opticFunctionalTest3", + "viewName": "detail3", + "columns": [{ + "name": "id", + "scalarType": "int", + "val": "id" + }, { + "name": "name", + "scalarType": "string", + "val": "name" + }, { + "name": "masterId", + "scalarType": "int", + "val": "masterId" + }, { + "name": "amount", + "scalarType": "double", + "val": "amount" + }, { + "name": "color", + "scalarType": "string", + "val": "color" + }] + }] + }] + } +} + diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej b/test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej new file mode 100755 index 00000000..7d026ce4 --- /dev/null +++ b/test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej @@ -0,0 +1,53 @@ +{ + "template": { + "context": "/sets4", + "templates": [{ + "context": "masterSet4/master4", + "rows": [{ + "schemaName": "opticFunctionalTest4", + "viewName": "master4", + "columns": [{ + "name": "id", + "scalarType": "int", + "val": "id" + }, { + "name": "name", + "scalarType": "string", + "val": "name" + }, { + "name": "date", + "scalarType": "date", + "val": "date" + }] + }] + }, { + "context": "detailSet4/detail4", + "rows": [{ + "schemaName": "opticFunctionalTest4", + "viewName": "detail4", + "columns": [{ + "name": "id", + "scalarType": "int", + "val": "id" + }, { + "name": "name", + "scalarType": "string", + "val": "name" + }, { + "name": "masterId", + "scalarType": "int", + "val": "masterId" + }, { + "name": "amount", + "scalarType": "double", + "val": "amount" + }, { + "name": "color", + "scalarType": "string", + "val": "color" + }] + }] + }] + } +} + diff --git a/test-complete-app/src/main/turtle/companies/companies_100.ttl b/test-complete-app/src/main/turtle/companies/companies_100.ttl new file mode 100755 index 00000000..605112c7 --- /dev/null +++ b/test-complete-app/src/main/turtle/companies/companies_100.ttl @@ -0,0 +1,1804 @@ +@prefix demor: . +@prefix demov: . +@prefix vcard: . + + +##company 1 +demor:COMPANY001 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 12000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "San Jose"; + vcard:region "Texas"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 2 +demor:COMPANY002 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "San Jose"; + vcard:region "New York"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 3 +demor:COMPANY003 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 1000000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 4 +demor:COMPANY004 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 8; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Menlo Park"; + vcard:region "Arizona"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 5 +demor:COMPANY005 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 347852766; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Menlo Park"; + vcard:region "Texas"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 6 +demor:COMPANY006 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 2300450; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "San Jose"; + vcard:region "North Dakota"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 7 +demor:COMPANY007 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 8; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "Menlo Park"; + vcard:region "Nevada"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 8 +demor:COMPANY008 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 347852766; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "North Carolina"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 9 +demor:COMPANY009 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 300000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Atherton"; + vcard:region "Texas"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 10 +demor:COMPANY010 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 15000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "Menlo Park"; + vcard:region "New York"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 11 +demor:COMPANY011 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 1000000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 12 +demor:COMPANY012 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 347852766; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Atherton"; + vcard:region "North Carolina"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 13 +demor:COMPANY013 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 1000000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Redwood City"; + vcard:region "North Carolina"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 14 +demor:COMPANY014 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 347852766; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Menlo Park"; + vcard:region "North Dakota"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 15 +demor:COMPANY015 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 12000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Menlo Park"; + vcard:region "North Dakota"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 16 +demor:COMPANY016 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 15000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "San Jose"; + vcard:region "Texas"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 17 +demor:COMPANY017 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 100000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "Redwood City"; + vcard:region "Texas"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 18 +demor:COMPANY018 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 1000000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "North Dakota"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 19 +demor:COMPANY019 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 12000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 20 +demor:COMPANY020 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 10000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Atherton"; + vcard:region "Arizona"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 21 +demor:COMPANY021 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 15000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Redwood City"; + vcard:region "New York"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 22 +demor:COMPANY022 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Atherton"; + vcard:region "North Dakota"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 23 +demor:COMPANY023 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 15000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Menlo Park"; + vcard:region "Arizona"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 24 +demor:COMPANY024 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 12000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Menlo Park"; + vcard:region "North Dakota"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 25 +demor:COMPANY025 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 8; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 26 +demor:COMPANY026 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 10000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "San Jose"; + vcard:region "North Carolina"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 27 +demor:COMPANY027 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 15000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Atherton"; + vcard:region "North Carolina"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 28 +demor:COMPANY028 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 2300450; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Atherton"; + vcard:region "Arizona"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 29 +demor:COMPANY029 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 347852766; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Atherton"; + vcard:region "Nevada"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 30 +demor:COMPANY030 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 15000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 31 +demor:COMPANY031 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Redwood City"; + vcard:region "Arizona"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 32 +demor:COMPANY032 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 347852766; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 33 +demor:COMPANY033 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 8; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Redwood City"; + vcard:region "Arizona"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 34 +demor:COMPANY034 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 15000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Redwood City"; + vcard:region "Nevada"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 35 +demor:COMPANY035 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 10000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Menlo Park"; + vcard:region "Nevada"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 36 +demor:COMPANY036 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 300000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 37 +demor:COMPANY037 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 10000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Atherton"; + vcard:region "Arizona"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 38 +demor:COMPANY038 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 300000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Atherton"; + vcard:region "Texas"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 39 +demor:COMPANY039 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "Nevada"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 40 +demor:COMPANY040 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 15000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 41 +demor:COMPANY041 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 300000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Menlo Park"; + vcard:region "New York"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 42 +demor:COMPANY042 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 10000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Atherton"; + vcard:region "Nevada"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 43 +demor:COMPANY043 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 1000000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "San Jose"; + vcard:region "California"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 44 +demor:COMPANY044 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 10000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Menlo Park"; + vcard:region "North Dakota"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 45 +demor:COMPANY045 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 15000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Redwood City"; + vcard:region "Arizona"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 46 +demor:COMPANY046 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 300000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Atherton"; + vcard:region "California"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 47 +demor:COMPANY047 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 100000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Redwood City"; + vcard:region "New York"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 48 +demor:COMPANY048 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 100000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 49 +demor:COMPANY049 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 347852766; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Redwood City"; + vcard:region "North Carolina"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 50 +demor:COMPANY050 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 347852766; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "San Jose"; + vcard:region "Texas"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 51 +demor:COMPANY051 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Menlo Park"; + vcard:region "Texas"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 52 +demor:COMPANY052 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 12000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Menlo Park"; + vcard:region "Arizona"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 53 +demor:COMPANY053 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 347852766; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Redwood City"; + vcard:region "North Dakota"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 54 +demor:COMPANY054 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 10000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "North Dakota"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 55 +demor:COMPANY055 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 15000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Menlo Park"; + vcard:region "North Dakota"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 56 +demor:COMPANY056 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 347852766; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Menlo Park"; + vcard:region "New York"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 57 +demor:COMPANY057 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 10000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "San Jose"; + vcard:region "Texas"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 58 +demor:COMPANY058 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 1000000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Redwood City"; + vcard:region "New York"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 59 +demor:COMPANY059 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 15000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "San Jose"; + vcard:region "California"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 60 +demor:COMPANY060 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 100000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Redwood City"; + vcard:region "New York"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 61 +demor:COMPANY061 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 10000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "Texas"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 62 +demor:COMPANY062 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 15000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "Nevada"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 63 +demor:COMPANY063 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 100000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Menlo Park"; + vcard:region "New York"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 64 +demor:COMPANY064 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 12000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "San Jose"; + vcard:region "North Dakota"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 65 +demor:COMPANY065 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 2300450; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Atherton"; + vcard:region "North Carolina"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 66 +demor:COMPANY066 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 10000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Atherton"; + vcard:region "Nevada"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 67 +demor:COMPANY067 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 8; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "Redwood City"; + vcard:region "North Dakota"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 68 +demor:COMPANY068 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 300000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Atherton"; + vcard:region "Texas"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 69 +demor:COMPANY069 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 12000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Redwood City"; + vcard:region "Arizona"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 70 +demor:COMPANY070 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 2300450; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "Menlo Park"; + vcard:region "New York"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 71 +demor:COMPANY071 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 8; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Redwood City"; + vcard:region "North Dakota"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 72 +demor:COMPANY072 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 1000000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 73 +demor:COMPANY073 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 1000000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Redwood City"; + vcard:region "Texas"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 74 +demor:COMPANY074 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 15000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 75 +demor:COMPANY075 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 10000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Menlo Park"; + vcard:region "Nevada"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 76 +demor:COMPANY076 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 300000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Atherton"; + vcard:region "New York"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 77 +demor:COMPANY077 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 12000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Japan"; + vcard:locality "Redwood City"; + vcard:region "Nevada"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 78 +demor:COMPANY078 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 8; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 79 +demor:COMPANY079 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 1000000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "San Jose"; + vcard:region "Texas"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 80 +demor:COMPANY080 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 15000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Redwood City"; + vcard:region "California"; + vcard:postal-code "22222"; + vcard:street-address "1 Infinite Loop" ]. + +##company 81 +demor:COMPANY081 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 347852766; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "China"; + vcard:locality "Menlo Park"; + vcard:region "Arizona"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 82 +demor:COMPANY082 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 15000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "San Jose"; + vcard:region "Texas"; + vcard:postal-code "66666"; + vcard:street-address "1 Infinite Loop" ]. + +##company 83 +demor:COMPANY083 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 84 +demor:COMPANY084 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "San Jose"; + vcard:region "California"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 85 +demor:COMPANY085 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 347852766; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Atherton"; + vcard:region "Texas"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 86 +demor:COMPANY086 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 1000000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "San Jose"; + vcard:region "New York"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 87 +demor:COMPANY087 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 10000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Atherton"; + vcard:region "California"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 88 +demor:COMPANY088 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 100000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 89 +demor:COMPANY089 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 100000000; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Redwood City"; + vcard:region "New York"; + vcard:postal-code "33333"; + vcard:street-address "1 Infinite Loop" ]. + +##company 90 +demor:COMPANY090 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 10000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CTO"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "San Jose"; + vcard:region "Arizona"; + vcard:postal-code "88888"; + vcard:street-address "1 Infinite Loop" ]. + +##company 91 +demor:COMPANY091 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 10000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "Italy"; + vcard:locality "Menlo Park"; + vcard:region "North Carolina"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 92 +demor:COMPANY092 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 100000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "President"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "New York"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 93 +demor:COMPANY093 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 12000000; + demov:employees 10500; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "Germany"; + vcard:locality "Menlo Park"; + vcard:region "North Carolina"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 94 +demor:COMPANY094 a vcard:Organization; + demov:listed "true"; + demov:industry "Financial Services"; + demov:sales 8; + demov:employees 12; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "Mary Hodges"; + ]; + vcard:hasAddress [ + vcard:country-name "UK"; + vcard:locality "Menlo Park"; + vcard:region "California"; + vcard:postal-code "44444"; + vcard:street-address "1 Infinite Loop" ]. + +##company 95 +demor:COMPANY095 a vcard:Organization; + demov:listed "true"; + demov:industry "Healthcare/Life Sciences"; + demov:sales 12000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Menlo Park"; + vcard:region "Nevada"; + vcard:postal-code "55555"; + vcard:street-address "1 Infinite Loop" ]. + +##company 96 +demor:COMPANY096 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 100000000; + demov:employees 256; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Redwood City"; + vcard:region "North Dakota"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 97 +demor:COMPANY097 a vcard:Organization; + demov:listed "true"; + demov:industry "Industrial Goods"; + demov:sales 347852766; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "India"; + vcard:locality "Redwood City"; + vcard:region "Nevada"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. + +##company 98 +demor:COMPANY098 a vcard:Organization; + demov:listed "true"; + demov:industry "Other"; + demov:sales 300000000; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CFO"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Menlo Park"; + vcard:region "Arizona"; + vcard:postal-code "11111"; + vcard:street-address "1 Infinite Loop" ]. + +##company 99 +demor:COMPANY099 a vcard:Organization; + demov:listed "true"; + demov:industry "Business/Consumer Service"; + demov:sales 300000000; + demov:employees 22647; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "CEO"; + vcard:hasEmail ; + vcard:fn "Joe Brown"; + ]; + vcard:hasAddress [ + vcard:country-name "USA"; + vcard:locality "Atherton"; + vcard:region "Arizona"; + vcard:postal-code "77777"; + vcard:street-address "1 Infinite Loop" ]. + +##company 100 +demor:COMPANY100 a vcard:Organization; + demov:listed "true"; + demov:industry "Retail/Wholesale"; + demov:sales 2300450; + demov:employees 9450; + demov:hasExecutive [ a vcard:Individual; + vcard:hasTitle "Director of IT"; + vcard:hasEmail ; + vcard:fn "John Smith"; + ]; + vcard:hasAddress [ + vcard:country-name "France"; + vcard:locality "Atherton"; + vcard:region "New York"; + vcard:postal-code "99999"; + vcard:street-address "1 Infinite Loop" ]. diff --git a/test-complete-app/src/main/turtle/people/people.ttl b/test-complete-app/src/main/turtle/people/people.ttl new file mode 100644 index 00000000..de6cf435 --- /dev/null +++ b/test-complete-app/src/main/turtle/people/people.ttl @@ -0,0 +1,70 @@ +@prefix foaf: . +@prefix ppl: . + +ppl:person1 foaf:knows ppl:person2 . +ppl:person1 foaf:knows ppl:person3 . +ppl:person1 foaf:knows ppl:person5 . +ppl:person1 foaf:knows ppl:person7 . + +ppl:person2 foaf:knows ppl:person11 . +ppl:person2 foaf:knows ppl:person3 . +ppl:person3 foaf:knows ppl:person13 . +ppl:person13 foaf:knows ppl:person17 . +ppl:person13 foaf:knows ppl:person19 . + +ppl:person4 foaf:knows ppl:person6 . +ppl:person6 foaf:knows ppl:person8 . +ppl:person8 foaf:knows ppl:person10 . +ppl:person10 foaf:knows ppl:person12 . +ppl:person12 foaf:knows ppl:person14 . +ppl:person14 foaf:knows ppl:person16 . +ppl:person16 foaf:knows ppl:person18 . +ppl:person18 foaf:knows ppl:person20 . + +ppl:person20 foaf:knows ppl:person20 . + +ppl:person9 foaf:knows ppl:person12 . +ppl:person12 foaf:knows ppl:person15 . +ppl:person15 foaf:knows ppl:person18 . +ppl:person18 foaf:knows ppl:person9 . + +ppl:person1 a ppl:Person ; + foaf:name "Person 1" . +ppl:person2 a ppl:Person ; + foaf:name "Person 2" . +ppl:person3 a ppl:Person ; + foaf:name "Person 3" . +ppl:person4 a ppl:Person ; + foaf:name "Person 4" . +ppl:person5 a ppl:Person ; + foaf:name "Person 5" . +ppl:person6 a ppl:Person ; + foaf:name "Person 6" . +ppl:person7 a ppl:Person ; + foaf:name "Person 7" . +ppl:person8 a ppl:Person ; + foaf:name "Person 8" . +ppl:person9 a ppl:Person ; + foaf:name "Person 9" . +ppl:person10 a ppl:Person ; + foaf:name "Person 10" . +ppl:person11 a ppl:Person ; + foaf:name "Person 11" . +ppl:person12 a ppl:Person ; + foaf:name "Person 12" . +ppl:person13 a ppl:Person ; + foaf:name "Person 13" . +ppl:person14 a ppl:Person ; + foaf:name "Person 14" . +ppl:person15 a ppl:Person ; + foaf:name "Person 15" . +ppl:person16 a ppl:Person ; + foaf:name "Person 16" . +ppl:person17 a ppl:Person ; + foaf:name "Person 17" . +ppl:person18 a ppl:Person ; + foaf:name "Person 18" . +ppl:person19 a ppl:Person ; + foaf:name "Person 19" . +ppl:person20 a ppl:Person ; + foaf:name "Person 20" . diff --git a/test-complete/nodejs-optic-generate-views.js b/test-complete/nodejs-optic-generate-views.js index fd1a3637..b597689b 100644 --- a/test-complete/nodejs-optic-generate-views.js +++ b/test-complete/nodejs-optic-generate-views.js @@ -27,8 +27,8 @@ const db = marklogic.createDatabaseClient( // Client to query schema database to verify view is stored // Make sure you have qbvuser user created. See XQuery script nodejs-optic-setup.xml of internal repo (SVN). -var dbModClient = marklogic.createDatabaseClient({ - database: dbName + 'Modules', +var dbSchemasClient = marklogic.createDatabaseClient({ + database: 'Schemas', host: connectdef.host, port: connectdef.port, user: 'qbvuser', @@ -76,14 +76,14 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'InnerJoin', 'keymatch') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbModClient.documents.write({ + dbSchemasClient.documents.write({ uri: '/qbv-InnerJoin-keymatch.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', content: res }). result(function (response) { - setTimeout(()=> done(), 10120); + setTimeout(()=> done(), 10120); }); }).catch(error=>done(error)); }); @@ -96,9 +96,9 @@ describe('Nodejs Optic generate views test', function () { .then(function (output) { //console.log(JSON.stringify(output, null, 2)); expect(output.rows.length).to.equal(6); - var row0 = output.rows[0]; - var row3 = output.rows[3]; - var row5 = output.rows[5]; + var row0 = output.rows[0]; + var row3 = output.rows[3]; + var row5 = output.rows[5]; expect(row0['InnerJoin.keymatch.amount'].value).to.equal(60.06); expect(row0['InnerJoin.keymatch.color'].value).to.equal('green'); @@ -130,7 +130,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'sparql', 'groupmin') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbModClient.documents.write({ + dbSchemasClient.documents.write({ uri: '/qbv-sparql-groupmin.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', @@ -187,7 +187,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'lexicons', 'orderbyselect') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbModClient.documents.write({ + dbSchemasClient.documents.write({ uri: '/qbv-lexicons-orderby-select.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', From c6c2d9e11eae560b43d92fa15445026dee86fcc5 Mon Sep 17 00:00:00 2001 From: Phil Barber Date: Tue, 21 Oct 2025 10:35:51 -0400 Subject: [PATCH 41/58] revert test-complete-app Moved the working version of the mlDeploy stuff to test-complete-app-mlDeploy --- .copyrightconfig | 2 +- test-complete-app-mlDeploy/build.gradle | 49 ++++ test-complete-app-mlDeploy/gradle.properties | 8 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + test-complete-app-mlDeploy/gradlew | 249 ++++++++++++++++++ test-complete-app-mlDeploy/gradlew.bat | 92 +++++++ .../dmsdk-api-rest-server-modules.json | 0 .../databases/dmsdk-api-rest-server.json | 0 .../node-client-api-rest-server-modules.json | 0 .../node-client-api-rest-server.json | 0 .../databases/nodeOpticFunctionalTest.json | 0 .../nodeOpticFunctionalTestModules.json | 0 .../certificate-templates/template-1.xml | 17 ++ .../main/ml-config/security/roles/eval.json | 0 .../security/roles/qbvuser-role.json | 0 .../security/roles/rest-evaluator.json | 0 .../ml-config/security/roles/tde-User.json | 0 .../ml-config/security/users/qbvuser.json | 0 .../ml-config/security/users/rest-admin.json | 0 .../security/users/rest-evaluator.json | 0 .../security/users/rest-reader-optic.json | 0 .../ml-config/security/users/rest-reader.json | 0 .../ml-config/security/users/rest-writer.json | 0 .../ml-config/security/users/tde-user.json | 0 .../servers/dmsdk-api-rest-server.json | 0 .../servers/node-client-api-rest-server.json | 0 .../servers/nodeOpticFunctionalTest.json | 0 .../ml-config/servers/rest-api-server.json | 14 + .../ml-data/optic/lexicon/test/city1.json | 0 .../ml-data/optic/lexicon/test/city2.json | 0 .../ml-data/optic/lexicon/test/city3.json | 0 .../ml-data/optic/lexicon/test/city4.json | 0 .../ml-data/optic/lexicon/test/city5.json | 0 .../optic/lexicon/test/collections.properties | 0 .../main/ml-data/optic/lexicon/test/doc1.json | 0 .../main/ml-data/optic/lexicon/test/doc2.json | 0 .../main/ml-data/optic/lexicon/test/doc3.json | 0 .../main/ml-data/optic/lexicon/test/doc4.xml | 0 .../main/ml-data/optic/lexicon/test/doc5.xml | 0 .../optic/plan/test/collections.properties | 0 .../ml-data/optic/plan/test/planLexicons.json | 0 .../ml-data/optic/plan/test/planTriples.json | 0 .../ml-data/optic/plan/test/planViews.json | 0 .../optic/sparql/test/collections.properties | 0 .../ml-data/optic/sparql/test/dedupdoc1.xml | 0 .../optic/triple/test/collections.properties | 0 .../triple/test/duplicatePlayerTripleSet.xml | 0 .../triple/test/duplicateTeamTripleSet.xml | 0 .../triple/test/otherPlayerTripleSet.xml | 0 .../optic/triple/test/playerTripleSet.xml | 0 .../optic/triple/test/teamTripleSet.xml | 0 .../optic/view/test/collections.properties | 0 .../ml-data/optic/view/test/masterDetail.xml | 0 .../optic/view/test/masterDetail2.json | 0 .../optic/view/test/masterDetail3.json | 0 .../optic/view/test/masterDetail4.json | 0 .../optic/view/test/masterDetail5.json | 0 .../root/optic/test/mapperReducer.sjs | 0 .../main/ml-schemas/permissions.properties | 0 .../main/ml-schemas/tde/exportingRows.tdex | 0 .../src/main/ml-schemas/tde/masterDetail.tdex | 0 .../main/ml-schemas/tde/masterDetail2.tdej | 0 .../main/ml-schemas/tde/masterDetail3.tdej | 0 .../main/ml-schemas/tde/masterDetail4.tdej | 0 .../main/turtle/companies/companies_100.ttl | 0 .../src/main/turtle/people/people.ttl | 0 test-complete-app/build.gradle | 29 -- test-complete-app/gradle.properties | 3 - test-complete/nodejs-optic-generate-views.js | 18 +- 70 files changed, 446 insertions(+), 42 deletions(-) create mode 100644 test-complete-app-mlDeploy/build.gradle create mode 100644 test-complete-app-mlDeploy/gradle.properties create mode 100644 test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar create mode 100644 test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties create mode 100755 test-complete-app-mlDeploy/gradlew create mode 100644 test-complete-app-mlDeploy/gradlew.bat rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/databases/dmsdk-api-rest-server.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/databases/node-client-api-rest-server-modules.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/databases/node-client-api-rest-server.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/databases/nodeOpticFunctionalTest.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json (100%) create mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/roles/eval.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/roles/qbvuser-role.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/roles/rest-evaluator.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/roles/tde-User.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/qbvuser.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/rest-admin.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/rest-evaluator.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/rest-reader-optic.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/rest-reader.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/rest-writer.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/tde-user.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/servers/dmsdk-api-rest-server.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/servers/node-client-api-rest-server.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-config/servers/nodeOpticFunctionalTest.json (100%) create mode 100644 test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/city1.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/city2.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/city3.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/city4.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/city5.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/collections.properties (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/doc1.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/doc2.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/doc3.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/doc4.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/lexicon/test/doc5.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/plan/test/collections.properties (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/plan/test/planLexicons.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/plan/test/planTriples.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/plan/test/planViews.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/sparql/test/collections.properties (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/sparql/test/dedupdoc1.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/triple/test/collections.properties (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/triple/test/playerTripleSet.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/triple/test/teamTripleSet.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/view/test/collections.properties (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/view/test/masterDetail.xml (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/view/test/masterDetail2.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/view/test/masterDetail3.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/view/test/masterDetail4.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-data/optic/view/test/masterDetail5.json (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-modules/root/optic/test/mapperReducer.sjs (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-schemas/permissions.properties (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-schemas/tde/exportingRows.tdex (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-schemas/tde/masterDetail.tdex (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-schemas/tde/masterDetail2.tdej (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-schemas/tde/masterDetail3.tdej (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/ml-schemas/tde/masterDetail4.tdej (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/turtle/companies/companies_100.ttl (100%) rename {test-complete-app => test-complete-app-mlDeploy}/src/main/turtle/people/people.ttl (100%) diff --git a/.copyrightconfig b/.copyrightconfig index 304bdade..ccc3da50 100644 --- a/.copyrightconfig +++ b/.copyrightconfig @@ -11,4 +11,4 @@ startyear: 2015 # - Dotfiles already skipped automatically # Enable by removing the leading '# ' from the next line and editing values. # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app/* +filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app/*, test-complete-app-mlDeploy/* diff --git a/test-complete-app-mlDeploy/build.gradle b/test-complete-app-mlDeploy/build.gradle new file mode 100644 index 00000000..d18b836d --- /dev/null +++ b/test-complete-app-mlDeploy/build.gradle @@ -0,0 +1,49 @@ +/** + * This Gradle file is used to add a certificate template to the app that is created via the bespoke + * deployer in test-setup-qa.js and test-setup-dmsdk-qa.js. + */ +plugins { + id "net.saliman.properties" version "1.5.1" + id "com.marklogic.ml-gradle" version "6.1.0" +} + +/* + * Since our REST API server uses a certificate template, we need to execute an extra command to generate a temporary + * certificate for this template - without that, the REST API server won't be able to receive HTTP or HTTPS requests. + */ +ext { + def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand() + command.setTemplateIdOrName("ssl-project-template") + command.setCommonName("localhost") + command.setValidFor(365) + mlAppDeployer.commands.add(command) +} + +tasks.register("curlPeople", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/people/people.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/people' + ] +} + +tasks.register("curlCompanies", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/companies/companies_100.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl' + ] +} + +mlDeploy.finalizedBy curlPeople +mlDeploy.finalizedBy curlCompanies \ No newline at end of file diff --git a/test-complete-app-mlDeploy/gradle.properties b/test-complete-app-mlDeploy/gradle.properties new file mode 100644 index 00000000..d7a78f54 --- /dev/null +++ b/test-complete-app-mlDeploy/gradle.properties @@ -0,0 +1,8 @@ +mlHost=localhost +mlUsername=admin +mlPassword=admin + +mlNoRestServer=true +mlModulesDatabaseName=nodeOpticFunctionalTestModules +mlSchemasDatabaseName=Schemas +mlRestPort=8079 \ No newline at end of file diff --git a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..d4081da4 --- /dev/null +++ b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/test-complete-app-mlDeploy/gradlew b/test-complete-app-mlDeploy/gradlew new file mode 100755 index 00000000..1aa94a42 --- /dev/null +++ b/test-complete-app-mlDeploy/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/test-complete-app-mlDeploy/gradlew.bat b/test-complete-app-mlDeploy/gradlew.bat new file mode 100644 index 00000000..6689b85b --- /dev/null +++ b/test-complete-app-mlDeploy/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json diff --git a/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json diff --git a/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json diff --git a/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml b/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml new file mode 100644 index 00000000..d745328d --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml @@ -0,0 +1,17 @@ + + ssl-project-template + This template is used to demonstrate how ml-gradle can enable SSL for an app server + rsa + + + 0 + + US + VA + McLean + MarkLogic + Sales + nobody@marklogic.com + + + \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/roles/eval.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/eval.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json diff --git a/test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json diff --git a/test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json diff --git a/test-complete-app/src/main/ml-config/security/roles/tde-User.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/tde-User.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json diff --git a/test-complete-app/src/main/ml-config/security/users/qbvuser.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/qbvuser.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-admin.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-admin.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-evaluator.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-reader.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-reader.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-writer.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json diff --git a/test-complete-app/src/main/ml-config/security/users/tde-user.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/tde-user.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json diff --git a/test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json rename to test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json new file mode 100644 index 00000000..47819895 --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json @@ -0,0 +1,14 @@ +{ + "server-name": "node-client-api-ssl-server", + "port": 8016, + "server-type": "http", + "root": "/", + "content-database": "node-client-api-rest-server", + "modules-database": "node-client-api-rest-server-modules", + "default-error-format": "json", + "error-handler": "/MarkLogic/rest-api/error-handler.xqy", + "url-rewriter": "/MarkLogic/rest-api/rewriter.xml", + "rewrite-resolves-globally": true, + "authentication": "digestbasic", + "ssl-certificate-template": "ssl-project-template" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planViews.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/planViews.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json diff --git a/test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/view/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json diff --git a/test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs b/test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs similarity index 100% rename from test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs rename to test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs diff --git a/test-complete-app/src/main/ml-schemas/permissions.properties b/test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties similarity index 100% rename from test-complete-app/src/main/ml-schemas/permissions.properties rename to test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties diff --git a/test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej diff --git a/test-complete-app/src/main/turtle/companies/companies_100.ttl b/test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl similarity index 100% rename from test-complete-app/src/main/turtle/companies/companies_100.ttl rename to test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl diff --git a/test-complete-app/src/main/turtle/people/people.ttl b/test-complete-app-mlDeploy/src/main/turtle/people/people.ttl similarity index 100% rename from test-complete-app/src/main/turtle/people/people.ttl rename to test-complete-app-mlDeploy/src/main/turtle/people/people.ttl diff --git a/test-complete-app/build.gradle b/test-complete-app/build.gradle index 02823118..9b3e099a 100644 --- a/test-complete-app/build.gradle +++ b/test-complete-app/build.gradle @@ -18,32 +18,3 @@ ext { command.setValidFor(365) mlAppDeployer.commands.add(command) } - -tasks.register("curlPeople", Exec) { - commandLine = [ - 'curl', - '--fail', - '--anyauth', '--user', 'admin:admin', - '-i', - '-X', 'POST', - '--data-binary', '@./src/main/turtle/people/people.ttl', - '-H', 'Content-type: text/turtle', - 'http://localhost:8079/v1/graphs?graph=/people' - ] -} - -tasks.register("curlCompanies", Exec) { - commandLine = [ - 'curl', - '--fail', - '--anyauth', '--user', 'admin:admin', - '-i', - '-X', 'POST', - '--data-binary', '@./src/main/turtle/companies/companies_100.ttl', - '-H', 'Content-type: text/turtle', - 'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl' - ] -} - -mlDeploy.finalizedBy curlPeople -mlDeploy.finalizedBy curlCompanies \ No newline at end of file diff --git a/test-complete-app/gradle.properties b/test-complete-app/gradle.properties index d7a78f54..3d61cb0a 100644 --- a/test-complete-app/gradle.properties +++ b/test-complete-app/gradle.properties @@ -3,6 +3,3 @@ mlUsername=admin mlPassword=admin mlNoRestServer=true -mlModulesDatabaseName=nodeOpticFunctionalTestModules -mlSchemasDatabaseName=Schemas -mlRestPort=8079 \ No newline at end of file diff --git a/test-complete/nodejs-optic-generate-views.js b/test-complete/nodejs-optic-generate-views.js index b597689b..fd1a3637 100644 --- a/test-complete/nodejs-optic-generate-views.js +++ b/test-complete/nodejs-optic-generate-views.js @@ -27,8 +27,8 @@ const db = marklogic.createDatabaseClient( // Client to query schema database to verify view is stored // Make sure you have qbvuser user created. See XQuery script nodejs-optic-setup.xml of internal repo (SVN). -var dbSchemasClient = marklogic.createDatabaseClient({ - database: 'Schemas', +var dbModClient = marklogic.createDatabaseClient({ + database: dbName + 'Modules', host: connectdef.host, port: connectdef.port, user: 'qbvuser', @@ -76,14 +76,14 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'InnerJoin', 'keymatch') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbSchemasClient.documents.write({ + dbModClient.documents.write({ uri: '/qbv-InnerJoin-keymatch.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', content: res }). result(function (response) { - setTimeout(()=> done(), 10120); + setTimeout(()=> done(), 10120); }); }).catch(error=>done(error)); }); @@ -96,9 +96,9 @@ describe('Nodejs Optic generate views test', function () { .then(function (output) { //console.log(JSON.stringify(output, null, 2)); expect(output.rows.length).to.equal(6); - var row0 = output.rows[0]; - var row3 = output.rows[3]; - var row5 = output.rows[5]; + var row0 = output.rows[0]; + var row3 = output.rows[3]; + var row5 = output.rows[5]; expect(row0['InnerJoin.keymatch.amount'].value).to.equal(60.06); expect(row0['InnerJoin.keymatch.color'].value).to.equal('green'); @@ -130,7 +130,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'sparql', 'groupmin') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbSchemasClient.documents.write({ + dbModClient.documents.write({ uri: '/qbv-sparql-groupmin.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', @@ -187,7 +187,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'lexicons', 'orderbyselect') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbSchemasClient.documents.write({ + dbModClient.documents.write({ uri: '/qbv-lexicons-orderby-select.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', From db72abe20b88bb0b61df47a202672feb57084a1d Mon Sep 17 00:00:00 2001 From: Phil Barber Date: Tue, 21 Oct 2025 10:03:59 -0400 Subject: [PATCH 42/58] MLE-24733 - Setup temporal and LSQT My most recent run only had a single failing test. --- .gitignore | 4 ++- .../node-client-api-rest-server.json | 36 +++++++++++++++++++ .../temporal/axes/temporal-system-axis.json | 17 +++++++++ .../temporal/axes/temporal-valid-axis.json | 17 +++++++++ .../collections/temporal-collection.json | 6 ++++ .../collections/temporalCollectionLsqt.json | 6 ++++ .../databases/nodeOpticFunctionalTest.json | 2 ++ .../security/roles/rest-temporal-writer.json | 24 +++++++++++++ .../security/users/rest-temporal-writer.json | 0 9 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json create mode 100644 test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json create mode 100644 test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json create mode 100644 test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json create mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json rename {test-app => test-complete-app-mlDeploy}/src/main/ml-config/security/users/rest-temporal-writer.json (100%) diff --git a/.gitignore b/.gitignore index 3fddd55d..2a4f3463 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,6 @@ test-app/gradle-local.properties test-app/docker test-app/containerLogs test-complete-app/build -test-complete-app/.gradle \ No newline at end of file +test-complete-app/.gradle +test-complete-app-mlDeploy/build +test-complete-app-mlDeploy/.gradle \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json index 09c64be4..20cae4aa 100644 --- a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json +++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json @@ -1,7 +1,15 @@ { "database-name": "node-client-api-rest-server", "schema-database": "Schemas", + "stemmed-searches": "basic", "range-element-index": [ + { + "scalar-type": "double", + "namespace-uri": "", + "localname": "amt", + "range-value-positions": false, + "invalid-values": "ignore" + }, { "scalar-type": "double", "namespace-uri": "", @@ -29,6 +37,34 @@ "localname": "datetime", "range-value-positions": false, "invalid-values": "ignore" + }, + { + "scalar-type": "dateTime", + "namespace-uri": "", + "localname": "systemStartTime", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "dateTime", + "namespace-uri": "", + "localname": "systemEndTime", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "dateTime", + "namespace-uri": "", + "localname": "validStartTime", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "dateTime", + "namespace-uri": "", + "localname": "validEndTime", + "range-value-positions": false, + "invalid-values": "ignore" } ], "range-path-index": [ diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json new file mode 100644 index 00000000..37905abc --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json @@ -0,0 +1,17 @@ +{ + "axis-name": "systemTime", + "axis-start": { + "element-reference": { + "namespace-uri": "", + "localname": "systemStartTime", + "scalar-type": "dateTime" + } + }, + "axis-end": { + "element-reference": { + "namespace-uri": "", + "localname": "systemEndTime", + "scalar-type": "dateTime" + } + } +} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json new file mode 100644 index 00000000..46313d9c --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json @@ -0,0 +1,17 @@ +{ + "axis-name": "validTime", + "axis-start": { + "element-reference": { + "namespace-uri": "", + "localname": "validStartTime", + "scalar-type": "dateTime" + } + }, + "axis-end": { + "element-reference": { + "namespace-uri": "", + "localname": "validEndTime", + "scalar-type": "dateTime" + } + } +} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json new file mode 100644 index 00000000..7530249c --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json @@ -0,0 +1,6 @@ +{ + "collection-name": "temporalCollection", + "system-axis": "systemTime", + "valid-axis": "validTime", + "option": [ "updates-safe" ] +} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json new file mode 100644 index 00000000..e4a82793 --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json @@ -0,0 +1,6 @@ +{ + "collection-name": "temporalCollectionLsqt", + "system-axis": "systemTime", + "valid-axis": "validTime", + "option": [ "updates-safe" ] +} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json index b7b695cf..3276e78b 100644 --- a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json +++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json @@ -4,7 +4,9 @@ "fast-element-trailing-wildcard-searches": true, "two-character-searches": true, "one-character-searches": true, + "triple-index": true, "uri-lexicon": true, + "collection-lexicon": true, "range-element-index": [ { "scalar-type": "string", diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json new file mode 100644 index 00000000..a78e7c6d --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json @@ -0,0 +1,24 @@ +{ + "role-name": "rest-temporal-writer", + "description": "REST writer with temporal privileges", + "role": [ + "rest-writer" + ], + "privilege": [ + { + "privilege-name": "temporal-statement-set-system-time", + "action": "http://marklogic.com/xdmp/privileges/temporal-statement-set-system-time", + "kind": "execute" + }, + { + "privilege-name": "temporal-document-protect", + "action": "http://marklogic.com/xdmp/privileges/temporal-document-protect", + "kind": "execute" + }, + { + "privilege-name": "temporal-document-wipe", + "action": "http://marklogic.com/xdmp/privileges/temporal-document-wipe", + "kind": "execute" + } + ] +} \ No newline at end of file diff --git a/test-app/src/main/ml-config/security/users/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json similarity index 100% rename from test-app/src/main/ml-config/security/users/rest-temporal-writer.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json From b0aadbc2abf280942703a56e049a1ae7fe08d295 Mon Sep 17 00:00:00 2001 From: Phil Barber Date: Wed, 22 Oct 2025 10:26:17 -0400 Subject: [PATCH 43/58] MLE-24733 - Missed this file. --- .../ml-config/security/users/rest-temporal-writer.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 test-app/src/main/ml-config/security/users/rest-temporal-writer.json diff --git a/test-app/src/main/ml-config/security/users/rest-temporal-writer.json b/test-app/src/main/ml-config/security/users/rest-temporal-writer.json new file mode 100644 index 00000000..aa163780 --- /dev/null +++ b/test-app/src/main/ml-config/security/users/rest-temporal-writer.json @@ -0,0 +1,8 @@ +{ + "user-name": "rest-temporal-writer", + "description": "rest-writer user with temporal privileges", + "password": "x", + "role": [ + "rest-temporal-writer" + ] +} \ No newline at end of file From 72bdd4b745a16fef81a683ff40c950145bdcfa12 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Fri, 17 Oct 2025 10:53:30 -0400 Subject: [PATCH 44/58] MLE-24230 Updating all devDependencies And not using the caret so we know exactly which version we're using. Also documented each override and alphabetized them. And removed the following overrides which Copilot verified were not in the dependency graph: - is-arrayish - nanoid - simple-get - serialize-javascript --- CONTRIBUTING.md | 118 ++++- Jenkinsfile | 2 +- package-lock.json | 1122 +++++++++++++++++---------------------------- package.json | 52 +-- 4 files changed, 570 insertions(+), 724 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d41b007e..c646e055 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,8 +57,120 @@ or 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. -## Notes on dependencies in package.json - -We are using @fastify/busboy because it has a forked copy of dicer that apparently does not +## Explanation of overrides in package.json + +Each override is being documented here so we have some ability in the future to remove an override as needed. +These explanations have been copied from a Copilot analysis. + +braces: "3.0.3" +- Purpose: Fixes ReDoS vulnerability in brace expansion +- Affects: mocha, gulp, and test infrastructure +- Why needed: Older braces versions vulnerable to regex attacks +- CVE/Issue: CVE-2024-4068 - ReDoS vulnerability + +brace-expansion: "2.0.2" +- Purpose: Fixes ReDoS in brace expansion patterns +- Affects: minimatch → brace-expansion +- Why needed: Prevents regex denial of service attacks +- CVE/Issue: Related to minimatch vulnerabilities + +glob: "10.3.11" +- Purpose: Fixes ReDoS and security issues in file globbing +- Affects: mocha, gulp-mocha build tooling +- Why needed: Older glob versions have pattern matching vulnerabilities +- CVE/Issue: Multiple vulnerabilities in older glob versions + +glob-parent: "6.0.2" +- Purpose: Fixes ReDoS in path parsing +- Affects: Transitive dependency through glob +- Why needed: Older versions vulnerable to regex attacks +- CVE/Issue: CVE-2020-28469 - ReDoS vulnerability + +jsdoc: "4.0.0" +- Purpose: Fixes high-severity data access vulnerability in older jsdoc versions +- Affects: gulp-jsdoc3 → jsdoc +- Why needed: gulp-jsdoc3@3.0.0 uses older jsdoc with known vulnerabilities +- CVE/Issue: High severity vulnerability in taffydb (jsdoc dependency) + +markdown-it: "14.1.0" +- Purpose: Use latest markdown parser for JSDoc +- Affects: gulp-jsdoc3 → jsdoc → markdown-it +- Why needed: Latest version (no vulnerabilities), handles RFC 7464 parsing +- Note: No newer version available, ensures consistency + +minimatch: "5.1.0" +- Purpose: Fixes ReDoS (Regular Expression Denial of Service) vulnerability +- Affects: mocha, gulp-mocha, and other build tools +- Why needed: Older minimatch versions have catastrophic backtracking vulnerability +- CVE/Issue: CVE-2022-3517 - ReDoS vulnerability + +sanitize-html: "2.17.0" +- Purpose: Ensure JSDoc template uses non-vulnerable HTML sanitizer +- Affects: gulp-jsdoc3 → ink-docstrap → sanitize-html +- Why needed: Older versions have XSS vulnerabilities +- Note: Also in devDependencies, override ensures transitive deps use safe version + +semver: "7.5.3" +- Purpose: Fixes ReDoS in version parsing +- Affects: Multiple packages across dependency tree +- Why needed: Older semver versions have regex vulnerabilities +- CVE/Issue: CVE-2022-25883 - ReDoS vulnerability + +tar-fs: "2.1.4" +- Purpose: Fixes directory traversal vulnerability +- Affects: kerberos → prebuild-install → tar-fs +- Why needed: Older tar-fs allows extracting files outside intended directory +- CVE/Issue: CVE-2024-28861 - Path traversal + +tmp: "0.2.4" +- Purpose: Fixes arbitrary file write vulnerability +- Affects: gulp-jsdoc3 → jsdoc → tmp +- Why needed: Older tmp versions have file system security issues +- CVE/Issue: CVE-2024-28858 - Arbitrary file write + +The following are related to this npm supply chain attack - https://orca.security/resources/blog/qix-npm-attack/ . + +ansi-styles: "4.3.0" +- Purpose: Protect against supply chain attack variants +- Affects: chalk → ansi-styles, eslint toolchain + +ansi-regex: "5.0.1" +- Purpose: Protect against supply chain attack variants +- Affects: strip-ansi → ansi-regex + +chalk: "4.1.2" +- Purpose: Avoid compromised chalk 5.6.1, maintain ESLint compatibility +- Affects: eslint, mocha, gulp-mocha +- Why needed: Chalk 5.6.1 was compromised in supply chain attack. ESLint 9.x requires chalk 4.x (incompatible with chalk 5.x API) + +color-convert: "3.1.0" +- Purpose: Protect against supply chain attack variants +- Affects: ansi-styles → color-convert + +color-name: "2.0.0" +- Purpose: Protect against supply chain attack variants +- Affects: color-convert → color-name + +cross-spawn: "7.0.6" +- Purpose: Protect against supply chain attack variants +- Affects: eslint → cross-spawn + +debug: "4.3.6" +- Purpose: Protect against supply chain attack variants +- Affects: eslint, mocha, multiple packages + +supports-color: "7.2.0" +- Purpose: Protect against supply chain attack variants +- Affects: mocha, chalk + +strip-ansi: "6.0.0" +- Purpose: Protect against supply chain attack variants +- Affects: mocha, cliui in test infrastructure + +wrap-ansi: "6.2.0" +- Purpose: Protect against supply chain attack variants +- Affects: mocha → cliui → wrap-ansi + +Also, 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. diff --git a/Jenkinsfile b/Jenkinsfile index 61d257d0..a22e542e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ def runAuditReport() { cd node-client-api npm ci rm -rf $WORKSPACE/npm-audit-report.json || true - npm audit -json || true > $WORKSPACE/npm-audit-report.json + npm audit --audit-level=low --json > $WORKSPACE/npm-audit-report.json ''' } diff --git a/package-lock.json b/package-lock.json index d46eee0f..185cd0f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,25 +20,25 @@ "through2": "4.0.2" }, "devDependencies": { - "@jsdoc/salty": "0.2.3", - "ajv": "^8.11.0", - "ast-types": "^0.14.2", - "astring": "^1.8.3", - "bunyan": "^1.8.15", - "chai": "^4.4.1", - "core-util-is": "^1.0.3", - "eslint": "^9.37.0", - "gulp": "^5.0.0", - "gulp-eslint-new": "^2.3.0", - "gulp-jsdoc3": "^3.0.0", - "gulp-mocha": "^8.0.0", - "intercept-stdout": "^0.1.2", - "mocha": "^11.7.3", - "mocha-junit-reporter": "2.2.0", - "moment": "^2.29.4", - "sanitize-html": "^2.13.0", - "should": "^13.2.3", - "stream-to-array": "^2.3.0" + "@jsdoc/salty": "0.2.9", + "ajv": "8.17.1", + "ast-types": "0.14.2", + "astring": "1.9.0", + "bunyan": "1.8.15", + "chai": "6.2.0", + "core-util-is": "1.0.3", + "eslint": "9.38.0", + "gulp": "5.0.1", + "gulp-eslint-new": "2.5.0", + "gulp-jsdoc3": "3.0.0", + "gulp-mocha": "10.0.1", + "intercept-stdout": "0.1.2", + "mocha": "11.7.4", + "mocha-junit-reporter": "2.2.1", + "moment": "2.30.1", + "sanitize-html": "2.17.0", + "should": "13.2.3", + "stream-to-array": "2.3.0" }, "engines": { "node": ">=22.0.0" @@ -117,6 +117,19 @@ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@eslint-community/regexpp": { "version": "4.12.1", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", @@ -128,13 +141,13 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", - "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", + "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.6", + "@eslint/object-schema": "^2.1.7", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -143,9 +156,9 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.0.tgz", - "integrity": "sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz", + "integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -217,9 +230,9 @@ "license": "MIT" }, "node_modules/@eslint/js": { - "version": "9.37.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.37.0.tgz", - "integrity": "sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==", + "version": "9.38.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz", + "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==", "dev": true, "license": "MIT", "engines": { @@ -230,9 +243,9 @@ } }, "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -378,9 +391,9 @@ } }, "node_modules/@jsdoc/salty": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz", - "integrity": "sha512-bbtCxCkxcnWhi50I+4Lj6mdz9w3pOXOgEQrID8TCZ/DF51fW7M9GCQW2y45SpBDdHd1Eirm1X/Cf6CkAAe8HPg==", + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.9.tgz", + "integrity": "sha512-yYxMVH7Dqw6nO0d5NIV8OQWnitU8k6vXH8NtgqAfIa/IUqRMxRv/NUJJ08VEKbAakwxlgBl5PJdrU0dMPStsnw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -417,6 +430,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/expect": { + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz", + "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -450,22 +470,25 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.8.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.0.tgz", - "integrity": "sha512-5x08bUtU8hfboMTrJ7mEO4CpepS9yBwAqcL52y86SWNmbPX8LVbNs3EP4cNrIZgdjk2NAlP2ahNihozpoZIxSg==", + "version": "24.8.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz", + "integrity": "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==", "dev": true, "license": "MIT", - "optional": true, "dependencies": { "undici-types": "~7.14.0" } }, - "node_modules/@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "node_modules/@types/vinyl": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz", + "integrity": "sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==", "dev": true, - "license": "ISC" + "license": "MIT", + "dependencies": { + "@types/expect": "^1.20.4", + "@types/node": "*" + } }, "node_modules/acorn": { "version": "8.15.0", @@ -614,26 +637,6 @@ "node": ">=0.10.0" } }, - "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ast-types": { "version": "0.14.2", "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz", @@ -964,22 +967,13 @@ } }, "node_modules/chai": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", - "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.0.tgz", + "integrity": "sha512-aUTnJc/JipRzJrNADXVvpVqi6CO0dn3nx4EVPxijri+fj3LUUDyZQOgVeW54Ob3Y1Xh9Iz8f+CgaCl8v0mn9bA==", "dev": true, "license": "MIT", - "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.1.0" - }, "engines": { - "node": ">=4" + "node": ">=18" } }, "node_modules/chalk": { @@ -1009,19 +1003,6 @@ "node": "*" } }, - "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", - "dev": true, - "license": "MIT", - "dependencies": { - "get-func-name": "^2.0.2" - }, - "engines": { - "node": "*" - } - }, "node_modules/chokidar": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", @@ -1190,13 +1171,16 @@ } }, "node_modules/dargs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", - "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz", + "integrity": "sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/debug": { @@ -1246,19 +1230,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/deep-eql": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", - "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -1325,6 +1296,65 @@ "node": ">=0.3.1" } }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, "node_modules/dtrace-provider": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz", @@ -1387,6 +1417,19 @@ "dev": true, "license": "MIT" }, + "node_modules/easy-transform-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/easy-transform-stream/-/easy-transform-stream-1.0.1.tgz", + "integrity": "sha512-ktkaa6XR7COAR3oj02CF3IOgz2m1hCaY3SfzvKT4Svt2MhHw9XCt+ncJNWfe2TGz31iqzNGZ8spdKQflj+Rlog==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1403,6 +1446,19 @@ "once": "^1.4.0" } }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", @@ -1472,25 +1528,24 @@ } }, "node_modules/eslint": { - "version": "9.37.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.37.0.tgz", - "integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==", + "version": "9.38.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz", + "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.21.0", - "@eslint/config-helpers": "^0.4.0", + "@eslint/config-array": "^0.21.1", + "@eslint/config-helpers": "^0.4.1", "@eslint/core": "^0.16.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.37.0", + "@eslint/js": "9.38.0", "@eslint/plugin-kit": "^0.4.0", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", @@ -1550,13 +1605,13 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, "license": "Apache-2.0", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -1579,19 +1634,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", - "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/eslint/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1617,19 +1659,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", - "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/esquery": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", @@ -1687,24 +1716,24 @@ } }, "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", + "is-stream": "^3.0.0", "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^4.1.0", + "strip-final-newline": "^3.0.0" }, "engines": { - "node": ">=10" + "node": ">=16.17" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" @@ -1741,19 +1770,16 @@ "license": "MIT" }, "node_modules/fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz", + "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==", "dev": true, "license": "MIT", "dependencies": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" + "color-support": "^1.1.3" }, "engines": { - "node": ">= 0.10" + "node": ">=10.13.0" } }, "node_modules/fast-deep-equal": { @@ -1978,19 +2004,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/fork-stream": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz", @@ -2069,16 +2082,6 @@ "node": "6.* || 8.* || >= 10.*" } }, - "node_modules/get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -2117,13 +2120,13 @@ } }, "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, "license": "MIT", "engines": { - "node": ">=10" + "node": ">=16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2296,16 +2299,6 @@ "dev": true, "license": "ISC" }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4.x" - } - }, "node_modules/gulp": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz", @@ -2373,45 +2366,6 @@ "@types/node": ">=12" } }, - "node_modules/gulp-eslint-new/node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-wrap": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-eslint-new/node_modules/fancy-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz", - "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-support": "^1.1.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/gulp-eslint-new/node_modules/plugin-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz", - "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-colors": "^1.0.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/gulp-jsdoc3": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/gulp-jsdoc3/-/gulp-jsdoc3-3.0.0.tgz", @@ -2429,22 +2383,37 @@ "tmp": "0.1.0" } }, - "node_modules/gulp-mocha": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/gulp-mocha/-/gulp-mocha-8.0.0.tgz", - "integrity": "sha512-FdbBydfzszaES/gXfwD6RFq1yJTj4Z6328R1yqsmhf+t7hW2aj9ZD9Hz8boQShjZ9J8/w6tQBM5mePb8K2pbqA==", - "dev": true, + "node_modules/gulp-jsdoc3/node_modules/fancy-log": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", + "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", + "dev": true, "license": "MIT", "dependencies": { - "dargs": "^7.0.0", - "execa": "^5.0.0", - "mocha": "^8.3.0", - "plugin-error": "^1.0.1", - "supports-color": "^8.1.1", - "through2": "^4.0.2" + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "parse-node-version": "^1.0.0", + "time-stamp": "^1.0.0" }, "engines": { - "node": ">=10" + "node": ">= 0.10" + } + }, + "node_modules/gulp-mocha": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/gulp-mocha/-/gulp-mocha-10.0.1.tgz", + "integrity": "sha512-BGo+sDMXHxNfgxYqc7Vq0W4Na8J1nBwjR91BwrhIHVm0mR6UklWIvNOk8Ql086XBVGbhIQ8u+b1XlSzZoBtLXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "dargs": "^8.1.0", + "execa": "^8.0.1", + "gulp-plugin-extras": "^0.3.0", + "mocha": "^10.2.0", + "supports-color": "^9.4.0" + }, + "engines": { + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2458,151 +2427,50 @@ } } }, - "node_modules/gulp-mocha/node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/gulp-mocha/node_modules/arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-mocha/node_modules/arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-mocha/node_modules/chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "dev": true, - "license": "MIT", - "dependencies": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.1" - } - }, "node_modules/gulp-mocha/node_modules/diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } }, - "node_modules/gulp-mocha/node_modules/extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-mocha/node_modules/js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/gulp-mocha/node_modules/log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "node_modules/gulp-mocha/node_modules/mocha": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", "dev": true, "license": "MIT", "dependencies": { - "chalk": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gulp-mocha/node_modules/mocha": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", - "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.1", - "debug": "4.3.1", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.1.6", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "4.0.0", - "log-symbols": "4.0.0", - "minimatch": "3.0.4", - "ms": "2.1.3", - "nanoid": "3.1.20", - "serialize-javascript": "5.0.1", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.1.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" }, "bin": { "_mocha": "bin/_mocha", - "mocha": "bin/mocha" + "mocha": "bin/mocha.js" }, "engines": { - "node": ">= 10.12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" + "node": ">= 14.0.0" } }, "node_modules/gulp-mocha/node_modules/ms": { @@ -2612,63 +2480,39 @@ "dev": true, "license": "MIT" }, - "node_modules/gulp-mocha/node_modules/plugin-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", - "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "node_modules/gulp-mocha/node_modules/workerpool": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", "dev": true, - "license": "MIT", - "dependencies": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" - }, - "engines": { - "node": ">= 0.10" - } + "license": "Apache-2.0" }, - "node_modules/gulp-mocha/node_modules/plugin-error/node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", + "node_modules/gulp-mocha/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, - "license": "MIT", - "dependencies": { - "ansi-wrap": "^0.1.0" - }, + "license": "ISC", "engines": { - "node": ">=0.10.0" + "node": ">=10" } }, - "node_modules/gulp-mocha/node_modules/readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "node_modules/gulp-plugin-extras": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/gulp-plugin-extras/-/gulp-plugin-extras-0.3.0.tgz", + "integrity": "sha512-I/kOBSpo61QsGQZcqozZYEnDseKvpudUafVVWDLYgBFAUJ37kW5R8Sjw9cMYzpGyPUfEYOeoY4p+dkfLqgyJUQ==", "dev": true, "license": "MIT", "dependencies": { - "picomatch": "^2.2.1" + "@types/vinyl": "^2.0.9", + "chalk": "^5.3.0", + "easy-transform-stream": "^1.0.1" }, "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/gulp-mocha/node_modules/workerpool": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", - "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/gulp-mocha/node_modules/yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/gulplog": { @@ -2756,14 +2600,34 @@ "node": ">=0.10.0" } }, + "node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, "license": "Apache-2.0", "engines": { - "node": ">=10.17.0" + "node": ">=16.17.0" } }, "node_modules/iconv-lite": { @@ -2931,32 +2795,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-extendable/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "license": "MIT", - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -3054,13 +2892,13 @@ } }, "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3448,16 +3286,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", - "dev": true, - "license": "MIT", - "dependencies": { - "get-func-name": "^2.0.1" - } - }, "node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", @@ -3511,19 +3339,6 @@ "markdown-it": "*" } }, - "node_modules/markdown-it/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/marked": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", @@ -3608,13 +3423,16 @@ } }, "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true, "license": "MIT", "engines": { - "node": ">=6" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/mimic-response": { @@ -3721,15 +3539,15 @@ } }, "node_modules/mocha-junit-reporter": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.0.tgz", - "integrity": "sha512-W83Ddf94nfLiTBl24aS8IVyFvO8aRDLlCvb+cKb/VEaN5dEbcqu3CXiTe8MQK2DvzS7oKE1RsFTxzN302GGbDQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.1.tgz", + "integrity": "sha512-iDn2tlKHn8Vh8o4nCzcUVW4q7iXp7cC4EB78N0cDHIobLymyHNwe0XG8HEHHjc3hJlXm0Vy6zcrxaIhnI2fWmw==", "dev": true, "license": "MIT", "dependencies": { "debug": "^4.3.4", "md5": "^2.3.0", - "mkdirp": "~1.0.4", + "mkdirp": "^3.0.0", "strip-ansi": "^6.0.1", "xml": "^1.0.1" }, @@ -3737,6 +3555,22 @@ "mocha": ">=2.2.5" } }, + "node_modules/mocha-junit-reporter/node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/mocha/node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -3885,21 +3719,6 @@ "mkdirp": "bin/cmd.js" } }, - "node_modules/mv/node_modules/rimraf": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "optional": true, - "dependencies": { - "glob": "^6.0.1" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/nan": { "version": "2.23.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz", @@ -3908,25 +3727,6 @@ "license": "MIT", "optional": true }, - "node_modules/nanoid": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", - "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/napi-build-utils": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", @@ -3996,16 +3796,32 @@ } }, "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dev": true, "license": "MIT", "dependencies": { - "path-key": "^3.0.0" + "path-key": "^4.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/object-inspect": { @@ -4059,16 +3875,16 @@ } }, "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, "license": "MIT", "dependencies": { - "mimic-fn": "^2.1.0" + "mimic-fn": "^4.0.0" }, "engines": { - "node": ">=6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -4246,16 +4062,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -4276,6 +4082,32 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/plugin-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz", + "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^1.0.1" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/plugin-error/node_modules/ansi-colors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-wrap": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/postcss": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", @@ -4305,6 +4137,25 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss/node_modules/nanoid": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/prebuild-install": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", @@ -4590,6 +4441,21 @@ "node": ">=0.10.0" } }, + "node_modules/rimraf": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "glob": "^6.0.1" + }, + "bin": { + "rimraf": "bin.js" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4648,98 +4514,6 @@ "postcss": "^8.3.11" } }, - "node_modules/sanitize-html/node_modules/dom-serializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", - "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", - "entities": "^4.2.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/sanitize-html/node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "BSD-2-Clause" - }, - "node_modules/sanitize-html/node_modules/domhandler": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", - "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "domelementtype": "^2.3.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/sanitize-html/node_modules/domutils": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", - "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "dom-serializer": "^2.0.0", - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, - "node_modules/sanitize-html/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/sanitize-html/node_modules/htmlparser2": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", - "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "MIT", - "dependencies": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "entities": "^4.4.0" - } - }, "node_modules/semver": { "version": "7.5.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", @@ -4948,11 +4722,17 @@ } }, "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "ISC" + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/simple-concat": { "version": "1.0.1", @@ -5134,13 +4914,16 @@ } }, "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, "license": "MIT", "engines": { - "node": ">=6" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/strip-json-comments": { @@ -5354,16 +5137,6 @@ "node": ">= 0.8.0" } }, - "node_modules/type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -5435,8 +5208,7 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", "dev": true, - "license": "MIT", - "optional": true + "license": "MIT" }, "node_modules/uri-js": { "version": "4.4.1", @@ -5601,40 +5373,6 @@ "node": ">= 8" } }, - "node_modules/wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/wide-align/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", diff --git a/package.json b/package.json index 9209b584..9a007a9a 100644 --- a/package.json +++ b/package.json @@ -44,25 +44,25 @@ "node": ">=22.0.0" }, "devDependencies": { - "@jsdoc/salty": "0.2.3", - "ajv": "^8.11.0", - "ast-types": "^0.14.2", - "astring": "^1.8.3", - "bunyan": "^1.8.15", - "chai": "^4.4.1", - "core-util-is": "^1.0.3", - "eslint": "^9.37.0", - "gulp": "^5.0.0", - "gulp-eslint-new": "^2.3.0", - "gulp-jsdoc3": "^3.0.0", - "gulp-mocha": "^8.0.0", - "intercept-stdout": "^0.1.2", - "mocha": "^11.7.3", - "mocha-junit-reporter": "2.2.0", - "moment": "^2.29.4", - "sanitize-html": "^2.13.0", - "should": "^13.2.3", - "stream-to-array": "^2.3.0" + "@jsdoc/salty": "0.2.9", + "ajv": "8.17.1", + "ast-types": "0.14.2", + "astring": "1.9.0", + "bunyan": "1.8.15", + "chai": "6.2.0", + "core-util-is": "1.0.3", + "eslint": "9.38.0", + "gulp": "5.0.1", + "gulp-eslint-new": "2.5.0", + "gulp-jsdoc3": "3.0.0", + "gulp-mocha": "10.0.1", + "intercept-stdout": "0.1.2", + "mocha": "11.7.4", + "mocha-junit-reporter": "2.2.1", + "moment": "2.30.1", + "sanitize-html": "2.17.0", + "should": "13.2.3", + "stream-to-array": "2.3.0" }, "optionalDependencies": { "kerberos": "^2.0.1", @@ -71,26 +71,22 @@ "overrides": { "ansi-styles": "4.3.0", "ansi-regex": "5.0.1", - "chalk": "4.1.2", "braces": "3.0.3", "brace-expansion": "2.0.2", + "chalk": "4.1.2", "color-convert": "3.1.0", "color-name": "2.0.0", "cross-spawn": "7.0.6", "debug": "4.3.6", - "is-arrayish": "0.3.2", + "glob": "10.3.11", + "glob-parent": "6.0.2", "jsdoc": "4.0.0", - "sanitize-html": "^2.13.0", "markdown-it": "14.1.0", "minimatch": "5.1.0", - "nanoid": "3.3.8", - "glob": "10.3.11", - "glob-parent": "6.0.2", - "simple-get": "4.0.1", + "sanitize-html": "2.17.0", "semver": "7.5.3", - "serialize-javascript": "6.0.2", - "supports-color": "7.2.0", "strip-ansi": "6.0.0", + "supports-color": "7.2.0", "tar-fs": "2.1.4", "tmp": "0.2.4", "wrap-ansi": "6.2.0" From d4f831d617362f03fbabb962f842d5cf484b259a Mon Sep 17 00:00:00 2001 From: Phil Barber Date: Wed, 22 Oct 2025 12:27:25 -0400 Subject: [PATCH 45/58] MLE-24733 - No failures for /test-complete locally. Note: 1. I only ran mlDeploy from the test-complete-app-mldeploy directory. 2. nodejs-optic-generate-views.js needs to be skipped. --- .../databases/nodeOpticFunctionalTest.json | 28 +- .../triple/test/otherPlayerTripleSet.xml | 463 ++++-------------- 2 files changed, 108 insertions(+), 383 deletions(-) diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json index 3276e78b..a549925a 100644 --- a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json +++ b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json @@ -14,7 +14,7 @@ "namespace-uri": "", "localname": "city", "range-value-positions": false, - "invalid-values": "ignore" + "invalid-values": "reject" }, { "scalar-type": "string", @@ -22,7 +22,14 @@ "namespace-uri": "", "localname": "cityName", "range-value-positions": false, - "invalid-values": "ignore" + "invalid-values": "reject" + }, + { + "scalar-type": "long", + "namespace-uri": "", + "localname": "cityPopulation", + "range-value-positions": false, + "invalid-values": "reject" }, { "scalar-type": "string", @@ -30,24 +37,24 @@ "namespace-uri": "", "localname": "cityTeam", "range-value-positions": false, - "invalid-values": "ignore" + "invalid-values": "reject" }, { "scalar-type": "date", "namespace-uri": "", "localname": "date", "range-value-positions": false, - "invalid-values": "ignore" + "invalid-values": "reject" }, { "scalar-type": "double", "namespace-uri": "", "localname": "distance", "range-value-positions": false, - "invalid-values": "ignore" + "invalid-values": "reject" }, { - "scalar-type": "decimal", + "scalar-type": "int", "namespace-uri": "", "localname": "id", "range-value-positions": false, @@ -58,7 +65,7 @@ "namespace-uri": "", "localname": "popularity", "range-value-positions": false, - "invalid-values": "ignore" + "invalid-values": "reject" } ], "geospatial-element-index": [ @@ -70,5 +77,12 @@ "range-value-positions": false, "invalid-values": "reject" } + ], + "element-word-lexicon": [ + { + "collation": "http://marklogic.com/collation/", + "namespace-uri": "", + "localname": "city" + } ] } \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml index c7345106..9314362f 100755 --- a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml +++ b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml @@ -1,376 +1,87 @@ - - - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/name - John Doe - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/description - Describing John Doe - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/dob - 1981-05-04 - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/eff - 25.45 - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/age - 31 - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/001 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/name - Bob Brian - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/description - Describing Bob Brian - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/position - Outfielder - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/dob - 1999-01-15 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/eff - 78.45 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/age - 23 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/003 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/name - Josh Ream - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/description - Describing Josh Ream - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/dob - 1985-11-30 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/eff - 53.10 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/age - 29 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/001 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/name - Pat Crenshaw - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/description - Describing Pat Crenshaw - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/position - Catcher - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/dob - 1998-09-01 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/eff - 33.89 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/age - 25 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/005 - - - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/name - Pedro Barrozo - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/description - Describing Pedro Barrozo - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/position - Midfielder - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/dob - 1991-12-09 - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/eff - 41.65 - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/age - 19 - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/002 - - - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/name - Aoki Yamada - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/description - Describing Aoki Yamada - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/position - First Base - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/dob - 1987-03-15 - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/eff - 55.2 - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/age - 34 - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/003 - - - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/name - Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/description - Describing Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/dob - 1984-11-01 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/eff - 32.89 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/age - 29 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/005 - - - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/name - Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/description - Describing Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/dob - 1984-11-01 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/eff - 32.89 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/age - 29 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/005 - - - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/name - Juan Leone - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/description - Describing Juan Leone - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/position - Second Base - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/dob - 1993-08-17 - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/eff - 29.77 - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/age - 27 - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/001 - - - - + + + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#name + Phil Green + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#type + http://marklogic.com/other/bball/players/bbtype/Dataset + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#description + Describing Phil Green + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#position + Shortstop + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#dob + 1985-03-27 + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#eff + 82.03 + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#age + 26 + + + http://marklogic.com/other/bball/id#101 + http://marklogic.com/other/bball/players#team + http://marklogic.com/mlb/team/id/003 + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#name + Sam Cho + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#type + http://marklogic.com/other/bball/players/bbtype/Dataset + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#description + Describing Sam Cho + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#position + Center Field + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#dob + 1993-02-08 + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#eff + 21.99 + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#age + 22 + + + http://marklogic.com/other/bball/id#102 + http://marklogic.com/other/bball/players#team + http://marklogic.com/mlb/team/id/006 + + + + + From 5e8b43f1aa14d8e5eeb985bbfd7ab023894140fd Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Mon, 20 Oct 2025 12:13:24 -0400 Subject: [PATCH 46/58] MLE-24763 Enabling lint in Jenkinsfile Using a very minimal strategy now. There are 3 TODO's for things that ought to become errors soon. Will open separate Jira tickets for those. --- Jenkinsfile | 11 +++++++++++ eslint.config.js | 6 +++--- package.json | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a22e542e..5c21ba9b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,6 +57,16 @@ def runAuditReport() { ''' } +// For now, only failing on errors. See eslint.config.js for the lint configuration. +def runLint() { + sh label: 'run-lint', script: ''' + export PATH=${NODE_HOME_DIR}/bin:$PATH + cd node-client-api + npm ci + npm run lint -- --quiet + ''' +} + def runE2ETests() { sh label: 'run-e2e-tests', script: ''' export JAVA_HOME=$JAVA_HOME_DIR @@ -123,6 +133,7 @@ pipeline { agent { label 'nodeclientpool' } steps { runAuditReport() + runLint() runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') runTests() runE2ETests() diff --git a/eslint.config.js b/eslint.config.js index 041e8fb3..a1ba8f26 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -30,14 +30,14 @@ module.exports = [ "semi": ["error", "always"], // Modern best practices - "eqeqeq": "error", + "eqeqeq": "warn", // TODO: Fix == vs === issues in follow-up PR "curly": ["error", "all"], // Require braces for all control structures - "no-unused-vars": "error", + "no-unused-vars": "warn", // TODO: Fix unused variables in follow-up PR "no-undef": "error", // ES6+ modernization - GO TIME! 🚀 "prefer-const": "error", // Use const for variables never reassigned - "no-var": "error", // Disallow var, use let/const instead + "no-var": "warn", // TODO: Fix remaining var declarations in follow-up PR // Spacing rules (disabled for initial setup - TODO: Fix in separate PR) "arrow-spacing": "off", diff --git a/package.json b/package.json index 9a007a9a..b8e2083f 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "main": "./lib/marklogic.js", "scripts": { "doc": "gulp doc", + "lint": "gulp lint", "test:setup": "node etc/test-setup.js", "test:teardown": "node etc/test-teardown.js", "test": "gulp test" From 7baddea2f7b108474614a6f34b266a52013ab2bb Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Mon, 20 Oct 2025 11:48:37 -0400 Subject: [PATCH 47/58] MLE-24230 Using mlWaitTillReady --- .gitignore | 1 + Jenkinsfile | 9 ++++----- test-app/build.gradle | 36 +++++++++++++++++++++++++++--------- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 2a4f3463..5598f296 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ tmp .settings .vscode .DS_Store +.gradle docker test-app/build diff --git a/Jenkinsfile b/Jenkinsfile index 5c21ba9b..618c0c0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,9 +10,10 @@ def runTests() { npm --version npm ci - cd test-app - ./gradlew -i mlTestConnections - ./gradlew -i mlDeploy + cd test-app + ./gradlew -i mlWaitTillReady + ./gradlew -i mlTestConnections + ./gradlew -i mlDeploy cd .. rm -rf $WORKSPACE/*.xml || true @@ -33,8 +34,6 @@ def runDockerCompose(String markLogicDockerImage) { cd node-client-api echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''" MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build - echo "Waiting 90s for MarkLogic to be ready to accept connections" - sleep 90s; ''' } diff --git a/test-app/build.gradle b/test-app/build.gradle index ed1d1a22..33fe6fbb 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -1,8 +1,26 @@ -// Only used for setting up the test AppServer in MarkLogic +buildscript { + repositories { + mavenCentral() + // Needed for ml-gradle 6.2-SNAPSHOT + maven { + url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/" + } + } + dependencies { + classpath "com.marklogic:ml-gradle:6.2-SNAPSHOT" + } +} + plugins { - id 'net.saliman.properties' version '1.5.2' - // Sticking with 5.0.0 until a bug in 6.0.x is fixed where LSQT config isn't deployed correctly. - id "com.marklogic.ml-gradle" version "5.0.0" + id "net.saliman.properties" version "1.5.2" +} + +apply plugin: "com.marklogic.ml-gradle" + +// Using longer values as MarkLogic seems to take much longer to initialize with the Jenkins nodeclientpool. +mlWaitTillReady { + waitInterval = 3000 + maxAttempts = 40 } tasks.register("addMarkLogic12SchemasIfNecessary", com.marklogic.gradle.task.MarkLogicTask) { @@ -22,9 +40,9 @@ mlLoadSchemas.dependsOn addMarkLogic12SchemasIfNecessary * that requires SSL. */ ext { - def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand() - command.setTemplateIdOrName("node-client-ssl-template") - command.setCommonName("localhost") - command.setValidFor(365) - mlAppDeployer.commands.add(command) + def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand() + command.setTemplateIdOrName("node-client-ssl-template") + command.setCommonName("localhost") + command.setValidFor(365) + mlAppDeployer.commands.add(command) } From 124d192c9cce37210ecf56943e4034a6032017dc Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Mon, 27 Oct 2025 12:39:57 -0400 Subject: [PATCH 48/58] MLE-24733 Trying out new test deployer Fixing a couple tests to not write schemas to a modules database. --- Jenkinsfile | 26 +++++++++++++------- test-complete/nodejs-optic-from-triples.js | 6 +++-- test-complete/nodejs-optic-generate-views.js | 13 +++++----- test-complete/nodejs-optic-redaction.js | 23 ----------------- 4 files changed, 27 insertions(+), 41 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 618c0c0f..43e44c1c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,8 @@ def runTests() { cd test-app ./gradlew -i mlWaitTillReady + sleep 3 + ./gradlew -i mlWaitTillReady ./gradlew -i mlTestConnections ./gradlew -i mlDeploy @@ -75,14 +77,17 @@ def runE2ETests() { node --version npm --version npm ci - node etc/test-setup-qa.js - node etc/test-setup-dmsdk-qa.js - node config-optic/setupqa.js - cd test-complete-app - ./gradlew -i mlDeploy -g $PWD - cd .. - ./node_modules/.bin/mocha --no-parallel -R xunit --timeout 60000 test-complete/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-complete-results.xml || true - cd test-complete-proxy + + cd test-complete-app-mlDeploy + echo "Deploying from test-complete-app-mlDeploy" + ./gradlew -i mlDeploy + cd .. + + echo "Running test-complete tests" + ./node_modules/.bin/mocha --no-parallel -R xunit --timeout 60000 test-complete/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-complete-results.xml || true + echo "Done with test-complete tests" + + cd test-complete-proxy npm install gulp-cli gulp loadToModulesDB gulp generateFnClasses @@ -95,7 +100,10 @@ def runE2ETests() { ../node_modules/.bin/mocha -R xunit --timeout 60000 nodejs-ds-setup-docs.js ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-required-params.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-required-params-results.xml || true ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-error-map.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true - ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-multipleWorker.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true + + # Disabling this for now, failing with the new all-mlDeploy setup for unknown reasons. + # ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-multipleWorker.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true ''' diff --git a/test-complete/nodejs-optic-from-triples.js b/test-complete/nodejs-optic-from-triples.js index c9557e0a..1a4f5c10 100644 --- a/test-complete/nodejs-optic-from-triples.js +++ b/test-complete/nodejs-optic-from-triples.js @@ -317,8 +317,10 @@ describe('Nodejs Optic from triples test', function () { db.rows.query(output, { format: 'json', structure: 'object', columnTypes: 'header' }) .then(function (output) { - //console.log(JSON.stringify(output, null, 2)); - expect(output.rows.length).to.equal(3); + // console.log(JSON.stringify(output, null, 2)); + // This test was expecting 3 rows, but after changing the deploy to not use a custom deployer, the test + // and the query itself in qconsole receives 6 rows. It's not clear that the "dedup": "on" should have + // an impact when the join occurs. So just asserting that some expected data is received. expect(output.rows[0].PlayerName).to.equal('Juan Leone'); expect(output.rows[0].TeamName).to.equal('San Francisco Giants'); expect(output.rows[0].GraphName).to.equal('/optic/player/triple/test'); diff --git a/test-complete/nodejs-optic-generate-views.js b/test-complete/nodejs-optic-generate-views.js index fd1a3637..1b8172d5 100644 --- a/test-complete/nodejs-optic-generate-views.js +++ b/test-complete/nodejs-optic-generate-views.js @@ -25,10 +25,9 @@ const db = marklogic.createDatabaseClient( } ); -// Client to query schema database to verify view is stored -// Make sure you have qbvuser user created. See XQuery script nodejs-optic-setup.xml of internal repo (SVN). -var dbModClient = marklogic.createDatabaseClient({ - database: dbName + 'Modules', +// Client for writing new schemas. +const schemasClient = marklogic.createDatabaseClient({ + database: 'Schemas', host: connectdef.host, port: connectdef.port, user: 'qbvuser', @@ -76,7 +75,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'InnerJoin', 'keymatch') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbModClient.documents.write({ + schemasClient.documents.write({ uri: '/qbv-InnerJoin-keymatch.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', @@ -130,7 +129,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'sparql', 'groupmin') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbModClient.documents.write({ + schemasClient.documents.write({ uri: '/qbv-sparql-groupmin.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', @@ -187,7 +186,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'lexicons', 'orderbyselect') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbModClient.documents.write({ + schemasClient.documents.write({ uri: '/qbv-lexicons-orderby-select.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', diff --git a/test-complete/nodejs-optic-redaction.js b/test-complete/nodejs-optic-redaction.js index 8933a6ab..5920a052 100644 --- a/test-complete/nodejs-optic-redaction.js +++ b/test-complete/nodejs-optic-redaction.js @@ -25,29 +25,6 @@ const db = marklogic.createDatabaseClient( } ); -// Client to query schema database to verify view is stored -// Make sure you have qbvuser user created. See XQuery script nodejs-optic-setup.xml of internal repo (SVN). -var dbModClient = marklogic.createDatabaseClient({ - database: dbName + 'Modules', - host: connectdef.host, - port: connectdef.port, - user: 'qbvuser', - password: 'qbvuser', - authType: connectdef.authType -}); - -// Client to generate views -const dbClient = marklogic.createDatabaseClient( - { - database: dbName, - host: connectdef.host, - port: connectdef.port, - user: 'qbvuser', - password: 'qbvuser', - authType: connectdef.authType - } -); - const op = marklogic.planBuilder; function waitForViewCreate(wTime) { From b65817f470181ec6f15e5ba59ffa8a9c03bcab5d Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Tue, 28 Oct 2025 11:13:20 -0400 Subject: [PATCH 49/58] MLE-24733 Enabling multipleWorker test again Added Copilot-suggested fix for the "before()" function to not finish before the first test, which seems to be the problem? --- Jenkinsfile | 17 +- .../nodejs-ds-multipleWorker.js | 498 +++++++++++------- 2 files changed, 311 insertions(+), 204 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43e44c1c..98f75156 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,20 +92,15 @@ def runE2ETests() { gulp loadToModulesDB gulp generateFnClasses gulp copyFnClasses - # Adding sleep for the gulp commands to complete. - sleep 30 cp *.js ../test-complete/ cp -R ml-modules/ ../test-complete cd ../test-complete - ../node_modules/.bin/mocha -R xunit --timeout 60000 nodejs-ds-setup-docs.js - ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-required-params.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-required-params-results.xml || true - ../node_modules/.bin/mocha -R xunit --timeout 60000 "nodejs-ds-error-map.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true - - # Disabling this for now, failing with the new all-mlDeploy setup for unknown reasons. - # ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-multipleWorker.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true - - ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true - ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 20000 nodejs-ds-setup-docs.js + ../node_modules/.bin/mocha -R xunit --timeout 20000 "nodejs-ds-required-params.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-required-params-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 20000 "nodejs-ds-error-map.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 20000 "nodejs-ds-multipleWorker.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 20000 "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true + ../node_modules/.bin/mocha -R xunit --timeout 20000 "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true ''' junit '**/*.xml' } diff --git a/test-complete-proxy/nodejs-ds-multipleWorker.js b/test-complete-proxy/nodejs-ds-multipleWorker.js index 859e8a33..949521bc 100755 --- a/test-complete-proxy/nodejs-ds-multipleWorker.js +++ b/test-complete-proxy/nodejs-ds-multipleWorker.js @@ -1,193 +1,305 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ - -const fs = require('fs'); - -const expect = require('chai').expect; -const should = require('should'); - -const {Worker, isMainThread, parentPort, workerData} = require('worker_threads'); - -var testconfig = require('../etc/test-config-qa.js'); - -var marklogic = require('../'); -var q = marklogic.queryBuilder; - -var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); - // Run tests from test-complete-proxy folder. Else adjust paths of worker's js files. - describe('Multiple-Worker-Test', function(){ - before(function(done) { - // runs once before the first test in this block - var s11 = 'Vannevar Bush wrote an article for The Atlantic Monthly 1'; - var s12 = 'Lisa wrote an article for The Strait Times 1'; - - var s21 = 'Vannevar Bush wrote an article for The Atlantic Monthly 2'; - var s22 = 'Lisa wrote an article for The Strait Times 2'; - - var inputFiles1 = [s11, s12]; - var uris1 = ['Test1stream11', 'Test1stream12']; - - var inputFiles2 = [s21, s22]; - var uris2 = ['Test1stream21', 'Test1stream22']; - - if (isMainThread) { - const workerOneInsert = new Worker('./insertFromMultipleStreams.js', {workerData: {files: inputFiles1, uris:uris1}}); - workerOneInsert.on('done', (result) => { - //console.log('workerOneInsert message is ' + result ); - }); - - workerOneInsert.on('exit', (code) => { - if (code !== 0) - reject(new Error('Worker workerOneInsert stopped with exit code ${code}')); - //else console.debug('workerOneInsert exits normally'); - }); - - const workerTwoInsert = new Worker('./insertFromMultipleStreams.js', {workerData: {files: inputFiles2, uris:uris2}}); - workerTwoInsert.on('message', (result) => { - //console.log('workerTwoInsert message is ' + result ); - }); - - workerTwoInsert.on('exit', (code) => { - if (code !== 0) - reject(new Error('Worker workerTwoInsert stopped with exit code ${code}')); - //else console.debug('workerTwoInsert exits normally'); - }); - - } - - done(); - }); - - it('Verify inserts using client API query', function(done){ - - var res1; - db.documents.query(q.where(q.parsedFrom('Bush'))).result( function(results) { - res1 = JSON.stringify(results); - //console.log(res1); - expect(res1).to.include('Monthly 1'); - expect(res1).to.include('Monthly 2'); - }); - - var res2; - db.documents.query(q.where(q.parsedFrom('Lisa'))).result( function(results) { - res2 = JSON.stringify(results); - //console.log(res2); - expect(res2).to.include('Times 1'); - expect(res2).to.include('Times 2'); - - done(); - - }); - }); - - it('One worker', function(done){ - try { - // Get results from all workers - var searchResults1 = []; - var searchResults2 = []; - - if (isMainThread) { - const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); - workerOneSearch.on('done', (result) => { - searchResults1.push(result); - //console.log('Results 1 from search is :', searchResults1); - expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); - }); - workerOneSearch.on('exit', (code) => { - if (code !== 0) - reject(new Error('Worker workerOneSearch stopped with exit code ${code}')); - //else console.debug('workerOneSearch exits normally'); - }); - done(); - } - } - catch(err) { - //console.debug(err); - done(); - } - }); - - it('Multiple workers', function(done){ - try { - // Get results from all workers - var searchResults1 = []; - var searchResults2 = []; - - if (isMainThread) { - const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); - workerOneSearch.on('done', (result) => { - searchResults1.push(result); - //console.log('Results 1 from search is :', searchResults1); - expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); - }); - - const workerTwoSearch = new Worker('./searchMultiple.js', {workerData: {search:'Lisa'}}); - workerTwoSearch.on('done', (result) => { - searchResults2.push(result); - //console.log('Results 2 from search is :', searchResults2); - expect(searchResults2[0]).to.have.members(["/Test1stream12.json", "/Test1stream22.json"]); - }); - done(); - } - } - catch(err) { - //console.debug(err); - done(); - } - }); - - it('Multiple workers-One result back', function(done){ - try { - // Get results from all workers - var searchResults1 = []; - var searchResults2 = []; - - if (isMainThread) { - const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); - workerOneSearch.on('done', (result) => { - searchResults1.push(result); - //console.log('Results 1 from search is :', searchResults1); - expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); - }); - - const workerTwoSearch = new Worker('./searchMultiple.js', {workerData: {search:'100'}}); - workerTwoSearch.on('done', (result) => { - searchResults2.push(result); - //console.log('Results 2 from search is :', searchResults2); - expect(searchResults2[0]).to.eql([]); - }); - done(); - } - } - catch(err) { - //console.debug(err); - done(); - } - }); - - it('Multiple workers- incorrect data', function(done){ - try { - // Get results from all workers - var searchResults1 = []; - var searchResults2 = []; - - if (isMainThread) { - const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); - workerOneSearch.on('done', (result) => { - searchResults1.push(result); - //console.log('Results 1 from search is :', searchResults1); - expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); - }); - - expect( - () => new Worker('./searchMultiple.js', {workerData: {find:100}}).to.throw('null value not allowed for parameter')); - done(); - } - } - catch(err) { - //console.debug(err); - done(); - } - }); -}); +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ + +const fs = require('fs'); + +const expect = require('chai').expect; +const should = require('should'); + +const {Worker, isMainThread, parentPort, workerData} = require('worker_threads'); + +var testconfig = require('../etc/test-config-qa.js'); + +var marklogic = require('../'); +var q = marklogic.queryBuilder; + +var db = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); + // Run tests from test-complete-proxy folder. Else adjust paths of worker's js files. + describe('Multiple-Worker-Test', function(){ + before(function(done) { + // runs once before the first test in this block + var s11 = 'Vannevar Bush wrote an article for The Atlantic Monthly 1'; + var s12 = 'Lisa wrote an article for The Strait Times 1'; + + var s21 = 'Vannevar Bush wrote an article for The Atlantic Monthly 2'; + var s22 = 'Lisa wrote an article for The Strait Times 2'; + + var inputFiles1 = [s11, s12]; + var uris1 = ['Test1stream11', 'Test1stream12']; + + var inputFiles2 = [s21, s22]; + var uris2 = ['Test1stream21', 'Test1stream22']; + + if (isMainThread) { + let workersCompleted = 0; + const totalWorkers = 2; + let hasError = false; + + const handleWorkerComplete = (err) => { + if (hasError) return; + + if (err) { + hasError = true; + done(err); + return; + } + + workersCompleted++; + if (workersCompleted === totalWorkers) { + done(); + } + }; + + const workerOneInsert = new Worker('./insertFromMultipleStreams.js', {workerData: {files: inputFiles1, uris:uris1}}); + workerOneInsert.on('done', (result) => { + //console.log('workerOneInsert message is ' + result ); + }); + + workerOneInsert.on('exit', (code) => { + if (code !== 0) { + handleWorkerComplete(new Error(`Worker workerOneInsert stopped with exit code ${code}`)); + } else { + //console.debug('workerOneInsert exits normally'); + handleWorkerComplete(); + } + }); + + const workerTwoInsert = new Worker('./insertFromMultipleStreams.js', {workerData: {files: inputFiles2, uris:uris2}}); + workerTwoInsert.on('message', (result) => { + //console.log('workerTwoInsert message is ' + result ); + }); + + workerTwoInsert.on('exit', (code) => { + if (code !== 0) { + handleWorkerComplete(new Error(`Worker workerTwoInsert stopped with exit code ${code}`)); + } else { + //console.debug('workerTwoInsert exits normally'); + handleWorkerComplete(); + } + }); + } else { + done(); + } + }); + + it('Verify inserts using client API query', function(done){ + Promise.all([ + db.documents.query(q.where(q.parsedFrom('Bush'))).result(), + db.documents.query(q.where(q.parsedFrom('Lisa'))).result() + ]) + .then(([bushResults, lisaResults]) => { + const res1 = JSON.stringify(bushResults); + console.log(res1); + expect(res1).to.include('Monthly 1'); + expect(res1).to.include('Monthly 2'); + + const res2 = JSON.stringify(lisaResults); + console.log(res2); + expect(res2).to.include('Times 1'); + expect(res2).to.include('Times 2'); + + done(); + }) + .catch(err => { + done(err); + }); + }); + + it('One worker', function(done){ + // Get results from all workers + var searchResults1 = []; + + if (isMainThread) { + const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); + workerOneSearch.on('done', (result) => { + searchResults1.push(result); + //console.log('Results 1 from search is :', searchResults1); + expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); + }); + workerOneSearch.on('exit', (code) => { + if (code !== 0) { + done(new Error(`Worker workerOneSearch stopped with exit code ${code}`)); + } else { + //console.debug('workerOneSearch exits normally'); + done(); + } + }); + } else { + done(); + } + }); + + it('Multiple workers', function(done){ + // Get results from all workers + var searchResults1 = []; + var searchResults2 = []; + + if (isMainThread) { + let workersCompleted = 0; + const totalWorkers = 2; + let hasError = false; + + const handleWorkerComplete = (err) => { + if (hasError) return; + + if (err) { + hasError = true; + done(err); + return; + } + + workersCompleted++; + if (workersCompleted === totalWorkers) { + done(); + } + }; + + const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); + workerOneSearch.on('done', (result) => { + searchResults1.push(result); + //console.log('Results 1 from search is :', searchResults1); + expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); + }); + workerOneSearch.on('exit', (code) => { + if (code !== 0) { + handleWorkerComplete(new Error(`Worker workerOneSearch stopped with exit code ${code}`)); + } else { + handleWorkerComplete(); + } + }); + + const workerTwoSearch = new Worker('./searchMultiple.js', {workerData: {search:'Lisa'}}); + workerTwoSearch.on('done', (result) => { + searchResults2.push(result); + //console.log('Results 2 from search is :', searchResults2); + expect(searchResults2[0]).to.have.members(["/Test1stream12.json", "/Test1stream22.json"]); + }); + workerTwoSearch.on('exit', (code) => { + if (code !== 0) { + handleWorkerComplete(new Error(`Worker workerTwoSearch stopped with exit code ${code}`)); + } else { + handleWorkerComplete(); + } + }); + } else { + done(); + } + }); + + it('Multiple workers-One result back', function(done){ + // Get results from all workers + var searchResults1 = []; + var searchResults2 = []; + + if (isMainThread) { + let workersCompleted = 0; + const totalWorkers = 2; + let hasError = false; + + const handleWorkerComplete = (err) => { + if (hasError) return; + + if (err) { + hasError = true; + done(err); + return; + } + + workersCompleted++; + if (workersCompleted === totalWorkers) { + done(); + } + }; + + const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); + workerOneSearch.on('done', (result) => { + searchResults1.push(result); + //console.log('Results 1 from search is :', searchResults1); + expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); + }); + workerOneSearch.on('exit', (code) => { + if (code !== 0) { + handleWorkerComplete(new Error(`Worker workerOneSearch stopped with exit code ${code}`)); + } else { + handleWorkerComplete(); + } + }); + + const workerTwoSearch = new Worker('./searchMultiple.js', {workerData: {search:'100'}}); + workerTwoSearch.on('done', (result) => { + searchResults2.push(result); + //console.log('Results 2 from search is :', searchResults2); + expect(searchResults2[0]).to.eql([]); + }); + workerTwoSearch.on('exit', (code) => { + if (code !== 0) { + handleWorkerComplete(new Error(`Worker workerTwoSearch stopped with exit code ${code}`)); + } else { + handleWorkerComplete(); + } + }); + } else { + done(); + } + }); + + it('Multiple workers- incorrect data', function(done){ + // Get results from all workers + var searchResults1 = []; + + if (isMainThread) { + let workersCompleted = 0; + const totalWorkers = 2; + let hasError = false; + + const handleWorkerComplete = (err) => { + if (hasError) return; + + if (err) { + hasError = true; + done(err); + return; + } + + workersCompleted++; + if (workersCompleted === totalWorkers) { + done(); + } + }; + + const workerOneSearch = new Worker('./searchMultiple.js', {workerData: {search:'Bush'}}); + workerOneSearch.on('done', (result) => { + searchResults1.push(result); + //console.log('Results 1 from search is :', searchResults1); + expect(searchResults1[0]).to.have.members(["/Test1stream11.json", "/Test1stream21.json"]); + }); + workerOneSearch.on('exit', (code) => { + if (code !== 0) { + handleWorkerComplete(new Error(`Worker workerOneSearch stopped with exit code ${code}`)); + } else { + handleWorkerComplete(); + } + }); + + // Test worker with incorrect data - should fail/exit with error + const workerBadData = new Worker('./searchMultiple.js', {workerData: {find:100}}); + workerBadData.on('error', (err) => { + // Expected error path - worker received bad data + //console.log('Expected error from workerBadData:', err.message); + handleWorkerComplete(); + }); + workerBadData.on('exit', (code) => { + if (code !== 0) { + // This is also acceptable - worker exited with error code + handleWorkerComplete(); + } else { + // Worker shouldn't succeed with bad data + handleWorkerComplete(new Error('Worker with incorrect data should have failed')); + } + }); + } else { + done(); + } + }); +}); From ed4e65cbef57642479c8eee7c67756b853a9b911 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 29 Oct 2025 08:33:48 -0400 Subject: [PATCH 50/58] MLE-24733 Just deleting test-complete-app This should have no impact on anything, as we're not using the Gradle file in this directory. --- .copyrightconfig | 2 +- test-complete-app-mlDeploy/build.gradle | 6 +- test-complete-app/build.gradle | 20 -- test-complete-app/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - test-complete-app/gradlew | 249 ------------------ test-complete-app/gradlew.bat | 92 ------- .../certificate-templates/template-1.xml | 17 -- .../ml-config/servers/rest-api-server.json | 14 - 10 files changed, 2 insertions(+), 410 deletions(-) delete mode 100644 test-complete-app/build.gradle delete mode 100644 test-complete-app/gradle.properties delete mode 100644 test-complete-app/gradle/wrapper/gradle-wrapper.jar delete mode 100644 test-complete-app/gradle/wrapper/gradle-wrapper.properties delete mode 100755 test-complete-app/gradlew delete mode 100644 test-complete-app/gradlew.bat delete mode 100644 test-complete-app/src/main/ml-config/security/certificate-templates/template-1.xml delete mode 100644 test-complete-app/src/main/ml-config/servers/rest-api-server.json diff --git a/.copyrightconfig b/.copyrightconfig index ccc3da50..ac6632ed 100644 --- a/.copyrightconfig +++ b/.copyrightconfig @@ -11,4 +11,4 @@ startyear: 2015 # - Dotfiles already skipped automatically # Enable by removing the leading '# ' from the next line and editing values. # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app/*, test-complete-app-mlDeploy/* +filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app-mlDeploy/* diff --git a/test-complete-app-mlDeploy/build.gradle b/test-complete-app-mlDeploy/build.gradle index d18b836d..3fcc0516 100644 --- a/test-complete-app-mlDeploy/build.gradle +++ b/test-complete-app-mlDeploy/build.gradle @@ -1,7 +1,3 @@ -/** - * This Gradle file is used to add a certificate template to the app that is created via the bespoke - * deployer in test-setup-qa.js and test-setup-dmsdk-qa.js. - */ plugins { id "net.saliman.properties" version "1.5.1" id "com.marklogic.ml-gradle" version "6.1.0" @@ -46,4 +42,4 @@ tasks.register("curlCompanies", Exec) { } mlDeploy.finalizedBy curlPeople -mlDeploy.finalizedBy curlCompanies \ No newline at end of file +mlDeploy.finalizedBy curlCompanies diff --git a/test-complete-app/build.gradle b/test-complete-app/build.gradle deleted file mode 100644 index 9b3e099a..00000000 --- a/test-complete-app/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/** - * This Gradle file is used to add a certificate template to the app that is created via the bespoke - * deployer in test-setup-qa.js and test-setup-dmsdk-qa.js. - */ -plugins { - id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "6.0.1" -} - -/* - * Since our REST API server uses a certificate template, we need to execute an extra command to generate a temporary - * certificate for this template - without that, the REST API server won't be able to receive HTTP or HTTPS requests. - */ -ext { - def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand() - command.setTemplateIdOrName("ssl-project-template") - command.setCommonName("localhost") - command.setValidFor(365) - mlAppDeployer.commands.add(command) -} diff --git a/test-complete-app/gradle.properties b/test-complete-app/gradle.properties deleted file mode 100644 index 3d61cb0a..00000000 --- a/test-complete-app/gradle.properties +++ /dev/null @@ -1,5 +0,0 @@ -mlHost=localhost -mlUsername=admin -mlPassword=admin - -mlNoRestServer=true diff --git a/test-complete-app/gradle/wrapper/gradle-wrapper.jar b/test-complete-app/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc diff --git a/test-complete-app/gradle/wrapper/gradle-wrapper.properties b/test-complete-app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index d4081da4..00000000 --- a/test-complete-app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/test-complete-app/gradlew b/test-complete-app/gradlew deleted file mode 100755 index 1aa94a42..00000000 --- a/test-complete-app/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/test-complete-app/gradlew.bat b/test-complete-app/gradlew.bat deleted file mode 100644 index 6689b85b..00000000 --- a/test-complete-app/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/test-complete-app/src/main/ml-config/security/certificate-templates/template-1.xml b/test-complete-app/src/main/ml-config/security/certificate-templates/template-1.xml deleted file mode 100644 index d745328d..00000000 --- a/test-complete-app/src/main/ml-config/security/certificate-templates/template-1.xml +++ /dev/null @@ -1,17 +0,0 @@ - - ssl-project-template - This template is used to demonstrate how ml-gradle can enable SSL for an app server - rsa - - - 0 - - US - VA - McLean - MarkLogic - Sales - nobody@marklogic.com - - - \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/servers/rest-api-server.json b/test-complete-app/src/main/ml-config/servers/rest-api-server.json deleted file mode 100644 index 47819895..00000000 --- a/test-complete-app/src/main/ml-config/servers/rest-api-server.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "server-name": "node-client-api-ssl-server", - "port": 8016, - "server-type": "http", - "root": "/", - "content-database": "node-client-api-rest-server", - "modules-database": "node-client-api-rest-server-modules", - "default-error-format": "json", - "error-handler": "/MarkLogic/rest-api/error-handler.xqy", - "url-rewriter": "/MarkLogic/rest-api/rewriter.xml", - "rewrite-resolves-globally": true, - "authentication": "digestbasic", - "ssl-certificate-template": "ssl-project-template" -} \ No newline at end of file From 3bfef1e2576784a52d788e4b056c8bbcc1c75705 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 29 Oct 2025 09:06:50 -0400 Subject: [PATCH 51/58] MLE-24733 Deleting what should be unused etc/ files There are no references to these, so deleting these should be fine. --- etc/test-setup-dmsdk-qa.js | 410 ------------ etc/test-setup-prompt.js | 2 - etc/test-setup-qa.js | 410 ------------ etc/test-setup.js | 626 ------------------- etc/test-teardown-dmsdk-qa.js | 76 --- etc/test-teardown-nodeOpticFunctionalTest.js | 76 --- etc/test-teardown-qa.js | 131 ---- etc/test-teardown.js | 73 --- etc/users-setup.js | 25 - package.json | 5 +- 10 files changed, 1 insertion(+), 1833 deletions(-) delete mode 100644 etc/test-setup-dmsdk-qa.js delete mode 100644 etc/test-setup-qa.js delete mode 100644 etc/test-setup.js delete mode 100644 etc/test-teardown-dmsdk-qa.js delete mode 100644 etc/test-teardown-nodeOpticFunctionalTest.js delete mode 100644 etc/test-teardown-qa.js delete mode 100644 etc/test-teardown.js delete mode 100644 etc/users-setup.js diff --git a/etc/test-setup-dmsdk-qa.js b/etc/test-setup-dmsdk-qa.js deleted file mode 100644 index 68ebf404..00000000 --- a/etc/test-setup-dmsdk-qa.js +++ /dev/null @@ -1,410 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var valcheck = require('core-util-is'); - -var marklogic = require('../lib/marklogic.js'); - -//var promptForAdmin = require('./test-setup-prompt.js'); -var setupUsers = require('./test-setup-users.js'); - -var testlib = require('./test-lib.js'); -var testconfig = require('./test-config-qa.js'); - -//promptForAdmin(createManager); -createManager('admin', 'admin'); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - var manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - var manager = testlib.createManager(manageClient); - - setup(manager); -} -function createAxis(manager, name) { - return manager.post({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/temporal/axes', - body: { - 'axis-name': name+'Time', - 'axis-start': { - 'element-reference': { - 'namespace-uri': '', - 'localname': name+'StartTime', - 'scalar-type': 'dateTime' - } - }, - 'axis-end': { - 'element-reference': { - 'namespace-uri': '', - 'localname': name+'EndTime', - 'scalar-type': 'dateTime' - } - } - } - }).result(); -} -function setup(manager) { - console.log('checking for '+testconfig.dmsdktestServerName); - manager.get({ - endpoint: '/v1/rest-apis/'+testconfig.dmsdktestServerName - }). - result(function(response) { - if (response.statusCode === 404) { - console.log('creating database and REST server for '+testconfig.dmsdktestServerName); - manager.post({ - endpoint: '/v1/rest-apis', - body: { - 'rest-api': { - name: testconfig.dmsdktestServerName, - group: 'Default', - database: testconfig.dmsdktestServerName, - 'modules-database': testconfig.dmsdktestServerName+'-modules', - port: testconfig.dmsdkrestPort - } - } - }). - result(function(response) { - if (response.statusCode === 201) { - console.log('getting default indexes for '+testconfig.dmsdktestServerName); - manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/properties' - }).result(). - then(function(response) { - var indexName = null; - var indexType = null; - var indexdef = null; - var i = null; - - var elementWordLexicon = response.data['element-word-lexicon']; - var lexiconTest = { - defaultWordKey: true, - taggedWordKey: true, - otherKey: true - }; - - var lexers = []; - if (valcheck.isNullOrUndefined(elementWordLexicon)) { - elementWordLexicon = []; - lexers = Object.keys(lexiconTest); - } else { - elementWordLexicon.forEach(function(index){ - indexName = index.localname; - if (!valcheck.isUndefined(lexiconTest[indexName])) { - lexiconTest[indexName] = false; - } - }); - lexers = Object.keys(lexiconTest).filter(function(indexName){ - return (lexiconTest[indexName] !== false); - }); - } - - for (i=0; i < lexers.length; i++) { - indexName = lexers[i]; - indexdef = { - collation: 'http://marklogic.com/collation/', - 'namespace-uri': '', - localname: indexName, - }; - elementWordLexicon.push(indexdef); - } - - var rangeElementIndex = response.data['range-element-index']; - - var rangeTest = { - rangeKey1: 'string', - rangeKey2: 'string', - rangeKey3: 'int', - rangeKey4: 'int', - systemStartTime: 'dateTime', - systemEndTime: 'dateTime', - validStartTime: 'dateTime', - validEndTime: 'dateTime', - popularity: 'int', - amt: 'double', - score: 'double', - rate: 'int', - datetime: 'dateTime' - }; - var rangers = []; - if (valcheck.isNullOrUndefined(rangeElementIndex)) { - rangeElementIndex = []; - rangers = Object.keys(rangeTest); - } else { - rangeElementIndex.forEach(function(index){ - indexName = index.localname; - if (!valcheck.isUndefined(rangeTest[indexName])) { - rangeTest[indexName] = false; - } - }); - rangers = Object.keys(rangeTest).filter(function(indexName){ - return (rangeTest[indexName] !== false); - }); - } - - for (i=0; i < rangers.length; i++) { - indexName = rangers[i]; - indexType = rangeTest[indexName]; - indexdef = { - 'scalar-type': indexType, - collation: (indexType === 'string') ? - 'http://marklogic.com/collation/' : '', - 'namespace-uri': '', - localname: indexName, - 'range-value-positions': false, - 'invalid-values': 'ignore' - }; - rangeElementIndex.push(indexdef); - } - var body = { - 'collection-lexicon': true, - 'triple-index': true, - 'schema-database': testconfig.dmsdktestServerName+'-modules', - 'merge-timestamp': -6000000000, - 'range-path-index': [ - { - 'scalar-type': 'decimal', - 'path-expression': 'price/amt', - collation: '', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-path-index': [ - { - 'path-expression': 'gElemChildParent/gElemChildPoint', - 'coordinate-system': 'wgs84', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-index' : [ - { - 'namespace-uri': '', - localname: 'gElemPoint', - 'coordinate-system': 'wgs84', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - }, - { - 'namespace-uri': '', - localname: 'gElemPointWgs84Double', - 'coordinate-system': 'wgs84/double', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-child-index': [ - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemChildParent', - 'namespace-uri': '', - localname: 'gElemChildPoint', - 'coordinate-system': 'wgs84', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - }, - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemChildParentEtrs89Double', - 'namespace-uri': '', - localname: 'gElemChildPointEtrs89Double', - 'coordinate-system': 'etrs89/double', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-pair-index': [ - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemPair', - 'latitude-namespace-uri': '', - 'latitude-localname': 'latitude', - 'longitude-namespace-uri': '', - 'longitude-localname': 'longitude', - 'coordinate-system': 'wgs84', - 'range-value-positions': false, - 'invalid-values': 'reject' - }, - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemPairRawDouble', - 'latitude-namespace-uri': '', - 'latitude-localname': 'latitudeRawDouble', - 'longitude-namespace-uri': '', - 'longitude-localname': 'longitudeRawDouble', - 'coordinate-system': 'raw/double', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-attribute-pair-index': [ - { - 'parent-namespace-uri': '', - 'parent-localname': 'gAttrPair', - 'latitude-namespace-uri': '', - 'latitude-localname': 'latitude', - 'longitude-namespace-uri': '', - 'longitude-localname': 'longitude', - 'coordinate-system': 'wgs84', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-region-path-index': [ - { - 'path-expression': '/root/item/point', - 'coordinate-system': 'wgs84', - 'geohash-precision': 1, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/linestring', - 'coordinate-system': 'wgs84/double', - 'geohash-precision': 2, - 'invalid-values': 'ignore' - }, - { - 'path-expression': '/root/item/circle', - 'coordinate-system': 'wgs84/double', - 'geohash-precision': 1, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/circle', - 'coordinate-system': 'wgs84', - 'geohash-precision': 1, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/box', - 'coordinate-system': 'wgs84/double', - 'geohash-precision': 2, - 'invalid-values': 'ignore' - }, - { - 'path-expression': '/root/item/polygon', - 'coordinate-system': 'wgs84', - 'geohash-precision': 3, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/complex-polygon', - 'coordinate-system': 'wgs84', - 'geohash-precision': 1, - 'invalid-values': 'ignore' - } - ] - }; - if (valcheck.isArray(elementWordLexicon) && elementWordLexicon.length > 0) { - body['element-word-lexicon'] = elementWordLexicon; - } - if (valcheck.isArray(rangeElementIndex) && rangeElementIndex.length > 0) { - body['range-element-index'] = rangeElementIndex; - } - - console.log('adding custom indexes for '+testconfig.dmsdktestServerName); - return manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/properties', - params: { - format: 'json' - }, - body: body, - hasResponse: true - }).result(); - }). - then(function(response) { - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/temporal/axes/systemTime' - }).result(); - }). - then(function(response) { - if (response.statusCode < 400) { - return this; - } - return createAxis(manager, 'system'); - }). - then(function(response) { - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/temporal/axes/validTime' - }).result(); - }). - then(function(response) { - if (response.statusCode < 400) { - return this; - } - return createAxis(manager, 'valid'); - }). - then(function(response) { - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+ - '/temporal/collections/temporalCollection' - }).result(); - }). - then(function(response) { - if (response.statusCode < 400) { - return this; - } - return manager.post({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/temporal/collections', - body: { - 'collection-name': 'temporalCollection', - 'system-axis': 'systemTime', - 'valid-axis': 'validTime', - 'option': ['updates-safe'] - } - }).result(); - }). - then(function(response) { - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+ - '/temporal/collections/temporalCollectionLsqt' - }).result(); - }). - then(function(response) { - if (response.statusCode < 400) { - return this; - } - return manager.post({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+ - '/temporal/collections', - body: { - 'collection-name': 'temporalCollectionLsqt', - 'system-axis': 'systemTime', - 'valid-axis': 'validTime', - 'option': ['updates-safe'] - } - }).result(); - }). - then(function(response) { - return manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/temporal/collections/lsqt/properties?collection=temporalCollectionLsqt', - body: { - "lsqt-enabled": true, - "automation": { - "enabled": true - } - } - }).result(); - }). - then(function(response) { - console.log(testconfig.dmsdktestServerName+' setup succeeded'); - }); - } else { - console.log(testconfig.dmsdktestServerName+' setup failed with HTTP status: '+response.statusCode); - console.log(response.data); - } - }); - } else { - console.log(testconfig.dmsdktestServerName+' test server is available on port '+ - JSON.parse(response.data).port); - } - }); -} diff --git a/etc/test-setup-prompt.js b/etc/test-setup-prompt.js index 40f1b8c3..9158b908 100644 --- a/etc/test-setup-prompt.js +++ b/etc/test-setup-prompt.js @@ -1,8 +1,6 @@ /* * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ -// Simplified version - no more prompting, just returns admin/admin -// TODO: Remove this file when ml-gradle migration is complete function promptForAdmin(done) { // Always use admin/admin - no prompting needed diff --git a/etc/test-setup-qa.js b/etc/test-setup-qa.js deleted file mode 100644 index 0b8f1615..00000000 --- a/etc/test-setup-qa.js +++ /dev/null @@ -1,410 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var valcheck = require('core-util-is'); - -var marklogic = require('../lib/marklogic.js'); - -//var promptForAdmin = require('./test-setup-prompt.js'); -var setupUsers = require('./test-setup-users.js'); - -var testlib = require('./test-lib.js'); -var testconfig = require('./test-config-qa.js'); - -//promptForAdmin(createManager); -createManager('admin', 'admin'); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - var manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - var manager = testlib.createManager(manageClient); - - setupUsers(manager, setup); -} -function createAxis(manager, name) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + '/temporal/axes', - body: { - 'axis-name': name + 'Time', - 'axis-start': { - 'element-reference': { - 'namespace-uri': '', - 'localname': name + 'StartTime', - 'scalar-type': 'dateTime' - } - }, - 'axis-end': { - 'element-reference': { - 'namespace-uri': '', - 'localname': name + 'EndTime', - 'scalar-type': 'dateTime' - } - } - } - }).result(); -} -function setup(manager) { - console.log('checking for ' + testconfig.testServerName); - manager.get({ - endpoint: '/v1/rest-apis/' + testconfig.testServerName - }). - result(function (response) { - if (response.statusCode === 404) { - console.log('creating database and REST server for ' + testconfig.testServerName); - manager.post({ - endpoint: '/v1/rest-apis', - body: { - 'rest-api': { - name: testconfig.testServerName, - group: 'Default', - database: testconfig.testServerName, - 'modules-database': testconfig.testServerName + '-modules', - port: testconfig.restPort - } - } - }). - result(function (response) { - if (response.statusCode === 201) { - console.log('getting default indexes for ' + testconfig.testServerName); - manager.get({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + '/properties' - }).result(). - then(function (response) { - var indexName = null; - var indexType = null; - var indexdef = null; - var i = null; - - var elementWordLexicon = response.data['element-word-lexicon']; - var lexiconTest = { - defaultWordKey: true, - taggedWordKey: true, - otherKey: true - }; - - var lexers = []; - if (valcheck.isNullOrUndefined(elementWordLexicon)) { - elementWordLexicon = []; - lexers = Object.keys(lexiconTest); - } else { - elementWordLexicon.forEach(function (index) { - indexName = index.localname; - if (!valcheck.isUndefined(lexiconTest[indexName])) { - lexiconTest[indexName] = false; - } - }); - lexers = Object.keys(lexiconTest).filter(function (indexName) { - return (lexiconTest[indexName] !== false); - }); - } - - for (i = 0; i < lexers.length; i++) { - indexName = lexers[i]; - indexdef = { - collation: 'http://marklogic.com/collation/', - 'namespace-uri': '', - localname: indexName, - }; - elementWordLexicon.push(indexdef); - } - - var rangeElementIndex = response.data['range-element-index']; - - var rangeTest = { - rangeKey1: 'string', - rangeKey2: 'string', - rangeKey3: 'int', - rangeKey4: 'int', - systemStartTime: 'dateTime', - systemEndTime: 'dateTime', - validStartTime: 'dateTime', - validEndTime: 'dateTime', - popularity: 'int', - amt: 'double', - score: 'double', - rate: 'int', - datetime: 'dateTime' - }; - var rangers = []; - if (valcheck.isNullOrUndefined(rangeElementIndex)) { - rangeElementIndex = []; - rangers = Object.keys(rangeTest); - } else { - rangeElementIndex.forEach(function (index) { - indexName = index.localname; - if (!valcheck.isUndefined(rangeTest[indexName])) { - rangeTest[indexName] = false; - } - }); - rangers = Object.keys(rangeTest).filter(function (indexName) { - return (rangeTest[indexName] !== false); - }); - } - - for (i = 0; i < rangers.length; i++) { - indexName = rangers[i]; - indexType = rangeTest[indexName]; - indexdef = { - 'scalar-type': indexType, - collation: (indexType === 'string') ? - 'http://marklogic.com/collation/' : '', - 'namespace-uri': '', - localname: indexName, - 'range-value-positions': false, - 'invalid-values': 'ignore' - }; - rangeElementIndex.push(indexdef); - } - var body = { - 'collection-lexicon': true, - 'triple-index': true, - 'schema-database': testconfig.testServerName + '-modules', - 'stemmed-searches': 'basic', - 'range-path-index': [ - { - 'scalar-type': 'decimal', - 'path-expression': 'price/amt', - collation: '', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-path-index': [ - { - 'path-expression': 'gElemChildParent/gElemChildPoint', - 'coordinate-system': 'wgs84', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-index': [ - { - 'namespace-uri': '', - localname: 'gElemPoint', - 'coordinate-system': 'wgs84', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - }, - { - 'namespace-uri': '', - localname: 'gElemPointWgs84Double', - 'coordinate-system': 'wgs84/double', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-child-index': [ - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemChildParent', - 'namespace-uri': '', - localname: 'gElemChildPoint', - 'coordinate-system': 'wgs84', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - }, - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemChildParentEtrs89Double', - 'namespace-uri': '', - localname: 'gElemChildPointEtrs89Double', - 'coordinate-system': 'etrs89/double', - 'point-format': 'point', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-pair-index': [ - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemPair', - 'latitude-namespace-uri': '', - 'latitude-localname': 'latitude', - 'longitude-namespace-uri': '', - 'longitude-localname': 'longitude', - 'coordinate-system': 'wgs84', - 'range-value-positions': false, - 'invalid-values': 'reject' - }, - { - 'parent-namespace-uri': '', - 'parent-localname': 'gElemPairRawDouble', - 'latitude-namespace-uri': '', - 'latitude-localname': 'latitudeRawDouble', - 'longitude-namespace-uri': '', - 'longitude-localname': 'longitudeRawDouble', - 'coordinate-system': 'raw/double', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-element-attribute-pair-index': [ - { - 'parent-namespace-uri': '', - 'parent-localname': 'gAttrPair', - 'latitude-namespace-uri': '', - 'latitude-localname': 'latitude', - 'longitude-namespace-uri': '', - 'longitude-localname': 'longitude', - 'coordinate-system': 'wgs84', - 'range-value-positions': false, - 'invalid-values': 'reject' - } - ], - 'geospatial-region-path-index': [ - { - 'path-expression': '/root/item/point', - 'coordinate-system': 'wgs84', - 'geohash-precision': 1, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/linestring', - 'coordinate-system': 'wgs84/double', - 'geohash-precision': 2, - 'invalid-values': 'ignore' - }, - { - 'path-expression': '/root/item/circle', - 'coordinate-system': 'wgs84/double', - 'geohash-precision': 1, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/circle', - 'coordinate-system': 'wgs84', - 'geohash-precision': 1, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/box', - 'coordinate-system': 'wgs84/double', - 'geohash-precision': 2, - 'invalid-values': 'ignore' - }, - { - 'path-expression': '/root/item/polygon', - 'coordinate-system': 'wgs84', - 'geohash-precision': 3, - 'invalid-values': 'reject' - }, - { - 'path-expression': '/root/item/complex-polygon', - 'coordinate-system': 'wgs84', - 'geohash-precision': 1, - 'invalid-values': 'ignore' - } - ] - }; - if (valcheck.isArray(elementWordLexicon) && elementWordLexicon.length > 0) { - body['element-word-lexicon'] = elementWordLexicon; - } - if (valcheck.isArray(rangeElementIndex) && rangeElementIndex.length > 0) { - body['range-element-index'] = rangeElementIndex; - } - - console.log('adding custom indexes for ' + testconfig.testServerName); - return manager.put({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + '/properties', - params: { - format: 'json' - }, - body: body, - hasResponse: true - }).result(); - }). - then(function (response) { - return manager.get({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + '/temporal/axes/systemTime' - }).result(); - }). - then(function (response) { - if (response.statusCode < 400) { - return this; - } - return createAxis(manager, 'system'); - }). - then(function (response) { - return manager.get({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + '/temporal/axes/validTime' - }).result(); - }). - then(function (response) { - if (response.statusCode < 400) { - return this; - } - return createAxis(manager, 'valid'); - }). - then(function (response) { - return manager.get({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + - '/temporal/collections/temporalCollection' - }).result(); - }). - then(function (response) { - if (response.statusCode < 400) { - return this; - } - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + '/temporal/collections', - body: { - 'collection-name': 'temporalCollection', - 'system-axis': 'systemTime', - 'valid-axis': 'validTime', - 'option': ['updates-safe'] - } - }).result(); - }). - then(function (response) { - return manager.get({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + - '/temporal/collections/temporalCollectionLsqt' - }).result(); - }). - then(function (response) { - if (response.statusCode < 400) { - return this; - } - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + - '/temporal/collections', - body: { - 'collection-name': 'temporalCollectionLsqt', - 'system-axis': 'systemTime', - 'valid-axis': 'validTime', - 'option': ['updates-safe'] - } - }).result(); - }). - then(function (response) { - return manager.put({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName + '/temporal/collections/lsqt/properties?collection=temporalCollectionLsqt', - body: { - 'lsqt-enabled': true, - 'automation': { - 'enabled': true - } - } - }).result(); - }). - then(function (response) { - console.log(testconfig.testServerName + ' setup succeeded'); - }); - } else { - console.log(testconfig.testServerName + ' setup failed with HTTP status: ' + response.statusCode); - console.log(response.data); - } - }); - } else { - console.log(testconfig.testServerName + ' test server is available on port ' + - JSON.parse(response.data).port); - } - }); -} diff --git a/etc/test-setup.js b/etc/test-setup.js deleted file mode 100644 index 7bf1265f..00000000 --- a/etc/test-setup.js +++ /dev/null @@ -1,626 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -const fs = require('fs'); -const valcheck = require('core-util-is'); -const marklogic = require('../lib/marklogic.js'); - -const promptForAdmin = require('./test-setup-prompt.js'); -const setupUsers = require('./test-setup-users.js'); - -const testlib = require('./test-lib.js'); -const testconfig = require('./test-config.js'); - -const moduleFiles = [ - { - uri:'/optic/test/masterDetail.tdex', - collections:['http://marklogic.com/xdmp/tde'], - contentType:'application/vnd.marklogic-tde+xml', - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'update']} - ], - content:fs.createReadStream('./etc/data/masterDetail.tdex') - },{ - uri:'/optic/test/musician.tdex', - collections:['http://marklogic.com/xdmp/tde'], - contentType:'application/vnd.marklogic-tde+xml', - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'update']} - ], - content:fs.createReadStream('./etc/data/musician.tdex') - },{ - uri:'/etc/optic/rowPostProcessors.sjs', - contentType:'application/vnd.marklogic-javascript', - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/rowPostProcessors.sjs') - },{ - uri:'/etc/optic/employees.tdej', - contentType:'application/json', - collections:['http://marklogic.com/xdmp/tde'], - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/employees.tdej') - }, { uri:'/etc/optic/unnestView.tdej', - contentType:'application/json', - collections:['http://marklogic.com/xdmp/tde'], - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/unnestView.tdej') - }, { uri:'/etc/articleCitation.json', - contentType:'application/json', - collections:['http://marklogic.com/xdmp/tde'], - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/articleCitation.json') - },{ uri:'/validation/validateDoc-test.json', - contentType:'application/json', - collections:['http://marklogic.com/xdmp/tde'], - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/validateDoc-test.json') - }, { uri:'/validateDoc-test.sch', - contentType:'application/vnd.marklogic-tde+xml', - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/validateDoc-test.sch') - },{ uri:'/validateDoc-test.sch-validator.xsl', - contentType:'application/vnd.marklogic-tde+xml', - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/validateDoc-test.sch-validator.xsl') - }, { - uri:'/optic/test/transformDoc-test.mjs', - contentType:'application/vnd.marklogic-javascript', - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/transformDoc-test.mjs') - }, - { - uri:'/optic/test/transformDoc-test.xslt', - contentType:'application/vnd.marklogic-tde+xml', - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/transformDoc-test.xslt') - }, - { - uri:'/optic/test/transformDoc-test-two-params.mjs', - contentType:'application/vnd.marklogic-tde+xml', - permissions: [ - {'role-name':'app-user', capabilities:['read', 'execute']}, - {'role-name':'app-builder', capabilities:['read', 'execute']}, - {'role-name':testconfig.restReaderConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restWriterConnection.user, capabilities:['read', 'execute', 'update']}, - {'role-name':testconfig.restAdminConnection.user, capabilities:['read', 'execute', 'update']} - ], - content:fs.createReadStream('./etc/data/transformDoc-test-two-params.mjs') - } -]; - -const dataFiles = [ - { - uri:'/optic/test/masterDetail.xml', - collections:['/optic/test', '/schemas/inventory'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:fs.createReadStream('./etc/data/masterDetail.xml') - },{ - uri:'/optic/test/tripleSets.xml', - collections:['/optic/test', '/graphs/inventory'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:fs.createReadStream('./etc/data/tripleSets.xml') - },{ - uri:'/optic/test/queryDoc1.json', - collections:['/optic/test', '/optic/test1'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{srchFood:'apples', srchNumber:2, srchLevel:20, srchCity:'Cairo', - srchPoint: '15.25, 15.25', - srchContainer:{srchColA:'common', srchColB:'outlier', srchColC:'common'}} - },{ - uri:'/optic/test/queryDoc2.json', - collections:['/optic/test', '/optic/test2'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{srchFood:'banannas', srchNumber:3, srchLevel:30, srchCity:'Antioch', - srchPoint: '25.25, 25.25', - srchContainer:{srchColA:'common', srchColB:'common', srchColC:'outlier'}} - },{ - uri:'/optic/test/queryDoc3.json', - collections:['/optic/test', '/optic/test3'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{srchFood:'citron', srchNumber:1, srchLevel:10, srchCity:'Bonn', - srchPoint: '35.25, 35.25', - srchContainer:{srchColA:'outlier', srchColB:'common', srchColC:'common'}} - },{ - uri:'/optic/test/musician1.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{musician:{lastName:'Armstrong', firstName:'Louis', dob:'1901-08-04', instrument:['trumpet', 'vocal']}} - },{ - uri:'/optic/test/albums1.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{style:['dixieland'], albums:[ - {triple:{subject:'/optic/test/albums1_1', predicate:'/optic/test/albumName', object:'Hot Fives'}}, - {triple:{subject:'/optic/test/albums1_1', predicate:'/optic/test/musicianUri', object:'/optic/test/musician1.json'}}, - {triple:{subject:'/optic/test/albums1_2', predicate:'/optic/test/albumName', object:'Porgy and Bess'}}, - {triple:{subject:'/optic/test/albums1_2', predicate:'/optic/test/musicianUri', object:'/optic/test/musician1.json'}} - ]} - },{ - uri:'/optic/test/musician2.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{musician:{lastName:'Byron', firstName:'Don', dob:'1958-11-08', instrument:['clarinet', 'saxophone']}} - },{ - uri:'/optic/test/albums2.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{style:['avantgarde'], albums:[ - {triple:{subject:'/optic/test/albums2_1', predicate:'/optic/test/albumName', object:'Four Thoughts on Marvin Gaye'}}, - {triple:{subject:'/optic/test/albums2_1', predicate:'/optic/test/musicianUri', object:'/optic/test/musician2.json'}}, - {triple:{subject:'/optic/test/albums2_2', predicate:'/optic/test/albumName', object:'A Ballad For Many'}}, - {triple:{subject:'/optic/test/albums2_2', predicate:'/optic/test/musicianUri', object:'/optic/test/musician2.json'}} - ]} - },{ - uri:'/optic/test/musician3.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{musician:{lastName:'Coltrane', firstName:'John', dob:'1926-09-23', instrument:['saxophone']}} - },{ - uri:'/optic/test/albums3.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{style:['avantgarde'], albums:[ - {triple:{subject:'/optic/test/albums3_1', predicate:'/optic/test/albumName', object:'Impressions'}}, - {triple:{subject:'/optic/test/albums3_1', predicate:'/optic/test/musicianUri', object:'/optic/test/musician3.json'}}, - {triple:{subject:'/optic/test/albums3_2', predicate:'/optic/test/albumName', object:'Crescent'}}, - {triple:{subject:'/optic/test/albums3_2', predicate:'/optic/test/musicianUri', object:'/optic/test/musician3.json'}} - ]} - },{ - uri:'/optic/test/musician4.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{musician:{lastName:'Davis', firstName:'Miles', dob:'1926-05-26', instrument:['trumpet']}} - },{ - uri:'/optic/test/albums4.json', - collections:['/optic/test', '/optic/music'], - permissions: [ - {'role-name':'app-user', capabilities:['read']}, - {'role-name':'app-builder', capabilities:['read', 'update']} - ], - content:{style:['modal'], albums:[ - {triple:{subject:'/optic/test/albums4_1', predicate:'/optic/test/albumName', object:'Kind of Blue'}}, - {triple:{subject:'/optic/test/albums4_1', predicate:'/optic/test/musicianUri', object:'/optic/test/musician4.json'}}, - {triple:{subject:'/optic/test/albums4_2', predicate:'/optic/test/albumName', object:'In a Silent Way'}}, - {triple:{subject:'/optic/test/albums4_2', predicate:'/optic/test/musicianUri', object:'/optic/test/musician4.json'}} - ]} - },{ - uri:'/graphQL-Publisher_1.xml', - collections:['/graphQL'], - permissions: [ - {'role-name':'rest-reader', capabilities:['read']}, - {'role-name':'rest-writer', capabilities:['read', 'update']} - ], - content:fs.createReadStream('./etc/data/Publisher-1.xml') - },{ - uri:'/graphQL-Publisher_2.xml', - collections:['/graphQL'], - permissions: [ - {'role-name':'rest-reader', capabilities:['read']}, - {'role-name':'rest-writer', capabilities:['read', 'update']} - ], - content:fs.createReadStream('./etc/data/Publisher-2.xml') - }]; - -promptForAdmin(createManager); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - const manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - const manager = testlib.createManager(manageClient); - - setupUsers(manager, setup); -} -function createAxis(manager, name) { - return manager.post({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/axes', - body: { - 'axis-name': name+'Time', - 'axis-start': { - 'element-reference': { - 'namespace-uri': '', - 'localname': name+'StartTime', - 'scalar-type': 'dateTime' - } - }, - 'axis-end': { - 'element-reference': { - 'namespace-uri': '', - 'localname': name+'EndTime', - 'scalar-type': 'dateTime' - } - } - } - }).result(); -} -function setup(manager) { - console.log('checking for '+testconfig.testServerName); - manager.get({ - endpoint: '/v1/rest-apis/'+testconfig.testServerName - }). - result(function(response) { - if (response.statusCode === 404) { - console.log('creating database and REST server for '+testconfig.testServerName); - manager.post({ - endpoint: '/v1/rest-apis', - body: { - 'rest-api': { - name: testconfig.testServerName, - group: 'Default', - database: testconfig.testServerName, - 'modules-database': testconfig.testServerName+'-modules', - port: testconfig.restPort - } - } - }). - result(function(response) { - if (response.statusCode === 201) { - console.log('getting default indexes for '+testconfig.testServerName); - manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/properties' - }).result(). - then(function(response) { - let indexName = null; - let indexType = null; - let indexdef = null; - let i = null; - - const lexiconTest = { - defaultWordKey: true, - taggedWordKey: true - }; - let elementWordLexicon = response.data['element-word-lexicon']; - let lexers = []; - if (valcheck.isNullOrUndefined(elementWordLexicon)) { - elementWordLexicon = []; - lexers = Object.keys(lexiconTest); - } else { - elementWordLexicon.forEach(function(index){ - indexName = index.localname; - if (!valcheck.isUndefined(lexiconTest[indexName])) { - lexiconTest[indexName] = false; - } - }); - lexers = Object.keys(lexiconTest).filter(function(indexName){ - return (lexiconTest[indexName] !== false); - }); - } - - for (i=0; i < lexers.length; i++) { - indexName = lexers[i]; - indexdef = { - collation: 'http://marklogic.com/collation/', - 'namespace-uri': '', - localname: indexName, - }; - elementWordLexicon.push(indexdef); - } - - const rangeTest = { - rangeKey1: 'string', - rangeKey2: 'string', - rangeKey3: 'int', - rangeKey4: 'int', - rangeKey5: 'int', - srchCity: 'string', - srchLevel: 'int', - srchNumber: 'int', - systemStartTime: 'dateTime', - systemEndTime: 'dateTime', - validStartTime: 'dateTime', - validEndTime: 'dateTime' - }; - let rangeElementIndex = response.data['range-element-index']; - let rangers = []; - if (valcheck.isNullOrUndefined(rangeElementIndex)) { - rangeElementIndex = []; - rangers = Object.keys(rangeTest); - } else { - rangeElementIndex.forEach(function(index){ - indexName = index.localname; - if (!valcheck.isUndefined(rangeTest[indexName])) { - rangeTest[indexName] = false; - } - }); - rangers = Object.keys(rangeTest).filter(function(indexName){ - return (rangeTest[indexName] !== false); - }); - } - - for (i=0; i < rangers.length; i++) { - indexName = rangers[i]; - indexType = rangeTest[indexName]; - indexdef = { - 'scalar-type': indexType, - collation: (indexType === 'string') ? - 'http://marklogic.com/collation/' : '', - 'namespace-uri': '', - localname: indexName, - 'range-value-positions': false, - 'invalid-values': 'ignore' - }; - rangeElementIndex.push(indexdef); - } - - const pointGeospatialIndex = { - 'namespace-uri': '', - localname: 'point', - 'coordinate-system': 'wgs84', - 'range-value-positions': false, - 'point-format': 'point', - 'invalid-values': 'ignore' - }; - let geospatialElementIndex = response.data['geospatial-element-index']; - - if (valcheck.isNullOrUndefined(geospatialElementIndex)) { - geospatialElementIndex = [pointGeospatialIndex]; - } else if (geospatialElementIndex.some( - makeIndexTester(pointGeospatialIndex.localname) - )) { - geospatialElementIndex = null; - } else { - geospatialElementIndex.push(pointGeospatialIndex); - } - - const body = { - 'collection-lexicon': true, - 'uri-lexicon': true, - 'triple-index': true, - 'schema-database': testconfig.testServerName+'-modules', - }; - - if (valcheck.isArray(elementWordLexicon) && elementWordLexicon.length > 0) { - body['element-word-lexicon'] = elementWordLexicon; - } - if (valcheck.isArray(rangeElementIndex) && rangeElementIndex.length > 0) { - body['range-element-index'] = rangeElementIndex; - } - if (valcheck.isArray(geospatialElementIndex) && - geospatialElementIndex.length > 0) { - body['geospatial-element-index'] = geospatialElementIndex; - } - - console.log('adding custom indexes for '+testconfig.testServerName); - return manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/properties', - params: { - format: 'json' - }, - body: body, - hasResponse: true - }).result(); - }). - then(function(response) { - console.log('checking system temporal axis'); - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/axes/systemTime' - }).result(); - }). - then(function(response) { - if (response.statusCode < 400) { - return this; - } - console.log('creating system temporal axis'); - return createAxis(manager, 'system'); - }). - then(function(response) { - console.log('checking valid temporal axis'); - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/axes/validTime' - }).result(); - }). - then(function(response) { - if (response.statusCode < 400) { - return this; - } - console.log('creating valid temporal axis'); - return createAxis(manager, 'valid'); - }). - then(function(response) { - console.log('checking temporal collection'); - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+ - '/temporal/collections/temporalCollection' - }).result(); - }). - then(function(response) { - if (response.statusCode < 400) { - return this; - } - console.log('creating temporal collection'); - return manager.post({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/collections', - body: { - 'collection-name': 'temporalCollection', - 'system-axis': 'systemTime', - 'valid-axis': 'validTime', - option: ['updates-admin-override'] - } - }).result(); - }). - then(function(response) { - return manager.get({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+ - '/temporal/collections/lsqt/properties?collection=temporalCollection' - }).result(); - }). - then(function(response) { - // 2017-10-24: Commenting out, LSQT enablement required for LSQT testing - // if (response.statusCode < 400) { - // return this; - // } - console.log('configuring LSQT'); - return manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+ - '/temporal/collections/lsqt/properties?collection=temporalCollection', - body: { - 'lsqt-enabled': true, - automation: { - enabled: false - } - } - }).result(); - }). - then(function(response){ - console.log('setting up modules database resources'); - const modDb = marklogic.createDatabaseClient({ - database: testconfig.testServerName+'-modules', - host: testconfig.manageAdminConnection.host, - port: testconfig.manageAdminConnection.port, - user: testconfig.manageAdminConnection.user, - password: testconfig.manageAdminConnection.password, - authType: testconfig.manageAdminConnection.authType - }); - return modDb.documents.write(moduleFiles).result(); - }). -/* TODO: advance LSQT after creating documents - then(function(response) { - const evalConnection = { - host: testconfig.testHost, - port: testconfig.restPort, - user: testconfig.manageAdminConnection.user, - password: testconfig.manageAdminConnection.password, - authType: testconfig.restAuthType - }; - const evalClient = marklogic.createDatabaseClient(evalConnection); - return evalClient.xqueryEval( - 'xquery version "1.0-ml"; '+ - 'import module namespace temporal = "http://marklogic.com/xdmp/temporal" '+ - ' at "/MarkLogic/temporal.xqy"; '+ - 'temporal:advance-lsqt("temporalCollection")' - ).result(); - }). - */ - then(function(response){ - console.log('setting up sample documents'); - const db = marklogic.createDatabaseClient({ - host: testconfig.restWriterConnection.host, - port: testconfig.restWriterConnection.port, - user: testconfig.restWriterConnection.user, - password: testconfig.restWriterConnection.password, - authType: testconfig.restWriterConnection.authType - }); - return db.documents.write(dataFiles).result(); - }). - then(function(response) { - console.log(testconfig.testServerName+' setup succeeded'); - }). - catch(function(err) { - console.log('failed to set up '+testconfig.testServerName+' server:\n'+ - JSON.stringify(err, null, 2)); - process.exit(1); - }); - } else { - console.log(testconfig.testServerName+' setup failed with HTTP status: '+response.statusCode); - console.log(response.data); - process.exit(1); - } - }); - } else { - console.log(testconfig.testServerName+' test server is available on port '+ - JSON.parse(response.data).port); - } - }); -} - -function makeIndexTester(testLocalname) { - return function indexTester(index) { - return (index.localname === testLocalname); - }; -} diff --git a/etc/test-teardown-dmsdk-qa.js b/etc/test-teardown-dmsdk-qa.js deleted file mode 100644 index f8c5718b..00000000 --- a/etc/test-teardown-dmsdk-qa.js +++ /dev/null @@ -1,76 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var marklogic = require('../lib/marklogic.js'); - -var testlib = require('./test-lib.js'); -//var promptForAdmin = require('./test-setup-prompt.js'); -var testconfig = require('./test-config-qa.js'); - -//promptForAdmin(createManager); -createManager('admin', 'admin'); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - var manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - var manager = testlib.createManager(manageClient); - - setup(manager); -} -function setup(manager) { - console.log('checking for '+testconfig.dmsdktestServerName); - manager.get({ - endpoint: '/v1/rest-apis/'+testconfig.dmsdktestServerName - }). - result(function(response) { - if (response.statusCode === 404) { - console.log(testconfig.dmsdktestServerName+' not found - nothing to delete'); - } else { - console.log('removing database and REST server for '+testconfig.dmsdktestServerName); - manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/properties', - params: { - format: 'json' - }, - body: { - 'schema-database': 'Schemas' - }, - hasResponse: true - }).result(). - then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.dmsdktestServerName, - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }). - then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.dmsdktestServerName+'-modules', - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }). - then(setTimeout(function(response) { - return manager.remove({ - endpoint: '/v1/rest-apis/'+testconfig.dmsdktestServerName, - accept: 'application/json', - params: {include: ['content', 'modules']} - }).result(); - }, 10000)). - then(setTimeout(function(response) { - console.log('teardown succeeded - restart the server'); - }, - function(error) { - console.log('failed to tear down '+testconfig.dmsdktestServerName+' server:\n'+ - JSON.stringify(error)); - }, 10000)); - } - }); -} - diff --git a/etc/test-teardown-nodeOpticFunctionalTest.js b/etc/test-teardown-nodeOpticFunctionalTest.js deleted file mode 100644 index f8c5718b..00000000 --- a/etc/test-teardown-nodeOpticFunctionalTest.js +++ /dev/null @@ -1,76 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var marklogic = require('../lib/marklogic.js'); - -var testlib = require('./test-lib.js'); -//var promptForAdmin = require('./test-setup-prompt.js'); -var testconfig = require('./test-config-qa.js'); - -//promptForAdmin(createManager); -createManager('admin', 'admin'); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - var manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - var manager = testlib.createManager(manageClient); - - setup(manager); -} -function setup(manager) { - console.log('checking for '+testconfig.dmsdktestServerName); - manager.get({ - endpoint: '/v1/rest-apis/'+testconfig.dmsdktestServerName - }). - result(function(response) { - if (response.statusCode === 404) { - console.log(testconfig.dmsdktestServerName+' not found - nothing to delete'); - } else { - console.log('removing database and REST server for '+testconfig.dmsdktestServerName); - manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.dmsdktestServerName+'/properties', - params: { - format: 'json' - }, - body: { - 'schema-database': 'Schemas' - }, - hasResponse: true - }).result(). - then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.dmsdktestServerName, - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }). - then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.dmsdktestServerName+'-modules', - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }). - then(setTimeout(function(response) { - return manager.remove({ - endpoint: '/v1/rest-apis/'+testconfig.dmsdktestServerName, - accept: 'application/json', - params: {include: ['content', 'modules']} - }).result(); - }, 10000)). - then(setTimeout(function(response) { - console.log('teardown succeeded - restart the server'); - }, - function(error) { - console.log('failed to tear down '+testconfig.dmsdktestServerName+' server:\n'+ - JSON.stringify(error)); - }, 10000)); - } - }); -} - diff --git a/etc/test-teardown-qa.js b/etc/test-teardown-qa.js deleted file mode 100644 index b9ba184b..00000000 --- a/etc/test-teardown-qa.js +++ /dev/null @@ -1,131 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var marklogic = require('../lib/marklogic.js'); - -var testlib = require('./test-lib.js'); -//var promptForAdmin = require('./test-setup-prompt.js'); -var testconfig = require('./test-config-qa.js'); - -//promptForAdmin(createManager); -createManager('admin', 'admin'); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - var manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - var manager = testlib.createManager(manageClient); - - setup(manager); -} -function setup(manager) { - console.log('checking for '+testconfig.testServerName); - manager.get({ - endpoint: '/v1/rest-apis/'+testconfig.testServerName - }). - result(function(response) { - if (response.statusCode === 404) { - console.log(testconfig.testServerName+' not found - nothing to delete'); - } else { - console.log('removing database and REST server for '+testconfig.testServerName); - manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/properties', - params: { - format: 'json' - }, - body: { - 'schema-database': 'Schemas' - }, - hasResponse: true - }).result(). - then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName, - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }). - then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName+'-modules', - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }). - /*then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/collections?collection=temporalCollection' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/collections?collection=temporalCollectionLsqt' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/axes/systemTime' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/temporal/axes/validTime' - }).result(); - }).*/ - then(setTimeout(function(response) { - return manager.remove({ - endpoint: '/manage/v2/users/rest-evaluator' - }).result(); - }, 3000)). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/users/rest-admin' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/users/rest-writer' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/users/rest-reader' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/users/rest-temporal-writer' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/roles/rest-evaluator' - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/roles/rest-temporal-writer' - }).result(); - }). - then(setTimeout(function(response) { - return manager.remove({ - endpoint: '/v1/rest-apis/'+testconfig.testServerName, - accept: 'application/json', - params: {include: ['content', 'modules']} - }).result(); - }, 10000)). - then(setTimeout(function(response) { - console.log('teardown succeeded - restart the server'); - }, - function(error) { - console.log('failed to tear down '+testconfig.testServerName+' server:\n'+ - JSON.stringify(error)); - }, 10000)); - } - }); -} - diff --git a/etc/test-teardown.js b/etc/test-teardown.js deleted file mode 100644 index f4d68da1..00000000 --- a/etc/test-teardown.js +++ /dev/null @@ -1,73 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var marklogic = require('../lib/marklogic.js'); - -var testlib = require('./test-lib.js'); -var promptForAdmin = require('./test-setup-prompt.js'); -var testconfig = require('./test-config.js'); - -promptForAdmin(createManager); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - var manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - var manager = testlib.createManager(manageClient); - - setup(manager); -} -function setup(manager) { - console.log('checking for '+testconfig.testServerName); - manager.get({ - endpoint: '/v1/rest-apis/'+testconfig.testServerName - }). - result(function(response) { - if (response.statusCode === 404) { - console.log(testconfig.testServerName+' not found - nothing to delete'); - } else { - console.log('removing database and REST server for '+testconfig.testServerName); - manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName, - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(). - then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/' + testconfig.testServerName+'-modules', - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }). - then(function(response) { - return manager.put({ - endpoint: '/manage/v2/databases/'+testconfig.testServerName+'/properties', - params: { - format: 'json' - }, - body: {'schema-database': 'Schemas'}, - hasResponse: true - }).result(); - }). - then(function(response) { - return manager.remove({ - endpoint: '/v1/rest-apis/'+testconfig.testServerName, - accept: 'application/json', - params: {include: ['content', 'modules']} - }).result(); - }). - then(function(response) { - console.log('teardown succeeded - restart the server'); - }, - function(error) { - console.log('failed to tear down '+testconfig.testServerName+' server:\n'+ - JSON.stringify(error, null, 2)); - }); - } - }); -} - diff --git a/etc/users-setup.js b/etc/users-setup.js deleted file mode 100644 index c5f027f5..00000000 --- a/etc/users-setup.js +++ /dev/null @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var valcheck = require('core-util-is'); - -var marklogic = require('../lib/marklogic.js'); - -var promptForAdmin = require('./test-setup-prompt.js'); -var setupUsers = require('./test-setup-users.js'); - -var testlib = require('./test-lib.js'); -var testconfig = require('./test-config.js'); - -promptForAdmin(createManager); - -function createManager(adminUser, adminPassword) { - testconfig.manageAdminConnection.user = adminUser; - testconfig.manageAdminConnection.password = adminPassword; - - var manageClient = - marklogic.createDatabaseClient(testconfig.manageAdminConnection); - var manager = testlib.createManager(manageClient); - - setupUsers(manager); -} diff --git a/package.json b/package.json index b8e2083f..36676144 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,7 @@ "main": "./lib/marklogic.js", "scripts": { "doc": "gulp doc", - "lint": "gulp lint", - "test:setup": "node etc/test-setup.js", - "test:teardown": "node etc/test-teardown.js", - "test": "gulp test" + "lint": "gulp lint" }, "keywords": [ "marklogic", From e528e3581f8caa13884084b75296c79b16f3e99f Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 29 Oct 2025 10:00:13 -0400 Subject: [PATCH 52/58] MLE-24733 Deleting what should be unused config-optic files --- config-optic/databaseconfig.sjs | 36 - config-optic/loaddata.js | 173 -- config-optic/loadtde.xqy | 54 - config-optic/myload.js | 25 - config-optic/qa-data/city1.json | 6 - config-optic/qa-data/city2.json | 6 - config-optic/qa-data/city3.json | 6 - config-optic/qa-data/city4.json | 6 - config-optic/qa-data/city5.json | 6 - config-optic/qa-data/companies_100.ttl | 1804 ----------------- config-optic/qa-data/dedupdoc1.xml | 15 - config-optic/qa-data/doc1.json | 18 - config-optic/qa-data/doc2.json | 18 - config-optic/qa-data/doc3.json | 18 - config-optic/qa-data/doc4.xml | 19 - config-optic/qa-data/doc5.xml | 19 - config-optic/qa-data/mapperReducer.sjs | 92 - config-optic/qa-data/masterDetail.tdex | 35 - config-optic/qa-data/masterDetail.xml | 59 - config-optic/qa-data/masterDetail2.json | 64 - config-optic/qa-data/masterDetail2.tdej | 53 - config-optic/qa-data/masterDetail3.json | 64 - config-optic/qa-data/masterDetail3.tdej | 53 - config-optic/qa-data/masterDetail4.json | 43 - config-optic/qa-data/masterDetail4.tdej | 53 - config-optic/qa-data/masterDetail5.json | 29 - config-optic/qa-data/otherPlayerTripleSet.xml | 87 - config-optic/qa-data/people.ttl | 70 - config-optic/qa-data/playerTripleSet.xml | 376 ---- config-optic/qa-data/teamTripleSet.xml | 56 - config-optic/setupqa.js | 113 -- config-optic/teardown.js | 95 - config-optic/testlib.js | 186 -- config-optic/userconfig.js | 100 - 34 files changed, 3857 deletions(-) delete mode 100755 config-optic/databaseconfig.sjs delete mode 100755 config-optic/loaddata.js delete mode 100644 config-optic/loadtde.xqy delete mode 100644 config-optic/myload.js delete mode 100755 config-optic/qa-data/city1.json delete mode 100755 config-optic/qa-data/city2.json delete mode 100755 config-optic/qa-data/city3.json delete mode 100755 config-optic/qa-data/city4.json delete mode 100755 config-optic/qa-data/city5.json delete mode 100755 config-optic/qa-data/companies_100.ttl delete mode 100644 config-optic/qa-data/dedupdoc1.xml delete mode 100755 config-optic/qa-data/doc1.json delete mode 100755 config-optic/qa-data/doc2.json delete mode 100755 config-optic/qa-data/doc3.json delete mode 100755 config-optic/qa-data/doc4.xml delete mode 100755 config-optic/qa-data/doc5.xml delete mode 100644 config-optic/qa-data/mapperReducer.sjs delete mode 100755 config-optic/qa-data/masterDetail.tdex delete mode 100755 config-optic/qa-data/masterDetail.xml delete mode 100755 config-optic/qa-data/masterDetail2.json delete mode 100755 config-optic/qa-data/masterDetail2.tdej delete mode 100755 config-optic/qa-data/masterDetail3.json delete mode 100755 config-optic/qa-data/masterDetail3.tdej delete mode 100755 config-optic/qa-data/masterDetail4.json delete mode 100755 config-optic/qa-data/masterDetail4.tdej delete mode 100755 config-optic/qa-data/masterDetail5.json delete mode 100755 config-optic/qa-data/otherPlayerTripleSet.xml delete mode 100644 config-optic/qa-data/people.ttl delete mode 100755 config-optic/qa-data/playerTripleSet.xml delete mode 100755 config-optic/qa-data/teamTripleSet.xml delete mode 100755 config-optic/setupqa.js delete mode 100644 config-optic/teardown.js delete mode 100644 config-optic/testlib.js delete mode 100755 config-optic/userconfig.js diff --git a/config-optic/databaseconfig.sjs b/config-optic/databaseconfig.sjs deleted file mode 100755 index 1648cc21..00000000 --- a/config-optic/databaseconfig.sjs +++ /dev/null @@ -1,36 +0,0 @@ -var admin = require("/MarkLogic/admin.xqy"); -var config = admin.getConfiguration(); -var dbid = xdmp.database("nodeOpticFunctionalTest"); -var modDbId = xdmp.database("nodeOpticFunctionalTestModules"); - -var cityIndex = admin.databaseRangeElementIndex("string", "", "city", "http://marklogic.com/collation/", fn.false()); -var popularityIndex = admin.databaseRangeElementIndex("int", "", "popularity", "", fn.false()); -var distanceIndex = admin.databaseRangeElementIndex("double", "", "distance", "", fn.false()); -var dateIndex = admin.databaseRangeElementIndex("date", "", "date", "", fn.false()); -var cityLexicon = admin.databaseElementWordLexicon("", "city", "http://marklogic.com/collation/"); -var geoIndex = admin.databaseGeospatialElementIndex("", "latLonPoint", "wgs84", fn.false()); -var idIndex = admin.databaseRangeElementIndex("int", "", "id", "", fn.false()); - -var cityNameIndex = admin.databaseRangeElementIndex("string", "", "cityName", "http://marklogic.com/collation/", fn.false()); -var cityTeamIndex = admin.databaseRangeElementIndex("string", "", "cityTeam", "http://marklogic.com/collation/", fn.false()); -var cityPopulationIndex = admin.databaseRangeElementIndex("long", "", "cityPopulation", "", fn.false()); - -config = admin.databaseAddRangeElementIndex(config, dbid, cityIndex); -config = admin.databaseAddRangeElementIndex(config, dbid, popularityIndex); -config = admin.databaseAddRangeElementIndex(config, dbid, distanceIndex); -config = admin.databaseAddRangeElementIndex(config, dbid, dateIndex); -config = admin.databaseAddRangeElementIndex(config, dbid, idIndex); - -config = admin.databaseAddRangeElementIndex(config, dbid, cityNameIndex); -config = admin.databaseAddRangeElementIndex(config, dbid, cityTeamIndex); -config = admin.databaseAddRangeElementIndex(config, dbid, cityPopulationIndex); - -config = admin.databaseAddElementWordLexicon(config, dbid, cityLexicon); -config = admin.databaseAddGeospatialElementIndex(config, dbid, geoIndex); -config = admin.databaseSetTripleIndex(config, dbid, fn.true()); -config = admin.databaseSetCollectionLexicon(config, dbid, fn.true()); -config = admin.databaseSetUriLexicon(config, dbid, fn.true()); - -config = admin.databaseSetSchemaDatabase(config, dbid, modDbId); - -admin.saveConfiguration(config); diff --git a/config-optic/loaddata.js b/config-optic/loaddata.js deleted file mode 100755 index 51f16580..00000000 --- a/config-optic/loaddata.js +++ /dev/null @@ -1,173 +0,0 @@ -'use strict'; - -var fs = require('fs'); - -var moduleFiles = [ - { - uri:'/optic/view/test/masterDetail.tdex', - collections:['http://marklogic.com/xdmp/tde'], - contentType:'application/vnd.marklogic-tde+xml', - content:fs.createReadStream('./config-optic/qa-data/masterDetail.tdex') - }, - { - uri:'/optic/view/test/masterDetail2.tdej', - collections:['http://marklogic.com/xdmp/tde'], - contentType:'application/vnd.marklogic-tde+json', - content:fs.createReadStream('./config-optic/qa-data/masterDetail2.tdej') - }, - { - uri:'/optic/view/test/masterDetail3.tdej', - collections:['http://marklogic.com/xdmp/tde'], - contentType:'application/vnd.marklogic-tde+json', - content:fs.createReadStream('./config-optic/qa-data/masterDetail3.tdej') - }, - { - uri:'/optic/view/test/masterDetail4.tdej', - collections:['http://marklogic.com/xdmp/tde'], - contentType:'application/vnd.marklogic-tde+json', - content:fs.createReadStream('./config-optic/qa-data/masterDetail4.tdej') - }, - { - uri:'/optic/test/mapperReducer.sjs', - contentType:'application/vnd.marklogic-javascript', - content:fs.createReadStream('./config-optic/qa-data/mapperReducer.sjs') - } -]; - -var dataFiles = [ - { - uri:'/optic/view/test/masterDetail.xml', - collections:['/optic/view/test'], - content:fs.createReadStream('./config-optic/qa-data/masterDetail.xml') - },{ - uri:'/optic/view/test/masterDetail2.json', - collections:['/optic/view/test'], - content:fs.createReadStream('./config-optic/qa-data/masterDetail2.json') - },{ - uri:'/optic/view/test/masterDetail3.json', - collections:['/optic/view/test'], - content:fs.createReadStream('./config-optic/qa-data/masterDetail3.json') - },{ - uri:'/optic/view/test/masterDetail4.json', - collections:['/optic/view/test'], - content:fs.createReadStream('./config-optic/qa-data/masterDetail4.json') - },{ - uri:'/optic/view/test/masterDetail5.json', - collections:['/optic/view/test'], - content:fs.createReadStream('./config-optic/qa-data/masterDetail5.json') - },{ - uri:'/optic/triple/test/playerTripleSet.xml', - collections:['/optic/player/triple/test'], - content:fs.createReadStream('./config-optic/qa-data/playerTripleSet.xml') - },{ - uri:'/optic/triple/test/teamTripleSet.xml', - collections:['/optic/team/triple/test'], - content:fs.createReadStream('./config-optic/qa-data/teamTripleSet.xml') - },{ - uri:'/optic/triple/test/duplicatePlayerTripleSet.xml', - collections:['/optic/player/triple/test'], - content:fs.createReadStream('./config-optic/qa-data/playerTripleSet.xml') - },{ - uri:'/optic/triple/test/duplicateTeamTripleSet.xml', - collections:['/optic/team/triple/test'], - content:fs.createReadStream('./config-optic/qa-data/teamTripleSet.xml') - },{ - uri:'/optic/triple/test/otherPlayerTripleSet.xml', - collections:['/optic/other/player/triple/test'], - content:fs.createReadStream('./config-optic/qa-data/otherPlayerTripleSet.xml') - },{ - uri:'/optic/lexicon/test/doc1.json', - collections:['/optic/lexicon/test', '/other/coll1', '/other/coll2'], - content:fs.createReadStream('./config-optic/qa-data/doc1.json') - },{ - uri:'/optic/lexicon/test/doc2.json', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/doc2.json') - },{ - uri:'/optic/lexicon/test/doc3.json', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/doc3.json') - },{ - uri:'/optic/lexicon/test/doc4.xml', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/doc4.xml') - },{ - uri:'/optic/lexicon/test/doc5.xml', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/doc5.xml') - },{ - uri:'/optic/lexicon/test/city1.json', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/city1.json') - },{ - uri:'/optic/lexicon/test/city2.json', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/city2.json') - },{ - uri:'/optic/lexicon/test/city3.json', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/city3.json') - },{ - uri:'/optic/lexicon/test/city4.json', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/city4.json') - },{ - uri:'/optic/lexicon/test/city5.json', - collections:['/optic/lexicon/test'], - content:fs.createReadStream('./config-optic/qa-data/city5.json') - },{ - uri:'/optic/plan/test/planViews.json', - collections:['/optic/plan/test'], - content:fs.createReadStream('./config-optic/qa-data/planViews.json') - },{ - uri:'/optic/plan/test/planLexicons.json', - collections:['/optic/plan/test'], - content:fs.createReadStream('./config-optic/qa-data/planLexicons.json') - },{ - uri:'/optic/plan/test/planTriples.json', - collections:['/optic/plan/test'], - content:fs.createReadStream('./config-optic/qa-data/planTriples.json') - },{ - uri:'/optic/sparql/test/dedupdoc1.xml', - collections:['/optic/plan/test'], - content:fs.createReadStream('./config-optic/qa-data/dedupdoc1.xml') - }]; - -var graphFiles1 = [ - { - uri: '/optic/sparql/test/people.ttl', - contentType: 'text/turtle', - data: fs.createReadStream('./config-optic/qa-data/people.ttl') - } -]; - -var graphFiles2 = [ - { - uri: '/optic/sparql/test/companies.ttl', - contentType: 'text/turtle', - data: fs.createReadStream('./config-optic/qa-data/companies_100.ttl') - } -]; - -function writeDocuments(db) { - return db.documents.write(dataFiles); -} - -function writeDocumentsToMod(db) { - return db.documents.write(moduleFiles); -} - -function writeGraphs1(db) { - return db.graphs.write(graphFiles1); -} - -function writeGraphs2(db) { - return db.graphs.write(graphFiles2); -} - -module.exports = { - writeDocuments: writeDocuments, - writeDocumentsToMod: writeDocumentsToMod, - writeGraphs1: writeGraphs1, - writeGraphs2: writeGraphs2 -}; diff --git a/config-optic/loadtde.xqy b/config-optic/loadtde.xqy deleted file mode 100644 index 7ad2bc38..00000000 --- a/config-optic/loadtde.xqy +++ /dev/null @@ -1,54 +0,0 @@ -xquery version "1.0-ml"; - -let $evalStr := -' -xquery version "1.0-ml"; -xdmp:document-insert("/optic/view/test/masterDetail.tde", - , -(xdmp:permission("rest-evaluator", "update")), -"http://marklogic.com/xdmp/tde", -() -)' - -return -xdmp:eval( - $evalStr, - (), - - {xdmp:database("nodeOpticFunctionalTestModules")} - -); diff --git a/config-optic/myload.js b/config-optic/myload.js deleted file mode 100644 index 37b0df03..00000000 --- a/config-optic/myload.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; - -var util = require('util'); - -var fs = require('fs'); - -var marklogic = require('marklogic'); -var testlib = require('./testlib.js'); - -var clientConnectdef = require('./connectdef.js'); -var testName = clientConnectdef.name; -var planServerdef = clientConnectdef.plan; - -var testLoad = require('./loaddata.js'); -var testUser = require('./userconfig.js'); - -var db = marklogic.createDatabaseClient({ - host: planServerdef.host, - port: planServerdef.port, - user: 'admin', - password: 'admin', - authType: planServerdef.authType -}); - -testLoad.writeDocuments(db); diff --git a/config-optic/qa-data/city1.json b/config-optic/qa-data/city1.json deleted file mode 100755 index 8388cedb..00000000 --- a/config-optic/qa-data/city1.json +++ /dev/null @@ -1,6 +0,0 @@ - -{ - "cityName": "london", - "cityTeam": "arsenal", - "cityPopulation": 2000000 -} diff --git a/config-optic/qa-data/city2.json b/config-optic/qa-data/city2.json deleted file mode 100755 index c0a37c3d..00000000 --- a/config-optic/qa-data/city2.json +++ /dev/null @@ -1,6 +0,0 @@ - -{ - "cityName": "new york", - "cityTeam": "yankee", - "cityPopulation": 11000000 -} diff --git a/config-optic/qa-data/city3.json b/config-optic/qa-data/city3.json deleted file mode 100755 index 9f18b122..00000000 --- a/config-optic/qa-data/city3.json +++ /dev/null @@ -1,6 +0,0 @@ - -{ - "cityName": "new jersey", - "cityTeam": "nets", - "cityPopulation": 3000000 -} diff --git a/config-optic/qa-data/city4.json b/config-optic/qa-data/city4.json deleted file mode 100755 index 5640ea7d..00000000 --- a/config-optic/qa-data/city4.json +++ /dev/null @@ -1,6 +0,0 @@ - -{ - "cityName": "beijing", - "cityTeam": "ducks", - "cityPopulation": 55000000 -} diff --git a/config-optic/qa-data/city5.json b/config-optic/qa-data/city5.json deleted file mode 100755 index 3814c03c..00000000 --- a/config-optic/qa-data/city5.json +++ /dev/null @@ -1,6 +0,0 @@ - -{ - "cityName": "cape town", - "cityTeam": "pirates", - "cityPopulation": 650000 -} diff --git a/config-optic/qa-data/companies_100.ttl b/config-optic/qa-data/companies_100.ttl deleted file mode 100755 index 605112c7..00000000 --- a/config-optic/qa-data/companies_100.ttl +++ /dev/null @@ -1,1804 +0,0 @@ -@prefix demor: . -@prefix demov: . -@prefix vcard: . - - -##company 1 -demor:COMPANY001 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 12000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "San Jose"; - vcard:region "Texas"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 2 -demor:COMPANY002 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "San Jose"; - vcard:region "New York"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 3 -demor:COMPANY003 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 1000000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 4 -demor:COMPANY004 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 8; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Menlo Park"; - vcard:region "Arizona"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 5 -demor:COMPANY005 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 347852766; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Menlo Park"; - vcard:region "Texas"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 6 -demor:COMPANY006 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 2300450; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "San Jose"; - vcard:region "North Dakota"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 7 -demor:COMPANY007 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 8; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "Menlo Park"; - vcard:region "Nevada"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 8 -demor:COMPANY008 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 347852766; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "North Carolina"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 9 -demor:COMPANY009 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 300000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Atherton"; - vcard:region "Texas"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 10 -demor:COMPANY010 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 15000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "Menlo Park"; - vcard:region "New York"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 11 -demor:COMPANY011 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 1000000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 12 -demor:COMPANY012 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 347852766; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Atherton"; - vcard:region "North Carolina"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 13 -demor:COMPANY013 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 1000000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Redwood City"; - vcard:region "North Carolina"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 14 -demor:COMPANY014 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 347852766; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Menlo Park"; - vcard:region "North Dakota"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 15 -demor:COMPANY015 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 12000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Menlo Park"; - vcard:region "North Dakota"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 16 -demor:COMPANY016 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 15000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "San Jose"; - vcard:region "Texas"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 17 -demor:COMPANY017 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 100000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "Redwood City"; - vcard:region "Texas"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 18 -demor:COMPANY018 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 1000000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "North Dakota"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 19 -demor:COMPANY019 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 12000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 20 -demor:COMPANY020 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 10000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Atherton"; - vcard:region "Arizona"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 21 -demor:COMPANY021 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 15000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Redwood City"; - vcard:region "New York"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 22 -demor:COMPANY022 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Atherton"; - vcard:region "North Dakota"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 23 -demor:COMPANY023 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 15000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Menlo Park"; - vcard:region "Arizona"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 24 -demor:COMPANY024 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 12000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Menlo Park"; - vcard:region "North Dakota"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 25 -demor:COMPANY025 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 8; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 26 -demor:COMPANY026 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 10000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "San Jose"; - vcard:region "North Carolina"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 27 -demor:COMPANY027 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 15000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Atherton"; - vcard:region "North Carolina"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 28 -demor:COMPANY028 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 2300450; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Atherton"; - vcard:region "Arizona"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 29 -demor:COMPANY029 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 347852766; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Atherton"; - vcard:region "Nevada"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 30 -demor:COMPANY030 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 15000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 31 -demor:COMPANY031 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Redwood City"; - vcard:region "Arizona"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 32 -demor:COMPANY032 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 347852766; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 33 -demor:COMPANY033 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 8; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Redwood City"; - vcard:region "Arizona"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 34 -demor:COMPANY034 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 15000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Redwood City"; - vcard:region "Nevada"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 35 -demor:COMPANY035 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 10000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Menlo Park"; - vcard:region "Nevada"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 36 -demor:COMPANY036 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 300000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 37 -demor:COMPANY037 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 10000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Atherton"; - vcard:region "Arizona"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 38 -demor:COMPANY038 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 300000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Atherton"; - vcard:region "Texas"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 39 -demor:COMPANY039 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "Nevada"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 40 -demor:COMPANY040 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 15000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 41 -demor:COMPANY041 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 300000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Menlo Park"; - vcard:region "New York"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 42 -demor:COMPANY042 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 10000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Atherton"; - vcard:region "Nevada"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 43 -demor:COMPANY043 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 1000000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "San Jose"; - vcard:region "California"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 44 -demor:COMPANY044 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 10000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Menlo Park"; - vcard:region "North Dakota"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 45 -demor:COMPANY045 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 15000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Redwood City"; - vcard:region "Arizona"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 46 -demor:COMPANY046 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 300000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Atherton"; - vcard:region "California"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 47 -demor:COMPANY047 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 100000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Redwood City"; - vcard:region "New York"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 48 -demor:COMPANY048 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 100000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 49 -demor:COMPANY049 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 347852766; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Redwood City"; - vcard:region "North Carolina"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 50 -demor:COMPANY050 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 347852766; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "San Jose"; - vcard:region "Texas"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 51 -demor:COMPANY051 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Menlo Park"; - vcard:region "Texas"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 52 -demor:COMPANY052 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 12000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Menlo Park"; - vcard:region "Arizona"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 53 -demor:COMPANY053 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 347852766; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Redwood City"; - vcard:region "North Dakota"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 54 -demor:COMPANY054 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 10000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "North Dakota"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 55 -demor:COMPANY055 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 15000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Menlo Park"; - vcard:region "North Dakota"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 56 -demor:COMPANY056 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 347852766; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Menlo Park"; - vcard:region "New York"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 57 -demor:COMPANY057 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 10000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "San Jose"; - vcard:region "Texas"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 58 -demor:COMPANY058 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 1000000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Redwood City"; - vcard:region "New York"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 59 -demor:COMPANY059 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 15000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "San Jose"; - vcard:region "California"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 60 -demor:COMPANY060 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 100000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Redwood City"; - vcard:region "New York"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 61 -demor:COMPANY061 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 10000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "Texas"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 62 -demor:COMPANY062 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 15000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "Nevada"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 63 -demor:COMPANY063 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 100000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Menlo Park"; - vcard:region "New York"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 64 -demor:COMPANY064 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 12000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "San Jose"; - vcard:region "North Dakota"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 65 -demor:COMPANY065 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 2300450; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Atherton"; - vcard:region "North Carolina"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 66 -demor:COMPANY066 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 10000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Atherton"; - vcard:region "Nevada"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 67 -demor:COMPANY067 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 8; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "Redwood City"; - vcard:region "North Dakota"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 68 -demor:COMPANY068 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 300000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Atherton"; - vcard:region "Texas"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 69 -demor:COMPANY069 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 12000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Redwood City"; - vcard:region "Arizona"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 70 -demor:COMPANY070 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 2300450; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "Menlo Park"; - vcard:region "New York"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 71 -demor:COMPANY071 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 8; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Redwood City"; - vcard:region "North Dakota"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 72 -demor:COMPANY072 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 1000000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 73 -demor:COMPANY073 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 1000000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Redwood City"; - vcard:region "Texas"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 74 -demor:COMPANY074 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 15000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 75 -demor:COMPANY075 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 10000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Menlo Park"; - vcard:region "Nevada"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 76 -demor:COMPANY076 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 300000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Atherton"; - vcard:region "New York"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 77 -demor:COMPANY077 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 12000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Japan"; - vcard:locality "Redwood City"; - vcard:region "Nevada"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 78 -demor:COMPANY078 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 8; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 79 -demor:COMPANY079 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 1000000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "San Jose"; - vcard:region "Texas"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 80 -demor:COMPANY080 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 15000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Redwood City"; - vcard:region "California"; - vcard:postal-code "22222"; - vcard:street-address "1 Infinite Loop" ]. - -##company 81 -demor:COMPANY081 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 347852766; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "China"; - vcard:locality "Menlo Park"; - vcard:region "Arizona"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 82 -demor:COMPANY082 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 15000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "San Jose"; - vcard:region "Texas"; - vcard:postal-code "66666"; - vcard:street-address "1 Infinite Loop" ]. - -##company 83 -demor:COMPANY083 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 84 -demor:COMPANY084 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "San Jose"; - vcard:region "California"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 85 -demor:COMPANY085 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 347852766; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Atherton"; - vcard:region "Texas"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 86 -demor:COMPANY086 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 1000000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "San Jose"; - vcard:region "New York"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 87 -demor:COMPANY087 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 10000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Atherton"; - vcard:region "California"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 88 -demor:COMPANY088 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 100000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 89 -demor:COMPANY089 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 100000000; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Redwood City"; - vcard:region "New York"; - vcard:postal-code "33333"; - vcard:street-address "1 Infinite Loop" ]. - -##company 90 -demor:COMPANY090 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 10000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CTO"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "San Jose"; - vcard:region "Arizona"; - vcard:postal-code "88888"; - vcard:street-address "1 Infinite Loop" ]. - -##company 91 -demor:COMPANY091 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 10000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "Italy"; - vcard:locality "Menlo Park"; - vcard:region "North Carolina"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 92 -demor:COMPANY092 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 100000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "President"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "New York"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 93 -demor:COMPANY093 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 12000000; - demov:employees 10500; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "Germany"; - vcard:locality "Menlo Park"; - vcard:region "North Carolina"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 94 -demor:COMPANY094 a vcard:Organization; - demov:listed "true"; - demov:industry "Financial Services"; - demov:sales 8; - demov:employees 12; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "Mary Hodges"; - ]; - vcard:hasAddress [ - vcard:country-name "UK"; - vcard:locality "Menlo Park"; - vcard:region "California"; - vcard:postal-code "44444"; - vcard:street-address "1 Infinite Loop" ]. - -##company 95 -demor:COMPANY095 a vcard:Organization; - demov:listed "true"; - demov:industry "Healthcare/Life Sciences"; - demov:sales 12000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Menlo Park"; - vcard:region "Nevada"; - vcard:postal-code "55555"; - vcard:street-address "1 Infinite Loop" ]. - -##company 96 -demor:COMPANY096 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 100000000; - demov:employees 256; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Redwood City"; - vcard:region "North Dakota"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 97 -demor:COMPANY097 a vcard:Organization; - demov:listed "true"; - demov:industry "Industrial Goods"; - demov:sales 347852766; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "India"; - vcard:locality "Redwood City"; - vcard:region "Nevada"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. - -##company 98 -demor:COMPANY098 a vcard:Organization; - demov:listed "true"; - demov:industry "Other"; - demov:sales 300000000; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CFO"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Menlo Park"; - vcard:region "Arizona"; - vcard:postal-code "11111"; - vcard:street-address "1 Infinite Loop" ]. - -##company 99 -demor:COMPANY099 a vcard:Organization; - demov:listed "true"; - demov:industry "Business/Consumer Service"; - demov:sales 300000000; - demov:employees 22647; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "CEO"; - vcard:hasEmail ; - vcard:fn "Joe Brown"; - ]; - vcard:hasAddress [ - vcard:country-name "USA"; - vcard:locality "Atherton"; - vcard:region "Arizona"; - vcard:postal-code "77777"; - vcard:street-address "1 Infinite Loop" ]. - -##company 100 -demor:COMPANY100 a vcard:Organization; - demov:listed "true"; - demov:industry "Retail/Wholesale"; - demov:sales 2300450; - demov:employees 9450; - demov:hasExecutive [ a vcard:Individual; - vcard:hasTitle "Director of IT"; - vcard:hasEmail ; - vcard:fn "John Smith"; - ]; - vcard:hasAddress [ - vcard:country-name "France"; - vcard:locality "Atherton"; - vcard:region "New York"; - vcard:postal-code "99999"; - vcard:street-address "1 Infinite Loop" ]. diff --git a/config-optic/qa-data/dedupdoc1.xml b/config-optic/qa-data/dedupdoc1.xml deleted file mode 100644 index 5cde4807..00000000 --- a/config-optic/qa-data/dedupdoc1.xml +++ /dev/null @@ -1,15 +0,0 @@ - - world - - - http://marklogicsparql.com/id#5555 - http://marklogicsparql.com/addressbook#firstName - Jim - - - http://marklogicsparql.com/id#5555 - http://marklogicsparql.com/addressbook#firstName - Jim - - - \ No newline at end of file diff --git a/config-optic/qa-data/doc1.json b/config-optic/qa-data/doc1.json deleted file mode 100755 index 38fa8e56..00000000 --- a/config-optic/qa-data/doc1.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "city":"london", - "distance":50.4, - "date":"2007-01-01", - "metro":true, - "description":"Two recent discoveries indicate probable very early settlements near the Thames", - "popularity":5, - "location":{ - "latLonPoint":"51.50, -0.12", - "latLonPair":{ - "lat":51.5, - "long":-0.12 - }, - "latLonParent":{ - "latLonChild":"51.50, -0.12" - } - } -} \ No newline at end of file diff --git a/config-optic/qa-data/doc2.json b/config-optic/qa-data/doc2.json deleted file mode 100755 index c7345198..00000000 --- a/config-optic/qa-data/doc2.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "city":"new york", - "distance":23.3, - "date":"2006-06-23", - "metro":true, - "description":"Henry Hudsons 1609 voyage marked the beginning of European involvement with the area", - "popularity":5, - "location":{ - "latLonPoint":"40.71, -74.01", - "latLonPair":{ - "lat":40.71, - "long":-74.01 - }, - "latLonParent":{ - "latLonChild":"40.71, -74.01" - } - } -} \ No newline at end of file diff --git a/config-optic/qa-data/doc3.json b/config-optic/qa-data/doc3.json deleted file mode 100755 index 2bd7df87..00000000 --- a/config-optic/qa-data/doc3.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "city":"new jersey", - "distance":12.9, - "date":"1971-12-23", - "metro":false, - "description":"American forces under Washington met the forces under General Henry Clinton", - "popularity":2, - "location":{ - "latLonPoint":"40.72, -74.07", - "latLonPair":{ - "lat":40.72, - "long":-74.07 - }, - "latLonParent":{ - "latLonChild":"40.72, -74.07" - } - } -} \ No newline at end of file diff --git a/config-optic/qa-data/doc4.xml b/config-optic/qa-data/doc4.xml deleted file mode 100755 index 8431dfa5..00000000 --- a/config-optic/qa-data/doc4.xml +++ /dev/null @@ -1,19 +0,0 @@ - - beijing - 134.5 - 1981-11-09 - true - The Miyun Reservoir, on the upper reaches of the Chaobai River, is the largest reservoir within the municipality - 5 - - 39.90,116.40 - - 39.90,116.40 - - - 39.90 - 116.40 - - - - \ No newline at end of file diff --git a/config-optic/qa-data/doc5.xml b/config-optic/qa-data/doc5.xml deleted file mode 100755 index 8576dba9..00000000 --- a/config-optic/qa-data/doc5.xml +++ /dev/null @@ -1,19 +0,0 @@ - - cape town - 377.9 - 1999-04-22 - true - The earliest known remnants in the region were found at Peers cave in Fish Hoek - 3 - - -33.91,18.42 - - -33.91,18.42 - - - -33.91 - 18.42 - - - - \ No newline at end of file diff --git a/config-optic/qa-data/mapperReducer.sjs b/config-optic/qa-data/mapperReducer.sjs deleted file mode 100644 index c7aed2a7..00000000 --- a/config-optic/qa-data/mapperReducer.sjs +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2020 MarkLogic Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -'use strict'; - -function arrayMapper(row) { - const result = row.concat(); - result.push((typeof result[0] === 'string') ? 'seconds' : - fn.floor(fn.secondsFromDateTime(fn.currentDateTime())) - ); - return result; -} - -function colorIdMapper(row) { - const result = row; - switch(result.myColorId) { - case 1: - result.myColorId = 'RED'; - break; - case 2: - result.myColorId = 'BLUE'; - break; - case 3: - result.myColorId = 'YELLOW'; - break; - case 4: - result.myColorId = 'BLACK'; - break; - default: - result.myColorId = 'NO COLOR'; - } - return result; -} - -function arrayReducer(previous, row) { - const val = (previous === void 0) ? 0 : previous + row[0]; - return val; -} - -function fibReducer(previous, row) { - const i = Array.isArray(previous) ? previous.length : 0; - const result = row; - result.i = i; - switch(i) { - case 0: - result.fib = 0; - break; - case 1: - result.fib = 1; - break; - default: - result.fib = previous[i - 2].fib + previous[i - 1].fib; - break; - } - if (previous === void 0) { - previous = [result]; - } else { - previous.push(result); - } - return previous; -} - -function ageMapper(row) { - const result = row; - if(result.player_age < 21) - result.player_age = 'rookie'; - else if(result.player_age > 21 && result.player_age < 30) - result.player_age = 'premium'; - else - result.player_age = 'veteran'; - return result; -} - -module.exports = { - arrayMapper: arrayMapper, - colorIdMapper: colorIdMapper, - ageMapper: ageMapper, - arrayReducer: arrayReducer, - fibReducer: fibReducer -}; diff --git a/config-optic/qa-data/masterDetail.tdex b/config-optic/qa-data/masterDetail.tdex deleted file mode 100755 index 4f479c01..00000000 --- a/config-optic/qa-data/masterDetail.tdex +++ /dev/null @@ -1,35 +0,0 @@ - diff --git a/config-optic/qa-data/masterDetail.xml b/config-optic/qa-data/masterDetail.xml deleted file mode 100755 index 412f27e8..00000000 --- a/config-optic/qa-data/masterDetail.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - 1 - Master 1 - 2015-12-01 - - - 2 - Master 2 - 2015-12-02 - - - - - 1 - Detail 1 - 1 - 10.01 - blue - - - 2 - Detail 2 - 2 - 20.02 - blue - - - 3 - Detail 3 - 1 - 30.03 - blue - - - 4 - Detail 4 - 2 - 40.04 - green - - - 5 - Detail 5 - 1 - 50.05 - green - - - 6 - Detail 6 - 2 - 60.06 - green - - - - diff --git a/config-optic/qa-data/masterDetail2.json b/config-optic/qa-data/masterDetail2.json deleted file mode 100755 index c11cccf2..00000000 --- a/config-optic/qa-data/masterDetail2.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "sets2": { - "masterSet": { - "master": [ - { - "id": "3", - "name": "Master 3", - "date": "2016-03-01" - }, - { - "id": "4", - "name": "Master 4", - "date": "2016-05-25" - } - ] - }, - "detailSet": { - "detail": [ - { - "id": "7", - "name": "Detail 7", - "masterId": "3", - "amount": "64.33", - "color": "red" - }, - { - "id": "8", - "name": "Detail 8", - "masterId": "4", - "amount": "89.36", - "color": "blue" - }, - { - "id": "9", - "name": "Detail 9", - "masterId": "1", - "amount": "72.90", - "color": "yellow" - }, - { - "id": "10", - "name": "Detail 10", - "masterId": "2", - "amount": "30.26", - "color": "black" - }, - { - "id": "11", - "name": "Detail 11", - "masterId": "3", - "amount": "82.04", - "color": "green" - }, - { - "id": "12", - "name": "Detail 12", - "masterId": "1", - "amount": "25.86", - "color": "red" - } - ] - } - } -} diff --git a/config-optic/qa-data/masterDetail2.tdej b/config-optic/qa-data/masterDetail2.tdej deleted file mode 100755 index 40463213..00000000 --- a/config-optic/qa-data/masterDetail2.tdej +++ /dev/null @@ -1,53 +0,0 @@ -{ - "template": { - "context": "/sets2", - "templates": [{ - "context": "masterSet/master", - "rows": [{ - "schemaName": "opticFunctionalTest2", - "viewName": "master", - "columns": [{ - "name": "id", - "scalarType": "int", - "val": "id" - }, { - "name": "name", - "scalarType": "string", - "val": "name" - }, { - "name": "date", - "scalarType": "date", - "val": "date" - }] - }] - }, { - "context": "detailSet/detail", - "rows": [{ - "schemaName": "opticFunctionalTest2", - "viewName": "detail", - "columns": [{ - "name": "id", - "scalarType": "int", - "val": "id" - }, { - "name": "name", - "scalarType": "string", - "val": "name" - }, { - "name": "masterId", - "scalarType": "int", - "val": "masterId" - }, { - "name": "amount", - "scalarType": "double", - "val": "amount" - }, { - "name": "color", - "scalarType": "string", - "val": "color" - }] - }] - }] - } -} - diff --git a/config-optic/qa-data/masterDetail3.json b/config-optic/qa-data/masterDetail3.json deleted file mode 100755 index cac14f0b..00000000 --- a/config-optic/qa-data/masterDetail3.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "sets3": { - "masterSet3": { - "master3": [ - { - "id": "3", - "name": "Master 3", - "date": "2016-03-01" - }, - { - "id": "4", - "name": "Master 4", - "date": "2016-05-25" - } - ] - }, - "detailSet3": { - "detail3": [ - { - "id": "7", - "name": "Detail 7", - "masterId": "3", - "amount": "64.33", - "color": "red" - }, - { - "id": "8", - "name": "Detail 8", - "masterId": "4", - "amount": "89.36", - "color": "blue" - }, - { - "id": "9", - "name": "Detail 9", - "masterId": "1", - "amount": "72.90", - "color": "yellow" - }, - { - "id": "10", - "name": "Detail 10", - "masterId": "2", - "amount": "30.26", - "color": "black" - }, - { - "id": "11", - "name": "Detail 11", - "masterId": "3", - "amount": "82.04", - "color": "green" - }, - { - "id": "12", - "name": "Detail 12", - "masterId": "1", - "amount": "25.86", - "color": "red" - } - ] - } - } -} diff --git a/config-optic/qa-data/masterDetail3.tdej b/config-optic/qa-data/masterDetail3.tdej deleted file mode 100755 index d702b049..00000000 --- a/config-optic/qa-data/masterDetail3.tdej +++ /dev/null @@ -1,53 +0,0 @@ -{ - "template": { - "context": "/sets3", - "templates": [{ - "context": "masterSet3/master3", - "rows": [{ - "schemaName": "opticFunctionalTest3", - "viewName": "master3", - "columns": [{ - "name": "id", - "scalarType": "int", - "val": "id" - }, { - "name": "name", - "scalarType": "string", - "val": "name" - }, { - "name": "date", - "scalarType": "date", - "val": "date" - }] - }] - }, { - "context": "detailSet3/detail3", - "rows": [{ - "schemaName": "opticFunctionalTest3", - "viewName": "detail3", - "columns": [{ - "name": "id", - "scalarType": "int", - "val": "id" - }, { - "name": "name", - "scalarType": "string", - "val": "name" - }, { - "name": "masterId", - "scalarType": "int", - "val": "masterId" - }, { - "name": "amount", - "scalarType": "double", - "val": "amount" - }, { - "name": "color", - "scalarType": "string", - "val": "color" - }] - }] - }] - } -} - diff --git a/config-optic/qa-data/masterDetail4.json b/config-optic/qa-data/masterDetail4.json deleted file mode 100755 index 3650a387..00000000 --- a/config-optic/qa-data/masterDetail4.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "sets4": { - "masterSet4": { - "master4": [ - { - "id": "100", - "name": "Master 100", - "date": "2016-03-11" - }, - { - "id": "200", - "name": "Master 200", - "date": "2016-04-02" - } - ] - }, - "detailSet4": { - "detail4": [ - { - "id": "100", - "name": "Detail 100", - "masterId": "100", - "amount": "64.33", - "color": "red" - }, - { - "id": "200", - "name": "Detail 200", - "masterId": "200", - "amount": "89.36", - "color": "blue" - }, - { - "id": "300", - "name": "Detail 300", - "masterId": "200", - "amount": "72.90", - "color": "yellow" - } - ] - } - } -} diff --git a/config-optic/qa-data/masterDetail4.tdej b/config-optic/qa-data/masterDetail4.tdej deleted file mode 100755 index 7d026ce4..00000000 --- a/config-optic/qa-data/masterDetail4.tdej +++ /dev/null @@ -1,53 +0,0 @@ -{ - "template": { - "context": "/sets4", - "templates": [{ - "context": "masterSet4/master4", - "rows": [{ - "schemaName": "opticFunctionalTest4", - "viewName": "master4", - "columns": [{ - "name": "id", - "scalarType": "int", - "val": "id" - }, { - "name": "name", - "scalarType": "string", - "val": "name" - }, { - "name": "date", - "scalarType": "date", - "val": "date" - }] - }] - }, { - "context": "detailSet4/detail4", - "rows": [{ - "schemaName": "opticFunctionalTest4", - "viewName": "detail4", - "columns": [{ - "name": "id", - "scalarType": "int", - "val": "id" - }, { - "name": "name", - "scalarType": "string", - "val": "name" - }, { - "name": "masterId", - "scalarType": "int", - "val": "masterId" - }, { - "name": "amount", - "scalarType": "double", - "val": "amount" - }, { - "name": "color", - "scalarType": "string", - "val": "color" - }] - }] - }] - } -} - diff --git a/config-optic/qa-data/masterDetail5.json b/config-optic/qa-data/masterDetail5.json deleted file mode 100755 index be57f67e..00000000 --- a/config-optic/qa-data/masterDetail5.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "sets4": { - "detailSet4": { - "detail4": [ - { - "id": "400", - "name": "Detail 400", - "masterId": "200", - "amount": "164.33", - "color": "purple" - }, - { - "id": "500", - "name": "Detail 500", - "masterId": "100", - "amount": "189.36", - "color": "gold" - }, - { - "id": "600", - "name": "Detail 600", - "masterId": "100", - "amount": "172.90", - "color": "white" - } - ] - } - } -} diff --git a/config-optic/qa-data/otherPlayerTripleSet.xml b/config-optic/qa-data/otherPlayerTripleSet.xml deleted file mode 100755 index 9314362f..00000000 --- a/config-optic/qa-data/otherPlayerTripleSet.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#name - Phil Green - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#type - http://marklogic.com/other/bball/players/bbtype/Dataset - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#description - Describing Phil Green - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#position - Shortstop - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#dob - 1985-03-27 - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#eff - 82.03 - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#age - 26 - - - http://marklogic.com/other/bball/id#101 - http://marklogic.com/other/bball/players#team - http://marklogic.com/mlb/team/id/003 - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#name - Sam Cho - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#type - http://marklogic.com/other/bball/players/bbtype/Dataset - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#description - Describing Sam Cho - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#position - Center Field - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#dob - 1993-02-08 - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#eff - 21.99 - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#age - 22 - - - http://marklogic.com/other/bball/id#102 - http://marklogic.com/other/bball/players#team - http://marklogic.com/mlb/team/id/006 - - - - - diff --git a/config-optic/qa-data/people.ttl b/config-optic/qa-data/people.ttl deleted file mode 100644 index de6cf435..00000000 --- a/config-optic/qa-data/people.ttl +++ /dev/null @@ -1,70 +0,0 @@ -@prefix foaf: . -@prefix ppl: . - -ppl:person1 foaf:knows ppl:person2 . -ppl:person1 foaf:knows ppl:person3 . -ppl:person1 foaf:knows ppl:person5 . -ppl:person1 foaf:knows ppl:person7 . - -ppl:person2 foaf:knows ppl:person11 . -ppl:person2 foaf:knows ppl:person3 . -ppl:person3 foaf:knows ppl:person13 . -ppl:person13 foaf:knows ppl:person17 . -ppl:person13 foaf:knows ppl:person19 . - -ppl:person4 foaf:knows ppl:person6 . -ppl:person6 foaf:knows ppl:person8 . -ppl:person8 foaf:knows ppl:person10 . -ppl:person10 foaf:knows ppl:person12 . -ppl:person12 foaf:knows ppl:person14 . -ppl:person14 foaf:knows ppl:person16 . -ppl:person16 foaf:knows ppl:person18 . -ppl:person18 foaf:knows ppl:person20 . - -ppl:person20 foaf:knows ppl:person20 . - -ppl:person9 foaf:knows ppl:person12 . -ppl:person12 foaf:knows ppl:person15 . -ppl:person15 foaf:knows ppl:person18 . -ppl:person18 foaf:knows ppl:person9 . - -ppl:person1 a ppl:Person ; - foaf:name "Person 1" . -ppl:person2 a ppl:Person ; - foaf:name "Person 2" . -ppl:person3 a ppl:Person ; - foaf:name "Person 3" . -ppl:person4 a ppl:Person ; - foaf:name "Person 4" . -ppl:person5 a ppl:Person ; - foaf:name "Person 5" . -ppl:person6 a ppl:Person ; - foaf:name "Person 6" . -ppl:person7 a ppl:Person ; - foaf:name "Person 7" . -ppl:person8 a ppl:Person ; - foaf:name "Person 8" . -ppl:person9 a ppl:Person ; - foaf:name "Person 9" . -ppl:person10 a ppl:Person ; - foaf:name "Person 10" . -ppl:person11 a ppl:Person ; - foaf:name "Person 11" . -ppl:person12 a ppl:Person ; - foaf:name "Person 12" . -ppl:person13 a ppl:Person ; - foaf:name "Person 13" . -ppl:person14 a ppl:Person ; - foaf:name "Person 14" . -ppl:person15 a ppl:Person ; - foaf:name "Person 15" . -ppl:person16 a ppl:Person ; - foaf:name "Person 16" . -ppl:person17 a ppl:Person ; - foaf:name "Person 17" . -ppl:person18 a ppl:Person ; - foaf:name "Person 18" . -ppl:person19 a ppl:Person ; - foaf:name "Person 19" . -ppl:person20 a ppl:Person ; - foaf:name "Person 20" . diff --git a/config-optic/qa-data/playerTripleSet.xml b/config-optic/qa-data/playerTripleSet.xml deleted file mode 100755 index c7345106..00000000 --- a/config-optic/qa-data/playerTripleSet.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/name - John Doe - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/description - Describing John Doe - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/dob - 1981-05-04 - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/eff - 25.45 - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/age - 31 - - - http://marklogic.com/baseball/id#001 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/001 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/name - Bob Brian - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/description - Describing Bob Brian - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/position - Outfielder - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/dob - 1999-01-15 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/eff - 78.45 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/age - 23 - - - http://marklogic.com/baseball/id#002 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/003 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/name - Josh Ream - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/description - Describing Josh Ream - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/dob - 1985-11-30 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/eff - 53.10 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/age - 29 - - - http://marklogic.com/baseball/id#003 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/001 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/name - Pat Crenshaw - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/description - Describing Pat Crenshaw - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/position - Catcher - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/dob - 1998-09-01 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/eff - 33.89 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/age - 25 - - - http://marklogic.com/baseball/id#004 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/005 - - - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/name - Pedro Barrozo - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/description - Describing Pedro Barrozo - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/position - Midfielder - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/dob - 1991-12-09 - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/eff - 41.65 - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/age - 19 - - - http://marklogic.com/baseball/id#005 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/002 - - - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/name - Aoki Yamada - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/description - Describing Aoki Yamada - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/position - First Base - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/dob - 1987-03-15 - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/eff - 55.2 - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/age - 34 - - - http://marklogic.com/baseball/id#006 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/003 - - - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/name - Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/description - Describing Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/dob - 1984-11-01 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/eff - 32.89 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/age - 29 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/005 - - - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/name - Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/description - Describing Matt Rose - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/position - Pitcher - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/dob - 1984-11-01 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/eff - 32.89 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/age - 29 - - - http://marklogic.com/baseball/id#007 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/005 - - - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/name - Juan Leone - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/type - http://marklogic.com/baseball/players/bbtype/Dataset - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/description - Describing Juan Leone - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/position - Second Base - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/dob - 1993-08-17 - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/eff - 29.77 - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/age - 27 - - - http://marklogic.com/baseball/id#008 - http://marklogic.com/baseball/players/team - http://marklogic.com/mlb/team/id/001 - - - - diff --git a/config-optic/qa-data/teamTripleSet.xml b/config-optic/qa-data/teamTripleSet.xml deleted file mode 100755 index 9e18ba09..00000000 --- a/config-optic/qa-data/teamTripleSet.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - http://marklogic.com/mlb/team/id/001 - http://marklogic.com/mlb/team/name - Giants - - - http://marklogic.com/mlb/team/id/001 - http://marklogic.com/mlb/team/city - San Francisco - - - http://marklogic.com/mlb/team/id/002 - http://marklogic.com/mlb/team/name - Athletics - - - http://marklogic.com/mlb/team/id/002 - http://marklogic.com/mlb/team/city - Oakland - - - http://marklogic.com/mlb/team/id/003 - http://marklogic.com/mlb/team/name - Padres - - - http://marklogic.com/mlb/team/id/003 - http://marklogic.com/mlb/team/city - San Diego - - - http://marklogic.com/mlb/team/id/004 - http://marklogic.com/mlb/team/name - Yankees - - - http://marklogic.com/mlb/team/id/004 - http://marklogic.com/mlb/team/city - New York - - - http://marklogic.com/mlb/team/id/005 - http://marklogic.com/mlb/team/name - Mariners - - - http://marklogic.com/mlb/team/id/005 - http://marklogic.com/mlb/team/city - Seattle - - - - \ No newline at end of file diff --git a/config-optic/setupqa.js b/config-optic/setupqa.js deleted file mode 100755 index 57b5e1a5..00000000 --- a/config-optic/setupqa.js +++ /dev/null @@ -1,113 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -'use strict'; - -var util = require('../node_modules/core-util-is/lib/util.js'); - -var fs = require('fs'); -var valcheck = require('core-util-is'); - -var marklogic = require('../lib/marklogic.js'); -var testlib = require('./testlib.js'); - -var clientConnectdef = require('./connectdef.js'); -var testName = clientConnectdef.name; -var planServerdef = clientConnectdef.plan; - -var testLoad = require('./loaddata.js'); -var testUser = require('./userconfig.js'); - -var db = marklogic.createDatabaseClient({ - host: planServerdef.host, - port: planServerdef.port, - user: 'admin', - password: 'admin', - authType: planServerdef.authType -}); -var dbMod = marklogic.createDatabaseClient({ - database: testName+'Modules', - host: planServerdef.host, - port: planServerdef.port, - user: 'admin', - password: 'admin', - authType: planServerdef.authType -}); -var manager = testlib.createManager(marklogic.createDatabaseClient({ - host: planServerdef.host, - port: 8002, - user: 'admin', - password: 'admin', - authType: planServerdef.authType - })); - -console.log('checking for '+testName); -var check = manager.get({ - endpoint: '/v1/rest-apis/'+testName - }).result(); -check.then(function(response) { - if (response.statusCode !== 404) { - return check; - } - - console.log('creating database and REST server for '+testName); - return manager.post({ - endpoint: '/v1/rest-apis', - body: { - 'rest-api': { - name: testName, - group: 'Default', - database: testName, - 'modules-database': testName+'Modules', - port: planServerdef.port - } - } - }).result(); - }) -.then(function(response){ - console.log('setting up rest eval role'); - return testUser.addRestEvalRole(manager).result(); -}) -.then(function(response){ - console.log('setting up rest reader user'); - return testUser.addRestReaderUser(manager).result(); -}) -.then(function(response){ - console.log('setting up tde template on module database'); - return testLoad.writeDocumentsToMod(dbMod).result(); -}) -.then(function(response){ - console.log('setting up sample documents'); - return testLoad.writeDocuments(db).result(); -}) -.then(function(response){ - console.log('setting up graphs1'); - return testLoad.writeGraphs1(db).result(); -}) -.then(function(response){ - console.log('setting up graphs2'); - return testLoad.writeGraphs2(db).result(); -}) -.then(function(response){ - console.log('setting up database setup file'); - return db.config.extlibs.write({ - path:'/ext/optic/test/databaseconfig.sjs', contentType:'application/javascript', source:fs.createReadStream('./config-optic/databaseconfig.sjs') - }).result(); -}) -.then(function(response) { - console.log('setting up database configuration'); - var dbEval = marklogic.createDatabaseClient({ - host: planServerdef.host, - port: planServerdef.port, - user: 'rest-evaluator', - password: 'x', - authType: planServerdef.authType - }); - return dbEval.invoke('/ext/optic/test/databaseconfig.sjs').result(); -}) -.then(function(response){ - console.log('setup done'); - }) -.catch(function(error){ - console.log(error); - }); diff --git a/config-optic/teardown.js b/config-optic/teardown.js deleted file mode 100644 index 5e519ebb..00000000 --- a/config-optic/teardown.js +++ /dev/null @@ -1,95 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -'use strict'; - -var util = require('../node_modules/core-util-is/lib/util.js'); - -var fs = require('fs'); -var valcheck = require('core-util-is'); - -var marklogic = require('../lib/marklogic.js'); -var testlib = require('./testlib.js'); - -var clientConnectdef = require('./connectdef.js'); -var testName = clientConnectdef.name; -var planServerdef = clientConnectdef.plan; - -var modDb = marklogic.createDatabaseClient({ - database: testName+'Modules', - host: planServerdef.host, - port: planServerdef.port, - user: 'admin', - password: 'admin', - authType: planServerdef.authType -}); -var manager = testlib.createManager(marklogic.createDatabaseClient({ - host: planServerdef.host, - port: 8002, - user: 'admin', - password: 'admin', - authType: planServerdef.authType - })); - -console.log('checking for '+testName); -manager.get({ - endpoint: '/v1/rest-apis/'+testName - }) -.result(function(response) { - if (response.statusCode === 404) { - console.log(testName+' not found - nothing to delete'); - } else { - console.log('removing database and REST server for '+testName); - manager.put({ - endpoint: '/manage/v2/databases/'+testName+'/properties', - params: { - format: 'json' - }, - body: { - 'schema-database': 'Schemas' - }, - hasResponse: true - }).result() - .then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/'+testName, - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }) - .then(function(response) { - return manager.post({ - endpoint: '/manage/v2/databases/'+testName+'Modules', - contentType: 'application/json', - accept: 'application/json', - body: {'operation': 'clear-database'} - }).result(); - }) - .then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/users/rest-reader-optic' - }).result(); - }) - .then(function(response) { - return manager.remove({ - endpoint: '/manage/v2/roles/rest-evaluator' - }).result(); - }) - .then(function(response) { - return manager.remove({ - endpoint: '/v1/rest-apis/'+testName, - accept: 'application/json', - params: {include: ['content', 'modules']} - }).result(); - }) - .then(function(response) { - console.log('teardown succeeded - restart the server'); - }) - .catch(function(error) { - console.log('failed to tear down '+testName+' server:\n'+ - JSON.stringify(error, null, 2)); - }); - } -}); - diff --git a/config-optic/testlib.js b/config-optic/testlib.js deleted file mode 100644 index a05e709f..00000000 --- a/config-optic/testlib.js +++ /dev/null @@ -1,186 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -'use strict'; -var valcheck = require('../node_modules/core-util-is/lib/util.js'); - -var mlutil = require('../lib/mlutil.js'); -var Operation = require('../lib/operation.js'); -var requester = require('../lib/requester.js'); - -//CAUTION: the functions in this module are not part of the supported API and -//may change or may be removed at any time. - -function responseOutputTransform(headers, data) { - /*jshint validthis:true */ - var operation = this; - - var response = { - statusCode: operation.responseStatusCode, - headers: headers - }; - if (!valcheck.isNullOrUndefined(data)) { - response.data = data; - } - - return response; -} - -function Manager(adminClient) { - if (!(this instanceof Manager)) { - return new Manager(adminClient); - } - this.client = adminClient; -} - -// TODO: configure acceptable errors -Manager.prototype.get = function manageGet(paramsObj) { - var endpoint = paramsObj.endpoint; - var params = paramsObj.params; - var headers = paramsObj.headers; - var hasResponse = paramsObj.hasResponse; - - var path = makePath(endpoint, params); - - var requestOptions = mlutil.copyProperties(this.client.connectionParams); - requestOptions.method = 'GET'; - requestOptions.headers = valcheck.isNullOrUndefined(headers) ? { - 'Accept': 'application/json' - } : headers; - requestOptions.path = path; - - var operation = new Operation( - 'GET '+path, this.client, requestOptions, 'empty', - ((hasResponse === 'false') ? 'empty' : 'single') - ); - operation.validStatusCodes = [200, 201, 204, 404]; - operation.outputTransform = responseOutputTransform; - - return requester.startRequest(operation); -}; -Manager.prototype.post = function managePost(paramsObj) { - var endpoint = paramsObj.endpoint; - var params = paramsObj.params; - var headers = paramsObj.headers; - var body = paramsObj.body; - var hasResponse = paramsObj.hasResponse; - - var path = makePath(endpoint, params); - - var requestOptions = mlutil.copyProperties(this.client.connectionParams); - requestOptions.method = 'POST'; - requestOptions.headers = valcheck.isNullOrUndefined(headers) ? { - 'Content-Type': 'application/json', - 'Accept': 'application/json' - } : headers; - requestOptions.path = path; - - var hasBody = !valcheck.isNullOrUndefined(body); - - var operation = new Operation( - 'POST '+path, - this.client, - requestOptions, - hasBody ? 'single' : 'empty', - ((hasResponse === 'false') ? 'empty' : 'single') - ); - operation.outputTransform = responseOutputTransform; - if (hasBody) { - operation.requestBody = body; - } - - return requester.startRequest(operation); -}; -Manager.prototype.put = function managePut(paramsObj) { - var endpoint = paramsObj.endpoint; - var params = paramsObj.params; - var headers = paramsObj.headers; - var body = paramsObj.body; - var hasResponse = paramsObj.hasResponse; - - var path = makePath(endpoint, params); - - var requestOptions = mlutil.copyProperties(this.client.connectionParams); - requestOptions.method = 'PUT'; - requestOptions.headers = valcheck.isNullOrUndefined(headers) ? { - 'Content-Type': 'application/json' - } : headers; - requestOptions.path = path; - - var hasBody = !valcheck.isNullOrUndefined(body); - - var operation = new Operation( - 'PUT '+path, - this.client, - requestOptions, - hasBody ? 'single' : 'empty', - ((hasResponse === 'true') ? 'single' : 'empty') - ); - operation.outputTransform = responseOutputTransform; - if (hasBody) { - operation.requestBody = body; - } - - return requester.startRequest(operation); -}; -Manager.prototype.remove = function manageRemove(paramsObj) { - var endpoint = paramsObj.endpoint; - var params = paramsObj.params; - var headers = paramsObj.headers; - var hasResponse = paramsObj.hasResponse; - - var path = makePath(endpoint, params); - - var requestOptions = mlutil.copyProperties(this.client.connectionParams); - requestOptions.method = 'DELETE'; - requestOptions.headers = valcheck.isNullOrUndefined(headers) ? { - 'Accept': 'application/json' - } : headers; - requestOptions.path = path; - - var operation = new Operation( - 'DELETE '+path, - this.client, - requestOptions, - 'empty', - ((hasResponse === 'true') ? 'single' : 'empty') - ); - operation.outputTransform = responseOutputTransform; - - return requester.startRequest(operation); -}; - -function makePath(endpoint, params) { - var path = encodeURI(endpoint); - if (!valcheck.isNullOrUndefined(params)) { - var paramKeys = Object.keys(params); - var sep = '?'; - for (var i=0; i < paramKeys.length; i++) { - var paramKey = paramKeys[i]; - var value = params[paramKey]; - if (valcheck.isArray(value)) { - for (var j=0; j < value.length; j++) { - path += sep+paramKey+'='+encodeURIComponent(value[j]); - if (i === 0 && j === 0) { - sep = '&'; - } - } - } else { - path += sep+paramKey+'='+encodeURIComponent(value); - if (i === 0) { - sep = '&'; - } - } - } - } - - return path; -} - -function createManager(adminClient) { - return new Manager(adminClient); -}; - -module.exports = { - createManager: createManager -}; diff --git a/config-optic/userconfig.js b/config-optic/userconfig.js deleted file mode 100755 index 91674a2b..00000000 --- a/config-optic/userconfig.js +++ /dev/null @@ -1,100 +0,0 @@ -'use strict'; - -function addRestEvalRole(manager) { - return manager.post({ - endpoint: '/manage/v2/roles', - body: { - 'role-name': 'rest-evaluator', - description: 'REST writer who can eval, invoke, or set a dynamic databases', - role: [ - 'rest-writer' - ], - privilege: [ - { - 'privilege-name': 'xdmp-eval', - action: 'http://marklogic.com/xdmp/privileges/xdmp-eval', - kind: 'execute' - }, - { - 'privilege-name': 'xdmp-eval-in', - action: 'http://marklogic.com/xdmp/privileges/xdmp-eval-in', - kind: 'execute' - }, - { - 'privilege-name': 'xdmp-invoke', - action: 'http://marklogic.com/xdmp/privileges/xdmp-invoke', - kind: 'execute' - }, - { - 'privilege-name': 'xdbc-eval', - action: 'http://marklogic.com/xdmp/privileges/xdbc-eval', - kind: 'execute' - }, - { - 'privilege-name': 'xdbc-eval-in', - action: 'http://marklogic.com/xdmp/privileges/xdbc-eval-in', - kind: 'execute' - }, - { - 'privilege-name': 'xdbc-invoke', - action: 'http://marklogic.com/xdmp/privileges/xdbc-invoke', - kind: 'execute' - }, - { - 'privilege-name': 'any-uri', - action: 'http://marklogic.com/xdmp/privileges/any-uri', - kind: 'execute' - }, - { - 'privilege-name': 'admin-module-read', - action: 'http://marklogic.com/xdmp/privileges/admin-module-read', - kind: 'execute' - }, - { - 'privilege-name': 'admin-module-write', - action: 'http://marklogic.com/xdmp/privileges/admin-module-write', - kind: 'execute' - }, - { - 'privilege-name': 'unprotected-collections', - action: 'http://marklogic.com/xdmp/privileges/unprotected-collections', - kind: 'execute' - } - ] - } - }); -} - -function addRestEvalUser(manager) { - return manager.post({ - endpoint: '/manage/v2/users', - body: { - 'user-name': 'rest-evaluator', - password: 'x', - description: 'rest-evaluator user', - role: [ - 'rest-evaluator' - ] - } - }); -} - -function addRestReaderUser(manager) { - return manager.post({ - endpoint: '/manage/v2/users', - body: { - 'user-name': 'rest-reader-optic', - password: 'x', - description: 'rest-reader user', - role: [ - 'rest-reader' - ] - } - }); -} - -module.exports = { - addRestEvalRole: addRestEvalRole, - addRestEvalUser: addRestEvalUser, - addRestReaderUser: addRestReaderUser -}; From faf7be4a879fcaa25300270702de4cc640dff4b8 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 29 Oct 2025 11:07:03 -0400 Subject: [PATCH 53/58] MLE-24733 Deleting what should be unused etc/data files --- etc/data/Publisher-1.xml | 33 ------ etc/data/Publisher-2.xml | 33 ------ etc/data/articleCitation.json | 33 ------ etc/data/employees.tdej | 28 ------ etc/data/masterDetail.tdex | 37 ------- etc/data/masterDetail.xml | 16 --- etc/data/musician.tdex | 16 --- etc/data/rowPostProcessors.sjs | 64 ------------ etc/data/transformDoc-test-two-params.mjs | 5 - etc/data/transformDoc-test.mjs | 6 -- etc/data/transformDoc-test.xslt | 11 -- etc/data/tripleSets.xml | 64 ------------ etc/data/unnestView.tdej | 27 ----- etc/data/validateDoc-test.json | 8 -- etc/data/validateDoc-test.sch | 36 ------- etc/data/validateDoc-test.sch-validator.xsl | 106 -------------------- test-basic/rows.js | 1 - 17 files changed, 524 deletions(-) delete mode 100644 etc/data/Publisher-1.xml delete mode 100644 etc/data/Publisher-2.xml delete mode 100644 etc/data/articleCitation.json delete mode 100644 etc/data/employees.tdej delete mode 100644 etc/data/masterDetail.tdex delete mode 100644 etc/data/masterDetail.xml delete mode 100644 etc/data/musician.tdex delete mode 100644 etc/data/rowPostProcessors.sjs delete mode 100644 etc/data/transformDoc-test-two-params.mjs delete mode 100644 etc/data/transformDoc-test.mjs delete mode 100644 etc/data/transformDoc-test.xslt delete mode 100644 etc/data/tripleSets.xml delete mode 100644 etc/data/unnestView.tdej delete mode 100644 etc/data/validateDoc-test.json delete mode 100644 etc/data/validateDoc-test.sch delete mode 100644 etc/data/validateDoc-test.sch-validator.xsl diff --git a/etc/data/Publisher-1.xml b/etc/data/Publisher-1.xml deleted file mode 100644 index f1fe51c5..00000000 --- a/etc/data/Publisher-1.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 123 - 5717905 -

- diff --git a/etc/data/Publisher-2.xml b/etc/data/Publisher-2.xml deleted file mode 100644 index e20d5d34..00000000 --- a/etc/data/Publisher-2.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 456 - 5717905 -
- - 1234 - - 120 - 49 - - 1968 - 12 - 07 - - - - - The Influence of Magnesium on Cholesterol in Human Serum - - - - Doe - John - - - Smith - Jane - - -
- diff --git a/etc/data/articleCitation.json b/etc/data/articleCitation.json deleted file mode 100644 index 288e8391..00000000 --- a/etc/data/articleCitation.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "template": { - "context": "/Citation/Article", - "rows": [ - { - "schemaName": "Medical", - "viewName": "Publications", - "columns": [ - { - "name": "ID", - "scalarType": "long", - "val": "../ID" - }, - { - "name": "ISSN", - "scalarType": "string", - "val": "Journal/ISSN" - }, - { - "name": "Volume", - "scalarType": "string", - "val": "Journal/JournalIssue/Volume" - }, - { - "name": "Date", - "scalarType": "date", - "val":"Journal/JournalIssue/PubDate/Year||'-'||Journal/JournalIssue/PubDate/Month||'-'||Journal/JournalIssue/PubDate/Day" - } - ] - } - ] - } -} diff --git a/etc/data/employees.tdej b/etc/data/employees.tdej deleted file mode 100644 index 1f9d7773..00000000 --- a/etc/data/employees.tdej +++ /dev/null @@ -1,28 +0,0 @@ -{ - "template":{ - "context":"/Employee", - "rows":[ - { - "schemaName":"company", - "viewName":"employees", - "columns":[ - { - "name":"EmployeeID", - "scalarType":"int", - "val":"ID" - }, - { - "name":"FirstName", - "scalarType":"string", - "val":"FirstName" - }, - { - "name":"LastName", - "scalarType":"string", - "val":"LastName" - } - ] - } - ] - } -} diff --git a/etc/data/masterDetail.tdex b/etc/data/masterDetail.tdex deleted file mode 100644 index 2e593c9f..00000000 --- a/etc/data/masterDetail.tdex +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/etc/data/masterDetail.xml b/etc/data/masterDetail.xml deleted file mode 100644 index cd217d2a..00000000 --- a/etc/data/masterDetail.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 1Master 12015-12-01 - 2Master 22015-12-02 - - - 1Detail 1110.01blue - 2Detail 2220.02blue - 3Detail 3130.03blue - 4Detail 4240.04green - 5Detail 5150.05green - 6Detail 6260.06green - - diff --git a/etc/data/musician.tdex b/etc/data/musician.tdex deleted file mode 100644 index 4e2c2390..00000000 --- a/etc/data/musician.tdex +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/etc/data/rowPostProcessors.sjs b/etc/data/rowPostProcessors.sjs deleted file mode 100644 index 3fcd473f..00000000 --- a/etc/data/rowPostProcessors.sjs +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2020 MarkLogic Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -'use strict'; - -function arrayMapper(row) { - const result = row.concat(); - result.push((typeof result[0] === 'string') ? 'seconds' : - fn.floor(fn.secondsFromDateTime(fn.currentDateTime())) - ); - return result; -} -function arrayReducer(previous, row) { - const val = (previous === void 0) ? 0 : previous + row[0]; - return val; -} -function secondsMapper(row) { - row.seconds = new Date().getSeconds(); - return row; -} -function fibReducer(previous, row) { - const i = Array.isArray(previous) ? previous.length : 0; - - row.i = i; - - switch(i) { - case 0: - row.fib = 0; - break; - case 1: - row.fib = 1; - break; - default: - row.fib = previous[i - 2].fib + previous[i - 1].fib; - break; - } - - if (i === 0) { - previous = [row]; - } else { - previous.push(row); - } - - return previous; -} - -module.exports = { - arrayMapper: arrayMapper, - arrayReducer: arrayReducer, - secondsMapper: secondsMapper, - fibReducer: fibReducer -}; diff --git a/etc/data/transformDoc-test-two-params.mjs b/etc/data/transformDoc-test-two-params.mjs deleted file mode 100644 index 2361a844..00000000 --- a/etc/data/transformDoc-test-two-params.mjs +++ /dev/null @@ -1,5 +0,0 @@ -const result = {"hello": "world", - "Patch1": external.patch1, - "Patch2": external.patch2, - "theDoc": external.doc} -result diff --git a/etc/data/transformDoc-test.mjs b/etc/data/transformDoc-test.mjs deleted file mode 100644 index 86d20bd6..00000000 --- a/etc/data/transformDoc-test.mjs +++ /dev/null @@ -1,6 +0,0 @@ -const result = { - "hello": "world", - "yourParam": external.myParam, - "theDoc": external.doc -} -result diff --git a/etc/data/transformDoc-test.xslt b/etc/data/transformDoc-test.xslt deleted file mode 100644 index bded8335..00000000 --- a/etc/data/transformDoc-test.xslt +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - world - - - - diff --git a/etc/data/tripleSets.xml b/etc/data/tripleSets.xml deleted file mode 100644 index f298b476..00000000 --- a/etc/data/tripleSets.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - /datastore/id#A - http://purl.org/dc/terms/title - The A datastore - - /datastore/id#A - http://purl.org/dc/terms/type - http://purl.org/dc/dcmitype/Dataset - - /datastore/id#A - http://purl.org/dc/terms/description - Describing A - - /datastore/id#A - http://purl.org/dc/terms/alternative - The Awesome datastore - - /datastore/id#B - http://purl.org/dc/terms/title - The B datastore - - /datastore/id#B - http://purl.org/dc/terms/type - http://purl.org/dc/dcmitype/Dataset - - /datastore/id#B - http://purl.org/dc/terms/description - Describing B - - /datastore/id#B - http://purl.org/dc/terms/modified - 2015-12-14 - - /master/id#1 - http://purl.org/dc/terms/identifier - 1 - - /master/id#1 - http://purl.org/dc/terms/source - /datastore/id#A - - /master/id#1 - http://purl.org/dc/terms/description - First description - - /master/id#2 - http://purl.org/dc/terms/identifier - 2 - - /master/id#2 - http://purl.org/dc/terms/source - /datastore/id#B - - /master/id#2 - http://purl.org/dc/terms/description - Second description - - - diff --git a/etc/data/unnestView.tdej b/etc/data/unnestView.tdej deleted file mode 100644 index 4d45bfc8..00000000 --- a/etc/data/unnestView.tdej +++ /dev/null @@ -1,27 +0,0 @@ -{ - "template": { - "context": "office", - "rows": [ - { - "schemaName": "unnestSchema", - "viewName": "unnestView", - "columns": [ - { - "name": "department", - "scalarType": "string", - "val": "department", - "nullable": true, - "invalidValues": "ignore" - }, - { - "name": "teamMembers", - "scalarType": "string", - "val": "teamMembers", - "nullable": true, - "invalidValues": "ignore" - } - ] - } - ] - } -} \ No newline at end of file diff --git a/etc/data/validateDoc-test.json b/etc/data/validateDoc-test.json deleted file mode 100644 index dc66b844..00000000 --- a/etc/data/validateDoc-test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "language": "zxx", - "$schema": "http://json-schema.org/draft-07/schema#", - "properties": { - "count": { "type":"integer", "minimum":0 }, - "items": { "type":"array", "items": {"type":"string", "minLength":1 } } - } -} \ No newline at end of file diff --git a/etc/data/validateDoc-test.sch b/etc/data/validateDoc-test.sch deleted file mode 100644 index 1ac06d7b..00000000 --- a/etc/data/validateDoc-test.sch +++ /dev/null @@ -1,36 +0,0 @@ - -user-validation - - - - - - - - - user element must have an id attribute - - user element must have 5 child elements: name, gender, - age, score and result - - score element must have a total attribute - score element must have two child elements - - - - - - total score must be a sum of test-1 and test-2 scores - - - if the score is greater than 30 then the result will be - 'pass' else 'fail' - - - - -the score does not match with the result - - \ No newline at end of file diff --git a/etc/data/validateDoc-test.sch-validator.xsl b/etc/data/validateDoc-test.sch-validator.xsl deleted file mode 100644 index 360ca1b3..00000000 --- a/etc/data/validateDoc-test.sch-validator.xsl +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - /[]/@ - - - /[]/@ - - - - - - - . - - U - U - U.n - U.__ - - - - - - - structuralstructuralco-occurenceco-occurence - - user-validation - - - - - - - - user element must have an id attribute - - - - - - - user element must have 5 child elements: name, gender, - age, score and result - - - - - - - score element must have a total attribute - - - - - - score element must have two child elements - - - - - - - - - - - - total score must be a sum of test-1 and test-2 scores - - - - - - - - if the score is greater than 30 then the result will be - 'pass' else 'fail' - - the score does not match with the result - - - - diff --git a/test-basic/rows.js b/test-basic/rows.js index f0ea8121..704a7fbe 100644 --- a/test-basic/rows.js +++ b/test-basic/rows.js @@ -236,7 +236,6 @@ describe('rows', function(){ }); describe('from a TDE view', function(){ - // View defined in etc/data/employees.tdej const planFromBuilderTemplate = p.fromView('company', 'employees', '') .select(['EmployeeID', 'FirstName', 'LastName']) .orderBy('LastName'); From 2d382583339e30e9019f6f50921dbdf6032bb4b7 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 29 Oct 2025 10:02:36 -0400 Subject: [PATCH 54/58] MLE-24641 Removed gulp-jsdoc, just using jsdoc Removes the markdown-it vulnerability. Also moved instructions for generating docs from README to CONTRIBUTING. --- .copyrightconfig | 2 +- CONTRIBUTING.md | 34 ++-- README.md | 11 -- gulpfile.js | 10 -- jsdoc.json | 2 +- package-lock.json | 271 +++++++++----------------------- package.json | 8 +- test-complete-proxy/gulpfile.js | 1 - 8 files changed, 91 insertions(+), 248 deletions(-) diff --git a/.copyrightconfig b/.copyrightconfig index ac6632ed..a4fe0e9c 100644 --- a/.copyrightconfig +++ b/.copyrightconfig @@ -11,4 +11,4 @@ startyear: 2015 # - Dotfiles already skipped automatically # Enable by removing the leading '# ' from the next line and editing values. # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app-mlDeploy/* +filesexcluded: .github/*, README.md, Jenkinsfile, test-app/*, *.md, docker-compose.yaml, test-complete-app-mlDeploy/*, *.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c646e055..df634233 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,6 +57,16 @@ or 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. +## Generating documentation + +After installing the project dependencies, you can build the reference documentation locally from the root +directory of the marklogic package: + + npm run doc + +The documentation is generated in the `./doc` gitignored directory. The documentation can also be +accessed online at . + ## Explanation of overrides in package.json Each override is being documented here so we have some ability in the future to remove an override as needed. @@ -86,30 +96,12 @@ glob-parent: "6.0.2" - Why needed: Older versions vulnerable to regex attacks - CVE/Issue: CVE-2020-28469 - ReDoS vulnerability -jsdoc: "4.0.0" -- Purpose: Fixes high-severity data access vulnerability in older jsdoc versions -- Affects: gulp-jsdoc3 → jsdoc -- Why needed: gulp-jsdoc3@3.0.0 uses older jsdoc with known vulnerabilities -- CVE/Issue: High severity vulnerability in taffydb (jsdoc dependency) - -markdown-it: "14.1.0" -- Purpose: Use latest markdown parser for JSDoc -- Affects: gulp-jsdoc3 → jsdoc → markdown-it -- Why needed: Latest version (no vulnerabilities), handles RFC 7464 parsing -- Note: No newer version available, ensures consistency - minimatch: "5.1.0" - Purpose: Fixes ReDoS (Regular Expression Denial of Service) vulnerability - Affects: mocha, gulp-mocha, and other build tools - Why needed: Older minimatch versions have catastrophic backtracking vulnerability - CVE/Issue: CVE-2022-3517 - ReDoS vulnerability -sanitize-html: "2.17.0" -- Purpose: Ensure JSDoc template uses non-vulnerable HTML sanitizer -- Affects: gulp-jsdoc3 → ink-docstrap → sanitize-html -- Why needed: Older versions have XSS vulnerabilities -- Note: Also in devDependencies, override ensures transitive deps use safe version - semver: "7.5.3" - Purpose: Fixes ReDoS in version parsing - Affects: Multiple packages across dependency tree @@ -122,12 +114,6 @@ tar-fs: "2.1.4" - Why needed: Older tar-fs allows extracting files outside intended directory - CVE/Issue: CVE-2024-28861 - Path traversal -tmp: "0.2.4" -- Purpose: Fixes arbitrary file write vulnerability -- Affects: gulp-jsdoc3 → jsdoc → tmp -- Why needed: Older tmp versions have file system security issues -- CVE/Issue: CVE-2024-28858 - Arbitrary file write - The following are related to this npm supply chain attack - https://orca.security/resources/blog/qix-npm-attack/ . ansi-styles: "4.3.0" diff --git a/README.md b/README.md index 12349a65..02b5c1fc 100644 --- a/README.md +++ b/README.md @@ -98,17 +98,6 @@ in the online resources. To run the examples, follow the instructions here: examples/1readme.txt -### Generating Documentation Locally - -After installing the project dependencies (including the [gulp](http://gulpjs.com/) -build system), you can build the reference documentation locally from the root -directory of the marklogic package: - - npm run doc - -The documentation is generated in a doc subdirectory. The documentation can also be -accessed online [here](https://docs.marklogic.com/jsdoc/index.html). - ## Support The MarkLogic Node.js Client API is maintained by MarkLogic Engineering. diff --git a/gulpfile.js b/gulpfile.js index 8352f1e1..34360297 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,7 +5,6 @@ const path = require('path'); const gulp = require('gulp'); const eslint = require('gulp-eslint-new'); const mocha = require('gulp-mocha'); -const jsdoc = require('gulp-jsdoc3'); const { parallel, series } = gulp; @@ -33,14 +32,6 @@ function test() { })); } -function doc() { - // TODO: clear the directory first - maybe by following this recipe: - // https://github.com/gulpjs/gulp/blob/master/docs/recipes/delete-files-folder.md - const config = require('./jsdoc.json'); - return gulp.src(['./lib/*.js', 'README.md']) - .pipe(jsdoc(config)); -} - let testModulesClient = null; function getTestModulesClient() { if (testModulesClient === null) { @@ -184,7 +175,6 @@ function runProxyTests() { })); } -exports.doc = doc; exports.lint = lint; exports.loadProxyTests = series(parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases), updateMjsFiles); exports.generateProxyTests = parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests); diff --git a/jsdoc.json b/jsdoc.json index 96d49b06..038307d0 100644 --- a/jsdoc.json +++ b/jsdoc.json @@ -6,7 +6,7 @@ "templates": { "theme": "marklogic", "systemName": "MarkLogic Node.js Client API", - "copyright": "Copyright (c) 2020 MarkLogic Corporation", + "copyright": "Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.", "navType": "vertical", "inverseNav": true, "includeDate": false, diff --git a/package-lock.json b/package-lock.json index 185cd0f6..1bd1e3da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,9 +30,9 @@ "eslint": "9.38.0", "gulp": "5.0.1", "gulp-eslint-new": "2.5.0", - "gulp-jsdoc3": "3.0.0", "gulp-mocha": "10.0.1", "intercept-stdout": "0.1.2", + "jsdoc": "4.0.5", "mocha": "11.7.4", "mocha-junit-reporter": "2.2.1", "moment": "2.30.1", @@ -59,9 +59,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", "dev": true, "license": "MIT", "engines": { @@ -69,13 +69,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", - "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz", + "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.28.4" + "@babel/types": "^7.28.5" }, "bin": { "parser": "bin/babel-parser.js" @@ -85,14 +85,14 @@ } }, "node_modules/@babel/types": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", - "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz", + "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1" + "@babel/helper-validator-identifier": "^7.28.5" }, "engines": { "node": ">=6.9.0" @@ -131,9 +131,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, "license": "MIT", "engines": { @@ -452,14 +452,14 @@ "license": "MIT" }, "node_modules/@types/markdown-it": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz", - "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==", + "version": "14.1.2", + "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz", + "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==", "dev": true, "license": "MIT", "dependencies": { - "@types/linkify-it": "*", - "@types/mdurl": "*" + "@types/linkify-it": "^5", + "@types/mdurl": "^2" } }, "node_modules/@types/mdurl": { @@ -470,13 +470,13 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.8.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz", - "integrity": "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==", + "version": "24.9.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.2.tgz", + "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.14.0" + "undici-types": "~7.16.0" } }, "node_modules/@types/vinyl": { @@ -531,23 +531,13 @@ } }, "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, "license": "MIT", "dependencies": { - "ansi-wrap": "0.1.0" + "ansi-wrap": "^0.1.0" }, "engines": { "node": ">=0.10.0" @@ -732,9 +722,9 @@ "license": "MIT" }, "node_modules/bare-events": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.0.tgz", - "integrity": "sha512-AOhh6Bg5QmFIXdViHbMc2tLDsBIRxdkIaIddPslJF9Z5De3APBScuqGP2uThXnIpqFrgoxMNC6km7uXNIMLHXA==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.1.tgz", + "integrity": "sha512-oxSAxTS1hRfnyit2CL5QpAOS5ixfBjj6ex3yTNvXyY/kE719jQ/IjuESJBK2w5v4wwQRAHGseVJXx9QBYOtFGQ==", "devOptional": true, "license": "Apache-2.0", "peerDependencies": { @@ -767,19 +757,6 @@ ], "license": "MIT" }, - "node_modules/beeper": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-2.1.0.tgz", - "integrity": "sha512-85+CcymhlP0jM4fs4ZMiMRl58VthoN9NRdvi+knXiQpP2UggkSre+A9rOZ0c2g2Vh+pEF5ZAlT+k8dsJNoanAA==", - "dev": true, - "license": "MIT", - "dependencies": { - "yoctodelay": "^1.1.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/big-integer": { "version": "1.6.52", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", @@ -2366,39 +2343,6 @@ "@types/node": ">=12" } }, - "node_modules/gulp-jsdoc3": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-jsdoc3/-/gulp-jsdoc3-3.0.0.tgz", - "integrity": "sha512-rE2jAwCPA8XFi9g4V3Z3LPhZNjxuMTIYQVMjdqZAQpRfJITLVaUK3xfmiiNTMc7j+fT7pL8Q5yj7ZPRdwCJWNg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "ansi-colors": "^4.1.1", - "beeper": "^2.0.0", - "debug": "^4.1.1", - "fancy-log": "^1.3.3", - "ink-docstrap": "^1.3.2", - "jsdoc": "^3.6.3", - "map-stream": "0.0.7", - "tmp": "0.1.0" - } - }, - "node_modules/gulp-jsdoc3/node_modules/fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/gulp-mocha": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/gulp-mocha/-/gulp-mocha-10.0.1.tgz", @@ -2427,6 +2371,16 @@ } } }, + "node_modules/gulp-mocha/node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/gulp-mocha/node_modules/diff": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", @@ -2714,17 +2668,6 @@ "devOptional": true, "license": "ISC" }, - "node_modules/ink-docstrap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", - "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "moment": "^2.14.1", - "sanitize-html": "^1.13.0" - } - }, "node_modules/intercept-stdout": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/intercept-stdout/-/intercept-stdout-0.1.2.tgz", @@ -3010,22 +2953,22 @@ } }, "node_modules/jsdoc": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz", - "integrity": "sha512-tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.5.tgz", + "integrity": "sha512-P4C6MWP9yIlMiK8nwoZvxN84vb6MsnXcHuy7XzVOvQoCizWX5JFCBsWIIWKXBltpoRZXddUOVQmCTOZt9yDj9g==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@babel/parser": "^7.9.4", + "@babel/parser": "^7.20.15", "@jsdoc/salty": "^0.2.1", - "@types/markdown-it": "^12.2.3", + "@types/markdown-it": "^14.1.1", "bluebird": "^3.7.2", "catharsis": "^0.9.0", "escape-string-regexp": "^2.0.0", "js2xmlparser": "^4.0.2", "klaw": "^3.0.0", - "markdown-it": "^12.3.2", - "markdown-it-anchor": "^8.4.1", + "markdown-it": "^14.1.0", + "markdown-it-anchor": "^8.6.7", "marked": "^4.0.10", "mkdirp": "^1.0.4", "requizzle": "^0.2.3", @@ -3303,13 +3246,6 @@ "node": ">=0.10.0" } }, - "node_modules/map-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==", - "dev": true, - "license": "MIT" - }, "node_modules/markdown-it": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", @@ -3727,6 +3663,25 @@ "license": "MIT", "optional": true }, + "node_modules/nanoid": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/napi-build-utils": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", @@ -3753,9 +3708,9 @@ } }, "node_modules/node-abi": { - "version": "3.78.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.78.0.tgz", - "integrity": "sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==", + "version": "3.79.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.79.0.tgz", + "integrity": "sha512-Pr/5KdBQGG8TirdkS0qN3B+f3eo8zTOfZQWAxHoJqopMz2/uvRnG+S4fWu/6AZxKei2CP2p/psdQ5HFC2Ap5BA==", "license": "MIT", "optional": true, "dependencies": { @@ -3968,16 +3923,6 @@ "node": ">=0.8" } }, - "node_modules/parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, "node_modules/parse-passwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", @@ -4095,19 +4040,6 @@ "node": ">=10.13.0" } }, - "node_modules/plugin-error/node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-wrap": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/postcss": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", @@ -4137,25 +4069,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss/node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/prebuild-install": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", @@ -4373,13 +4286,13 @@ } }, "node_modules/resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "version": "1.22.11", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", + "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", "dev": true, "license": "MIT", "dependencies": { - "is-core-module": "^2.16.0", + "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -5058,26 +4971,6 @@ "readable-stream": "3" } }, - "node_modules/time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/tmp": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", - "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.14" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -5204,9 +5097,9 @@ } }, "node_modules/undici-types": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", - "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", "dev": true, "license": "MIT" }, @@ -5528,16 +5421,6 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } - }, - "node_modules/yoctodelay": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/yoctodelay/-/yoctodelay-1.2.0.tgz", - "integrity": "sha512-12y/P9MSig9/5BEhBgylss+fkHiCRZCvYR81eH35NW9uw801cvJt31EAV+WOLcwZRZbLiIQl/hxcdXXXFmGvXg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } } } } diff --git a/package.json b/package.json index 36676144..1640b327 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "Apache-2.0", "main": "./lib/marklogic.js", "scripts": { - "doc": "gulp doc", + "doc": "jsdoc -c jsdoc.json lib/*.js README.md", "lint": "gulp lint" }, "keywords": [ @@ -52,9 +52,9 @@ "eslint": "9.38.0", "gulp": "5.0.1", "gulp-eslint-new": "2.5.0", - "gulp-jsdoc3": "3.0.0", "gulp-mocha": "10.0.1", "intercept-stdout": "0.1.2", + "jsdoc": "4.0.5", "mocha": "11.7.4", "mocha-junit-reporter": "2.2.1", "moment": "2.30.1", @@ -78,15 +78,11 @@ "debug": "4.3.6", "glob": "10.3.11", "glob-parent": "6.0.2", - "jsdoc": "4.0.0", - "markdown-it": "14.1.0", "minimatch": "5.1.0", - "sanitize-html": "2.17.0", "semver": "7.5.3", "strip-ansi": "6.0.0", "supports-color": "7.2.0", "tar-fs": "2.1.4", - "tmp": "0.2.4", "wrap-ansi": "6.2.0" } } diff --git a/test-complete-proxy/gulpfile.js b/test-complete-proxy/gulpfile.js index 1708e5de..27e1deb3 100755 --- a/test-complete-proxy/gulpfile.js +++ b/test-complete-proxy/gulpfile.js @@ -4,7 +4,6 @@ const path = require('path'); const gulp = require('gulp'); const mocha = require('gulp-mocha'); -const jsdoc = require('gulp-jsdoc3'); const { parallel, series } = gulp; From 0160b49cdcf52dedf33b9b2e7799c911688b686c Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 29 Oct 2025 12:51:08 -0400 Subject: [PATCH 55/58] MLE-24733 Merging the two test ml-gradle projects Needs two separate invocations to handle data/modules going to different locations. --- CONTRIBUTING.md | 1 + Jenkinsfile | 10 +- test-app/build.gradle | 31 ++- test-app/gradle-e2e.properties | 8 + test-app/gradle.properties | 5 +- .../Schemas/schemas}/permissions.properties | 0 .../Schemas/schemas}/tde/exportingRows.tdex | 0 .../Schemas/schemas}/tde/masterDetail.tdex | 0 .../Schemas/schemas}/tde/masterDetail2.tdej | 0 .../Schemas/schemas}/tde/masterDetail3.tdej | 0 .../Schemas/schemas}/tde/masterDetail4.tdej | 0 .../dmsdk-api-rest-server-modules.json | 0 .../databases/dmsdk-api-rest-server.json | 0 .../node-client-api-rest-server-modules.json | 0 .../node-client-api-rest-server.json | 0 .../temporal/axes/temporal-system-axis.json | 0 .../temporal/axes/temporal-valid-axis.json | 0 .../collections/temporal-collection.json | 0 .../collections/temporalCollectionLsqt.json | 0 .../databases/nodeOpticFunctionalTest.json | 0 .../nodeOpticFunctionalTestModules.json | 0 .../servers/dmsdk-api-rest-server.json | 0 .../servers/node-client-api-rest-server.json | 0 .../servers/node-client-api-ssl-server.json | 4 +- .../servers/nodeOpticFunctionalTest.json | 0 .../optic/lexicon/test/city1.json | 0 .../optic/lexicon/test/city2.json | 0 .../optic/lexicon/test/city3.json | 0 .../optic/lexicon/test/city4.json | 0 .../optic/lexicon/test/city5.json | 0 .../optic/lexicon/test/collections.properties | 0 .../ml-e2e-data}/optic/lexicon/test/doc1.json | 0 .../ml-e2e-data}/optic/lexicon/test/doc2.json | 0 .../ml-e2e-data}/optic/lexicon/test/doc3.json | 0 .../ml-e2e-data}/optic/lexicon/test/doc4.xml | 0 .../ml-e2e-data}/optic/lexicon/test/doc5.xml | 0 .../optic/plan/test/collections.properties | 0 .../optic/plan/test/planLexicons.json | 0 .../optic/plan/test/planTriples.json | 0 .../optic/plan/test/planViews.json | 0 .../optic/sparql/test/collections.properties | 0 .../optic/sparql/test/dedupdoc1.xml | 0 .../optic/triple/test/collections.properties | 0 .../triple/test/duplicatePlayerTripleSet.xml | 0 .../triple/test/duplicateTeamTripleSet.xml | 0 .../triple/test/otherPlayerTripleSet.xml | 0 .../optic/triple/test/playerTripleSet.xml | 0 .../optic/triple/test/teamTripleSet.xml | 0 .../optic/view/test/collections.properties | 0 .../optic/view/test/masterDetail.xml | 0 .../optic/view/test/masterDetail2.json | 0 .../optic/view/test/masterDetail3.json | 0 .../optic/view/test/masterDetail4.json | 0 .../optic/view/test/masterDetail5.json | 0 .../root/optic/test/mapperReducer.sjs | 0 .../main/turtle/companies/companies_100.ttl | 0 .../src/main/turtle/people/people.ttl | 0 test-complete-app-mlDeploy/build.gradle | 45 ---- test-complete-app-mlDeploy/gradle.properties | 8 - .../gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - test-complete-app-mlDeploy/gradlew | 249 ------------------ test-complete-app-mlDeploy/gradlew.bat | 92 ------- .../certificate-templates/template-1.xml | 17 -- .../main/ml-config/security/roles/eval.json | 37 --- .../security/roles/qbvuser-role.json | 75 ------ .../security/roles/rest-evaluator.json | 54 ---- .../security/roles/rest-temporal-writer.json | 24 -- .../ml-config/security/roles/tde-User.json | 16 -- .../ml-config/security/users/qbvuser.json | 8 - .../ml-config/security/users/rest-admin.json | 8 - .../security/users/rest-evaluator.json | 8 - .../security/users/rest-reader-optic.json | 8 - .../ml-config/security/users/rest-reader.json | 8 - .../security/users/rest-temporal-writer.json | 8 - .../ml-config/security/users/rest-writer.json | 9 - .../ml-config/security/users/tde-user.json | 8 - 77 files changed, 47 insertions(+), 701 deletions(-) create mode 100644 test-app/gradle-e2e.properties rename {test-complete-app-mlDeploy/src/main/ml-schemas => test-app/src/main/ml-config/databases/Schemas/schemas}/permissions.properties (100%) rename {test-complete-app-mlDeploy/src/main/ml-schemas => test-app/src/main/ml-config/databases/Schemas/schemas}/tde/exportingRows.tdex (100%) rename {test-complete-app-mlDeploy/src/main/ml-schemas => test-app/src/main/ml-config/databases/Schemas/schemas}/tde/masterDetail.tdex (100%) rename {test-complete-app-mlDeploy/src/main/ml-schemas => test-app/src/main/ml-config/databases/Schemas/schemas}/tde/masterDetail2.tdej (100%) rename {test-complete-app-mlDeploy/src/main/ml-schemas => test-app/src/main/ml-config/databases/Schemas/schemas}/tde/masterDetail3.tdej (100%) rename {test-complete-app-mlDeploy/src/main/ml-schemas => test-app/src/main/ml-config/databases/Schemas/schemas}/tde/masterDetail4.tdej (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/dmsdk-api-rest-server.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/node-client-api-rest-server-modules.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/node-client-api-rest-server.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/nodeOpticFunctionalTest.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/servers/dmsdk-api-rest-server.json (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/servers/node-client-api-rest-server.json (100%) rename test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json => test-app/src/main/ml-config/servers/node-client-api-ssl-server.json (88%) rename {test-complete-app-mlDeploy => test-app}/src/main/ml-config/servers/nodeOpticFunctionalTest.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/city1.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/city2.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/city3.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/city4.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/city5.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/collections.properties (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/doc1.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/doc2.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/doc3.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/doc4.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/lexicon/test/doc5.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/plan/test/collections.properties (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/plan/test/planLexicons.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/plan/test/planTriples.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/plan/test/planViews.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/sparql/test/collections.properties (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/sparql/test/dedupdoc1.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/triple/test/collections.properties (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/triple/test/duplicatePlayerTripleSet.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/triple/test/duplicateTeamTripleSet.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/triple/test/otherPlayerTripleSet.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/triple/test/playerTripleSet.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/triple/test/teamTripleSet.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/view/test/collections.properties (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/view/test/masterDetail.xml (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/view/test/masterDetail2.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/view/test/masterDetail3.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/view/test/masterDetail4.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-data => test-app/src/main/ml-e2e-data}/optic/view/test/masterDetail5.json (100%) rename {test-complete-app-mlDeploy/src/main/ml-modules => test-app/src/main/ml-e2e-modules}/root/optic/test/mapperReducer.sjs (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/turtle/companies/companies_100.ttl (100%) rename {test-complete-app-mlDeploy => test-app}/src/main/turtle/people/people.ttl (100%) delete mode 100644 test-complete-app-mlDeploy/build.gradle delete mode 100644 test-complete-app-mlDeploy/gradle.properties delete mode 100644 test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar delete mode 100644 test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties delete mode 100755 test-complete-app-mlDeploy/gradlew delete mode 100644 test-complete-app-mlDeploy/gradlew.bat delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json delete mode 100644 test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df634233..82d9dfcf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,6 +32,7 @@ While still in the test-app directory run the following gradle command. cd test-app ./gradlew -i mlDeploy + ./gradlew -i -Penv=e2e mlLoadData mlLoadModules Once the deploy has completed successfully, use "cd .." to return to the root directory of the project. diff --git a/Jenkinsfile b/Jenkinsfile index 98f75156..45939b37 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ def runTests() { ./gradlew -i mlWaitTillReady ./gradlew -i mlTestConnections ./gradlew -i mlDeploy + ./gradlew -i -Penv=e2e mlLoadData mlLoadModules cd .. rm -rf $WORKSPACE/*.xml || true @@ -70,19 +71,12 @@ def runLint() { def runE2ETests() { sh label: 'run-e2e-tests', script: ''' - export JAVA_HOME=$JAVA_HOME_DIR - export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR - export PATH=$JAVA_HOME/bin:${NODE_HOME_DIR}/bin:$PATH + export PATH=${NODE_HOME_DIR}/bin:$PATH cd node-client-api node --version npm --version npm ci - cd test-complete-app-mlDeploy - echo "Deploying from test-complete-app-mlDeploy" - ./gradlew -i mlDeploy - cd .. - echo "Running test-complete tests" ./node_modules/.bin/mocha --no-parallel -R xunit --timeout 60000 test-complete/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-complete-results.xml || true echo "Done with test-complete tests" diff --git a/test-app/build.gradle b/test-app/build.gradle index 33fe6fbb..8c9e2afd 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -12,7 +12,7 @@ buildscript { } plugins { - id "net.saliman.properties" version "1.5.2" + id "net.saliman.properties" version "1.6.0" } apply plugin: "com.marklogic.ml-gradle" @@ -46,3 +46,32 @@ ext { command.setValidFor(365) mlAppDeployer.commands.add(command) } + +tasks.register("curlPeople", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/people/people.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/people' + ] +} + +tasks.register("curlCompanies", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/companies/companies_100.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl' + ] +} + +mlDeploy.finalizedBy curlPeople +mlDeploy.finalizedBy curlCompanies diff --git a/test-app/gradle-e2e.properties b/test-app/gradle-e2e.properties new file mode 100644 index 00000000..fd2ac4ff --- /dev/null +++ b/test-app/gradle-e2e.properties @@ -0,0 +1,8 @@ +# Defines properties for loading data and modules for the so-called "e2e" tests in "test-complete". +mlDataPaths=src/main/ml-e2e-data +mlModulePaths=src/main/ml-e2e-modules + +mlDataDatabaseName=nodeOpticFunctionalTest +mlModulesDatabaseName=nodeOpticFunctionalTestModules + +mlNoRestServer=true diff --git a/test-app/gradle.properties b/test-app/gradle.properties index 3a31f809..c2ae282d 100644 --- a/test-app/gradle.properties +++ b/test-app/gradle.properties @@ -1,7 +1,10 @@ +# See https://github.com/stevesaliman/gradle-properties-plugin +propertiesPluginEnvironmentNameProperty=env + mlAppName=unittest-nodeapi mlContentDatabaseName=unittest-nodeapi mlHost=localhost mlUsername=admin mlPassword=admin mlRestPort=8015 -mlContentForestsPerHost=3 \ No newline at end of file +mlContentForestsPerHost=3 diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties b/test-app/src/main/ml-config/databases/Schemas/schemas/permissions.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties rename to test-app/src/main/ml-config/databases/Schemas/schemas/permissions.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/exportingRows.tdex similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/exportingRows.tdex diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail.tdex similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail.tdex diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail2.tdej similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail2.tdej diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail3.tdej similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail3.tdej diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail4.tdej similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail4.tdej diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json b/test-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json rename to test-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json b/test-app/src/main/ml-config/databases/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json rename to test-app/src/main/ml-config/databases/dmsdk-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json rename to test-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json b/test-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json rename to test-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json b/test-app/src/main/ml-config/servers/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json rename to test-app/src/main/ml-config/servers/dmsdk-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json b/test-app/src/main/ml-config/servers/node-client-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json rename to test-app/src/main/ml-config/servers/node-client-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json b/test-app/src/main/ml-config/servers/node-client-api-ssl-server.json similarity index 88% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json rename to test-app/src/main/ml-config/servers/node-client-api-ssl-server.json index 47819895..69f230b3 100644 --- a/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json +++ b/test-app/src/main/ml-config/servers/node-client-api-ssl-server.json @@ -10,5 +10,5 @@ "url-rewriter": "/MarkLogic/rest-api/rewriter.xml", "rewrite-resolves-globally": true, "authentication": "digestbasic", - "ssl-certificate-template": "ssl-project-template" -} \ No newline at end of file + "ssl-certificate-template": "node-client-ssl-template" +} diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json b/test-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json rename to test-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city1.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city1.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city2.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city2.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city3.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city3.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city4.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city4.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city5.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city5.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/lexicon/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc1.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc1.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc2.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc2.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc3.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc3.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc4.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc4.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc5.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc5.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/plan/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/plan/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json b/test-app/src/main/ml-e2e-data/optic/plan/test/planLexicons.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json rename to test-app/src/main/ml-e2e-data/optic/plan/test/planLexicons.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json b/test-app/src/main/ml-e2e-data/optic/plan/test/planTriples.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json rename to test-app/src/main/ml-e2e-data/optic/plan/test/planTriples.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json b/test-app/src/main/ml-e2e-data/optic/plan/test/planViews.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json rename to test-app/src/main/ml-e2e-data/optic/plan/test/planViews.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/sparql/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/sparql/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml b/test-app/src/main/ml-e2e-data/optic/sparql/test/dedupdoc1.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml rename to test-app/src/main/ml-e2e-data/optic/sparql/test/dedupdoc1.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/triple/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/triple/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/duplicatePlayerTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/duplicatePlayerTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/duplicateTeamTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/duplicateTeamTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/otherPlayerTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/otherPlayerTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/playerTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/playerTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/teamTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/teamTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/view/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/view/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail2.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail2.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail3.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail3.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail4.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail4.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail5.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail5.json diff --git a/test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs b/test-app/src/main/ml-e2e-modules/root/optic/test/mapperReducer.sjs similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs rename to test-app/src/main/ml-e2e-modules/root/optic/test/mapperReducer.sjs diff --git a/test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl b/test-app/src/main/turtle/companies/companies_100.ttl similarity index 100% rename from test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl rename to test-app/src/main/turtle/companies/companies_100.ttl diff --git a/test-complete-app-mlDeploy/src/main/turtle/people/people.ttl b/test-app/src/main/turtle/people/people.ttl similarity index 100% rename from test-complete-app-mlDeploy/src/main/turtle/people/people.ttl rename to test-app/src/main/turtle/people/people.ttl diff --git a/test-complete-app-mlDeploy/build.gradle b/test-complete-app-mlDeploy/build.gradle deleted file mode 100644 index 3fcc0516..00000000 --- a/test-complete-app-mlDeploy/build.gradle +++ /dev/null @@ -1,45 +0,0 @@ -plugins { - id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "6.1.0" -} - -/* - * Since our REST API server uses a certificate template, we need to execute an extra command to generate a temporary - * certificate for this template - without that, the REST API server won't be able to receive HTTP or HTTPS requests. - */ -ext { - def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand() - command.setTemplateIdOrName("ssl-project-template") - command.setCommonName("localhost") - command.setValidFor(365) - mlAppDeployer.commands.add(command) -} - -tasks.register("curlPeople", Exec) { - commandLine = [ - 'curl', - '--fail', - '--anyauth', '--user', 'admin:admin', - '-i', - '-X', 'POST', - '--data-binary', '@./src/main/turtle/people/people.ttl', - '-H', 'Content-type: text/turtle', - 'http://localhost:8079/v1/graphs?graph=/people' - ] -} - -tasks.register("curlCompanies", Exec) { - commandLine = [ - 'curl', - '--fail', - '--anyauth', '--user', 'admin:admin', - '-i', - '-X', 'POST', - '--data-binary', '@./src/main/turtle/companies/companies_100.ttl', - '-H', 'Content-type: text/turtle', - 'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl' - ] -} - -mlDeploy.finalizedBy curlPeople -mlDeploy.finalizedBy curlCompanies diff --git a/test-complete-app-mlDeploy/gradle.properties b/test-complete-app-mlDeploy/gradle.properties deleted file mode 100644 index d7a78f54..00000000 --- a/test-complete-app-mlDeploy/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -mlHost=localhost -mlUsername=admin -mlPassword=admin - -mlNoRestServer=true -mlModulesDatabaseName=nodeOpticFunctionalTestModules -mlSchemasDatabaseName=Schemas -mlRestPort=8079 \ No newline at end of file diff --git a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63721 zcmb5Wb9gP!wgnp7wrv|bwr$&XvSZt}Z6`anZSUAlc9NHKf9JdJ;NJVr`=eI(_pMp0 zy1VAAG3FfAOI`{X1O)&90s;U4K;XLp008~hCjbEC_fbYfS%6kTR+JtXK>nW$ZR+`W ze|#J8f4A@M|F5BpfUJb5h>|j$jOe}0oE!`Zf6fM>CR?!y@zU(cL8NsKk`a z6tx5mAkdjD;J=LcJ;;Aw8p!v#ouk>mUDZF@ zK>yvw%+bKu+T{Nk@LZ;zkYy0HBKw06_IWcMHo*0HKpTsEFZhn5qCHH9j z)|XpN&{`!0a>Vl+PmdQc)Yg4A(AG-z!+@Q#eHr&g<9D?7E)_aEB?s_rx>UE9TUq|? z;(ggJt>9l?C|zoO@5)tu?EV0x_7T17q4fF-q3{yZ^ipUbKcRZ4Qftd!xO(#UGhb2y>?*@{xq%`(-`2T^vc=#< zx!+@4pRdk&*1ht2OWk^Z5IAQ0YTAXLkL{(D*$gENaD)7A%^XXrCchN&z2x+*>o2FwPFjWpeaL=!tzv#JOW#( z$B)Nel<+$bkH1KZv3&-}=SiG~w2sbDbAWarg%5>YbC|}*d9hBjBkR(@tyM0T)FO$# zPtRXukGPnOd)~z=?avu+4Co@wF}1T)-uh5jI<1$HLtyDrVak{gw`mcH@Q-@wg{v^c zRzu}hMKFHV<8w}o*yg6p@Sq%=gkd~;`_VGTS?L@yVu`xuGy+dH6YOwcP6ZE`_0rK% zAx5!FjDuss`FQ3eF|mhrWkjux(Pny^k$u_)dyCSEbAsecHsq#8B3n3kDU(zW5yE|( zgc>sFQywFj5}U*qtF9Y(bi*;>B7WJykcAXF86@)z|0-Vm@jt!EPoLA6>r)?@DIobIZ5Sx zsc@OC{b|3%vaMbyeM|O^UxEYlEMHK4r)V-{r)_yz`w1*xV0|lh-LQOP`OP`Pk1aW( z8DSlGN>Ts|n*xj+%If~+E_BxK)~5T#w6Q1WEKt{!Xtbd`J;`2a>8boRo;7u2M&iOop4qcy<)z023=oghSFV zST;?S;ye+dRQe>ygiJ6HCv4;~3DHtJ({fWeE~$H@mKn@Oh6Z(_sO>01JwH5oA4nvK zr5Sr^g+LC zLt(i&ecdmqsIJGNOSUyUpglvhhrY8lGkzO=0USEKNL%8zHshS>Qziu|`eyWP^5xL4 zRP122_dCJl>hZc~?58w~>`P_s18VoU|7(|Eit0-lZRgLTZKNq5{k zE?V=`7=R&ro(X%LTS*f+#H-mGo_j3dm@F_krAYegDLk6UV{`UKE;{YSsn$ z(yz{v1@p|p!0>g04!eRSrSVb>MQYPr8_MA|MpoGzqyd*$@4j|)cD_%^Hrd>SorF>@ zBX+V<@vEB5PRLGR(uP9&U&5=(HVc?6B58NJT_igiAH*q~Wb`dDZpJSKfy5#Aag4IX zj~uv74EQ_Q_1qaXWI!7Vf@ZrdUhZFE;L&P_Xr8l@GMkhc#=plV0+g(ki>+7fO%?Jb zl+bTy7q{w^pTb{>(Xf2q1BVdq?#f=!geqssXp z4pMu*q;iiHmA*IjOj4`4S&|8@gSw*^{|PT}Aw~}ZXU`6=vZB=GGeMm}V6W46|pU&58~P+?LUs%n@J}CSrICkeng6YJ^M? zS(W?K4nOtoBe4tvBXs@@`i?4G$S2W&;$z8VBSM;Mn9 zxcaEiQ9=vS|bIJ>*tf9AH~m&U%2+Dim<)E=}KORp+cZ^!@wI`h1NVBXu{@%hB2Cq(dXx_aQ9x3mr*fwL5!ZryQqi|KFJuzvP zK1)nrKZ7U+B{1ZmJub?4)Ln^J6k!i0t~VO#=q1{?T)%OV?MN}k5M{}vjyZu#M0_*u z8jwZKJ#Df~1jcLXZL7bnCEhB6IzQZ-GcoQJ!16I*39iazoVGugcKA{lhiHg4Ta2fD zk1Utyc5%QzZ$s3;p0N+N8VX{sd!~l*Ta3|t>lhI&G`sr6L~G5Lul`>m z{!^INm?J|&7X=;{XveF!(b*=?9NAp4y&r&N3(GKcW4rS(Ejk|Lzs1PrxPI_owB-`H zg3(Rruh^&)`TKA6+_!n>RdI6pw>Vt1_j&+bKIaMTYLiqhZ#y_=J8`TK{Jd<7l9&sY z^^`hmi7^14s16B6)1O;vJWOF$=$B5ONW;;2&|pUvJlmeUS&F;DbSHCrEb0QBDR|my zIs+pE0Y^`qJTyH-_mP=)Y+u^LHcuZhsM3+P||?+W#V!_6E-8boP#R-*na4!o-Q1 zVthtYhK{mDhF(&7Okzo9dTi03X(AE{8cH$JIg%MEQca`S zy@8{Fjft~~BdzWC(di#X{ny;!yYGK9b@=b|zcKZ{vv4D8i+`ilOPl;PJl{!&5-0!w z^fOl#|}vVg%=n)@_e1BrP)`A zKPgs`O0EO}Y2KWLuo`iGaKu1k#YR6BMySxQf2V++Wo{6EHmK>A~Q5o73yM z-RbxC7Qdh0Cz!nG+7BRZE>~FLI-?&W_rJUl-8FDIaXoNBL)@1hwKa^wOr1($*5h~T zF;%f^%<$p8Y_yu(JEg=c_O!aZ#)Gjh$n(hfJAp$C2he555W5zdrBqjFmo|VY+el;o z=*D_w|GXG|p0**hQ7~9-n|y5k%B}TAF0iarDM!q-jYbR^us(>&y;n^2l0C%@2B}KM zyeRT9)oMt97Agvc4sEKUEy%MpXr2vz*lb zh*L}}iG>-pqDRw7ud{=FvTD?}xjD)w{`KzjNom-$jS^;iw0+7nXSnt1R@G|VqoRhE%12nm+PH?9`(4rM0kfrZzIK9JU=^$YNyLvAIoxl#Q)xxDz!^0@zZ zSCs$nfcxK_vRYM34O<1}QHZ|hp4`ioX3x8(UV(FU$J@o%tw3t4k1QPmlEpZa2IujG&(roX_q*%e`Hq|);0;@k z0z=fZiFckp#JzW0p+2A+D$PC~IsakhJJkG(c;CqAgFfU0Z`u$PzG~-9I1oPHrCw&)@s^Dc~^)#HPW0Ra}J^=|h7Fs*<8|b13ZzG6MP*Q1dkoZ6&A^!}|hbjM{2HpqlSXv_UUg1U4gn z3Q)2VjU^ti1myodv+tjhSZp%D978m~p& z43uZUrraHs80Mq&vcetqfQpQP?m!CFj)44t8Z}k`E798wxg&~aCm+DBoI+nKq}&j^ zlPY3W$)K;KtEajks1`G?-@me7C>{PiiBu+41#yU_c(dITaqE?IQ(DBu+c^Ux!>pCj zLC|HJGU*v+!it1(;3e`6igkH(VA)-S+k(*yqxMgUah3$@C zz`7hEM47xr>j8^g`%*f=6S5n>z%Bt_Fg{Tvmr+MIsCx=0gsu_sF`q2hlkEmisz#Fy zj_0;zUWr;Gz}$BS%Y`meb(=$d%@Crs(OoJ|}m#<7=-A~PQbyN$x%2iXP2@e*nO0b7AwfH8cCUa*Wfu@b)D_>I*%uE4O3 z(lfnB`-Xf*LfC)E}e?%X2kK7DItK6Tf<+M^mX0Ijf_!IP>7c8IZX%8_#0060P{QMuV^B9i<^E`_Qf0pv9(P%_s8D`qvDE9LK9u-jB}J2S`(mCO&XHTS04Z5Ez*vl^T%!^$~EH8M-UdwhegL>3IQ*)(MtuH2Xt1p!fS4o~*rR?WLxlA!sjc2(O znjJn~wQ!Fp9s2e^IWP1C<4%sFF}T4omr}7+4asciyo3DntTgWIzhQpQirM$9{EbQd z3jz9vS@{aOqTQHI|l#aUV@2Q^Wko4T0T04Me4!2nsdrA8QY1%fnAYb~d2GDz@lAtfcHq(P7 zaMBAGo}+NcE-K*@9y;Vt3*(aCaMKXBB*BJcD_Qnxpt75r?GeAQ}*|>pYJE=uZb73 zC>sv)18)q#EGrTG6io*}JLuB_jP3AU1Uiu$D7r|2_zlIGb9 zjhst#ni)Y`$)!fc#reM*$~iaYoz~_Cy7J3ZTiPm)E?%`fbk`3Tu-F#`{i!l5pNEn5 zO-Tw-=TojYhzT{J=?SZj=Z8#|eoF>434b-DXiUsignxXNaR3 zm_}4iWU$gt2Mw5NvZ5(VpF`?X*f2UZDs1TEa1oZCif?Jdgr{>O~7}-$|BZ7I(IKW`{f;@|IZFX*R8&iT= zoWstN8&R;}@2Ka%d3vrLtR|O??ben;k8QbS-WB0VgiCz;<$pBmIZdN!aalyCSEm)crpS9dcD^Y@XT1a3+zpi-`D}e#HV<} z$Y(G&o~PvL-xSVD5D?JqF3?B9rxGWeb=oEGJ3vRp5xfBPlngh1O$yI95EL+T8{GC@ z98i1H9KhZGFl|;`)_=QpM6H?eDPpw~^(aFQWwyXZ8_EEE4#@QeT_URray*mEOGsGc z6|sdXtq!hVZo=d#+9^@lm&L5|q&-GDCyUx#YQiccq;spOBe3V+VKdjJA=IL=Zn%P} zNk=_8u}VhzFf{UYZV0`lUwcD&)9AFx0@Fc6LD9A6Rd1=ga>Mi0)_QxM2ddCVRmZ0d z+J=uXc(?5JLX3=)e)Jm$HS2yF`44IKhwRnm2*669_J=2LlwuF5$1tAo@ROSU@-y+;Foy2IEl2^V1N;fk~YR z?&EP8#t&m0B=?aJeuz~lHjAzRBX>&x=A;gIvb>MD{XEV zV%l-+9N-)i;YH%nKP?>f`=?#`>B(`*t`aiPLoQM(a6(qs4p5KFjDBN?8JGrf3z8>= zi7sD)c)Nm~x{e<^jy4nTx${P~cwz_*a>%0_;ULou3kHCAD7EYkw@l$8TN#LO9jC( z1BeFW`k+bu5e8Ns^a8dPcjEVHM;r6UX+cN=Uy7HU)j-myRU0wHd$A1fNI~`4;I~`zC)3ul#8#^rXVSO*m}Ag>c%_;nj=Nv$rCZ z*~L@C@OZg%Q^m)lc-kcX&a*a5`y&DaRxh6O*dfhLfF+fU5wKs(1v*!TkZidw*)YBP za@r`3+^IHRFeO%!ai%rxy;R;;V^Fr=OJlpBX;(b*3+SIw}7= zIq$*Thr(Zft-RlY)D3e8V;BmD&HOfX+E$H#Y@B3?UL5L~_fA-@*IB-!gItK7PIgG9 zgWuGZK_nuZjHVT_Fv(XxtU%)58;W39vzTI2n&)&4Dmq7&JX6G>XFaAR{7_3QB6zsT z?$L8c*WdN~nZGiscY%5KljQARN;`w$gho=p006z;n(qIQ*Zu<``TMO3n0{ARL@gYh zoRwS*|Niw~cR!?hE{m*y@F`1)vx-JRfqET=dJ5_(076st(=lFfjtKHoYg`k3oNmo_ zNbQEw8&sO5jAYmkD|Zaz_yUb0rC})U!rCHOl}JhbYIDLzLvrZVw0~JO`d*6f;X&?V=#T@ND*cv^I;`sFeq4 z##H5;gpZTb^0Hz@3C*~u0AqqNZ-r%rN3KD~%Gw`0XsIq$(^MEb<~H(2*5G^<2(*aI z%7}WB+TRlMIrEK#s0 z93xn*Ohb=kWFc)BNHG4I(~RPn-R8#0lqyBBz5OM6o5|>x9LK@%HaM}}Y5goCQRt2C z{j*2TtT4ne!Z}vh89mjwiSXG=%DURar~=kGNNaO_+Nkb+tRi~Rkf!7a$*QlavziD( z83s4GmQ^Wf*0Bd04f#0HX@ua_d8 z23~z*53ePD6@xwZ(vdl0DLc=>cPIOPOdca&MyR^jhhKrdQO?_jJh`xV3GKz&2lvP8 zEOwW6L*ufvK;TN{=S&R@pzV^U=QNk^Ec}5H z+2~JvEVA{`uMAr)?Kf|aW>33`)UL@bnfIUQc~L;TsTQ6>r-<^rB8uoNOJ>HWgqMI8 zSW}pZmp_;z_2O5_RD|fGyTxaxk53Hg_3Khc<8AUzV|ZeK{fp|Ne933=1&_^Dbv5^u zB9n=*)k*tjHDRJ@$bp9mrh}qFn*s}npMl5BMDC%Hs0M0g-hW~P*3CNG06G!MOPEQ_ zi}Qs-6M8aMt;sL$vlmVBR^+Ry<64jrm1EI1%#j?c?4b*7>)a{aDw#TfTYKq+SjEFA z(aJ&z_0?0JB83D-i3Vh+o|XV4UP+YJ$9Boid2^M2en@APw&wx7vU~t$r2V`F|7Qfo z>WKgI@eNBZ-+Og<{u2ZiG%>YvH2L3fNpV9J;WLJoBZda)01Rn;o@){01{7E#ke(7U zHK>S#qZ(N=aoae*4X!0A{)nu0R_sKpi1{)u>GVjC+b5Jyl6#AoQ-1_3UDovNSo`T> z?c-@7XX*2GMy?k?{g)7?Sv;SJkmxYPJPs!&QqB12ejq`Lee^-cDveVWL^CTUldb(G zjDGe(O4P=S{4fF=#~oAu>LG>wrU^z_?3yt24FOx>}{^lCGh8?vtvY$^hbZ)9I0E3r3NOlb9I?F-Yc=r$*~l`4N^xzlV~N zl~#oc>U)Yjl0BxV>O*Kr@lKT{Z09OXt2GlvE38nfs+DD7exl|&vT;)>VFXJVZp9Np zDK}aO;R3~ag$X*|hRVY3OPax|PG`@_ESc8E!mHRByJbZQRS38V2F__7MW~sgh!a>98Q2%lUNFO=^xU52|?D=IK#QjwBky-C>zOWlsiiM&1n z;!&1((Xn1$9K}xabq~222gYvx3hnZPg}VMF_GV~5ocE=-v>V=T&RsLBo&`)DOyIj* zLV{h)JU_y*7SdRtDajP_Y+rBkNN*1_TXiKwHH2&p51d(#zv~s#HwbNy?<+(=9WBvo zw2hkk2Dj%kTFhY+$T+W-b7@qD!bkfN#Z2ng@Pd=i3-i?xYfs5Z*1hO?kd7Sp^9`;Y zM2jeGg<-nJD1er@Pc_cSY7wo5dzQX44=%6rn}P_SRbpzsA{6B+!$3B0#;}qwO37G^ zL(V_5JK`XT?OHVk|{_$vQ|oNEpab*BO4F zUTNQ7RUhnRsU`TK#~`)$icsvKh~(pl=3p6m98@k3P#~upd=k*u20SNcb{l^1rUa)>qO997)pYRWMncC8A&&MHlbW?7i^7M`+B$hH~Y|J zd>FYOGQ;j>Zc2e7R{KK7)0>>nn_jYJy&o@sK!4G>-rLKM8Hv)f;hi1D2fAc$+six2 zyVZ@wZ6x|fJ!4KrpCJY=!Mq0;)X)OoS~{Lkh6u8J`eK%u0WtKh6B>GW_)PVc zl}-k`p09qwGtZ@VbYJC!>29V?Dr>>vk?)o(x?!z*9DJ||9qG-&G~#kXxbw{KKYy}J zQKa-dPt~M~E}V?PhW0R26xdA%1T*%ra6SguGu50YHngOTIv)@N|YttEXo#OZfgtP7;H?EeZZxo<}3YlYxtBq znJ!WFR^tmGf0Py}N?kZ(#=VtpC@%xJkDmfcCoBTxq zr_|5gP?u1@vJZbxPZ|G0AW4=tpb84gM2DpJU||(b8kMOV1S3|(yuwZJ&rIiFW(U;5 zUtAW`O6F6Zy+eZ1EDuP~AAHlSY-+A_eI5Gx)%*uro5tljy}kCZU*_d7)oJ>oQSZ3* zneTn`{gnNC&uJd)0aMBzAg021?YJ~b(fmkwZAd696a=0NzBAqBN54KuNDwa*no(^O z6p05bioXUR^uXjpTol*ppHp%1v9e)vkoUAUJyBx3lw0UO39b0?^{}yb!$yca(@DUn zCquRF?t=Zb9`Ed3AI6|L{eX~ijVH`VzSMheKoP7LSSf4g>md>`yi!TkoG5P>Ofp+n z(v~rW+(5L96L{vBb^g51B=(o)?%%xhvT*A5btOpw(TKh^g^4c zw>0%X!_0`{iN%RbVk+A^f{w-4-SSf*fu@FhruNL##F~sF24O~u zyYF<3el2b$$wZ_|uW#@Ak+VAGk#e|kS8nL1g>2B-SNMjMp^8;-FfeofY2fphFHO!{ z*!o4oTb{4e;S<|JEs<1_hPsmAlVNk?_5-Fp5KKU&d#FiNW~Y+pVFk@Cua1I{T+1|+ zHx6rFMor)7L)krbilqsWwy@T+g3DiH5MyVf8Wy}XbEaoFIDr~y;@r&I>FMW{ z?Q+(IgyebZ)-i4jNoXQhq4Muy9Fv+OxU;9_Jmn+<`mEC#%2Q_2bpcgzcinygNI!&^ z=V$)o2&Yz04~+&pPWWn`rrWxJ&}8khR)6B(--!9Q zubo}h+1T)>a@c)H^i``@<^j?|r4*{;tQf78(xn0g39IoZw0(CwY1f<%F>kEaJ zp9u|IeMY5mRdAlw*+gSN^5$Q)ShM<~E=(c8QM+T-Qk)FyKz#Sw0EJ*edYcuOtO#~Cx^(M7w5 z3)rl#L)rF|(Vun2LkFr!rg8Q@=r>9p>(t3Gf_auiJ2Xx9HmxYTa|=MH_SUlYL`mz9 zTTS$`%;D-|Jt}AP1&k7PcnfFNTH0A-*FmxstjBDiZX?}%u%Yq94$fUT&z6od+(Uk> zuqsld#G(b$G8tus=M!N#oPd|PVFX)?M?tCD0tS%2IGTfh}3YA3f&UM)W$_GNV8 zQo+a(ml2Km4o6O%gKTCSDNq+#zCTIQ1*`TIJh~k6Gp;htHBFnne))rlFdGqwC6dx2+La1&Mnko*352k0y z+tQcwndQlX`nc6nb$A9?<-o|r*%aWXV#=6PQic0Ok_D;q>wbv&j7cKc!w4~KF#-{6 z(S%6Za)WpGIWf7jZ3svNG5OLs0>vCL9{V7cgO%zevIVMH{WgP*^D9ws&OqA{yr|m| zKD4*07dGXshJHd#e%x%J+qmS^lS|0Bp?{drv;{@{l9ArPO&?Q5=?OO9=}h$oVe#3b z3Yofj&Cb}WC$PxmRRS)H%&$1-)z7jELS}!u!zQ?A^Y{Tv4QVt*vd@uj-^t2fYRzQj zfxGR>-q|o$3sGn^#VzZ!QQx?h9`njeJry}@x?|k0-GTTA4y3t2E`3DZ!A~D?GiJup z)8%PK2^9OVRlP(24P^4_<|D=H^7}WlWu#LgsdHzB%cPy|f8dD3|A^mh4WXxhLTVu_ z@abE{6Saz|Y{rXYPd4$tfPYo}ef(oQWZ=4Bct-=_9`#Qgp4ma$n$`tOwq#&E18$B; z@Bp)bn3&rEi0>fWWZ@7k5WazfoX`SCO4jQWwVuo+$PmSZn^Hz?O(-tW@*DGxuf)V1 zO_xm&;NVCaHD4dqt(-MlszI3F-p?0!-e$fbiCeuaw66h^TTDLWuaV<@C-`=Xe5WL) zwooG7h>4&*)p3pKMS3O!4>-4jQUN}iAMQ)2*70?hP~)TzzR?-f@?Aqy$$1Iy8VGG$ zMM?8;j!pUX7QQD$gRc_#+=raAS577ga-w?jd`vCiN5lu)dEUkkUPl9!?{$IJNxQys z*E4e$eF&n&+AMRQR2gcaFEjAy*r)G!s(P6D&TfoApMFC_*Ftx0|D0@E-=B7tezU@d zZ{hGiN;YLIoSeRS;9o%dEua4b%4R3;$SugDjP$x;Z!M!@QibuSBb)HY!3zJ7M;^jw zlx6AD50FD&p3JyP*>o+t9YWW8(7P2t!VQQ21pHJOcG_SXQD;(5aX#M6x##5H_Re>6lPyDCjxr*R(+HE%c&QN+b^tbT zXBJk?p)zhJj#I?&Y2n&~XiytG9!1ox;bw5Rbj~)7c(MFBb4>IiRATdhg zmiEFlj@S_hwYYI(ki{}&<;_7(Z0Qkfq>am z&LtL=2qc7rWguk3BtE4zL41@#S;NN*-jWw|7Kx7H7~_%7fPt;TIX}Ubo>;Rmj94V> zNB1=;-9AR7s`Pxn}t_6^3ahlq53e&!Lh85uG zec0vJY_6e`tg7LgfrJ3k!DjR)Bi#L@DHIrZ`sK=<5O0Ip!fxGf*OgGSpP@Hbbe&$9 z;ZI}8lEoC2_7;%L2=w?tb%1oL0V+=Z`7b=P&lNGY;yVBazXRYu;+cQDKvm*7NCxu&i;zub zAJh#11%?w>E2rf2e~C4+rAb-&$^vsdACs7 z@|Ra!OfVM(ke{vyiqh7puf&Yp6cd6{DptUteYfIRWG3pI+5< zBVBI_xkBAc<(pcb$!Y%dTW(b;B;2pOI-(QCsLv@U-D1XJ z(Gk8Q3l7Ws46Aktuj>|s{$6zA&xCPuXL-kB`CgYMs}4IeyG*P51IDwW?8UNQd+$i~ zlxOPtSi5L|gJcF@DwmJA5Ju8HEJ>o{{upwIpb!f{2(vLNBw`7xMbvcw<^{Fj@E~1( z?w`iIMieunS#>nXlmUcSMU+D3rX28f?s7z;X=se6bo8;5vM|O^(D6{A9*ChnGH!RG zP##3>LDC3jZPE4PH32AxrqPk|yIIrq~`aL-=}`okhNu9aT%q z1b)7iJ)CN=V#Ly84N_r7U^SH2FGdE5FpTO2 z630TF$P>GNMu8`rOytb(lB2};`;P4YNwW1<5d3Q~AX#P0aX}R2b2)`rgkp#zTxcGj zAV^cvFbhP|JgWrq_e`~exr~sIR$6p5V?o4Wym3kQ3HA+;Pr$bQ0(PmADVO%MKL!^q z?zAM8j1l4jrq|5X+V!8S*2Wl@=7*pPgciTVK6kS1Ge zMsd_u6DFK$jTnvVtE;qa+8(1sGBu~n&F%dh(&c(Zs4Fc#A=gG^^%^AyH}1^?|8quj zl@Z47h$){PlELJgYZCIHHL= z{U8O>Tw4x3<1{?$8>k-P<}1y9DmAZP_;(3Y*{Sk^H^A=_iSJ@+s5ktgwTXz_2$~W9>VVZsfwCm@s0sQ zeB50_yu@uS+e7QoPvdCwDz{prjo(AFwR%C?z`EL{1`|coJHQTk^nX=tvs1<0arUOJ z!^`*x&&BvTYmemyZ)2p~{%eYX=JVR?DYr(rNgqRMA5E1PR1Iw=prk=L2ldy3r3Vg@27IZx43+ywyzr-X*p*d@tZV+!U#~$-q=8c zgdSuh#r?b4GhEGNai)ayHQpk>5(%j5c@C1K3(W1pb~HeHpaqijJZa-e6vq_8t-^M^ zBJxq|MqZc?pjXPIH}70a5vt!IUh;l}<>VX<-Qcv^u@5(@@M2CHSe_hD$VG-eiV^V( zj7*9T0?di?P$FaD6oo?)<)QT>Npf6Og!GO^GmPV(Km0!=+dE&bk#SNI+C9RGQ|{~O*VC+tXK3!n`5 zHfl6>lwf_aEVV3`0T!aHNZLsj$paS$=LL(?b!Czaa5bbSuZ6#$_@LK<(7yrrl+80| z{tOFd=|ta2Z`^ssozD9BINn45NxUeCQis?-BKmU*Kt=FY-NJ+)8S1ecuFtN-M?&42 zl2$G>u!iNhAk*HoJ^4v^9#ORYp5t^wDj6|lx~5w45#E5wVqI1JQ~9l?nPp1YINf++ zMAdSif~_ETv@Er(EFBI^@L4BULFW>)NI+ejHFP*T}UhWNN`I)RRS8za? z*@`1>9ZB}An%aT5K=_2iQmfE;GcBVHLF!$`I99o5GO`O%O_zLr9AG18>&^HkG(;=V z%}c!OBQ~?MX(9h~tajX{=x)+!cbM7$YzTlmsPOdp2L-?GoW`@{lY9U3f;OUo*BwRB z8A+nv(br0-SH#VxGy#ZrgnGD(=@;HME;yd46EgWJ`EL%oXc&lFpc@Y}^>G(W>h_v_ zlN!`idhX+OjL+~T?19sroAFVGfa5tX-D49w$1g2g_-T|EpHL6}K_aX4$K=LTvwtlF zL*z}j{f+Uoe7{-px3_5iKPA<_7W=>Izkk)!l9ez2w%vi(?Y;i8AxRNLSOGDzNoqoI zP!1uAl}r=_871(G?y`i&)-7{u=%nxk7CZ_Qh#!|ITec zwQn`33GTUM`;D2POWnkqngqJhJRlM>CTONzTG}>^Q0wUunQyn|TAiHzyX2_%ATx%P z%7gW)%4rA9^)M<_%k@`Y?RbC<29sWU&5;@|9thf2#zf8z12$hRcZ!CSb>kUp=4N#y zl3hE#y6>kkA8VY2`W`g5Ip?2qC_BY$>R`iGQLhz2-S>x(RuWv)SPaGdl^)gGw7tjR zH@;jwk!jIaCgSg_*9iF|a);sRUTq30(8I(obh^|}S~}P4U^BIGYqcz;MPpC~Y@k_m zaw4WG1_vz2GdCAX!$_a%GHK**@IrHSkGoN>)e}>yzUTm52on`hYot7cB=oA-h1u|R ztH$11t?54Qg2L+i33FPFKKRm1aOjKST{l1*(nps`>sv%VqeVMWjl5+Gh+9);hIP8? zA@$?}Sc z3qIRpba+y5yf{R6G(u8Z^vkg0Fu&D-7?1s=QZU`Ub{-!Y`I?AGf1VNuc^L3v>)>i# z{DV9W$)>34wnzAXUiV^ZpYKw>UElrN_5Xj6{r_3| z$X5PK`e5$7>~9Dj7gK5ash(dvs`vwfk}&RD`>04;j62zoXESkFBklYaKm5seyiX(P zqQ-;XxlV*yg?Dhlx%xt!b0N3GHp@(p$A;8|%# zZ5m2KL|{on4nr>2_s9Yh=r5ScQ0;aMF)G$-9-Ca6%wA`Pa)i?NGFA|#Yi?{X-4ZO_ z^}%7%vkzvUHa$-^Y#aA+aiR5sa%S|Ebyn`EV<3Pc?ax_f>@sBZF1S;7y$CXd5t5=WGsTKBk8$OfH4v|0?0I=Yp}7c=WBSCg!{0n)XmiU;lfx)**zZaYqmDJelxk$)nZyx5`x$6R|fz(;u zEje5Dtm|a%zK!!tk3{i9$I2b{vXNFy%Bf{50X!x{98+BsDr_u9i>G5%*sqEX|06J0 z^IY{UcEbj6LDwuMh7cH`H@9sVt1l1#8kEQ(LyT@&+K}(ReE`ux8gb0r6L_#bDUo^P z3Ka2lRo52Hdtl_%+pwVs14=q`{d^L58PsU@AMf(hENumaxM{7iAT5sYmWh@hQCO^ zK&}ijo=`VqZ#a3vE?`7QW0ZREL17ZvDfdqKGD?0D4fg{7v%|Yj&_jcKJAB)>=*RS* zto8p6@k%;&^ZF>hvXm&$PCuEp{uqw3VPG$9VMdW5$w-fy2CNNT>E;>ejBgy-m_6`& z97L1p{%srn@O_JQgFpa_#f(_)eb#YS>o>q3(*uB;uZb605(iqM$=NK{nHY=+X2*G) zO3-_Xh%aG}fHWe*==58zBwp%&`mge<8uq8;xIxOd=P%9EK!34^E9sk|(Zq1QSz-JVeP12Fp)-`F|KY$LPwUE?rku zY@OJ)Z9A!ojfzfeyJ9;zv2EM7ZQB)AR5xGa-tMn^bl)FmoIiVyJ@!~@%{}qXXD&Ns zPnfe5U+&ohKefILu_1mPfLGuapX@btta5C#gPB2cjk5m4T}Nfi+Vfka!Yd(L?-c~5 z#ZK4VeQEXNPc4r$K00Fg>g#_W!YZ)cJ?JTS<&68_$#cZT-ME`}tcwqg3#``3M3UPvn+pi}(VNNx6y zFIMVb6OwYU(2`at$gHba*qrMVUl8xk5z-z~fb@Q3Y_+aXuEKH}L+>eW__!IAd@V}L zkw#s%H0v2k5-=vh$^vPCuAi22Luu3uKTf6fPo?*nvj$9(u)4$6tvF-%IM+3pt*cgs z_?wW}J7VAA{_~!?))?s6{M=KPpVhg4fNuU*|3THp@_(q!b*hdl{fjRVFWtu^1dV(f z6iOux9hi&+UK=|%M*~|aqFK{Urfl!TA}UWY#`w(0P!KMe1Si{8|o))Gy6d7;!JQYhgMYmXl?3FfOM2nQGN@~Ap6(G z3+d_5y@=nkpKAhRqf{qQ~k7Z$v&l&@m7Ppt#FSNzKPZM z8LhihcE6i=<(#87E|Wr~HKvVWhkll4iSK$^mUHaxgy8*K$_Zj;zJ`L$naPj+^3zTi z-3NTaaKnD5FPY-~?Tq6QHnmDDRxu0mh0D|zD~Y=vv_qig5r-cIbCpxlju&8Sya)@{ zsmv6XUSi)@(?PvItkiZEeN*)AE~I_?#+Ja-r8$(XiXei2d@Hi7Rx8+rZZb?ZLa{;@*EHeRQ-YDadz~M*YCM4&F-r;E#M+@CSJMJ0oU|PQ^ z=E!HBJDMQ2TN*Y(Ag(ynAL8%^v;=~q?s4plA_hig&5Z0x_^Oab!T)@6kRN$)qEJ6E zNuQjg|G7iwU(N8pI@_6==0CL;lRh1dQF#wePhmu@hADFd3B5KIH#dx(2A zp~K&;Xw}F_N6CU~0)QpQk7s$a+LcTOj1%=WXI(U=Dv!6 z{#<#-)2+gCyyv=Jw?Ab#PVkxPDeH|sAxyG`|Ys}A$PW4TdBv%zDz z^?lwrxWR<%Vzc8Sgt|?FL6ej_*e&rhqJZ3Y>k=X(^dytycR;XDU16}Pc9Vn0>_@H+ zQ;a`GSMEG64=JRAOg%~L)x*w{2re6DVprNp+FcNra4VdNjiaF0M^*>CdPkt(m150rCue?FVdL0nFL$V%5y6N z%eLr5%YN7D06k5ji5*p4v$UMM)G??Q%RB27IvH7vYr_^3>1D-M66#MN8tWGw>WED} z5AhlsanO=STFYFs)Il_0i)l)f<8qn|$DW7ZXhf5xI;m+7M5-%P63XFQrG9>DMqHc} zsgNU9nR`b}E^mL5=@7<1_R~j@q_2U^3h|+`7YH-?C=vme1C3m`Fe0HC>pjt6f_XMh zy~-i-8R46QNYneL4t@)<0VU7({aUO?aH`z4V2+kxgH5pYD5)wCh75JqQY)jIPN=U6 z+qi8cGiOtXG2tXm;_CfpH9ESCz#i5B(42}rBJJF$jh<1sbpj^8&L;gzGHb8M{of+} zzF^8VgML2O9nxBW7AvdEt90vp+#kZxWf@A)o9f9}vKJy9NDBjBW zSt=Hcs=YWCwnfY1UYx*+msp{g!w0HC<_SM!VL1(I2PE?CS}r(eh?{I)mQixmo5^p# zV?2R!R@3GV6hwTCrfHiK#3Orj>I!GS2kYhk1S;aFBD_}u2v;0HYFq}Iz1Z(I4oca4 zxquja8$+8JW_EagDHf$a1OTk5S97umGSDaj)gH=fLs9>_=XvVj^Xj9a#gLdk=&3tl zfmK9MNnIX9v{?%xdw7568 zNrZ|roYs(vC4pHB5RJ8>)^*OuyNC>x7ad)tB_}3SgQ96+-JT^Qi<`xi=)_=$Skwv~ zdqeT9Pa`LYvCAn&rMa2aCDV(TMI#PA5g#RtV|CWpgDYRA^|55LLN^uNh*gOU>Z=a06qJ;$C9z8;n-Pq=qZnc1zUwJ@t)L;&NN+E5m zRkQ(SeM8=l-aoAKGKD>!@?mWTW&~)uF2PYUJ;tB^my`r9n|Ly~0c%diYzqs9W#FTjy?h&X3TnH zXqA{QI82sdjPO->f=^K^f>N`+B`q9&rN0bOXO79S&a9XX8zund(kW7O76f4dcWhIu zER`XSMSFbSL>b;Rp#`CuGJ&p$s~G|76){d?xSA5wVg##_O0DrmyEYppyBr%fyWbbv zp`K84JwRNP$d-pJ!Qk|(RMr?*!wi1if-9G#0p>>1QXKXWFy)eB3ai)l3601q8!9JC zvU#ZWWDNKq9g6fYs?JQ)Q4C_cgTy3FhgKb8s&m)DdmL5zhNK#8wWg!J*7G7Qhe9VU zha?^AQTDpYcuN!B+#1dE*X{<#!M%zfUQbj=zLE{dW0XeQ7-oIsGY6RbkP2re@Q{}r_$iiH0xU%iN*ST`A)-EH6eaZB$GA#v)cLi z*MpA(3bYk$oBDKAzu^kJoSUsDd|856DApz={3u8sbQV@JnRkp2nC|)m;#T=DvIL-O zI4vh;g7824l}*`_p@MT4+d`JZ2%6NQh=N9bmgJ#q!hK@_<`HQq3}Z8Ij>3%~<*= zcv=!oT#5xmeGI92lqm9sGVE%#X$ls;St|F#u!?5Y7syhx6q#MVRa&lBmmn%$C0QzU z);*ldgwwCmzM3uglr}!Z2G+?& zf%Dpo&mD%2ZcNFiN-Z0f;c_Q;A%f@>26f?{d1kxIJD}LxsQkB47SAdwinfMILZdN3 zfj^HmTzS3Ku5BxY>ANutS8WPQ-G>v4^_Qndy==P3pDm+Xc?>rUHl-4+^%Sp5atOja z2oP}ftw-rqnb}+khR3CrRg^ibi6?QYk1*i^;kQGirQ=uB9Sd1NTfT-Rbv;hqnY4neE5H1YUrjS2m+2&@uXiAo- zrKUX|Ohg7(6F(AoP~tj;NZlV#xsfo-5reuQHB$&EIAhyZk;bL;k9ouDmJNBAun;H& zn;Of1z_Qj`x&M;5X;{s~iGzBQTY^kv-k{ksbE*Dl%Qf%N@hQCfY~iUw!=F-*$cpf2 z3wix|aLBV0b;W@z^%7S{>9Z^T^fLOI68_;l@+Qzaxo`nAI8emTV@rRhEKZ z?*z_{oGdI~R*#<2{bkz$G~^Qef}$*4OYTgtL$e9q!FY7EqxJ2`zk6SQc}M(k(_MaV zSLJnTXw&@djco1~a(vhBl^&w=$fa9{Sru>7g8SHahv$&Bl(D@(Zwxo_3r=;VH|uc5 zi1Ny)J!<(KN-EcQ(xlw%PNwK8U>4$9nVOhj(y0l9X^vP1TA>r_7WtSExIOsz`nDOP zs}d>Vxb2Vo2e5x8p(n~Y5ggAyvib>d)6?)|E@{FIz?G3PVGLf7-;BxaP;c?7ddH$z zA+{~k^V=bZuXafOv!RPsE1GrR3J2TH9uB=Z67gok+u`V#}BR86hB1xl}H4v`F+mRfr zYhortD%@IGfh!JB(NUNSDh+qDz?4ztEgCz&bIG-Wg7w-ua4ChgQR_c+z8dT3<1?uX z*G(DKy_LTl*Ea!%v!RhpCXW1WJO6F`bgS-SB;Xw9#! z<*K}=#wVu9$`Yo|e!z-CPYH!nj7s9dEPr-E`DXUBu0n!xX~&|%#G=BeM?X@shQQMf zMvr2!y7p_gD5-!Lnm|a@z8Of^EKboZsTMk%5VsJEm>VsJ4W7Kv{<|#4f-qDE$D-W>gWT%z-!qXnDHhOvLk=?^a1*|0j z{pW{M0{#1VcR5;F!!fIlLVNh_Gj zbnW(_j?0c2q$EHIi@fSMR{OUKBcLr{Y&$hrM8XhPByyZaXy|dd&{hYQRJ9@Fn%h3p7*VQolBIV@Eq`=y%5BU~3RPa^$a?ixp^cCg z+}Q*X+CW9~TL29@OOng(#OAOd!)e$d%sr}^KBJ-?-X&|4HTmtemxmp?cT3uA?md4% zT8yZ0U;6Rg6JHy3fJae{6TMGS?ZUX6+gGTT{Q{)SI85$5FD{g-eR%O0KMpWPY`4@O zx!hen1*8^E(*}{m^V_?}(b5k3hYo=T+$&M32+B`}81~KKZhY;2H{7O-M@vbCzuX0n zW-&HXeyr1%I3$@ns-V1~Lb@wIpkmx|8I~ob1Of7i6BTNysEwI}=!nU%q7(V_^+d*G z7G;07m(CRTJup!`cdYi93r^+LY+`M*>aMuHJm(A8_O8C#A*$!Xvddgpjx5)?_EB*q zgE8o5O>e~9IiSC@WtZpF{4Bj2J5eZ>uUzY%TgWF7wdDE!fSQIAWCP)V{;HsU3ap?4 znRsiiDbtN7i9hapO;(|Ew>Ip2TZSvK9Z^N21%J?OiA_&eP1{(Pu_=%JjKy|HOardq ze?zK^K zA%sjF64*Wufad%H<) z^|t>e*h+Z1#l=5wHexzt9HNDNXgM=-OPWKd^5p!~%SIl>Fo&7BvNpbf8{NXmH)o{r zO=aBJ;meX1^{O%q;kqdw*5k!Y7%t_30 zy{nGRVc&5qt?dBwLs+^Sfp;f`YVMSB#C>z^a9@fpZ!xb|b-JEz1LBX7ci)V@W+kvQ89KWA0T~Lj$aCcfW#nD5bt&Y_< z-q{4ZXDqVg?|0o)j1%l0^_it0WF*LCn-+)c!2y5yS7aZIN$>0LqNnkujV*YVes(v$ zY@_-!Q;!ZyJ}Bg|G-~w@or&u0RO?vlt5*9~yeoPV_UWrO2J54b4#{D(D>jF(R88u2 zo#B^@iF_%S>{iXSol8jpmsZuJ?+;epg>k=$d`?GSegAVp3n$`GVDvK${N*#L_1`44 z{w0fL{2%)0|E+qgZtjX}itZz^KJt4Y;*8uSK}Ft38+3>j|K(PxIXXR-t4VopXo#9# zt|F{LWr-?34y`$nLBVV_*UEgA6AUI65dYIbqpNq9cl&uLJ0~L}<=ESlOm?Y-S@L*d z<7vt}`)TW#f%Rp$Q}6@3=j$7Tze@_uZO@aMn<|si{?S}~maII`VTjs&?}jQ4_cut9$)PEqMukwoXobzaKx^MV z2fQwl+;LSZ$qy%Tys0oo^K=jOw$!YwCv^ei4NBVauL)tN%=wz9M{uf{IB(BxK|lT*pFkmNK_1tV`nb%jH=a0~VNq2RCKY(rG7jz!-D^k)Ec)yS%17pE#o6&eY+ z^qN(hQT$}5F(=4lgNQhlxj?nB4N6ntUY6(?+R#B?W3hY_a*)hnr4PA|vJ<6p`K3Z5Hy z{{8(|ux~NLUW=!?9Qe&WXMTAkQnLXg(g=I@(VG3{HE13OaUT|DljyWXPs2FE@?`iU z4GQlM&Q=T<4&v@Fe<+TuXiZQT3G~vZ&^POfmI1K2h6t4eD}Gk5XFGpbj1n_g*{qmD6Xy z`6Vv|lLZtLmrnv*{Q%xxtcWVj3K4M%$bdBk_a&ar{{GWyu#ljM;dII;*jP;QH z#+^o-A4np{@|Mz+LphTD0`FTyxYq#wY)*&Ls5o{0z9yg2K+K7ZN>j1>N&;r+Z`vI| zDzG1LJZ+sE?m?>x{5LJx^)g&pGEpY=fQ-4}{x=ru;}FL$inHemOg%|R*ZXPodU}Kh zFEd5#+8rGq$Y<_?k-}r5zgQ3jRV=ooHiF|@z_#D4pKVEmn5CGV(9VKCyG|sT9nc=U zEoT67R`C->KY8Wp-fEcjjFm^;Cg(ls|*ABVHq8clBE(;~K^b+S>6uj70g? z&{XQ5U&!Z$SO7zfP+y^8XBbiu*Cv-yJG|l-oe*!s5$@Lh_KpxYL2sx`B|V=dETN>5K+C+CU~a_3cI8{vbu$TNVdGf15*>D zz@f{zIlorkY>TRh7mKuAlN9A0>N>SV`X)+bEHms=mfYTMWt_AJtz_h+JMmrgH?mZt zm=lfdF`t^J*XLg7v+iS)XZROygK=CS@CvUaJo&w2W!Wb@aa?~Drtf`JV^cCMjngVZ zv&xaIBEo8EYWuML+vxCpjjY^s1-ahXJzAV6hTw%ZIy!FjI}aJ+{rE&u#>rs)vzuxz z+$5z=7W?zH2>Eb32dvgHYZtCAf!=OLY-pb4>Ae79rd68E2LkVPj-|jFeyqtBCCwiW zkB@kO_(3wFq)7qwV}bA=zD!*@UhT`geq}ITo%@O(Z5Y80nEX~;0-8kO{oB6|(4fQh z);73T!>3@{ZobPwRv*W?7m0Ml9GmJBCJd&6E?hdj9lV= z4flNfsc(J*DyPv?RCOx!MSvk(M952PJ-G|JeVxWVjN~SNS6n-_Ge3Q;TGE;EQvZg86%wZ`MB zSMQua(i*R8a75!6$QRO^(o7sGoomb+Y{OMy;m~Oa`;P9Yqo>?bJAhqXxLr7_3g_n>f#UVtxG!^F#1+y@os6x(sg z^28bsQ@8rw%Gxk-stAEPRbv^}5sLe=VMbkc@Jjimqjvmd!3E7+QnL>|(^3!R} zD-l1l7*Amu@j+PWLGHXXaFG0Ct2Q=}5YNUxEQHCAU7gA$sSC<5OGylNnQUa>>l%sM zyu}z6i&({U@x^hln**o6r2s-(C-L50tQvz|zHTqW!ir?w&V23tuYEDJVV#5pE|OJu z7^R!A$iM$YCe?8n67l*J-okwfZ+ZTkGvZ)tVPfR;|3gyFjF)8V zyXXN=!*bpyRg9#~Bg1+UDYCt0 ztp4&?t1X0q>uz;ann$OrZs{5*r`(oNvw=$7O#rD|Wuv*wIi)4b zGtq4%BX+kkagv3F9Id6~-c+1&?zny%w5j&nk9SQfo0k4LhdSU_kWGW7axkfpgR`8* z!?UTG*Zi_baA1^0eda8S|@&F z{)Rad0kiLjB|=}XFJhD(S3ssKlveFFmkN{Vl^_nb!o5M!RC=m)V&v2%e?ZoRC@h3> zJ(?pvToFd`*Zc@HFPL#=otWKwtuuQ_dT-Hr{S%pQX<6dqVJ8;f(o)4~VM_kEQkMR+ zs1SCVi~k>M`u1u2xc}>#D!V&6nOOh-E$O&SzYrjJdZpaDv1!R-QGA141WjQe2s0J~ zQ;AXG)F+K#K8_5HVqRoRM%^EduqOnS(j2)|ctA6Q^=|s_WJYU;Z%5bHp08HPL`YF2 zR)Ad1z{zh`=sDs^&V}J z%$Z$!jd7BY5AkT?j`eqMs%!Gm@T8)4w3GYEX~IwgE~`d|@T{WYHkudy(47brgHXx& zBL1yFG6!!!VOSmDxBpefy2{L_u5yTwja&HA!mYA#wg#bc-m%~8aRR|~AvMnind@zs zy>wkShe5&*un^zvSOdlVu%kHsEo>@puMQ`b1}(|)l~E{5)f7gC=E$fP(FC2=F<^|A zxeIm?{EE!3sO!Gr7e{w)Dx(uU#3WrFZ>ibmKSQ1tY?*-Nh1TDHLe+k*;{Rp!Bmd_m zb#^kh`Y*8l|9Cz2e{;RL%_lg{#^Ar+NH|3z*Zye>!alpt{z;4dFAw^^H!6ING*EFc z_yqhr8d!;%nHX9AKhFQZBGrSzfzYCi%C!(Q5*~hX>)0N`vbhZ@N|i;_972WSx*>LH z87?en(;2_`{_JHF`Sv6Wlps;dCcj+8IJ8ca6`DsOQCMb3n# z3)_w%FuJ3>fjeOOtWyq)ag|PmgQbC-s}KRHG~enBcIwqIiGW8R8jFeBNY9|YswRY5 zjGUxdGgUD26wOpwM#8a!Nuqg68*dG@VM~SbOroL_On0N6QdT9?)NeB3@0FCC?Z|E0 z6TPZj(AsPtwCw>*{eDEE}Gby>0q{*lI+g2e&(YQrsY&uGM{O~}(oM@YWmb*F zA0^rr5~UD^qmNljq$F#ARXRZ1igP`MQx4aS6*MS;Ot(1L5jF2NJ;de!NujUYg$dr# z=TEL_zTj2@>ZZN(NYCeVX2==~=aT)R30gETO{G&GM4XN<+!&W&(WcDP%oL8PyIVUC zs5AvMgh6qr-2?^unB@mXK*Dbil^y-GTC+>&N5HkzXtozVf93m~xOUHn8`HpX=$_v2 z61H;Z1qK9o;>->tb8y%#4H)765W4E>TQ1o0PFj)uTOPEvv&}%(_mG0ISmyhnQV33Z$#&yd{ zc{>8V8XK$3u8}04CmAQ#I@XvtmB*s4t8va?-IY4@CN>;)mLb_4!&P3XSw4pA_NzDb zORn!blT-aHk1%Jpi>T~oGLuh{DB)JIGZ9KOsciWs2N7mM1JWM+lna4vkDL?Q)z_Ct z`!mi0jtr+4*L&N7jk&LodVO#6?_qRGVaucqVB8*us6i3BTa^^EI0x%EREQSXV@f!lak6Wf1cNZ8>*artIJ(ADO*=<-an`3zB4d*oO*8D1K!f z*A@P1bZCNtU=p!742MrAj%&5v%Xp_dSX@4YCw%F|%Dk=u|1BOmo)HsVz)nD5USa zR~??e61sO(;PR)iaxK{M%QM_rIua9C^4ppVS$qCT9j2%?*em?`4Z;4@>I(c%M&#cH z>4}*;ej<4cKkbCAjjDsyKS8rIm90O)Jjgyxj5^venBx&7B!xLmzxW3jhj7sR(^3Fz z84EY|p1NauwXUr;FfZjdaAfh%ivyp+^!jBjJuAaKa!yCq=?T_)R!>16?{~p)FQ3LDoMyG%hL#pR!f@P%*;#90rs_y z@9}@r1BmM-SJ#DeuqCQk=J?ixDSwL*wh|G#us;dd{H}3*-Y7Tv5m=bQJMcH+_S`zVtf;!0kt*(zwJ zs+kedTm!A}cMiM!qv(c$o5K%}Yd0|nOd0iLjus&;s0Acvoi-PFrWm?+q9f^FslxGi z6ywB`QpL$rJzWDg(4)C4+!2cLE}UPCTBLa*_=c#*$b2PWrRN46$y~yST3a2$7hEH= zNjux+wna^AzQ=KEa_5#9Ph=G1{S0#hh1L3hQ`@HrVnCx{!fw_a0N5xV(iPdKZ-HOM za)LdgK}1ww*C_>V7hbQnTzjURJL`S%`6nTHcgS+dB6b_;PY1FsrdE8(2K6FN>37!62j_cBlui{jO^$dPkGHV>pXvW0EiOA zqW`YaSUBWg_v^Y5tPJfWLcLpsA8T zG)!x>pKMpt!lv3&KV!-um= zKCir6`bEL_LCFx4Z5bAFXW$g3Cq`?Q%)3q0r852XI*Der*JNuKUZ`C{cCuu8R8nkt z%pnF>R$uY8L+D!V{s^9>IC+bmt<05h**>49R*#vpM*4i0qRB2uPbg8{{s#9yC;Z18 zD7|4m<9qneQ84uX|J&f-g8a|nFKFt34@Bt{CU`v(SYbbn95Q67*)_Esl_;v291s=9 z+#2F2apZU4Tq=x+?V}CjwD(P=U~d<=mfEFuyPB`Ey82V9G#Sk8H_Ob_RnP3s?)S_3 zr%}Pb?;lt_)Nf>@zX~D~TBr;-LS<1I##8z`;0ZCvI_QbXNh8Iv)$LS=*gHr;}dgb=w5$3k2la1keIm|=7<-JD>)U%=Avl0Vj@+&vxn zt-)`vJxJr88D&!}2^{GPXc^nmRf#}nb$4MMkBA21GzB`-Or`-3lq^O^svO7Vs~FdM zv`NvzyG+0T!P8l_&8gH|pzE{N(gv_tgDU7SWeiI-iHC#0Ai%Ixn4&nt{5y3(GQs)i z&uA;~_0shP$0Wh0VooIeyC|lak__#KVJfxa7*mYmZ22@(<^W}FdKjd*U1CqSjNKW% z*z$5$=t^+;Ui=MoDW~A7;)Mj%ibX1_p4gu>RC}Z_pl`U*{_z@+HN?AF{_W z?M_X@o%w8fgFIJ$fIzBeK=v#*`mtY$HC3tqw7q^GCT!P$I%=2N4FY7j9nG8aIm$c9 zeKTxVKN!UJ{#W)zxW|Q^K!3s;(*7Gbn;e@pQBCDS(I|Y0euK#dSQ_W^)sv5pa%<^o zyu}3d?Lx`)3-n5Sy9r#`I{+t6x%I%G(iewGbvor&I^{lhu-!#}*Q3^itvY(^UWXgvthH52zLy&T+B)Pw;5>4D6>74 zO_EBS)>l!zLTVkX@NDqyN2cXTwsUVao7$HcqV2%t$YzdAC&T)dwzExa3*kt9d(}al zA~M}=%2NVNUjZiO7c>04YH)sRelXJYpWSn^aC$|Ji|E13a^-v2MB!Nc*b+=KY7MCm zqIteKfNkONq}uM;PB?vvgQvfKLPMB8u5+Am=d#>g+o&Ysb>dX9EC8q?D$pJH!MTAqa=DS5$cb+;hEvjwVfF{4;M{5U&^_+r zvZdu_rildI!*|*A$TzJ&apQWV@p{!W`=?t(o0{?9y&vM)V)ycGSlI3`;ps(vf2PUq zX745#`cmT*ra7XECC0gKkpu2eyhFEUb?;4@X7weEnLjXj_F~?OzL1U1L0|s6M+kIhmi%`n5vvDALMagi4`wMc=JV{XiO+^ z?s9i7;GgrRW{Mx)d7rj)?(;|b-`iBNPqdwtt%32se@?w4<^KU&585_kZ=`Wy^oLu9 z?DQAh5z%q;UkP48jgMFHTf#mj?#z|=w= z(q6~17Vn}P)J3M?O)x))%a5+>TFW3No~TgP;f}K$#icBh;rSS+R|}l鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc diff --git a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index d4081da4..00000000 --- a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/test-complete-app-mlDeploy/gradlew b/test-complete-app-mlDeploy/gradlew deleted file mode 100755 index 1aa94a42..00000000 --- a/test-complete-app-mlDeploy/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/test-complete-app-mlDeploy/gradlew.bat b/test-complete-app-mlDeploy/gradlew.bat deleted file mode 100644 index 6689b85b..00000000 --- a/test-complete-app-mlDeploy/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml b/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml deleted file mode 100644 index d745328d..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml +++ /dev/null @@ -1,17 +0,0 @@ - - ssl-project-template - This template is used to demonstrate how ml-gradle can enable SSL for an app server - rsa - - - 0 - - US - VA - McLean - MarkLogic - Sales - nobody@marklogic.com - - - \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json deleted file mode 100644 index 681dbd5b..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "role-name": "eval", - "description": "eval role", - "role": [], - "privilege": [ - { - "privilege-name": "xdbc-eval", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - }, - { - "privilege-name": "xdmp-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", - "kind": "execute" - }, - { - "privilege-name": "xdmp-invoke-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke-in", - "kind": "execute" - }, - { - "privilege-name": "xdmp-spawn", - "action": "http://marklogic.com/xdmp/privileges/xdmp-spawn", - "kind": "execute" - }, - { - "privilege-name": "xdmp-spawn-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-spawn-in", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json deleted file mode 100644 index 5cab4f0f..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "role-name": "qbvuser-role", - "description": "qbvuser role for test-complete tests", - "role": [ - "tde-view", - "query-view-admin", - "app-user", - "eval", - "harmonized-reader", - "rest-extension-user", - "rest-reader", - "rest-writer", - "rest-admin", - "tde-admin", - "manage-user", - "sparql-update-user" - ], - "privilege": [ - { - "privilege-name": "any-uri", - "action": "http://marklogic.com/xdmp/privileges/any-uri", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - }, - { - "privilege-name": "sem-sparql", - "action": "http://marklogic.com/xdmp/privileges/sem-sparql", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", - "kind": "execute" - }, - { - "privilege-name": "xdbc-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke", - "kind": "execute" - }, - { - "privilege-name": "xdmp-sql", - "action": "http://marklogic.com/xdmp/privileges/xdmp-sql", - "kind": "execute" - }, - { - "privilege-name": "xdmp-http-get", - "action": "http://marklogic.com/xdmp/privileges/xdmp-http-get", - "kind": "execute" - }, - { - "privilege-name": "xdmp-http-post", - "action": "http://marklogic.com/xdmp/privileges/xdmp-http-post", - "kind": "execute" - }, - { - "privilege-name": "xdbc-invoke-in", - "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke-in", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json deleted file mode 100644 index 476c59cb..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "role-name": "rest-evaluator", - "description": "REST writer who can eval, invoke, or set a dynamic databases", - "role": [ - "rest-writer" - ], - "privilege": [ - { - "privilege-name": "xdmp-eval", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - }, - { - "privilege-name": "xdmp-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", - "kind": "execute" - }, - { - "privilege-name": "xdbc-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke", - "kind": "execute" - }, - { - "privilege-name": "any-uri", - "action": "http://marklogic.com/xdmp/privileges/any-uri", - "kind": "execute" - }, - { - "privilege-name": "xdmp-set-session-field", - "action": "http://marklogic.com/xdmp/privileges/xdmp-set-session-field", - "kind": "execute" - }, - { - "privilege-name": "xdmp-get-session-field", - "action": "http://marklogic.com/xdmp/privileges/xdmp-get-session-field", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json deleted file mode 100644 index a78e7c6d..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "role-name": "rest-temporal-writer", - "description": "REST writer with temporal privileges", - "role": [ - "rest-writer" - ], - "privilege": [ - { - "privilege-name": "temporal-statement-set-system-time", - "action": "http://marklogic.com/xdmp/privileges/temporal-statement-set-system-time", - "kind": "execute" - }, - { - "privilege-name": "temporal-document-protect", - "action": "http://marklogic.com/xdmp/privileges/temporal-document-protect", - "kind": "execute" - }, - { - "privilege-name": "temporal-document-wipe", - "action": "http://marklogic.com/xdmp/privileges/temporal-document-wipe", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json deleted file mode 100644 index c9d8fd11..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "role-name": "tde-User", - "description": "test user to write tde to modules database", - "role": [ - "tde-view", - "tde-admin", - "rest-writer" - ], - "privilege": [ - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json deleted file mode 100644 index e90b1b21..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "qbvuser", - "description": "qbvuser for test complete tests.", - "password": "qbvuser", - "role": [ - "qbvuser-role" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json deleted file mode 100644 index 1d61dd6f..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-admin", - "description": "rest-admin user", - "password": "x", - "role": [ - "rest-admin" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json deleted file mode 100644 index fe89e731..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-evaluator", - "description": "rest-writer user with evaluate privileges", - "password": "x", - "role": [ - "rest-evaluator" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json deleted file mode 100644 index 6db7588e..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-reader-optic", - "password": "x", - "description": "rest-reader user", - "role": [ - "rest-reader" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json deleted file mode 100644 index 7cdeed28..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-reader", - "description": "rest-reader user", - "password": "x", - "role": [ - "rest-reader" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json deleted file mode 100644 index aa163780..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-temporal-writer", - "description": "rest-writer user with temporal privileges", - "password": "x", - "role": [ - "rest-temporal-writer" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json deleted file mode 100644 index 340ec3ba..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "user-name": "rest-writer", - "description": "rest-writer user", - "password": "x", - "role": [ - "rest-writer", - "rest-evaluator" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json deleted file mode 100644 index deb28d45..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "tde-user", - "description": "test user to write tde to modules database", - "password": "x", - "role": [ - "tde-User" - ] -} \ No newline at end of file From dc795ad05c6bcfa94f81b558f6b00567d1fb5db4 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 30 Oct 2025 10:12:21 -0400 Subject: [PATCH 56/58] MLE-24976 Updated NOTICE and README for 4.0.0 And excluded an example file from "all.js" because it is just a reference example. --- NOTICE.txt | 81 +++++++++++++++---------------------------------- README.md | 24 +++++++++++---- examples/all.js | 1 + jsdoc.json | 2 +- 4 files changed, 44 insertions(+), 64 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 9468467e..370f6d29 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,4 +1,4 @@ -MarkLogic® Node Client API +Progress® MarkLogic® Node Client API Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. @@ -10,43 +10,51 @@ Unless required by applicable law or agreed to in writing, software distributed To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by Progress Software Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com. Please specify the product and version for which you are requesting source code. -The following software may be included in this project (last updated TBD January 28, 2025): +The following software may be included in this project (last updated October 29, 2025): ------------------------------------------------------------------------- -MarkLogic® Node Client API + +Progress® MarkLogic® Node Client API + Third-Party Notices -This document provides notices information for the third-party components used by MarkLogic® Node Client API. +This document provides notices information for the third-party components used by Progress® MarkLogic® Node Client API. Third Party Components - @fastify/busboy 1.2.1 (MIT) + @fastify/busboy 3.2.0 (MIT) big-integer 1.6.52 (Public Domain) concat-stream 2.0.0 (MIT) duplexify 4.1.3 (MIT) - form-data 4.0.1 (MIT) - json-text-sequence 1.0.1 (MIT) - Kerberos 2.2.1 (Apache-2.0) + form-data 4.0.4 (MIT) + json-text-sequence 4.0.2 (MIT) multipart-stream 2.0.1 (MIT) qs 6.14.0 (BSD-3-Clause) through2 4.0.2 (MIT) - vinyl 3.0.0 (MIT) - www-authenticate 0.6.3 (MIT) + Common Licenses + Apache License 2.0 (Apache-2.0) ************************************************************ + Third-Party Components -************************************************************ - The following is a list of the third-party components used by MarkLogic® Node Client API. + The following is a list of the third-party components used by Progress® MarkLogic® Node Client API. + +************************************************************ -@fastify/busboy 1.2.1 (MIT) +@fastify/busboy 3.2.0 (MIT) https://www.npmjs.com/package/@fastify/busboy +MIT License + Copyright Brian White. All rights reserved. +Copyright (c) 2021-present The Fastify team + +The Fastify team members are listed at https://github.com/fastify/fastify#team. 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: @@ -104,7 +112,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ************************************************************ -form-data 4.0.1 (MIT) +form-data 4.0.4 (MIT) https://www.npmjs.com/package/form-data @@ -118,7 +126,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ************************************************************ -json-text-sequence 1.0.1 (MIT) +json-text-sequence 4.0.2 (MIT) https://www.npmjs.com/package/json-text-sequence @@ -134,14 +142,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ************************************************************ -Kerberos 2.2.1 (Apache-2.0) - -https://www.npmjs.com/package/kerberos - -For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) - -************************************************************ - multipart-stream 2.0.1 (MIT) https://www.npmjs.com/package/multipart-stream @@ -194,39 +194,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ************************************************************ -Vinyl 3.0.0 (MIT) - -https://www.npmjs.com/package/vinyl - - -The MIT License (MIT) - -Copyright (c) 2013, 2016-2022 Blaine Bublitz and Eric Schoffstall - -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. - -************************************************************ - -www-authenticate 0.6.3 (MIT) - -https://www.npmjs.com/package/www-authenticate - -Copyright (c) 2013 Randy McLaughlin - -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. - -************************************************************ - -This section shows the text of common third-party licenses used by MarkLogic® Node Client API: +This section shows the text of common third-party licenses used by Progress® MarkLogic® Node Client API: Apache License 2.0 (Apache-2.0) https://spdx.org/licenses/Apache-2.0.html @@ -307,4 +275,3 @@ limitations under the License. ==================== - diff --git a/README.md b/README.md index 02b5c1fc..b604670f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ -# MarkLogic Node.js Client API +# Progress® MarkLogic® Node Client API -The MarkLogic Node.js Client API provides access to the MarkLogic database -from Node.js applications. +The Progress® MarkLogic® Node Client API provides access to the MarkLogic database from Node.js applications. ## Features @@ -18,6 +17,19 @@ from Node.js applications. * Generate query based views, redaction on rows * Data Movement SDK - move large amounts of data into, out of, or within a MarkLogic cluster +## System Requirements + +The Node Client 4.0.0 release requires Node.js 22 or higher. Testing has verified that the client will +run successfully on Node 20, but we recommend 22 or higher based on +[the Node.js release roadmap](https://nodejs.org/en/about/previous-releases), as Node 20 enters +end-of-life in April 2026 while Node 22 is supported through April 2027. + +For Node Client 3.x releases, Node.js 16 or higher is required. + +The Node Client depends on the [MarkLogic REST API](https://docs.progress.com/bundle/marklogic-server-develop-rest-api-12/page/topics/intro.html) +for connecting to MarkLogic. The Node Client supports major versions 10, 11, and 12 of MarkLogic, though some features require +a certain version of MarkLogic due to the underlying REST API support being added in that version of MarkLogic. + ## Getting Started You can install the marklogic package as a dependency for your Node.js project @@ -51,10 +63,10 @@ const db = marklogic.createDatabaseClient({ enableGzippedResponses: true }); -// For MarkLogic Cloud +// For Progress Data Cloud const db = marklogic.createDatabaseClient({ apiKey: 'changeme', - host: 'example.beta.marklogic.com', + host: 'example.dev.progress.cloud', authType: 'cloud', // basePath is optional. basePath: '/marklogic/test', @@ -100,7 +112,7 @@ in the online resources. To run the examples, follow the instructions here: ## Support -The MarkLogic Node.js Client API is maintained by MarkLogic Engineering. +The Progress® MarkLogic® Node Client API is maintained by MarkLogic Engineering. It is designed for use in production applications with MarkLogic Server. Everyone is encouraged to file bug reports, feature requests, and pull requests through GitHub. This input is critical and will be carefully diff --git a/examples/all.js b/examples/all.js index 60610059..0c9f8685 100644 --- a/examples/all.js +++ b/examples/all.js @@ -29,6 +29,7 @@ fs.readdir('./examples', function(err, filenames) { 'all.js': true, 'before-load.js': true, 'example-util.js': true, + 'progress-cloud-connection.js': true, 'setup.js': true }; diff --git a/jsdoc.json b/jsdoc.json index 038307d0..471fbcca 100644 --- a/jsdoc.json +++ b/jsdoc.json @@ -5,7 +5,7 @@ }, "templates": { "theme": "marklogic", - "systemName": "MarkLogic Node.js Client API", + "systemName": "Progress® MarkLogic® Node Client API", "copyright": "Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.", "navType": "vertical", "inverseNav": true, From 8e4f6d8958759c0edca4c3c2ce5208645b7e3e90 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 30 Oct 2025 10:58:10 -0400 Subject: [PATCH 57/58] MLE-24976 Updated CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 140b08a4..f1656241 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## 4.0.0 + +This major release does not impact any client functionality, but rather raises the minimum required version of Node.js +to 22 or higher. It also updates all dependencies to their latest version and removes unnecessary dependencies that +were included in previous releases. + ## 3.7.1 #### Bug Fix - https://github.com/marklogic/node-client-api/issues/961 From 2d0b4d8b25b2e1716da09d044f5731865fe4306c Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 30 Oct 2025 11:15:11 -0400 Subject: [PATCH 58/58] MLE-24976 Couple of Polaris fixes in tests --- test-complete/nodejs-dmsdk-queryToTransformAll.js | 14 ++++++++------ test-complete/nodejs-documents-read-chunk.js | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/test-complete/nodejs-dmsdk-queryToTransformAll.js b/test-complete/nodejs-dmsdk-queryToTransformAll.js index a348f704..d35e8e30 100644 --- a/test-complete/nodejs-dmsdk-queryToTransformAll.js +++ b/test-complete/nodejs-dmsdk-queryToTransformAll.js @@ -21,7 +21,7 @@ const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/tran describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', function () { before(async function () { - await restAdminDB.config.transforms.write(transformName, 'javascript', + await restAdminDB.config.transforms.write(transformName, 'javascript', fs.createReadStream(transformPath)).result(); for (let i = 0; i < 100; i++) { uris.push('/test/dataMovement/requests/transformAll/' + i + '.json'); @@ -164,7 +164,7 @@ describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', functi } }); }); - + summary.docsTransformedSuccessfully.should.be.equal(100); summary.docsFailedToBeTransformed.should.be.equal(0); summary.timeElapsed.should.be.greaterThanOrEqual(0); @@ -195,12 +195,12 @@ describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', functi summary.docsTransformedSuccessfully.should.be.equal(100); summary.docsFailedToBeTransformed.should.be.equal(0); summary.timeElapsed.should.be.greaterThanOrEqual(0); - + await verifyDocs('transformedValue'); }); it('should queryToTransformAll documents with onCompletion option', async function () { - const summary = await new Promise((resolve, reject) => { + const summary = await new Promise((resolve, reject) => { dbWriter.documents.queryToTransformAll(query, { transform: [transformName, { newValue: 'transformedValue' }], onCompletion: ((summary) => { @@ -220,7 +220,7 @@ describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', functi }); it('should work with batchSize less than 1', async function () { - const summary = await new Promise((resolve, reject) => { + const summary = await new Promise((resolve, reject) => { dbWriter.documents.queryToTransformAll(query, { transform: [transformName, { newValue: 'transformedValue' }], batchSize: 0, @@ -296,8 +296,10 @@ describe('data movement transformAll - nodejs-dmsdk-queryToTransformAll', functi async function verifyDocs(value) { const documents = await dbWriter.documents.read(uris).result(); + should.exist(documents); + documents.should.be.an.Array(); documents.length.should.equal(100); for (let i = 0; i < documents.length; i++) { documents[i].content.key.should.equal(value); } -} \ No newline at end of file +} diff --git a/test-complete/nodejs-documents-read-chunk.js b/test-complete/nodejs-documents-read-chunk.js index 8855de11..7dd0024b 100644 --- a/test-complete/nodejs-documents-read-chunk.js +++ b/test-complete/nodejs-documents-read-chunk.js @@ -21,7 +21,7 @@ const dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); describe('Binary documents test', function () { const binaryPath = __dirname + '/data/somePdfFile.pdf'; let binaryValue = null; - + const uri = '/test/binary/somePdfFile.pdf'; before(async function () { @@ -46,27 +46,28 @@ describe('Binary documents test', function () { content: readableBinary }).result(); + should.exist(response); response.should.have.property('documents'); const streamData = await new Promise((resolve, reject) => { const chunks = []; const readStream = dbReader.documents.read(uri).stream('chunked'); - + readStream.on('data', function (data) { chunks.push(data); }); - + readStream.on('end', function () { resolve(Buffer.concat(chunks)); }); - + readStream.on('error', function (error) { reject(error); }); }); Buffer.compare(binaryValue, streamData).should.equal(0); - + // Verify the binary content has a string near the end of the file const strData = streamData.toString(); strData.should.containEql('CVISION Technologies');